From fc2e28a9d859ef2118d58339ca3931054358c499 Mon Sep 17 00:00:00 2001 From: "cyril.carlin" Date: Thu, 8 Sep 2022 11:33:12 +0200 Subject: [PATCH 0001/2115] Fixing issue #26686 Adding 'parameters' attribute to partition_keys schema Modifying acceptance test for target aws_glue_catalog_table (resource link) so it is more complete and covers the above modification --- internal/service/glue/catalog_table.go | 5 +++++ internal/service/glue/catalog_table_test.go | 24 +++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index 8c5ef0f3f43e..2ef60f7a02cd 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -86,6 +86,11 @@ func ResourceCatalogTable() *schema.Resource { Optional: true, ValidateFunc: validation.StringLenBetween(0, 131072), }, + "parameters": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, }, }, }, diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index 81c21cad3e1a..6120a9b80a47 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -1385,6 +1385,30 @@ resource "aws_glue_catalog_database" "test2" { resource "aws_glue_catalog_table" "test2" { name = "%[1]s-2" database_name = aws_glue_catalog_database.test2.name + + columns { + name = "my_column_1" + type = "int" + comment = "my_column1_comment" + } + + columns { + name = "my_column_2" + type = "string" + comment = "my_column2_comment" + } + + partition_keys { + name = "my_column_1" + type = "int" + comment = "my_column_1_comment" + } + + partition_keys { + name = "my_column_2" + type = "string" + comment = "my_column_2_comment" + } } `, rName) } From e6195dff6cd60a8fba87048468be9f8c04459cb7 Mon Sep 17 00:00:00 2001 From: "cyril.carlin" Date: Thu, 8 Sep 2022 14:31:05 +0200 Subject: [PATCH 0002/2115] Added changelog entry --- .changelog/26702.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/26702.txt diff --git a/.changelog/26702.txt b/.changelog/26702.txt new file mode 100644 index 000000000000..5c8e322b7976 --- /dev/null +++ b/.changelog/26702.txt @@ -0,0 +1,3 @@ +```release-note:bug +internal/service/glue/catalog_table.go: "partition_keys" schema was missing the optional attribute "parameters" to match AWS definition found at github.com/aws/aws-sdk-go/service/glue +``` From 23ec4e55bc7d103b2c505de92c37acdc46be5641 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 16:47:30 +0100 Subject: [PATCH 0003/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 19 +++++ internal/service/dlm/lifecycle_policy_test.go | 69 +++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 94621385916d..0585d2a744fb 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -57,6 +57,11 @@ func resourceLifecyclePolicy() *schema.Resource { Required: true, ValidateFunc: verify.ValidARN, }, + "default_policy": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.DefaultPolicyTypeValues](), + }, "policy_details": { Type: schema.TypeList, Required: true, @@ -210,6 +215,11 @@ func resourceLifecyclePolicy() *schema.Resource { }, }, }, + "policy_language": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.PolicyLanguageValues](), + }, "policy_type": { Type: schema.TypeString, Optional: true, @@ -500,6 +510,10 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, Tags: getTagsIn(ctx), } + if v, ok := d.GetOk("default_policy"); ok { + input.DefaultPolicy = awstypes.DefaultPolicyTypeValues(v.(string)) + } + out, err := tfresource.RetryWhenIsA[*awstypes.InvalidRequestException](ctx, createRetryTimeout, func() (interface{}, error) { return conn.CreateLifecyclePolicy(ctx, &input) }) @@ -533,6 +547,7 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me d.Set(names.AttrARN, out.Policy.PolicyArn) d.Set(names.AttrDescription, out.Policy.Description) d.Set(names.AttrExecutionRoleARN, out.Policy.ExecutionRoleArn) + d.Set("default_policy", out.Policy.DefaultPolicy) d.Set(names.AttrState, out.Policy.State) if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails)); err != nil { return sdkdiag.AppendErrorf(diags, "setting policy details %s", err) @@ -630,6 +645,9 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { policyDetails := &awstypes.PolicyDetails{ PolicyType: awstypes.PolicyTypeValues(policyType), } + if v, ok := m["policy_language"].(string); ok { + policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) + } if v, ok := m["resource_types"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) } @@ -664,6 +682,7 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]in result[names.AttrSchedule] = flattenSchedules(policyDetails.Schedules) result["target_tags"] = flattenTags(policyDetails.TargetTags) result["policy_type"] = string(policyDetails.PolicyType) + result["policy_language"] = string(policyDetails.PolicyLanguage) if policyDetails.Parameters != nil { result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 14e1b3c4eb90..8e7454df6d6b 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -198,6 +198,48 @@ func TestAccDLMLifecyclePolicy_deprecate(t *testing.T) { }) } +func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_defaultPolicy(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), + resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), + resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_types.0", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", acctest.Ct0), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", acctest.Ct0), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.#", acctest.Ct1), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.interval", "12"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.interval_unit", "HOURS"), + resource.TestCheckResourceAttrSet(resourceName, "policy_details.0.schedule.0.create_rule.0.times.0"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.retain_rule.0.count", acctest.Ct10), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.deprecate_rule.#", acctest.Ct0), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.target_tags.tf-acc-test", acctest.CtBasic), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct0), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccDLMLifecyclePolicy_fastRestore(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_dlm_lifecycle_policy.test" @@ -641,6 +683,33 @@ resource "aws_dlm_lifecycle_policy" "test" { `) } +func testAccLifecyclePolicyConfig_defaultPolicy(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +resource "aws_dlm_lifecycle_policy" "test" { + description = "tf-acc-basic" + execution_role_arn = aws_iam_role.test.arn + default_policy = "VOLUME" + + policy_details { + resource_types = ["VOLUME"] + policy_language = "SIMPLIFIED" + + schedule { + name = "tf-acc-basic" + + create_rule { + interval = 12 + } + + retain_rule { + count = 10 + } + } + } +} +`) +} + func testAccLifecyclePolicyConfig_event(rName string) string { return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), fmt.Sprintf(` data "aws_caller_identity" "current" {} From 8cdf9b0769e96330cd4797be3d0a905afc2a2d69 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 17:01:35 +0100 Subject: [PATCH 0004/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 12 ++++++++++++ internal/service/dlm/lifecycle_policy_test.go | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 0585d2a744fb..7de981904329 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -179,6 +179,13 @@ func resourceLifecyclePolicy() *schema.Resource { }, }, }, + "resource_type": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), + ConflictsWith: []string{"resource_types"}, + RequiredWith: []string{"default_policy"}, + }, "resource_types": { Type: schema.TypeList, Optional: true, @@ -187,6 +194,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), }, + ConflictsWith: []string{"resource_type", "default_policy"}, }, "resource_locations": { Type: schema.TypeList, @@ -648,6 +656,9 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { if v, ok := m["policy_language"].(string); ok { policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) } + if v, ok := m["resource_type"].(string); ok { + policyDetails.ResourceType = awstypes.ResourceTypeValues(v) + } if v, ok := m["resource_types"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) } @@ -675,6 +686,7 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]interface{} { result := make(map[string]interface{}) + result["resource_type"] = string(policyDetails.ResourceType) result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) result[names.AttrAction] = flattenActions(policyDetails.Actions) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 8e7454df6d6b..cd47a2816def 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -217,7 +217,9 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_types.0", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "default_policy", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_language", "SIMPLIFIED"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.#", acctest.Ct1), @@ -227,8 +229,6 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "policy_details.0.schedule.0.create_rule.0.times.0"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.retain_rule.0.count", acctest.Ct10), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.deprecate_rule.#", acctest.Ct0), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.target_tags.tf-acc-test", acctest.CtBasic), - resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct0), ), }, { @@ -688,10 +688,10 @@ func testAccLifecyclePolicyConfig_defaultPolicy(rName string) string { resource "aws_dlm_lifecycle_policy" "test" { description = "tf-acc-basic" execution_role_arn = aws_iam_role.test.arn - default_policy = "VOLUME" + default_policy = "VOLUME" policy_details { - resource_types = ["VOLUME"] + resource_type = "VOLUME" policy_language = "SIMPLIFIED" schedule { From ca6cd757a006c519650f4311795d0b2adc28ccde Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 17:09:16 +0100 Subject: [PATCH 0005/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 7de981904329..6bcb64cf8eb5 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -183,7 +183,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), - ConflictsWith: []string{"resource_types"}, + ConflictsWith: []string{"policy_details.0.resource_types"}, RequiredWith: []string{"default_policy"}, }, "resource_types": { @@ -194,7 +194,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), }, - ConflictsWith: []string{"resource_type", "default_policy"}, + ConflictsWith: []string{"policy_details.0.resource_type", "default_policy"}, }, "resource_locations": { Type: schema.TypeList, From 1cd09230dfae1d08c3f00f43b09ede195047b097 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 17:38:50 +0100 Subject: [PATCH 0006/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 44 ++++++++++++++++++- internal/service/dlm/lifecycle_policy_test.go | 12 ----- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 6bcb64cf8eb5..e47476f72740 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -137,6 +137,25 @@ func resourceLifecyclePolicy() *schema.Resource { }, }, }, + "copy_tags": { + Type: schema.TypeBool, + Optional: true, + Default: false, + ConflictsWith: []string{names.AttrSchedule}, + }, + "create_interval": { + Type: schema.TypeInt, + Optional: true, + Default: 1, + ValidateFunc: validation.IntBetween(1, 7), + ConflictsWith: []string{names.AttrSchedule}, + }, + "extend_deletion": { + Type: schema.TypeBool, + Optional: true, + Default: false, + ConflictsWith: []string{names.AttrSchedule}, + }, "event_source": { Type: schema.TypeList, Optional: true, @@ -183,7 +202,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), - ConflictsWith: []string{"policy_details.0.resource_types"}, + ConflictsWith: []string{"policy_details.0.resource_types", names.AttrSchedule}, RequiredWith: []string{"default_policy"}, }, "resource_types": { @@ -206,6 +225,13 @@ func resourceLifecyclePolicy() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.ResourceLocationValues](), }, }, + "retain_interval": { + Type: schema.TypeInt, + Optional: true, + Default: 7, + ValidateFunc: validation.IntBetween(1, 7), + ConflictsWith: []string{names.AttrSchedule}, + }, names.AttrParameters: { Type: schema.TypeList, Optional: true, @@ -653,6 +679,15 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { policyDetails := &awstypes.PolicyDetails{ PolicyType: awstypes.PolicyTypeValues(policyType), } + if v, ok := m["copy_tags"].(bool); ok { + policyDetails.CopyTags = aws.Bool(v) + } + if v, ok := m["create_interval"].(int32); ok { + policyDetails.CreateInterval = aws.Int32(v) + } + if v, ok := m["extend_deletion"].(bool); ok { + policyDetails.ExtendDeletion = aws.Bool(v) + } if v, ok := m["policy_language"].(string); ok { policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) } @@ -665,6 +700,9 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { if v, ok := m["resource_locations"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) } + if v, ok := m["retain_interval"].(int32); ok { + policyDetails.RetainInterval = aws.Int32(v) + } if v, ok := m[names.AttrSchedule].([]interface{}); ok && len(v) > 0 { policyDetails.Schedules = expandSchedules(v) } @@ -686,9 +724,13 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]interface{} { result := make(map[string]interface{}) + result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) + result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) + result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) result["resource_type"] = string(policyDetails.ResourceType) result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) + result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) result[names.AttrAction] = flattenActions(policyDetails.Actions) result["event_source"] = flattenEventSource(policyDetails.EventSource) result[names.AttrSchedule] = flattenSchedules(policyDetails.Schedules) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index cd47a2816def..14caf876c30d 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -693,18 +693,6 @@ resource "aws_dlm_lifecycle_policy" "test" { policy_details { resource_type = "VOLUME" policy_language = "SIMPLIFIED" - - schedule { - name = "tf-acc-basic" - - create_rule { - interval = 12 - } - - retain_rule { - count = 10 - } - } } } `) From ece5cb447c90206cc39f2d0db6abde409e86789a Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 18:24:32 +0100 Subject: [PATCH 0007/2115] default policy --- internal/acctest/consts_gen.go | 2 ++ internal/service/dlm/lifecycle_policy.go | 22 +++++++++++-------- internal/service/dlm/lifecycle_policy_test.go | 13 +++++------ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/internal/acctest/consts_gen.go b/internal/acctest/consts_gen.go index ad1ecbeb665f..dfcd0d492d16 100644 --- a/internal/acctest/consts_gen.go +++ b/internal/acctest/consts_gen.go @@ -11,6 +11,7 @@ import ( const ( Ct0 = "0" Ct1 = "1" + Ct7 = "7" Ct10 = "10" Ct2 = "2" Ct3 = "3" @@ -56,6 +57,7 @@ func ConstOrQuote(constant string) string { allConstants := map[string]string{ "0": "Ct0", "1": "Ct1", + "7": "Ct7", "10": "Ct10", "2": "Ct2", "3": "Ct3", diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index e47476f72740..1f5e43895344 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -141,20 +141,23 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeBool, Optional: true, Default: false, - ConflictsWith: []string{names.AttrSchedule}, + ConflictsWith: []string{"policy_details.0.schedule"}, + RequiredWith: []string{"default_policy"}, }, "create_interval": { Type: schema.TypeInt, Optional: true, Default: 1, ValidateFunc: validation.IntBetween(1, 7), - ConflictsWith: []string{names.AttrSchedule}, + ConflictsWith: []string{"policy_details.0.schedule"}, + RequiredWith: []string{"default_policy"}, }, "extend_deletion": { Type: schema.TypeBool, Optional: true, Default: false, - ConflictsWith: []string{names.AttrSchedule}, + ConflictsWith: []string{"policy_details.0.schedule"}, + RequiredWith: []string{"default_policy"}, }, "event_source": { Type: schema.TypeList, @@ -202,7 +205,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), - ConflictsWith: []string{"policy_details.0.resource_types", names.AttrSchedule}, + ConflictsWith: []string{"policy_details.0.resource_types", "policy_details.0.schedule"}, RequiredWith: []string{"default_policy"}, }, "resource_types": { @@ -230,7 +233,8 @@ func resourceLifecyclePolicy() *schema.Resource { Optional: true, Default: 7, ValidateFunc: validation.IntBetween(1, 7), - ConflictsWith: []string{names.AttrSchedule}, + ConflictsWith: []string{"policy_details.0.schedule"}, + RequiredWith: []string{"default_policy"}, }, names.AttrParameters: { Type: schema.TypeList, @@ -682,8 +686,8 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { if v, ok := m["copy_tags"].(bool); ok { policyDetails.CopyTags = aws.Bool(v) } - if v, ok := m["create_interval"].(int32); ok { - policyDetails.CreateInterval = aws.Int32(v) + if v, ok := m["create_interval"].(int); ok { + policyDetails.CreateInterval = aws.Int32(int32(v)) } if v, ok := m["extend_deletion"].(bool); ok { policyDetails.ExtendDeletion = aws.Bool(v) @@ -700,8 +704,8 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { if v, ok := m["resource_locations"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) } - if v, ok := m["retain_interval"].(int32); ok { - policyDetails.RetainInterval = aws.Int32(v) + if v, ok := m["retain_interval"].(int); ok { + policyDetails.RetainInterval = aws.Int32(int32(v)) } if v, ok := m[names.AttrSchedule].([]interface{}); ok && len(v) > 0 { policyDetails.Schedules = expandSchedules(v) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 14caf876c30d..53ffd74f89e1 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -217,18 +217,14 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), - resource.TestCheckResourceAttr(resourceName, "default_policy", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.copy_tags", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", acctest.Ct1), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.extend_deletion", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", acctest.Ct7), resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_language", "SIMPLIFIED"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", acctest.Ct0), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.#", acctest.Ct1), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.interval", "12"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.interval_unit", "HOURS"), - resource.TestCheckResourceAttrSet(resourceName, "policy_details.0.schedule.0.create_rule.0.times.0"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.retain_rule.0.count", acctest.Ct10), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.deprecate_rule.#", acctest.Ct0), ), }, { @@ -691,6 +687,7 @@ resource "aws_dlm_lifecycle_policy" "test" { default_policy = "VOLUME" policy_details { + create_interval = 5 resource_type = "VOLUME" policy_language = "SIMPLIFIED" } From f4b1c57edde0a5ec116adca27f2c83be1a85819d Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 19:56:48 +0100 Subject: [PATCH 0008/2115] default policy --- internal/acctest/consts_gen.go | 2 + internal/service/dlm/lifecycle_policy.go | 58 +++++++++++-------- internal/service/dlm/lifecycle_policy_test.go | 3 +- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/internal/acctest/consts_gen.go b/internal/acctest/consts_gen.go index dfcd0d492d16..6ab4a1759861 100644 --- a/internal/acctest/consts_gen.go +++ b/internal/acctest/consts_gen.go @@ -11,6 +11,7 @@ import ( const ( Ct0 = "0" Ct1 = "1" + Ct5 = "5" Ct7 = "7" Ct10 = "10" Ct2 = "2" @@ -57,6 +58,7 @@ func ConstOrQuote(constant string) string { allConstants := map[string]string{ "0": "Ct0", "1": "Ct1", + "5": "Ct5", "7": "Ct7", "10": "Ct10", "2": "Ct2", diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 1f5e43895344..cae9805da0a6 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -256,6 +256,7 @@ func resourceLifecyclePolicy() *schema.Resource { "policy_language": { Type: schema.TypeString, Optional: true, + Computed: true, ValidateDiagFunc: enum.Validate[awstypes.PolicyLanguageValues](), }, "policy_type": { @@ -543,7 +544,7 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, input := dlm.CreateLifecyclePolicyInput{ Description: aws.String(d.Get(names.AttrDescription).(string)), ExecutionRoleArn: aws.String(d.Get(names.AttrExecutionRoleARN).(string)), - PolicyDetails: expandPolicyDetails(d.Get("policy_details").([]interface{})), + PolicyDetails: expandPolicyDetails(d.Get("policy_details").([]interface{}), d.Get("default_policy").(string)), State: awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)), Tags: getTagsIn(ctx), } @@ -585,9 +586,11 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me d.Set(names.AttrARN, out.Policy.PolicyArn) d.Set(names.AttrDescription, out.Policy.Description) d.Set(names.AttrExecutionRoleARN, out.Policy.ExecutionRoleArn) - d.Set("default_policy", out.Policy.DefaultPolicy) d.Set(names.AttrState, out.Policy.State) - if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails)); err != nil { + if aws.ToBool(out.Policy.DefaultPolicy) { + d.Set("default_policy", d.Get("default_policy").(string)) + } + if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails, aws.ToBool(out.Policy.DefaultPolicy))); err != nil { return sdkdiag.AppendErrorf(diags, "setting policy details %s", err) } @@ -615,7 +618,7 @@ func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, input.State = awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)) } if d.HasChange("policy_details") { - input.PolicyDetails = expandPolicyDetails(d.Get("policy_details").([]interface{})) + input.PolicyDetails = expandPolicyDetails(d.Get("policy_details").([]interface{}), d.Get("default_policy").(string)) } log.Printf("[INFO] Updating lifecycle policy %s", d.Id()) @@ -673,7 +676,7 @@ func findLifecyclePolicyByID(ctx context.Context, conn *dlm.Client, id string) ( return output, nil } -func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { +func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes.PolicyDetails { if len(cfg) == 0 || cfg[0] == nil { return nil } @@ -683,30 +686,32 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { policyDetails := &awstypes.PolicyDetails{ PolicyType: awstypes.PolicyTypeValues(policyType), } - if v, ok := m["copy_tags"].(bool); ok { - policyDetails.CopyTags = aws.Bool(v) - } - if v, ok := m["create_interval"].(int); ok { - policyDetails.CreateInterval = aws.Int32(int32(v)) - } - if v, ok := m["extend_deletion"].(bool); ok { - policyDetails.ExtendDeletion = aws.Bool(v) + if defaultPolicyValue != "" { + if v, ok := m["copy_tags"].(bool); ok { + policyDetails.CopyTags = aws.Bool(v) + } + if v, ok := m["create_interval"].(int); ok { + policyDetails.CreateInterval = aws.Int32(int32(v)) + } + if v, ok := m["extend_deletion"].(bool); ok { + policyDetails.ExtendDeletion = aws.Bool(v) + } + if v, ok := m["resource_type"].(string); ok { + policyDetails.ResourceType = awstypes.ResourceTypeValues(v) + } + if v, ok := m["retain_interval"].(int); ok { + policyDetails.RetainInterval = aws.Int32(int32(v)) + } } if v, ok := m["policy_language"].(string); ok { policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) } - if v, ok := m["resource_type"].(string); ok { - policyDetails.ResourceType = awstypes.ResourceTypeValues(v) - } if v, ok := m["resource_types"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) } if v, ok := m["resource_locations"].([]interface{}); ok && len(v) > 0 { policyDetails.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) } - if v, ok := m["retain_interval"].(int); ok { - policyDetails.RetainInterval = aws.Int32(int32(v)) - } if v, ok := m[names.AttrSchedule].([]interface{}); ok && len(v) > 0 { policyDetails.Schedules = expandSchedules(v) } @@ -726,15 +731,10 @@ func expandPolicyDetails(cfg []interface{}) *awstypes.PolicyDetails { return policyDetails } -func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]interface{} { +func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails, defaultPolicyValue bool) []map[string]interface{} { result := make(map[string]interface{}) - result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) - result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) - result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) - result["resource_type"] = string(policyDetails.ResourceType) result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) - result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) result[names.AttrAction] = flattenActions(policyDetails.Actions) result["event_source"] = flattenEventSource(policyDetails.EventSource) result[names.AttrSchedule] = flattenSchedules(policyDetails.Schedules) @@ -742,6 +742,14 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]in result["policy_type"] = string(policyDetails.PolicyType) result["policy_language"] = string(policyDetails.PolicyLanguage) + if defaultPolicyValue { + } + result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) + result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) + result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) + result["resource_type"] = string(policyDetails.ResourceType) + result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) + if policyDetails.Parameters != nil { result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) } diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 53ffd74f89e1..369df64fe3d4 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -217,8 +217,9 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), + resource.TestCheckResourceAttr(resourceName, "default_policy", "VOLUME"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.copy_tags", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", acctest.Ct1), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", acctest.Ct5), resource.TestCheckResourceAttr(resourceName, "policy_details.0.extend_deletion", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", acctest.Ct7), From 0e16185a98e9a2886299c7f46cfa2236ebfd62be Mon Sep 17 00:00:00 2001 From: nikhil Date: Sat, 1 Jun 2024 21:41:04 +0100 Subject: [PATCH 0009/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 9 ++++++--- internal/service/dlm/lifecycle_policy_test.go | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index cae9805da0a6..47e2c1677d25 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -588,7 +588,7 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me d.Set(names.AttrExecutionRoleARN, out.Policy.ExecutionRoleArn) d.Set(names.AttrState, out.Policy.State) if aws.ToBool(out.Policy.DefaultPolicy) { - d.Set("default_policy", d.Get("default_policy").(string)) + d.Set("default_policy", d.Get("default_policy")) } if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails, aws.ToBool(out.Policy.DefaultPolicy))); err != nil { return sdkdiag.AppendErrorf(diags, "setting policy details %s", err) @@ -743,12 +743,15 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails, defaultPolicyVa result["policy_language"] = string(policyDetails.PolicyLanguage) if defaultPolicyValue { + result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) + result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) + } else { + result["create_interval"] = 0 + result["retain_interval"] = 0 } result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) - result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) result["resource_type"] = string(policyDetails.ResourceType) - result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) if policyDetails.Parameters != nil { result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 369df64fe3d4..bcb6b41c9c54 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -229,9 +229,10 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"default_policy"}, }, }, }) From 9af5a0eb8f812c80125e1352ed35d13810d4094d Mon Sep 17 00:00:00 2001 From: nikhil Date: Sun, 2 Jun 2024 12:12:23 +0100 Subject: [PATCH 0010/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 30 ++++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 47e2c1677d25..a81978d47f45 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -151,6 +151,14 @@ func resourceLifecyclePolicy() *schema.Resource { ValidateFunc: validation.IntBetween(1, 7), ConflictsWith: []string{"policy_details.0.schedule"}, RequiredWith: []string{"default_policy"}, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if d.Get("default_policy").(string) == "" { + if old == "0" && new == "1" { + return true + } + } + return false + }, }, "extend_deletion": { Type: schema.TypeBool, @@ -235,6 +243,14 @@ func resourceLifecyclePolicy() *schema.Resource { ValidateFunc: validation.IntBetween(1, 7), ConflictsWith: []string{"policy_details.0.schedule"}, RequiredWith: []string{"default_policy"}, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if d.Get("default_policy").(string) == "" { + if old == "0" && new == "7" { + return true + } + } + return false + }, }, names.AttrParameters: { Type: schema.TypeList, @@ -590,7 +606,7 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me if aws.ToBool(out.Policy.DefaultPolicy) { d.Set("default_policy", d.Get("default_policy")) } - if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails, aws.ToBool(out.Policy.DefaultPolicy))); err != nil { + if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails)); err != nil { return sdkdiag.AppendErrorf(diags, "setting policy details %s", err) } @@ -731,7 +747,7 @@ func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes return policyDetails } -func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails, defaultPolicyValue bool) []map[string]interface{} { +func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]interface{} { result := make(map[string]interface{}) result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) @@ -741,14 +757,8 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails, defaultPolicyVa result["target_tags"] = flattenTags(policyDetails.TargetTags) result["policy_type"] = string(policyDetails.PolicyType) result["policy_language"] = string(policyDetails.PolicyLanguage) - - if defaultPolicyValue { - result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) - result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) - } else { - result["create_interval"] = 0 - result["retain_interval"] = 0 - } + result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) + result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) result["resource_type"] = string(policyDetails.ResourceType) From c8b23efad2c3bcc5bcabf3208ca92c2184e16131 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sun, 2 Jun 2024 12:32:13 +0100 Subject: [PATCH 0011/2115] default policy --- internal/service/dlm/lifecycle_policy.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index a81978d47f45..5c710eb261dc 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -209,7 +209,7 @@ func resourceLifecyclePolicy() *schema.Resource { }, }, }, - "resource_type": { + names.AttrResourceType: { Type: schema.TypeString, Optional: true, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), @@ -712,7 +712,7 @@ func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes if v, ok := m["extend_deletion"].(bool); ok { policyDetails.ExtendDeletion = aws.Bool(v) } - if v, ok := m["resource_type"].(string); ok { + if v, ok := m[names.AttrResourceType].(string); ok { policyDetails.ResourceType = awstypes.ResourceTypeValues(v) } if v, ok := m["retain_interval"].(int); ok { @@ -761,7 +761,7 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]in result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) - result["resource_type"] = string(policyDetails.ResourceType) + result[names.AttrResourceType] = string(policyDetails.ResourceType) if policyDetails.Parameters != nil { result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) From 89cabff4d1c9d0b16f98c429e49d9f4330a86c74 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sun, 2 Jun 2024 13:17:40 +0100 Subject: [PATCH 0012/2115] default policy --- .changelog/37796.txt | 27 +++++++++++++++++++ internal/service/dlm/lifecycle_policy.go | 2 +- .../docs/r/dlm_lifecycle_policy.html.markdown | 7 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .changelog/37796.txt diff --git a/.changelog/37796.txt b/.changelog/37796.txt new file mode 100644 index 000000000000..39558d77faee --- /dev/null +++ b/.changelog/37796.txt @@ -0,0 +1,27 @@ +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `default_policy` argument +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `copy_tags` argument to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `create_interval` argument to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `extend_deletion` argument to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `resource_type` argument to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `retain_interval` argument to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `policy_language` argument to `policy_details` +``` \ No newline at end of file diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 5c710eb261dc..623eb7e092da 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -240,7 +240,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeInt, Optional: true, Default: 7, - ValidateFunc: validation.IntBetween(1, 7), + ValidateFunc: validation.IntBetween(2, 14), ConflictsWith: []string{"policy_details.0.schedule"}, RequiredWith: []string{"default_policy"}, DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index 6c66dd1f20e5..876fd4148364 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -222,6 +222,7 @@ This resource supports the following arguments: * `description` - (Required) A description for the DLM lifecycle policy. * `execution_role_arn` - (Required) The ARN of an IAM role that is able to be assumed by the DLM service. +* `default_policy` - (Required) Specify the type of default policy to create. valid values are `VOLUME` or `INSTANCE`. * `policy_details` - (Required) See the [`policy_details` configuration](#policy-details-arguments) block. Max of 1. * `state` - (Optional) Whether the lifecycle policy should be enabled or disabled. `ENABLED` or `DISABLED` are valid values. Defaults to `ENABLED`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -229,9 +230,15 @@ This resource supports the following arguments: #### Policy Details arguments * `action` - (Optional) The actions to be performed when the event-based policy is triggered. You can specify only one action per policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`action` configuration](#action-arguments) block. +* `copy_tags` - (Optional, Default policies only) Indicates whether the policy should copy tags from the source resource to the snapshot or AMI. Default value is `false`. +* `create_interval` - (Optional, Default policies only) How often the policy should run and create snapshots or AMIs. valid values range from `1` to `7`. Default value is `1`. +* `extend_deletion` - (Optional, Default policies only) snapshot or AMI retention behavior for the policy if the source volume or instance is deleted, or if the policy enters the error, disabled, or deleted state. Default value is `false`. +* `retain_interval` - (Optional, Default policies only) Specifies how long the policy should retain snapshots or AMIs before deleting them. valid values range from `2` to `14`. Default value is `7`. * `event_source` - (Optional) The event that triggers the event-based policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`event_source` configuration](#event-source-arguments) block. +* `resource_type` - (Optional, Default policies only) Type of default policy to create. Valid values are `VOLUME` and `INSTANCE`. * `resource_types` - (Optional) A list of resource types that should be targeted by the lifecycle policy. Valid values are `VOLUME` and `INSTANCE`. * `resource_locations` - (Optional) The location of the resources to backup. If the source resources are located in an AWS Region, specify `CLOUD`. If the source resources are located on an Outpost in your account, specify `OUTPOST`. If you specify `OUTPOST`, Amazon Data Lifecycle Manager backs up all resources of the specified type with matching target tags across all of the Outposts in your account. Valid values are `CLOUD` and `OUTPOST`. +* `policy_language` - (Optional) Type of policy to create. `SIMPLIFIED` To create a default policy. `STANDARD` To create a custom policy. * `policy_type` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. From 975bdd7313ff4a343a94ed9c66254e1e9d7076c0 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sun, 2 Jun 2024 13:39:06 +0100 Subject: [PATCH 0013/2115] default policy --- internal/acctest/consts_gen.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/acctest/consts_gen.go b/internal/acctest/consts_gen.go index 6ab4a1759861..ad1ecbeb665f 100644 --- a/internal/acctest/consts_gen.go +++ b/internal/acctest/consts_gen.go @@ -11,8 +11,6 @@ import ( const ( Ct0 = "0" Ct1 = "1" - Ct5 = "5" - Ct7 = "7" Ct10 = "10" Ct2 = "2" Ct3 = "3" @@ -58,8 +56,6 @@ func ConstOrQuote(constant string) string { allConstants := map[string]string{ "0": "Ct0", "1": "Ct1", - "5": "Ct5", - "7": "Ct7", "10": "Ct10", "2": "Ct2", "3": "Ct3", From e08c62c0ff8354215601646c856d889b6bf667b0 Mon Sep 17 00:00:00 2001 From: nikhil Date: Sun, 2 Jun 2024 14:11:36 +0100 Subject: [PATCH 0014/2115] default policy --- internal/service/dlm/lifecycle_policy_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index bcb6b41c9c54..083819b2b0bb 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -219,10 +219,10 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), resource.TestCheckResourceAttr(resourceName, "default_policy", "VOLUME"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.copy_tags", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", acctest.Ct5), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", "5"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.extend_deletion", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", acctest.Ct7), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", "7"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_language", "SIMPLIFIED"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", acctest.Ct0), From 80b5318546994a4da831929255076d0764423077 Mon Sep 17 00:00:00 2001 From: James Collins Date: Thu, 25 Jul 2024 00:06:10 +0100 Subject: [PATCH 0015/2115] fix(ec2_instance): adding placement_group_id to aws_instance resource --- internal/service/ec2/ec2_instance.go | 17 +++++- .../service/ec2/ec2_instance_data_source.go | 4 ++ internal/service/ec2/ec2_instance_test.go | 59 ++++++++++++++++++- 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 2b343e9de825..934e389ad18b 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -380,7 +380,7 @@ func resourceInstance() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ConflictsWith: []string{"placement_group"}, + ConflictsWith: []string{"placement_group", "placement_group_id"}, }, "iam_instance_profile": { Type: schema.TypeString, @@ -630,7 +630,14 @@ func resourceInstance() *schema.Resource { Optional: true, Computed: true, ForceNew: true, - ConflictsWith: []string{"host_resource_group_arn"}, + ConflictsWith: []string{"host_resource_group_arn", "placement_group_id"}, + }, + "placement_group_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ConflictsWith: []string{"host_resource_group_arn", "placement_group"}, }, "placement_partition_number": { Type: schema.TypeInt, @@ -2989,6 +2996,12 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta interfa opts.SpotPlacement.GroupName = aws.String(v.(string)) } + if v, ok := d.GetOk("placement_group_id"); ok && (instanceInterruptionBehavior == "" || instanceInterruptionBehavior == string(awstypes.InstanceInterruptionBehaviorTerminate)) { + opts.Placement.GroupId = aws.String(v.(string)) + // AWS SDK missing groupID in type for spotplacement + // opts.SpotPlacement.GroupId = aws.String(v.(string)) + } + if v, ok := d.GetOk("tenancy"); ok { opts.Placement.Tenancy = awstypes.Tenancy(v.(string)) } diff --git a/internal/service/ec2/ec2_instance_data_source.go b/internal/service/ec2/ec2_instance_data_source.go index a54464eba6cf..0b330afeeba7 100644 --- a/internal/service/ec2/ec2_instance_data_source.go +++ b/internal/service/ec2/ec2_instance_data_source.go @@ -274,6 +274,10 @@ func dataSourceInstance() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "placement_group_id": { + Type: schema.TypeString, + Computed: true, + }, "placement_partition_number": { Type: schema.TypeInt, Computed: true, diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index b56b2ae1712b..de95e4025866 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -1148,7 +1148,7 @@ func TestAccEC2Instance_placementGroup(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_placementGroup(rName), + Config: testAccInstanceConfig_placementGroupId(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "placement_group", rName), @@ -1164,6 +1164,35 @@ func TestAccEC2Instance_placementGroup(t *testing.T) { }) } +func TestAccEC2Instance_placementGroupId(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.Instance + resourceName := "aws_instance.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckInstanceDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_placementGroupId(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "placement_group_id", rName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"user_data_replace_on_change"}, + }, + }, + }) +} + func TestAccEC2Instance_placementPartitionNumber(t *testing.T) { ctx := acctest.Context(t) var v awstypes.Instance @@ -6610,6 +6639,34 @@ resource "aws_instance" "test" { `, rName)) } +func testAccInstanceConfig_placementGroupId(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceVPCConfig(rName, false, 0), + fmt.Sprintf(` +resource "aws_placement_group" "test" { + name = %[1]q + strategy = "cluster" +} + +# Limitations: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html#concepts-placement-groups +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "c5.large" + subnet_id = aws_subnet.test.id + associate_public_ip_address = true + placement_group_id = aws_placement_group.test.placement_group_id + + # pre-encoded base64 data + user_data = "3dc39dda39be1205215e776bad998da361a5955d" + + tags = { + Name = %[1]q + } +} +`, rName)) +} + func testAccInstanceConfig_placementPartitionNumber(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), From 6b134b6f6337adfc750c93a830bad2ed57ab3c84 Mon Sep 17 00:00:00 2001 From: Gabe <1342gr@gmail.com> Date: Thu, 11 Jul 2024 14:26:12 +0200 Subject: [PATCH 0016/2115] Rmove card index from spot instance request For ec2 spot instance reqeusts network_interface_card_index is not allowed in network_interface. Thus it is removed from the schema. --- internal/service/ec2/ec2_instance.go | 4 +++- internal/service/ec2/ec2_spot_instance_request.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 2b343e9de825..646601435603 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -2531,10 +2531,12 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfa ini := v.(map[string]interface{}) ni := awstypes.InstanceNetworkInterfaceSpecification{ DeviceIndex: aws.Int32(int32(ini["device_index"].(int))), - NetworkCardIndex: aws.Int32(int32(ini["network_card_index"].(int))), NetworkInterfaceId: aws.String(ini[names.AttrNetworkInterfaceID].(string)), DeleteOnTermination: aws.Bool(ini[names.AttrDeleteOnTermination].(bool)), } + if nci, ok := ini["network_card_index"]; ok { + ni.NetworkCardIndex = aws.Int32(int32(nci.(int))) + } networkInterfaces = append(networkInterfaces, ni) } } diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index 03845f7ddaa0..6eb0c53ceec3 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -141,6 +141,8 @@ func resourceSpotInstanceRequest() *schema.Resource { Default: false, } + delete(s["network_interface"].Elem.(*schema.Resource).Schema, "network_card_index") + return s }(), From 5d2e1b1fefdd7e489628c91939a29a916836b34e Mon Sep 17 00:00:00 2001 From: Gabe <1342gr@gmail.com> Date: Wed, 24 Jul 2024 14:00:51 +0200 Subject: [PATCH 0017/2115] Add tests for primary network interface in spot instance request --- .../ec2/ec2_spot_instance_request_test.go | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/internal/service/ec2/ec2_spot_instance_request_test.go b/internal/service/ec2/ec2_spot_instance_request_test.go index 0f9178e48cc4..bca7a1153d82 100644 --- a/internal/service/ec2/ec2_spot_instance_request_test.go +++ b/internal/service/ec2/ec2_spot_instance_request_test.go @@ -351,6 +351,39 @@ func TestAccEC2SpotInstanceRequest_networkInterfaceAttributes(t *testing.T) { }) } +func TestAccEC2SpotInstanceRequest_primaryNetworkInterface(t *testing.T) { + ctx := acctest.Context(t) + var sir awstypes.SpotInstanceRequest + resourceName := "aws_spot_instance_request.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSpotInstanceRequestDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSpotInstanceRequestConfig_primaryNetworkInterface(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSpotInstanceRequestExists(ctx, resourceName, &sir), + testAccCheckSpotInstanceRequest_InstanceAttributes(ctx, &sir, rName), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", acctest.Ct1), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "network_interface.*", map[string]string{ + "device_index": acctest.Ct0, + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change", "wait_for_fulfillment"}, + }, + }, + }) +} + func TestAccEC2SpotInstanceRequest_getPasswordData(t *testing.T) { ctx := acctest.Context(t) var sir awstypes.SpotInstanceRequest @@ -956,6 +989,74 @@ resource "aws_ec2_tag" "test" { `, rName)) } +func testAccSpotInstanceRequestConfig_primaryNetworkInterface(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigAvailableAZsNoOptIn(), + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + fmt.Sprintf(` +resource "aws_spot_instance_request" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = data.aws_ec2_instance_type_offering.available.instance_type + spot_price = "0.05" + wait_for_fulfillment = true + network_interface { + network_interface_id = aws_network_interface.test.id + device_index = 0 + } + + tags = { + Name = %[1]q + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + enable_dns_hostnames = true + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + availability_zone = data.aws_availability_zones.available.names[0] + vpc_id = aws_vpc.test.id + cidr_block = "10.0.0.0/24" + map_public_ip_on_launch = true + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "test" { + subnet_id = aws_subnet.test.id + private_ips = [ "10.0.0.100" ] + security_groups = [ aws_security_group.test.id ] + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + name = %[1]q + vpc_id = aws_vpc.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_ec2_tag" "test" { + resource_id = aws_spot_instance_request.test.spot_instance_id + key = "Name" + value = %[1]q +} +`, rName)) +} + func testAccSpotInstanceRequestConfig_getPasswordData(rName, publicKey string) string { return acctest.ConfigCompose( testAccLatestWindowsServer2016CoreAMIConfig(), From b6129cf1306880d334f42844905ec68f6cb4e9a6 Mon Sep 17 00:00:00 2001 From: Steven Kalt Date: Thu, 14 Nov 2024 11:21:11 -0500 Subject: [PATCH 0018/2115] fix(batch): allow updating compute environments that use the SPOT_PRICE_CAPACITY_OPTIMIZED allocation strategy. While I was developing this fix, I noticed that the update_policy was computed, and had to update the resource schema with the defaults from the API to get my tests to pass. --- internal/service/batch/compute_environment.go | 14 +++- .../service/batch/compute_environment_test.go | 83 +++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go index 288ba4685b7c..17159ddfcafe 100644 --- a/internal/service/batch/compute_environment.go +++ b/internal/service/batch/compute_environment.go @@ -259,17 +259,21 @@ func resourceComputeEnvironment() *schema.Resource { "update_policy": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ + // https://docs.aws.amazon.com/batch/latest/APIReference/API_UpdatePolicy.html Schema: map[string]*schema.Schema{ "job_execution_timeout_minutes": { Type: schema.TypeInt, - Required: true, + Optional: true, + Default: 30, ValidateFunc: validation.IntBetween(1, 360), }, "terminate_jobs_on_update": { Type: schema.TypeBool, - Required: true, + Optional: true, + Default: false, }, }, }, @@ -858,7 +862,11 @@ func isUpdatableAllocationStrategyDiff(diff *schema.ResourceDiff) bool { } func isUpdatableAllocationStrategy(allocationStrategy awstypes.CRAllocationStrategy) bool { - return allocationStrategy == awstypes.CRAllocationStrategyBestFitProgressive || allocationStrategy == awstypes.CRAllocationStrategySpotCapacityOptimized + switch allocationStrategy { + case awstypes.CRAllocationStrategyBestFitProgressive, awstypes.CRAllocationStrategySpotCapacityOptimized, awstypes.CRAllocationStrategySpotPriceCapacityOptimized: + return true + } + return false } func expandComputeResource(ctx context.Context, tfMap map[string]interface{}) *awstypes.ComputeResource { diff --git a/internal/service/batch/compute_environment_test.go b/internal/service/batch/compute_environment_test.go index 93943799861e..34465c7fb53d 100644 --- a/internal/service/batch/compute_environment_test.go +++ b/internal/service/batch/compute_environment_test.go @@ -16,6 +16,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -1825,6 +1826,47 @@ func TestAccBatchComputeEnvironment_createEC2WithoutComputeResources(t *testing. }) } +func TestAccBatchComputeEnvironment_updateInstanceTypeWithAllocationStrategy(t *testing.T) { + ctx := acctest.Context(t) + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + publicKey, _, err := sdkacctest.RandSSHKeyPair(acctest.DefaultEmailAddress) + if err != nil { + t.Fatalf("error generating random SSH key: %s", err) + } + + resourceName := "aws_batch_compute_environment.test" + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.BatchServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckComputeEnvironmentDestroy(ctx), + Steps: []resource.TestStep{ + { // set up a basic compute environment with the SPOT_PRICE_CAPACITY_OPTIMIZED allocation strategy + Config: testAccComputeEnvironmentConfig_spotCapacityOptimizedAllocationInstanceTypeUpdate(rName, publicKey, "m7i"), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "SPOT_PRICE_CAPACITY_OPTIMIZED"), + resource.TestCheckResourceAttr(resourceName, "compute_resources.0.instance_type.#", "1"), + resource.TestCheckTypeSetElemAttr(resourceName, "compute_resources.0.instance_type.*", "m7i"), + ), + }, + { + Config: testAccComputeEnvironmentConfig_spotCapacityOptimizedAllocationInstanceTypeUpdate(rName, publicKey, "r7i"), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "SPOT_PRICE_CAPACITY_OPTIMIZED"), + resource.TestCheckResourceAttr(resourceName, "compute_resources.0.instance_type.#", "1"), + resource.TestCheckTypeSetElemAttr(resourceName, "compute_resources.0.instance_type.*", "r7i"), + ), + }, + }}) +} + func testAccCheckComputeEnvironmentDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).BatchClient(ctx) @@ -3136,3 +3178,44 @@ resource "aws_batch_compute_environment" "test" { } `, rName)) } + +func testAccComputeEnvironmentConfig_spotCapacityOptimizedAllocationInstanceTypeUpdate(rName, publicKey, instanceType string) string { + return acctest.ConfigCompose( + testAccComputeEnvironmentConfig_base(rName), + testAccComputeEnvironmentConfig_baseForUpdates(rName, publicKey), + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + fmt.Sprintf(` +resource "aws_batch_compute_environment" "test" { + compute_environment_name = %[1]q + + compute_resources { + allocation_strategy = "SPOT_PRICE_CAPACITY_OPTIMIZED" + bid_percentage = 100 + ec2_key_pair = aws_key_pair.test.id + instance_role = aws_iam_instance_profile.ecs_instance_2.arn + ec2_configuration { + image_id_override = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + image_type = "ECS_AL2" + } + launch_template { + launch_template_id = aws_launch_template.test.id + version = "$Latest" + } + instance_type = [ + %[2]q, + ] + max_vcpus = 16 + security_group_ids = [ + aws_security_group.test_2.id + ] + spot_iam_fleet_role = aws_iam_role.ec2_spot_fleet.arn + subnets = [ + aws_subnet.test_2.id + ] + type = "SPOT" + } + + type = "MANAGED" +} +`, rName, instanceType)) +} From 95850045916a6bdde5f3975bb86bde76df093ed0 Mon Sep 17 00:00:00 2001 From: Steven Kalt Date: Mon, 18 Nov 2024 08:47:17 -0500 Subject: [PATCH 0019/2115] chore(batch): add changelog entry for compute environment fix --- .changelog/40148.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/40148.md diff --git a/.changelog/40148.md b/.changelog/40148.md new file mode 100644 index 000000000000..8e4a71eb276b --- /dev/null +++ b/.changelog/40148.md @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_batch_compute_environment: allow in-place updates of compute environments that have the SPOT_PRICE_CAPACITY_OPTIMIZED strategy +``` From 40615ea0b2866c81de66eaf73bdbaeb601ea1cee Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Tue, 21 Jan 2025 11:49:01 +1100 Subject: [PATCH 0020/2115] WIP --- internal/service/dlm/lifecycle_policy.go | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 86df105b82fd..66acda18490a 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -257,6 +257,56 @@ func resourceLifecyclePolicy() *schema.Resource { Computed: true, ValidateDiagFunc: enum.Validate[awstypes.LocationValues](), }, + "scripts": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "execute_operation_on_script_failure": { + Type: schema.TypeBool, + Computed: true, + Optional: true, + }, + "execution_handler": { + Type: schema.TypeString, + Computed: true, + Required: true, + ValidateFunc: validation.All( + validation.StringLenBetween(0, 200), + validation.StringMatch(regexache.MustCompile("^([a-zA-Z0-9_\\-.]{3,128}|[a-zA-Z0-9_\\-.:/]{3,200}|[A-Z0-9_]+)$"), "see https://docs.aws.amazon.com/dlm/latest/APIReference/API_Action.html"), + ), + }, + "execution_handler_service":{ + Type: schema.TypeString, + Computed: true, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.ExecutionHandlerServiceValues](), + }, + "execution_timeout": { + Type: schema.TypeInt, + Computed: true, + Optional: true, + ValidateFunc: validation.IntBetween(1, 120), + }, + "maximum_retry_count": { + Type: schema.TypeInt, + Computed: true, + Optional: true, + ValidateFunc: validation.IntBetween(1, 3), + }, + "stages": { + Type: schema.TypeList, + Optional: true, + MinItems: 1, + MaxItems: 2, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateDiagFunc: enum.Validate[awstypes.StageValues](), + }, + }, + }, + }, "times": { Type: schema.TypeList, Optional: true, From 8236dc4a7789f4af8f8be0067938f91ae3e201a3 Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Wed, 22 Jan 2025 21:24:03 +1100 Subject: [PATCH 0021/2115] fixed schema --- internal/service/dlm/lifecycle_policy.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 66acda18490a..1b0986254dfa 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -303,7 +303,8 @@ func resourceLifecyclePolicy() *schema.Resource { Elem: &schema.Schema{ Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.StageValues](), - }, + }, + }, }, }, }, @@ -530,7 +531,7 @@ func resourceLifecyclePolicy() *schema.Resource { }, CustomizeDiff: verify.SetTagsDiff, - } + }, } const ( From 643f55417d3dab24436424a9959d4eec907b5e13 Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Wed, 22 Jan 2025 21:31:13 +1100 Subject: [PATCH 0022/2115] fixed schema --- internal/service/dlm/lifecycle_policy.go | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 1b0986254dfa..fc5f2d35f526 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -265,34 +265,34 @@ func resourceLifecyclePolicy() *schema.Resource { Schema: map[string]*schema.Schema{ "execute_operation_on_script_failure": { Type: schema.TypeBool, - Computed: true, - Optional: true, + Computed: true, + Optional: true, }, "execution_handler": { Type: schema.TypeString, - Computed: true, + Computed: true, Required: true, ValidateFunc: validation.All( validation.StringLenBetween(0, 200), validation.StringMatch(regexache.MustCompile("^([a-zA-Z0-9_\\-.]{3,128}|[a-zA-Z0-9_\\-.:/]{3,200}|[A-Z0-9_]+)$"), "see https://docs.aws.amazon.com/dlm/latest/APIReference/API_Action.html"), ), }, - "execution_handler_service":{ - Type: schema.TypeString, - Computed: true, - Optional: true, + "execution_handler_service": { + Type: schema.TypeString, + Computed: true, + Optional: true, ValidateDiagFunc: enum.Validate[awstypes.ExecutionHandlerServiceValues](), }, "execution_timeout": { - Type: schema.TypeInt, - Computed: true, - Optional: true, + Type: schema.TypeInt, + Computed: true, + Optional: true, ValidateFunc: validation.IntBetween(1, 120), }, "maximum_retry_count": { - Type: schema.TypeInt, - Computed: true, - Optional: true, + Type: schema.TypeInt, + Computed: true, + Optional: true, ValidateFunc: validation.IntBetween(1, 3), }, "stages": { @@ -304,7 +304,7 @@ func resourceLifecyclePolicy() *schema.Resource { Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.StageValues](), }, - }, + }, }, }, }, @@ -531,7 +531,7 @@ func resourceLifecyclePolicy() *schema.Resource { }, CustomizeDiff: verify.SetTagsDiff, - }, + } } const ( From 15cb7a2e3227ae486e7b41bcafc6848914ddf559 Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Wed, 22 Jan 2025 23:20:57 +1100 Subject: [PATCH 0023/2115] updated resource_types to be required --- .changelog/37796.txt | 27 --- internal/service/dlm/lifecycle_policy.go | 59 +++++- internal/service/dlm/lifecycle_policy_test.go | 200 +++++++++++++++++- 3 files changed, 251 insertions(+), 35 deletions(-) delete mode 100644 .changelog/37796.txt diff --git a/.changelog/37796.txt b/.changelog/37796.txt deleted file mode 100644 index 39558d77faee..000000000000 --- a/.changelog/37796.txt +++ /dev/null @@ -1,27 +0,0 @@ -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `default_policy` argument -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `copy_tags` argument to `policy_details` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `create_interval` argument to `policy_details` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `extend_deletion` argument to `policy_details` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `resource_type` argument to `policy_details` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `retain_interval` argument to `policy_details` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `policy_language` argument to `policy_details` -``` \ No newline at end of file diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 3047dbe68f7b..ca0ee529496a 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -218,8 +218,7 @@ func resourceLifecyclePolicy() *schema.Resource { }, "resource_types": { Type: schema.TypeList, - Optional: true, - MaxItems: 1, + Required: true, Elem: &schema.Schema{ Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), @@ -335,7 +334,6 @@ func resourceLifecyclePolicy() *schema.Resource { }, "execution_handler": { Type: schema.TypeString, - Computed: true, Required: true, ValidateFunc: validation.All( validation.StringLenBetween(0, 200), @@ -1212,7 +1210,9 @@ func expandCreateRule(cfg []interface{}) *awstypes.CreateRule { createRule.CronExpression = aws.String(v) createRule.IntervalUnit = "" // sets interval unit to empty string so that all fields related to interval are ignored } - + if v, ok := c["scripts"]; ok { + createRule.Scripts = expandScripts(v.([]interface{})) + } return createRule } @@ -1236,6 +1236,10 @@ func flattenCreateRule(createRule *awstypes.CreateRule) []map[string]interface{} result["cron_expression"] = aws.ToString(createRule.CronExpression) } + if createRule.Scripts != nil { + result["scripts"] = flattenScripts(createRule.Scripts) + } + return []map[string]interface{}{result} } @@ -1436,3 +1440,50 @@ func flattenParameters(parameters *awstypes.Parameters) []map[string]interface{} return []map[string]interface{}{result} } + +func expandScripts(cfg []interface{}) []awstypes.Script { + + scripts := make([]awstypes.Script, len(cfg)) + for i, c := range cfg { + m := c.(map[string]interface{}) + script := awstypes.Script{} + if v, ok := m["execute_operation_on_script_failure"].(bool); ok { + script.ExecuteOperationOnScriptFailure = aws.Bool(v) + } + if v, ok := m["execution_handler"].(string); ok { + script.ExecutionHandler = aws.String(v) + } + if v, ok := m["execution_handler_service"].(string); ok && v != "" { + script.ExecutionHandlerService = awstypes.ExecutionHandlerServiceValues(v) + } + if v, ok := m["execution_timeout"].(int); ok && v > 0 { + script.ExecutionTimeout = aws.Int32(int32(v)) + } + if v, ok := m["maximum_retry_count"].(int); ok && v > 0 { + script.MaximumRetryCount = aws.Int32(int32(v)) + } + if v, ok := m["stages"].([]interface{}); ok && len(v) > 0 { + script.Stages = flex.ExpandStringyValueList[awstypes.StageValues](v) + } + scripts[i] = script + } + + return scripts +} + +func flattenScripts(scripts []awstypes.Script) []map[string]interface{} { + result := make([]map[string]interface{}, len(scripts)) + for i, s := range scripts { + m := make(map[string]interface{}) + m["execute_operation_on_script_failure"] = aws.ToBool(s.ExecuteOperationOnScriptFailure) + m["execution_handler"] = aws.ToString(s.ExecutionHandler) + m["execution_handler_service"] = string(s.ExecutionHandlerService) + m["execution_timeout"] = aws.ToInt32(s.ExecutionTimeout) + m["maximum_retry_count"] = aws.ToInt32(s.MaximumRetryCount) + m["stages"] = flex.FlattenStringyValueList(s.Stages) + + result[i] = m + } + + return result +} diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 160a2c622004..7ca4b4628a89 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -37,7 +37,6 @@ func TestAccDLMLifecyclePolicy_basic(t *testing.T) { Config: testAccLifecyclePolicyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( checkLifecyclePolicyExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), @@ -142,6 +141,67 @@ func TestAccDLMLifecyclePolicy_cron(t *testing.T) { }) } +func TestAccDLMLifecyclePolicy_scriptsAlias(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_scriptsAlias(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execution_handler", "AWS_VSS_BACKUP"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execute_operation_on_script_failure", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.maximum_retry_count", "3"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccDLMLifecyclePolicy_scriptsSSMDocument(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_scriptsSSMDocument(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), + resource.TestCheckResourceAttrSet(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execution_handler"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execute_operation_on_script_failure", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execution_timeout", "60"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.maximum_retry_count", "3"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccDLMLifecyclePolicy_retainInterval(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_dlm_lifecycle_policy.test" @@ -213,7 +273,7 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { Config: testAccLifecyclePolicyConfig_defaultPolicy(rName), Check: resource.ComposeTestCheckFunc( checkLifecyclePolicyExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), @@ -224,8 +284,8 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", "7"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_language", "SIMPLIFIED"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", acctest.Ct0), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", acctest.Ct0), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", "0"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", "0"), ), }, { @@ -836,6 +896,138 @@ resource "aws_dlm_lifecycle_policy" "test" { `) } +func testAccLifecyclePolicyConfig_scriptsAlias(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +data "aws_iam_policy" "test" { + name = "AWSDataLifecycleManagerSSMFullAccess" +} + +resource "aws_iam_role_policy_attachment" "test" { + role = aws_iam_role.test.id + policy_arn = data.aws_iam_policy.test.arn +} + +resource "aws_dlm_lifecycle_policy" "test" { + description = "tf-acc-basic" + execution_role_arn = aws_iam_role.test.arn + + policy_details { + resource_types = ["INSTANCE"] + + schedule { + name = "tf-acc-basic" + + create_rule { + interval = 12 + scripts { + execute_operation_on_script_failure = false + execution_handler = "AWS_VSS_BACKUP" + maximum_retry_count = 3 + } + } + + retain_rule { + count = 10 + } + } + + target_tags = { + tf-acc-test = "basic" + } + } +} +`) +} + +func testAccLifecyclePolicyConfig_scriptsSSMDocument(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +data "aws_iam_policy" "test" { + name = "AWSDataLifecycleManagerSSMFullAccess" +} + +resource "aws_iam_role_policy_attachment" "test" { + role = aws_iam_role.test.id + policy_arn = data.aws_iam_policy.test.arn +} + +resource "aws_ssm_document" "test" { + name = "tf-acc-basic" + document_type = "Command" + + tags = { + DLMScriptsAccess = "true" + } + + content =< Date: Thu, 23 Jan 2025 19:41:24 +1100 Subject: [PATCH 0024/2115] added scritps docs --- website/docs/r/dlm_lifecycle_policy.html.markdown | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index 9aa1cf824bfb..f8a2ccb15aa9 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -297,6 +297,7 @@ This resource supports the following arguments: * `interval` - (Optional) How often this lifecycle policy should be evaluated. `1`, `2`,`3`,`4`,`6`,`8`,`12` or `24` are valid values. Conflicts with `cron_expression`. If set, `interval_unit` and `times` must also be set. * `interval_unit` - (Optional) The unit for how often the lifecycle policy should be evaluated. `HOURS` is currently the only allowed value and also the default value. Conflicts with `cron_expression`. Must be set if `interval` is set. * `location` - (Optional) Specifies the destination for snapshots created by the policy. To create snapshots in the same Region as the source resource, specify `CLOUD`. To create snapshots on the same Outpost as the source resource, specify `OUTPOST_LOCAL`. If you omit this parameter, `CLOUD` is used by default. If the policy targets resources in an AWS Region, then you must create snapshots in the same Region as the source resource. If the policy targets resources on an Outpost, then you can create snapshots on the same Outpost as the source resource, or in the Region of that Outpost. Valid values are `CLOUD` and `OUTPOST_LOCAL`. +* `scripts` - (Optional) Specifies pre and/or post scripts for a snapshot lifecycle policy that targets instances. Valid only when `resource_type` is INSTANCE. See the [`scripts` configuration](#scripts-rule-arguments) block. * `times` - (Optional) A list of times in 24 hour clock format that sets when the lifecycle policy should be evaluated. Max of 1. Conflicts with `cron_expression`. Must be set if `interval` is set. #### Deprecate Rule arguments @@ -343,6 +344,18 @@ This resource supports the following arguments: * `interval` - (Required) The amount of time to retain each snapshot. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days. * `interval_unit` - (Required) The unit of time for time-based retention. Valid values: `DAYS`, `WEEKS`, `MONTHS`, or `YEARS`. +#### Scripts Rule arguments + +* `execute_operation_on_script_failure` - (Optional) Indicates whether Amazon Data Lifecycle Manager should default to crash-consistent snapshots if the pre script fails. The default is `true`. + +* `execution_handler` - (Required) The SSM document that includes the pre and/or post scripts to run. In case automating VSS backups, specify `AWS_VSS_BACKUP`. In case automating application-consistent snapshots for SAP HANA workloads, specify `AWSSystemsManagerSAP-CreateDLMSnapshotForSAPHANA`. If you are using a custom SSM document that you own, specify either the name or ARN of the SSM document. + +* `execution_handler_service` - (Optional) Indicates the service used to execute the pre and/or post scripts. If using custom SSM documents or automating application-consistent snapshots of SAP HANA workloads, specify `AWS_SYSTEMS_MANAGER`. In case automating VSS Backups, omit this parameter. The default is `AWS_SYSTEMS_MANAGER`. + +* `execution_timeout` - (Optional) Specifies a timeout period, in seconds, after which Amazon Data Lifecycle Manager fails the script run attempt if it has not completed. In case automating VSS Backups, omit this parameter. The default is `10`. + +* `maximum_retry_count` - (Optional) Specifies the number of times Amazon Data Lifecycle Manager should retry scripts that fail. Must be an integer between `0` and `3`. The default is `0`. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 33b7951813f0d8b09fc8bd11d99fbbfa5218147f Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Thu, 23 Jan 2025 22:51:02 +1100 Subject: [PATCH 0025/2115] added schedule archive rule --- internal/service/dlm/lifecycle_policy.go | 125 +++++++++++++++- internal/service/dlm/lifecycle_policy_test.go | 133 ++++++++++++++++++ .../docs/r/dlm_lifecycle_policy.html.markdown | 15 ++ 3 files changed, 272 insertions(+), 1 deletion(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index ca0ee529496a..b94ef7767c0b 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -218,7 +218,7 @@ func resourceLifecyclePolicy() *schema.Resource { }, "resource_types": { Type: schema.TypeList, - Required: true, + Optional: true, Elem: &schema.Schema{ Type: schema.TypeString, ValidateDiagFunc: enum.Validate[awstypes.ResourceTypeValues](), @@ -287,6 +287,48 @@ func resourceLifecyclePolicy() *schema.Resource { MaxItems: 4, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "archive_rule": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "archive_retain_rule": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "retention_archive_tier": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "count": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(1, 1000), + }, + names.AttrInterval: { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntAtLeast(1), + }, + "interval_unit": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.RetentionIntervalUnitValues](), + }, + }, + }, + }, + }, + }, + }, + }, + }, + }, "copy_tags": { Type: schema.TypeBool, Optional: true, @@ -824,6 +866,9 @@ func expandSchedules(cfg []interface{}) []awstypes.Schedule { for i, c := range cfg { schedule := awstypes.Schedule{} m := c.(map[string]interface{}) + if v, ok := m["archive_rule"].([]interface{}); ok && len(v) > 0 { + schedule.ArchiveRule = expandArchiveRule(v) + } if v, ok := m["copy_tags"]; ok { schedule.CopyTags = aws.Bool(v.(bool)) } @@ -865,6 +910,7 @@ func flattenSchedules(schedules []awstypes.Schedule) []map[string]interface{} { result := make([]map[string]interface{}, len(schedules)) for i, s := range schedules { m := make(map[string]interface{}) + m["archive_rule"] = flattenArchiveRule(s.ArchiveRule) m["copy_tags"] = aws.ToBool(s.CopyTags) m["create_rule"] = flattenCreateRule(s.CreateRule) m["cross_region_copy_rule"] = flattenCrossRegionCopyRules(s.CrossRegionCopyRules) @@ -1487,3 +1533,80 @@ func flattenScripts(scripts []awstypes.Script) []map[string]interface{} { return result } + +func expandArchiveRule(v []interface{}) *awstypes.ArchiveRule { + if len(v) == 0 || v[0] == nil { + return nil + } + m := v[0].(map[string]interface{}) + return &awstypes.ArchiveRule{ + RetainRule: expandArchiveRetainRule(m["archive_retain_rule"].([]interface{})), + } +} + +func flattenArchiveRule(rule *awstypes.ArchiveRule) []map[string]interface{} { + if rule == nil { + return []map[string]interface{}{} + } + + result := make(map[string]interface{}) + result["archive_retain_rule"] = flattenArchiveRetainRule(rule.RetainRule) + + return []map[string]interface{}{result} +} + +func expandArchiveRetainRule(cfg []interface{}) *awstypes.ArchiveRetainRule { + if len(cfg) == 0 || cfg[0] == nil { + return nil + } + m := cfg[0].(map[string]interface{}) + return &awstypes.ArchiveRetainRule{ + RetentionArchiveTier: expandRetentionArchiveTier(m["retention_archive_tier"].([]interface{})), + } +} + +func flattenArchiveRetainRule(rule *awstypes.ArchiveRetainRule) []map[string]interface{} { + if rule == nil { + return []map[string]interface{}{} + } + + result := make(map[string]interface{}) + result["retention_archive_tier"] = flattenRetentionArchiveTier(rule.RetentionArchiveTier) + + return []map[string]interface{}{result} +} + +func expandRetentionArchiveTier(cfg []interface{}) *awstypes.RetentionArchiveTier { + if len(cfg) == 0 || cfg[0] == nil { + return nil + } + m := cfg[0].(map[string]interface{}) + retention_archive_tier := &awstypes.RetentionArchiveTier{} + + if v, ok := m["count"].(int); ok && v > 0 { + retention_archive_tier.Count = aws.Int32(int32(v)) + } + + if v, ok := m[names.AttrInterval].(int); ok && v > 0 { + retention_archive_tier.Interval = aws.Int32(int32(v)) + } + + if v, ok := m["interval_unit"].(string); ok && v != "" { + retention_archive_tier.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) + } + + return retention_archive_tier +} + +func flattenRetentionArchiveTier(tier *awstypes.RetentionArchiveTier) []map[string]interface{} { + if tier == nil { + return []map[string]interface{}{} + } + + result := make(map[string]interface{}) + result["count"] = aws.ToInt32(tier.Count) + result[names.AttrInterval] = aws.ToInt32(tier.Interval) + result["interval_unit"] = string(tier.IntervalUnit) + + return []map[string]interface{}{result} +} diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 7ca4b4628a89..f1feca6b3f6d 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -202,6 +202,63 @@ func TestAccDLMLifecyclePolicy_scriptsSSMDocument(t *testing.T) { }) } +func TestAccDLMLifecyclePolicy_archiveRuleCount(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_archiveRuleCount(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.archive_rule.0.archive_retain_rule.0.retention_archive_tier.0.count", "10"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccDLMLifecyclePolicy_archiveRuleInterval(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_archiveRuleInterval(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.name", "tf-acc-basic"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.archive_rule.0.archive_retain_rule.0.retention_archive_tier.0.interval", "6"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.archive_rule.0.archive_retain_rule.0.retention_archive_tier.0.interval_unit", "MONTHS"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccDLMLifecyclePolicy_retainInterval(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_dlm_lifecycle_policy.test" @@ -896,6 +953,82 @@ resource "aws_dlm_lifecycle_policy" "test" { `) } +func testAccLifecyclePolicyConfig_archiveRuleCount(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +resource "aws_dlm_lifecycle_policy" "test" { + description = "tf-acc-basic" + execution_role_arn = aws_iam_role.test.arn + + policy_details { + resource_types = ["VOLUME"] + + schedule { + name = "tf-acc-basic" + + create_rule { + cron_expression = "cron(5 14 3 * ? *)" + } + + archive_rule { + archive_retain_rule { + retention_archive_tier { + count = 10 + } + } + } + + retain_rule { + count = 10 + } + } + + target_tags = { + tf-acc-test = "basic" + } + } +} +`) +} + +func testAccLifecyclePolicyConfig_archiveRuleInterval(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +resource "aws_dlm_lifecycle_policy" "test" { + description = "tf-acc-basic" + execution_role_arn = aws_iam_role.test.arn + + policy_details { + resource_types = ["VOLUME"] + + schedule { + name = "tf-acc-basic" + + create_rule { + cron_expression = "cron(5 14 3 * ? *)" + } + + archive_rule { + archive_retain_rule { + retention_archive_tier { + interval = 6 + interval_unit = "MONTHS" + } + } + } + + retain_rule { + interval = 12 + interval_unit = "MONTHS" + } + } + + target_tags = { + tf-acc-test = "basic" + } + } +} +`) +} + func testAccLifecyclePolicyConfig_scriptsAlias(rName string) string { return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` data "aws_iam_policy" "test" { diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index f8a2ccb15aa9..b125d46854f1 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -280,6 +280,7 @@ This resource supports the following arguments: #### Schedule arguments +* `archive_rule` - (Optional) Specifies a snapshot archiving rule for a schedule. See [`archive_rule`](#archive-rule-arguments) block. * `copy_tags` - (Optional) Copy all user-defined tags on a source volume to snapshots of the volume created by this policy. * `create_rule` - (Required) See the [`create_rule`](#create-rule-arguments) block. Max of 1 per schedule. * `cross_region_copy_rule` (Optional) - See the [`cross_region_copy_rule`](#cross-region-copy-rule-arguments) block. Max of 3 per schedule. @@ -291,6 +292,14 @@ This resource supports the following arguments: * `tags_to_add` - (Optional) A map of tag keys and their values. DLM lifecycle policies will already tag the snapshot with the tags on the volume. This configuration adds extra tags on top of these. * `variable_tags` - (Optional) A map of tag keys and variable values, where the values are determined when the policy is executed. Only `$(instance-id)` or `$(timestamp)` are valid values. Can only be used when `resource_types` is `INSTANCE`. +#### Archive Rule Arguments + +* `archive_retain_rule` - (Required) Information about the retention period for the snapshot archiving rule. See the [`archive_retain_rule`](#archive-retain-rule-arguments) block. + +#### Archive Retain Rule Arguments + +* `retention_archive_tier` - (Required) Information about retention period in the Amazon EBS Snapshots Archive. See the [`retention_archive_tier`](#retention-archive-tier-arguments) block. + #### Create Rule arguments * `cron_expression` - (Optional) The schedule, as a Cron expression. The schedule interval must be between 1 hour and 1 year. Conflicts with `interval`, `interval_unit`, and `times`. @@ -356,6 +365,12 @@ This resource supports the following arguments: * `maximum_retry_count` - (Optional) Specifies the number of times Amazon Data Lifecycle Manager should retry scripts that fail. Must be an integer between `0` and `3`. The default is `0`. +#### Retention Archive Tier Arguments + +* `count` - (Optional)The maximum number of snapshots to retain in the archive storage tier for each volume. Must be an integer between `1` and `1000`. Conflicts with `interval` and `interval_unit`. +* `interval` - (Optional) Specifies the period of time to retain snapshots in the archive tier. After this period expires, the snapshot is permanently deleted. Conflicts with `count`. If set, `interval_unit` must also be set. +* `interval_unit` - (Optional) The unit of time for time-based retention. Valid values are `DAYS`, `WEEKS`, `MONTHS`, `YEARS`. Conflicts with `count`. Must be set if `interval` is set. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 4a6fd1889f61a93c903f8190fa97fec3e7c7640f Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Thu, 23 Jan 2025 23:39:30 +1100 Subject: [PATCH 0026/2115] added default policy exclusions --- internal/service/dlm/lifecycle_policy.go | 64 ++++++++++++++++ internal/service/dlm/lifecycle_policy_test.go | 76 +++++++++++++++++++ .../docs/r/dlm_lifecycle_policy.html.markdown | 9 +++ 3 files changed, 149 insertions(+) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index b94ef7767c0b..3410c49dc257 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -160,6 +160,33 @@ func resourceLifecyclePolicy() *schema.Resource { return false }, }, + "exclusions": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + RequiredWith: []string{"default_policy"}, + ConflictsWith: []string{"policy_details.0.resource_types", "policy_details.0.schedule"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "exclude_boot_volumes": { + Type: schema.TypeBool, + Optional: true, + }, + "exclude_tags": { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "exclude_volume_types": { + Type: schema.TypeList, + Optional: true, + MinItems: 0, + MaxItems: 6, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + }, "extend_deletion": { Type: schema.TypeBool, Optional: true, @@ -800,6 +827,9 @@ func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes if v, ok := m["create_interval"].(int); ok { policyDetails.CreateInterval = aws.Int32(int32(v)) } + if v, ok := m["exclusions"].([]interface{}); ok && len(v) > 0 { + policyDetails.Exclusions = expandExclusions(v) + } if v, ok := m["extend_deletion"].(bool); ok { policyDetails.ExtendDeletion = aws.Bool(v) } @@ -844,6 +874,7 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]in result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) result[names.AttrAction] = flattenActions(policyDetails.Actions) result["event_source"] = flattenEventSource(policyDetails.EventSource) + result["exclusions"] = flattenExclusions(policyDetails.Exclusions) result[names.AttrSchedule] = flattenSchedules(policyDetails.Schedules) result["target_tags"] = flattenTags(policyDetails.TargetTags) result["policy_type"] = string(policyDetails.PolicyType) @@ -1610,3 +1641,36 @@ func flattenRetentionArchiveTier(tier *awstypes.RetentionArchiveTier) []map[stri return []map[string]interface{}{result} } + +func expandExclusions(cfg []interface{}) *awstypes.Exclusions { + if len(cfg) == 0 || cfg[0] == nil { + return nil + } + m := cfg[0].(map[string]interface{}) + exclusions := &awstypes.Exclusions{} + + if v, ok := m["exclude_boot_volumes"].(bool); ok { + exclusions.ExcludeBootVolumes = aws.Bool(v) + } + if v, ok := m["exclude_tags"].(map[string]interface{}); ok { + exclusions.ExcludeTags = expandTags(v) + } + if v, ok := m["exclude_volume_types"].([]interface{}); ok && len(v) > 0 { + exclusions.ExcludeVolumeTypes = flex.ExpandStringValueList(v) + } + + return exclusions +} + +func flattenExclusions(exclusions *awstypes.Exclusions) []map[string]interface{} { + if exclusions == nil { + return []map[string]interface{}{} + } + + result := make(map[string]interface{}) + result["exclude_boot_volumes"] = aws.ToBool(exclusions.ExcludeBootVolumes) + result["exclude_tags"] = flattenTags(exclusions.ExcludeTags) + result["exclude_volume_types"] = flex.FlattenStringValueList(exclusions.ExcludeVolumeTypes) + + return []map[string]interface{}{result} +} diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index f1feca6b3f6d..cbc030142d3a 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -191,6 +191,7 @@ func TestAccDLMLifecyclePolicy_scriptsSSMDocument(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execute_operation_on_script_failure", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.execution_timeout", "60"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.maximum_retry_count", "3"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.create_rule.0.scripts.0.stages.0", "PRE"), ), }, { @@ -355,6 +356,49 @@ func TestAccDLMLifecyclePolicy_defaultPolicy(t *testing.T) { }) } +func TestAccDLMLifecyclePolicy_defaultPolicyExclusions(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_dlm_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_defaultPolicyExclusions(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), + resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), + resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), + resource.TestCheckResourceAttr(resourceName, "default_policy", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.copy_tags", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.create_interval", "5"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.extend_deletion", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.resource_type", "VOLUME"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.retain_interval", "7"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_language", "SIMPLIFIED"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.action.#", "0"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.event_source.#", "0"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.exclusions.0.exclude_boot_volumes", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.exclusions.0.exclude_tags.test", "exclude"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.exclusions.0.exclude_volume_types.0", "gp2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"default_policy"}, + }, + }, + }) +} + func TestAccDLMLifecyclePolicy_fastRestore(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_dlm_lifecycle_policy.test" @@ -809,6 +853,38 @@ resource "aws_dlm_lifecycle_policy" "test" { create_interval = 5 resource_type = "VOLUME" policy_language = "SIMPLIFIED" + + exclusions { + exclude_boot_volumes = false + exclude_tags = { + test = "exclude" + } + exclude_volume_types = ["gp2"] + } + } +} +`) +} + +func testAccLifecyclePolicyConfig_defaultPolicyExclusions(rName string) string { + return acctest.ConfigCompose(lifecyclePolicyBaseConfig(rName), ` +resource "aws_dlm_lifecycle_policy" "test" { + description = "tf-acc-basic" + execution_role_arn = aws_iam_role.test.arn + default_policy = "VOLUME" + + policy_details { + create_interval = 5 + resource_type = "VOLUME" + policy_language = "SIMPLIFIED" + + exclusions { + exclude_boot_volumes = false + exclude_tags = { + test = "exclude" + } + exclude_volume_types = ["gp2"] + } } } `) diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index b125d46854f1..61c88878d71c 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -232,6 +232,7 @@ This resource supports the following arguments: * `action` - (Optional) The actions to be performed when the event-based policy is triggered. You can specify only one action per policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`action` configuration](#action-arguments) block. * `copy_tags` - (Optional, Default policies only) Indicates whether the policy should copy tags from the source resource to the snapshot or AMI. Default value is `false`. * `create_interval` - (Optional, Default policies only) How often the policy should run and create snapshots or AMIs. valid values range from `1` to `7`. Default value is `1`. +* `exclusions` - (Optional, Default policies only) Specifies exclusion parameters for volumes or instances for which you do not want to create snapshots or AMIs. See the [`exclusions` configuration](#exclusions-arguments) block. * `extend_deletion` - (Optional, Default policies only) snapshot or AMI retention behavior for the policy if the source volume or instance is deleted, or if the policy enters the error, disabled, or deleted state. Default value is `false`. * `retain_interval` - (Optional, Default policies only) Specifies how long the policy should retain snapshots or AMIs before deleting them. valid values range from `2` to `14`. Default value is `7`. * `event_source` - (Optional) The event that triggers the event-based policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`event_source` configuration](#event-source-arguments) block. @@ -273,6 +274,12 @@ This resource supports the following arguments: * `event_type` - (Required) The type of event. Currently, only `shareSnapshot` events are supported. * `snapshot_owner` - (Required) The IDs of the AWS accounts that can trigger policy by sharing snapshots with your account. The policy only runs if one of the specified AWS accounts shares a snapshot with your account. +#### Exclusions arguments + +* `exclude_boot_volumes` - (Optional) Indicates whether to exclude volumes that are attached to instances as the boot volume. To exclude boot volumes, specify `true`. +* `exclude_tags` - (Optional) Map specifies whether to exclude volumes that have specific tags. +* `exclude_volume_types` - (Optional) List specifies the volume types to exclude. + #### Parameters arguments * `exclude_boot_volume` - (Optional) Indicates whether to exclude the root volume from snapshots created using CreateSnapshots. The default is `false`. @@ -365,6 +372,8 @@ This resource supports the following arguments: * `maximum_retry_count` - (Optional) Specifies the number of times Amazon Data Lifecycle Manager should retry scripts that fail. Must be an integer between `0` and `3`. The default is `0`. +* `stages` - (Optional) List to indicate which scripts Amazon Data Lifecycle Manager should run on target instances. Pre scripts run before Amazon Data Lifecycle Manager initiates snapshot creation. Post scripts run after Amazon Data Lifecycle Manager initiates snapshot creation. Valid values: `PRE` and `POST`. The default is `PRE` and `POST` + #### Retention Archive Tier Arguments * `count` - (Optional)The maximum number of snapshots to retain in the archive storage tier for each volume. Must be an integer between `1` and `1000`. Conflicts with `interval` and `interval_unit`. From b7d30257f748803d0938834a39aaf4dd38e4b4d3 Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Fri, 24 Jan 2025 05:45:17 +1100 Subject: [PATCH 0027/2115] added changelog, doc examples, fixed lint --- .changelog/41055.txt | 35 ++++++++ internal/service/dlm/lifecycle_policy.go | 1 - internal/service/dlm/lifecycle_policy_test.go | 82 +++++++++---------- .../docs/r/dlm_lifecycle_policy.html.markdown | 67 +++++++++++++++ 4 files changed, 139 insertions(+), 46 deletions(-) create mode 100644 .changelog/41055.txt diff --git a/.changelog/41055.txt b/.changelog/41055.txt new file mode 100644 index 000000000000..517174fd15b1 --- /dev/null +++ b/.changelog/41055.txt @@ -0,0 +1,35 @@ +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Added `default_policy` argument +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `copy_tags`,`create_interval`,`exclusions`,`extend_deletion`,`policy_language`,`resource_type` and `retain_interval` arguments to `policy_details` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `scripts` argument to `create_rule` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `execute_operation_on_script_failure`, `execution_handler`, `execution_handler_service`, `execution_timeout`, `maximum_retry_count` and `stages` arguments to `scripts` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `exclude_boot_volumes`, `exclude_tags` and `exclude_volume_types` arguments to `exclusions` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `archive_rule` argument to `schedule` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `archive_retain_rule` argument to `archive_rule` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `retention_archive_tier` argument to `archive_retain_rule` +``` + +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `count`,`interval` and `interval_unit` arguments to `retention_archive_tier` +``` \ No newline at end of file diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 3410c49dc257..44bb54d64dd1 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -1519,7 +1519,6 @@ func flattenParameters(parameters *awstypes.Parameters) []map[string]interface{} } func expandScripts(cfg []interface{}) []awstypes.Script { - scripts := make([]awstypes.Script, len(cfg)) for i, c := range cfg { m := c.(map[string]interface{}) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index cbc030142d3a..abeaefa4cca0 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -853,14 +853,6 @@ resource "aws_dlm_lifecycle_policy" "test" { create_interval = 5 resource_type = "VOLUME" policy_language = "SIMPLIFIED" - - exclusions { - exclude_boot_volumes = false - exclude_tags = { - test = "exclude" - } - exclude_volume_types = ["gp2"] - } } } `) @@ -878,13 +870,13 @@ resource "aws_dlm_lifecycle_policy" "test" { resource_type = "VOLUME" policy_language = "SIMPLIFIED" - exclusions { - exclude_boot_volumes = false - exclude_tags = { - test = "exclude" + exclusions { + exclude_boot_volumes = false + exclude_tags = { + test = "exclude" } - exclude_volume_types = ["gp2"] - } + exclude_volume_types = ["gp2"] + } } } `) @@ -1041,16 +1033,16 @@ resource "aws_dlm_lifecycle_policy" "test" { schedule { name = "tf-acc-basic" - create_rule { + create_rule { cron_expression = "cron(5 14 3 * ? *)" } - archive_rule { - archive_retain_rule { - retention_archive_tier { - count = 10 - } - } + archive_rule { + archive_retain_rule { + retention_archive_tier { + count = 10 + } + } } retain_rule { @@ -1078,22 +1070,22 @@ resource "aws_dlm_lifecycle_policy" "test" { schedule { name = "tf-acc-basic" - create_rule { + create_rule { cron_expression = "cron(5 14 3 * ? *)" } - archive_rule { - archive_retain_rule { - retention_archive_tier { - interval = 6 - interval_unit = "MONTHS" - } - } + archive_rule { + archive_retain_rule { + retention_archive_tier { + interval = 6 + interval_unit = "MONTHS" + } + } } retain_rule { - interval = 12 - interval_unit = "MONTHS" + interval = 12 + interval_unit = "MONTHS" } } @@ -1127,12 +1119,12 @@ resource "aws_dlm_lifecycle_policy" "test" { name = "tf-acc-basic" create_rule { - interval = 12 + interval = 12 scripts { - execute_operation_on_script_failure = false - execution_handler = "AWS_VSS_BACKUP" - maximum_retry_count = 3 - } + execute_operation_on_script_failure = false + execution_handler = "AWS_VSS_BACKUP" + maximum_retry_count = 3 + } } retain_rule { @@ -1164,10 +1156,10 @@ resource "aws_ssm_document" "test" { document_type = "Command" tags = { - DLMScriptsAccess = "true" + DLMScriptsAccess = "true" } - content =< Date: Fri, 6 Oct 2023 09:23:30 +0200 Subject: [PATCH 0028/2115] feat: dlm: Add support for target_region parameter in cross_region_copy_rule `target_region` should only be used for dlm policies of `policy_type=IMAGE_MANAGEMENT`. Creating `IMAGE_MANAGEMENT` policies using `target` raises a validation error from the AWS API. Previously the argument was marked as deprecated from the AWS docs, but after contacting the AWS support, the documentation was updated to specify that `TargetRegion` should be used only for `IMAGE_MANAGEMENT` policies, while `Target` only for `EBS_SNAPSHOT_MANAGEMENT` policies. See the relevant docs: https://docs.aws.amazon.com/dlm/latest/APIReference/API_CrossRegionCopyRule.html Relevant issues: - https://discuss.hashicorp.com/t/fail-to-create-a-cross-region-copy-rule-for-dlp/46076 - https://github.com/hashicorp/terraform-provider-aws/issues/24226 This fixes #24226 --- .changelog/33796.txt | 3 + internal/service/dlm/lifecycle_policy.go | 11 ++- internal/service/dlm/lifecycle_policy_test.go | 77 +++++++++++++++++++ .../docs/r/dlm_lifecycle_policy.html.markdown | 3 +- 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 .changelog/33796.txt diff --git a/.changelog/33796.txt b/.changelog/33796.txt new file mode 100644 index 000000000000..4084a2fb8631 --- /dev/null +++ b/.changelog/33796.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_dlm_lifecycle_policy: Add `target_region` argument in `cross_region_copy_rule`, to be used for `IMAGE_MANAGEMENT` policies. +``` diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index c9e2f0581333..bf6c44514a61 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -330,7 +330,12 @@ func resourceLifecyclePolicy() *schema.Resource { }, names.AttrTarget: { Type: schema.TypeString, - Required: true, + Optional: true, + ValidateFunc: validation.StringMatch(regexache.MustCompile(`^[\w:\-\/\*]+$`), ""), + }, + "target_region": { + Type: schema.TypeString, + Optional: true, ValidateFunc: validation.StringMatch(regexache.MustCompile(`^[\w:\-\/\*]+$`), ""), }, }, @@ -951,6 +956,9 @@ func expandCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyRule if v, ok := m[names.AttrTarget].(string); ok && v != "" { rule.Target = aws.String(v) } + if v, ok := m["target_region"].(string); ok && v != "" { + rule.TargetRegion = aws.String(v) + } rules = append(rules, rule) } @@ -973,6 +981,7 @@ func flattenCrossRegionCopyRules(rules []awstypes.CrossRegionCopyRule) []interfa names.AttrEncrypted: aws.ToBool(rule.Encrypted), "retain_rule": flattenCrossRegionCopyRuleRetainRule(rule.RetainRule), names.AttrTarget: aws.ToString(rule.Target), + "target_region": aws.ToString(rule.TargetRegion), } result = append(result, m) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index 7a0465ac62ee..7bde0dca0366 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -456,6 +456,42 @@ func TestAccDLMLifecyclePolicy_crossRegionCopyRule(t *testing.T) { }) } +func TestAccDLMLifecyclePolicy_crossRegionCopyRuleImageManagement(t *testing.T) { + ctx := acctest.Context(t) + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_dlm_lifecycle_policy.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckMultipleRegion(t, 2) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.DLMServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5FactoriesAlternate(ctx, t), + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_crossRegionCopyRuleImageManagement(rName), + Check: resource.ComposeTestCheckFunc( + checkLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_type", "IMAGE_MANAGEMENT"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.encrypted", "false"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.retain_rule.0.interval", "15"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.retain_rule.0.interval_unit", "DAYS"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.target_region", acctest.AlternateRegion()), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccDLMLifecyclePolicy_tags(t *testing.T) { ctx := acctest.Context(t) rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -1069,6 +1105,47 @@ resource "aws_dlm_lifecycle_policy" "test" { `, rName, acctest.AlternateRegion())) } +func testAccLifecyclePolicyConfig_crossRegionCopyRuleImageManagement(rName string) string { + return acctest.ConfigCompose( + lifecyclePolicyBaseConfig(rName), + fmt.Sprintf(` +resource "aws_dlm_lifecycle_policy" "test" { + description = %[1]q + execution_role_arn = aws_iam_role.test.arn + + policy_details { + policy_type = "IMAGE_MANAGEMENT" + resource_types = ["INSTANCE"] + + schedule { + name = %[1]q + + create_rule { + interval = 12 + } + + retain_rule { + count = 10 + } + + cross_region_copy_rule { + target_region = %[2]q + encrypted = false + retain_rule { + interval = 15 + interval_unit = "DAYS" + } + } + } + + target_tags = { + Name = %[1]q + } + } +} +`, rName, acctest.AlternateRegion())) +} + func testAccLifecyclePolicyConfig_updateCrossRegionCopyRule(rName string) string { return acctest.ConfigCompose( acctest.ConfigMultipleRegionProvider(2), diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index 474169f751e8..819848196939 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -324,7 +324,8 @@ This resource supports the following arguments: * `deprecate_rule` - (Optional) The AMI deprecation rule for cross-Region AMI copies created by the rule. See the [`deprecate_rule`](#cross-region-copy-rule-deprecate-rule-arguments) block. * `encrypted` - (Required) To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Copies of encrypted snapshots are encrypted, even if this parameter is false or if encryption by default is not enabled. * `retain_rule` - (Required) The retention rule that indicates how long snapshot copies are to be retained in the destination Region. See the [`retain_rule`](#cross-region-copy-rule-retain-rule-arguments) block. Max of 1 per schedule. -* `target` - (Required) The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `target` - Use only for DLM policies of `policy_type=EBS_SNAPSHOT_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `target_region` - Use only for DLM policies of `policy_type=IMAGE_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. #### Cross Region Copy Rule Deprecate Rule arguments From 5f13cad2bc90339f48c7a571c8a304c71922a3e1 Mon Sep 17 00:00:00 2001 From: aristosvo <8375124+aristosvo@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:34:22 +0300 Subject: [PATCH 0029/2115] add warm_throughput to aws_dynamodb_table --- internal/service/dynamodb/status.go | 20 +++ internal/service/dynamodb/table.go | 126 ++++++++++++++++++ .../service/dynamodb/table_data_source.go | 6 +- .../dynamodb/table_data_source_test.go | 7 + internal/service/dynamodb/table_test.go | 99 ++++++++++++++ internal/service/dynamodb/wait.go | 13 ++ website/docs/r/dynamodb_table.html.markdown | 6 + 7 files changed, 276 insertions(+), 1 deletion(-) diff --git a/internal/service/dynamodb/status.go b/internal/service/dynamodb/status.go index 6f7d601196b8..ac11467713b6 100644 --- a/internal/service/dynamodb/status.go +++ b/internal/service/dynamodb/status.go @@ -29,6 +29,26 @@ func statusTable(ctx context.Context, conn *dynamodb.Client, tableName string) r } } +func statusTableWarmThroughput(ctx context.Context, conn *dynamodb.Client, tableName string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + output, err := findTableByName(ctx, conn, tableName) + + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + if output == nil || output.WarmThroughput == nil { + return nil, "", nil + } + + return output, string(output.WarmThroughput.Status), nil + } +} + func statusImport(ctx context.Context, conn *dynamodb.Client, importARN string) retry.StateRefreshFunc { return func() (any, string, error) { output, err := findImportByARN(ctx, conn, importARN) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 10881bddfdd1..234ee11fc917 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -126,6 +126,22 @@ func resourceTable() *schema.Resource { customdiff.ForceNewIfChange("restore_source_table_arn", func(_ context.Context, old, new, meta any) bool { return old.(string) != new.(string) && new.(string) != "" }), + customdiff.ForceNewIfChange("warm_throughput.0.read_units_per_second", func(_ context.Context, old, new, meta any) bool { + // warm_throughput can only be increased, not decreased + if old, new := old.(int), new.(int); new != 0 && new < old { + return true + } + + return false + }), + customdiff.ForceNewIfChange("warm_throughput.0.write_units_per_second", func(_ context.Context, old, new, meta any) bool { + // warm_throughput can only be increased, not decreased + if old, new := old.(int), new.(int); new != 0 && new < old { + return true + } + + return false + }), validateTTLCustomDiff, ), @@ -490,6 +506,7 @@ func resourceTable() *schema.Resource { }, DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock, }, + "warm_throughput": warmThroughputSchema(), "write_capacity": { Type: schema.TypeInt, Computed: true, @@ -528,6 +545,31 @@ func onDemandThroughputSchema() *schema.Schema { } } +func warmThroughputSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "read_units_per_second": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(12000)), + }, + "write_units_per_second": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(4000)), + }, + }, + }, + } +} + func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) @@ -761,6 +803,10 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) input.TableClass = awstypes.TableClass(v.(string)) } + if v, ok := d.GetOk("warm_throughput"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { + input.WarmThroughput = expandWarmThroughput(v.([]any)[0].(map[string]any)) + } + _, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (any, error) { return conn.CreateTable(ctx, input) }, func(err error) (bool, error) { @@ -789,6 +835,9 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) if output, err = waitTableActive(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForCreation, resNameTable, d.Id(), err) } + if err := waitTableWarmThroughputActive(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), err) + } if v, ok := d.GetOk("global_secondary_index"); ok { gsiSet := v.(*schema.Set) @@ -953,6 +1002,10 @@ func resourceTableRead(ctx context.Context, d *schema.ResourceData, meta any) di return create.AppendDiagSettingError(diags, names.DynamoDB, resNameTable, d.Id(), "ttl", err) } + if err := d.Set("warm_throughput", flattenTableWarmThroughput(table.WarmThroughput)); err != nil { + return create.AppendDiagSettingError(diags, names.DynamoDB, resNameTable, d.Id(), "warm_throughput", err) + } + return diags } @@ -1111,6 +1164,10 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), err) } + if err := waitTableWarmThroughputActive(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), err) + } + for _, gsiUpdate := range gsiUpdates { if gsiUpdate.Update == nil { continue @@ -1261,6 +1318,12 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) } } + if d.HasChange("warm_throughput") { + if err := updateWarmThroughput(ctx, conn, d.Get("warm_throughput").([]any), d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTable, d.Id(), err) + } + } + return append(diags, resourceTableRead(ctx, d, meta)...) } @@ -1651,6 +1714,33 @@ func updateReplica(ctx context.Context, conn *dynamodb.Client, d *schema.Resourc return nil } +func updateWarmThroughput(ctx context.Context, conn *dynamodb.Client, warmList []any, tableName string, timeout time.Duration) error { + if len(warmList) < 1 && warmList[0] == nil { + return nil + } + + warmMap := warmList[0].(map[string]any) + + input := &dynamodb.UpdateTableInput{ + TableName: aws.String(tableName), + WarmThroughput: expandWarmThroughput(warmMap), + } + + if _, err := conn.UpdateTable(ctx, input); err != nil { + return err + } + + if _, err := waitTableActive(ctx, conn, tableName, timeout); err != nil { + return fmt.Errorf("waiting for warm throughput: %s", err) + } + + if err := waitTableWarmThroughputActive(ctx, conn, tableName, timeout); err != nil { + return fmt.Errorf("waiting for warm throughput: %s", err) + } + + return nil +} + func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]awstypes.GlobalSecondaryIndexUpdate, error) { // Transform slices into maps oldGsis := make(map[string]any) @@ -2208,6 +2298,24 @@ func flattenOnDemandThroughput(apiObject *awstypes.OnDemandThroughput) []any { return []any{m} } +func flattenTableWarmThroughput(apiObject *awstypes.TableWarmThroughputDescription) []any { + if apiObject == nil { + return []any{} + } + + m := map[string]any{} + + if v := apiObject.ReadUnitsPerSecond; v != nil { + m["read_units_per_second"] = aws.ToInt64(v) + } + + if v := apiObject.WriteUnitsPerSecond; v != nil { + m["write_units_per_second"] = aws.ToInt64(v) + } + + return []any{m} +} + func flattenReplicaDescription(apiObject *awstypes.ReplicaDescription) map[string]any { if apiObject == nil { return nil @@ -2462,6 +2570,24 @@ func expandOnDemandThroughput(tfMap map[string]any) *awstypes.OnDemandThroughput return apiObject } +func expandWarmThroughput(tfMap map[string]any) *awstypes.WarmThroughput { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.WarmThroughput{} + + if v, ok := tfMap["read_units_per_second"].(int); ok && v != 0 { + apiObject.ReadUnitsPerSecond = aws.Int64(int64(v)) + } + + if v, ok := tfMap["write_units_per_second"].(int); ok && v != 0 { + apiObject.WriteUnitsPerSecond = aws.Int64(int64(v)) + } + + return apiObject +} + func expandS3BucketSource(data map[string]any) *awstypes.S3BucketSource { if data == nil { return nil diff --git a/internal/service/dynamodb/table_data_source.go b/internal/service/dynamodb/table_data_source.go index 2f6c88e579ef..a63e7462386b 100644 --- a/internal/service/dynamodb/table_data_source.go +++ b/internal/service/dynamodb/table_data_source.go @@ -245,6 +245,7 @@ func dataSourceTable() *schema.Resource { }, }, }, + "warm_throughput": warmThroughputSchema(), "write_capacity": { Type: schema.TypeInt, Computed: true, @@ -330,11 +331,14 @@ func dataSourceTableRead(ctx context.Context, d *schema.ResourceData, meta any) d.Set("table_class", awstypes.TableClassStandard) } + if err := d.Set("warm_throughput", flattenTableWarmThroughput(table.WarmThroughput)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting warm_throughput: %s", err) + } + describeBackupsInput := dynamodb.DescribeContinuousBackupsInput{ TableName: aws.String(d.Id()), } pitrOut, err := conn.DescribeContinuousBackups(ctx, &describeBackupsInput) - // When a Table is `ARCHIVED`, DescribeContinuousBackups returns `TableNotFoundException` if err != nil && !tfawserr.ErrCodeEquals(err, errCodeUnknownOperationException, errCodeTableNotFoundException) { return sdkdiag.AppendErrorf(diags, "reading DynamoDB Table (%s) Continuous Backups: %s", d.Id(), err) diff --git a/internal/service/dynamodb/table_data_source_test.go b/internal/service/dynamodb/table_data_source_test.go index e2345f07f231..56272465c822 100644 --- a/internal/service/dynamodb/table_data_source_test.go +++ b/internal/service/dynamodb/table_data_source_test.go @@ -43,6 +43,8 @@ func TestAccDynamoDBTableDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "point_in_time_recovery.#", resourceName, "point_in_time_recovery.#"), resource.TestCheckResourceAttrPair(datasourceName, "point_in_time_recovery.0.enabled", resourceName, "point_in_time_recovery.0.enabled"), resource.TestCheckResourceAttrPair(datasourceName, "table_class", resourceName, "table_class"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), ), }, }, @@ -119,6 +121,11 @@ resource "aws_dynamodb_table" "test" { read_capacity = 10 projection_type = "INCLUDE" non_key_attributes = ["UserId"] + + + warm_throughput { + read_units_per_second = 12100 + write_units_per_second = 4100 } tags = { diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 142a93bfbf41..e78520335ee1 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -3353,6 +3353,69 @@ func TestAccDynamoDBTable_importTable(t *testing.T) { }) } +func TestAccDynamoDBTable_warmThroughput(t *testing.T) { + ctx := acctest.Context(t) + var conf, confDecreasedThroughput awstypes.TableDescription + resourceName := "aws_dynamodb_table.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_warmThroughput(rName, 5, 5, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.#", "1"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccTableConfig_warmThroughput(rName, 5, 5, 12200, 4200), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.#", "1"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12200"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4200"), + ), + }, + + { + Config: testAccTableConfig_warmThroughput(rName, 6, 6, 12300, 4300), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.#", "1"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12300"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4300"), + ), + }, + { + Config: testAccTableConfig_warmThroughput(rName, 6, 6, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &confDecreasedThroughput), + testAccCheckTableRecreated(&conf, &confDecreasedThroughput), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.#", "1"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), + resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), + ), + }, + }, + }) +} + func testAccCheckTableDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).DynamoDBClient(ctx) @@ -3414,6 +3477,16 @@ func testAccCheckTableNotRecreated(i, j *awstypes.TableDescription) resource.Tes } } +func testAccCheckTableRecreated(i, j *awstypes.TableDescription) resource.TestCheckFunc { + return func(s *terraform.State) error { + if i.CreationDateTime.Equal(aws.ToTime(j.CreationDateTime)) { + return errors.New("DynamoDB Table was not recreated") + } + + return nil + } +} + func testAccCheckReplicaExists(ctx context.Context, n string, region string, v *awstypes.TableDescription) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -5339,3 +5412,29 @@ resource "aws_dynamodb_table" "test_restore" { } `, rName)) } + +func testAccTableConfig_warmThroughput(rName string, maxRead, maxWrite, warmRead, warmWrite int) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + name = %[1]q + billing_mode = "PAY_PER_REQUEST" + hash_key = "TestTableHashKey" + + on_demand_throughput { + max_read_request_units = %[2]d + max_write_request_units = %[3]d + } + + warm_throughput { + read_units_per_second = %[4]d + write_units_per_second = %[5]d + } + + attribute { + name = "TestTableHashKey" + type = "S" + } +} +`, rName, maxRead, maxWrite, warmRead, warmWrite) +} +} diff --git a/internal/service/dynamodb/wait.go b/internal/service/dynamodb/wait.go index 6850495003f9..fc3163769f16 100644 --- a/internal/service/dynamodb/wait.go +++ b/internal/service/dynamodb/wait.go @@ -45,6 +45,19 @@ func waitTableActive(ctx context.Context, conn *dynamodb.Client, tableName strin return nil, err } +func waitTableWarmThroughputActive(ctx context.Context, conn *dynamodb.Client, tableName string, timeout time.Duration) error { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.TableStatusCreating, awstypes.TableStatusUpdating), + Target: enum.Slice(awstypes.TableStatusActive), + Refresh: statusTableWarmThroughput(ctx, conn, tableName), + Timeout: max(createTableTimeout, timeout), + } + + _, err := stateConf.WaitForStateContext(ctx) + + return err +} + func waitTableDeleted(ctx context.Context, conn *dynamodb.Client, tableName string, timeout time.Duration) (*awstypes.TableDescription, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.TableStatusActive, awstypes.TableStatusDeleting), diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index aa25a89dedce..9372d1884c29 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -197,6 +197,7 @@ Optional arguments: Default value is `STANDARD`. * `tags` - (Optional) A map of tags to populate on the created table. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `ttl` - (Optional) Configuration block for TTL. See below. +* `warm_throughput` - (Optional) Sets the number of warm read and write units for the specified table. See below. * `write_capacity` - (Optional) Number of write units for this table. If the `billing_mode` is `PROVISIONED`, this field is required. ### `attribute` @@ -282,6 +283,11 @@ Optional arguments: * `enabled` - (Optional) Whether TTL is enabled. Default value is `false`. +### `warm_throughput` + +* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table decreasing this value will force a new resource. For an index this value can be lowered, but that triggers recreation of the index. Minimum value of `12000`. +* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table decreasing this value will force a new resource. For an index this value can be lowered, but that triggers recreation of the index. Minimum value of `4000`. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 0484bbccace972314b42647752cd5b2f54398c73 Mon Sep 17 00:00:00 2001 From: aristosvo <8375124+aristosvo@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:38:28 +0300 Subject: [PATCH 0030/2115] add global_secondary_index.warm_throughput to aws_dynamodb_table --- internal/service/dynamodb/forge.go | 13 + internal/service/dynamodb/status.go | 20 + internal/service/dynamodb/table.go | 117 ++++- .../service/dynamodb/table_data_source.go | 1 + .../dynamodb/table_data_source_test.go | 9 + internal/service/dynamodb/table_test.go | 491 ++++++++++++++++++ internal/service/dynamodb/wait.go | 13 + website/docs/r/dynamodb_table.html.markdown | 1 + 8 files changed, 659 insertions(+), 6 deletions(-) diff --git a/internal/service/dynamodb/forge.go b/internal/service/dynamodb/forge.go index d5c8c3f77633..e4db4f515245 100644 --- a/internal/service/dynamodb/forge.go +++ b/internal/service/dynamodb/forge.go @@ -46,3 +46,16 @@ func stripOnDemandThroughputAttributes(in map[string]any) (map[string]any, error return m, nil } + +func stripWarmThroughputAttributes(in map[string]interface{}) (map[string]interface{}, error) { + mapCopy, err := copystructure.Copy(in) + if err != nil { + return nil, err + } + + m := mapCopy.(map[string]interface{}) + + delete(m, "warm_throughput") + + return m, nil +} diff --git a/internal/service/dynamodb/status.go b/internal/service/dynamodb/status.go index ac11467713b6..22e06e876e7c 100644 --- a/internal/service/dynamodb/status.go +++ b/internal/service/dynamodb/status.go @@ -133,6 +133,26 @@ func statusGSI(ctx context.Context, conn *dynamodb.Client, tableName, indexName } } +func statusGSIWarmThroughput(ctx context.Context, conn *dynamodb.Client, tableName, indexName string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + output, err := findGSIByTwoPartKey(ctx, conn, tableName, indexName) + + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + if output == nil || output.WarmThroughput == nil { + return nil, "", nil + } + + return output, string(output.WarmThroughput.Status), nil + } +} + func statusPITR(ctx context.Context, conn *dynamodb.Client, tableName string, optFns ...func(*dynamodb.Options)) retry.StateRefreshFunc { return func() (any, string, error) { output, err := findPITRByTableName(ctx, conn, tableName, optFns...) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 234ee11fc917..4b4528b0a1a2 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -215,6 +215,7 @@ func resourceTable() *schema.Resource { Optional: true, Computed: true, }, + "warm_throughput": warmThroughputSchema(), "write_capacity": { Type: schema.TypeInt, Optional: true, @@ -1132,7 +1133,7 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) // Must update all indexes when switching BillingMode from PAY_PER_REQUEST to PROVISIONED if newBillingMode == awstypes.BillingModeProvisioned { for _, gsiUpdate := range gsiUpdates { - if gsiUpdate.Update == nil { + if gsiUpdate.Update == nil || (gsiUpdate.Update != nil && gsiUpdate.Update.WarmThroughput != nil) { continue } @@ -1141,7 +1142,7 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) } } - // update only on-demand throughput indexes when switching to PAY_PER_REQUEST + // update only on-demand throughput indexes when switching to PAY_PER_REQUEST in Phase 2a if newBillingMode == awstypes.BillingModePayPerRequest { for _, gsiUpdate := range gsiUpdates { if gsiUpdate.Update == nil || (gsiUpdate.Update != nil && gsiUpdate.Update.OnDemandThroughput == nil) { @@ -1178,6 +1179,35 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) if _, err := waitGSIActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), fmt.Errorf("GSI (%s): %w", idxName, err)) } + + if err := waitGSIWarmThroughputActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), fmt.Errorf("GSI (%s): %w", idxName, err)) + } + } + } + + // Phase 2b: update indexes in two steps when warm throughput is set + for _, gsiUpdate := range gsiUpdates { + if gsiUpdate.Update == nil || (gsiUpdate.Update != nil && gsiUpdate.Update.WarmThroughput == nil) { + continue + } + + idxName := aws.ToString(gsiUpdate.Update.IndexName) + input := &dynamodb.UpdateTableInput{ + GlobalSecondaryIndexUpdates: []awstypes.GlobalSecondaryIndexUpdate{gsiUpdate}, + TableName: aws.String(d.Id()), + } + + if _, err := conn.UpdateTable(ctx, input); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTable, d.Id(), fmt.Errorf("updating GSI for warm throughput (%s): %w", idxName, err)) + } + + if _, err := waitGSIActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTable, d.Id(), fmt.Errorf("%s GSI (%s): %w", create.ErrActionWaitingForCreation, idxName, err)) + } + + if err := waitGSIWarmThroughputActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), fmt.Errorf("GSI (%s): %w", idxName, err)) } } @@ -1202,6 +1232,10 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta any) if _, err := waitGSIActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTable, d.Id(), fmt.Errorf("%s GSI (%s): %w", create.ErrActionWaitingForCreation, idxName, err)) } + + if err := waitGSIWarmThroughputActive(ctx, conn, d.Id(), idxName, d.Timeout(schema.TimeoutUpdate)); err != nil { + return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForUpdate, resNameTable, d.Id(), fmt.Errorf("GSI (%s): %w", idxName, err)) + } } if d.HasChange("server_side_encryption") { @@ -1779,6 +1813,10 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw c.OnDemandThroughput = expandOnDemandThroughput(v[0].(map[string]any)) } + if v, ok := m["warm_throughput"].([]any); ok && len(v) > 0 && v[0] != nil { + c.WarmThroughput = expandWarmThroughput(v[0].(map[string]any)) + } + ops = append(ops, awstypes.GlobalSecondaryIndexUpdate{ Create: &c, }) @@ -1812,6 +1850,27 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw onDemandThroughputChanged = true } + var oldWarmThroughput *awstypes.WarmThroughput + var newWarmThroughput *awstypes.WarmThroughput + if v, ok := oldMap["warm_throughput"].([]any); ok && len(v) > 0 && v[0] != nil { + oldWarmThroughput = expandWarmThroughput(v[0].(map[string]any)) + } + + if v, ok := newMap["warm_throughput"].([]any); ok && len(v) > 0 && v[0] != nil { + newWarmThroughput = expandWarmThroughput(v[0].(map[string]any)) + } + + var warmThroughputChanged bool + if !reflect.DeepEqual(oldWarmThroughput, newWarmThroughput) { + warmThroughputChanged = true + } + + var warmThroughPutDecreased bool + if warmThroughputChanged && newWarmThroughput != nil && oldWarmThroughput != nil { + warmThroughPutDecreased = (aws.ToInt64(newWarmThroughput.ReadUnitsPerSecond) < aws.ToInt64(oldWarmThroughput.ReadUnitsPerSecond) || + aws.ToInt64(newWarmThroughput.WriteUnitsPerSecond) < aws.ToInt64(oldWarmThroughput.WriteUnitsPerSecond)) + } + // pluck non_key_attributes from oldAttributes and newAttributes as reflect.DeepEquals will compare // ordinal of elements in its equality (which we actually don't care about) nonKeyAttributesChanged := checkIfNonKeyAttributesChanged(oldMap, newMap) @@ -1828,6 +1887,10 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw if err != nil { return ops, err } + oldAttributes, err = stripWarmThroughputAttributes(oldAttributes) + if err != nil { + return ops, err + } newAttributes, err := stripCapacityAttributes(newMap) if err != nil { return ops, err @@ -1840,9 +1903,14 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw if err != nil { return ops, err } - otherAttributesChanged := nonKeyAttributesChanged || !reflect.DeepEqual(oldAttributes, newAttributes) + newAttributes, err = stripWarmThroughputAttributes(newAttributes) + if err != nil { + return ops, err + } + gsiNeedsRecreate := nonKeyAttributesChanged || !reflect.DeepEqual(oldAttributes, newAttributes) || warmThroughPutDecreased - if capacityChanged && !otherAttributesChanged && billingMode == awstypes.BillingModeProvisioned { + // One step in most cases, an extra step in case of warmThroughputChanged without recreation necessity: + if (capacityChanged) && !gsiNeedsRecreate && billingMode == awstypes.BillingModeProvisioned { update := awstypes.GlobalSecondaryIndexUpdate{ Update: &awstypes.UpdateGlobalSecondaryIndexAction{ IndexName: aws.String(idxName), @@ -1850,7 +1918,7 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw }, } ops = append(ops, update) - } else if onDemandThroughputChanged && !otherAttributesChanged && billingMode == awstypes.BillingModePayPerRequest { + } else if onDemandThroughputChanged && !gsiNeedsRecreate && billingMode == awstypes.BillingModePayPerRequest { update := awstypes.GlobalSecondaryIndexUpdate{ Update: &awstypes.UpdateGlobalSecondaryIndexAction{ IndexName: aws.String(idxName), @@ -1858,7 +1926,7 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw }, } ops = append(ops, update) - } else if otherAttributesChanged { + } else if gsiNeedsRecreate { // Other attributes cannot be updated ops = append(ops, awstypes.GlobalSecondaryIndexUpdate{ Delete: &awstypes.DeleteGlobalSecondaryIndexAction{ @@ -1872,9 +1940,20 @@ func updateDiffGSI(oldGsi, newGsi []any, billingMode awstypes.BillingMode) ([]aw KeySchema: expandKeySchema(newMap), ProvisionedThroughput: expandProvisionedThroughput(newMap, billingMode), Projection: expandProjection(newMap), + WarmThroughput: newWarmThroughput, }, }) } + // Separating the WarmThroughput updates from the others + if !gsiNeedsRecreate && warmThroughputChanged { + update := awstypes.GlobalSecondaryIndexUpdate{ + Update: &awstypes.UpdateGlobalSecondaryIndexAction{ + IndexName: aws.String(idxName), + WarmThroughput: newWarmThroughput, + }, + } + ops = append(ops, update) + } } else { idxName := oldName ops = append(ops, awstypes.GlobalSecondaryIndexUpdate{ @@ -2249,6 +2328,10 @@ func flattenTableGlobalSecondaryIndex(gsi []awstypes.GlobalSecondaryIndexDescrip gsi["on_demand_throughput"] = flattenOnDemandThroughput(g.OnDemandThroughput) } + if g.WarmThroughput != nil { + gsi["warm_throughput"] = flattenGSIWarmThroughput(g.WarmThroughput) + } + output = append(output, gsi) } @@ -2316,6 +2399,24 @@ func flattenTableWarmThroughput(apiObject *awstypes.TableWarmThroughputDescripti return []any{m} } +func flattenGSIWarmThroughput(apiObject *awstypes.GlobalSecondaryIndexWarmThroughputDescription) []any { + if apiObject == nil { + return []any{} + } + + m := map[string]any{} + + if v := apiObject.ReadUnitsPerSecond; v != nil { + m["read_units_per_second"] = aws.ToInt64(v) + } + + if v := apiObject.WriteUnitsPerSecond; v != nil { + m["write_units_per_second"] = aws.ToInt64(v) + } + + return []any{m} +} + func flattenReplicaDescription(apiObject *awstypes.ReplicaDescription) map[string]any { if apiObject == nil { return nil @@ -2443,6 +2544,10 @@ func expandGlobalSecondaryIndex(data map[string]any, billingMode awstypes.Billin output.OnDemandThroughput = expandOnDemandThroughput(v[0].(map[string]any)) } + if v, ok := data["warm_throughput"].([]any); ok && len(v) > 0 && v[0] != nil { + output.WarmThroughput = expandWarmThroughput(v[0].(map[string]any)) + } + return &output } diff --git a/internal/service/dynamodb/table_data_source.go b/internal/service/dynamodb/table_data_source.go index a63e7462386b..3f90e338b955 100644 --- a/internal/service/dynamodb/table_data_source.go +++ b/internal/service/dynamodb/table_data_source.go @@ -98,6 +98,7 @@ func dataSourceTable() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "warm_throughput": warmThroughputSchema(), "write_capacity": { Type: schema.TypeInt, Computed: true, diff --git a/internal/service/dynamodb/table_data_source_test.go b/internal/service/dynamodb/table_data_source_test.go index 56272465c822..fb507c86a3a2 100644 --- a/internal/service/dynamodb/table_data_source_test.go +++ b/internal/service/dynamodb/table_data_source_test.go @@ -45,6 +45,10 @@ func TestAccDynamoDBTableDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "table_class", resourceName, "table_class"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12200", + "warm_throughput.0.write_units_per_second": "4200", + }), ), }, }, @@ -122,6 +126,11 @@ resource "aws_dynamodb_table" "test" { projection_type = "INCLUDE" non_key_attributes = ["UserId"] + warm_throughput { + read_units_per_second = 12200 + write_units_per_second = 4200 + } + } warm_throughput { read_units_per_second = 12100 diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index e78520335ee1..f514e16bf1a7 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -150,6 +150,74 @@ func TestUpdateDiffGSI(t *testing.T) { }, }, + { // Creation with warm throughput + Old: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 10, + "read_capacity": 10, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }}, + }, + }, + New: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 10, + "read_capacity": 10, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }}, + }, + map[string]any{ + names.AttrName: "att2-index", + "hash_key": "att2", + "write_capacity": 12, + "read_capacity": 11, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }, + }, + }, + }, + ExpectedUpdates: []awstypes.GlobalSecondaryIndexUpdate{ + { + Create: &awstypes.CreateGlobalSecondaryIndexAction{ + IndexName: aws.String("att2-index"), + KeySchema: []awstypes.KeySchemaElement{ + { + AttributeName: aws.String("att2"), + KeyType: awstypes.KeyTypeHash, + }, + }, + ProvisionedThroughput: &awstypes.ProvisionedThroughput{ + WriteCapacityUnits: aws.Int64(12), + ReadCapacityUnits: aws.Int64(11), + }, + WarmThroughput: &awstypes.WarmThroughput{ + ReadUnitsPerSecond: aws.Int64(10), + WriteUnitsPerSecond: aws.Int64(10), + }, + Projection: &awstypes.Projection{ + ProjectionType: awstypes.ProjectionTypeAll, + }, + }, + }, + }, + }, + { // Deletion Old: []any{ map[string]any{ @@ -217,6 +285,165 @@ func TestUpdateDiffGSI(t *testing.T) { }, }, + { // Update warm throughput 1: update in place + Old: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 10, + "read_capacity": 10, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }, + }, + }, + }, + New: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 10, + "read_capacity": 10, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 11, + "write_units_per_second": 12, + }, + }, + }, + }, + ExpectedUpdates: []awstypes.GlobalSecondaryIndexUpdate{ + { + Update: &awstypes.UpdateGlobalSecondaryIndexAction{ + IndexName: aws.String("att1-index"), + WarmThroughput: &awstypes.WarmThroughput{ + ReadUnitsPerSecond: aws.Int64(11), + WriteUnitsPerSecond: aws.Int64(12), + }, + }, + }, + }, + }, + + { // Update warm throughput 2: update via recreate + Old: []any{ + map[string]any{ + names.AttrName: "att2-index", + "hash_key": "att2", + "write_capacity": 12, + "read_capacity": 11, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 15000, + "write_units_per_second": 5000, + }, + }, + }, + }, + New: []any{ + map[string]any{ + names.AttrName: "att2-index", + "hash_key": "att2", + "write_capacity": 12, + "read_capacity": 11, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 14000, + "write_units_per_second": 5000, + }, + }, + }, + }, + ExpectedUpdates: []awstypes.GlobalSecondaryIndexUpdate{ + { + Delete: &awstypes.DeleteGlobalSecondaryIndexAction{ + IndexName: aws.String("att2-index"), + }, + }, + { + Create: &awstypes.CreateGlobalSecondaryIndexAction{ + IndexName: aws.String("att2-index"), + KeySchema: []awstypes.KeySchemaElement{ + { + AttributeName: aws.String("att2"), + KeyType: awstypes.KeyTypeHash, + }, + }, + ProvisionedThroughput: &awstypes.ProvisionedThroughput{ + WriteCapacityUnits: aws.Int64(12), + ReadCapacityUnits: aws.Int64(11), + }, + WarmThroughput: &awstypes.WarmThroughput{ + ReadUnitsPerSecond: aws.Int64(14000), + WriteUnitsPerSecond: aws.Int64(5000), + }, + Projection: &awstypes.Projection{ + ProjectionType: awstypes.ProjectionTypeAll, + }, + }, + }, + }, + }, + + { // Update warm throughput 3: update in place at the same moment as capacity + Old: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 10, + "read_capacity": 10, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }, + }, + }, + }, + New: []any{ + map[string]any{ + names.AttrName: "att1-index", + "hash_key": "att1", + "write_capacity": 11, + "read_capacity": 12, + "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 11, + "write_units_per_second": 12, + }, + }, + }, + }, + ExpectedUpdates: []awstypes.GlobalSecondaryIndexUpdate{ + { + Update: &awstypes.UpdateGlobalSecondaryIndexAction{ + IndexName: aws.String("att1-index"), + ProvisionedThroughput: &awstypes.ProvisionedThroughput{ + ReadCapacityUnits: aws.Int64(12), + WriteCapacityUnits: aws.Int64(11), + }, + }, + }, + { + Update: &awstypes.UpdateGlobalSecondaryIndexAction{ + IndexName: aws.String("att1-index"), + WarmThroughput: &awstypes.WarmThroughput{ + ReadUnitsPerSecond: aws.Int64(11), + WriteUnitsPerSecond: aws.Int64(12), + }, + }, + }, + }, + }, + { // Update of non-capacity attributes Old: []any{ map[string]any{ @@ -278,6 +505,12 @@ func TestUpdateDiffGSI(t *testing.T) { "write_capacity": 10, "read_capacity": 10, "projection_type": "ALL", + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 10, + "write_units_per_second": 10, + }, + }, }, }, New: []any{ @@ -289,6 +522,12 @@ func TestUpdateDiffGSI(t *testing.T) { "read_capacity": 12, "projection_type": "INCLUDE", "non_key_attributes": schema.NewSet(schema.HashString, []any{"RandomAttribute"}), + "warm_throughput": []any{ + map[string]any{ + "read_units_per_second": 22, + "write_units_per_second": 33, + }, + }, }, }, ExpectedUpdates: []awstypes.GlobalSecondaryIndexUpdate{ @@ -318,6 +557,10 @@ func TestUpdateDiffGSI(t *testing.T) { ProjectionType: awstypes.ProjectionTypeInclude, NonKeyAttributes: []string{"RandomAttribute"}, }, + WarmThroughput: &awstypes.WarmThroughput{ + ReadUnitsPerSecond: aws.Int64(22), + WriteUnitsPerSecond: aws.Int64(33), + }, }, }, }, @@ -3416,6 +3659,184 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { }) } +func TestAccDynamoDBTable_gsiWarmThroughput_billingProvisioned(t *testing.T) { + ctx := acctest.Context(t) + var conf awstypes.TableDescription + resourceName := "aws_dynamodb_table.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName, 1, 1, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModeProvisioned)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12100", + "warm_throughput.0.write_units_per_second": "4100", + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName, 1, 1, 12200, 4200), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModeProvisioned)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12200", + "warm_throughput.0.write_units_per_second": "4200", + }), + ), + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName, 2, 2, 12300, 4300), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModeProvisioned)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12300", + "warm_throughput.0.write_units_per_second": "4300", + }), + ), + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName, 1, 1, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModeProvisioned)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12100", + "warm_throughput.0.write_units_per_second": "4100", + }), + ), + }, + }, + }) +} + +func TestAccDynamoDBTable_gsiWarmThroughput_billingPayPerRequest(t *testing.T) { + ctx := acctest.Context(t) + var conf awstypes.TableDescription + resourceName := "aws_dynamodb_table.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12100", + "warm_throughput.0.write_units_per_second": "4100", + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12200, 4200), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12200", + "warm_throughput.0.write_units_per_second": "4200", + }), + ), + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 6, 6, 12300, 4300), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12300", + "warm_throughput.0.write_units_per_second": "4300", + }), + ), + }, + + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 6, 6, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12100", + "warm_throughput.0.write_units_per_second": "4100", + }), + ), + }, + }, + }) +} + +func TestAccDynamoDBTable_gsiWarmThroughput_switchBilling(t *testing.T) { + ctx := acctest.Context(t) + var conf awstypes.TableDescription + resourceName := "aws_dynamodb_table.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName, 1, 1, 12100, 4100), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModeProvisioned)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12100", + "warm_throughput.0.write_units_per_second": "4100", + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12200, 4200), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + "warm_throughput.0.read_units_per_second": "12200", + "warm_throughput.0.write_units_per_second": "4200", + }), + ), + }, + { + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12200, 4200), + PlanOnly: true, + }, + }, + }) +} + func testAccCheckTableDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).DynamoDBClient(ctx) @@ -5437,4 +5858,74 @@ resource "aws_dynamodb_table" "test" { } `, rName, maxRead, maxWrite, warmRead, warmWrite) } + +func testAccTableConfig_gsiWarmThroughput_billingProvisioned(rName string, readCapacity, writeCapacity, warmRead, warmWrite int) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + billing_mode = "PROVISIONED" + hash_key = "TestTableHashKey" + name = %[1]q + read_capacity = 1 + write_capacity = 1 + + global_secondary_index { + name = "att1-index" + hash_key = "att1" + projection_type = "ALL" + read_capacity = %[2]d + write_capacity = %[3]d + + warm_throughput { + read_units_per_second = %[4]d + write_units_per_second = %[5]d + } + } + + attribute { + name = "TestTableHashKey" + type = "S" + } + + attribute { + name = "att1" + type = "S" + } +} +`, rName, readCapacity, writeCapacity, warmRead, warmWrite) +} + +func testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName string, maxRead, maxWrite, warmRead, warmWrite int) string { + return fmt.Sprintf(` +resource "aws_dynamodb_table" "test" { + name = %[1]q + billing_mode = "PAY_PER_REQUEST" + hash_key = "TestTableHashKey" + + on_demand_throughput { + max_read_request_units = %[2]d + max_write_request_units = %[3]d + } + + global_secondary_index { + name = "att1-index" + hash_key = "att1" + projection_type = "ALL" + + warm_throughput { + read_units_per_second = %[4]d + write_units_per_second = %[5]d + } + } + + attribute { + name = "TestTableHashKey" + type = "S" + } + + attribute { + name = "att1" + type = "S" + } +} +`, rName, maxRead, maxWrite, warmRead, warmWrite) } diff --git a/internal/service/dynamodb/wait.go b/internal/service/dynamodb/wait.go index fc3163769f16..ab36d97e81e1 100644 --- a/internal/service/dynamodb/wait.go +++ b/internal/service/dynamodb/wait.go @@ -149,6 +149,19 @@ func waitGSIActive(ctx context.Context, conn *dynamodb.Client, tableName, indexN return nil, err } +func waitGSIWarmThroughputActive(ctx context.Context, conn *dynamodb.Client, tableName, indexName string, timeout time.Duration) error { //nolint:unparam + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.IndexStatusCreating, awstypes.IndexStatusUpdating), + Target: enum.Slice(awstypes.IndexStatusActive), + Refresh: statusGSIWarmThroughput(ctx, conn, tableName, indexName), + Timeout: max(updateTableTimeout, timeout), + } + + _, err := stateConf.WaitForStateContext(ctx) + + return err +} + func waitGSIDeleted(ctx context.Context, conn *dynamodb.Client, tableName, indexName string, timeout time.Duration) (*awstypes.GlobalSecondaryIndexDescription, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.IndexStatusActive, awstypes.IndexStatusDeleting, awstypes.IndexStatusUpdating), diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index 9372d1884c29..46a0bb7a6582 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -238,6 +238,7 @@ Optional arguments: * `projection_type` - (Required) One of `ALL`, `INCLUDE` or `KEYS_ONLY` where `ALL` projects every attribute into the index, `KEYS_ONLY` projects into the index only the table and index hash_key and sort_key attributes , `INCLUDE` projects into the index all of the attributes that are defined in `non_key_attributes` in addition to the attributes that that`KEYS_ONLY` project. * `range_key` - (Optional) Name of the range key; must be defined * `read_capacity` - (Optional) Number of read units for this index. Must be set if billing_mode is set to PROVISIONED. +* `warm_throughput` - (Optional) Sets the number of warm read and write units for this index. See below. * `write_capacity` - (Optional) Number of write units for this index. Must be set if billing_mode is set to PROVISIONED. ### `local_secondary_index` From c1e7795ef56c372cbf48711eb5b491ed5dbc02d4 Mon Sep 17 00:00:00 2001 From: aristosvo <8375124+aristosvo@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:38:45 +0300 Subject: [PATCH 0031/2115] changelog --- .changelog/41308.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/41308.txt diff --git a/.changelog/41308.txt b/.changelog/41308.txt new file mode 100644 index 000000000000..802bf0de409f --- /dev/null +++ b/.changelog/41308.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments +``` + +```release-note:enhancement +data-source/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` attributes +``` \ No newline at end of file From f5aa76cc11996432072fe8a58aa0ec94c8062200 Mon Sep 17 00:00:00 2001 From: aristosvo <8375124+aristosvo@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:39:39 +0300 Subject: [PATCH 0032/2115] fixes along the way --- internal/service/dynamodb/forge.go | 4 +- internal/service/dynamodb/status.go | 4 +- internal/service/dynamodb/table.go | 138 ++++++++++---------- website/docs/r/dynamodb_table.html.markdown | 2 +- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/internal/service/dynamodb/forge.go b/internal/service/dynamodb/forge.go index e4db4f515245..2c63cc57673d 100644 --- a/internal/service/dynamodb/forge.go +++ b/internal/service/dynamodb/forge.go @@ -47,13 +47,13 @@ func stripOnDemandThroughputAttributes(in map[string]any) (map[string]any, error return m, nil } -func stripWarmThroughputAttributes(in map[string]interface{}) (map[string]interface{}, error) { +func stripWarmThroughputAttributes(in map[string]any) (map[string]any, error) { mapCopy, err := copystructure.Copy(in) if err != nil { return nil, err } - m := mapCopy.(map[string]interface{}) + m := mapCopy.(map[string]any) delete(m, "warm_throughput") diff --git a/internal/service/dynamodb/status.go b/internal/service/dynamodb/status.go index 22e06e876e7c..f9c3abc2b892 100644 --- a/internal/service/dynamodb/status.go +++ b/internal/service/dynamodb/status.go @@ -30,7 +30,7 @@ func statusTable(ctx context.Context, conn *dynamodb.Client, tableName string) r } func statusTableWarmThroughput(ctx context.Context, conn *dynamodb.Client, tableName string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { + return func() (any, string, error) { output, err := findTableByName(ctx, conn, tableName) if tfresource.NotFound(err) { @@ -134,7 +134,7 @@ func statusGSI(ctx context.Context, conn *dynamodb.Client, tableName, indexName } func statusGSIWarmThroughput(ctx context.Context, conn *dynamodb.Client, tableName, indexName string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { + return func() (any, string, error) { output, err := findGSIByTwoPartKey(ctx, conn, tableName, indexName) if tfresource.NotFound(err) { diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 4b4528b0a1a2..92d14d0adb73 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -230,6 +230,75 @@ func resourceTable() *schema.Resource { Computed: true, ForceNew: true, }, + "import_table": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + ConflictsWith: []string{"restore_source_name", "restore_source_table_arn"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "input_compression_type": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.InputCompressionType](), + }, + "input_format": { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.InputFormat](), + }, + "input_format_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "csv": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delimiter": { + Type: schema.TypeString, + Optional: true, + }, + "header_list": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + }, + }, + }, + }, + }, + "s3_bucket_source": { + Type: schema.TypeList, + MaxItems: 1, + Required: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrBucket: { + Type: schema.TypeString, + Required: true, + }, + "bucket_owner": { + Type: schema.TypeString, + Optional: true, + }, + "key_prefix": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + }, + }, + }, "local_secondary_index": { Type: schema.TypeSet, Optional: true, @@ -335,75 +404,6 @@ func resourceTable() *schema.Resource { }, }, }, - "import_table": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - ConflictsWith: []string{"restore_source_name", "restore_source_table_arn"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "input_compression_type": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.InputCompressionType](), - }, - "input_format": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.InputFormat](), - }, - "input_format_options": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "csv": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "delimiter": { - Type: schema.TypeString, - Optional: true, - }, - "header_list": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - }, - }, - }, - }, - }, - }, - "s3_bucket_source": { - Type: schema.TypeList, - MaxItems: 1, - Required: true, - ForceNew: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrBucket: { - Type: schema.TypeString, - Required: true, - }, - "bucket_owner": { - Type: schema.TypeString, - Optional: true, - }, - "key_prefix": { - Type: schema.TypeString, - Optional: true, - }, - }, - }, - }, - }, - }, - }, "restore_date_time": { Type: schema.TypeString, Optional: true, diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index 46a0bb7a6582..adc226f04e2e 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -234,7 +234,7 @@ Optional arguments: * `hash_key` - (Required) Name of the hash key in the index; must be defined as an attribute in the resource. * `name` - (Required) Name of the index. * `non_key_attributes` - (Optional) Only required with `INCLUDE` as a projection type; a list of attributes to project into the index. These do not need to be defined as attributes on the table. -* `on_demand_throughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand table. See below. +* `on_demand_throughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand index. See below. * `projection_type` - (Required) One of `ALL`, `INCLUDE` or `KEYS_ONLY` where `ALL` projects every attribute into the index, `KEYS_ONLY` projects into the index only the table and index hash_key and sort_key attributes , `INCLUDE` projects into the index all of the attributes that are defined in `non_key_attributes` in addition to the attributes that that`KEYS_ONLY` project. * `range_key` - (Optional) Name of the range key; must be defined * `read_capacity` - (Optional) Number of read units for this index. Must be set if billing_mode is set to PROVISIONED. From 94262cf78b1c7f79aaebdf97f3e63c0e3183f7cc Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 8 Apr 2025 09:23:02 -0700 Subject: [PATCH 0033/2115] Add timestreaminfluxdb db_cluster --- .../service/timestreaminfluxdb/db_cluster.go | 700 +++++ .../db_cluster_tags_gen_test.go | 2344 +++++++++++++++++ .../timestreaminfluxdb/db_cluster_test.go | 800 ++++++ .../service/timestreaminfluxdb/db_instance.go | 64 +- .../timestreaminfluxdb/db_instance_test.go | 22 +- .../timestreaminfluxdb/exports_test.go | 2 + .../timestreaminfluxdb/service_package_gen.go | 8 + internal/service/timestreaminfluxdb/sweep.go | 24 + .../testdata/DBCluster/tags/main_gen.tf | 56 + .../DBCluster/tagsComputed1/main_gen.tf | 60 + .../DBCluster/tagsComputed2/main_gen.tf | 71 + .../DBCluster/tags_defaults/main_gen.tf | 67 + .../DBCluster/tags_ignore/main_gen.tf | 76 + .../testdata/tmpl/db_cluster_tags.gtpl | 40 + 14 files changed, 4291 insertions(+), 43 deletions(-) create mode 100644 internal/service/timestreaminfluxdb/db_cluster.go create mode 100644 internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go create mode 100644 internal/service/timestreaminfluxdb/db_cluster_test.go create mode 100644 internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf create mode 100644 internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf create mode 100644 internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf create mode 100644 internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf create mode 100644 internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf create mode 100644 internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go new file mode 100644 index 000000000000..2460b1e7ac79 --- /dev/null +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -0,0 +1,700 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package timestreaminfluxdb + +import ( + "context" + "errors" + "math" + "time" + + "github.com/YakDriver/regexache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/types" + "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" + "github.com/hashicorp/terraform-plugin-framework-validators/int32validator" + "github.com/hashicorp/terraform-plugin-framework-validators/int64validator" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @FrameworkResource("aws_timestreaminfluxdb_db_cluster", name="DB Cluster") +// @Tags(identifierAttribute="arn") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb;timestreaminfluxdb.GetDbClusterOutput") +// @Testing(importIgnore="bucket;username;organization;password") +func newResourceDBCluster(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &resourceDBCluster{} + + r.SetDefaultCreateTimeout(30 * time.Minute) + r.SetDefaultUpdateTimeout(30 * time.Minute) + r.SetDefaultDeleteTimeout(30 * time.Minute) + + return r, nil +} + +const ( + ResNameDBCluster = "DB Cluster" +) + +type resourceDBCluster struct { + framework.ResourceWithConfigure + framework.WithTimeouts + framework.WithImportByID +} + +func (r *resourceDBCluster) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { + resp.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + names.AttrAllocatedStorage: schema.Int64Attribute{ + Required: true, + Validators: []validator.Int64{ + int64validator.Between(20, 16384), + }, + Description: `The amount of storage to allocate for your DB storage type in GiB (gibibytes).`, + }, + names.AttrARN: framework.ARNAttributeComputedOnly(), + names.AttrBucket: schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Validators: []validator.String{ + stringvalidator.LengthBetween(2, 64), + stringvalidator.RegexMatches( + regexache.MustCompile("^[^_][^\"]*$"), + "", + ), + }, + Description: `The name of the initial InfluxDB bucket. All InfluxDB data is stored in a bucket. + A bucket combines the concept of a database and a retention period (the duration of time + that each data point persists). A bucket belongs to an organization.`, + }, + "db_instance_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.DbInstanceType](), + Required: true, + Description: `The Timestream for InfluxDB DB instance type to run InfluxDB on.`, + }, + "db_parameter_group_identifier": schema.StringAttribute{ + Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplaceIf( + dbClusterDBParameterGroupIdentifierReplaceIf, "Replace db_parameter_group_identifier diff", "Replace db_parameter_group_identifier diff", + ), + }, + Validators: []validator.String{ + stringvalidator.LengthBetween(3, 64), + stringvalidator.RegexMatches( + regexache.MustCompile("^[a-zA-Z0-9]+$"), + "", + ), + }, + Description: `The ID of the DB parameter group to assign to your DB cluster. + DB parameter groups specify how the database is configured. For example, DB parameter groups + can specify the limit for query concurrency.`, + }, + "db_storage_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.DbStorageType](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `The Timestream for InfluxDB DB storage type to read and write InfluxDB data. + You can choose between 3 different types of provisioned Influx IOPS included storage according + to your workloads requirements: Influx IO Included 3000 IOPS, Influx IO Included 12000 IOPS, + Influx IO Included 16000 IOPS.`, + }, + "deployment_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.ClusterDeploymentType](), + Optional: true, + Computed: true, + Default: stringdefault.StaticString(string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `Specifies the type of cluster to create.`, + }, + names.AttrEndpoint: schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `The endpoint used to connect to InfluxDB. The default InfluxDB port is 8086.`, + }, + "failover_mode": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.FailoverMode](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `Specifies the behavior of failure recovery when the primary node of the cluster + fails.`, + }, + names.AttrID: framework.IDAttribute(), + "influx_auth_parameters_secret_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `The Amazon Resource Name (ARN) of the AWS Secrets Manager secret containing the + initial InfluxDB authorization parameters. The secret value is a JSON formatted + key-value pair holding InfluxDB authorization values: organization, bucket, + username, and password.`, + }, + names.AttrName: schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Validators: []validator.String{ + stringvalidator.LengthBetween(3, 40), + stringvalidator.RegexMatches( + regexache.MustCompile("^[a-zA-z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$"), + "", + ), + }, + Description: `The name that uniquely identifies the DB cluster when interacting with the + Amazon Timestream for InfluxDB API and CLI commands. This name will also be a + prefix included in the endpoint. DB cluster names must be unique per customer + and per region.`, + }, + "network_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.NetworkType](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + stringplanmodifier.UseStateForUnknown(), + }, + Description: `Specifies whether the networkType of the Timestream for InfluxDB cluster is + IPV4, which can communicate over IPv4 protocol only, or DUAL, which can communicate + over both IPv4 and IPv6 protocols.`, + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + "organization": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Validators: []validator.String{ + stringvalidator.LengthBetween(1, 64), + }, + Description: `The name of the initial organization for the initial admin user in InfluxDB. An + InfluxDB organization is a workspace for a group of users.`, + }, + names.AttrPassword: schema.StringAttribute{ + Required: true, + Sensitive: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Validators: []validator.String{ + stringvalidator.LengthBetween(8, 64), + stringvalidator.RegexMatches(regexache.MustCompile("^[a-zA-Z0-9]+$"), ""), + }, + Description: `The password of the initial admin user created in InfluxDB. This password will + allow you to access the InfluxDB UI to perform various administrative tasks and + also use the InfluxDB CLI to create an operator token. These attributes will be + stored in a Secret created in AWS SecretManager in your account.`, + }, + names.AttrPort: schema.Int32Attribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Int32{ + int32planmodifier.UseStateForUnknown(), + }, + Validators: []validator.Int32{ + int32validator.Between(1024, 65535), + int32validator.NoneOf(2375, 2376, 7788, 7789, 7790, 7791, 7792, 7793, 7794, 7795, 7796, 7797, 7798, 7799, 8090, 51678, 51679, 51680), + }, + Description: `The port number on which InfluxDB accepts connections.`, + }, + names.AttrPubliclyAccessible: schema.BoolAttribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Bool{ + boolplanmodifier.RequiresReplace(), + boolplanmodifier.UseStateForUnknown(), + }, + Description: `Configures the Timestream for InfluxDB cluster with a public IP to facilitate access.`, + }, + "reader_endpoint": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + Description: `The endpoint used to connect to the Timestream for InfluxDB cluster for + read-only operations.`, + }, + names.AttrUsername: schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Validators: []validator.String{ + stringvalidator.RegexMatches( + regexache.MustCompile("^[a-zA-Z]([a-zA-Z0-9]*(-[a-zA-Z0-9]+)*)?$"), + `Must start with a letter and can't end with a hyphen or contain two + consecutive hyphens`, + ), + }, + Description: `The username of the initial admin user created in InfluxDB. + Must start with a letter and can't end with a hyphen or contain two + consecutive hyphens. For example, my-user1. This username will allow + you to access the InfluxDB UI to perform various administrative tasks + and also use the InfluxDB CLI to create an operator token. These + attributes will be stored in a Secret created in Amazon Secrets + Manager in your account`, + }, + names.AttrVPCSecurityGroupIDs: schema.SetAttribute{ + CustomType: fwtypes.SetOfStringType, + Required: true, + PlanModifiers: []planmodifier.Set{ + setplanmodifier.RequiresReplace(), + }, + Validators: []validator.Set{ + setvalidator.SizeBetween(1, 5), + setvalidator.ValueStringsAre( + stringvalidator.LengthAtMost(64), + stringvalidator.RegexMatches(regexache.MustCompile("^sg-[a-z0-9]+$"), ""), + ), + }, + Description: `A list of VPC security group IDs to associate with the Timestream for InfluxDB cluster.`, + }, + "vpc_subnet_ids": schema.SetAttribute{ + CustomType: fwtypes.SetOfStringType, + Required: true, + PlanModifiers: []planmodifier.Set{ + setplanmodifier.RequiresReplace(), + }, + Validators: []validator.Set{ + setvalidator.SizeBetween(1, 3), + setvalidator.ValueStringsAre( + stringvalidator.LengthAtMost(64), + stringvalidator.RegexMatches(regexache.MustCompile("^subnet-[a-z0-9]+$"), ""), + ), + }, + Description: `A list of VPC subnet IDs to associate with the DB cluster. Provide at least + two VPC subnet IDs in different availability zones when deploying with a Multi-AZ standby.`, + }, + }, + Blocks: map[string]schema.Block{ + "log_delivery_configuration": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[dbClusterLogDeliveryConfigurationData](ctx), + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + Description: `Configuration for sending InfluxDB engine logs to a specified S3 bucket.`, + NestedObject: schema.NestedBlockObject{ + Blocks: map[string]schema.Block{ + "s3_configuration": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[dbClusterS3ConfigurationData](ctx), + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + names.AttrBucketName: schema.StringAttribute{ + Required: true, + Validators: []validator.String{ + stringvalidator.LengthBetween(3, 63), + stringvalidator.RegexMatches(regexache.MustCompile("^[0-9a-z]+[0-9a-z\\.\\-]*[0-9a-z]+$"), ""), + }, + Description: `The name of the S3 bucket to deliver logs to.`, + }, + names.AttrEnabled: schema.BoolAttribute{ + Required: true, + Description: `Indicates whether log delivery to the S3 bucket is enabled.`, + }, + }, + }, + Description: `Configuration for S3 bucket log delivery.`, + }, + }, + }, + }, + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ + Create: true, + Update: true, + Delete: true, + }), + }, + } +} + +func dbClusterDBParameterGroupIdentifierReplaceIf(ctx context.Context, req planmodifier.StringRequest, resp *stringplanmodifier.RequiresReplaceIfFuncResponse) { + if req.State.Raw.IsNull() || req.Plan.Raw.IsNull() { + return + } + var plan, state resourceDBClusterData + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + dbParameterGroupIdentifierRemoved := !state.DBParameterGroupIdentifier.IsNull() && plan.DBParameterGroupIdentifier.IsNull() + + resp.RequiresReplace = dbParameterGroupIdentifierRemoved +} + +func (r *resourceDBCluster) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { + conn := r.Meta().TimestreamInfluxDBClient(ctx) + + var plan resourceDBClusterData + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + if resp.Diagnostics.HasError() { + return + } + + input := timestreaminfluxdb.CreateDbClusterInput{} + resp.Diagnostics.Append(fwflex.Expand(ctx, plan, &input)...) + if resp.Diagnostics.HasError() { + return + } + + input.Tags = getTagsIn(ctx) + + out, err := conn.CreateDbCluster(ctx, &input) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionCreating, ResNameDBCluster, plan.Name.String(), err), + err.Error(), + ) + return + } + + if out == nil || out.DbClusterId == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionCreating, ResNameDBCluster, plan.Name.String(), nil), + errors.New("empty output").Error(), + ) + return + } + + state := plan + state.ID = fwflex.StringToFramework(ctx, out.DbClusterId) + + createTimeout := r.CreateTimeout(ctx, plan.Timeouts) + output, err := waitDBClusterCreated(ctx, conn, state.ID.ValueString(), createTimeout) + if err != nil { + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), out.DbClusterId)...) + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionWaitingForCreation, ResNameDBCluster, plan.Name.String(), err), + err.Error(), + ) + return + } + + resp.Diagnostics.Append(fwflex.Flatten(ctx, output, &state)...) + if resp.Diagnostics.HasError() { + return + } + + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) +} + +func (r *resourceDBCluster) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { + conn := r.Meta().TimestreamInfluxDBClient(ctx) + + var state resourceDBClusterData + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + output, err := findDBClusterByID(ctx, conn, state.ID.ValueString()) + if tfresource.NotFound(err) { + resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + resp.State.RemoveResource(ctx) + return + } + + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionSetting, ResNameDBCluster, state.ID.String(), err), + err.Error(), + ) + return + } + + resp.Diagnostics.Append(fwflex.Flatten(ctx, output, &state)...) + if resp.Diagnostics.HasError() { + return + } + + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) +} + +func (r *resourceDBCluster) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { + conn := r.Meta().TimestreamInfluxDBClient(ctx) + + var plan, state resourceDBClusterData + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + diff, d := fwflex.Diff(ctx, plan, state) + resp.Diagnostics.Append(d...) + if resp.Diagnostics.HasError() { + return + } + + if diff.HasChanges() { + input := timestreaminfluxdb.UpdateDbClusterInput{ + DbClusterId: plan.ID.ValueStringPointer(), + } + resp.Diagnostics.Append(fwflex.Expand(ctx, plan, &input, diff.IgnoredFieldNamesOpts()...)...) + if resp.Diagnostics.HasError() { + return + } + + _, err := conn.UpdateDbCluster(ctx, &input) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionUpdating, ResNameDBCluster, plan.ID.String(), err), + err.Error(), + ) + return + } + + updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) + output, err := waitDBClusterUpdated(ctx, conn, plan.ID.ValueString(), updateTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionWaitingForUpdate, ResNameDBCluster, plan.ID.String(), err), + err.Error(), + ) + return + } + + resp.Diagnostics.Append(fwflex.Flatten(ctx, output, &plan)...) + if resp.Diagnostics.HasError() { + return + } + } + + resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) +} + +func (r *resourceDBCluster) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { + conn := r.Meta().TimestreamInfluxDBClient(ctx) + + var state resourceDBClusterData + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + in := ×treaminfluxdb.DeleteDbClusterInput{ + DbClusterId: state.ID.ValueStringPointer(), + } + + _, err := conn.DeleteDbCluster(ctx, in) + if err != nil { + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionDeleting, ResNameDBCluster, state.ID.String(), err), + err.Error(), + ) + return + } + + deleteTimeout := r.DeleteTimeout(ctx, state.Timeouts) + _, err = waitDBClusterDeleted(ctx, conn, state.ID.ValueString(), deleteTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionWaitingForDeletion, ResNameDBCluster, state.ID.String(), err), + err.Error(), + ) + return + } +} + +func (r *resourceDBCluster) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) { + var allocatedStorage types.Int64 + resp.Diagnostics.Append(req.Config.GetAttribute(ctx, path.Root(names.AttrAllocatedStorage), &allocatedStorage)...) + if resp.Diagnostics.HasError() { + return + } + + if allocatedStorage.IsNull() || allocatedStorage.IsUnknown() { + return + } + + if allocatedStorage.ValueInt64() > math.MaxInt32 { + resp.Diagnostics.AddError( + "Invalid value for allocated_storage", + "allocated_storage was greater than the maximum allowed value for int32", + ) + return + } + + if allocatedStorage.ValueInt64() < math.MinInt32 { + resp.Diagnostics.AddError( + "Invalid value for allocated_storage", + "allocated_storage was less than the minimum allowed value for int32", + ) + return + } +} + +func waitDBClusterCreated(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbClusterOutput, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ClusterStatusCreating), + Target: enum.Slice(awstypes.ClusterStatusAvailable), + Refresh: statusDBCluster(ctx, conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*timestreaminfluxdb.GetDbClusterOutput); ok { + return out, err + } + + return nil, err +} + +func waitDBClusterUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbClusterOutput, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ClusterStatusUpdating), + Target: enum.Slice(awstypes.ClusterStatusAvailable), + Refresh: statusDBCluster(ctx, conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*timestreaminfluxdb.GetDbClusterOutput); ok { + return out, err + } + + return nil, err +} + +func waitDBClusterDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbClusterOutput, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ClusterStatusDeleting, awstypes.ClusterStatusDeleted), + Target: []string{}, + Refresh: statusDBCluster(ctx, conn, id), + Timeout: timeout, + Delay: 30 * time.Second, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*timestreaminfluxdb.GetDbClusterOutput); ok { + return out, err + } + + return nil, err +} + +func statusDBCluster(ctx context.Context, conn *timestreaminfluxdb.Client, id string) retry.StateRefreshFunc { + return func() (any, string, error) { + out, err := findDBClusterByID(ctx, conn, id) + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + return out, string(out.Status), nil + } +} + +func findDBClusterByID(ctx context.Context, conn *timestreaminfluxdb.Client, id string) (*timestreaminfluxdb.GetDbClusterOutput, error) { + in := ×treaminfluxdb.GetDbClusterInput{ + DbClusterId: aws.String(id), + } + + out, err := conn.GetDbCluster(ctx, in) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, + } + } + + if err != nil { + return nil, err + } + + if out == nil || out.Id == nil { + return nil, tfresource.NewEmptyResultError(in) + } + + return out, nil +} + +type resourceDBClusterData struct { + AllocatedStorage types.Int64 `tfsdk:"allocated_storage"` + ARN types.String `tfsdk:"arn"` + Bucket types.String `tfsdk:"bucket"` + DBInstanceType fwtypes.StringEnum[awstypes.DbInstanceType] `tfsdk:"db_instance_type"` + DBParameterGroupIdentifier types.String `tfsdk:"db_parameter_group_identifier"` + DBStorageType fwtypes.StringEnum[awstypes.DbStorageType] `tfsdk:"db_storage_type"` + DeploymentType fwtypes.StringEnum[awstypes.ClusterDeploymentType] `tfsdk:"deployment_type"` + Endpoint types.String `tfsdk:"endpoint"` + FailoverMode fwtypes.StringEnum[awstypes.FailoverMode] `tfsdk:"failover_mode"` + ID types.String `tfsdk:"id"` + InfluxAuthParametersSecretARN types.String `tfsdk:"influx_auth_parameters_secret_arn"` + LogDeliveryConfiguration fwtypes.ListNestedObjectValueOf[dbClusterLogDeliveryConfigurationData] `tfsdk:"log_delivery_configuration"` + Name types.String `tfsdk:"name"` + NetworkType fwtypes.StringEnum[awstypes.NetworkType] `tfsdk:"network_type"` + Organization types.String `tfsdk:"organization"` + Password types.String `tfsdk:"password"` + Port types.Int32 `tfsdk:"port"` + PubliclyAccessible types.Bool `tfsdk:"publicly_accessible"` + ReaderEndpoint types.String `tfsdk:"reader_endpoint"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + Username types.String `tfsdk:"username"` + VPCSecurityGroupIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_security_group_ids"` + VPCSubnetIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_subnet_ids"` +} + +type dbClusterLogDeliveryConfigurationData struct { + S3Configuration fwtypes.ListNestedObjectValueOf[dbClusterS3ConfigurationData] `tfsdk:"s3_configuration"` +} + +type dbClusterS3ConfigurationData struct { + BucketName types.String `tfsdk:"bucket_name"` + Enabled types.Bool `tfsdk:"enabled"` +} diff --git a/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go new file mode 100644 index 000000000000..58180bdb3406 --- /dev/null +++ b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go @@ -0,0 +1,2344 @@ +// Code generated by internal/generate/tagstests/main.go; DO NOT EDIT. + +package timestreaminfluxdb_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_null(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_EmptyMap(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_AddOnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToProviderOnly(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToResourceOnly(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "tags.resourcekey1", // The canonical value returned by the AWS API is "" + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed2/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed2/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey(acctest.CtKey1)), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrBucket, names.AttrUsername, "organization", names.AttrPassword, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 2: Update ignored tag only + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Again), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 2: Update ignored tag + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/DBCluster/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go new file mode 100644 index 000000000000..14f17d2cb19d --- /dev/null +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -0,0 +1,800 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package timestreaminfluxdb_test + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" + awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/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/create" + tftimestreaminfluxdb "github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccTimestreamInfluxDBDBCluster_basic(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "timestream-influxdb", regexache.MustCompile(`db-cluster/.+$`)), + resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), + resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), + resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeAutomatic)), + resource.TestCheckResourceAttrSet(resourceName, "influx_auth_parameters_secret_arn"), + resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeIpv4)), + resource.TestCheckResourceAttr(resourceName, names.AttrPort, "8086"), + resource.TestCheckResourceAttr(resourceName, names.AttrPubliclyAccessible, acctest.CtFalse), + resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_disappears(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tftimestreaminfluxdb.ResourceDBCluster, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_dbInstanceType(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxMedium)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxMedium)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxLarge)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxLarge)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtTrue), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), + resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtFalse), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_networkType(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_networkTypeIPV4(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeIpv4)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_networkTypeDual(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeDual)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_port(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + port1 := "8086" + port2 := "8087" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_port(rName, port1), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, names.AttrPort, port1), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_port(rName, port2), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, names.AttrPort, port2), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_allocatedStorage(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + allocatedStorage1 := "20" + allocatedStorage2 := "40" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage1), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage1), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage2), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage2), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_dbStorageType(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT1)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT2)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT2)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_publiclyAccessible(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_publiclyAccessible(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttrSet(resourceName, names.AttrEndpoint), + resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint"), + resource.TestCheckResourceAttr(resourceName, names.AttrPubliclyAccessible, acctest.CtTrue), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func TestAccTimestreamInfluxDBDBCluster_deploymentType(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_deploymentType(rName, string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + +func testAccCheckDBClusterDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_timestreaminfluxdb_db_cluster" { + continue + } + + _, err := tftimestreaminfluxdb.FindDBClusterByID(ctx, conn, rs.Primary.ID) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingDestroyed, tftimestreaminfluxdb.ResNameDBCluster, rs.Primary.ID, err) + } + + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingDestroyed, tftimestreaminfluxdb.ResNameDBCluster, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func testAccCheckDBClusterExists(ctx context.Context, name string, dbCluster *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingExistence, tftimestreaminfluxdb.ResNameDBCluster, name, errors.New("not found")) + } + + if rs.Primary.ID == "" { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingExistence, tftimestreaminfluxdb.ResNameDBCluster, name, errors.New("not set")) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + resp, err := tftimestreaminfluxdb.FindDBClusterByID(ctx, conn, rs.Primary.ID) + + if err != nil { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingExistence, tftimestreaminfluxdb.ResNameDBCluster, rs.Primary.ID, err) + } + + *dbCluster = *resp + + return nil + } +} + +func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { + conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + + input := ×treaminfluxdb.ListDbClustersInput{} + _, err := conn.ListDbClusters(ctx, input) + + if acctest.PreCheckSkipError(err) { + t.Skipf("skipping acceptance testing: %s", err) + } + if err != nil { + t.Fatalf("unexpected PreCheck error: %s", err) + } +} + +func testAccCheckDBClusterNotRecreated(before, after *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + if before, after := aws.ToString(before.Id), aws.ToString(after.Id); before != after { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, tftimestreaminfluxdb.ResNameDBCluster, before, errors.New("recreated")) + } + + return nil + } +} + +func testAccDBClusterConfig_base(rName string, subnetCount int) string { + return acctest.ConfigCompose(acctest.ConfigVPCWithSubnets(rName, subnetCount), ` +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} +`) +} + +// Minimal configuration. +func testAccDBClusterConfig_basic(rName string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + port = 8086 + bucket = "initial" + organization = "organization" +} +`, rName)) +} + +func testAccDBClusterConfig_dbInstanceType(rName string, instanceType string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = %[2]q + port = 8086 + bucket = "initial" + organization = "organization" +} +`, rName, instanceType)) +} + +// Configuration with log_delivery_configuration set and enabled. +func testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName string, enabled bool) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +data "aws_iam_policy_document" "test" { + statement { + actions = ["s3:PutObject"] + principals { + type = "Service" + identifiers = ["timestream-influxdb.amazonaws.com"] + } + resources = [ + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "test" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.test.json +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + publicly_accessible = false + port = 8086 + bucket = "initial" + organization = "organization" + + log_delivery_configuration { + s3_configuration { + bucket_name = aws_s3_bucket.test.bucket + enabled = %[2]t + } + } +} +`, rName, enabled)) +} + +func testAccDBClusterConfig_publiclyAccessible(rName string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_internet_gateway" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_route" "test" { + route_table_id = aws_vpc.test.main_route_table_id + destination_cidr_block = "0.0.0.0/0" + gateway_id = aws_internet_gateway.test.id +} + +resource "aws_route_table_association" "test" { + subnet_id = aws_subnet.test[0].id + route_table_id = aws_vpc.test.main_route_table_id +} + +resource "aws_vpc_security_group_ingress_rule" "test" { + security_group_id = aws_security_group.test.id + referenced_security_group_id = aws_security_group.test.id + ip_protocol = -1 +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + db_storage_type = "InfluxIOIncludedT1" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + publicly_accessible = true +} +`, rName)) +} + +func testAccDBClusterConfig_deploymentType(rName string, deploymentType string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + db_storage_type = "InfluxIOIncludedT1" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + deployment_type = %[2]q +} +`, rName, deploymentType)) +} + +func testAccDBClusterConfig_networkTypeIPV4(rName string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + port = 8086 + bucket = "initial" + organization = "organization" + + network_type = "IPV4" +} +`, rName)) +} + +func testAccDBClusterConfig_networkTypeDual(rName string) string { + return acctest.ConfigCompose(acctest.ConfigVPCWithSubnetsIPv6(rName, 2), fmt.Sprintf(` +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + port = 8086 + bucket = "initial" + organization = "organization" + + network_type = "DUAL" +} +`, rName)) +} + +func testAccDBClusterConfig_port(rName string, port string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + port = %[2]s +} +`, rName, port)) +} + +func testAccDBClusterConfig_allocatedStorage(rName string, storageAmount string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + allocated_storage = %[2]s +} +`, rName, storageAmount)) +} + +func testAccDBClusterConfig_dbStorageType(rName string, dbStorageType string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = %[1]q + allocated_storage = 400 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + db_storage_type = %[2]q +} +`, rName, dbStorageType)) +} diff --git a/internal/service/timestreaminfluxdb/db_instance.go b/internal/service/timestreaminfluxdb/db_instance.go index 90de5c14cc5b..4f40d7fe8679 100644 --- a/internal/service/timestreaminfluxdb/db_instance.go +++ b/internal/service/timestreaminfluxdb/db_instance.go @@ -109,7 +109,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ Optional: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplaceIf( - dbParameterGroupIdentifierReplaceIf, "Replace db_parameter_group_identifier diff", "Replace db_parameter_group_identifier diff", + dbInstanceDBParameterGroupIdentifierReplaceIf, "Replace db_parameter_group_identifier diff", "Replace db_parameter_group_identifier diff", ), }, Validators: []validator.String{ @@ -298,7 +298,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ }, Blocks: map[string]schema.Block{ "log_delivery_configuration": schema.ListNestedBlock{ - CustomType: fwtypes.NewListNestedObjectTypeOf[logDeliveryConfigurationData](ctx), + CustomType: fwtypes.NewListNestedObjectTypeOf[dbInstanceLogDeliveryConfigurationData](ctx), Validators: []validator.List{ listvalidator.SizeAtMost(1), }, @@ -306,7 +306,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ NestedObject: schema.NestedBlockObject{ Blocks: map[string]schema.Block{ "s3_configuration": schema.ListNestedBlock{ - CustomType: fwtypes.NewListNestedObjectTypeOf[s3ConfigurationData](ctx), + CustomType: fwtypes.NewListNestedObjectTypeOf[dbInstanceS3ConfigurationData](ctx), Validators: []validator.List{ listvalidator.SizeAtMost(1), }, @@ -340,7 +340,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ } } -func dbParameterGroupIdentifierReplaceIf(ctx context.Context, req planmodifier.StringRequest, resp *stringplanmodifier.RequiresReplaceIfFuncResponse) { +func dbInstanceDBParameterGroupIdentifierReplaceIf(ctx context.Context, req planmodifier.StringRequest, resp *stringplanmodifier.RequiresReplaceIfFuncResponse) { if req.State.Raw.IsNull() || req.Plan.Raw.IsNull() { return } @@ -664,38 +664,38 @@ func findDBInstanceByID(ctx context.Context, conn *timestreaminfluxdb.Client, id } type resourceDBInstanceData struct { - AllocatedStorage types.Int64 `tfsdk:"allocated_storage"` - ARN types.String `tfsdk:"arn"` - AvailabilityZone types.String `tfsdk:"availability_zone"` - Bucket types.String `tfsdk:"bucket"` - DBInstanceType fwtypes.StringEnum[awstypes.DbInstanceType] `tfsdk:"db_instance_type"` - DBParameterGroupIdentifier types.String `tfsdk:"db_parameter_group_identifier"` - DBStorageType fwtypes.StringEnum[awstypes.DbStorageType] `tfsdk:"db_storage_type"` - DeploymentType fwtypes.StringEnum[awstypes.DeploymentType] `tfsdk:"deployment_type"` - Endpoint types.String `tfsdk:"endpoint"` - ID types.String `tfsdk:"id"` - InfluxAuthParametersSecretARN types.String `tfsdk:"influx_auth_parameters_secret_arn"` - LogDeliveryConfiguration fwtypes.ListNestedObjectValueOf[logDeliveryConfigurationData] `tfsdk:"log_delivery_configuration"` - Name types.String `tfsdk:"name"` - NetworkType fwtypes.StringEnum[awstypes.NetworkType] `tfsdk:"network_type"` - Organization types.String `tfsdk:"organization"` - Password types.String `tfsdk:"password"` - Port types.Int32 `tfsdk:"port"` - PubliclyAccessible types.Bool `tfsdk:"publicly_accessible"` - SecondaryAvailabilityZone types.String `tfsdk:"secondary_availability_zone"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` - Timeouts timeouts.Value `tfsdk:"timeouts"` - Username types.String `tfsdk:"username"` - VPCSecurityGroupIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_security_group_ids"` - VPCSubnetIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_subnet_ids"` + AllocatedStorage types.Int64 `tfsdk:"allocated_storage"` + ARN types.String `tfsdk:"arn"` + AvailabilityZone types.String `tfsdk:"availability_zone"` + Bucket types.String `tfsdk:"bucket"` + DBInstanceType fwtypes.StringEnum[awstypes.DbInstanceType] `tfsdk:"db_instance_type"` + DBParameterGroupIdentifier types.String `tfsdk:"db_parameter_group_identifier"` + DBStorageType fwtypes.StringEnum[awstypes.DbStorageType] `tfsdk:"db_storage_type"` + DeploymentType fwtypes.StringEnum[awstypes.DeploymentType] `tfsdk:"deployment_type"` + Endpoint types.String `tfsdk:"endpoint"` + ID types.String `tfsdk:"id"` + InfluxAuthParametersSecretARN types.String `tfsdk:"influx_auth_parameters_secret_arn"` + LogDeliveryConfiguration fwtypes.ListNestedObjectValueOf[dbInstanceLogDeliveryConfigurationData] `tfsdk:"log_delivery_configuration"` + Name types.String `tfsdk:"name"` + NetworkType fwtypes.StringEnum[awstypes.NetworkType] `tfsdk:"network_type"` + Organization types.String `tfsdk:"organization"` + Password types.String `tfsdk:"password"` + Port types.Int32 `tfsdk:"port"` + PubliclyAccessible types.Bool `tfsdk:"publicly_accessible"` + SecondaryAvailabilityZone types.String `tfsdk:"secondary_availability_zone"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + Username types.String `tfsdk:"username"` + VPCSecurityGroupIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_security_group_ids"` + VPCSubnetIDs fwtypes.SetValueOf[types.String] `tfsdk:"vpc_subnet_ids"` } -type logDeliveryConfigurationData struct { - S3Configuration fwtypes.ListNestedObjectValueOf[s3ConfigurationData] `tfsdk:"s3_configuration"` +type dbInstanceLogDeliveryConfigurationData struct { + S3Configuration fwtypes.ListNestedObjectValueOf[dbInstanceS3ConfigurationData] `tfsdk:"s3_configuration"` } -type s3ConfigurationData struct { +type dbInstanceS3ConfigurationData struct { BucketName types.String `tfsdk:"bucket_name"` Enabled types.Bool `tfsdk:"enabled"` } diff --git a/internal/service/timestreaminfluxdb/db_instance_test.go b/internal/service/timestreaminfluxdb/db_instance_test.go index 5116182913f8..b47e75272610 100644 --- a/internal/service/timestreaminfluxdb/db_instance_test.go +++ b/internal/service/timestreaminfluxdb/db_instance_test.go @@ -37,7 +37,7 @@ func TestAccTimestreamInfluxDBDBInstance_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -80,7 +80,7 @@ func TestAccTimestreamInfluxDBDBInstance_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -111,7 +111,7 @@ func TestAccTimestreamInfluxDBDBInstance_dbInstanceType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -161,7 +161,7 @@ func TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration(t *testing.T) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -215,7 +215,7 @@ func TestAccTimestreamInfluxDBDBInstance_networkType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -266,7 +266,7 @@ func TestAccTimestreamInfluxDBDBInstance_port(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -318,7 +318,7 @@ func TestAccTimestreamInfluxDBDBInstance_allocatedStorage(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -368,7 +368,7 @@ func TestAccTimestreamInfluxDBDBInstance_dbStorageType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -418,7 +418,7 @@ func TestAccTimestreamInfluxDBDBInstance_publiclyAccessible(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -455,7 +455,7 @@ func TestAccTimestreamInfluxDBDBInstance_deploymentType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -546,7 +546,7 @@ func testAccCheckDBInstanceExists(ctx context.Context, name string, dbInstance * } } -func testAccPreCheck(ctx context.Context, t *testing.T) { +func testAccPreCheckDBInstances(ctx context.Context, t *testing.T) { conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) input := ×treaminfluxdb.ListDbInstancesInput{} diff --git a/internal/service/timestreaminfluxdb/exports_test.go b/internal/service/timestreaminfluxdb/exports_test.go index 55949817f990..f11a4baf79c8 100644 --- a/internal/service/timestreaminfluxdb/exports_test.go +++ b/internal/service/timestreaminfluxdb/exports_test.go @@ -5,7 +5,9 @@ package timestreaminfluxdb // Exports for use in tests only. var ( + ResourceDBCluster = newResourceDBCluster ResourceDBInstance = newResourceDBInstance + FindDBClusterByID = findDBClusterByID FindDBInstanceByID = findDBInstanceByID ) diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index 06bfeec80e2f..1fa9e7cb1667 100644 --- a/internal/service/timestreaminfluxdb/service_package_gen.go +++ b/internal/service/timestreaminfluxdb/service_package_gen.go @@ -20,6 +20,14 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { return []*types.ServicePackageFrameworkResource{ + { + Factory: newResourceDBCluster, + TypeName: "aws_timestreaminfluxdb_db_cluster", + Name: "DB Cluster", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }, + }, { Factory: newResourceDBInstance, TypeName: "aws_timestreaminfluxdb_db_instance", diff --git a/internal/service/timestreaminfluxdb/sweep.go b/internal/service/timestreaminfluxdb/sweep.go index 569fdc645b6d..bbcec6c7606b 100644 --- a/internal/service/timestreaminfluxdb/sweep.go +++ b/internal/service/timestreaminfluxdb/sweep.go @@ -16,9 +16,33 @@ import ( ) func RegisterSweepers() { + awsv2.Register("aws_timestreaminfluxdb_db_cluster", sweepDBClusters) awsv2.Register("aws_timestreaminfluxdb_db_instance", sweepDBInstances) } +func sweepDBClusters(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { + conn := client.TimestreamInfluxDBClient(ctx) + var input timestreaminfluxdb.ListDbClustersInput + sweepResources := make([]sweep.Sweepable, 0) + + pages := timestreaminfluxdb.NewListDbClustersPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + + if err != nil { + return nil, err + } + + for _, v := range page.Items { + sweepResources = append(sweepResources, framework.NewSweepResource(newResourceDBCluster, client, + framework.NewAttribute(names.AttrID, aws.ToString(v.Id)), + )) + } + } + + return sweepResources, nil +} + func sweepDBInstances(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.TimestreamInfluxDBClient(ctx) var input timestreaminfluxdb.ListDbInstancesInput diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf new file mode 100644 index 000000000000..8ba6f55f28da --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf @@ -0,0 +1,56 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf new file mode 100644 index 000000000000..f265c77d220e --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf @@ -0,0 +1,60 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = { + (var.unknownTagKey) = null_resource.test.id + } +} + +resource "null_resource" "test" {} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "unknownTagKey" { + type = string + nullable = false +} diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf new file mode 100644 index 000000000000..1c8fa2919223 --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf @@ -0,0 +1,71 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } +} + +resource "null_resource" "test" {} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "unknownTagKey" { + type = string + nullable = false +} + +variable "knownTagKey" { + type = string + nullable = false +} + +variable "knownTagValue" { + type = string + nullable = false +} diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf new file mode 100644 index 000000000000..0ac96a7a0ea3 --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf @@ -0,0 +1,67 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = false +} diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf new file mode 100644 index 000000000000..e8967ad97853 --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf @@ -0,0 +1,76 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } + ignore_tags { + keys = var.ignore_tag_keys + } +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = true + default = null +} + +variable "ignore_tag_keys" { + type = set(string) + nullable = false +} diff --git a/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl b/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl new file mode 100644 index 000000000000..97d893fedc0d --- /dev/null +++ b/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl @@ -0,0 +1,40 @@ +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +data "aws_availability_zones" "available" { + exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + +{{- template "tags" . }} +} From cc52ef89ecf37488c31b15f8ed1b5a990d14a014 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 15 Apr 2025 15:17:37 -0700 Subject: [PATCH 0034/2115] Improve cluster tests --- .../service/timestreaminfluxdb/db_cluster.go | 2 + .../timestreaminfluxdb/db_cluster_test.go | 142 +++++++++--------- 2 files changed, 75 insertions(+), 69 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 2460b1e7ac79..7ff877ce321b 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -122,6 +122,7 @@ func (r *resourceDBCluster) Schema(ctx context.Context, req resource.SchemaReque Optional: true, Computed: true, PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), stringplanmodifier.UseStateForUnknown(), }, Description: `The Timestream for InfluxDB DB storage type to read and write InfluxDB data. @@ -135,6 +136,7 @@ func (r *resourceDBCluster) Schema(ctx context.Context, req resource.SchemaReque Computed: true, Default: stringdefault.StaticString(string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), stringplanmodifier.UseStateForUnknown(), }, Description: `Specifies the type of cluster to create.`, diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index 14f17d2cb19d..9f4369e9cdda 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -209,7 +209,7 @@ func TestAccTimestreamInfluxDBDBCluster_networkType(t *testing.T) { t.Skip("skipping long-running test in short mode") } - var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + var dbCluster timestreaminfluxdb.GetDbClusterOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" @@ -225,7 +225,7 @@ func TestAccTimestreamInfluxDBDBCluster_networkType(t *testing.T) { { Config: testAccDBClusterConfig_networkTypeIPV4(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeIpv4)), ), }, @@ -235,19 +235,6 @@ func TestAccTimestreamInfluxDBDBCluster_networkType(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, }, - { - Config: testAccDBClusterConfig_networkTypeDual(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), - resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeDual)), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, - }, }, }) } @@ -310,9 +297,8 @@ func TestAccTimestreamInfluxDBDBCluster_allocatedStorage(t *testing.T) { t.Skip("skipping long-running test in short mode") } - var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput - allocatedStorage1 := "20" - allocatedStorage2 := "40" + var dbCluster timestreaminfluxdb.GetDbClusterOutput + allocatedStorage := "20" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" @@ -326,24 +312,10 @@ func TestAccTimestreamInfluxDBDBCluster_allocatedStorage(t *testing.T) { CheckDestroy: testAccCheckDBClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage1), + Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), - resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage1), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, - }, - { - Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage2), - Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), - resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage2), + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage), ), }, { @@ -362,7 +334,7 @@ func TestAccTimestreamInfluxDBDBCluster_dbStorageType(t *testing.T) { t.Skip("skipping long-running test in short mode") } - var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + var dbCluster timestreaminfluxdb.GetDbClusterOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" @@ -378,7 +350,7 @@ func TestAccTimestreamInfluxDBDBCluster_dbStorageType(t *testing.T) { { Config: testAccDBClusterConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT1)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), ), }, @@ -388,20 +360,6 @@ func TestAccTimestreamInfluxDBDBCluster_dbStorageType(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, }, - { - Config: testAccDBClusterConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT2)), - Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), - resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT2)), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, - }, }, }) } @@ -480,6 +438,56 @@ func TestAccTimestreamInfluxDBDBCluster_deploymentType(t *testing.T) { }) } +func TestAccTimestreamInfluxDBDBCluster_failoverMode(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_timestreaminfluxdb_db_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckDBClusters(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDBClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDBClusterConfig_failoverMode(rName, string(awstypes.FailoverModeAutomatic)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeAutomatic)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + { + Config: testAccDBClusterConfig_failoverMode(rName, string(awstypes.FailoverModeNoFailover)), + Check: resource.ComposeTestCheckFunc( + testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), + resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeNoFailover)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, + }, + }, + }) +} + func testAccCheckDBClusterDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) @@ -724,11 +732,8 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { `, rName)) } -func testAccDBClusterConfig_networkTypeDual(rName string) string { - return acctest.ConfigCompose(acctest.ConfigVPCWithSubnetsIPv6(rName, 2), fmt.Sprintf(` -resource "aws_security_group" "test" { - vpc_id = aws_vpc.test.id -} +func testAccDBClusterConfig_port(rName string, port string) string { + return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` resource "aws_timestreaminfluxdb_db_cluster" "test" { name = %[1]q allocated_storage = 20 @@ -737,20 +742,18 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { vpc_subnet_ids = aws_subnet.test[*].id vpc_security_group_ids = [aws_security_group.test.id] db_instance_type = "db.influx.medium" - port = 8086 bucket = "initial" organization = "organization" - network_type = "DUAL" + port = %[2]s } -`, rName)) +`, rName, port)) } -func testAccDBClusterConfig_port(rName string, port string) string { +func testAccDBClusterConfig_allocatedStorage(rName string, storageAmount string) string { return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` resource "aws_timestreaminfluxdb_db_cluster" "test" { name = %[1]q - allocated_storage = 20 username = "admin" password = "testpassword" vpc_subnet_ids = aws_subnet.test[*].id @@ -759,15 +762,16 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { bucket = "initial" organization = "organization" - port = %[2]s + allocated_storage = %[2]s } -`, rName, port)) +`, rName, storageAmount)) } -func testAccDBClusterConfig_allocatedStorage(rName string, storageAmount string) string { +func testAccDBClusterConfig_dbStorageType(rName string, dbStorageType string) string { return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` resource "aws_timestreaminfluxdb_db_cluster" "test" { name = %[1]q + allocated_storage = 400 username = "admin" password = "testpassword" vpc_subnet_ids = aws_subnet.test[*].id @@ -776,12 +780,12 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { bucket = "initial" organization = "organization" - allocated_storage = %[2]s + db_storage_type = %[2]q } -`, rName, storageAmount)) +`, rName, dbStorageType)) } -func testAccDBClusterConfig_dbStorageType(rName string, dbStorageType string) string { +func testAccDBClusterConfig_failoverMode(rName string, failoverMode string) string { return acctest.ConfigCompose(testAccDBClusterConfig_base(rName, 2), fmt.Sprintf(` resource "aws_timestreaminfluxdb_db_cluster" "test" { name = %[1]q @@ -794,7 +798,7 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { bucket = "initial" organization = "organization" - db_storage_type = %[2]q + failover_mode = %[2]q } -`, rName, dbStorageType)) +`, rName, failoverMode)) } From 9731c5c03c8dfba0a489e386f22f8382f331001f Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 15 Apr 2025 15:19:16 -0700 Subject: [PATCH 0035/2115] Remove mention of accessing instance secret for imports --- website/docs/r/timestreaminfluxdb_db_instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/timestreaminfluxdb_db_instance.html.markdown b/website/docs/r/timestreaminfluxdb_db_instance.html.markdown index 3d2d6e6670a2..586d5f02d48a 100644 --- a/website/docs/r/timestreaminfluxdb_db_instance.html.markdown +++ b/website/docs/r/timestreaminfluxdb_db_instance.html.markdown @@ -252,7 +252,7 @@ This resource exports the following attributes in addition to the arguments abov * `availability_zone` - Availability Zone in which the DB instance resides. * `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. * `id` - ID of the Timestream for InfluxDB instance. -* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. This secret will be read by the `aws_timestreaminfluxdb_db_instance` resource in order to support importing: deleting the secret or secret values can cause errors. +* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. * `secondary_availability_zone` - Availability Zone in which the standby instance is located when deploying with a MultiAZ standby instance. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). From 4c3df0c86a40602073ca468a4c1ab80ac67a70db Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 15 Apr 2025 15:20:58 -0700 Subject: [PATCH 0036/2115] Add cluster website documentation --- ...imestreaminfluxdb_db_cluster.html.markdown | 264 ++++++++++++++++++ 1 file changed, 264 insertions(+) create mode 100644 website/docs/r/timestreaminfluxdb_db_cluster.html.markdown diff --git a/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown b/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown new file mode 100644 index 000000000000..642e947b6560 --- /dev/null +++ b/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown @@ -0,0 +1,264 @@ +--- +subcategory: "Timestream for InfluxDB" +layout: "aws" +page_title: "AWS: aws_timestreaminfluxdb_db_cluster" +description: |- + Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. +--- + +# Resource: aws_timestreaminfluxdb_db_cluster + +Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. + +~> **NOTE:** This resource requires a subscription to [Timestream for InfluxDB Read Replicas (Add-On) on the AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-lftzfxtb5xlv4?applicationId=AWS-Marketplace-Console&ref_=beagle&sr=0-2). + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_timestreaminfluxdb_db_cluster" "example" { + allocated_storage = 20 + bucket = "example-bucket-name" + db_instance_type = "db.influx.medium" + failover_mode = "AUTOMATIC" + username = "admin" + password = "example-password" + port = 8086 + organization = "organization" + vpc_subnet_ids = [aws_subnet.example_1.id, aws_subnet.example_2.id] + vpc_security_group_ids = [aws_security_group.example.id] + name = "example-db-cluster" +} +``` + +### Usage with Prerequisite Resources + +All Timestream for InfluxDB clusters require a VPC, at least two subnets, and a security group. The following example shows how these prerequisite resources can be created and used with `aws_timestreaminfluxdb_db_cluster`. + +```terraform +resource "aws_vpc" "example" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_subnet" "example_1" { + vpc_id = aws_vpc.example.id + cidr_block = "10.0.1.0/24" +} + +resource "aws_subnet" "example_2" { + vpc_id = aws_vpc.example.id + cidr_block = "10.0.2.0/24" +} + +resource "aws_security_group" "example" { + name = "example" + vpc_id = aws_vpc.example.id +} + +resource "aws_timestreaminfluxdb_db_cluster" "example" { + allocated_storage = 20 + bucket = "example-bucket-name" + db_instance_type = "db.influx.medium" + username = "admin" + password = "example-password" + organization = "organization" + vpc_subnet_ids = [aws_subnet.example_1.id, aws_subnet.example_2.id] + vpc_security_group_ids = [aws_security_group.example.id] + name = "example-db-cluster" +} +``` + +### Usage with Public Internet Access Enabled + +The following configuration shows how to define the necessary resources and arguments to allow public internet access on your Timestream for InfluxDB read-replica cluster's primary endpoint (simply referred to as "endpoint") and read endpoint on port `8086`. After applying this configuration, the cluster's InfluxDB UI can be accessed by visiting your cluster's primary endpoint at port `8086`. + +```terraform +resource "aws_vpc" "example" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_subnet" "example_1" { + vpc_id = aws_vpc.example.id + cidr_block = "10.0.1.0/24" +} + +resource "aws_subnet" "example_2" { + vpc_id = aws_vpc.example.id + cidr_block = "10.0.2.0/24" +} + +resource "aws_security_group" "example" { + name = "example" + vpc_id = aws_vpc.example.id +} + +resource "aws_internet_gateway" "example" { + vpc_id = aws_vpc.example.id + + tags = { + Name = "example" + } +} + +resource "aws_route" "test_route" { + route_table_id = aws_vpc.example.main_route_table_id + destination_cidr_block = "0.0.0.0/0" + gateway_id = aws_internet_gateway.example.id +} + +resource "aws_route_table_association" "test_route_table_association" { + subnet_id = aws_subnet.test_subnet.id + route_table_id = aws_vpc.example.main_route_table_id +} + +resource "aws_vpc_security_group_ingress_rule" "example" { + security_group_id = aws_security_group.example.id + referenced_security_group_id = aws_security_group.example.id + ip_protocol = -1 +} + +resource "aws_vpc_security_group_ingress_rule" "example" { + security_group_id = aws_security_group.example.id + cidr_ipv4 = "0.0.0.0/0" + ip_protocol = "tcp" + from_port = 8086 + to_port = 8086 +} + +resource "aws_timestreaminfluxdb_db_cluster" "example" { + allocated_storage = 20 + bucket = "example-bucket-name" + db_instance_type = "db.influx.medium" + username = "admin" + password = "example-password" + organization = "organization" + vpc_subnet_ids = [aws_subnet.example_1.id, aws_subnet.example_2.id] + vpc_security_group_ids = [aws_security_group.example.id] + name = "example-db-cluster" + publicly_accessible = true # False by default +} +``` + +### Usage with S3 Log Delivery Enabled + +You can use an S3 bucket to store logs generated by your Timestream for InfluxDB cluster. The following example shows what resources and arguments are required to configure an S3 bucket for logging, including the IAM policy that needs to be set in order to allow Timestream for InfluxDB to place logs in your S3 bucket. The configuration of the required VPC, security group, and subnets have been left out of the example for brevity. + +```terraform +resource "aws_s3_bucket" "example" { + bucket = "example-s3-bucket" + force_destroy = true +} + +data "aws_iam_policy_document" "example" { + statement { + actions = ["s3:PutObject"] + principals { + type = "Service" + identifiers = ["timestream-influxdb.amazonaws.com"] + } + resources = [ + "${aws_s3_bucket.example.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "example" { + bucket = aws_s3_bucket.example.id + policy = data.aws_iam_policy_document.example.json +} + +resource "aws_timestreaminfluxdb_db_cluster" "example" { + allocated_storage = 20 + bucket = "example-bucket-name" + db_instance_type = "db.influx.medium" + username = "admin" + password = "example-password" + organization = "organization" + vpc_subnet_ids = [aws_subnet.example_1.id, aws_subnet.example_2.id] + vpc_security_group_ids = [aws_security_group.example.id] + name = "example-db-cluster" + + log_delivery_configuration { + s3_configuration { + bucket_name = aws_s3_bucket.example.bucket + enabled = true + } + } +} +``` + +## Argument Reference + +The following arguments are required: + +* `allocated_storage` - (Required) Amount of storage in GiB (gibibytes). The minimum value is `20`, the maximum value is `16384`. The argument `db_storage_type` places restrictions on this argument's minimum value. The following is a list of `db_storage_type` values and the corresponding minimum value for `allocated_storage`: `"InfluxIOIncludedT1": `20`, `"InfluxIOIncludedT2" and `"InfluxIOIncludedT3": `400`. +* `bucket` - (Required) Name of the initial InfluxDB bucket. All InfluxDB data is stored in a bucket. A bucket combines the concept of a database and a retention period (the duration of time that each data point persists). A bucket belongs to an organization. Along with `organization`, `username`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `db_instance_type` - (Required) Timestream for InfluxDB DB instance type to run InfluxDB on. Valid options are: `"db.influx.medium"`, `"db.influx.large"`, `"db.influx.xlarge"`, `"db.influx.2xlarge"`, `"db.influx.4xlarge"`, `"db.influx.8xlarge"`, `"db.influx.12xlarge"`, and `"db.influx.16xlarge"`. This argument is updatable. +* `name` - (Required) Name that uniquely identifies the DB cluster when interacting with the Amazon Timestream for InfluxDB API and CLI commands. This name will also be a prefix included in the endpoint. Cluster names must be unique per customer and per region. The argument must start with a letter, cannot contain consecutive hyphens (`-`) and cannot end with a hyphen. +* `password` - (Required) Password of the initial admin user created in InfluxDB. This password will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `username`, and `organization`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `organization` - (Required) Name of the initial organization for the initial admin user in InfluxDB. An InfluxDB organization is a workspace for a group of users. Along with `bucket`, `username`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `username` - (Required) Username of the initial admin user created in InfluxDB. Must start with a letter and can't end with a hyphen or contain two consecutive hyphens. This username will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `organization`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `vpc_security_group_ids` - (Required) List of VPC security group IDs to associate with the cluster. +* `vpc_subnet_ids` - (Required) List of VPC subnet IDs to associate with the cluster. Provide at least two VPC subnet IDs in different availability zones when deploying with a Multi-AZ standby. + +The following arguments are optional: + +* `db_parameter_group_identifier` - (Optional) ID of the DB parameter group assigned to your cluster. This argument is updatable. If added to an existing Timestream for InfluxDB cluster or given a new value, will cause an in-place update to the cluster. However, if a cluster already has a value for `db_parameter_group_identifier`, removing `db_parameter_group_identifier` will cause the cluster to be destroyed and recreated. +* `db_storage_type` - (Default `"InfluxIOIncludedT1"`) Timestream for InfluxDB DB storage type to read and write InfluxDB data. You can choose between 3 different types of provisioned Influx IOPS included storage according to your workloads requirements: Influx IO Included 3000 IOPS, Influx IO Included 12000 IOPS, Influx IO Included 16000 IOPS. Valid options are: `"InfluxIOIncludedT1"`, `"InfluxIOIncludedT2"`, and `"InfluxIOIncludedT3"`. If you use `"InfluxIOIncludedT2" or "InfluxIOIncludedT3", the minimum value for `allocated_storage` is 400. +* `deployment_type` - (Default `"MULTI_NODE_READ_REPLICAS"`) Specifies the type of cluster to create. Valid options are: `"MULTI_NODE_READ_REPLICAS"`. +* `failover_mode` - (Default `"AUTOMATIC"`) Specifies the behavior of failure recovery when the primary node of the cluster fails. Valid options are: `"AUTOMATIC"` and `"NO_FAILOVER"`. +* `log_delivery_configuration` - (Optional) Configuration for sending InfluxDB engine logs to a specified S3 bucket. This argument is updatable. +* `network_type` - (Optional) Specifies whether the network type of the Timestream for InfluxDB cluster is IPV4, which can communicate over IPv4 protocol only, or DUAL, which can communicate over both IPv4 and IPv6 protocols. +* `port` - (Default `8086`) The port on which the cluster accepts connections. Valid values: `1024`-`65535`. Cannot be `2375`-`2376`, `7788`-`7799`, `8090`, or `51678`-`51680`. This argument is updatable. +* `publicly_accessible` - (Default `false`) Configures the DB cluster with a public IP to facilitate access. Other resources, such as a VPC, a subnet, an internet gateway, and a route table with routes, are also required to enabled public access, in addition to this argument. See "[Usage with Public Internet Access Enabled](#usage-with-public-internet-access-enabled)" for an example configuration with all required resources for public internet access. +* `tags` - (Optional) Map of tags assigned to the resource. If configured with a provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Nested Fields + +#### `log_delivery_configuration` + +* `s3_configuration` - (Required) Configuration for S3 bucket log delivery. + +#### `s3_configuration` + +* `bucket_name` - (Required) Name of the S3 bucket to deliver logs to. +* `enabled` - (Required) Indicates whether log delivery to the S3 bucket is enabled. + +**Note**: The following arguments do updates in-place: `db_parameter_group_identifier`, `log_delivery_configuration`, `port`, `db_instance_type`, `failover_mode`, and `tags`. Changes to any other argument after a cluster has been deployed will cause destruction and re-creation of the cluster. Additionally, when `db_parameter_group_identifier` is added to a cluster or modified, the cluster will be updated in-place but if `db_parameter_group_identifier` is removed from a cluster, the cluster will be destroyed and re-created. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Timestream for InfluxDB cluster. +* `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. +* `id` - ID of the Timestream for InfluxDB cluster. +* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. +* `reader_endpoint` - The endpoint used to connect to the Timestream for InfluxDB cluster for read-only operations. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Timestream for InfluxDB cluster using its identifier. For example: + +```terraform +import { + to = aws_timestreaminfluxdb_db_cluster.example + id = "12345abcde" +} +``` + +Using `terraform import`, import Timestream for InfluxDB cluster using its identifier. For example: + +```console +% terraform import aws_timestreaminfluxdb_db_cluster.example 12345abcde +``` From 1867006a5dfc3d2ff45a6ccbd8ec1c35b31505c5 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 15 Apr 2025 15:22:22 -0700 Subject: [PATCH 0037/2115] Fix instance tag test failures --- internal/service/timestreaminfluxdb/db_instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_instance.go b/internal/service/timestreaminfluxdb/db_instance.go index 4f40d7fe8679..cf24e21a5862 100644 --- a/internal/service/timestreaminfluxdb/db_instance.go +++ b/internal/service/timestreaminfluxdb/db_instance.go @@ -460,7 +460,7 @@ func (r *resourceDBInstance) Update(ctx context.Context, req resource.UpdateRequ return } - diff, d := fwflex.Diff(ctx, plan, state) + diff, d := fwflex.Diff(ctx, plan, state, fwflex.WithIgnoredField("SecondaryAvailabilityZone")) resp.Diagnostics.Append(d...) if resp.Diagnostics.HasError() { return From 1e7aaae9ed071f59f7a1b3f14baab4e2e97dc4fd Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Wed, 16 Apr 2025 09:58:49 -0700 Subject: [PATCH 0038/2115] Add StatusUpdatingInstanceType as cluster pending update status --- internal/service/timestreaminfluxdb/db_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 7ff877ce321b..1a7519130fa4 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -592,7 +592,7 @@ func waitDBClusterCreated(ctx context.Context, conn *timestreaminfluxdb.Client, func waitDBClusterUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbClusterOutput, error) { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.ClusterStatusUpdating), + Pending: []string{string(awstypes.ClusterStatusUpdating), string(awstypes.StatusUpdatingInstanceType)}, Target: enum.Slice(awstypes.ClusterStatusAvailable), Refresh: statusDBCluster(ctx, conn, id), Timeout: timeout, From d87ca4797926fe219d93ef1c7b6b15f13a2ea27b Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Fri, 25 Apr 2025 13:23:30 -0700 Subject: [PATCH 0039/2115] Use enum.Slice for db_cluster pending statuses --- internal/service/timestreaminfluxdb/db_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 1a7519130fa4..40ef1c7b5dc6 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -592,7 +592,7 @@ func waitDBClusterCreated(ctx context.Context, conn *timestreaminfluxdb.Client, func waitDBClusterUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbClusterOutput, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{string(awstypes.ClusterStatusUpdating), string(awstypes.StatusUpdatingInstanceType)}, + Pending: enum.Slice(string(awstypes.ClusterStatusUpdating), string(awstypes.StatusUpdatingInstanceType)), Target: enum.Slice(awstypes.ClusterStatusAvailable), Refresh: statusDBCluster(ctx, conn, id), Timeout: timeout, From 6dd175f37d67b185da366c21a797a1270be107af Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Fri, 25 Apr 2025 14:26:17 -0700 Subject: [PATCH 0040/2115] Add .changelog entry --- .changelog/42382.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/42382.txt diff --git a/.changelog/42382.txt b/.changelog/42382.txt new file mode 100644 index 000000000000..3b9c964b56e0 --- /dev/null +++ b/.changelog/42382.txt @@ -0,0 +1,7 @@ +```release-note:new-resource +aws_timestreaminfluxdb_db_cluster +``` + +```release-note:bug +resource/aws_timestreaminfluxdb_db_instance: Fix tag updates causing errors +``` From 96bf0df7495ef3f9f741b3fe31025bb9de03c96b Mon Sep 17 00:00:00 2001 From: Alex Bacchin Date: Sat, 26 Apr 2025 10:09:47 +1000 Subject: [PATCH 0041/2115] updated interface{} to any --- internal/service/dlm/lifecycle_policy.go | 306 +++++++++++------------ 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 44bb54d64dd1..9f1eee2097b5 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -670,7 +670,7 @@ const ( ResNameLifecyclePolicy = "Lifecycle Policy" ) -func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { const createRetryTimeout = 2 * time.Minute var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) @@ -678,7 +678,7 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, input := dlm.CreateLifecyclePolicyInput{ Description: aws.String(d.Get(names.AttrDescription).(string)), ExecutionRoleArn: aws.String(d.Get(names.AttrExecutionRoleARN).(string)), - PolicyDetails: expandPolicyDetails(d.Get("policy_details").([]interface{}), d.Get("default_policy").(string)), + PolicyDetails: expandPolicyDetails(d.Get("policy_details").([]any), d.Get("default_policy").(string)), State: awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)), Tags: getTagsIn(ctx), } @@ -687,7 +687,7 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, input.DefaultPolicy = awstypes.DefaultPolicyTypeValues(v.(string)) } - out, err := tfresource.RetryWhenIsA[*awstypes.InvalidRequestException](ctx, createRetryTimeout, func() (interface{}, error) { + out, err := tfresource.RetryWhenIsA[*awstypes.InvalidRequestException](ctx, createRetryTimeout, func() (any, error) { return conn.CreateLifecyclePolicy(ctx, &input) }) @@ -700,7 +700,7 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, return append(diags, resourceLifecyclePolicyRead(ctx, d, meta)...) } -func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) @@ -733,7 +733,7 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me return diags } -func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) @@ -752,7 +752,7 @@ func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, input.State = awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)) } if d.HasChange("policy_details") { - input.PolicyDetails = expandPolicyDetails(d.Get("policy_details").([]interface{}), d.Get("default_policy").(string)) + input.PolicyDetails = expandPolicyDetails(d.Get("policy_details").([]any), d.Get("default_policy").(string)) } log.Printf("[INFO] Updating lifecycle policy %s", d.Id()) @@ -765,7 +765,7 @@ func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, return append(diags, resourceLifecyclePolicyRead(ctx, d, meta)...) } -func resourceLifecyclePolicyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { +func resourceLifecyclePolicyDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) @@ -810,11 +810,11 @@ func findLifecyclePolicyByID(ctx context.Context, conn *dlm.Client, id string) ( return output, nil } -func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes.PolicyDetails { +func expandPolicyDetails(cfg []any, defaultPolicyValue string) *awstypes.PolicyDetails { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) policyType := m["policy_type"].(string) policyDetails := &awstypes.PolicyDetails{ @@ -827,7 +827,7 @@ func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes if v, ok := m["create_interval"].(int); ok { policyDetails.CreateInterval = aws.Int32(int32(v)) } - if v, ok := m["exclusions"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["exclusions"].([]any); ok && len(v) > 0 { policyDetails.Exclusions = expandExclusions(v) } if v, ok := m["extend_deletion"].(bool); ok { @@ -843,33 +843,33 @@ func expandPolicyDetails(cfg []interface{}, defaultPolicyValue string) *awstypes if v, ok := m["policy_language"].(string); ok { policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) } - if v, ok := m["resource_types"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["resource_types"].([]any); ok && len(v) > 0 { policyDetails.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) } - if v, ok := m["resource_locations"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["resource_locations"].([]any); ok && len(v) > 0 { policyDetails.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) } - if v, ok := m[names.AttrSchedule].([]interface{}); ok && len(v) > 0 { + if v, ok := m[names.AttrSchedule].([]any); ok && len(v) > 0 { policyDetails.Schedules = expandSchedules(v) } - if v, ok := m[names.AttrAction].([]interface{}); ok && len(v) > 0 { + if v, ok := m[names.AttrAction].([]any); ok && len(v) > 0 { policyDetails.Actions = expandActions(v) } - if v, ok := m["event_source"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["event_source"].([]any); ok && len(v) > 0 { policyDetails.EventSource = expandEventSource(v) } - if v, ok := m["target_tags"].(map[string]interface{}); ok && len(v) > 0 { + if v, ok := m["target_tags"].(map[string]any); ok && len(v) > 0 { policyDetails.TargetTags = expandTags(v) } - if v, ok := m[names.AttrParameters].([]interface{}); ok && len(v) > 0 { + if v, ok := m[names.AttrParameters].([]any); ok && len(v) > 0 { policyDetails.Parameters = expandParameters(v, policyType) } return policyDetails } -func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]interface{} { - result := make(map[string]interface{}) +func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]any { + result := make(map[string]any) result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) result[names.AttrAction] = flattenActions(policyDetails.Actions) @@ -889,22 +889,22 @@ func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]in result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) } - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandSchedules(cfg []interface{}) []awstypes.Schedule { +func expandSchedules(cfg []any) []awstypes.Schedule { schedules := make([]awstypes.Schedule, len(cfg)) for i, c := range cfg { schedule := awstypes.Schedule{} - m := c.(map[string]interface{}) - if v, ok := m["archive_rule"].([]interface{}); ok && len(v) > 0 { + m := c.(map[string]any) + if v, ok := m["archive_rule"].([]any); ok && len(v) > 0 { schedule.ArchiveRule = expandArchiveRule(v) } if v, ok := m["copy_tags"]; ok { schedule.CopyTags = aws.Bool(v.(bool)) } if v, ok := m["create_rule"]; ok { - schedule.CreateRule = expandCreateRule(v.([]interface{})) + schedule.CreateRule = expandCreateRule(v.([]any)) } if v, ok := m["cross_region_copy_rule"].(*schema.Set); ok && v.Len() > 0 { schedule.CrossRegionCopyRules = expandCrossRegionCopyRules(v.List()) @@ -913,22 +913,22 @@ func expandSchedules(cfg []interface{}) []awstypes.Schedule { schedule.Name = aws.String(v.(string)) } if v, ok := m["deprecate_rule"]; ok { - schedule.DeprecateRule = expandDeprecateRule(v.([]interface{})) + schedule.DeprecateRule = expandDeprecateRule(v.([]any)) } if v, ok := m["fast_restore_rule"]; ok { - schedule.FastRestoreRule = expandFastRestoreRule(v.([]interface{})) + schedule.FastRestoreRule = expandFastRestoreRule(v.([]any)) } if v, ok := m["share_rule"]; ok { - schedule.ShareRules = expandShareRule(v.([]interface{})) + schedule.ShareRules = expandShareRule(v.([]any)) } if v, ok := m["retain_rule"]; ok { - schedule.RetainRule = expandRetainRule(v.([]interface{})) + schedule.RetainRule = expandRetainRule(v.([]any)) } if v, ok := m["tags_to_add"]; ok { - schedule.TagsToAdd = expandTags(v.(map[string]interface{})) + schedule.TagsToAdd = expandTags(v.(map[string]any)) } if v, ok := m["variable_tags"]; ok { - schedule.VariableTags = expandTags(v.(map[string]interface{})) + schedule.VariableTags = expandTags(v.(map[string]any)) } schedules[i] = schedule @@ -937,10 +937,10 @@ func expandSchedules(cfg []interface{}) []awstypes.Schedule { return schedules } -func flattenSchedules(schedules []awstypes.Schedule) []map[string]interface{} { - result := make([]map[string]interface{}, len(schedules)) +func flattenSchedules(schedules []awstypes.Schedule) []map[string]any { + result := make([]map[string]any, len(schedules)) for i, s := range schedules { - m := make(map[string]interface{}) + m := make(map[string]any) m["archive_rule"] = flattenArchiveRule(s.ArchiveRule) m["copy_tags"] = aws.ToBool(s.CopyTags) m["create_rule"] = flattenCreateRule(s.CreateRule) @@ -968,11 +968,11 @@ func flattenSchedules(schedules []awstypes.Schedule) []map[string]interface{} { return result } -func expandActions(cfg []interface{}) []awstypes.Action { +func expandActions(cfg []any) []awstypes.Action { actions := make([]awstypes.Action, len(cfg)) for i, c := range cfg { action := awstypes.Action{} - m := c.(map[string]interface{}) + m := c.(map[string]any) if v, ok := m["cross_region_copy"].(*schema.Set); ok { action.CrossRegionCopy = expandActionCrossRegionCopyRules(v.List()) } @@ -986,10 +986,10 @@ func expandActions(cfg []interface{}) []awstypes.Action { return actions } -func flattenActions(actions []awstypes.Action) []map[string]interface{} { - result := make([]map[string]interface{}, len(actions)) +func flattenActions(actions []awstypes.Action) []map[string]any { + result := make([]map[string]any, len(actions)) for i, s := range actions { - m := make(map[string]interface{}) + m := make(map[string]any) m[names.AttrName] = aws.ToString(s.Name) @@ -1003,7 +1003,7 @@ func flattenActions(actions []awstypes.Action) []map[string]interface{} { return result } -func expandActionCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyAction { +func expandActionCrossRegionCopyRules(l []any) []awstypes.CrossRegionCopyAction { if len(l) == 0 || l[0] == nil { return nil } @@ -1011,17 +1011,17 @@ func expandActionCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCop var rules []awstypes.CrossRegionCopyAction for _, tfMapRaw := range l { - m, ok := tfMapRaw.(map[string]interface{}) + m, ok := tfMapRaw.(map[string]any) if !ok { continue } rule := awstypes.CrossRegionCopyAction{} - if v, ok := m[names.AttrEncryptionConfiguration].([]interface{}); ok { + if v, ok := m[names.AttrEncryptionConfiguration].([]any); ok { rule.EncryptionConfiguration = expandActionCrossRegionCopyRuleEncryptionConfiguration(v) } - if v, ok := m["retain_rule"].([]interface{}); ok && len(v) > 0 && v[0] != nil { + if v, ok := m["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { rule.RetainRule = expandCrossRegionCopyRuleRetainRule(v) } if v, ok := m[names.AttrTarget].(string); ok && v != "" { @@ -1034,15 +1034,15 @@ func expandActionCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCop return rules } -func flattenActionCrossRegionCopyRules(rules []awstypes.CrossRegionCopyAction) []interface{} { +func flattenActionCrossRegionCopyRules(rules []awstypes.CrossRegionCopyAction) []any { if len(rules) == 0 { - return []interface{}{} + return []any{} } - var result []interface{} + var result []any for _, rule := range rules { - m := map[string]interface{}{ + m := map[string]any{ names.AttrEncryptionConfiguration: flattenActionCrossRegionCopyRuleEncryptionConfiguration(rule.EncryptionConfiguration), "retain_rule": flattenCrossRegionCopyRuleRetainRule(rule.RetainRule), names.AttrTarget: aws.ToString(rule.Target), @@ -1054,12 +1054,12 @@ func flattenActionCrossRegionCopyRules(rules []awstypes.CrossRegionCopyAction) [ return result } -func expandActionCrossRegionCopyRuleEncryptionConfiguration(l []interface{}) *awstypes.EncryptionConfiguration { +func expandActionCrossRegionCopyRuleEncryptionConfiguration(l []any) *awstypes.EncryptionConfiguration { if len(l) == 0 || l[0] == nil { return nil } - m := l[0].(map[string]interface{}) + m := l[0].(map[string]any) config := &awstypes.EncryptionConfiguration{ Encrypted: aws.Bool(m[names.AttrEncrypted].(bool)), } @@ -1070,55 +1070,55 @@ func expandActionCrossRegionCopyRuleEncryptionConfiguration(l []interface{}) *aw return config } -func flattenActionCrossRegionCopyRuleEncryptionConfiguration(rule *awstypes.EncryptionConfiguration) []interface{} { +func flattenActionCrossRegionCopyRuleEncryptionConfiguration(rule *awstypes.EncryptionConfiguration) []any { if rule == nil { - return []interface{}{} + return []any{} } - m := map[string]interface{}{ + m := map[string]any{ names.AttrEncrypted: aws.ToBool(rule.Encrypted), "cmk_arn": aws.ToString(rule.CmkArn), } - return []interface{}{m} + return []any{m} } -func expandEventSource(l []interface{}) *awstypes.EventSource { +func expandEventSource(l []any) *awstypes.EventSource { if len(l) == 0 || l[0] == nil { return nil } - m := l[0].(map[string]interface{}) + m := l[0].(map[string]any) config := &awstypes.EventSource{ Type: awstypes.EventSourceValues(m[names.AttrType].(string)), } - if v, ok := m[names.AttrParameters].([]interface{}); ok && len(v) > 0 { + if v, ok := m[names.AttrParameters].([]any); ok && len(v) > 0 { config.Parameters = expandEventSourceParameters(v) } return config } -func flattenEventSource(rule *awstypes.EventSource) []interface{} { +func flattenEventSource(rule *awstypes.EventSource) []any { if rule == nil { - return []interface{}{} + return []any{} } - m := map[string]interface{}{ + m := map[string]any{ names.AttrParameters: flattenEventSourceParameters(rule.Parameters), names.AttrType: string(rule.Type), } - return []interface{}{m} + return []any{m} } -func expandEventSourceParameters(l []interface{}) *awstypes.EventParameters { +func expandEventSourceParameters(l []any) *awstypes.EventParameters { if len(l) == 0 || l[0] == nil { return nil } - m := l[0].(map[string]interface{}) + m := l[0].(map[string]any) config := &awstypes.EventParameters{ DescriptionRegex: aws.String(m["description_regex"].(string)), EventType: awstypes.EventTypeValues(m["event_type"].(string)), @@ -1128,21 +1128,21 @@ func expandEventSourceParameters(l []interface{}) *awstypes.EventParameters { return config } -func flattenEventSourceParameters(rule *awstypes.EventParameters) []interface{} { +func flattenEventSourceParameters(rule *awstypes.EventParameters) []any { if rule == nil { - return []interface{}{} + return []any{} } - m := map[string]interface{}{ + m := map[string]any{ "description_regex": aws.ToString(rule.DescriptionRegex), "event_type": string(rule.EventType), "snapshot_owner": flex.FlattenStringValueSet(rule.SnapshotOwner), } - return []interface{}{m} + return []any{m} } -func expandCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyRule { +func expandCrossRegionCopyRules(l []any) []awstypes.CrossRegionCopyRule { if len(l) == 0 || l[0] == nil { return nil } @@ -1150,7 +1150,7 @@ func expandCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyRule var rules []awstypes.CrossRegionCopyRule for _, tfMapRaw := range l { - m, ok := tfMapRaw.(map[string]interface{}) + m, ok := tfMapRaw.(map[string]any) if !ok { continue @@ -1164,13 +1164,13 @@ func expandCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyRule if v, ok := m["copy_tags"].(bool); ok { rule.CopyTags = aws.Bool(v) } - if v, ok := m["deprecate_rule"].([]interface{}); ok && len(v) > 0 && v[0] != nil { + if v, ok := m["deprecate_rule"].([]any); ok && len(v) > 0 && v[0] != nil { rule.DeprecateRule = expandCrossRegionCopyRuleDeprecateRule(v) } if v, ok := m[names.AttrEncrypted].(bool); ok { rule.Encrypted = aws.Bool(v) } - if v, ok := m["retain_rule"].([]interface{}); ok && len(v) > 0 && v[0] != nil { + if v, ok := m["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { rule.RetainRule = expandCrossRegionCopyRuleRetainRule(v) } if v, ok := m[names.AttrTarget].(string); ok && v != "" { @@ -1183,15 +1183,15 @@ func expandCrossRegionCopyRules(l []interface{}) []awstypes.CrossRegionCopyRule return rules } -func flattenCrossRegionCopyRules(rules []awstypes.CrossRegionCopyRule) []interface{} { +func flattenCrossRegionCopyRules(rules []awstypes.CrossRegionCopyRule) []any { if len(rules) == 0 { - return []interface{}{} + return []any{} } - var result []interface{} + var result []any for _, rule := range rules { - m := map[string]interface{}{ + m := map[string]any{ "cmk_arn": aws.ToString(rule.CmkArn), "copy_tags": aws.ToBool(rule.CopyTags), "deprecate_rule": flattenCrossRegionCopyRuleDeprecateRule(rule.DeprecateRule), @@ -1206,12 +1206,12 @@ func flattenCrossRegionCopyRules(rules []awstypes.CrossRegionCopyRule) []interfa return result } -func expandCrossRegionCopyRuleDeprecateRule(l []interface{}) *awstypes.CrossRegionCopyDeprecateRule { +func expandCrossRegionCopyRuleDeprecateRule(l []any) *awstypes.CrossRegionCopyDeprecateRule { if len(l) == 0 || l[0] == nil { return nil } - m := l[0].(map[string]interface{}) + m := l[0].(map[string]any) return &awstypes.CrossRegionCopyDeprecateRule{ Interval: aws.Int32(int32(m[names.AttrInterval].(int))), @@ -1219,12 +1219,12 @@ func expandCrossRegionCopyRuleDeprecateRule(l []interface{}) *awstypes.CrossRegi } } -func expandCrossRegionCopyRuleRetainRule(l []interface{}) *awstypes.CrossRegionCopyRetainRule { +func expandCrossRegionCopyRuleRetainRule(l []any) *awstypes.CrossRegionCopyRetainRule { if len(l) == 0 || l[0] == nil { return nil } - m := l[0].(map[string]interface{}) + m := l[0].(map[string]any) return &awstypes.CrossRegionCopyRetainRule{ Interval: aws.Int32(int32(m[names.AttrInterval].(int))), @@ -1232,40 +1232,40 @@ func expandCrossRegionCopyRuleRetainRule(l []interface{}) *awstypes.CrossRegionC } } -func flattenCrossRegionCopyRuleDeprecateRule(rule *awstypes.CrossRegionCopyDeprecateRule) []interface{} { +func flattenCrossRegionCopyRuleDeprecateRule(rule *awstypes.CrossRegionCopyDeprecateRule) []any { if rule == nil { - return []interface{}{} + return []any{} } - m := map[string]interface{}{ + m := map[string]any{ names.AttrInterval: int(aws.ToInt32(rule.Interval)), "interval_unit": string(rule.IntervalUnit), } - return []interface{}{m} + return []any{m} } -func flattenCrossRegionCopyRuleRetainRule(rule *awstypes.CrossRegionCopyRetainRule) []interface{} { +func flattenCrossRegionCopyRuleRetainRule(rule *awstypes.CrossRegionCopyRetainRule) []any { if rule == nil { - return []interface{}{} + return []any{} } - m := map[string]interface{}{ + m := map[string]any{ names.AttrInterval: int(aws.ToInt32(rule.Interval)), "interval_unit": string(rule.IntervalUnit), } - return []interface{}{m} + return []any{m} } -func expandCreateRule(cfg []interface{}) *awstypes.CreateRule { +func expandCreateRule(cfg []any) *awstypes.CreateRule { if len(cfg) == 0 || cfg[0] == nil { return nil } - c := cfg[0].(map[string]interface{}) + c := cfg[0].(map[string]any) createRule := &awstypes.CreateRule{} - if v, ok := c["times"].([]interface{}); ok && len(v) > 0 { + if v, ok := c["times"].([]any); ok && len(v) > 0 { createRule.Times = flex.ExpandStringValueList(v) } @@ -1288,17 +1288,17 @@ func expandCreateRule(cfg []interface{}) *awstypes.CreateRule { createRule.IntervalUnit = "" // sets interval unit to empty string so that all fields related to interval are ignored } if v, ok := c["scripts"]; ok { - createRule.Scripts = expandScripts(v.([]interface{})) + createRule.Scripts = expandScripts(v.([]any)) } return createRule } -func flattenCreateRule(createRule *awstypes.CreateRule) []map[string]interface{} { +func flattenCreateRule(createRule *awstypes.CreateRule) []map[string]any { if createRule == nil { - return []map[string]interface{}{} + return []map[string]any{} } - result := make(map[string]interface{}) + result := make(map[string]any) result["times"] = flex.FlattenStringValueList(createRule.Times) if createRule.Interval != nil { @@ -1317,14 +1317,14 @@ func flattenCreateRule(createRule *awstypes.CreateRule) []map[string]interface{} result["scripts"] = flattenScripts(createRule.Scripts) } - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandRetainRule(cfg []interface{}) *awstypes.RetainRule { +func expandRetainRule(cfg []any) *awstypes.RetainRule { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) rule := &awstypes.RetainRule{} if v, ok := m["count"].(int); ok && v > 0 { @@ -1342,20 +1342,20 @@ func expandRetainRule(cfg []interface{}) *awstypes.RetainRule { return rule } -func flattenRetainRule(retainRule *awstypes.RetainRule) []map[string]interface{} { - result := make(map[string]interface{}) +func flattenRetainRule(retainRule *awstypes.RetainRule) []map[string]any { + result := make(map[string]any) result["count"] = aws.ToInt32(retainRule.Count) result["interval_unit"] = string(retainRule.IntervalUnit) result[names.AttrInterval] = aws.ToInt32(retainRule.Interval) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandDeprecateRule(cfg []interface{}) *awstypes.DeprecateRule { +func expandDeprecateRule(cfg []any) *awstypes.DeprecateRule { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) rule := &awstypes.DeprecateRule{} if v, ok := m["count"].(int); ok && v > 0 { @@ -1373,20 +1373,20 @@ func expandDeprecateRule(cfg []interface{}) *awstypes.DeprecateRule { return rule } -func flattenDeprecateRule(rule *awstypes.DeprecateRule) []map[string]interface{} { - result := make(map[string]interface{}) +func flattenDeprecateRule(rule *awstypes.DeprecateRule) []map[string]any { + result := make(map[string]any) result["count"] = aws.ToInt32(rule.Count) result["interval_unit"] = string(rule.IntervalUnit) result[names.AttrInterval] = aws.ToInt32(rule.Interval) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandFastRestoreRule(cfg []interface{}) *awstypes.FastRestoreRule { +func expandFastRestoreRule(cfg []any) *awstypes.FastRestoreRule { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) rule := &awstypes.FastRestoreRule{ AvailabilityZones: flex.ExpandStringValueSet(m[names.AttrAvailabilityZones].(*schema.Set)), } @@ -1406,17 +1406,17 @@ func expandFastRestoreRule(cfg []interface{}) *awstypes.FastRestoreRule { return rule } -func flattenFastRestoreRule(rule *awstypes.FastRestoreRule) []map[string]interface{} { - result := make(map[string]interface{}) +func flattenFastRestoreRule(rule *awstypes.FastRestoreRule) []map[string]any { + result := make(map[string]any) result["count"] = aws.ToInt32(rule.Count) result["interval_unit"] = string(rule.IntervalUnit) result[names.AttrInterval] = aws.ToInt32(rule.Interval) result[names.AttrAvailabilityZones] = flex.FlattenStringValueSet(rule.AvailabilityZones) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandShareRule(cfg []interface{}) []awstypes.ShareRule { +func expandShareRule(cfg []any) []awstypes.ShareRule { if len(cfg) == 0 || cfg[0] == nil { return nil } @@ -1424,7 +1424,7 @@ func expandShareRule(cfg []interface{}) []awstypes.ShareRule { rules := make([]awstypes.ShareRule, 0) for _, shareRule := range cfg { - m := shareRule.(map[string]interface{}) + m := shareRule.(map[string]any) rule := awstypes.ShareRule{ TargetAccounts: flex.ExpandStringValueSet(m["target_accounts"].(*schema.Set)), @@ -1444,11 +1444,11 @@ func expandShareRule(cfg []interface{}) []awstypes.ShareRule { return rules } -func flattenShareRule(rules []awstypes.ShareRule) []map[string]interface{} { - values := make([]map[string]interface{}, 0) +func flattenShareRule(rules []awstypes.ShareRule) []map[string]any { + values := make([]map[string]any, 0) for _, v := range rules { - rule := make(map[string]interface{}) + rule := make(map[string]any) if v.TargetAccounts != nil { rule["target_accounts"] = flex.FlattenStringValueSet(v.TargetAccounts) @@ -1466,7 +1466,7 @@ func flattenShareRule(rules []awstypes.ShareRule) []map[string]interface{} { return values } -func expandTags(m map[string]interface{}) []awstypes.Tag { +func expandTags(m map[string]any) []awstypes.Tag { var result []awstypes.Tag for k, v := range m { result = append(result, awstypes.Tag{ @@ -1487,11 +1487,11 @@ func flattenTags(tags []awstypes.Tag) map[string]string { return result } -func expandParameters(cfg []interface{}, policyType string) *awstypes.Parameters { +func expandParameters(cfg []any, policyType string) *awstypes.Parameters { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) parameters := &awstypes.Parameters{} if v, ok := m["exclude_boot_volume"].(bool); ok && policyType == string(awstypes.PolicyTypeValuesEbsSnapshotManagement) { @@ -1505,8 +1505,8 @@ func expandParameters(cfg []interface{}, policyType string) *awstypes.Parameters return parameters } -func flattenParameters(parameters *awstypes.Parameters) []map[string]interface{} { - result := make(map[string]interface{}) +func flattenParameters(parameters *awstypes.Parameters) []map[string]any { + result := make(map[string]any) if parameters.ExcludeBootVolume != nil { result["exclude_boot_volume"] = aws.ToBool(parameters.ExcludeBootVolume) } @@ -1515,13 +1515,13 @@ func flattenParameters(parameters *awstypes.Parameters) []map[string]interface{} result["no_reboot"] = aws.ToBool(parameters.NoReboot) } - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandScripts(cfg []interface{}) []awstypes.Script { +func expandScripts(cfg []any) []awstypes.Script { scripts := make([]awstypes.Script, len(cfg)) for i, c := range cfg { - m := c.(map[string]interface{}) + m := c.(map[string]any) script := awstypes.Script{} if v, ok := m["execute_operation_on_script_failure"].(bool); ok { script.ExecuteOperationOnScriptFailure = aws.Bool(v) @@ -1538,7 +1538,7 @@ func expandScripts(cfg []interface{}) []awstypes.Script { if v, ok := m["maximum_retry_count"].(int); ok && v > 0 { script.MaximumRetryCount = aws.Int32(int32(v)) } - if v, ok := m["stages"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["stages"].([]any); ok && len(v) > 0 { script.Stages = flex.ExpandStringyValueList[awstypes.StageValues](v) } scripts[i] = script @@ -1547,10 +1547,10 @@ func expandScripts(cfg []interface{}) []awstypes.Script { return scripts } -func flattenScripts(scripts []awstypes.Script) []map[string]interface{} { - result := make([]map[string]interface{}, len(scripts)) +func flattenScripts(scripts []awstypes.Script) []map[string]any { + result := make([]map[string]any, len(scripts)) for i, s := range scripts { - m := make(map[string]interface{}) + m := make(map[string]any) m["execute_operation_on_script_failure"] = aws.ToBool(s.ExecuteOperationOnScriptFailure) m["execution_handler"] = aws.ToString(s.ExecutionHandler) m["execution_handler_service"] = string(s.ExecutionHandlerService) @@ -1564,53 +1564,53 @@ func flattenScripts(scripts []awstypes.Script) []map[string]interface{} { return result } -func expandArchiveRule(v []interface{}) *awstypes.ArchiveRule { +func expandArchiveRule(v []any) *awstypes.ArchiveRule { if len(v) == 0 || v[0] == nil { return nil } - m := v[0].(map[string]interface{}) + m := v[0].(map[string]any) return &awstypes.ArchiveRule{ - RetainRule: expandArchiveRetainRule(m["archive_retain_rule"].([]interface{})), + RetainRule: expandArchiveRetainRule(m["archive_retain_rule"].([]any)), } } -func flattenArchiveRule(rule *awstypes.ArchiveRule) []map[string]interface{} { +func flattenArchiveRule(rule *awstypes.ArchiveRule) []map[string]any { if rule == nil { - return []map[string]interface{}{} + return []map[string]any{} } - result := make(map[string]interface{}) + result := make(map[string]any) result["archive_retain_rule"] = flattenArchiveRetainRule(rule.RetainRule) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandArchiveRetainRule(cfg []interface{}) *awstypes.ArchiveRetainRule { +func expandArchiveRetainRule(cfg []any) *awstypes.ArchiveRetainRule { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) return &awstypes.ArchiveRetainRule{ - RetentionArchiveTier: expandRetentionArchiveTier(m["retention_archive_tier"].([]interface{})), + RetentionArchiveTier: expandRetentionArchiveTier(m["retention_archive_tier"].([]any)), } } -func flattenArchiveRetainRule(rule *awstypes.ArchiveRetainRule) []map[string]interface{} { +func flattenArchiveRetainRule(rule *awstypes.ArchiveRetainRule) []map[string]any { if rule == nil { - return []map[string]interface{}{} + return []map[string]any{} } - result := make(map[string]interface{}) + result := make(map[string]any) result["retention_archive_tier"] = flattenRetentionArchiveTier(rule.RetentionArchiveTier) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandRetentionArchiveTier(cfg []interface{}) *awstypes.RetentionArchiveTier { +func expandRetentionArchiveTier(cfg []any) *awstypes.RetentionArchiveTier { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) retention_archive_tier := &awstypes.RetentionArchiveTier{} if v, ok := m["count"].(int); ok && v > 0 { @@ -1628,48 +1628,48 @@ func expandRetentionArchiveTier(cfg []interface{}) *awstypes.RetentionArchiveTie return retention_archive_tier } -func flattenRetentionArchiveTier(tier *awstypes.RetentionArchiveTier) []map[string]interface{} { +func flattenRetentionArchiveTier(tier *awstypes.RetentionArchiveTier) []map[string]any { if tier == nil { - return []map[string]interface{}{} + return []map[string]any{} } - result := make(map[string]interface{}) + result := make(map[string]any) result["count"] = aws.ToInt32(tier.Count) result[names.AttrInterval] = aws.ToInt32(tier.Interval) result["interval_unit"] = string(tier.IntervalUnit) - return []map[string]interface{}{result} + return []map[string]any{result} } -func expandExclusions(cfg []interface{}) *awstypes.Exclusions { +func expandExclusions(cfg []any) *awstypes.Exclusions { if len(cfg) == 0 || cfg[0] == nil { return nil } - m := cfg[0].(map[string]interface{}) + m := cfg[0].(map[string]any) exclusions := &awstypes.Exclusions{} if v, ok := m["exclude_boot_volumes"].(bool); ok { exclusions.ExcludeBootVolumes = aws.Bool(v) } - if v, ok := m["exclude_tags"].(map[string]interface{}); ok { + if v, ok := m["exclude_tags"].(map[string]any); ok { exclusions.ExcludeTags = expandTags(v) } - if v, ok := m["exclude_volume_types"].([]interface{}); ok && len(v) > 0 { + if v, ok := m["exclude_volume_types"].([]any); ok && len(v) > 0 { exclusions.ExcludeVolumeTypes = flex.ExpandStringValueList(v) } return exclusions } -func flattenExclusions(exclusions *awstypes.Exclusions) []map[string]interface{} { +func flattenExclusions(exclusions *awstypes.Exclusions) []map[string]any { if exclusions == nil { - return []map[string]interface{}{} + return []map[string]any{} } - result := make(map[string]interface{}) + result := make(map[string]any) result["exclude_boot_volumes"] = aws.ToBool(exclusions.ExcludeBootVolumes) result["exclude_tags"] = flattenTags(exclusions.ExcludeTags) result["exclude_volume_types"] = flex.FlattenStringValueList(exclusions.ExcludeVolumeTypes) - return []map[string]interface{}{result} + return []map[string]any{result} } From b0d2254cac2c9734aef2b5b30911d3e9864bd2bb Mon Sep 17 00:00:00 2001 From: Sasi Date: Mon, 28 Apr 2025 00:20:46 -0400 Subject: [PATCH 0042/2115] Implementation of control tower baseline enablement --- internal/service/controltower/baseline.go | 352 ++++++++++++++++++ .../service/controltower/baseline_test.go | 271 ++++++++++++++ internal/service/controltower/exports_test.go | 1 + .../controltower/service_package_gen.go | 5 + .../r/controltower_baseline.html.markdown | 69 ++++ 5 files changed, 698 insertions(+) create mode 100644 internal/service/controltower/baseline.go create mode 100644 internal/service/controltower/baseline_test.go create mode 100644 website/docs/r/controltower_baseline.html.markdown diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go new file mode 100644 index 000000000000..180741b7284b --- /dev/null +++ b/internal/service/controltower/baseline.go @@ -0,0 +1,352 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package controltower + +import ( + "context" + "errors" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/controltower" + awstypes "github.com/aws/aws-sdk-go-v2/service/controltower/types" + "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// Function annotations are used for resource registration to the Provider. DO NOT EDIT. +// @FrameworkResource("aws_controltower_baseline", name="Baseline") +func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &resourceBaseline{} + + r.SetDefaultCreateTimeout(30 * time.Minute) + r.SetDefaultUpdateTimeout(30 * time.Minute) + r.SetDefaultDeleteTimeout(30 * time.Minute) + + return r, nil +} + +const ( + ResNameBaseline = "Baseline" +) + +type resourceBaseline struct { + framework.ResourceWithConfigure + framework.WithTimeouts +} + +func (r *resourceBaseline) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) { + resp.TypeName = "aws_controltower_baseline" +} + +func (r *resourceBaseline) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { + resp.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + names.AttrARN: framework.ARNAttributeComputedOnly(), + "baseline_identifier": schema.StringAttribute{ + Required: true, + }, + "baseline_version": schema.StringAttribute{ + Required: true, + }, + names.AttrID: framework.IDAttribute(), + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + "target_identifier": schema.StringAttribute{ + Required: true, + }, + }, + Blocks: map[string]schema.Block{ + names.AttrParameters: schema.ListNestedBlock{ + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "key": schema.StringAttribute{ + Required: true, + }, + "value": schema.StringAttribute{ + Required: true, + }, + }, + }, + }, + "timeouts": timeouts.Block(ctx, timeouts.Opts{ + Create: true, + Update: true, + Delete: true, + }), + }, + } +} + +func (r *resourceBaseline) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { + + conn := r.Meta().ControlTowerClient(ctx) + + // TIP: -- 2. Fetch the plan + var plan resourceBaselineData + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a create input structure + in := &controltower.EnableBaselineInput{} + + resp.Diagnostics.Append(fwflex.Expand(ctx, plan, in)...) + if resp.Diagnostics.HasError() { + return + } + + in.Tags = getTagsIn(ctx) + // TIP: -- 4. Call the AWS create function + out, err := conn.EnableBaseline(ctx, in) + if err != nil { + // TIP: Since ID has not been set yet, you cannot use plan.ID.String() + // in error messages at this point. + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionCreating, ResNameBaseline, plan.BaselineIdentifier.String(), err), + err.Error(), + ) + return + } + if out == nil || out.OperationIdentifier == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionCreating, ResNameBaseline, plan.BaselineIdentifier.String(), nil), + errors.New("empty output").Error(), + ) + return + } + + // TIP: -- 5. Using the output from the create function, set the minimum attributes + plan.ARN = flex.StringToFramework(ctx, out.Arn) + plan.ID = flex.StringToFramework(ctx, out.OperationIdentifier) + + resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) +} + +func (r *resourceBaseline) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { + conn := r.Meta().ControlTowerClient(ctx) + + var state resourceBaselineData + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Get the resource from AWS using an API Get, List, or Describe- + // type function, or, better yet, using a finder. + out, err := findBaselineByID(ctx, conn, state.ARN.ValueString()) + // TIP: -- 4. Remove resource from state if it is not found + if tfresource.NotFound(err) { + resp.State.RemoveResource(ctx) + return + } + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionSetting, ResNameBaseline, state.ARN.String(), err), + err.Error(), + ) + return + } + + resp.Diagnostics.Append(fwflex.Flatten(ctx, out, &state)...) + + if resp.Diagnostics.HasError() { + return + } + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) +} + +func (r *resourceBaseline) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { + // TIP: ==== RESOURCE UPDATE ==== + // Not all resources have Update functions. There are a few reasons: + // a. The AWS API does not support changing a resource + // b. All arguments have RequiresReplace() plan modifiers + // c. The AWS API uses a create call to modify an existing resource + // + // In the cases of a. and b., the resource will not have an update method + // defined. In the case of c., Update and Create can be refactored to call + // the same underlying function. + // + // The rest of the time, there should be an Update function and it should + // do the following things. Make sure there is a good reason if you don't + // do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the plan and state + // 3. Populate a modify input structure and check for changes + // 4. Call the AWS modify/update function + // 5. Use a waiter to wait for update to complete + // 6. Save the request plan to response state + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().ControlTowerClient(ctx) + + // TIP: -- 2. Fetch the plan + var plan, state resourceBaselineData + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a modify input structure and check for changes + if !plan.BaselineVersion.Equal(state.BaselineVersion) { + + in := &controltower.UpdateEnabledBaselineInput{ + EnabledBaselineIdentifier: plan.ARN.ValueStringPointer(), + } + + resp.Diagnostics.Append(fwflex.Expand(ctx, plan, in)...) + + out, err := conn.UpdateEnabledBaseline(ctx, in) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ID.String(), err), + err.Error(), + ) + return + } + if out == nil || out.OperationIdentifier == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ID.String(), nil), + errors.New("empty output").Error(), + ) + return + } + + } + + // TIP: -- 6. Save the request plan to response state + resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) +} + +func (r *resourceBaseline) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { + // TIP: ==== RESOURCE DELETE ==== + // Most resources have Delete functions. There are rare situations + // where you might not need a delete: + // a. The AWS API does not provide a way to delete the resource + // b. The point of your resource is to perform an action (e.g., reboot a + // server) and deleting serves no purpose. + // + // The Delete function should do the following things. Make sure there + // is a good reason if you don't do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the state + // 3. Populate a delete input structure + // 4. Call the AWS delete function + // 5. Use a waiter to wait for delete to complete + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().ControlTowerClient(ctx) + + // TIP: -- 2. Fetch the state + var state resourceBaselineData + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a delete input structure + in := &controltower.DisableBaselineInput{ + EnabledBaselineIdentifier: aws.String(state.ARN.ValueString()), + } + + // TIP: -- 4. Call the AWS delete function + _, err := conn.DisableBaseline(ctx, in) + // TIP: On rare occassions, the API returns a not found error after deleting a + // resource. If that happens, we don't want it to show up as an error. + if err != nil { + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionDeleting, ResNameBaseline, state.ARN.String(), err), + err.Error(), + ) + return + } + +} + +// TIP: ==== TERRAFORM IMPORTING ==== +// If Read can get all the information it needs from the Identifier +// (i.e., path.Root("id")), you can use the PassthroughID importer. Otherwise, +// you'll need a custom import function. +// +// See more: +// https://developer.hashicorp.com/terraform/plugin/framework/resources/import +func (r *resourceBaseline) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) +} + +func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) (*awstypes.EnabledBaselineDetails, error) { + in := &controltower.GetEnabledBaselineInput{ + EnabledBaselineIdentifier: aws.String(id), + } + + out, err := conn.GetEnabledBaseline(ctx, in) + if err != nil { + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, + } + } + + return nil, err + } + + if out == nil || out.EnabledBaselineDetails == nil { + return nil, tfresource.NewEmptyResultError(in) + } + + return out.EnabledBaselineDetails, nil +} + +// TIP: ==== DATA STRUCTURES ==== +// With Terraform Plugin-Framework configurations are deserialized into +// Go types, providing type safety without the need for type assertions. +// These structs should match the schema definition exactly, and the `tfsdk` +// tag value should match the attribute name. +// +// Nested objects are represented in their own data struct. These will +// also have a corresponding attribute type mapping for use inside flex +// functions. +// +// See more: +// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values +type resourceBaselineData struct { + ARN types.String `tfsdk:"arn"` + BaselineIdentifier types.String `tfsdk:"baseline_identifier"` + BaselineVersion types.String `tfsdk:"baseline_version"` + ID types.String `tfsdk:"id"` + Parameters fwtypes.ListNestedObjectValueOf[parameters] `tfsdk:"parameters"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TargetIdentifier types.String `tfsdk:"target_identifier"` + Timeouts timeouts.Value `tfsdk:"timeouts"` +} + +type parameters struct { + key types.String `tfsdk:"key"` + value types.String `tfsdk:"value"` +} diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go new file mode 100644 index 000000000000..a6dcdb46f9bf --- /dev/null +++ b/internal/service/controltower/baseline_test.go @@ -0,0 +1,271 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package controltower_test + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/service/controltower/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/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/names" + + tfcontroltower "github.com/hashicorp/terraform-provider-aws/internal/service/controltower" +) + +// TIP: File Structure. The basic outline for all test files should be as +// follows. Improve this resource's maintainability by following this +// outline. +// +// 1. Package declaration (add "_test" since this is a test file) +// 2. Imports +// 3. Unit tests +// 4. Basic test +// 5. Disappears test +// 6. All the other tests +// 7. Helper functions (exists, destroy, check, etc.) +// 8. Functions that return Terraform configurations + +// TIP: ==== UNIT TESTS ==== +// This is an example of a unit test. Its name is not prefixed with +// "TestAcc" like an acceptance test. +// +// Unlike acceptance tests, unit tests do not access AWS and are focused on a +// function (or method). Because of this, they are quick and cheap to run. +// +// In designing a resource's implementation, isolate complex bits from AWS bits +// so that they can be tested through a unit test. We encourage more unit tests +// in the provider. +// +// Cut and dry functions using well-used patterns, like typical flatteners and +// expanders, don't need unit testing. However, if they are complex or +// intricate, they should be unit tested. +// func TestBaselineExampleUnitTest(t *testing.T) { +// t.Parallel() + +// testCases := []struct { +// TestName string +// Input string +// Expected string +// Error bool +// }{ +// { +// TestName: "empty", +// Input: "", +// Expected: "", +// Error: true, +// }, +// { +// TestName: "descriptive name", +// Input: "some input", +// Expected: "some output", +// Error: false, +// }, +// { +// TestName: "another descriptive name", +// Input: "more input", +// Expected: "more output", +// Error: false, +// }, +// } + +// for _, testCase := range testCases { +// testCase := testCase +// t.Run(testCase.TestName, func(t *testing.T) { +// t.Parallel() +// got, err := tfcontroltower.FunctionFromResource(testCase.Input) + +// if err != nil && !testCase.Error { +// t.Errorf("got error (%s), expected no error", err) +// } + +// if err == nil && testCase.Error { +// t.Errorf("got (%s) and no error, expected error", got) +// } + +// if got != testCase.Expected { +// t.Errorf("got %s, expected %s", got, testCase.Expected) +// } +// }) +// } +// } + +// TIP: ==== ACCEPTANCE TESTS ==== +// This is an example of a basic acceptance test. This should test as much of +// standard functionality of the resource as possible, and test importing, if +// applicable. We prefix its name with "TestAcc", the service, and the +// resource name. +// +// Acceptance test access AWS and cost money to run. +func TestAccControlTowerBaseline_basic(t *testing.T) { + ctx := acctest.Context(t) + // TIP: This is a long-running test guard for tests that run longer than + // 300s (5 min) generally. + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var baseline types.EnabledBaselineDetails + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_controltower_baseline.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.ControlTowerServiceID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ControlTowerServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBaselineDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBaselineConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckBaselineExists(ctx, resourceName, &baseline), + resource.TestCheckResourceAttr(resourceName, "baseline_version", "4.0"), + resource.TestCheckResourceAttrSet(resourceName, "baseline_identifier"), + resource.TestCheckResourceAttrSet(resourceName, "arn"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn", "controltower", regexache.MustCompile(`enabledbaseline:+.`)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccControlTowerBaseline_disappears(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var baseline types.EnabledBaselineDetails + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_controltower_baseline.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.ControlTowerServiceID) + testAccEnabledBaselinesPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ControlTowerServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBaselineDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBaselineConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckBaselineExists(ctx, resourceName, &baseline), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfcontroltower.ResourceBaseline, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckBaselineDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_controltower_baseline" { + continue + } + + input := &controltower.GetEnabledBaselineInput{ + EnabledBaselineIdentifier: aws.String(rs.Primary.Attributes[names.AttrARN]), + } + _, err := conn.GetEnabledBaseline(ctx, input) + if errs.IsA[*types.ResourceNotFoundException](err) { + return nil + } + if err != nil { + return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, rs.Primary.ID, err) + } + + return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func testAccCheckBaselineExists(ctx context.Context, name string, baseline *types.EnabledBaselineDetails) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, name, errors.New("not found")) + } + + if rs.Primary.ID == "" { + return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, name, errors.New("not set")) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) + resp, err := conn.GetEnabledBaseline(ctx, &controltower.GetEnabledBaselineInput{ + EnabledBaselineIdentifier: aws.String(rs.Primary.Attributes[names.AttrARN]), + }) + + if err != nil { + return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, rs.Primary.ID, err) + } + + *baseline = *resp.EnabledBaselineDetails + + return nil + } +} + +func testAccEnabledBaselinesPreCheck(ctx context.Context, t *testing.T) { + conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) + + input := &controltower.ListEnabledBaselinesInput{} + _, err := conn.ListEnabledBaselines(ctx, input) + + if acctest.PreCheckSkipError(err) { + t.Skipf("skipping acceptance testing: %s", err) + } + if err != nil { + t.Fatalf("unexpected PreCheck error: %s", err) + } +} + +func testAccBaselineConfig_basic(rName string) string { + return fmt.Sprintf(` +data "aws_organizations_organization" "current" {} + +resource "aws_organizations_organizational_unit" "test" { + name = %[1]q + parent_id = data.aws_organizations_organization.current.roots[0].id +} + +resource "aws_controltower_baseline" "test" { + baseline_identifier = "arn:aws:controltower:us-east-1::baseline/3WPD0NA6TJ9AOMU2" + baseline_version = "4.0" + target_identifier = aws_organizations_organizational_unit.test.arn + parameters { + key = "IdentityCenterEnabledBaselineArn" + value = "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" + } +} +`, rName) +} diff --git a/internal/service/controltower/exports_test.go b/internal/service/controltower/exports_test.go index 57ee78e0f1a6..e5102aee6de8 100644 --- a/internal/service/controltower/exports_test.go +++ b/internal/service/controltower/exports_test.go @@ -7,6 +7,7 @@ package controltower var ( ResourceControl = resourceControl ResourceLandingZone = resourceLandingZone + ResourceBaseline = resourceBaseline FindEnabledControlByTwoPartKey = findEnabledControlByTwoPartKey FindLandingZoneByID = findLandingZoneByID diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index 53ee9928f7f1..c8c3944c06e5 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -34,6 +34,11 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePackageSDKResource { return []*types.ServicePackageSDKResource{ + { + Factory: resourceBaseline, + TypeName: "aws_controltower_baseline", + Name: "Baseline", + }, { Factory: resourceControl, TypeName: "aws_controltower_control", diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown new file mode 100644 index 000000000000..68c5026e05a0 --- /dev/null +++ b/website/docs/r/controltower_baseline.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "Control Tower" +layout: "aws" +page_title: "AWS: aws_controltower_baseline" +description: |- + Terraform resource for managing an AWS Control Tower Baseline. +--- +` +# Resource: aws_controltower_baseline + +Terraform resource for managing an AWS Control Tower Baseline. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_controltower_baseline" "example" { +} +``` + +## Argument Reference + +The following arguments are required: + +* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +The following arguments are optional: + +* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Baseline. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Control Tower Baseline using the `example_id_arg`. For example: + +```terraform +import { + to = aws_controltower_baseline.example + id = "baseline-id-12345678" +} +``` + +Using `terraform import`, import Control Tower Baseline using the `example_id_arg`. For example: + +```console +% terraform import aws_controltower_baseline.example baseline-id-12345678 +``` From d56eb9dbc467c27d23c28b2ec76c8431f94fd40d Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 29 Apr 2025 12:40:03 -0700 Subject: [PATCH 0043/2115] Make Create error messages clearer and add comments --- internal/service/timestreaminfluxdb/db_cluster.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 40ef1c7b5dc6..a615d88742b5 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -362,6 +362,7 @@ func dbClusterDBParameterGroupIdentifierReplaceIf(ctx context.Context, req planm return } + // If the DBParameterGroupIdentifier is being removed, the cluster must be recreated. dbParameterGroupIdentifierRemoved := !state.DBParameterGroupIdentifier.IsNull() && plan.DBParameterGroupIdentifier.IsNull() resp.RequiresReplace = dbParameterGroupIdentifierRemoved @@ -393,7 +394,7 @@ func (r *resourceDBCluster) Create(ctx context.Context, req resource.CreateReque return } - if out == nil || out.DbClusterId == nil { + if out == nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionCreating, ResNameDBCluster, plan.Name.String(), nil), errors.New("empty output").Error(), @@ -401,6 +402,14 @@ func (r *resourceDBCluster) Create(ctx context.Context, req resource.CreateReque return } + if out.DbClusterId == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionCreating, ResNameDBCluster, plan.Name.String(), nil), + errors.New("received response with nil DbClusterId").Error(), + ) + return + } + state := plan state.ID = fwflex.StringToFramework(ctx, out.DbClusterId) From 39ddbe3b433a1939cfcb506086dd842147704145 Mon Sep 17 00:00:00 2001 From: Trevor Bonas <45324987+trevorbonas@users.noreply.github.com> Date: Tue, 29 Apr 2025 14:52:53 -0700 Subject: [PATCH 0044/2115] Update internal/service/timestreaminfluxdb/db_cluster_test.go Co-authored-by: Alexey Temnikov --- internal/service/timestreaminfluxdb/db_cluster_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index 9f4369e9cdda..b6ef99f3655c 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -555,7 +555,10 @@ func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { func testAccCheckDBClusterNotRecreated(before, after *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { return func(s *terraform.State) error { if before, after := aws.ToString(before.Id), aws.ToString(after.Id); before != after { - return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, tftimestreaminfluxdb.ResNameDBCluster, before, errors.New("recreated")) + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, + tftimestreaminfluxdb.ResNameDBCluster, + fmt.Sprintf("before: %s, after: %s", beforeID, afterID), + errors.New("resource was recreated when it should have been updated in-place")) } return nil From f70fb7b176b8ef1d4ac0d629eff3e7525686b944 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 29 Apr 2025 14:55:45 -0700 Subject: [PATCH 0045/2115] Fix undefined variable error --- internal/service/timestreaminfluxdb/db_cluster_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index b6ef99f3655c..aaf1a1ffc512 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -554,11 +554,11 @@ func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { func testAccCheckDBClusterNotRecreated(before, after *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - if before, after := aws.ToString(before.Id), aws.ToString(after.Id); before != after { - return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, - tftimestreaminfluxdb.ResNameDBCluster, - fmt.Sprintf("before: %s, after: %s", beforeID, afterID), - errors.New("resource was recreated when it should have been updated in-place")) + if beforeID, afterID := aws.ToString(before.Id), aws.ToString(after.Id); before != after { + return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, + tftimestreaminfluxdb.ResNameDBCluster, + fmt.Sprintf("before: %s, after: %s", beforeID, afterID), + errors.New("resource was recreated when it should have been updated in-place")) } return nil From efb528cab2263dd0698ed38715c7a7639ddd777b Mon Sep 17 00:00:00 2001 From: Sasi Date: Tue, 29 Apr 2025 22:23:15 -0400 Subject: [PATCH 0046/2115] updated resource baseline --- internal/service/controltower/exports_test.go | 2 +- .../service/controltower/service_package_gen.go | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/service/controltower/exports_test.go b/internal/service/controltower/exports_test.go index e5102aee6de8..c30c23a7bc31 100644 --- a/internal/service/controltower/exports_test.go +++ b/internal/service/controltower/exports_test.go @@ -7,7 +7,7 @@ package controltower var ( ResourceControl = resourceControl ResourceLandingZone = resourceLandingZone - ResourceBaseline = resourceBaseline + ResourceBaseline = newResourceBaseline FindEnabledControlByTwoPartKey = findEnabledControlByTwoPartKey FindLandingZoneByID = findLandingZoneByID diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index c8c3944c06e5..da804491405b 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -19,7 +19,13 @@ func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*types.Serv } func (p *servicePackage) FrameworkResources(ctx context.Context) []*types.ServicePackageFrameworkResource { - return []*types.ServicePackageFrameworkResource{} + return []*types.ServicePackageFrameworkResource{ + { + Factory: newResourceBaseline, + TypeName: "aws_controltower_baseline", + Name: "Baseline", + }, + } } func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePackageSDKDataSource { @@ -34,11 +40,6 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePackageSDKResource { return []*types.ServicePackageSDKResource{ - { - Factory: resourceBaseline, - TypeName: "aws_controltower_baseline", - Name: "Baseline", - }, { Factory: resourceControl, TypeName: "aws_controltower_control", From 2a0bece28c3b6e5a176afd3575f1722fedeef747 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Tue, 29 Apr 2025 21:13:20 -0700 Subject: [PATCH 0047/2115] Fix incorrect ID check --- internal/service/timestreaminfluxdb/db_cluster_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index aaf1a1ffc512..ff49f43d12ee 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -554,7 +554,7 @@ func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { func testAccCheckDBClusterNotRecreated(before, after *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - if beforeID, afterID := aws.ToString(before.Id), aws.ToString(after.Id); before != after { + if beforeID, afterID := aws.ToString(before.Id), aws.ToString(after.Id); beforeID != afterID { return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, tftimestreaminfluxdb.ResNameDBCluster, fmt.Sprintf("before: %s, after: %s", beforeID, afterID), From 1becab13ccc76b2889c898b4925187d31db35c6c Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Thu, 1 May 2025 13:17:16 -0700 Subject: [PATCH 0048/2115] Add period to the end of a description --- internal/service/timestreaminfluxdb/db_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index a615d88742b5..c54a12f216fe 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -273,7 +273,7 @@ func (r *resourceDBCluster) Schema(ctx context.Context, req resource.SchemaReque you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. These attributes will be stored in a Secret created in Amazon Secrets - Manager in your account`, + Manager in your account.`, }, names.AttrVPCSecurityGroupIDs: schema.SetAttribute{ CustomType: fwtypes.SetOfStringType, From 88f60c56d2861bb718d4567dab3a9201af844f47 Mon Sep 17 00:00:00 2001 From: Sasi Date: Fri, 2 May 2025 00:50:43 -0400 Subject: [PATCH 0049/2115] implemented wait function on create logic --- internal/service/controltower/baseline.go | 101 +++++++++++++++--- .../service/controltower/baseline_test.go | 6 +- names/names.go | 1 + 3 files changed, 93 insertions(+), 15 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 180741b7284b..b63109657f90 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" - fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -140,6 +139,17 @@ func (r *resourceBaseline) Create(ctx context.Context, req resource.CreateReques plan.ARN = flex.StringToFramework(ctx, out.Arn) plan.ID = flex.StringToFramework(ctx, out.OperationIdentifier) + // TIP: -- 6. Use a waiter to wait for create to complete + createTimeout := r.CreateTimeout(ctx, plan.Timeouts) + _, err = waitBaselineCreated(ctx, conn, plan.ID.ValueString(), createTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionWaitingForCreation, ResNameBaseline, plan.BaselineIdentifier.String(), err), + err.Error(), + ) + return + } + resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) } @@ -298,6 +308,73 @@ func (r *resourceBaseline) ImportState(ctx context.Context, req resource.ImportS resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) } +// TIP: ==== STATUS CONSTANTS ==== +// Create constants for states and statuses if the service does not +// already have suitable constants. We prefer that you use the constants +// provided in the service if available (e.g., awstypes.StatusInProgress). +const ( + statusChangePending = "Pending" + statusDeleting = "Deleting" + statusNormal = "Normal" + statusUpdated = "Updated" + statusSucceeded = "SUCCEEDED" + statusFailed = "FAILED" + statusUnderChange = "UNDER_CHANGE" +) + +// TIP: ==== WAITERS ==== +// Some resources of some services have waiters provided by the AWS API. +// Unless they do not work properly, use them rather than defining new ones +// here. +// +// Sometimes we define the wait, status, and find functions in separate +// files, wait.go, status.go, and find.go. Follow the pattern set out in the +// service and define these where it makes the most sense. +// +// If these functions are used in the _test.go file, they will need to be +// exported (i.e., capitalized). +// +// You will need to adjust the parameters and names to fit the service. +func waitBaselineCreated(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { + stateConf := &retry.StateChangeConf{ + Pending: []string{}, + Target: []string{statusSucceeded}, + Refresh: statusBaseline(ctx, conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*awstypes.EnabledBaselineDetails); ok { + return out, err + } + + return nil, err +} + +// TIP: ==== STATUS ==== +// The status function can return an actual status when that field is +// available from the API (e.g., out.Status). Otherwise, you can use custom +// statuses to communicate the states of the resource. +// +// Waiters consume the values returned by status functions. Design status so +// that it can be reused by a create, update, and delete waiter, if possible. +func statusBaseline(ctx context.Context, conn *controltower.Client, id string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + out, err := findBaselineByID(ctx, conn, id) + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + return out, string(out.StatusSummary.Status), nil + } +} + func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) (*awstypes.EnabledBaselineDetails, error) { in := &controltower.GetEnabledBaselineInput{ EnabledBaselineIdentifier: aws.String(id), @@ -335,18 +412,18 @@ func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) // See more: // https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values type resourceBaselineData struct { - ARN types.String `tfsdk:"arn"` - BaselineIdentifier types.String `tfsdk:"baseline_identifier"` - BaselineVersion types.String `tfsdk:"baseline_version"` - ID types.String `tfsdk:"id"` - Parameters fwtypes.ListNestedObjectValueOf[parameters] `tfsdk:"parameters"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` - TargetIdentifier types.String `tfsdk:"target_identifier"` - Timeouts timeouts.Value `tfsdk:"timeouts"` + ARN types.String `tfsdk:"arn"` + BaselineIdentifier types.String `tfsdk:"baseline_identifier"` + BaselineVersion types.String `tfsdk:"baseline_version"` + ID types.String `tfsdk:"id"` + Parameters []parameters `tfsdk:"parameters"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TargetIdentifier types.String `tfsdk:"target_identifier"` + Timeouts timeouts.Value `tfsdk:"timeouts"` } type parameters struct { - key types.String `tfsdk:"key"` - value types.String `tfsdk:"value"` + Key types.String `tfsdk:"key"` + Value types.String `tfsdk:"value"` } diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index a6dcdb46f9bf..44d7d13200a8 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -124,7 +124,7 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckPartitionHasService(t, names.ControlTowerServiceID) + acctest.PreCheckPartitionHasService(t, names.ControlTowerEndpointID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.ControlTowerServiceID), @@ -163,7 +163,7 @@ func TestAccControlTowerBaseline_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckPartitionHasService(t, names.ControlTowerServiceID) + acctest.PreCheckPartitionHasService(t, names.ControlTowerEndpointID) testAccEnabledBaselinesPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.ControlTowerServiceID), @@ -259,7 +259,7 @@ resource "aws_organizations_organizational_unit" "test" { } resource "aws_controltower_baseline" "test" { - baseline_identifier = "arn:aws:controltower:us-east-1::baseline/3WPD0NA6TJ9AOMU2" + baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" baseline_version = "4.0" target_identifier = aws_organizations_organizational_unit.test.arn parameters { diff --git a/names/names.go b/names/names.go index 3af13bd58752..7586651af412 100644 --- a/names/names.go +++ b/names/names.go @@ -66,6 +66,7 @@ const ( ComputeOptimizerEndpointID = "compute-optimizer" ConfigServiceEndpointID = "config" ConnectEndpointID = "connect" + ControlTowerEndpointID = "controltower" DataExchangeEndpointID = "dataexchange" DataPipelineEndpointID = "datapipeline" DataZoneEndpointID = "datazone" From f2acb85b46647eff5869cfa6bc48e186a62dc63b Mon Sep 17 00:00:00 2001 From: Andrew Tulloch Date: Fri, 23 May 2025 10:44:16 +0100 Subject: [PATCH 0050/2115] Use HasChanges over HasChangesExcept which performs badly with large numbers of ignored attributes --- internal/service/wafv2/web_acl.go | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/internal/service/wafv2/web_acl.go b/internal/service/wafv2/web_acl.go index 3179ce0fcc1a..6eee1fcc4684 100644 --- a/internal/service/wafv2/web_acl.go +++ b/internal/service/wafv2/web_acl.go @@ -384,7 +384,27 @@ func resourceWebACLUpdate(ctx context.Context, d *schema.ResourceData, meta any) var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFV2Client(ctx) - if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { + // HasChangesExcept can perform _very_ slowly when presented with a large number of unchanged (or ignored) + // attributes e.g. rule blocks in this case + if d.HasChanges( + "application_integration_url", + "association_config", + "capacity", + "captcha_config", + "challenge_config", + "custom_response_body", + "data_protection_config", + names.AttrDefaultAction, + names.AttrDescription, + "lock_token", + names.AttrName, + names.AttrNamePrefix, + "rule_json", + names.AttrRule, + names.AttrScope, + "token_domains", + "visibility_config", + ) { aclName := d.Get(names.AttrName).(string) aclScope := d.Get(names.AttrScope).(string) aclLockToken := d.Get("lock_token").(string) From 712f11bccff03ffbcead1556b8dfe59271b51858 Mon Sep 17 00:00:00 2001 From: Andrew Tulloch Date: Fri, 23 May 2025 10:50:32 +0100 Subject: [PATCH 0051/2115] Add changelog --- .changelog/42740.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/42740.txt diff --git a/.changelog/42740.txt b/.changelog/42740.txt new file mode 100644 index 000000000000..b627c91b9361 --- /dev/null +++ b/.changelog/42740.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_wafv2_web_acl: Fix performance of update with `rule` ignored where the WebACL has a large number of rules. +``` From 8489cd93c1387c1577e848b6b735d6407c6d2c3a Mon Sep 17 00:00:00 2001 From: Raglin Anthony Date: Mon, 9 Jun 2025 18:08:32 +0000 Subject: [PATCH 0052/2115] eks: Add support for enabling / disabling EKS Hybrid Nodes on existing clusters This enhancement allows users to modify remote node and pod network CIDRs without recreating their EKS clusters.. The implementation includes: - Remove ForceNew constraint from remote_network_config fields to allow updates without cluster recreation - Add update logic for remote_node_networks and remote_pod_networks in resourceClusterUpdate - Split expand functions into separate create and update variants to handle different update scenarios - Remove Computed attribute from remote_pod_networks - Add test coverage for remote network config updates including node-only and pod network scenarios - Ensure proper handling of empty network configurations during updates --- internal/service/eks/cluster.go | 69 +++++++++++--- internal/service/eks/cluster_test.go | 135 ++++++++++++++++++++++++++- 2 files changed, 189 insertions(+), 15 deletions(-) diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index 8a7d28be915f..d980119c1099 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -331,7 +331,7 @@ func resourceCluster() *schema.Resource { "remote_network_config": { Type: schema.TypeList, Optional: true, - ForceNew: true, + ForceNew: false, MaxItems: 1, ConflictsWith: []string{"outpost_config"}, Elem: &schema.Resource{ @@ -346,7 +346,7 @@ func resourceCluster() *schema.Resource { "cidrs": { Type: schema.TypeSet, Optional: true, - ForceNew: true, + ForceNew: false, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -362,14 +362,13 @@ func resourceCluster() *schema.Resource { "remote_pod_networks": { Type: schema.TypeList, Optional: true, - Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "cidrs": { Type: schema.TypeSet, Optional: true, - ForceNew: true, + ForceNew: false, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -538,7 +537,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta any } if v, ok := d.GetOk("remote_network_config"); ok { - input.RemoteNetworkConfig = expandRemoteNetworkConfigRequest(v.([]any)) + input.RemoteNetworkConfig = expandCreateRemoteNetworkConfigRequest(v.([]any)) } if v, ok := d.GetOk("storage_config"); ok { @@ -878,6 +877,27 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any } } + if d.HasChanges("remote_network_config.0.remote_node_networks", "remote_network_config.0.remote_pod_networks") { + remoteNetworkConfig := expandUpdateRemoteNetworkConfigRequest(d.Get("remote_network_config").([]any)) + + input := &eks.UpdateClusterConfigInput{ + Name: aws.String(d.Id()), + RemoteNetworkConfig: remoteNetworkConfig, + } + + output, err := conn.UpdateClusterConfig(ctx, input) + + if err != nil { + return sdkdiag.AppendErrorf(diags, "updating EKS Cluster (%s) remote network config: %s", d.Id(), err) + } + + updateID := aws.ToString(output.Update.Id) + + if _, err := waitClusterUpdateSuccessful(ctx, conn, d.Id(), updateID, d.Timeout(schema.TimeoutUpdate)); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for EKS Cluster (%s) remote network config update (%s): %s", d.Id(), updateID, err) + } + } + return append(diags, resourceClusterRead(ctx, d, meta)...) } @@ -1371,7 +1391,7 @@ func expandKubernetesNetworkConfigElasticLoadBalancing(tfList []any) *types.Elas return apiObject } -func expandRemoteNetworkConfigRequest(tfList []any) *types.RemoteNetworkConfigRequest { +func expandCreateRemoteNetworkConfigRequest(tfList []any) *types.RemoteNetworkConfigRequest { if len(tfList) == 0 { return nil } @@ -1385,19 +1405,42 @@ func expandRemoteNetworkConfigRequest(tfList []any) *types.RemoteNetworkConfigRe RemoteNodeNetworks: expandRemoteNodeNetworks(tfMap["remote_node_networks"].([]any)), } - if v, ok := tfMap["remote_pod_networks"].([]any); ok { + if v, ok := tfMap["remote_pod_networks"].([]any); ok && len(v) > 0 { apiObject.RemotePodNetworks = expandRemotePodNetworks(v) } return apiObject } -func expandRemoteNodeNetworks(tfList []any) []types.RemoteNodeNetwork { +func expandUpdateRemoteNetworkConfigRequest(tfList []any) *types.RemoteNetworkConfigRequest { + apiObject := &types.RemoteNetworkConfigRequest{ + RemoteNodeNetworks: []types.RemoteNodeNetwork{}, + RemotePodNetworks: []types.RemotePodNetwork{}, + } + if len(tfList) == 0 { - return nil + return apiObject } - var apiObjects []types.RemoteNodeNetwork + tfMap, ok := tfList[0].(map[string]any) + if !ok { + return apiObject + } + + apiObject.RemoteNodeNetworks = expandRemoteNodeNetworks(tfMap["remote_node_networks"].([]any)) + + if v, ok := tfMap["remote_pod_networks"].([]any); ok { + apiObject.RemotePodNetworks = expandRemotePodNetworks(v) + } + + return apiObject +} +func expandRemoteNodeNetworks(tfList []any) []types.RemoteNodeNetwork { + var apiObjects = []types.RemoteNodeNetwork{} + + if len(tfList) == 0 { + return apiObjects + } for _, tfMapRaw := range tfList { tfMap, ok := tfMapRaw.(map[string]any) @@ -1416,12 +1459,12 @@ func expandRemoteNodeNetworks(tfList []any) []types.RemoteNodeNetwork { } func expandRemotePodNetworks(tfList []any) []types.RemotePodNetwork { + var apiObjects = []types.RemotePodNetwork{} + if len(tfList) == 0 { - return nil + return apiObjects } - var apiObjects []types.RemotePodNetwork - for _, tfMapRaw := range tfList { tfMap, ok := tfMapRaw.(map[string]any) if !ok { diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index b0b8bfeaa0db..adeed9a0f7ae 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -1262,7 +1262,7 @@ func TestAccEKSCluster_Outpost_placement(t *testing.T) { }) } -func TestAccEKSCluster_RemoteNetwork_Node(t *testing.T) { +func TestAccEKSCluster_RemoteNetwork_Node_OnCreate(t *testing.T) { ctx := acctest.Context(t) var cluster types.Cluster rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -1296,7 +1296,69 @@ func TestAccEKSCluster_RemoteNetwork_Node(t *testing.T) { }) } -func TestAccEKSCluster_RemoteNetwork_Pod(t *testing.T) { +func TestAccEKSCluster_RemoteNetwork_Node_OnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var cluster1, cluster2, cluster3 types.Cluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_eks_cluster.test" + remoteNodeCIDR := "10.90.0.0/22" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EKSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_accessConfig(rName, types.AuthenticationModeApi), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster1), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + { + Config: testAccClusterConfig_remoteNodeNetwork(rName, remoteNodeCIDR), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster2), + testAccCheckClusterNotRecreated(&cluster1, &cluster2), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.0", remoteNodeCIDR), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_pod_networks.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + { + Config: testAccClusterConfig_accessConfig(rName, types.AuthenticationModeApi), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster3), + testAccCheckClusterNotRecreated(&cluster2, &cluster3), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + }, + }) +} + +func TestAccEKSCluster_RemoteNetwork_Pod_OnCreate(t *testing.T) { ctx := acctest.Context(t) var cluster types.Cluster rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -1333,6 +1395,75 @@ func TestAccEKSCluster_RemoteNetwork_Pod(t *testing.T) { }) } +func TestAccEKSCluster_RemoteNetwork_Pod_OnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var cluster1, cluster2, cluster3 types.Cluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_eks_cluster.test" + remoteNodeCIDR := "10.90.0.0/22" + remotePodCIDR := "10.80.0.0/22" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EKSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_accessConfig(rName, types.AuthenticationModeApi), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster1), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + { + Config: testAccClusterConfig_remotePodNetwork(rName, remoteNodeCIDR, remotePodCIDR), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster2), + testAccCheckClusterNotRecreated(&cluster1, &cluster2), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.0", remoteNodeCIDR), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_pod_networks.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_pod_networks.0.cidrs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_pod_networks.0.cidrs.0", remotePodCIDR), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + { + Config: testAccClusterConfig_remoteNodeNetwork(rName, remoteNodeCIDR), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &cluster3), + testAccCheckClusterNotRecreated(&cluster2, &cluster3), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.#", "1"), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_node_networks.0.cidrs.0", remoteNodeCIDR), + resource.TestCheckResourceAttr(resourceName, "remote_network_config.0.remote_pod_networks.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, + }, + }, + }) +} + func TestAccEKSCluster_upgradePolicy(t *testing.T) { ctx := acctest.Context(t) var cluster types.Cluster From bec5e98d2fde60acda7ec9e1be32e871eb326bfb Mon Sep 17 00:00:00 2001 From: Raglin Anthony Date: Mon, 9 Jun 2025 19:30:23 +0000 Subject: [PATCH 0053/2115] added changelog --- .changelog/42928.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/42928.txt diff --git a/.changelog/42928.txt b/.changelog/42928.txt new file mode 100644 index 000000000000..9a9a40466e1a --- /dev/null +++ b/.changelog/42928.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_eks_cluster: Add support for `remote_network_config` on existing EKS Clusters +``` \ No newline at end of file From 99f837c99a3bdcddb9a40e484685435ff47a2d0c Mon Sep 17 00:00:00 2001 From: "jserras@tripadvisor.com" Date: Mon, 16 Jun 2025 22:45:13 +0100 Subject: [PATCH 0054/2115] feat:add input argument to enable worker replacement strategy --- internal/service/mwaa/environment.go | 11 ++++ internal/service/mwaa/environment_test.go | 61 ++++++++++++++++++++++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/internal/service/mwaa/environment.go b/internal/service/mwaa/environment.go index cfaf7062dfd3..25f88e5c42f3 100644 --- a/internal/service/mwaa/environment.go +++ b/internal/service/mwaa/environment.go @@ -297,6 +297,12 @@ func resourceEnvironment() *schema.Resource { Optional: true, Computed: true, }, + "worker_replacement_strategy": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.WorkerReplacementStrategy](), + }, }, CustomizeDiff: customdiff.Sequence( @@ -465,6 +471,7 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta a if err := d.Set("last_updated", flattenLastUpdate(environment.LastUpdate)); err != nil { return sdkdiag.AppendErrorf(diags, "setting last_updated: %s", err) } + d.Set("worker_replacement_strategy", environment.LastUpdate.WorkerReplacementStrategy) if err := d.Set(names.AttrLoggingConfiguration, flattenLoggingConfiguration(environment.LoggingConfiguration)); err != nil { return sdkdiag.AppendErrorf(diags, "setting logging_configuration: %s", err) } @@ -595,6 +602,10 @@ func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta input.WeeklyMaintenanceWindowStart = aws.String(d.Get("weekly_maintenance_window_start").(string)) } + if d.HasChange("worker_replacement_strategy") { + input.WorkerReplacementStrategy = awstypes.WorkerReplacementStrategy(d.Get("worker_replacement_strategy").(string)) + } + _, err := conn.UpdateEnvironment(ctx, input) if err != nil { diff --git a/internal/service/mwaa/environment_test.go b/internal/service/mwaa/environment_test.go index d46575f1745e..7aa0d46b1b59 100644 --- a/internal/service/mwaa/environment_test.go +++ b/internal/service/mwaa/environment_test.go @@ -472,6 +472,47 @@ func TestAccMWAAEnvironment_updateAirflowVersionMinor(t *testing.T) { }) } +func TestAccMWAAEnvironment_updateAirflowWorkerReplacementStrategy(t *testing.T) { + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + ctx := acctest.Context(t) + var environment1, environment2 awstypes.Environment + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_mwaa_environment.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.MWAAServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckEnvironmentDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckEnvironmentExists(ctx, resourceName, &environment1), + resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", "FORCED"), + ), + ExpectNonEmptyPlan: true, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckEnvironmentExists(ctx, resourceName, &environment2), + testAccCheckEnvironmentNotRecreated(&environment2, &environment1), + resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", "GRACEFUL"), + ), + }, + }, + }) +} + func testAccCheckEnvironmentExists(ctx context.Context, n string, v *awstypes.Environment) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -1010,8 +1051,26 @@ resource "aws_mwaa_environment" "test" { } source_bucket_arn = aws_s3_bucket.test.arn - airflow_version = %[2]q } `, rName, airflowVersion)) } + +func testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName string) string { + return acctest.ConfigCompose(testAccEnvironmentConfig_base(rName), fmt.Sprintf(` +resource "aws_mwaa_environment" "test" { + dag_s3_path = aws_s3_object.dags.key + execution_role_arn = aws_iam_role.test.arn + name = %[1]q + + worker_replacement_strategy = "GRACEFUL" + network_configuration { + security_group_ids = [aws_security_group.test.id] + subnet_ids = aws_subnet.private[*].id + } + + source_bucket_arn = aws_s3_bucket.test.arn + airflow_version = "2.4.3" +} +`, rName)) +} From 5c0f4236c3a8456532985e030dc8b5f8b11b8563 Mon Sep 17 00:00:00 2001 From: "jserras@tripadvisor.com" Date: Mon, 16 Jun 2025 23:56:57 +0100 Subject: [PATCH 0055/2115] feat:add changelog --- .changelog/43041.txt | 3 +++ internal/service/mwaa/environment_test.go | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 .changelog/43041.txt diff --git a/.changelog/43041.txt b/.changelog/43041.txt new file mode 100644 index 000000000000..e1e6ce096a59 --- /dev/null +++ b/.changelog/43041.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_mwaa_environment: Add `worker_replacement_strategy` attribute +``` diff --git a/internal/service/mwaa/environment_test.go b/internal/service/mwaa/environment_test.go index 7aa0d46b1b59..8805d0a39364 100644 --- a/internal/service/mwaa/environment_test.go +++ b/internal/service/mwaa/environment_test.go @@ -1051,7 +1051,7 @@ resource "aws_mwaa_environment" "test" { } source_bucket_arn = aws_s3_bucket.test.arn - airflow_version = %[2]q + airflow_version = %[2]q } `, rName, airflowVersion)) } @@ -1059,18 +1059,17 @@ resource "aws_mwaa_environment" "test" { func testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName string) string { return acctest.ConfigCompose(testAccEnvironmentConfig_base(rName), fmt.Sprintf(` resource "aws_mwaa_environment" "test" { - dag_s3_path = aws_s3_object.dags.key - execution_role_arn = aws_iam_role.test.arn - name = %[1]q - - worker_replacement_strategy = "GRACEFUL" + dag_s3_path = aws_s3_object.dags.key + execution_role_arn = aws_iam_role.test.arn + name = %[1]q + worker_replacement_strategy = "GRACEFUL" network_configuration { security_group_ids = [aws_security_group.test.id] subnet_ids = aws_subnet.private[*].id } source_bucket_arn = aws_s3_bucket.test.arn - airflow_version = "2.4.3" + airflow_version = "2.4.3" } `, rName)) } From e3a4d888e9771b4d3a16c78a6d34fbcfad55c461 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Wed, 2 Jul 2025 11:41:52 -0700 Subject: [PATCH 0056/2115] Rename DB cluster resource --- .../service/timestreaminfluxdb/db_cluster.go | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 589cc4199122..0707519d654d 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -355,7 +355,7 @@ func dbClusterDBParameterGroupIdentifierReplaceIf(ctx context.Context, req planm if req.State.Raw.IsNull() || req.Plan.Raw.IsNull() { return } - var plan, state resourceDBClusterData + var plan, state dbClusterResourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) resp.Diagnostics.Append(req.State.Get(ctx, &state)...) if resp.Diagnostics.HasError() { @@ -368,10 +368,10 @@ func dbClusterDBParameterGroupIdentifierReplaceIf(ctx context.Context, req planm resp.RequiresReplace = dbParameterGroupIdentifierRemoved } -func (r *resourceDBCluster) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { +func (r *dbClusterResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { conn := r.Meta().TimestreamInfluxDBClient(ctx) - var plan resourceDBClusterData + var plan dbClusterResourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) if resp.Diagnostics.HasError() { return @@ -432,10 +432,10 @@ func (r *resourceDBCluster) Create(ctx context.Context, req resource.CreateReque resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) } -func (r *resourceDBCluster) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { +func (r *dbClusterResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { conn := r.Meta().TimestreamInfluxDBClient(ctx) - var state resourceDBClusterData + var state dbClusterResourceModel resp.Diagnostics.Append(req.State.Get(ctx, &state)...) if resp.Diagnostics.HasError() { return @@ -464,10 +464,10 @@ func (r *resourceDBCluster) Read(ctx context.Context, req resource.ReadRequest, resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) } -func (r *resourceDBCluster) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { +func (r *dbClusterResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { conn := r.Meta().TimestreamInfluxDBClient(ctx) - var plan, state resourceDBClusterData + var plan, state dbClusterResourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) resp.Diagnostics.Append(req.State.Get(ctx, &state)...) if resp.Diagnostics.HasError() { @@ -517,10 +517,10 @@ func (r *resourceDBCluster) Update(ctx context.Context, req resource.UpdateReque resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) } -func (r *resourceDBCluster) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { +func (r *dbClusterResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { conn := r.Meta().TimestreamInfluxDBClient(ctx) - var state resourceDBClusterData + var state dbClusterResourceModel resp.Diagnostics.Append(req.State.Get(ctx, &state)...) if resp.Diagnostics.HasError() { return @@ -553,7 +553,7 @@ func (r *resourceDBCluster) Delete(ctx context.Context, req resource.DeleteReque } } -func (r *resourceDBCluster) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) { +func (r *dbClusterResource) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) { var allocatedStorage types.Int64 resp.Diagnostics.Append(req.Config.GetAttribute(ctx, path.Root(names.AttrAllocatedStorage), &allocatedStorage)...) if resp.Diagnostics.HasError() { From 98c214bdee08a603b631d5358cf0875dc0f80d1d Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Wed, 2 Jul 2025 12:00:57 -0700 Subject: [PATCH 0057/2115] Fix incorrect DB Cluster resource name --- .../timestreaminfluxdb/db_cluster_tags_gen_test.go | 12 ++++++------ internal/service/timestreaminfluxdb/exports_test.go | 4 ++-- internal/service/timestreaminfluxdb/sweep.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go index 58180bdb3406..290aa91ba379 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go @@ -2031,7 +2031,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), @@ -2080,7 +2080,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), @@ -2129,7 +2129,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), })), @@ -2192,7 +2192,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), @@ -2250,7 +2250,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), @@ -2307,7 +2307,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), })), diff --git a/internal/service/timestreaminfluxdb/exports_test.go b/internal/service/timestreaminfluxdb/exports_test.go index f11a4baf79c8..3a0de223d589 100644 --- a/internal/service/timestreaminfluxdb/exports_test.go +++ b/internal/service/timestreaminfluxdb/exports_test.go @@ -5,8 +5,8 @@ package timestreaminfluxdb // Exports for use in tests only. var ( - ResourceDBCluster = newResourceDBCluster - ResourceDBInstance = newResourceDBInstance + ResourceDBCluster = newDBClusterResource + ResourceDBInstance = newDBInstanceResource FindDBClusterByID = findDBClusterByID FindDBInstanceByID = findDBInstanceByID diff --git a/internal/service/timestreaminfluxdb/sweep.go b/internal/service/timestreaminfluxdb/sweep.go index 7974a6ded647..2873c45b155e 100644 --- a/internal/service/timestreaminfluxdb/sweep.go +++ b/internal/service/timestreaminfluxdb/sweep.go @@ -34,7 +34,7 @@ func sweepDBClusters(ctx context.Context, client *conns.AWSClient) ([]sweep.Swee } for _, v := range page.Items { - sweepResources = append(sweepResources, framework.NewSweepResource(newResourceDBCluster, client, + sweepResources = append(sweepResources, framework.NewSweepResource(newDBClusterResource, client, framework.NewAttribute(names.AttrID, aws.ToString(v.Id)), )) } From a55bec892277bde4422cd52a70f3372d9774cf72 Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Thu, 3 Jul 2025 09:17:17 -0700 Subject: [PATCH 0058/2115] Fix incorrect test function call --- internal/service/timestreaminfluxdb/db_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_instance_test.go b/internal/service/timestreaminfluxdb/db_instance_test.go index 64e601c05e96..f2ba7e1d711c 100644 --- a/internal/service/timestreaminfluxdb/db_instance_test.go +++ b/internal/service/timestreaminfluxdb/db_instance_test.go @@ -515,7 +515,7 @@ func TestAccTimestreamInfluxDBDBInstance_upgradeV5_90_0(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - testAccPreCheck(ctx, t) + testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), CheckDestroy: testAccCheckDBInstanceDestroy(ctx), From 57d2cf377fb8ca05845d575b0705ab3e30f03f1c Mon Sep 17 00:00:00 2001 From: Trevor Bonas Date: Thu, 3 Jul 2025 09:59:37 -0700 Subject: [PATCH 0059/2115] Add optional region argument to db_cluster documentation --- website/docs/r/timestreaminfluxdb_db_cluster.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown b/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown index 642e947b6560..e7bdb8e8678a 100644 --- a/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown +++ b/website/docs/r/timestreaminfluxdb_db_cluster.html.markdown @@ -204,6 +204,7 @@ The following arguments are required: The following arguments are optional: +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `db_parameter_group_identifier` - (Optional) ID of the DB parameter group assigned to your cluster. This argument is updatable. If added to an existing Timestream for InfluxDB cluster or given a new value, will cause an in-place update to the cluster. However, if a cluster already has a value for `db_parameter_group_identifier`, removing `db_parameter_group_identifier` will cause the cluster to be destroyed and recreated. * `db_storage_type` - (Default `"InfluxIOIncludedT1"`) Timestream for InfluxDB DB storage type to read and write InfluxDB data. You can choose between 3 different types of provisioned Influx IOPS included storage according to your workloads requirements: Influx IO Included 3000 IOPS, Influx IO Included 12000 IOPS, Influx IO Included 16000 IOPS. Valid options are: `"InfluxIOIncludedT1"`, `"InfluxIOIncludedT2"`, and `"InfluxIOIncludedT3"`. If you use `"InfluxIOIncludedT2" or "InfluxIOIncludedT3", the minimum value for `allocated_storage` is 400. * `deployment_type` - (Default `"MULTI_NODE_READ_REPLICAS"`) Specifies the type of cluster to create. Valid options are: `"MULTI_NODE_READ_REPLICAS"`. From 6913625cbf0ba1bd5b309a7f6030599762c9dca4 Mon Sep 17 00:00:00 2001 From: timothy-welsh_ramp Date: Thu, 15 May 2025 09:04:22 -0400 Subject: [PATCH 0060/2115] Support Valkey upgrades on elasticache_global_replication_group Once a replication group is added to a global datastore, all of it's engine upgrades need to be controlled on the global datastore. This resource did not support setting an explicit engine value on global datastores, preventing upgrades (#41618). Further, if creating a Valkey global datastore by inheriting version from the primary (or manually upgrading the engine of the global datastore in AWS Console), then you could not continue manage the secondary replication groups in terraform. A Valkey engine would cause an incorrect destroy & re-create plan (if using defaults for engine) or a conflict (if trying to set the engine correctly). We remove the default engine value, mark it as computed and add DiffSuppressFunc to engine, engine_version and parmeter_group_name to ignore changes to these attributes in plans when the resource belongs to a global datastore (primary or secondary). Fixes #40786 and #41713. This also has the benefit of removing the need to add explicit ignore_changes lifecycle blocks to attempt to work around these plans. We update existing documentation on around this. --- .../service/elasticache/engine_version.go | 22 ++ .../elasticache/engine_version_test.go | 4 + internal/service/elasticache/exports_test.go | 2 +- .../elasticache/global_replication_group.go | 68 ++++- .../global_replication_group_test.go | 278 ++++++++++++++++-- .../service/elasticache/replication_group.go | 45 +-- ...che_global_replication_group.html.markdown | 21 +- 7 files changed, 362 insertions(+), 78 deletions(-) diff --git a/internal/service/elasticache/engine_version.go b/internal/service/elasticache/engine_version.go index 412413e6ccd0..4ce8e8cdb720 100644 --- a/internal/service/elasticache/engine_version.go +++ b/internal/service/elasticache/engine_version.go @@ -13,6 +13,7 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" gversion "github.com/hashicorp/go-version" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -109,6 +110,22 @@ func customizeDiffEngineVersionForceNewOnDowngrade(_ context.Context, diff *sche return engineVersionForceNewOnDowngrade(diff) } +func customizeDiffEngineForceNewOnDowngrade() schema.CustomizeDiffFunc { + return customdiff.ForceNewIf(names.AttrEngine, func(_ context.Context, diff *schema.ResourceDiff, meta any) bool { + if _, is_global := diff.GetOk("global_replication_group_id"); is_global { + return false + } + + if !diff.HasChange(names.AttrEngine) { + return false + } + if old, new := diff.GetChange(names.AttrEngine); old.(string) == engineRedis && new.(string) == engineValkey { + return false + } + return true + }) +} + type getChangeDiffer interface { Get(key string) any GetChange(key string) (any, any) @@ -151,12 +168,17 @@ func engineVersionIsDowngrade(diff getChangeDiffer) (bool, error) { type forceNewDiffer interface { Id() string Get(key string) any + GetOk(key string) (any, bool) GetChange(key string) (any, any) HasChange(key string) bool ForceNew(key string) error } func engineVersionForceNewOnDowngrade(diff forceNewDiffer) error { + if _, is_global := diff.GetOk("global_replication_group_id"); is_global { + return nil + } + if diff.Id() == "" || !diff.HasChange(names.AttrEngineVersion) { return nil } diff --git a/internal/service/elasticache/engine_version_test.go b/internal/service/elasticache/engine_version_test.go index b9101f353c09..929401a7917e 100644 --- a/internal/service/elasticache/engine_version_test.go +++ b/internal/service/elasticache/engine_version_test.go @@ -513,6 +513,10 @@ func (d *mockForceNewDiffer) Get(key string) any { return d.old } +func (d *mockForceNewDiffer) GetOk(key string) (any, bool) { + return d.old, d.old != "" +} + func (d *mockForceNewDiffer) HasChange(key string) bool { return d.hasChange || d.old != d.new } diff --git a/internal/service/elasticache/exports_test.go b/internal/service/elasticache/exports_test.go index 0a2778624848..4904a245956c 100644 --- a/internal/service/elasticache/exports_test.go +++ b/internal/service/elasticache/exports_test.go @@ -41,7 +41,7 @@ var ( EngineVersionIsDowngrade = engineVersionIsDowngrade GlobalReplicationGroupRegionPrefixFormat = globalReplicationGroupRegionPrefixFormat NormalizeEngineVersion = normalizeEngineVersion - ParamGroupNameRequiresMajorVersionUpgrade = paramGroupNameRequiresMajorVersionUpgrade + ParamGroupNameRequiresMajorVersionUpgrade = paramGroupNameRequiresEngineOrMajorVersionUpgrade ValidateClusterEngineVersion = validateClusterEngineVersion ValidMemcachedVersionString = validMemcachedVersionString ValidRedisVersionString = validRedisVersionString diff --git a/internal/service/elasticache/global_replication_group.go b/internal/service/elasticache/global_replication_group.go index abf04d1a2618..3f0546e44bbf 100644 --- a/internal/service/elasticache/global_replication_group.go +++ b/internal/service/elasticache/global_replication_group.go @@ -90,8 +90,10 @@ func resourceGlobalReplicationGroup() *schema.Resource { Computed: true, }, names.AttrEngine: { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{engineRedis, engineValkey}, true), }, names.AttrEngineVersion: { Type: schema.TypeString, @@ -210,7 +212,8 @@ func resourceGlobalReplicationGroup() *schema.Resource { CustomizeDiff: customdiff.All( customizeDiffGlobalReplicationGroupEngineVersionErrorOnDowngrade, - customizeDiffGlobalReplicationGroupParamGroupNameRequiresMajorVersionUpgrade, + customizeDiffEngineForceNewOnDowngrade(), + customizeDiffGlobalReplicationGroupParamGroupNameRequiresEngineOrMajorVersionUpgrade, customdiff.ComputedIf("global_node_groups", diffHasChange("num_node_groups")), ), } @@ -233,18 +236,23 @@ of the Global Replication Group and all Replication Group members. The AWS provi Please use the "-replace" option on the terraform plan and apply commands (see https://www.terraform.io/cli/commands/plan#replace-address).`, diff.Id()) } -func customizeDiffGlobalReplicationGroupParamGroupNameRequiresMajorVersionUpgrade(_ context.Context, diff *schema.ResourceDiff, _ any) error { - return paramGroupNameRequiresMajorVersionUpgrade(diff) +func customizeDiffGlobalReplicationGroupParamGroupNameRequiresEngineOrMajorVersionUpgrade(_ context.Context, diff *schema.ResourceDiff, _ any) error { + return paramGroupNameRequiresEngineOrMajorVersionUpgrade(diff) } // parameter_group_name can only be set when doing a major update, // but we also should allow it to stay set afterwards -func paramGroupNameRequiresMajorVersionUpgrade(diff sdkv2.ResourceDiffer) error { +func paramGroupNameRequiresEngineOrMajorVersionUpgrade(diff sdkv2.ResourceDiffer) error { o, n := diff.GetChange(names.AttrParameterGroupName) if o.(string) == n.(string) { return nil } + // param group must be able to change on Redis 7.1 to Valkey 7.2 upgrade + if diff.HasChange(names.AttrEngine) { + return nil + } + if diff.Id() == "" { if !diff.HasChange(names.AttrEngineVersion) { return errors.New("cannot change parameter group name without upgrading major engine version") @@ -262,7 +270,7 @@ func paramGroupNameRequiresMajorVersionUpgrade(diff sdkv2.ResourceDiffer) error if vDiff[0] == 0 && vDiff[1] == 0 { return errors.New("cannot change parameter group name without upgrading major engine version") } - if vDiff[0] != 1 { + if vDiff[0] == 0 { return fmt.Errorf("cannot change parameter group name on minor engine version upgrade, upgrading from %s to %s", oldVersion.String(), newVersion.String()) } } @@ -318,9 +326,25 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc } } - if v, ok := d.GetOk(names.AttrEngineVersion); ok { + if e, ok := d.GetOk(names.AttrEngine); ok { + if e.(string) == aws.ToString(globalReplicationGroup.Engine) { + log.Printf("[DEBUG] Not updating ElastiCache Global Replication Group (%s) engine: no change from %q", d.Id(), e) + } else { + version := d.Get(names.AttrEngineVersion).(string) + p := d.Get(names.AttrParameterGroupName).(string) + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), "engine", d.Timeout(schema.TimeoutUpdate)); err != nil { + return sdkdiag.AppendFromErr(diags, err) + } + } + } else if v, ok := d.GetOk(names.AttrEngineVersion); ok { requestedVersion, _ := normalizeEngineVersion(v.(string)) + // backwards-compatibility; imply redis engine if just given engine version + engine, ok := d.GetOk(names.AttrEngine) + if !ok { + engine = engineRedis + } + engineVersion, err := gversion.NewVersion(aws.ToString(globalReplicationGroup.EngineVersion)) if err != nil { return sdkdiag.AppendErrorf(diags, "updating ElastiCache Global Replication Group (%s) engine version on creation: error reading engine version: %s", d.Id(), err) @@ -335,7 +359,7 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc p := d.Get(names.AttrParameterGroupName).(string) if diff[0] == 1 { - if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(v.(string), p), "engine version (major)", d.Timeout(schema.TimeoutCreate)); err != nil { + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(engine.(string), v.(string), p), "engine version (major)", d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } else if diff[1] == 1 { @@ -343,7 +367,7 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc return sdkdiag.AppendErrorf(diags, "cannot change parameter group name on minor engine version upgrade, upgrading from %s to %s", engineVersion.String(), requestedVersion.String()) } if t, _ := regexp.MatchString(`[6-9]\.x`, v.(string)); !t { - if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMinorUpdater(v.(string)), "engine version (minor)", d.Timeout(schema.TimeoutCreate)); err != nil { + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMinorUpdater(engine.(string), v.(string)), "engine version (minor)", d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } @@ -440,20 +464,32 @@ func resourceGlobalReplicationGroupUpdate(ctx context.Context, d *schema.Resourc } } - if d.HasChange(names.AttrEngineVersion) { + if d.HasChange(names.AttrEngine) { + engine := d.Get(names.AttrEngine).(string) + version := d.Get(names.AttrEngineVersion).(string) + p := d.Get(names.AttrParameterGroupName).(string) + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(engine, version, p), "engine version (major)", d.Timeout(schema.TimeoutUpdate)); err != nil { + return sdkdiag.AppendFromErr(diags, err) + } + } else if d.HasChange(names.AttrEngineVersion) { o, n := d.GetChange(names.AttrEngineVersion) newVersion, _ := normalizeEngineVersion(n.(string)) oldVersion, _ := gversion.NewVersion(o.(string)) + // backwards-compatibility; imply redis engine if just given engine version + engine, ok := d.GetOk(names.AttrEngine) + if !ok { + engine = engineRedis + } diff := diffVersion(newVersion, oldVersion) if diff[0] == 1 { p := d.Get(names.AttrParameterGroupName).(string) - if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(n.(string), p), "engine version (major)", d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(engine.(string), n.(string), p), "engine version (major)", d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } else if diff[1] == 1 { - if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMinorUpdater(n.(string)), "engine version (minor)", d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMinorUpdater(engine.(string), n.(string)), "engine version (minor)", d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } @@ -509,14 +545,16 @@ func globalReplicationGroupDescriptionUpdater(description string) globalReplicat } } -func globalReplicationGroupEngineVersionMinorUpdater(version string) globalReplicationGroupUpdater { +func globalReplicationGroupEngineVersionMinorUpdater(engine, version string) globalReplicationGroupUpdater { return func(input *elasticache.ModifyGlobalReplicationGroupInput) { + input.Engine = aws.String(engine) input.EngineVersion = aws.String(version) } } -func globalReplicationGroupEngineVersionMajorUpdater(version, paramGroupName string) globalReplicationGroupUpdater { +func globalReplicationGroupEngineVersionMajorUpdater(engine, version, paramGroupName string) globalReplicationGroupUpdater { return func(input *elasticache.ModifyGlobalReplicationGroupInput) { + input.Engine = aws.String(engine) input.EngineVersion = aws.String(version) input.CacheParameterGroupName = aws.String(paramGroupName) } diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 44e40491efcc..06eb8dcceaa6 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -926,10 +926,9 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnCreate_NoChange_ ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrEngineVersion}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -1230,7 +1229,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1267,7 +1266,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1313,7 +1312,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorDown CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1360,7 +1359,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MajorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1402,7 +1401,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MajorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1445,7 +1444,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetParameterGroupOnUpdate_NoVersio CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.2\.[[:digit:]]+$`)), @@ -1479,7 +1478,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetParameterGroupOnUpdate_MinorUpg CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.0\.[[:digit:]]+$`)), @@ -1528,6 +1527,179 @@ func TestAccElastiCacheGlobalReplicationGroup_UpdateParameterGroupName(t *testin }) } +func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnCreate_ValkeyUpgrade(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + primaryReplicationGroupId := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckGlobalReplicationGroup(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), + Steps: []resource.TestStep{ + { + // create global datastore with valkey 8.0 engine version from a redis 7.1 primary replication group + Config: testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGroupId, "redis", "7.1", "valkey", "8.0", "default.valkey8"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^8\.0\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being upgraded by the global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + +func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + primaryReplicationGroupId := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckGlobalReplicationGroup(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), + Steps: []resource.TestStep{ + { + // create global datastore using redis 7.1 primary replication group engine version + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "7.1"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^7\.1\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being associated to global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "redis"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.1"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + { + // upgrade engine and version on global datastore + Config: testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGroupId, "redis", "7.1", "valkey", "7.2", "default.valkey7"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^7\.2\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being upgraded by the global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.2"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + +func TestAccElastiCacheGlobalReplicationGroup_InheritValkeyEngine_SecondaryReplicationGroup(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + primaryReplicationGroupId := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + secondaryReplicationGroupId := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + secondaryReplicationGroupResourceName := "aws_elasticache_replication_group.secondary" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckMultipleRegion(t, 2) + testAccPreCheckGlobalReplicationGroup(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 2), + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx), + Steps: []resource.TestStep{ + { + // create global datastore using Valkey 8.0 primary replication group and add secondary replication group + Config: testAccGlobalReplicationGroupConfig_Valkey_inheritEngine_secondaryReplicationGroup(rName, primaryReplicationGroupId, secondaryReplicationGroupId), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^8\.0\.[[:digit:]]+$`)), + ), + }, + { + // refresh replication groups to pick up all engine and version computed changes + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + + resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(secondaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + func testAccCheckGlobalReplicationGroupExists(ctx context.Context, resourceName string, v *awstypes.GlobalReplicationGroup) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] @@ -2070,7 +2242,7 @@ resource "aws_elasticache_replication_group" "test" { `, rName, numNodeGroups, globalNumNodeGroups) } -func testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, repGroupEngineVersion string) string { +func testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, repGroupEngineVersion string) string { return fmt.Sprintf(` resource "aws_elasticache_global_replication_group" "test" { global_replication_group_id_suffix = %[1]q @@ -2106,10 +2278,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion) } @@ -2131,10 +2299,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion) } @@ -2157,14 +2321,72 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion, parameterGroup) } +func testAccGlobalReplicationGroupConfig_engineParam( + rName, + primaryReplicationGroupId, + repGroupEngine, + repGroupEngineVersion, + globalEngine, + globalEngineVersion, + globalParamGroup string, +) string { + return fmt.Sprintf(` +resource "aws_elasticache_global_replication_group" "test" { + global_replication_group_id_suffix = %[1]q + primary_replication_group_id = aws_elasticache_replication_group.test.id + + engine = %[5]q + engine_version = %[6]q + parameter_group_name = %[7]q +} + +resource "aws_elasticache_replication_group" "test" { + replication_group_id = %[2]q + description = "test" + + engine = %[3]q + engine_version = %[4]q + node_type = "cache.m5.large" + num_cache_clusters = 1 +} +`, rName, primaryReplicationGroupId, repGroupEngine, repGroupEngineVersion, globalEngine, globalEngineVersion, globalParamGroup) +} + +func testAccGlobalReplicationGroupConfig_Valkey_inheritEngine_secondaryReplicationGroup( + rName, + primaryReplicationGroupId, + secondaryReplicationGroupId string, +) string { + return acctest.ConfigCompose(acctest.ConfigMultipleRegionProvider(2), fmt.Sprintf(` +resource "aws_elasticache_global_replication_group" "test" { + global_replication_group_id_suffix = %[1]q + primary_replication_group_id = aws_elasticache_replication_group.test.id +} + +resource "aws_elasticache_replication_group" "test" { + replication_group_id = %[2]q + description = "test" + + engine = "valkey" + engine_version = "8.0" + node_type = "cache.m5.large" + num_cache_clusters = 1 +} + +resource "aws_elasticache_replication_group" "secondary" { + provider = awsalternate + + replication_group_id = %[3]q + description = "test secondary" + global_replication_group_id = aws_elasticache_global_replication_group.test.id +} +`, rName, primaryReplicationGroupId, secondaryReplicationGroupId)) +} + func testAccGlobalReplicationGroupConfig_engineVersionCustomParam(rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion, parameterGroupName, parameterGroupFamily string) string { return fmt.Sprintf(` resource "aws_elasticache_global_replication_group" "test" { @@ -2183,10 +2405,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } resource "aws_elasticache_parameter_group" "test" { @@ -2214,10 +2432,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, parameterGroup) } diff --git a/internal/service/elasticache/replication_group.go b/internal/service/elasticache/replication_group.go index 278d993dc594..3368cbc90c6f 100644 --- a/internal/service/elasticache/replication_group.go +++ b/internal/service/elasticache/replication_group.go @@ -124,9 +124,9 @@ func resourceReplicationGroup() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, names.AttrEngine: { - Type: schema.TypeString, - Optional: true, - Default: engineRedis, + Type: schema.TypeString, + Optional: true, + Computed: true, ValidateDiagFunc: validation.AllDiag( validation.ToDiagFunc(validation.StringInSlice([]string{engineRedis, engineValkey}, true)), // While the existing validator makes it technically possible to provide an @@ -136,6 +136,7 @@ func resourceReplicationGroup() *schema.Resource { // practitioners that stricter validation will be enforced in v7.0.0. verify.CaseInsensitiveMatchDeprecation([]string{engineRedis, engineValkey}), ), + DiffSuppressFunc: suppressDiffIfBelongsToGlobalReplicationGroup, }, names.AttrEngineVersion: { Type: schema.TypeString, @@ -145,6 +146,7 @@ func resourceReplicationGroup() *schema.Resource { validRedisVersionString, validValkeyVersionString, ), + DiffSuppressFunc: suppressDiffIfBelongsToGlobalReplicationGroup, }, "engine_version_actual": { Type: schema.TypeString, @@ -266,7 +268,7 @@ func resourceReplicationGroup() *schema.Resource { Optional: true, Computed: true, DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - return strings.HasPrefix(old, "global-datastore-") + return suppressDiffIfBelongsToGlobalReplicationGroup(k, old, new, d) }, }, names.AttrPort: { @@ -415,15 +417,7 @@ func resourceReplicationGroup() *schema.Resource { CustomizeDiff: customdiff.All( replicationGroupValidateMultiAZAutomaticFailover, customizeDiffEngineVersionForceNewOnDowngrade, - customdiff.ForceNewIf(names.AttrEngine, func(_ context.Context, diff *schema.ResourceDiff, meta any) bool { - if !diff.HasChange(names.AttrEngine) { - return false - } - if old, new := diff.GetChange(names.AttrEngine); old.(string) == engineRedis && new.(string) == engineValkey { - return false - } - return true - }), + customizeDiffEngineForceNewOnDowngrade(), customdiff.ComputedIf("member_clusters", func(ctx context.Context, diff *schema.ResourceDiff, meta any) bool { return diff.HasChange("num_cache_clusters") || diff.HasChange("num_node_groups") || @@ -492,8 +486,14 @@ func resourceReplicationGroupCreate(ctx context.Context, d *schema.ResourceData, } input.AutomaticFailoverEnabled = aws.Bool(d.Get("automatic_failover_enabled").(bool)) input.CacheNodeType = aws.String(nodeType) - input.Engine = aws.String(d.Get(names.AttrEngine).(string)) input.TransitEncryptionEnabled = aws.Bool(d.Get("transit_encryption_enabled").(bool)) + + // backwards-compatibility; imply redis engine if empty and not part of global replication group + if e, ok := d.GetOk(names.AttrEngine); ok { + input.Engine = aws.String(e.(string)) + } else { + input.Engine = aws.String(engineRedis) + } } if v, ok := d.GetOk("ip_discovery"); ok { @@ -682,8 +682,6 @@ func resourceReplicationGroupRead(ctx context.Context, d *schema.ResourceData, m d.Set("global_replication_group_id", rgp.GlobalReplicationGroupInfo.GlobalReplicationGroupId) } - d.Set(names.AttrEngine, rgp.Engine) - switch rgp.AutomaticFailover { case awstypes.AutomaticFailoverStatusDisabled, awstypes.AutomaticFailoverStatusDisabling: d.Set("automatic_failover_enabled", false) @@ -862,7 +860,7 @@ func resourceReplicationGroupUpdate(ctx context.Context, d *schema.ResourceData, requestUpdate = true } - if old, new := d.GetChange(names.AttrEngine); old.(string) == engineRedis && new.(string) == engineValkey { + if old, new := d.GetChange(names.AttrEngine); old.(string) != new.(string) && new.(string) == engineValkey { if !d.HasChange(names.AttrEngineVersion) { return sdkdiag.AppendErrorf(diags, "must explicitly set '%s' attribute for Replication Group (%s) when updating engine to 'valkey'", names.AttrEngineVersion, d.Id()) } @@ -872,6 +870,14 @@ func resourceReplicationGroupUpdate(ctx context.Context, d *schema.ResourceData, if d.HasChange(names.AttrEngineVersion) { input.EngineVersion = aws.String(d.Get(names.AttrEngineVersion).(string)) + if input.Engine == nil { + // backwards-compatibility; imply redis engine if just given engine version + if e, ok := d.GetOk(names.AttrEngine); ok { + input.Engine = aws.String(e.(string)) + } else { + input.Engine = aws.String(engineRedis) + } + } requestUpdate = true } @@ -1500,3 +1506,8 @@ func replicationGroupValidateAutomaticFailoverNumCacheClusters(_ context.Context } return errors.New(`"num_cache_clusters": must be at least 2 if automatic_failover_enabled is true`) } + +func suppressDiffIfBelongsToGlobalReplicationGroup(k, old, new string, d *schema.ResourceData) bool { + _, has_global_replication_group := d.GetOk("global_replication_group_id") + return has_global_replication_group && !d.IsNewResource() +} diff --git a/website/docs/r/elasticache_global_replication_group.html.markdown b/website/docs/r/elasticache_global_replication_group.html.markdown index 5e2ddaa606c4..7e77665e01e1 100644 --- a/website/docs/r/elasticache_global_replication_group.html.markdown +++ b/website/docs/r/elasticache_global_replication_group.html.markdown @@ -50,8 +50,7 @@ The initial Redis version is determined by the version set on the primary replic However, once it is part of a Global Replication Group, the Global Replication Group manages the version of all member replication groups. -The member replication groups must have [`lifecycle.ignore_changes[engine_version]`](https://www.terraform.io/language/meta-arguments/lifecycle) set, -or Terraform will always return a diff. +The provider is configured to ignore changes to `engine`, `engine_version` and `parameter_group_name` inside `aws_elasticache_replication_group` resources if they belong to a global replication group. In this example, the primary replication group will be created with Redis 6.0, @@ -75,10 +74,6 @@ resource "aws_elasticache_replication_group" "primary" { node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } resource "aws_elasticache_replication_group" "secondary" { @@ -89,10 +84,6 @@ resource "aws_elasticache_replication_group" "secondary" { global_replication_group_id = aws_elasticache_global_replication_group.example.global_replication_group_id num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } ``` @@ -107,7 +98,12 @@ This resource supports the following arguments: See AWS documentation for information on [supported node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheNodes.SupportedTypes.html) and [guidance on selecting node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/nodes-select-size.html). When creating, by default the Global Replication Group inherits the node type of the primary replication group. -* `engine_version` - (Optional) Redis version to use for the Global Replication Group. +* `engine` - (Optional) The name of the cache engine to be used for the clusters in this global replication group. + When creating, by default the Global Replication Group inherits the engine of the primary replication group. + If an engine is specified, the Global Replication Group and all member replication groups will be upgraded to this engine. + Valid values are `redis` or `valkey`. + Default is `redis` if `engine_version` is specified. +* `engine_version` - (Optional) Engine version to use for the Global Replication Group. When creating, by default the Global Replication Group inherits the version of the primary replication group. If a version is specified, the Global Replication Group and all member replication groups will be upgraded to this version. Cannot be downgraded without replacing the Global Replication Group and all member replication groups. @@ -120,7 +116,7 @@ This resource supports the following arguments: * `global_replication_group_description` - (Optional) A user-created description for the global replication group. * `num_node_groups` - (Optional) The number of node groups (shards) on the global replication group. * `parameter_group_name` - (Optional) An ElastiCache Parameter Group to use for the Global Replication Group. - Required when upgrading a major engine version, but will be ignored if left configured after the upgrade is complete. + Required when upgrading an engine or major engine version, but will be ignored if left configured after the upgrade is complete. Specifying without a major version upgrade will fail. Note that ElastiCache creates a copy of this parameter group for each member replication group. @@ -134,7 +130,6 @@ This resource exports the following attributes in addition to the arguments abov * `at_rest_encryption_enabled` - A flag that indicate whether the encryption at rest is enabled. * `auth_token_enabled` - A flag that indicate whether AuthToken (password) is enabled. * `cluster_enabled` - Indicates whether the Global Datastore is cluster enabled. -* `engine` - The name of the cache engine to be used for the clusters in this global replication group. * `global_replication_group_id` - The full ID of the global replication group. * `global_node_groups` - Set of node groups (shards) on the global replication group. Has the values: From 40bbf29c7e3838f122929c182488fa653edfbe19 Mon Sep 17 00:00:00 2001 From: twelsh-aw Date: Thu, 15 May 2025 15:59:02 -0400 Subject: [PATCH 0061/2115] fix units and semgrep --- internal/service/elasticache/engine_version_test.go | 2 +- .../service/elasticache/global_replication_group.go | 2 +- .../elasticache/global_replication_group_test.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/elasticache/engine_version_test.go b/internal/service/elasticache/engine_version_test.go index 929401a7917e..cb350f585d7b 100644 --- a/internal/service/elasticache/engine_version_test.go +++ b/internal/service/elasticache/engine_version_test.go @@ -514,7 +514,7 @@ func (d *mockForceNewDiffer) Get(key string) any { } func (d *mockForceNewDiffer) GetOk(key string) (any, bool) { - return d.old, d.old != "" + return "", false } func (d *mockForceNewDiffer) HasChange(key string) bool { diff --git a/internal/service/elasticache/global_replication_group.go b/internal/service/elasticache/global_replication_group.go index 3f0546e44bbf..1c6652ae8fb9 100644 --- a/internal/service/elasticache/global_replication_group.go +++ b/internal/service/elasticache/global_replication_group.go @@ -332,7 +332,7 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc } else { version := d.Get(names.AttrEngineVersion).(string) p := d.Get(names.AttrParameterGroupName).(string) - if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), "engine", d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), names.AttrEngine, d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 06eb8dcceaa6..56cd2fb6cca2 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -1567,7 +1567,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnCreate_ValkeyUpgrade(t Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), - resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), ), }, @@ -1615,7 +1615,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "redis"), resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.1"), - resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), ), }, @@ -1640,7 +1640,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.2"), - resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), ), }, @@ -1687,12 +1687,12 @@ func TestAccElastiCacheGlobalReplicationGroup_InheritValkeyEngine_SecondaryRepli Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), - resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngine, "valkey"), resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), - resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), resource.TestCheckResourceAttrPair(secondaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), ), }, From c8439372e4084b1b4412ceec969b2724a9f0dd4b Mon Sep 17 00:00:00 2001 From: twelsh-aw Date: Thu, 15 May 2025 18:04:58 -0400 Subject: [PATCH 0062/2115] Create 42636.txt --- .changelog/42636.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/42636.txt diff --git a/.changelog/42636.txt b/.changelog/42636.txt new file mode 100644 index 000000000000..79410a4790ad --- /dev/null +++ b/.changelog/42636.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_elasticache_global_replication_group: Support `engine` attribute for Valkey +``` + +```release-note:bug +resource/aws_elasticache_replication_group: Correctly set Valkey engine on secondary replication groups using global datastores +``` From edf46a18fd522e50d6fc0547aa706063f2e3b30e Mon Sep 17 00:00:00 2001 From: twelsh-aw Date: Thu, 15 May 2025 18:25:09 -0400 Subject: [PATCH 0063/2115] Add back ImportStateVerifyIgnore This is redis6.x specific. It has nothing to do with my DiffSuppressFunc changes or removing the lifecycle { ignore_changes } blocks. Still needed to pass tests :) ``` Step 2/2 error running import: ImportStateVerify attributes not equivalent. Difference is shown below. The - symbol indicates attributes missing after import. map[string]string{ - "engine_version": "6.x", + "engine_version": "6.2", } ``` --- .../service/elasticache/global_replication_group_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 56cd2fb6cca2..9a557ae1c01e 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -926,9 +926,10 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnCreate_NoChange_ ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrEngineVersion}, }, }, }) From 31697b95d4eedf8c1280eb83f2fe2d0019dad876 Mon Sep 17 00:00:00 2001 From: twelsh-aw Date: Fri, 4 Jul 2025 13:38:05 -0400 Subject: [PATCH 0064/2115] Fix lint --- internal/service/elasticache/replication_group.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/elasticache/replication_group.go b/internal/service/elasticache/replication_group.go index 3368cbc90c6f..274b23daaeb1 100644 --- a/internal/service/elasticache/replication_group.go +++ b/internal/service/elasticache/replication_group.go @@ -124,9 +124,9 @@ func resourceReplicationGroup() *schema.Resource { ValidateFunc: validation.StringIsNotEmpty, }, names.AttrEngine: { - Type: schema.TypeString, - Optional: true, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, ValidateDiagFunc: validation.AllDiag( validation.ToDiagFunc(validation.StringInSlice([]string{engineRedis, engineValkey}, true)), // While the existing validator makes it technically possible to provide an From 68fd4f333c24d2013c048c0ee8551c06a6cbbd64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20S=C3=A1nchez=20Carmona?= Date: Tue, 22 Jul 2025 23:08:02 +0200 Subject: [PATCH 0065/2115] fixing dx hosted connection creation/describe --- .changelog/43499.txt | 3 ++ .../directconnect/hosted_connection.go | 46 +++++++++++++------ .../directconnect/hosted_connection_test.go | 9 +++- 3 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 .changelog/43499.txt diff --git a/.changelog/43499.txt b/.changelog/43499.txt new file mode 100644 index 000000000000..edb4ebbc894c --- /dev/null +++ b/.changelog/43499.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_dx_hosted_connection: Fix `DescribeHostedConnections failed for connection dxcon-xxxx doesn't exist` by pointing to the correct connection ID when doing the describe. +``` \ No newline at end of file diff --git a/internal/service/directconnect/hosted_connection.go b/internal/service/directconnect/hosted_connection.go index c7874c24b1b0..20a4721414dc 100644 --- a/internal/service/directconnect/hosted_connection.go +++ b/internal/service/directconnect/hosted_connection.go @@ -139,21 +139,24 @@ func resourceHostedConnectionRead(ctx context.Context, d *schema.ResourceData, m var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DirectConnectClient(ctx) - connection, err := findHostedConnectionByID(ctx, conn, d.Id()) + // Get both the hosted connection ID and the parent connection ID + hostedConnectionID := d.Id() + parentConnectionID := d.Get(names.AttrConnectionID).(string) + + connection, err := findHostedConnectionByID(ctx, conn, hostedConnectionID, parentConnectionID) if !d.IsNewResource() && tfresource.NotFound(err) { - log.Printf("[WARN] Direct Connect Hosted Connection (%s) not found, removing from state", d.Id()) + log.Printf("[WARN] Direct Connect Hosted Connection (%s) not found, removing from state", hostedConnectionID) d.SetId("") return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "reading Direct Connect Hosted Connection (%s): %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Direct Connect Hosted Connection (%s): %s", hostedConnectionID, err) } - // Cannot set the following attributes from the response: - // - connection_id: conn.ConnectionId is this resource's ID, not the ID of the interconnect or LAG - // - tags: conn.Tags seems to always come back empty and DescribeTags needs to be called from the owner account + // Set the connection_id (parent/interconnect ID) and other attributes + d.Set(names.AttrConnectionID, parentConnectionID) d.Set("aws_device", connection.AwsDeviceV2) d.Set("connection_region", connection.Region) d.Set("has_logical_redundancy", connection.HasLogicalRedundancy) @@ -176,18 +179,33 @@ func resourceHostedConnectionDelete(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DirectConnectClient(ctx) - if err := deleteConnection(ctx, conn, d.Id(), waitHostedConnectionDeleted); err != nil { + // Get the parent connection ID + parentConnectionID := d.Get(names.AttrConnectionID).(string) + + // Create a wrapper function that adapts waitHostedConnectionDeleted to match the expected signature + waiterWrapper := func(ctx context.Context, conn *directconnect.Client, connectionID string) (*awstypes.Connection, error) { + return waitHostedConnectionDeleted(ctx, conn, connectionID, parentConnectionID) + } + + if err := deleteConnection(ctx, conn, d.Id(), waiterWrapper); err != nil { return sdkdiag.AppendFromErr(diags, err) } return diags } -func findHostedConnectionByID(ctx context.Context, conn *directconnect.Client, id string) (*awstypes.Connection, error) { +func findHostedConnectionByID(ctx context.Context, conn *directconnect.Client, hostedConnectionID, parentConnectionID string) (*awstypes.Connection, error) { + // Use the parent connection ID for the API call input := &directconnect.DescribeHostedConnectionsInput{ - ConnectionId: aws.String(id), + ConnectionId: aws.String(parentConnectionID), } - output, err := findHostedConnection(ctx, conn, input, tfslices.PredicateTrue[*awstypes.Connection]()) + + // Create a predicate to filter by the hosted connection ID + predicate := func(c *awstypes.Connection) bool { + return aws.ToString(c.ConnectionId) == hostedConnectionID + } + + output, err := findHostedConnection(ctx, conn, input, predicate) if err != nil { return nil, err @@ -234,9 +252,9 @@ func findHostedConnections(ctx context.Context, conn *directconnect.Client, inpu return tfslices.Filter(output.Connections, tfslices.PredicateValue(filter)), nil } -func statusHostedConnection(ctx context.Context, conn *directconnect.Client, id string) retry.StateRefreshFunc { +func statusHostedConnection(ctx context.Context, conn *directconnect.Client, hostedConnectionID string, parentConnectionID string) retry.StateRefreshFunc { return func() (any, string, error) { - output, err := findHostedConnectionByID(ctx, conn, id) + output, err := findHostedConnectionByID(ctx, conn, hostedConnectionID, parentConnectionID) if tfresource.NotFound(err) { return nil, "", nil @@ -250,14 +268,14 @@ func statusHostedConnection(ctx context.Context, conn *directconnect.Client, id } } -func waitHostedConnectionDeleted(ctx context.Context, conn *directconnect.Client, id string) (*awstypes.Connection, error) { +func waitHostedConnectionDeleted(ctx context.Context, conn *directconnect.Client, hostedConnectionID string, parentConnectionID string) (*awstypes.Connection, error) { const ( timeout = 10 * time.Minute ) stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.ConnectionStatePending, awstypes.ConnectionStateOrdering, awstypes.ConnectionStateAvailable, awstypes.ConnectionStateRequested, awstypes.ConnectionStateDeleting), Target: []string{}, - Refresh: statusHostedConnection(ctx, conn, id), + Refresh: statusHostedConnection(ctx, conn, hostedConnectionID, parentConnectionID), Timeout: timeout, } diff --git a/internal/service/directconnect/hosted_connection_test.go b/internal/service/directconnect/hosted_connection_test.go index eb10bc459cb2..7650e9c46195 100644 --- a/internal/service/directconnect/hosted_connection_test.go +++ b/internal/service/directconnect/hosted_connection_test.go @@ -60,7 +60,9 @@ func testAccCheckHostedConnectionDestroy(ctx context.Context, providerFunc func( continue } - _, err := tfdirectconnect.FindHostedConnectionByID(ctx, conn, rs.Primary.ID) + // Get the parent connection ID from the resource attributes + parentConnectionID := rs.Primary.Attributes[names.AttrConnectionID] + _, err := tfdirectconnect.FindHostedConnectionByID(ctx, conn, rs.Primary.ID, parentConnectionID) if tfresource.NotFound(err) { continue @@ -86,7 +88,10 @@ func testAccCheckHostedConnectionExists(ctx context.Context, n string) resource. return fmt.Errorf("Not found: %s", n) } - _, err := tfdirectconnect.FindHostedConnectionByID(ctx, conn, rs.Primary.ID) + // Get the parent connection ID from the resource state + parentConnectionID := rs.Primary.Attributes[names.AttrConnectionID] + + _, err := tfdirectconnect.FindHostedConnectionByID(ctx, conn, rs.Primary.ID, parentConnectionID) return err } From b2aa0142a2c91c02da825502f29cdecb60d44428 Mon Sep 17 00:00:00 2001 From: Byungjin Park Date: Fri, 25 Jul 2025 17:19:07 +0900 Subject: [PATCH 0066/2115] r/aws_quicksight_data_set: add `output_columns` output description --- website/docs/r/quicksight_data_set.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/quicksight_data_set.html.markdown b/website/docs/r/quicksight_data_set.html.markdown index e7e318654dba..cd5391ee114c 100644 --- a/website/docs/r/quicksight_data_set.html.markdown +++ b/website/docs/r/quicksight_data_set.html.markdown @@ -395,6 +395,7 @@ This resource exports the following attributes in addition to the arguments abov * `arn` - Amazon Resource Name (ARN) of the data set. * `id` - A comma-delimited string joining AWS account ID and data set ID. +* `output_columns` - The final set of columns available for use in analyses and dashboards after all data preparation and transformation steps have been applied within the data set. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). ## Import From 2b54669263190c22a5bed0f930f71504b6cb61ed Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 28 Jul 2025 08:17:02 -0400 Subject: [PATCH 0067/2115] dynamodb: Replace 'testAccCheckTableRecreated' with 'plancheck'. --- internal/service/dynamodb/table_test.go | 27 ++++++++++++++----------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 3ab049680a8c..39b6c6d10986 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -4776,6 +4776,11 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, }, { ResourceName: resourceName, @@ -4791,8 +4796,12 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12200"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4200"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, - { Config: testAccTableConfig_warmThroughput(rName, 6, 6, 12300, 4300), Check: resource.ComposeAggregateTestCheckFunc( @@ -4807,12 +4816,16 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { Config: testAccTableConfig_warmThroughput(rName, 6, 6, 12100, 4100), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &confDecreasedThroughput), - testAccCheckTableRecreated(&conf, &confDecreasedThroughput), resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), resource.TestCheckResourceAttr(resourceName, "warm_throughput.#", "1"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, }, }) @@ -5057,16 +5070,6 @@ func testAccCheckTableNotRecreated(i, j *awstypes.TableDescription) resource.Tes } } -func testAccCheckTableRecreated(i, j *awstypes.TableDescription) resource.TestCheckFunc { - return func(s *terraform.State) error { - if i.CreationDateTime.Equal(aws.ToTime(j.CreationDateTime)) { - return errors.New("DynamoDB Table was not recreated") - } - - return nil - } -} - func testAccCheckReplicaExists(ctx context.Context, n string, region string, v *awstypes.TableDescription) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] From 329fd6bdc84c0cb2c4b6ffbb5e2081fbebee3be9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 28 Jul 2025 08:25:18 -0400 Subject: [PATCH 0068/2115] Use 'SchemaFunc'. --- internal/service/dynamodb/table.go | 686 +++++++++--------- .../service/dynamodb/table_data_source.go | 414 +++++------ 2 files changed, 553 insertions(+), 547 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index aa4b661fc492..e85f3c7acebe 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -147,384 +147,386 @@ func resourceTable() *schema.Resource { SchemaVersion: 1, MigrateState: resourceTableMigrateState, - Schema: map[string]*schema.Schema{ - names.AttrARN: { - Type: schema.TypeString, - Computed: true, - }, - "attribute": { - Type: schema.TypeSet, - Optional: true, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Required: true, - }, - names.AttrType: { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.ScalarAttributeType](), + SchemaFunc: func() map[string]*schema.Schema { + return map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + "attribute": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + names.AttrType: { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ScalarAttributeType](), + }, }, }, + Set: sdkv2.SimpleSchemaSetFunc(names.AttrName), }, - Set: sdkv2.SimpleSchemaSetFunc(names.AttrName), - }, - "billing_mode": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.BillingModeProvisioned, - ValidateDiagFunc: enum.Validate[awstypes.BillingMode](), - }, - "deletion_protection_enabled": { - Type: schema.TypeBool, - Optional: true, - }, - "global_secondary_index": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "hash_key": { - Type: schema.TypeString, - Required: true, - }, - names.AttrName: { - Type: schema.TypeString, - Required: true, - }, - "non_key_attributes": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "on_demand_throughput": onDemandThroughputSchema(), - "projection_type": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.ProjectionType](), - }, - "range_key": { - Type: schema.TypeString, - Optional: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - }, - "warm_throughput": warmThroughputSchema(), - "write_capacity": { - Type: schema.TypeInt, - Optional: true, - Computed: true, + "billing_mode": { + Type: schema.TypeString, + Optional: true, + Default: awstypes.BillingModeProvisioned, + ValidateDiagFunc: enum.Validate[awstypes.BillingMode](), + }, + "deletion_protection_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "global_secondary_index": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "hash_key": { + Type: schema.TypeString, + Required: true, + }, + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + "non_key_attributes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "on_demand_throughput": onDemandThroughputSchema(), + "projection_type": { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.ProjectionType](), + }, + "range_key": { + Type: schema.TypeString, + Optional: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "warm_throughput": warmThroughputSchema(), + "write_capacity": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, }, }, }, - }, - "hash_key": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - }, - "import_table": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - ConflictsWith: []string{"restore_source_name", "restore_source_table_arn"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "input_compression_type": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.InputCompressionType](), - }, - "input_format": { - Type: schema.TypeString, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.InputFormat](), - }, - "input_format_options": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "csv": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "delimiter": { - Type: schema.TypeString, - Optional: true, - }, - "header_list": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + "hash_key": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "import_table": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + ConflictsWith: []string{"restore_source_name", "restore_source_table_arn"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "input_compression_type": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.InputCompressionType](), + }, + "input_format": { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[awstypes.InputFormat](), + }, + "input_format_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "csv": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "delimiter": { + Type: schema.TypeString, + Optional: true, + }, + "header_list": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, }, }, }, }, }, }, - }, - "s3_bucket_source": { - Type: schema.TypeList, - MaxItems: 1, - Required: true, - ForceNew: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrBucket: { - Type: schema.TypeString, - Required: true, - }, - "bucket_owner": { - Type: schema.TypeString, - Optional: true, - }, - "key_prefix": { - Type: schema.TypeString, - Optional: true, + "s3_bucket_source": { + Type: schema.TypeList, + MaxItems: 1, + Required: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrBucket: { + Type: schema.TypeString, + Required: true, + }, + "bucket_owner": { + Type: schema.TypeString, + Optional: true, + }, + "key_prefix": { + Type: schema.TypeString, + Optional: true, + }, }, }, }, }, }, }, - }, - "local_secondary_index": { - Type: schema.TypeSet, - Optional: true, - ForceNew: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "non_key_attributes": { - Type: schema.TypeList, - Optional: true, - ForceNew: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "projection_type": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateDiagFunc: enum.Validate[awstypes.ProjectionType](), - }, - "range_key": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + "local_secondary_index": { + Type: schema.TypeSet, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "non_key_attributes": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "projection_type": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateDiagFunc: enum.Validate[awstypes.ProjectionType](), + }, + "range_key": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, }, }, + Set: sdkv2.SimpleSchemaSetFunc(names.AttrName), }, - Set: sdkv2.SimpleSchemaSetFunc(names.AttrName), - }, - names.AttrName: { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "on_demand_throughput": onDemandThroughputSchema(), - "point_in_time_recovery": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrEnabled: { - Type: schema.TypeBool, - Required: true, - }, - "recovery_period_in_days": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - ValidateFunc: validation.IntBetween(1, 35), - DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool { - return !d.Get("point_in_time_recovery.0.enabled").(bool) + names.AttrName: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "on_demand_throughput": onDemandThroughputSchema(), + "point_in_time_recovery": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Required: true, + }, + "recovery_period_in_days": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntBetween(1, 35), + DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool { + return !d.Get("point_in_time_recovery.0.enabled").(bool) + }, }, }, }, }, - }, - "range_key": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - ConflictsWith: []string{"on_demand_throughput"}, - }, - "replica": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrARN: { - Type: schema.TypeString, - Computed: true, - }, - "consistency_mode": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.MultiRegionConsistencyEventual, - ValidateDiagFunc: enum.Validate[awstypes.MultiRegionConsistency](), - }, - names.AttrKMSKeyARN: { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: verify.ValidARN, - // update is equivalent of force a new *replica*, not table - }, - "point_in_time_recovery": { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - names.AttrPropagateTags: { - Type: schema.TypeBool, - Optional: true, - Default: false, - }, - "region_name": { - Type: schema.TypeString, - Required: true, - // update is equivalent of force a new *replica*, not table - }, - names.AttrStreamARN: { - Type: schema.TypeString, - Computed: true, - }, - "stream_label": { - Type: schema.TypeString, - Computed: true, + "range_key": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ConflictsWith: []string{"on_demand_throughput"}, + }, + "replica": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + "consistency_mode": { + Type: schema.TypeString, + Optional: true, + Default: awstypes.MultiRegionConsistencyEventual, + ValidateDiagFunc: enum.Validate[awstypes.MultiRegionConsistency](), + }, + names.AttrKMSKeyARN: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: verify.ValidARN, + // update is equivalent of force a new *replica*, not table + }, + "point_in_time_recovery": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + names.AttrPropagateTags: { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "region_name": { + Type: schema.TypeString, + Required: true, + // update is equivalent of force a new *replica*, not table + }, + names.AttrStreamARN: { + Type: schema.TypeString, + Computed: true, + }, + "stream_label": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, - }, - "restore_date_time": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - ValidateFunc: verify.ValidUTCTimestamp, - }, - "restore_source_table_arn": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: verify.ValidARN, - ConflictsWith: []string{"import_table", "restore_source_name"}, - }, - "restore_source_name": { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"import_table", "restore_source_table_arn"}, - }, - "restore_to_latest_time": { - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - }, - "server_side_encryption": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrEnabled: { - Type: schema.TypeBool, - Required: true, - }, - names.AttrKMSKeyARN: { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: verify.ValidARN, + "restore_date_time": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: verify.ValidUTCTimestamp, + }, + "restore_source_table_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: verify.ValidARN, + ConflictsWith: []string{"import_table", "restore_source_name"}, + }, + "restore_source_name": { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"import_table", "restore_source_table_arn"}, + }, + "restore_to_latest_time": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + "server_side_encryption": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Required: true, + }, + names.AttrKMSKeyARN: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: verify.ValidARN, + }, }, }, }, - }, - names.AttrStreamARN: { - Type: schema.TypeString, - Computed: true, - }, - "stream_enabled": { - Type: schema.TypeBool, - Optional: true, - }, - "stream_label": { - Type: schema.TypeString, - Computed: true, - }, - "stream_view_type": { - Type: schema.TypeString, - Optional: true, - Computed: true, - StateFunc: sdkv2.ToUpperSchemaStateFunc, - ValidateFunc: validation.StringInSlice(append(enum.Values[awstypes.StreamViewType](), ""), false), - }, - "table_class": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.TableClassStandard, - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - return old == "" && new == string(awstypes.TableClassStandard) + names.AttrStreamARN: { + Type: schema.TypeString, + Computed: true, }, - ValidateDiagFunc: enum.Validate[awstypes.TableClass](), - }, - names.AttrTags: tftags.TagsSchema(), - names.AttrTagsAll: tftags.TagsSchemaComputed(), - "ttl": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "attribute_name": { - Type: schema.TypeString, - Optional: true, - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - // AWS requires the attribute name to be set when disabling TTL but - // does not return it so it causes a diff. - if old == "" && new != "" && !d.Get("ttl.0.enabled").(bool) { - return true - } - return false + "stream_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "stream_label": { + Type: schema.TypeString, + Computed: true, + }, + "stream_view_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + StateFunc: sdkv2.ToUpperSchemaStateFunc, + ValidateFunc: validation.StringInSlice(append(enum.Values[awstypes.StreamViewType](), ""), false), + }, + "table_class": { + Type: schema.TypeString, + Optional: true, + Default: awstypes.TableClassStandard, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + return old == "" && new == string(awstypes.TableClassStandard) + }, + ValidateDiagFunc: enum.Validate[awstypes.TableClass](), + }, + names.AttrTags: tftags.TagsSchema(), + names.AttrTagsAll: tftags.TagsSchemaComputed(), + "ttl": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "attribute_name": { + Type: schema.TypeString, + Optional: true, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + // AWS requires the attribute name to be set when disabling TTL but + // does not return it so it causes a diff. + if old == "" && new != "" && !d.Get("ttl.0.enabled").(bool) { + return true + } + return false + }, + }, + names.AttrEnabled: { + Type: schema.TypeBool, + Optional: true, + Default: false, }, - }, - names.AttrEnabled: { - Type: schema.TypeBool, - Optional: true, - Default: false, }, }, + DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock, }, - DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock, - }, - "warm_throughput": warmThroughputSchema(), - "write_capacity": { - Type: schema.TypeInt, - Computed: true, - Optional: true, - ConflictsWith: []string{"on_demand_throughput"}, - }, + "warm_throughput": warmThroughputSchema(), + "write_capacity": { + Type: schema.TypeInt, + Computed: true, + Optional: true, + ConflictsWith: []string{"on_demand_throughput"}, + }, + } }, } } diff --git a/internal/service/dynamodb/table_data_source.go b/internal/service/dynamodb/table_data_source.go index e63c983b9541..628116673856 100644 --- a/internal/service/dynamodb/table_data_source.go +++ b/internal/service/dynamodb/table_data_source.go @@ -14,6 +14,7 @@ import ( "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/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -23,238 +24,241 @@ import ( func dataSourceTable() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceTableRead, - Schema: map[string]*schema.Schema{ - names.AttrARN: { - Type: schema.TypeString, - Computed: true, - }, - "attribute": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Computed: true, - }, - names.AttrType: { - Type: schema.TypeString, - Computed: true, + + SchemaFunc: func() map[string]*schema.Schema { + return map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + "attribute": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Computed: true, + }, + names.AttrType: { + Type: schema.TypeString, + Computed: true, + }, }, }, }, - }, - "billing_mode": { - Type: schema.TypeString, - Computed: true, - }, - "deletion_protection_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - "global_secondary_index": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "hash_key": { - Type: schema.TypeString, - Computed: true, - }, - names.AttrName: { - Type: schema.TypeString, - Computed: true, - }, - "non_key_attributes": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "on_demand_throughput": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "max_read_request_units": { - Type: schema.TypeInt, - Computed: true, - }, - "max_write_request_units": { - Type: schema.TypeInt, - Computed: true, + "billing_mode": { + Type: schema.TypeString, + Computed: true, + }, + "deletion_protection_enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "global_secondary_index": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "hash_key": { + Type: schema.TypeString, + Computed: true, + }, + names.AttrName: { + Type: schema.TypeString, + Computed: true, + }, + "non_key_attributes": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "on_demand_throughput": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "max_read_request_units": { + Type: schema.TypeInt, + Computed: true, + }, + "max_write_request_units": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, - }, - "projection_type": { - Type: schema.TypeString, - Computed: true, - }, - "range_key": { - Type: schema.TypeString, - Computed: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Computed: true, - }, - "warm_throughput": warmThroughputSchema(), - "write_capacity": { - Type: schema.TypeInt, - Computed: true, + "projection_type": { + Type: schema.TypeString, + Computed: true, + }, + "range_key": { + Type: schema.TypeString, + Computed: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Computed: true, + }, + "warm_throughput": sdkv2.ComputedOnlyFromSchema(warmThroughputSchema()), + "write_capacity": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, - }, - "hash_key": { - Type: schema.TypeString, - Computed: true, - }, - "local_secondary_index": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Computed: true, - }, - "non_key_attributes": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, - "projection_type": { - Type: schema.TypeString, - Computed: true, - }, - "range_key": { - Type: schema.TypeString, - Computed: true, + "hash_key": { + Type: schema.TypeString, + Computed: true, + }, + "local_secondary_index": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Computed: true, + }, + "non_key_attributes": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "projection_type": { + Type: schema.TypeString, + Computed: true, + }, + "range_key": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, - }, - names.AttrName: { - Type: schema.TypeString, - Required: true, - }, - "on_demand_throughput": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "max_read_request_units": { - Type: schema.TypeInt, - Computed: true, - }, - "max_write_request_units": { - Type: schema.TypeInt, - Computed: true, + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + "on_demand_throughput": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "max_read_request_units": { + Type: schema.TypeInt, + Computed: true, + }, + "max_write_request_units": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, - }, - "point_in_time_recovery": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrEnabled: { - Type: schema.TypeBool, - Computed: true, - }, - "recovery_period_in_days": { - Type: schema.TypeInt, - Computed: true, + "point_in_time_recovery": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Computed: true, + }, + "recovery_period_in_days": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, - }, - "range_key": { - Type: schema.TypeString, - Computed: true, - }, - "read_capacity": { - Type: schema.TypeInt, - Computed: true, - }, - "replica": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrKMSKeyARN: { - Type: schema.TypeString, - Computed: true, - }, - "region_name": { - Type: schema.TypeString, - Computed: true, + "range_key": { + Type: schema.TypeString, + Computed: true, + }, + "read_capacity": { + Type: schema.TypeInt, + Computed: true, + }, + "replica": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrKMSKeyARN: { + Type: schema.TypeString, + Computed: true, + }, + "region_name": { + Type: schema.TypeString, + Computed: true, + }, }, }, }, - }, - "server_side_encryption": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrEnabled: { - Type: schema.TypeBool, - Computed: true, - }, - names.AttrKMSKeyARN: { - Type: schema.TypeString, - Computed: true, + "server_side_encryption": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Computed: true, + }, + names.AttrKMSKeyARN: { + Type: schema.TypeString, + Computed: true, + }, }, }, }, - }, - names.AttrStreamARN: { - Type: schema.TypeString, - Computed: true, - }, - "stream_enabled": { - Type: schema.TypeBool, - Computed: true, - }, - "stream_label": { - Type: schema.TypeString, - Computed: true, - }, - "stream_view_type": { - Type: schema.TypeString, - Computed: true, - }, - "table_class": { - Type: schema.TypeString, - Computed: true, - }, - names.AttrTags: tftags.TagsSchemaComputed(), - "ttl": { - Type: schema.TypeSet, - Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "attribute_name": { - Type: schema.TypeString, - Computed: true, - }, - names.AttrEnabled: { - Type: schema.TypeBool, - Computed: true, + names.AttrStreamARN: { + Type: schema.TypeString, + Computed: true, + }, + "stream_enabled": { + Type: schema.TypeBool, + Computed: true, + }, + "stream_label": { + Type: schema.TypeString, + Computed: true, + }, + "stream_view_type": { + Type: schema.TypeString, + Computed: true, + }, + "table_class": { + Type: schema.TypeString, + Computed: true, + }, + names.AttrTags: tftags.TagsSchemaComputed(), + "ttl": { + Type: schema.TypeSet, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "attribute_name": { + Type: schema.TypeString, + Computed: true, + }, + names.AttrEnabled: { + Type: schema.TypeBool, + Computed: true, + }, }, }, }, - }, - "warm_throughput": warmThroughputSchema(), - "write_capacity": { - Type: schema.TypeInt, - Computed: true, - }, + "warm_throughput": sdkv2.ComputedOnlyFromSchema(warmThroughputSchema()), + "write_capacity": { + Type: schema.TypeInt, + Computed: true, + }, + } }, } } From eefa012df0089e226a76c04d47c07a166126fcb3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 28 Jul 2025 12:25:21 -0400 Subject: [PATCH 0069/2115] Fix semgrep 'ci.semgrep.acctest.checks.replace-planonly-checks'. --- internal/service/dynamodb/table_test.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 39b6c6d10986..b74c6175a3a6 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -4984,6 +4984,11 @@ func TestAccDynamoDBTable_gsiWarmThroughput_switchBilling(t *testing.T) { "warm_throughput.0.write_units_per_second": "4100", }), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, }, { ResourceName: resourceName, @@ -5000,10 +5005,22 @@ func TestAccDynamoDBTable_gsiWarmThroughput_switchBilling(t *testing.T) { "warm_throughput.0.write_units_per_second": "4200", }), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { - Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12200, 4200), - PlanOnly: true, + Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 5, 5, 12200, 4200), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, }, }, }) From 93b21edf36b25fb7e20b49cd3a86b78756ddffb3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 29 Jul 2025 12:06:21 -0400 Subject: [PATCH 0070/2115] Consistency. --- internal/service/dynamodb/table.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index e85f3c7acebe..5a06b51c21db 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -996,6 +996,10 @@ func resourceTableRead(ctx context.Context, d *schema.ResourceData, meta any) di d.Set("table_class", awstypes.TableClassStandard) } + if err := d.Set("warm_throughput", flattenTableWarmThroughput(table.WarmThroughput)); err != nil { + return create.AppendDiagSettingError(diags, names.DynamoDB, resNameTable, d.Id(), "warm_throughput", err) + } + describeBackupsInput := dynamodb.DescribeContinuousBackupsInput{ TableName: aws.String(d.Id()), } @@ -1023,10 +1027,6 @@ func resourceTableRead(ctx context.Context, d *schema.ResourceData, meta any) di return create.AppendDiagSettingError(diags, names.DynamoDB, resNameTable, d.Id(), "ttl", err) } - if err := d.Set("warm_throughput", flattenTableWarmThroughput(table.WarmThroughput)); err != nil { - return create.AppendDiagSettingError(diags, names.DynamoDB, resNameTable, d.Id(), "warm_throughput", err) - } - return diags } From a8b412de9fec554862a331ea74b79bb69f505c9b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 29 Jul 2025 12:11:29 -0400 Subject: [PATCH 0071/2115] r/aws_dynamodb_table: Remove 'warm_throughput.read_units_per_second' and 'warm_throughput.write_units_per_second' validation as the minima depend on 'read_capacity' and 'write_capacity'. --- internal/service/dynamodb/table.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 5a06b51c21db..ec717ef9e8f5 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -568,16 +568,14 @@ func warmThroughputSchema() *schema.Schema { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "read_units_per_second": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(12000)), + Type: schema.TypeInt, + Optional: true, + Computed: true, }, "write_units_per_second": { - Type: schema.TypeInt, - Optional: true, - Computed: true, - ValidateDiagFunc: validation.ToDiagFunc(validation.IntAtLeast(4000)), + Type: schema.TypeInt, + Optional: true, + Computed: true, }, }, }, From 863ca6eb21b7088b4f48d228f16df1f929bfd376 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 1 Aug 2025 15:06:22 +0100 Subject: [PATCH 0072/2115] exadata infra res and ds with test --- examples/odb/exadata_infra.tf | 48 + .../odb/cloud_exadata_infrastructure.go | 848 ++++++++++++++++++ ...loud_exadata_infrastructure_data_source.go | 425 +++++++++ ...exadata_infrastructure_data_source_test.go | 107 +++ .../odb/cloud_exadata_infrastructure_test.go | 459 ++++++++++ internal/service/odb/generate.go | 6 + .../odb/service_endpoint_resolver_gen.go | 82 ++ .../service/odb/service_endpoints_gen_test.go | 602 +++++++++++++ internal/service/odb/service_package.go | 32 + internal/service/odb/service_package_gen.go | 55 ++ internal/service/odb/tags_gen.go | 128 +++ 11 files changed, 2792 insertions(+) create mode 100644 examples/odb/exadata_infra.tf create mode 100644 internal/service/odb/cloud_exadata_infrastructure.go create mode 100644 internal/service/odb/cloud_exadata_infrastructure_data_source.go create mode 100644 internal/service/odb/cloud_exadata_infrastructure_data_source_test.go create mode 100644 internal/service/odb/cloud_exadata_infrastructure_test.go create mode 100644 internal/service/odb/generate.go create mode 100644 internal/service/odb/service_endpoint_resolver_gen.go create mode 100644 internal/service/odb/service_endpoints_gen_test.go create mode 100644 internal/service/odb/service_package.go create mode 100644 internal/service/odb/service_package_gen.go create mode 100644 internal/service/odb/tags_gen.go diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf new file mode 100644 index 000000000000..68fe806f0ffe --- /dev/null +++ b/examples/odb/exadata_infra.tf @@ -0,0 +1,48 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. + +//Exadata Infrastructure with customer managed maintenance window +resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_X11M_all_param" { + display_name = "Ofake_my_odb_exadata_infra" //Required Field + shape = "Exadata.X11M" //Required Field + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" //Required Field + customer_contacts_to_send_to_oci = ["abc@example.com"] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window = { //Required + custom_action_timeout_in_mins = 16 + days_of_week = ["MONDAY", "TUESDAY"] + hours_of_day = [11, 16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = ["FEBRUARY", "MAY", "AUGUST", "NOVEMBER"] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month = [2, 4] + } + tags = { + "env" = "dev" + } + +} + +//Exadata Infrastructure with default maintenance window with X9M system shape. with minimum parameters +resource "aws_odb_cloud_exadata_infrastructure" "test_X9M" { + display_name = "Ofake_my_exa_X9M" + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = [] + hours_of_day = [] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 0 + months = [] + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + weeks_of_month = [] + } +} \ No newline at end of file diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go new file mode 100644 index 000000000000..29f4f94f68f2 --- /dev/null +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -0,0 +1,848 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. + +package odb + +import ( + "context" + "errors" + "fmt" + "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types/basetypes" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/odb" + odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" + "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" + + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/sweep" + sweepfw "github.com/hashicorp/terraform-provider-aws/internal/sweep/framework" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// Function annotations are used for resource registration to the Provider. DO NOT EDIT. +// @FrameworkResource("aws_odb_cloud_exadata_infrastructure", name="Cloud Exadata Infrastructure") +// @Tags(identifierAttribute="arn") +func newResourceCloudExadataInfrastructure(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &resourceCloudExadataInfrastructure{} + + r.SetDefaultCreateTimeout(24 * time.Hour) + r.SetDefaultUpdateTimeout(24 * time.Hour) + r.SetDefaultDeleteTimeout(24 * time.Hour) + + return r, nil +} + +const ( + ResNameCloudExadataInfrastructure = "Cloud Exadata Infrastructure" +) + +var ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure + +type resourceCloudExadataInfrastructure struct { + framework.ResourceWithModel[cloudExadataInfrastructureResourceModel] + framework.WithTimeouts +} + +// For more about schema options, visit +// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/schemas?page=schemas +func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { + statusType := fwtypes.StringEnumType[odbtypes.ResourceStatus]() + computeModelType := fwtypes.StringEnumType[odbtypes.ComputeModel]() + + resp.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "activated_storage_count": schema.Int32Attribute{ + Computed: true, + Description: "The number of storage servers requested for the Exadata infrastructure", + }, + "additional_storage_count": schema.Int32Attribute{ + Computed: true, + Description: " The number of storage servers requested for the Exadata infrastructure", + }, + "database_server_type": schema.StringAttribute{ + Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Description: "The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation", + }, + "storage_server_type": schema.StringAttribute{ + Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Description: "The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation", + }, + names.AttrARN: framework.ARNAttributeComputedOnly(), + names.AttrID: framework.IDAttribute(), + "available_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure", + }, + "availability_zone": schema.StringAttribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + stringplanmodifier.UseStateForUnknown(), + }, + Description: "The name of the Availability Zone (AZ) where the Exadata infrastructure is located. Changing this will force terraform to create new resource", + }, + "availability_zone_id": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + stringplanmodifier.UseStateForUnknown(), + }, + Description: " The AZ ID of the AZ where the Exadata infrastructure is located. Changing this will force terraform to create new resource", + }, + "compute_count": schema.Int32Attribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Int32{ + int32planmodifier.RequiresReplace(), + int32planmodifier.UseStateForUnknown(), + }, + Description: " The number of compute instances that the Exadata infrastructure is located", + }, + "cpu_count": schema.Int32Attribute{ + Computed: true, + Description: "The total number of CPU cores that are allocated to the Exadata infrastructure", + }, + "customer_contacts_to_send_to_oci": schema.SetAttribute{ + ElementType: types.StringType, + CustomType: fwtypes.SetOfStringType, + Optional: true, + PlanModifiers: []planmodifier.Set{ + setplanmodifier.RequiresReplace(), + setplanmodifier.UseStateForUnknown(), + }, + Description: "The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure. Changing this will force terraform to create new resource", + }, + "data_storage_size_in_tbs": schema.Float64Attribute{ + Computed: true, + Description: "The size of the Exadata infrastructure's data disk group, in terabytes (TB)", + }, + "db_node_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The size of the Exadata infrastructure's local node storage, in gigabytes (GB)", + }, + "db_server_version": schema.StringAttribute{ + Computed: true, + Description: "The software version of the database servers (dom0) in the Exadata infrastructure", + }, + "display_name": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Description: "The user-friendly name for the Exadata infrastructure. Changing this will force terraform to create a new resource", + }, + "last_maintenance_run_id": schema.StringAttribute{ + Computed: true, + Description: "The Oracle Cloud Identifier (OCID) of the last maintenance run for the Exadata infrastructure", + }, + "max_cpu_count": schema.Int32Attribute{ + Computed: true, + Description: "The total number of CPU cores available on the Exadata infrastructure", + }, + "max_data_storage_in_tbs": schema.Float64Attribute{ + Computed: true, + Description: "The total amount of data disk group storage, in terabytes (TB), that's available on the Exadata infrastructure", + }, + "max_db_node_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The total amount of local node storage, in gigabytes (GB), that's available on the Exadata infrastructure", + }, + "max_memory_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The total amount of memory in gigabytes (GB) available on the Exadata infrastructure", + }, + "memory_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The amount of memory, in gigabytes (GB), that's allocated on the Exadata infrastructure", + }, + "monthly_db_server_version": schema.StringAttribute{ + Computed: true, + Description: "The monthly software version of the database servers in the Exadata infrastructure", + }, + "monthly_storage_server_version": schema.StringAttribute{ + Computed: true, + Description: "The monthly software version of the storage servers installed on the Exadata infrastructure", + }, + "next_maintenance_run_id": schema.StringAttribute{ + Computed: true, + Description: "The OCID of the next maintenance run for the Exadata infrastructure", + }, + "ocid": schema.StringAttribute{ + Computed: true, + Description: "The OCID of the Exadata infrastructure", + }, + "oci_resource_anchor_name": schema.StringAttribute{ + Computed: true, + Description: "The name of the OCI resource anchor for the Exadata infrastructure", + }, + "oci_url": schema.StringAttribute{ + Computed: true, + Description: "The HTTPS link to the Exadata infrastructure in OCI", + }, + "percent_progress": schema.Float64Attribute{ + Computed: true, + Description: "The amount of progress made on the current operation on the Exadata infrastructure, expressed as a percentage", + }, + "shape": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + Description: "The model name of the Exadata infrastructure. Changing this will force terraform to create new resource", + }, + "status": schema.StringAttribute{ + CustomType: statusType, + Computed: true, + Description: "The current status of the Exadata infrastructure", + }, + "status_reason": schema.StringAttribute{ + Computed: true, + Description: "Additional information about the status of the Exadata infrastructure", + }, + "storage_count": schema.Int32Attribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Int32{ + int32planmodifier.RequiresReplace(), + int32planmodifier.UseStateForUnknown(), + }, + Description: "TThe number of storage servers that are activated for the Exadata infrastructure", + }, + "storage_server_version": schema.StringAttribute{ + Computed: true, + Description: "The software version of the storage servers on the Exadata infrastructure.", + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + "total_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + }, + "created_at": schema.StringAttribute{ + Computed: true, + Description: "The time when the Exadata infrastructure was created", + }, + "compute_model": schema.StringAttribute{ + CustomType: computeModelType, + Computed: true, + Description: fmt.Sprint("The OCI model compute model used when you create or clone an\n " + + " instance: ECPU or OCPU. An ECPU is an abstracted measure of\n " + + "compute resources. ECPUs are based on the number of cores\n " + + "elastically allocated from a pool of compute and storage servers.\n " + + " An OCPU is a legacy physical measure of compute resources. OCPUs\n " + + "are based on the physical core of a processor with\n " + + " hyper-threading enabled."), + }, + "maintenance_window": schema.ObjectAttribute{ + Required: true, + CustomType: fwtypes.NewObjectTypeOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx), + Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", + AttributeTypes: map[string]attr.Type{ + "custom_action_timeout_in_mins": types.Int32Type, + "days_of_week": types.SetType{ + ElemType: fwtypes.StringEnumType[odbtypes.DayOfWeekName](), + }, + "hours_of_day": types.SetType{ + ElemType: types.Int32Type, + }, + "is_custom_action_timeout_enabled": types.BoolType, + "lead_time_in_weeks": types.Int32Type, + "months": types.SetType{ + ElemType: fwtypes.StringEnumType[odbtypes.MonthName](), + }, + "patching_mode": fwtypes.StringEnumType[odbtypes.PatchingModeType](), + "preference": fwtypes.StringEnumType[odbtypes.PreferenceType](), + "weeks_of_month": types.SetType{ + ElemType: types.Int32Type, + }, + }, + }, + }, + Blocks: map[string]schema.Block{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ + Create: true, + Update: true, + Delete: true, + }), + }, + } +} + +func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { + conn := r.Meta().ODBClient(ctx) + + var plan cloudExadataInfrastructureResourceModel + + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + if resp.Diagnostics.HasError() { + return + } + + input := odb.CreateCloudExadataInfrastructureInput{ + Tags: getTagsIn(ctx), + MaintenanceWindow: r.expandMaintenanceWindow(ctx, plan.MaintenanceWindow), + } + + if !plan.CustomerContactsToSendToOCI.IsNull() && !plan.CustomerContactsToSendToOCI.IsUnknown() { + input.CustomerContactsToSendToOCI = r.expandCustomerContacts(ctx, plan.CustomerContactsToSendToOCI) + } + + resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) + if resp.Diagnostics.HasError() { + return + } + + out, err := conn.CreateCloudExadataInfrastructure(ctx, &input) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionCreating, ResNameCloudExadataInfrastructure, plan.DisplayName.ValueString(), err), + err.Error(), + ) + return + } + if out == nil || out.CloudExadataInfrastructureId == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionCreating, ResNameCloudExadataInfrastructure, plan.DisplayName.ValueString(), nil), + errors.New("empty output").Error(), + ) + return + } + + createTimeout := r.CreateTimeout(ctx, plan.Timeouts) + createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, *out.CloudExadataInfrastructureId, createTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudExadataInfrastructure, plan.DisplayName.ValueString(), err), + err.Error(), + ) + return + } + + plan.CustomerContactsToSendToOCI = r.flattenCustomerContacts(createdExaInfra.CustomerContactsToSendToOCI) + plan.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, createdExaInfra.MaintenanceWindow) + + plan.CreatedAt = types.StringValue(createdExaInfra.CreatedAt.Format(time.RFC3339)) + + if createdExaInfra.DatabaseServerType != nil { + plan.DatabaseServerType = types.StringValue(*createdExaInfra.DatabaseServerType) + } + if createdExaInfra.StorageServerType != nil { + plan.StorageServerType = types.StringValue(*createdExaInfra.StorageServerType) + } + resp.Diagnostics.Append(flex.Flatten(ctx, createdExaInfra, &plan)...) + + if resp.Diagnostics.HasError() { + return + } + resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) +} + +func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { + conn := r.Meta().ODBClient(ctx) + var state cloudExadataInfrastructureResourceModel + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + out, err := FindOdbExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString()) + if tfresource.NotFound(err) { + resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + resp.State.RemoveResource(ctx) + return + } + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionReading, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.String(), err), + err.Error(), + ) + return + } + + state.CustomerContactsToSendToOCI = r.flattenCustomerContacts(out.CustomerContactsToSendToOCI) + state.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) + + state.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, out.MaintenanceWindow) + + if out.DatabaseServerType != nil { + state.DatabaseServerType = types.StringValue(*out.DatabaseServerType) + } + if out.StorageServerType != nil { + state.StorageServerType = types.StringValue(*out.StorageServerType) + } + resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) + + if resp.Diagnostics.HasError() { + return + } + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) +} + +func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { + + var plan, state cloudExadataInfrastructureResourceModel + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + conn := r.Meta().ODBClient(ctx) + + if !state.MaintenanceWindow.Equal(plan.MaintenanceWindow) { + + //we need to call update maintenance window + + updatedMW := odb.UpdateCloudExadataInfrastructureInput{ + CloudExadataInfrastructureId: plan.CloudExadataInfrastructureId.ValueStringPointer(), + MaintenanceWindow: r.expandMaintenanceWindow(ctx, plan.MaintenanceWindow), + } + + out, err := conn.UpdateCloudExadataInfrastructure(ctx, &updatedMW) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionUpdating, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.ValueString(), err), + err.Error(), + ) + return + } + if out == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionUpdating, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.ValueString(), err), + err.Error(), + ) + return + } + + } + + updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) + updatedExaInfra, err := waitCloudExadataInfrastructureUpdated(ctx, conn, state.CloudExadataInfrastructureId.ValueString(), updateTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForUpdate, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.ValueString(), err), + err.Error(), + ) + return + } + plan.CustomerContactsToSendToOCI = r.flattenCustomerContacts(updatedExaInfra.CustomerContactsToSendToOCI) + plan.CreatedAt = types.StringValue(updatedExaInfra.CreatedAt.Format(time.RFC3339)) + plan.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, updatedExaInfra.MaintenanceWindow) + if updatedExaInfra.DatabaseServerType != nil { + plan.DatabaseServerType = types.StringValue(*updatedExaInfra.DatabaseServerType) + } + if updatedExaInfra.StorageServerType != nil { + plan.StorageServerType = types.StringValue(*updatedExaInfra.StorageServerType) + } + + resp.Diagnostics.Append(flex.Flatten(ctx, updatedExaInfra, &plan)...) + + resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + +} + +func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { + conn := r.Meta().ODBClient(ctx) + + var state cloudExadataInfrastructureResourceModel + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + input := odb.DeleteCloudExadataInfrastructureInput{ + CloudExadataInfrastructureId: state.CloudExadataInfrastructureId.ValueStringPointer(), + } + + _, err := conn.DeleteCloudExadataInfrastructure(ctx, &input) + if err != nil { + if errs.IsA[*odbtypes.ResourceNotFoundException](err) { + return + } + + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionDeleting, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.String(), err), + err.Error(), + ) + return + } + + deleteTimeout := r.DeleteTimeout(ctx, state.Timeouts) + _, err = waitCloudExadataInfrastructureDeleted(ctx, conn, state.CloudExadataInfrastructureId.ValueString(), deleteTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForDeletion, ResNameCloudExadataInfrastructure, state.CloudExadataInfrastructureId.String(), err), + err.Error(), + ) + return + } +} + +func (r *resourceCloudExadataInfrastructure) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) +} + +func waitCloudExadataInfrastructureCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(odbtypes.ResourceStatusProvisioning), + Target: enum.Slice(odbtypes.ResourceStatusAvailable, odbtypes.ResourceStatusFailed), + Refresh: statusCloudExadataInfrastructure(ctx, conn, id), + PollInterval: 1 * time.Minute, + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*odbtypes.CloudExadataInfrastructure); ok { + return out, err + } + return nil, err +} + +func waitCloudExadataInfrastructureUpdated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(odbtypes.ResourceStatusUpdating), + Target: enum.Slice(odbtypes.ResourceStatusAvailable, odbtypes.ResourceStatusFailed), + Refresh: statusCloudExadataInfrastructure(ctx, conn, id), + PollInterval: 1 * time.Minute, + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*odbtypes.CloudExadataInfrastructure); ok { + return out, err + } + + return nil, err +} + +func waitCloudExadataInfrastructureDeleted(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(odbtypes.ResourceStatusTerminating), + Target: []string{}, + Refresh: statusCloudExadataInfrastructure(ctx, conn, id), + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*odbtypes.CloudExadataInfrastructure); ok { + return out, err + } + + return nil, err +} + +func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc { + return func() (any, string, error) { + out, err := FindOdbExadataInfraResourceByID(ctx, conn, id) + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + return out, string(out.Status), nil + } +} +func (r *resourceCloudExadataInfrastructure) expandCustomerContacts(ctx context.Context, contactsList fwtypes.SetValueOf[types.String]) []odbtypes.CustomerContact { + if contactsList.IsNull() || contactsList.IsUnknown() { + return nil + } + + var contacts []types.String + + contactsList.ElementsAs(ctx, &contacts, false) + + result := make([]odbtypes.CustomerContact, 0, len(contacts)) + for _, element := range contacts { + result = append(result, odbtypes.CustomerContact{ + Email: element.ValueStringPointer(), + }) + } + + return result +} + +func (r *resourceCloudExadataInfrastructure) flattenCustomerContacts(contacts []odbtypes.CustomerContact) fwtypes.SetValueOf[types.String] { + if len(contacts) == 0 { + return fwtypes.SetValueOf[types.String]{ + SetValue: basetypes.NewSetNull(types.StringType), + } + } + + elements := make([]attr.Value, 0, len(contacts)) + for _, contact := range contacts { + if contact.Email != nil { + stringValue := types.StringValue(*contact.Email) + elements = append(elements, stringValue) + } + } + + list, _ := basetypes.NewSetValue(types.StringType, elements) + + return fwtypes.SetValueOf[types.String]{ + SetValue: list, + } +} + +func FindOdbExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { + input := odb.GetCloudExadataInfrastructureInput{ + CloudExadataInfrastructureId: aws.String(id), + } + + out, err := conn.GetCloudExadataInfrastructure(ctx, &input) + if err != nil { + if errs.IsA[*odbtypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: &input, + } + } + + return nil, err + } + + if out == nil || out.CloudExadataInfrastructure == nil { + return nil, tfresource.NewEmptyResultError(&input) + } + + return out.CloudExadataInfrastructure, nil +} +func (r *resourceCloudExadataInfrastructure) expandMaintenanceWindow(ctx context.Context, exaInfraMWResourceObj fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel]) *odbtypes.MaintenanceWindow { + + var exaInfraMWResource cloudExadataInfraMaintenanceWindowResourceModel + + exaInfraMWResourceObj.As(ctx, &exaInfraMWResource, basetypes.ObjectAsOptions{ + UnhandledNullAsEmpty: true, + UnhandledUnknownAsEmpty: true, + }) + + var daysOfWeekNames []odbtypes.DayOfWeekName + exaInfraMWResource.DaysOfWeek.ElementsAs(ctx, &daysOfWeekNames, false) + daysOfWeek := make([]odbtypes.DayOfWeek, 0, len(daysOfWeekNames)) + + for _, dayOfWeek := range daysOfWeekNames { + daysOfWeek = append(daysOfWeek, odbtypes.DayOfWeek{ + Name: dayOfWeek, + }) + } + + var hoursOfTheDay []int32 + exaInfraMWResource.HoursOfDay.ElementsAs(ctx, &hoursOfTheDay, false) + + var monthNames []odbtypes.MonthName + exaInfraMWResource.Months.ElementsAs(ctx, &monthNames, false) + months := make([]odbtypes.Month, 0, len(monthNames)) + for _, month := range monthNames { + months = append(months, odbtypes.Month{ + Name: month, + }) + } + + var weeksOfMonth []int32 + exaInfraMWResource.WeeksOfMonth.ElementsAs(ctx, &weeksOfMonth, false) + odbTypeMW := odbtypes.MaintenanceWindow{ + CustomActionTimeoutInMins: exaInfraMWResource.CustomActionTimeoutInMins.ValueInt32Pointer(), + DaysOfWeek: daysOfWeek, + HoursOfDay: hoursOfTheDay, + IsCustomActionTimeoutEnabled: exaInfraMWResource.IsCustomActionTimeoutEnabled.ValueBoolPointer(), + LeadTimeInWeeks: exaInfraMWResource.LeadTimeInWeeks.ValueInt32Pointer(), + Months: months, + PatchingMode: exaInfraMWResource.PatchingMode.ValueEnum(), + Preference: exaInfraMWResource.Preference.ValueEnum(), + WeeksOfMonth: weeksOfMonth, + } + + if len(odbTypeMW.DaysOfWeek) == 0 { + odbTypeMW.DaysOfWeek = nil + } + if len(odbTypeMW.HoursOfDay) == 0 { + odbTypeMW.HoursOfDay = nil + } + if len(odbTypeMW.WeeksOfMonth) == 0 { + odbTypeMW.WeeksOfMonth = nil + } + if len(odbTypeMW.Months) == 0 { + odbTypeMW.Months = nil + } + if *odbTypeMW.LeadTimeInWeeks == 0 { + odbTypeMW.LeadTimeInWeeks = nil + } + + return &odbTypeMW +} + +func (r *resourceCloudExadataInfrastructure) flattenMaintenanceWindow(ctx context.Context, obdExaInfraMW *odbtypes.MaintenanceWindow) fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel] { + //days of week + daysOfWeek := make([]attr.Value, 0, len(obdExaInfraMW.DaysOfWeek)) + for _, dayOfWeek := range obdExaInfraMW.DaysOfWeek { + dayOfWeekStringValue := fwtypes.StringEnumValue(dayOfWeek.Name).StringValue + daysOfWeek = append(daysOfWeek, dayOfWeekStringValue) + } + setValueOfDaysOfWeek, _ := basetypes.NewSetValue(types.StringType, daysOfWeek) + daysOfWeekRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]]{ + SetValue: setValueOfDaysOfWeek, + } + //hours of the day + hoursOfTheDay := make([]attr.Value, 0, len(obdExaInfraMW.HoursOfDay)) + for _, hourOfTheDay := range obdExaInfraMW.HoursOfDay { + daysOfWeekInt32Value := types.Int32Value(hourOfTheDay) + hoursOfTheDay = append(hoursOfTheDay, daysOfWeekInt32Value) + } + setValuesOfHoursOfTheDay, _ := basetypes.NewSetValue(types.Int32Type, hoursOfTheDay) + hoursOfTheDayRead := fwtypes.SetValueOf[types.Int64]{ + SetValue: setValuesOfHoursOfTheDay, + } + //months + months := make([]attr.Value, 0, len(obdExaInfraMW.Months)) + for _, month := range obdExaInfraMW.Months { + monthStringValue := fwtypes.StringEnumValue(month.Name).StringValue + months = append(months, monthStringValue) + } + setValuesOfMonth, _ := basetypes.NewSetValue(types.StringType, months) + monthsRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]]{ + SetValue: setValuesOfMonth, + } + //weeks of month + weeksOfMonth := make([]attr.Value, 0, len(obdExaInfraMW.WeeksOfMonth)) + for _, weekOfMonth := range obdExaInfraMW.WeeksOfMonth { + weeksOfMonthInt32Value := types.Int32Value(weekOfMonth) + weeksOfMonth = append(weeksOfMonth, weeksOfMonthInt32Value) + } + setValuesOfWeekOfMonth, _ := basetypes.NewSetValue(types.Int32Type, weeksOfMonth) + weeksOfMonthRead := fwtypes.SetValueOf[types.Int64]{ + SetValue: setValuesOfWeekOfMonth, + } + + flattenMW := cloudExadataInfraMaintenanceWindowResourceModel{ + CustomActionTimeoutInMins: types.Int32PointerValue(obdExaInfraMW.CustomActionTimeoutInMins), + DaysOfWeek: daysOfWeekRead, + HoursOfDay: hoursOfTheDayRead, + IsCustomActionTimeoutEnabled: types.BoolPointerValue(obdExaInfraMW.IsCustomActionTimeoutEnabled), + LeadTimeInWeeks: types.Int32PointerValue(obdExaInfraMW.LeadTimeInWeeks), + Months: monthsRead, + PatchingMode: fwtypes.StringEnumValue(obdExaInfraMW.PatchingMode), + Preference: fwtypes.StringEnumValue(obdExaInfraMW.Preference), + WeeksOfMonth: weeksOfMonthRead, + } + if obdExaInfraMW.LeadTimeInWeeks == nil { + flattenMW.LeadTimeInWeeks = types.Int32Value(0) + } + if obdExaInfraMW.CustomActionTimeoutInMins == nil { + flattenMW.CustomActionTimeoutInMins = types.Int32Value(0) + } + if obdExaInfraMW.IsCustomActionTimeoutEnabled == nil { + flattenMW.IsCustomActionTimeoutEnabled = types.BoolValue(false) + } + + result, _ := fwtypes.NewObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx, &flattenMW) + return result +} + +// See more: +// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values +type cloudExadataInfrastructureResourceModel struct { + framework.WithRegionModel + ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` + AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` + DatabaseServerType types.String `tfsdk:"database_server_type" autoflex:",noflatten"` + StorageServerType types.String `tfsdk:"storage_server_type" autoflex:",noflatten"` + AvailabilityZone types.String `tfsdk:"availability_zone"` + AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` + AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` + CloudExadataInfrastructureArn types.String `tfsdk:"arn"` + CloudExadataInfrastructureId types.String `tfsdk:"id"` + ComputeCount types.Int32 `tfsdk:"compute_count"` + CpuCount types.Int32 `tfsdk:"cpu_count"` + CustomerContactsToSendToOCI fwtypes.SetValueOf[types.String] `tfsdk:"customer_contacts_to_send_to_oci" autoflex:"-"` + DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` + DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` + DbServerVersion types.String `tfsdk:"db_server_version"` + DisplayName types.String `tfsdk:"display_name"` + LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` + MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` + MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` + MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` + MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` + MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` + MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` + MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` + NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` + Ocid types.String `tfsdk:"ocid"` + OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` + OciUrl types.String `tfsdk:"oci_url"` + PercentProgress types.Float64 `tfsdk:"percent_progress"` + Shape types.String `tfsdk:"shape"` + Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` + StatusReason types.String `tfsdk:"status_reason"` + StorageCount types.Int32 `tfsdk:"storage_count"` + StorageServerVersion types.String `tfsdk:"storage_server_version"` + TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + CreatedAt types.String `tfsdk:"created_at" autoflex:",noflatten"` + ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` + MaintenanceWindow fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel] `tfsdk:"maintenance_window" autoflex:"-"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` +} + +type cloudExadataInfraMaintenanceWindowResourceModel struct { + CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` + DaysOfWeek fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]] `tfsdk:"days_of_week"` + HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` + IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` + LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` + Months fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]] `tfsdk:"months"` + PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` + Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` + WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` +} + +func sweepCloudExadataInfrastructures(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { + input := odb.ListCloudExadataInfrastructuresInput{} + conn := client.ODBClient(ctx) + var sweepResources []sweep.Sweepable + + pages := odb.NewListCloudExadataInfrastructuresPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + if err != nil { + return nil, err + } + + for _, v := range page.CloudExadataInfrastructures { + sweepResources = append(sweepResources, sweepfw.NewSweepResource(newResourceCloudExadataInfrastructure, client, + sweepfw.NewAttribute(names.AttrID, aws.ToString(v.CloudExadataInfrastructureId))), + ) + } + } + + return sweepResources, nil +} diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go new file mode 100644 index 000000000000..5fb59a3fbf80 --- /dev/null +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -0,0 +1,425 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. + +package odb + +import ( + "context" + "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework/types/basetypes" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/odb" + odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" + "github.com/hashicorp/terraform-plugin-framework/datasource" + "github.com/hashicorp/terraform-plugin-framework/datasource/schema" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// Function annotations are used for datasource registration to the Provider. DO NOT EDIT. +// @FrameworkDataSource("aws_odb_cloud_exadata_infrastructure", name="Cloud Exadata Infrastructure") +func newDataSourceCloudExadataInfrastructure(context.Context) (datasource.DataSourceWithConfigure, error) { + return &dataSourceCloudExadataInfrastructure{}, nil +} + +const ( + DSNameCloudExadataInfrastructure = "Cloud Exadata Infrastructure Data Source" +) + +type dataSourceCloudExadataInfrastructure struct { + framework.DataSourceWithModel[cloudExadataInfrastructureDataSourceModel] +} + +func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) { + statusType := fwtypes.StringEnumType[odbtypes.ResourceStatus]() + computeModelType := fwtypes.StringEnumType[odbtypes.ComputeModel]() + resp.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "activated_storage_count": schema.Int32Attribute{ + Computed: true, + Description: "The number of storage servers requested for the Exadata infrastructure.", + }, + "additional_storage_count": schema.Int32Attribute{ + Computed: true, + Description: "The number of storage servers requested for the Exadata infrastructure.", + }, + "available_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure.", + }, + "availability_zone": schema.StringAttribute{ + Computed: true, + Description: "he name of the Availability Zone (AZ) where the Exadata infrastructure is located.", + }, + "availability_zone_id": schema.StringAttribute{ + Computed: true, + Description: "The AZ ID of the AZ where the Exadata infrastructure is located.", + }, + names.AttrARN: schema.StringAttribute{ + Computed: true, + Description: "The Amazon Resource Name (ARN) for the Exadata infrastructure.", + }, + names.AttrID: schema.StringAttribute{ + Required: true, + Description: "The unique identifier of the Exadata infrastructure.", + }, + "compute_count": schema.Int32Attribute{ + Computed: true, + Description: "The number of database servers for the Exadata infrastructure.", + }, + "cpu_count": schema.Int32Attribute{ + Computed: true, + Description: "The total number of CPU cores that are allocated to the Exadata infrastructure.", + }, + "data_storage_size_in_tbs": schema.Float64Attribute{ + Computed: true, + Description: "The size of the Exadata infrastructure's data disk group, in terabytes (TB).", + }, + "db_node_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The database server model type of the Exadata infrastructure. For the list of\n" + + "valid model names, use the ListDbSystemShapes operation.", + }, + "db_server_version": schema.StringAttribute{ + Computed: true, + Description: "The version of the Exadata infrastructure.", + }, + "display_name": schema.StringAttribute{ + Computed: true, + Description: "The display name of the Exadata infrastructure.", + }, + "last_maintenance_run_id": schema.StringAttribute{ + Computed: true, + Description: "The Oracle Cloud Identifier (OCID) of the last maintenance run for the Exadata infrastructure.", + }, + "max_cpu_count": schema.Int32Attribute{ + Computed: true, + Description: "The total number of CPU cores available on the Exadata infrastructure.", + }, + "max_data_storage_in_tbs": schema.Float64Attribute{ + Computed: true, + Description: "The total amount of data disk group storage, in terabytes (TB), that's available on the Exadata infrastructure.", + }, + "max_db_node_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The total amount of local node storage, in gigabytes (GB), that's available on the Exadata infrastructure.", + }, + "max_memory_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The total amount of memory, in gigabytes (GB), that's available on the Exadata infrastructure.", + }, + "memory_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The amount of memory, in gigabytes (GB), that's allocated on the Exadata infrastructure.", + }, + "monthly_db_server_version": schema.StringAttribute{ + Computed: true, + Description: "The monthly software version of the database servers installed on the Exadata infrastructure.", + }, + "monthly_storage_server_version": schema.StringAttribute{ + Computed: true, + Description: "The monthly software version of the storage servers installed on the Exadata infrastructure.", + }, + "next_maintenance_run_id": schema.StringAttribute{ + Computed: true, + Description: "The OCID of the next maintenance run for the Exadata infrastructure.", + }, + "oci_resource_anchor_name": schema.StringAttribute{ + Computed: true, + Description: "The name of the OCI resource anchor for the Exadata infrastructure.", + }, + "oci_url": schema.StringAttribute{ + Computed: true, + Description: "The HTTPS link to the Exadata infrastructure in OCI.", + }, + "ocid": schema.StringAttribute{ + Computed: true, + Description: "The OCID of the Exadata infrastructure in OCI.", + }, + "percent_progress": schema.Float64Attribute{ + Computed: true, + Description: "The amount of progress made on the current operation on the Exadata infrastructure expressed as a percentage.", + }, + "shape": schema.StringAttribute{ + Computed: true, + Description: "The model name of the Exadata infrastructure.", + }, + "status": schema.StringAttribute{ + CustomType: statusType, + Computed: true, + Description: "The status of the Exadata infrastructure.", + }, + "status_reason": schema.StringAttribute{ + Computed: true, + Description: "Additional information about the status of the Exadata infrastructure.", + }, + "storage_count": schema.Int32Attribute{ + Computed: true, + Description: "he number of storage servers that are activated for the Exadata infrastructure.", + }, + "storage_server_version": schema.StringAttribute{ + Computed: true, + Description: "The software version of the storage servers on the Exadata infrastructure.", + }, + "total_storage_size_in_gbs": schema.Int32Attribute{ + Computed: true, + Description: "The total amount of storage, in gigabytes (GB), on the the Exadata infrastructure.", + }, + "compute_model": schema.StringAttribute{ + CustomType: computeModelType, + Computed: true, + Description: "The OCI model compute model used when you create or clone an instance: ECPU or\n" + + "OCPU. An ECPU is an abstracted measure of compute resources. ECPUs are based on\n" + + "the number of cores elastically allocated from a pool of compute and storage\n" + + "servers. An OCPU is a legacy physical measure of compute resources. OCPUs are\n" + + "based on the physical core of a processor with hyper-threading enabled.", + }, + "created_at": schema.StringAttribute{ + Computed: true, + Description: "The time when the Exadata infrastructure was created.", + }, + "database_server_type": schema.StringAttribute{ + Computed: true, + Description: "The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation.", + }, + "storage_server_type": schema.StringAttribute{ + Computed: true, + Description: "The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation.", + }, + names.AttrTags: tftags.TagsAttributeComputedOnly(), + "maintenance_window": schema.ObjectAttribute{ + Computed: true, + CustomType: fwtypes.NewObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), + Description: "The maintenance window for the Exadata infrastructure.", + AttributeTypes: map[string]attr.Type{ + "custom_action_timeout_in_mins": types.Int32Type, + "days_of_week": types.SetType{ + ElemType: fwtypes.StringEnumType[odbtypes.DayOfWeekName](), + }, + "hours_of_day": types.SetType{ + ElemType: types.Int32Type, + }, + "is_custom_action_timeout_enabled": types.BoolType, + "lead_time_in_weeks": types.Int32Type, + "months": types.SetType{ + ElemType: fwtypes.StringEnumType[odbtypes.MonthName](), + }, + "patching_mode": fwtypes.StringEnumType[odbtypes.PatchingModeType](), + "preference": fwtypes.StringEnumType[odbtypes.PreferenceType](), + "weeks_of_month": types.SetType{ + ElemType: types.Int32Type, + }, + }, + }, + }, + Blocks: map[string]schema.Block{ + "customer_contacts_to_send_to_oci": schema.SetNestedBlock{ + Description: "Customer contact emails to send to OCI.", + CustomType: fwtypes.NewSetNestedObjectTypeOf[customerContactDataSourceModel](ctx), + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "email": schema.StringAttribute{ + Computed: true, + }, + }, + }, + }, + }, + } +} + +func (d *dataSourceCloudExadataInfrastructure) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { + conn := d.Meta().ODBClient(ctx) + + var data cloudExadataInfrastructureDataSourceModel + resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) + if resp.Diagnostics.HasError() { + return + } + + out, err := FindOdbExaDataInfraForDataSourceByID(ctx, conn, data.CloudExadataInfrastructureId.ValueString()) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameCloudExadataInfrastructure, data.CloudExadataInfrastructureId.String(), err), + err.Error(), + ) + return + } + tagsRead, err := listTags(ctx, conn, *out.CloudExadataInfrastructureArn) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameCloudExadataInfrastructure, data.CloudExadataInfrastructureId.String(), err), + err.Error(), + ) + return + } + if tagsRead != nil { + data.Tags = tftags.FlattenStringValueMap(ctx, tagsRead.Map()) + } + data.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) + data.MaintenanceWindow = d.flattenMaintenanceWindow(ctx, out.MaintenanceWindow) + resp.Diagnostics.Append(flex.Flatten(ctx, out, &data)...) + if resp.Diagnostics.HasError() { + return + } + + resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) +} + +func FindOdbExaDataInfraForDataSourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { + input := odb.GetCloudExadataInfrastructureInput{ + CloudExadataInfrastructureId: aws.String(id), + } + + out, err := conn.GetCloudExadataInfrastructure(ctx, &input) + if err != nil { + if errs.IsA[*odbtypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: &input, + } + } + + return nil, err + } + + if out == nil || out.CloudExadataInfrastructure == nil { + return nil, tfresource.NewEmptyResultError(&input) + } + + return out.CloudExadataInfrastructure, nil +} + +func (d *dataSourceCloudExadataInfrastructure) flattenMaintenanceWindow(ctx context.Context, obdExaInfraMW *odbtypes.MaintenanceWindow) fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel] { + //days of week + daysOfWeek := make([]attr.Value, 0, len(obdExaInfraMW.DaysOfWeek)) + for _, dayOfWeek := range obdExaInfraMW.DaysOfWeek { + dayOfWeekStringValue := fwtypes.StringEnumValue(dayOfWeek.Name).StringValue + daysOfWeek = append(daysOfWeek, dayOfWeekStringValue) + } + setValueOfDaysOfWeek, _ := basetypes.NewSetValue(types.StringType, daysOfWeek) + daysOfWeekRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]]{ + SetValue: setValueOfDaysOfWeek, + } + //hours of the day + hoursOfTheDay := make([]attr.Value, 0, len(obdExaInfraMW.HoursOfDay)) + for _, hourOfTheDay := range obdExaInfraMW.HoursOfDay { + daysOfWeekInt32Value := types.Int32Value(hourOfTheDay) + hoursOfTheDay = append(hoursOfTheDay, daysOfWeekInt32Value) + } + setValuesOfHoursOfTheDay, _ := basetypes.NewSetValue(types.Int32Type, hoursOfTheDay) + hoursOfTheDayRead := fwtypes.SetValueOf[types.Int64]{ + SetValue: setValuesOfHoursOfTheDay, + } + //months + months := make([]attr.Value, 0, len(obdExaInfraMW.Months)) + for _, month := range obdExaInfraMW.Months { + monthStringValue := fwtypes.StringEnumValue(month.Name).StringValue + months = append(months, monthStringValue) + } + setValuesOfMonth, _ := basetypes.NewSetValue(types.StringType, months) + monthsRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]]{ + SetValue: setValuesOfMonth, + } + //weeks of month + weeksOfMonth := make([]attr.Value, 0, len(obdExaInfraMW.WeeksOfMonth)) + for _, weekOfMonth := range obdExaInfraMW.WeeksOfMonth { + weeksOfMonthInt32Value := types.Int32Value(weekOfMonth) + weeksOfMonth = append(weeksOfMonth, weeksOfMonthInt32Value) + } + setValuesOfWeekOfMonth, _ := basetypes.NewSetValue(types.Int32Type, weeksOfMonth) + weeksOfMonthRead := fwtypes.SetValueOf[types.Int64]{ + SetValue: setValuesOfWeekOfMonth, + } + + flattenMW := cloudExadataInfraMaintenanceWindowDataSourceModel{ + CustomActionTimeoutInMins: types.Int32PointerValue(obdExaInfraMW.CustomActionTimeoutInMins), + DaysOfWeek: daysOfWeekRead, + HoursOfDay: hoursOfTheDayRead, + IsCustomActionTimeoutEnabled: types.BoolPointerValue(obdExaInfraMW.IsCustomActionTimeoutEnabled), + LeadTimeInWeeks: types.Int32PointerValue(obdExaInfraMW.LeadTimeInWeeks), + Months: monthsRead, + PatchingMode: fwtypes.StringEnumValue(obdExaInfraMW.PatchingMode), + Preference: fwtypes.StringEnumValue(obdExaInfraMW.Preference), + WeeksOfMonth: weeksOfMonthRead, + } + if obdExaInfraMW.LeadTimeInWeeks == nil { + flattenMW.LeadTimeInWeeks = types.Int32Value(0) + } + if obdExaInfraMW.CustomActionTimeoutInMins == nil { + flattenMW.CustomActionTimeoutInMins = types.Int32Value(0) + } + if obdExaInfraMW.IsCustomActionTimeoutEnabled == nil { + flattenMW.IsCustomActionTimeoutEnabled = types.BoolValue(false) + } + + result, _ := fwtypes.NewObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx, &flattenMW) + return result +} + +type cloudExadataInfrastructureDataSourceModel struct { + framework.WithRegionModel + ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` + AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` + AvailabilityZone types.String `tfsdk:"availability_zone"` + AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` + AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` + CloudExadataInfrastructureArn types.String `tfsdk:"arn"` + CloudExadataInfrastructureId types.String `tfsdk:"id"` + ComputeCount types.Int32 `tfsdk:"compute_count"` + CpuCount types.Int32 `tfsdk:"cpu_count"` + DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` + DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` + DbServerVersion types.String `tfsdk:"db_server_version"` + DisplayName types.String `tfsdk:"display_name"` + LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` + MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` + MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` + MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` + MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` + MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` + MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` + MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` + NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` + OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` + OciUrl types.String `tfsdk:"oci_url"` + Ocid types.String `tfsdk:"ocid"` + PercentProgress types.Float64 `tfsdk:"percent_progress"` + Shape types.String `tfsdk:"shape"` + Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` + StatusReason types.String `tfsdk:"status_reason"` + StorageCount types.Int32 `tfsdk:"storage_count"` + StorageServerVersion types.String `tfsdk:"storage_server_version"` + TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` + CustomerContactsToSendToOCI fwtypes.SetNestedObjectValueOf[customerContactDataSourceModel] `tfsdk:"customer_contacts_to_send_to_oci"` + ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` + CreatedAt types.String `tfsdk:"created_at" autoflex:",noflatten"` + DatabaseServerType types.String `tfsdk:"database_server_type"` + StorageServerType types.String `tfsdk:"storage_server_type"` + MaintenanceWindow fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel] `tfsdk:"maintenance_window" autoflex:",noflatten"` + Tags tftags.Map `tfsdk:"tags"` +} + +type cloudExadataInfraMaintenanceWindowDataSourceModel struct { + CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` + DaysOfWeek fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]] `tfsdk:"days_of_week"` + HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` + IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` + LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` + Months fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]] `tfsdk:"months"` + PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` + Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` + WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` +} +type customerContactDataSourceModel struct { + Email types.String `tfsdk:"email"` +} diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go new file mode 100644 index 000000000000..28f0cb416572 --- /dev/null +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -0,0 +1,107 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package odb_test + +import ( + "context" + "errors" + "fmt" + 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/create" + tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" + "testing" +) + +// Acceptance test access AWS and cost money to run. +func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + exaInfraResource := "aws_odb_cloud_exadata_infrastructure.test" + exaInfraDataSource := "data.aws_odb_cloud_exadata_infrastructure.test" + displayNameSuffix := sdkacctest.RandomWithPrefix("tf_") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCloudExadataInfrastructureDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: basicExaInfraDataSource(displayNameSuffix), + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttrPair(exaInfraResource, "id", exaInfraDataSource, "id"), + resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"), + resource.TestCheckResourceAttr(exaInfraDataSource, "status", "AVAILABLE"), + resource.TestCheckResourceAttr(exaInfraDataSource, "storage_count", "3"), + resource.TestCheckResourceAttr(exaInfraDataSource, "compute_count", "2"), + ), + }, + }, + }) +} + +func testAccCheckCloudExadataInfrastructureDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_odb_cloud_exadata_infrastructure" { + continue + } + _, err := tfodb.FindOdbExaDataInfraForDataSourceByID(ctx, conn, rs.Primary.ID) + if tfresource.NotFound(err) { + return nil + } + if err != nil { + return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, err) + } + + return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func basicExaInfraDataSource(displayNameSuffix string) string { + + testData := fmt.Sprintf(` + + +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = "Ofake_exa_%[1]s" + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = ["abc@example.com"] +maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = [] + hours_of_day = [] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 0 + months = [] + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + weeks_of_month =[] + } +} + +data "aws_odb_cloud_exadata_infrastructure" "test" { + id = aws_odb_cloud_exadata_infrastructure.test.id +} +`, displayNameSuffix) + return testData +} diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go new file mode 100644 index 000000000000..702a44c07952 --- /dev/null +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -0,0 +1,459 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. + +package odb_test + +import ( + "context" + "errors" + "fmt" + odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-provider-aws/internal/create" + tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "strings" + "testing" + + "github.com/aws/aws-sdk-go-v2/service/odb" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// Acceptance test access AWS and cost money to run. + +type cloudExaDataInfraResourceTest struct { + displayNamePrefix string +} + +var exaInfraTestResource = cloudExaDataInfraResourceTest{ + displayNamePrefix: "Ofake-exa", +} + +func TestAccODBCloudExadataInfrastructureCreate_basic(t *testing.T) { + ctx := acctest.Context(t) + + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure odbtypes.CloudExadataInfrastructure + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} +func TestAccODBCloudExadataInfrastructureCreateWithAllParameters(t *testing.T) { + ctx := acctest.Context(t) + + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure odbtypes.CloudExadataInfrastructure + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ + { + Config: exaInfraTestResource.exaDataInfraResourceWithAllConfig(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure1 odbtypes.CloudExadataInfrastructure + var cloudExaDataInfrastructure2 odbtypes.CloudExadataInfrastructure + var cloudExaDataInfrastructure3 odbtypes.CloudExadataInfrastructure + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfigAddTags(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure2), + resource.ComposeTestCheckFunc(func(state *terraform.State) error { + if strings.Compare(*(cloudExaDataInfrastructure1.CloudExadataInfrastructureId), *(cloudExaDataInfrastructure2.CloudExadataInfrastructureId)) != 0 { + return errors.New("Should not create a new cloud exa basicExaInfraDataSource after update") + } + return nil + }), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfigRemoveTags(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure3), + resource.ComposeTestCheckFunc(func(state *terraform.State) error { + if strings.Compare(*(cloudExaDataInfrastructure1.CloudExadataInfrastructureId), *(cloudExaDataInfrastructure3.CloudExadataInfrastructureId)) != 0 { + return errors.New("Should not create a new cloud exa basicExaInfraDataSource after update") + } + return nil + }), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure1 odbtypes.CloudExadataInfrastructure + var cloudExaDataInfrastructure2 odbtypes.CloudExadataInfrastructure + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), + resource.TestCheckResourceAttr(resourceName, "maintenance_window.preference", "NO_PREFERENCE"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: exaInfraTestResource.basicWithCustomMaintenanceWindow(rName), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure2), + resource.ComposeTestCheckFunc(func(state *terraform.State) error { + if strings.Compare(*(cloudExaDataInfrastructure1.CloudExadataInfrastructureId), *(cloudExaDataInfrastructure2.CloudExadataInfrastructureId)) != 0 { + return errors.New("Should not create a new cloud exa basicExaInfraDataSource after update") + } + return nil + }), + resource.TestCheckResourceAttr(resourceName, "maintenance_window.preference", "CUSTOM_PREFERENCE"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccODBCloudExadataInfrastructure_disappears(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure odbtypes.CloudExadataInfrastructure + + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), + Check: resource.ComposeTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfodb.ResourceCloudExadataInfrastructure, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func (cloudExaDataInfraResourceTest) testAccCheckCloudExaDataInfraDestroyed(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_odb_cloud_exadata_infrastructure" { + continue + } + _, err := tfodb.FindOdbExadataInfraResourceByID(ctx, conn, rs.Primary.ID) + if tfresource.NotFound(err) { + return nil + } + if err != nil { + return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, err) + } + + return create.Error(names.ODB, create.ErrActionCheckingDestroyed, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func (cloudExaDataInfraResourceTest) testAccCheckCloudExadataInfrastructureExists(ctx context.Context, name string, cloudExadataInfrastructure *odbtypes.CloudExadataInfrastructure) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudExadataInfrastructure, name, errors.New("not found")) + } + + if rs.Primary.ID == "" { + return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudExadataInfrastructure, name, errors.New("not set")) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) + + resp, err := tfodb.FindOdbExadataInfraResourceByID(ctx, conn, rs.Primary.ID) + if err != nil { + return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, err) + } + + *cloudExadataInfrastructure = *resp + + return nil + } +} + +func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *testing.T) { + conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) + + input := &odb.ListCloudExadataInfrastructuresInput{} + + _, err := conn.ListCloudExadataInfrastructures(ctx, input) + + if acctest.PreCheckSkipError(err) { + t.Skipf("skipping acceptance testing: %s", err) + } + if err != nil { + t.Fatalf("unexpected PreCheck error: %s", err) + } +} + +/* + func testAccCheckCloudExadataInfrastructureNotRecreated(before, after *odb.DescribeCloudExadataInfrastructureResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + if before, after := aws.ToString(before.CloudExadataInfrastructureId), aws.ToString(after.CloudExadataInfrastructureId); before != after { + return create.Error(names.ODB, create.ErrActionCheckingNotRecreated, tfodb.ResNameCloudExadataInfrastructure, aws.ToString(before.CloudExadataInfrastructureId), errors.New("recreated")) + } + + return nil + } + } +*/ +func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId string) string { + exaDataInfra := fmt.Sprintf(` + +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = %[1]q + shape = "Exadata.X11M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = ["abc@example.com"] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = ["MONDAY", "TUESDAY"] + hours_of_day = [11,16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = ["FEBRUARY","MAY","AUGUST","NOVEMBER"] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month =[2,4] + } + tags = { + "env"= "dev" + } + +} +`, randomId) + return exaDataInfra +} +func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfig(displayName string) string { + exaInfra := fmt.Sprintf(` +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = [] + hours_of_day = [] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 0 + months = [] + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + weeks_of_month =[] + } +} +`, displayName) + return exaInfra +} +func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigAddTags(displayName string) string { + exaInfra := fmt.Sprintf(` +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" +maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = [] + hours_of_day = [] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 0 + months = [] + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + weeks_of_month =[] + } + tags = { + "env"= "dev" + } +} +`, displayName) + return exaInfra +} + +func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigRemoveTags(displayName string) string { + exaInfra := fmt.Sprintf(` +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" +maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = [] + hours_of_day = [] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 0 + months = [] + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + weeks_of_month =[] + } +} +`, displayName) + return exaInfra +} +func (cloudExaDataInfraResourceTest) basicWithCustomMaintenanceWindow(displayName string) string { + exaInfra := fmt.Sprintf(` +resource "aws_odb_cloud_exadata_infrastructure" "test" { + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window = { + custom_action_timeout_in_mins = 16 + days_of_week = ["MONDAY", "TUESDAY"] + hours_of_day = [11,16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = ["FEBRUARY","MAY","AUGUST","NOVEMBER"] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month =[2,4] + } +} +`, displayName) + return exaInfra +} diff --git a/internal/service/odb/generate.go b/internal/service/odb/generate.go new file mode 100644 index 000000000000..2fef8ab1a1c7 --- /dev/null +++ b/internal/service/odb/generate.go @@ -0,0 +1,6 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +//go:generate go run ../../generate/tags/main.go -ServiceTagsMap -ListTags -KVTValues -UpdateTags +//go:generate go run ../../generate/servicepackage/main.go +// ONLY generate directives and package declaration! Do not add anything else to this file. + +package odb diff --git a/internal/service/odb/service_endpoint_resolver_gen.go b/internal/service/odb/service_endpoint_resolver_gen.go new file mode 100644 index 000000000000..103f29abab6b --- /dev/null +++ b/internal/service/odb/service_endpoint_resolver_gen.go @@ -0,0 +1,82 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package odb + +import ( + "context" + "fmt" + "net" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/odb" + smithyendpoints "github.com/aws/smithy-go/endpoints" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/errs" +) + +var _ odb.EndpointResolverV2 = resolverV2{} + +type resolverV2 struct { + defaultResolver odb.EndpointResolverV2 +} + +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: odb.NewDefaultEndpointResolverV2(), + } +} + +func (r resolverV2) ResolveEndpoint(ctx context.Context, params odb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { + params = params.WithDefaults() + useFIPS := aws.ToBool(params.UseFIPS) + + if eps := params.Endpoint; aws.ToString(eps) != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + + if useFIPS { + tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") + params.UseFIPS = aws.Bool(false) + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) + } else if useFIPS { + ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) + + endpoint, err = r.defaultResolver.ResolveEndpoint(ctx, params) + if err != nil { + return endpoint, err + } + + tflog.Debug(ctx, "endpoint resolved", map[string]any{ + "tf_aws.endpoint": endpoint.URI.String(), + }) + + hostname := endpoint.URI.Hostname() + _, err = net.LookupHost(hostname) + if err != nil { + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ + "tf_aws.hostname": hostname, + }) + params.UseFIPS = aws.Bool(false) + } else { + err = fmt.Errorf("looking up odb endpoint %q: %s", hostname, err) + return + } + } else { + return endpoint, err + } + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) +} + +func withBaseEndpoint(endpoint string) func(*odb.Options) { + return func(o *odb.Options) { + if endpoint != "" { + o.BaseEndpoint = aws.String(endpoint) + } + } +} diff --git a/internal/service/odb/service_endpoints_gen_test.go b/internal/service/odb/service_endpoints_gen_test.go new file mode 100644 index 000000000000..3e14b47bd0f5 --- /dev/null +++ b/internal/service/odb/service_endpoints_gen_test.go @@ -0,0 +1,602 @@ +// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. + +package odb_test + +import ( + "context" + "errors" + "fmt" + "maps" + "net" + "net/url" + "os" + "path/filepath" + "reflect" + "strings" + "testing" + + "github.com/aws/aws-sdk-go-v2/aws" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/service/odb" + "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" + terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "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/provider/sdkv2" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type endpointTestCase struct { + with []setupFunc + expected caseExpectations +} + +type caseSetup struct { + config map[string]any + configFile configFile + environmentVariables map[string]string +} + +type configFile struct { + baseUrl string + serviceUrl string +} + +type caseExpectations struct { + diags diag.Diagnostics + endpoint string + region string +} + +type apiCallParams struct { + endpoint string + region string +} + +type setupFunc func(setup *caseSetup) + +type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams + +const ( + packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" + awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" + baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" + serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" + baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" +) + +const ( + packageName = "odb" + awsEnvVar = "AWS_ENDPOINT_URL_ODB" + baseEnvVar = "AWS_ENDPOINT_URL" + configParam = "odb" +) + +const ( + expectedCallRegion = "us-east-1" //lintignore:AWSAT003 +) + +func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv + ctx := t.Context() + const providerRegion = "us-west-2" //lintignore:AWSAT003 + const expectedEndpointRegion = providerRegion + + testcases := map[string]endpointTestCase{ + "no config": { + with: []setupFunc{withNoConfig}, + expected: expectDefaultEndpoint(ctx, t, expectedEndpointRegion), + }, + + // Package name endpoint on Config + + "package name endpoint config": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides aws service envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withAwsEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides service config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withServiceEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + // Service endpoint in AWS envvar + + "service aws envvar": { + with: []setupFunc{ + withAwsEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base envvar": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides service config file": { + with: []setupFunc{ + withAwsEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base config file": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + // Base endpoint in envvar + + "base endpoint envvar": { + with: []setupFunc{ + withBaseEnvVar, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides service config file": { + with: []setupFunc{ + withBaseEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides base config file": { + with: []setupFunc{ + withBaseEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + // Service endpoint in config file + + "service config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + "service config file overrides base config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + withBaseEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + // Base endpoint in config file + + "base endpoint config file": { + with: []setupFunc{ + withBaseEndpointInConfigFile, + }, + expected: expectBaseConfigFileEndpoint(), + }, + + // Use FIPS endpoint on Config + + "use fips config": { + with: []setupFunc{ + withUseFIPSInConfig, + }, + expected: expectDefaultFIPSEndpoint(ctx, t, expectedEndpointRegion), + }, + + "use fips config with package name endpoint config": { + with: []setupFunc{ + withUseFIPSInConfig, + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + } + + for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv + t.Run(name, func(t *testing.T) { + testEndpointCase(ctx, t, providerRegion, testcase, callService) + }) + } +} + +func defaultEndpoint(ctx context.Context, region string) (url.URL, error) { + r := odb.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, odb.EndpointParameters{ + Region: aws.String(region), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func defaultFIPSEndpoint(ctx context.Context, region string) (url.URL, error) { + r := odb.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, odb.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { + t.Helper() + + client := meta.ODBClient(ctx) + + var result apiCallParams + + input := odb.ListGiVersionsInput{} + _, err := client.ListGiVersions(ctx, &input, + func(opts *odb.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) { + // no-op +} + +func withPackageNameEndpointInConfig(setup *caseSetup) { + if _, ok := setup.config[names.AttrEndpoints]; !ok { + setup.config[names.AttrEndpoints] = []any{ + map[string]any{}, + } + } + endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) + endpoints[packageName] = packageNameConfigEndpoint +} + +func withAwsEnvVar(setup *caseSetup) { + setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint +} + +func withBaseEnvVar(setup *caseSetup) { + setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint +} + +func withServiceEndpointInConfigFile(setup *caseSetup) { + setup.configFile.serviceUrl = serviceConfigFileEndpoint +} + +func withBaseEndpointInConfigFile(setup *caseSetup) { + setup.configFile.baseUrl = baseConfigFileEndpoint +} + +func withUseFIPSInConfig(setup *caseSetup) { + setup.config["use_fips_endpoint"] = true +} + +func expectDefaultEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer default endpoint: %s", err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectDefaultFIPSEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultFIPSEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) + } + + hostname := endpoint.Hostname() + _, err = net.LookupHost(hostname) + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + return expectDefaultEndpoint(ctx, t, region) + } else if err != nil { + t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectPackageNameConfigEndpoint() caseExpectations { + return caseExpectations{ + endpoint: packageNameConfigEndpoint, + region: expectedCallRegion, + } +} + +func expectAwsEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: awsServiceEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectServiceConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: serviceConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func testEndpointCase(ctx context.Context, t *testing.T, region string, testcase endpointTestCase, callF callFunc) { + t.Helper() + + setup := caseSetup{ + config: map[string]any{}, + environmentVariables: map[string]string{}, + } + + for _, f := range testcase.with { + f(&setup) + } + + config := map[string]any{ + names.AttrAccessKey: servicemocks.MockStaticAccessKey, + names.AttrSecretKey: servicemocks.MockStaticSecretKey, + names.AttrRegion: region, + names.AttrSkipCredentialsValidation: true, + names.AttrSkipRequestingAccountID: true, + } + + maps.Copy(config, setup.config) + + if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { + config[names.AttrProfile] = "default" + tempDir := t.TempDir() + writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) + } + + for k, v := range setup.environmentVariables { + t.Setenv(k, v) + } + + p, err := sdkv2.NewProvider(ctx) + if err != nil { + t.Fatal(err) + } + + p.TerraformVersion = "1.0.0" + + expectedDiags := testcase.expected.diags + diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) + + if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { + t.Errorf("unexpected diagnostics difference: %s", diff) + } + + if diags.HasError() { + return + } + + meta := p.Meta().(*conns.AWSClient) + + callParams := callF(ctx, t, meta) + + if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { + t.Errorf("expected endpoint %q, got %q", e, a) + } + + if e, a := testcase.expected.region, callParams.region; e != a { + t.Errorf("expected region %q, got %q", e, a) + } +} + +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 any) 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 + + buf.WriteString(` +[default] +aws_access_key_id = DefaultSharedCredentialsAccessKey +aws_secret_access_key = DefaultSharedCredentialsSecretKey +`) + if config.baseUrl != "" { + fmt.Fprintf(&buf, "endpoint_url = %s\n", config.baseUrl) + } + + if config.serviceUrl != "" { + fmt.Fprintf(&buf, ` +services = endpoint-test + +[services endpoint-test] +%[1]s = + endpoint_url = %[2]s +`, configParam, serviceConfigFileEndpoint) + } + + return buf.String() +} + +func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { + t.Helper() + + file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) + if err != nil { + t.Fatalf("creating shared configuration file: %s", err) + } + + _, err = file.WriteString(content) + if err != nil { + t.Fatalf(" writing shared configuration file: %s", err) + } + + if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { + (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} + } else { + (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) + } + + return file.Name() +} diff --git a/internal/service/odb/service_package.go b/internal/service/odb/service_package.go new file mode 100644 index 000000000000..bcd16fc18e33 --- /dev/null +++ b/internal/service/odb/service_package.go @@ -0,0 +1,32 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. + +package odb + +import ( + "context" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/odb" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*odb.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) + + return odb.NewFromConfig(cfg, + odb.WithEndpointResolverV2(newEndpointResolverV2()), + withBaseEndpoint(config[names.AttrEndpoint].(string)), + func(o *odb.Options) { + //if config["partition"].(string) == names.StandardPartitionID { + if cfg.Region != "\"us-east-1\"" { + tflog.Info(ctx, "overriding region", map[string]any{ + "original_region": cfg.Region, + "override_region": "us-east-1", + }) + o.Region = "us-east-1" + } + //} + o.BaseEndpoint = aws.String("https://gammaiad.capi.us-east-1.oracolo.alameda.aws.dev") + }, + ), nil +} diff --git a/internal/service/odb/service_package_gen.go b/internal/service/odb/service_package_gen.go new file mode 100644 index 000000000000..cd5cffdd14ed --- /dev/null +++ b/internal/service/odb/service_package_gen.go @@ -0,0 +1,55 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package odb + +import ( + "context" + "unique" + + "github.com/hashicorp/terraform-provider-aws/internal/conns" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type servicePackage struct{} + +func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.ServicePackageFrameworkDataSource { + return []*inttypes.ServicePackageFrameworkDataSource{ + { + Factory: newDataSourceCloudExadataInfrastructure, + TypeName: "aws_odb_cloud_exadata_infrastructure", + Name: "Cloud Exadata Infrastructure", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, + } +} + +func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.ServicePackageFrameworkResource { + return []*inttypes.ServicePackageFrameworkResource{ + { + Factory: newResourceCloudExadataInfrastructure, + TypeName: "aws_odb_cloud_exadata_infrastructure", + Name: "Cloud Exadata Infrastructure", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, + } +} + +func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { + return []*inttypes.ServicePackageSDKDataSource{} +} + +func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePackageSDKResource { + return []*inttypes.ServicePackageSDKResource{} +} + +func (p *servicePackage) ServicePackageName() string { + return names.ODB +} + +func ServicePackage(ctx context.Context) conns.ServicePackage { + return &servicePackage{} +} diff --git a/internal/service/odb/tags_gen.go b/internal/service/odb/tags_gen.go new file mode 100644 index 000000000000..3ae4f0f73d8e --- /dev/null +++ b/internal/service/odb/tags_gen.go @@ -0,0 +1,128 @@ +// Code generated by internal/generate/tags/main.go; DO NOT EDIT. +package odb + +import ( + "context" + + "github.com/YakDriver/smarterr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/odb" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/logging" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/types/option" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// listTags lists odb 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 *odb.Client, identifier string, optFns ...func(*odb.Options)) (tftags.KeyValueTags, error) { + input := odb.ListTagsForResourceInput{ + ResourceArn: aws.String(identifier), + } + + output, err := conn.ListTagsForResource(ctx, &input, optFns...) + + if err != nil { + return tftags.New(ctx, nil), smarterr.NewError(err) + } + + return keyValueTags(ctx, output.Tags), nil +} + +// ListTags lists odb 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).ODBClient(ctx), identifier) + + if err != nil { + return smarterr.NewError(err) + } + + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(tags) + } + + return nil +} + +// map[string]string handling + +// svcTags returns odb service tags. +func svcTags(tags tftags.KeyValueTags) map[string]string { + return tags.Map() +} + +// keyValueTags creates tftags.KeyValueTags from odb service tags. +func keyValueTags(ctx context.Context, tags map[string]string) tftags.KeyValueTags { + return tftags.New(ctx, tags) +} + +// getTagsIn returns odb service tags from Context. +// nil is returned if there are no input tags. +func getTagsIn(ctx context.Context) map[string]string { + if inContext, ok := tftags.FromContext(ctx); ok { + if tags := svcTags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { + return tags + } + } + + return nil +} + +// setTagsOut sets odb service tags in Context. +func setTagsOut(ctx context.Context, tags map[string]string) { + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(keyValueTags(ctx, tags)) + } +} + +// updateTags updates odb 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 *odb.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*odb.Options)) error { + oldTags := tftags.New(ctx, oldTagsMap) + newTags := tftags.New(ctx, newTagsMap) + + ctx = tflog.SetField(ctx, logging.KeyResourceId, identifier) + + removedTags := oldTags.Removed(newTags) + removedTags = removedTags.IgnoreSystem(names.ODB) + if len(removedTags) > 0 { + input := odb.UntagResourceInput{ + ResourceArn: aws.String(identifier), + TagKeys: removedTags.Keys(), + } + + _, err := conn.UntagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + updatedTags := oldTags.Updated(newTags) + updatedTags = updatedTags.IgnoreSystem(names.ODB) + if len(updatedTags) > 0 { + input := odb.TagResourceInput{ + ResourceArn: aws.String(identifier), + Tags: svcTags(updatedTags), + } + + _, err := conn.TagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + return nil +} + +// UpdateTags updates odb 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).ODBClient(ctx), identifier, oldTags, newTags) +} From 2eabcfc5d335db549ee75cc6a2c7a6e0bd52cab8 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 1 Aug 2025 15:14:54 +0100 Subject: [PATCH 0073/2115] service package corrected --- internal/service/odb/service_package.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/internal/service/odb/service_package.go b/internal/service/odb/service_package.go index bcd16fc18e33..5278c3224650 100644 --- a/internal/service/odb/service_package.go +++ b/internal/service/odb/service_package.go @@ -6,7 +6,6 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/odb" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -17,16 +16,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( odb.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *odb.Options) { - //if config["partition"].(string) == names.StandardPartitionID { - if cfg.Region != "\"us-east-1\"" { - tflog.Info(ctx, "overriding region", map[string]any{ - "original_region": cfg.Region, - "override_region": "us-east-1", - }) - o.Region = "us-east-1" - } - //} - o.BaseEndpoint = aws.String("https://gammaiad.capi.us-east-1.oracolo.alameda.aws.dev") + }, ), nil } From 68f0a3fa527c9771fd9f4dfc09080f1db3692055 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 1 Aug 2025 15:23:37 +0100 Subject: [PATCH 0074/2115] added odb service --- names/data/names_data.hcl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 6a83a3386cfa..b67beb4f52a0 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -9441,4 +9441,34 @@ service "evs" { provider_package_correct = "evs" doc_prefix = ["evs_"] brand = "Amazon" +} + +service "odb" { + sdk { + id = "ODB" + arn_namespace = "odb" + } + names { + provider_name_upper = "ODB" + human_friendly = "Oracle Database@AWS" + } + endpoint_info { + endpoint_api_call = " ListGiVersions" + endpoint_region_overrides = { + "aws" = "us-east-1" + } + } + go_packages { + v1_package = "" + v2_package = "odb" + } + client{ + skip_client_generate = true + } + resource_prefix{ + correct = "aws_odb_" + } + provider_package_correct = "odb" + doc_prefix = ["odb_"] + brand = "AWS" } \ No newline at end of file From fa3571380b4df0a80854fd8b597d7dd3b07ab96d Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 1 Aug 2025 15:52:27 +0100 Subject: [PATCH 0075/2115] change log for exadata infra --- .changelog/43650.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changelog/43650.txt diff --git a/.changelog/43650.txt b/.changelog/43650.txt new file mode 100644 index 000000000000..6b4f271ca176 --- /dev/null +++ b/.changelog/43650.txt @@ -0,0 +1,8 @@ +```release-note:new-resource +aws_odb_cloud_exadata_infrastructure +``` + +```release-note:new-data-source +aws_odb_cloud_exadata_infrastructure +``` + From 58f6ea70d9bdfdbfff88de881a7bbe5c6e359d6e Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 1 Aug 2025 16:41:41 +0100 Subject: [PATCH 0076/2115] fix tflint review --- examples/odb/exadata_infra.tf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf index 68fe806f0ffe..5285bd2160c1 100644 --- a/examples/odb/exadata_infra.tf +++ b/examples/odb/exadata_infra.tf @@ -1,16 +1,16 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright © 2025, Oracle and/or its affiliates. All rights reserved. -//Exadata Infrastructure with customer managed maintenance window +# Exadata Infrastructure with customer managed maintenance window resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_X11M_all_param" { - display_name = "Ofake_my_odb_exadata_infra" //Required Field - shape = "Exadata.X11M" //Required Field + display_name = "Ofake_my_odb_exadata_infra" + shape = "Exadata.X11M" storage_count = 3 compute_count = 2 - availability_zone_id = "use1-az6" //Required Field + availability_zone_id = "use1-az6" customer_contacts_to_send_to_oci = ["abc@example.com"] database_server_type = "X11M" storage_server_type = "X11M-HC" - maintenance_window = { //Required + maintenance_window = { custom_action_timeout_in_mins = 16 days_of_week = ["MONDAY", "TUESDAY"] hours_of_day = [11, 16] @@ -27,7 +27,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_X11M_all_param" { } -//Exadata Infrastructure with default maintenance window with X9M system shape. with minimum parameters +# Exadata Infrastructure with default maintenance window with X9M system shape. with minimum parameters resource "aws_odb_cloud_exadata_infrastructure" "test_X9M" { display_name = "Ofake_my_exa_X9M" shape = "Exadata.X9M" From 4f44376dd278404de6b3ac03964a71b6817be89f Mon Sep 17 00:00:00 2001 From: Byungjin Park Date: Mon, 4 Aug 2025 13:49:46 +0900 Subject: [PATCH 0077/2115] add descriptions for each properties of `output_columns` output --- website/docs/r/quicksight_data_set.html.markdown | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/website/docs/r/quicksight_data_set.html.markdown b/website/docs/r/quicksight_data_set.html.markdown index cd5391ee114c..9dfc280a5ab3 100644 --- a/website/docs/r/quicksight_data_set.html.markdown +++ b/website/docs/r/quicksight_data_set.html.markdown @@ -395,9 +395,17 @@ This resource exports the following attributes in addition to the arguments abov * `arn` - Amazon Resource Name (ARN) of the data set. * `id` - A comma-delimited string joining AWS account ID and data set ID. -* `output_columns` - The final set of columns available for use in analyses and dashboards after all data preparation and transformation steps have been applied within the data set. +* `output_columns` - The final set of columns available for use in analyses and dashboards after all data preparation and transformation steps have been applied within the data set. See [`output_columns` Block](#output_columns-block) below. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +### `output_columns` Block + +The `output_columns` block has the following attributes. + +* `name` - The name of the column. +* `description` - The description of the column. +* `type` - The data type of the column. + ## Import In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Data Set using the AWS account ID and data set ID separated by a comma (`,`). For example: From be9eac95d99fe30da943df24a506bfa85496e840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20S=C3=A1nchez=20Carmona?= Date: Mon, 4 Aug 2025 16:12:47 +0200 Subject: [PATCH 0078/2115] minor update doc - clarification dx hosted connection id --- website/docs/r/dx_hosted_connection.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/dx_hosted_connection.html.markdown b/website/docs/r/dx_hosted_connection.html.markdown index b4b8c5ee474e..eaedb8faef50 100644 --- a/website/docs/r/dx_hosted_connection.html.markdown +++ b/website/docs/r/dx_hosted_connection.html.markdown @@ -39,7 +39,7 @@ This resource exports the following attributes in addition to the arguments abov * `aws_device` - The Direct Connect endpoint on which the physical connection terminates. * `connection_region` - The AWS Region where the connection is located. * `has_logical_redundancy` - Indicates whether the connection supports a secondary BGP peer in the same address family (IPv4/IPv6). -* `id` - The ID of the connection. +* `id` - The ID of the hosted connection. * `jumbo_frame_capable` - Boolean value representing if jumbo frames have been enabled for this connection. * `lag_id` - The ID of the LAG. * `loa_issue_time` - The time of the most recent call to [DescribeLoa](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLoa.html) for this connection. From 8c1c1803b387afce0134c8adfdfc5094dbd0af68 Mon Sep 17 00:00:00 2001 From: Andrew Tulloch Date: Mon, 4 Aug 2025 16:06:38 +0100 Subject: [PATCH 0079/2115] Make sure the secondary_private_ip_addresses is computed if the ID of the EIP allocation isn't known yet --- internal/service/ec2/vpc_nat_gateway.go | 16 +++--- internal/service/ec2/vpc_nat_gateway_test.go | 60 ++++++++++++++++++++ 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/internal/service/ec2/vpc_nat_gateway.go b/internal/service/ec2/vpc_nat_gateway.go index ad4033049720..ac6d6328ae3a 100644 --- a/internal/service/ec2/vpc_nat_gateway.go +++ b/internal/service/ec2/vpc_nat_gateway.go @@ -384,14 +384,16 @@ func resourceNATGatewayCustomizeDiff(ctx context.Context, diff *schema.ResourceD return fmt.Errorf(`secondary_private_ip_address_count is not supported with connectivity_type = "%s"`, connectivityType) } - if diff.Id() != "" && diff.HasChange("secondary_allocation_ids") { - if err := diff.SetNewComputed("secondary_private_ip_address_count"); err != nil { - return fmt.Errorf("setting secondary_private_ip_address_count to computed: %s", err) - } + if diff.Id() != "" { + if v := diff.GetRawConfig().GetAttr("secondary_allocation_ids"); diff.HasChange("secondary_allocation_ids") || !v.IsWhollyKnown() { + if err := diff.SetNewComputed("secondary_private_ip_address_count"); err != nil { + return fmt.Errorf("setting secondary_private_ip_address_count to computed: %s", err) + } - if v := diff.GetRawConfig().GetAttr("secondary_private_ip_addresses"); !v.IsKnown() || v.IsNull() { - if err := diff.SetNewComputed("secondary_private_ip_addresses"); err != nil { - return fmt.Errorf("setting secondary_private_ip_addresses to computed: %s", err) + if v := diff.GetRawConfig().GetAttr("secondary_private_ip_addresses"); !v.IsKnown() || v.IsNull() { + if err := diff.SetNewComputed("secondary_private_ip_addresses"); err != nil { + return fmt.Errorf("setting secondary_private_ip_addresses to computed: %s", err) + } } } } diff --git a/internal/service/ec2/vpc_nat_gateway_test.go b/internal/service/ec2/vpc_nat_gateway_test.go index 380162c22869..00fec123e5eb 100644 --- a/internal/service/ec2/vpc_nat_gateway_test.go +++ b/internal/service/ec2/vpc_nat_gateway_test.go @@ -281,6 +281,66 @@ func TestAccVPCNATGateway_secondaryAllocationIDs(t *testing.T) { }) } +func TestAccVPCNATGateway_addSecondaryAllocationIDs(t *testing.T) { + ctx := acctest.Context(t) + var natGateway awstypes.NatGateway + resourceName := "aws_nat_gateway.test" + eipResourceName := "aws_eip.secondary" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckNATGatewayDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccVPCNATGatewayConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNATGatewayExists(ctx, resourceName, &natGateway), + resource.TestCheckResourceAttr(resourceName, "secondary_allocation_ids.#", "0"), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_address_count", "0"), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_addresses.#", "0"), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + }, + { + Config: testAccVPCNATGatewayConfig_secondaryAllocationIDs(rName, true), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNATGatewayExists(ctx, resourceName, &natGateway), + resource.TestCheckResourceAttr(resourceName, "secondary_allocation_ids.#", "1"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "secondary_allocation_ids.*", eipResourceName, names.AttrID), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_address_count", "1"), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_addresses.#", "1"), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + }, + { + Config: testAccVPCNATGatewayConfig_secondaryAllocationIDs(rName, false), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNATGatewayExists(ctx, resourceName, &natGateway), + resource.TestCheckResourceAttr(resourceName, "secondary_allocation_ids.#", "0"), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_address_count", "0"), + resource.TestCheckResourceAttr(resourceName, "secondary_private_ip_addresses.#", "0"), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + }, + }, + }) +} + func TestAccVPCNATGateway_secondaryPrivateIPAddressCount(t *testing.T) { ctx := acctest.Context(t) var natGateway awstypes.NatGateway From 6e88c2cdeb0e76be418d44ba3aab1288b0f2bc72 Mon Sep 17 00:00:00 2001 From: Dave DeRicco <30156588+ddericco@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:15:51 +0000 Subject: [PATCH 0080/2115] Add support for NLB secondary IPv4 addresses --- internal/service/elbv2/const.go | 3 +- internal/service/elbv2/load_balancer.go | 28 ++++++++ internal/service/elbv2/load_balancer_test.go | 74 ++++++++++++++++++++ website/docs/r/lb.html.markdown | 1 + 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/internal/service/elbv2/const.go b/internal/service/elbv2/const.go index 56f7170035c5..a536f3f2d40f 100644 --- a/internal/service/elbv2/const.go +++ b/internal/service/elbv2/const.go @@ -44,7 +44,8 @@ const ( loadBalancerAttributeZonalShiftConfigEnabled = "zonal_shift.config.enabled" // The following attributes are supported by only Network Load Balancers: - loadBalancerAttributeDNSRecordClientRoutingPolicy = "dns_record.client_routing_policy" + loadBalancerAttributeDNSRecordClientRoutingPolicy = "dns_record.client_routing_policy" + loadBalancerAttributeSecondaryIPsAutoAssignedPerSubnet = "secondary_ips.auto_assigned.per_subnet" ) const ( diff --git a/internal/service/elbv2/load_balancer.go b/internal/service/elbv2/load_balancer.go index a96e838d2c99..a9c12f60609a 100644 --- a/internal/service/elbv2/load_balancer.go +++ b/internal/service/elbv2/load_balancer.go @@ -287,6 +287,13 @@ func resourceLoadBalancer() *schema.Resource { Default: false, DiffSuppressFunc: suppressIfLBTypeNot(awstypes.LoadBalancerTypeEnumApplication), }, + "secondary_ips_auto_assigned_per_subnet": { + Type: schema.TypeInt, + Optional: true, + Default: 0, + DiffSuppressFunc: suppressIfLBTypeNot(awstypes.LoadBalancerTypeEnumNetwork), + ValidateFunc: validation.IntBetween(0, 7), + }, names.AttrSecurityGroups: { Type: schema.TypeSet, Optional: true, @@ -899,6 +906,11 @@ var loadBalancerAttributes = loadBalancerAttributeMap(map[string]loadBalancerAtt tfType: schema.TypeBool, loadBalancerTypesSupported: []awstypes.LoadBalancerTypeEnum{awstypes.LoadBalancerTypeEnumApplication}, }, + "secondary_ips_auto_assigned_per_subnet": { + apiAttributeKey: loadBalancerAttributeSecondaryIPsAutoAssignedPerSubnet, + tfType: schema.TypeInt, + loadBalancerTypesSupported: []awstypes.LoadBalancerTypeEnum{awstypes.LoadBalancerTypeEnumNetwork}, + }, "xff_header_processing_mode": { apiAttributeKey: loadBalancerAttributeRoutingHTTPXFFHeaderProcessingMode, tfType: schema.TypeString, @@ -1280,6 +1292,7 @@ func customizeDiffLoadBalancerNLB(_ context.Context, diff *schema.ResourceDiff, // - there are subnet removals // OR security groups are being added where none currently exist // OR all security groups are being removed + // OR secondary IPv4 addresses are being decreased // // Any other combination should be treated as normal. At this time, subnet // handling is the only known difference between Network Load Balancers and @@ -1360,6 +1373,21 @@ func customizeDiffLoadBalancerNLB(_ context.Context, diff *schema.ResourceDiff, } } + // Get diff for secondary IPv4 addresses + if diff.HasChange("secondary_ips_auto_assigned_per_subnet") { + if v := config.GetAttr("secondary_ips_auto_assigned_per_subnet"); v.IsWhollyKnown() { + o, n := diff.GetChange("secondary_ips_auto_assigned_per_subnet") + oldCount, newCount := o.(int), n.(int) + + // Force new if secondary IPv4 address count is decreased + if newCount < oldCount { + if err := diff.ForceNew("secondary_ips_auto_assigned_per_subnet"); err != nil { + return err + } + } + } + } + return nil } diff --git a/internal/service/elbv2/load_balancer_test.go b/internal/service/elbv2/load_balancer_test.go index 70475e6495c9..4d96547035bb 100644 --- a/internal/service/elbv2/load_balancer_test.go +++ b/internal/service/elbv2/load_balancer_test.go @@ -2059,6 +2059,56 @@ func TestAccELBV2LoadBalancer_NetworkLoadBalancer_deleteSubnetMapping(t *testing }) } +func TestAccELBV2LoadBalancer_NetworkLoadBalancer_secondaryIPAddresses(t *testing.T) { + ctx := acctest.Context(t) + var pre, mid, post awstypes.LoadBalancer + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_lb.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + // GovCloud Regions don't always have 3 AZs. + acctest.PreCheckPartitionNot(t, endpoints.AwsUsGovPartitionID) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLoadBalancerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLoadBalancerConfig_nlbBasic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLoadBalancerExists(ctx, resourceName, &pre), + resource.TestCheckResourceAttr(resourceName, "secondary_ips_auto_assigned_per_subnet", "0"), + ), + }, + { + Config: testAccLoadBalancerConfig_nlbSecondaryIPAddresses(rName, 3, 7), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLoadBalancerExists(ctx, resourceName, &mid), + // Increasing secondary IP count should not force recreation + testAccCheckLoadBalancerNotRecreated(&pre, &mid), + resource.TestCheckResourceAttr(resourceName, "secondary_ips_auto_assigned_per_subnet", "7"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccLoadBalancerConfig_nlbSecondaryIPAddresses(rName, 3, 3), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLoadBalancerExists(ctx, resourceName, &post), + // Decreasing secondary IP count should force recreation + testAccCheckLoadBalancerRecreated(&mid, &post), + resource.TestCheckResourceAttr(resourceName, "secondary_ips_auto_assigned_per_subnet", "3"), + ), + }, + }, + }) +} + func TestAccELBV2LoadBalancer_updateDesyncMitigationMode(t *testing.T) { ctx := acctest.Context(t) var pre, mid, post awstypes.LoadBalancer @@ -3007,6 +3057,30 @@ func testAccLoadBalancerConfig_nlbZonalShift(rName string, zs bool) string { return testAccLoadBalancerConfig_nlbSubnetMappingCount(rName, true, zs, 1) } +func testAccLoadBalancerConfig_nlbSecondaryIPAddresses(rName string, subnetCount, addressCount int) string { + return acctest.ConfigCompose(acctest.ConfigVPCWithSubnets(rName, subnetCount), fmt.Sprintf(` +resource "aws_lb" "test" { + name = %[1]q + internal = true + load_balancer_type = "network" + + enable_deletion_protection = false + secondary_ips_auto_assigned_per_subnet = %[2]d + + dynamic "subnet_mapping" { + for_each = aws_subnet.test[*] + content { + subnet_id = subnet_mapping.value.id + } + } + + tags = { + Name = %[1]q + } +} +`, rName, addressCount)) +} + func testAccLoadBalancerConfig_nlbSubnetMappingCount(rName string, cz, zs bool, subnetCount int) string { return acctest.ConfigCompose(acctest.ConfigVPCWithSubnets(rName, subnetCount), fmt.Sprintf(` resource "aws_lb" "test" { diff --git a/website/docs/r/lb.html.markdown b/website/docs/r/lb.html.markdown index 8d740d37bf72..4c08f55c5eaa 100644 --- a/website/docs/r/lb.html.markdown +++ b/website/docs/r/lb.html.markdown @@ -123,6 +123,7 @@ This resource supports the following arguments: * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `security_groups` - (Optional) List of security group IDs to assign to the LB. Only valid for Load Balancers of type `application` or `network`. For load balancers of type `network` security groups cannot be added if none are currently present, and cannot all be removed once added. If either of these conditions are met, this will force a recreation of the resource. * `preserve_host_header` - (Optional) Whether the Application Load Balancer should preserve the Host header in the HTTP request and send it to the target without any change. Defaults to `false`. +* `secondary_ips_auto_assigned_per_subnet` - (Optional) The number of secondary IP addresses to configure for your load balancer nodes. Only valid for Load Balancers of type `network`. The valid range is 0-7. When decreased, this will force a recreation of the resource. Default: `0`. * `subnet_mapping` - (Optional) Subnet mapping block. See below. For Load Balancers of type `network` subnet mappings can only be added. * `subnets` - (Optional) List of subnet IDs to attach to the LB. For Load Balancers of type `network` subnets can only be added (see [Availability Zones](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/network-load-balancers.html#availability-zones)), deleting a subnet for load balancers of type `network` will force a recreation of the resource. * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From 7062213abb578d89d79770b302f8044029346054 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 4 Aug 2025 12:16:54 -0400 Subject: [PATCH 0081/2115] r/aws_cognito_managed_login_branding: New resource. --- .../cognitoidp/managed_login_branding.go | 292 ++++++++++++++++++ .../service/cognitoidp/service_package_gen.go | 6 + 2 files changed, 298 insertions(+) create mode 100644 internal/service/cognitoidp/managed_login_branding.go diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go new file mode 100644 index 000000000000..da9c712cd79d --- /dev/null +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -0,0 +1,292 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package cognitoidp + +import ( + "context" + "fmt" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/document" + awstypes "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" + "github.com/hashicorp/terraform-plugin-framework-validators/boolvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @FrameworkResource("aws_cognito_managed_login_branding", name="Managed Login Branding") +func newManagedLoginBrandingResource(context.Context) (resource.ResourceWithConfigure, error) { + r := &managedLoginBrandingResource{} + + return r, nil +} + +type managedLoginBrandingResource struct { + framework.ResourceWithModel[managedLoginBrandingResourceModel] +} + +func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + names.AttrClientID: schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "managed_login_branding_id": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "settings": schema.StringAttribute{ + CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), + Optional: true, + }, + "use_cognito_provided_values": schema.BoolAttribute{ + Optional: true, + Validators: []validator.Bool{ + boolvalidator.ConflictsWith( + path.MatchRoot("asset"), + path.MatchRoot("settings"), + ), + }, + }, + names.AttrUserPoolID: schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + Blocks: map[string]schema.Block{ + "asset": schema.SetNestedBlock{ + CustomType: fwtypes.NewSetNestedObjectTypeOf[assetTypeModel](ctx), + Validators: []validator.Set{ + setvalidator.SizeBetween(0, 40), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "bytes": schema.StringAttribute{ + Optional: true, + }, + "category": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.AssetCategoryType](), + Required: true, + }, + "color_mode": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.ColorSchemeModeType](), + Required: true, + }, + "extension": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.AssetExtensionType](), + Required: true, + }, + "resource_id": schema.StringAttribute{ + Optional: true, + }, + }, + }, + }, + }, + } +} + +func (r *managedLoginBrandingResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data managedLoginBrandingResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().CognitoIDPClient(ctx) + + var input cognitoidentityprovider.CreateManagedLoginBrandingInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { + return + } + + output, err := conn.CreateManagedLoginBranding(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating Cognito Managed Login Branding (%s)", data.ClientID.ValueString()), err.Error()) + + return + } + + // Set values for unknowns. + mlb := output.ManagedLoginBranding + data.ManagedLoginBrandingID = fwflex.StringToFramework(ctx, mlb.ManagedLoginBrandingId) + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *managedLoginBrandingResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data managedLoginBrandingResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().CognitoIDPClient(ctx) + + mlb, err := findManagedLoginBrandingByTwoPartKey(ctx, conn, data.UserPoolID.ValueString(), data.ManagedLoginBrandingID.ValueString()) + + if tfresource.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", data.ManagedLoginBrandingID.ValueString()), err.Error()) + + return + } + + // Set attributes for import. + response.Diagnostics.Append(fwflex.Flatten(ctx, mlb, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *managedLoginBrandingResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var old, new managedLoginBrandingResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().CognitoIDPClient(ctx) + + var input cognitoidentityprovider.UpdateManagedLoginBrandingInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { + return + } + + _, err := conn.UpdateManagedLoginBranding(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("updating Cognito Managed Login Branding (%s)", new.ManagedLoginBrandingID.ValueString()), err.Error()) + + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &new)...) +} + +func (r *managedLoginBrandingResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data managedLoginBrandingResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().CognitoIDPClient(ctx) + + tflog.Debug(ctx, "deleting Cognito Managed Login Branding", map[string]any{ + "managed_login_branding_id": data.ManagedLoginBrandingID.ValueString(), + names.AttrUserPoolID: data.UserPoolID.ValueString(), + }) + input := cognitoidentityprovider.DeleteManagedLoginBrandingInput{ + ManagedLoginBrandingId: fwflex.StringFromFramework(ctx, data.ManagedLoginBrandingID), + UserPoolId: fwflex.StringFromFramework(ctx, data.UserPoolID), + } + _, err := conn.DeleteManagedLoginBranding(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting Cognito Managed Login Branding (%s)", data.ManagedLoginBrandingID.ValueString()), err.Error()) + + return + } +} + +func (r *managedLoginBrandingResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + parts := strings.Split(request.ID, "/") + if len(parts) != 2 { + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(fmt.Errorf("wrong format of import ID (%s), use: 'user-pool-id/managed-login-branding-id'", request.ID))) + + return + } + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrUserPoolID), parts[0])...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("managed_login_branding_id"), parts[1])...) +} + +func findManagedLoginBrandingByTwoPartKey(ctx context.Context, conn *cognitoidentityprovider.Client, userPoolID, managedLoginBrandingID string) (*awstypes.ManagedLoginBrandingType, error) { + input := cognitoidentityprovider.DescribeManagedLoginBrandingInput{ + ManagedLoginBrandingId: aws.String(managedLoginBrandingID), + ReturnMergedResources: false, // Return only customized values. + UserPoolId: aws.String(userPoolID), + } + + output, err := conn.DescribeManagedLoginBranding(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.ManagedLoginBranding == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.ManagedLoginBranding, nil +} + +type managedLoginBrandingResourceModel struct { + framework.WithRegionModel + Asset fwtypes.SetNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` + ClientID types.String `tfsdk:"client_id"` + ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` + Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` + UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` + UserPoolID types.String `tfsdk:"user_pool_id"` +} + +type assetTypeModel struct { + Bytes types.String `tfsdk:"bytes"` + Category fwtypes.StringEnum[awstypes.AssetCategoryType] `tfsdk:"category"` + ColorMode fwtypes.StringEnum[awstypes.ColorSchemeModeType] `tfsdk:"color_mode"` + Extension fwtypes.StringEnum[awstypes.AssetExtensionType] `tfsdk:"extension"` + ResourceID types.String `tfsdk:"resource_id"` +} diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index 46a883eb59da..33ee4e84546b 100644 --- a/internal/service/cognitoidp/service_package_gen.go +++ b/internal/service/cognitoidp/service_package_gen.go @@ -53,6 +53,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser WrappedImport: true, }, }, + { + Factory: newManagedLoginBrandingResource, + TypeName: "aws_cognito_managed_login_branding", + Name: "Managed Login Branding", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newManagedUserPoolClientResource, TypeName: "aws_cognito_managed_user_pool_client", From 690081b81c409c81930434e67492694cc795a731 Mon Sep 17 00:00:00 2001 From: Dave DeRicco <30156588+ddericco@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:27:41 +0000 Subject: [PATCH 0082/2115] Add changelog --- .changelog/43699.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43699.txt diff --git a/.changelog/43699.txt b/.changelog/43699.txt new file mode 100644 index 000000000000..a85f589e51ea --- /dev/null +++ b/.changelog/43699.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_lb: Add secondary_ips_auto_assigned_per_subnet argument for Network Load Balancer +``` \ No newline at end of file From 19db9fc02a33027571dbdf4dde5a4e12c5bd30e6 Mon Sep 17 00:00:00 2001 From: Dave DeRicco <30156588+ddericco@users.noreply.github.com> Date: Mon, 4 Aug 2025 18:17:15 +0000 Subject: [PATCH 0083/2115] Acceptance test linting --- internal/service/elbv2/load_balancer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elbv2/load_balancer_test.go b/internal/service/elbv2/load_balancer_test.go index 4d96547035bb..211a2e7bbbed 100644 --- a/internal/service/elbv2/load_balancer_test.go +++ b/internal/service/elbv2/load_balancer_test.go @@ -3064,7 +3064,7 @@ resource "aws_lb" "test" { internal = true load_balancer_type = "network" - enable_deletion_protection = false + enable_deletion_protection = false secondary_ips_auto_assigned_per_subnet = %[2]d dynamic "subnet_mapping" { From 7fc99ffc275a9807fb0884ab7fa71b3f38120809 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 4 Aug 2025 15:57:48 -0400 Subject: [PATCH 0084/2115] r/aws_cognito_managed_login_branding: Documentation. --- .../cognitoidp/managed_login_branding.go | 38 +++++---- ...gnito_managed_login_branding.markdown.html | 79 +++++++++++++++++++ 2 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 website/docs/r/cognito_managed_login_branding.markdown.html diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index da9c712cd79d..36dbb75adaad 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -6,14 +6,13 @@ package cognitoidp import ( "context" "fmt" - "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/document" awstypes "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" "github.com/hashicorp/terraform-plugin-framework-validators/boolvalidator" - "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -25,6 +24,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" @@ -65,6 +65,10 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou "use_cognito_provided_values": schema.BoolAttribute{ Optional: true, Validators: []validator.Bool{ + boolvalidator.ExactlyOneOf( + path.MatchRoot("settings"), + path.MatchRoot("use_cognito_provided_values"), + ), boolvalidator.ConflictsWith( path.MatchRoot("asset"), path.MatchRoot("settings"), @@ -79,10 +83,10 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou }, }, Blocks: map[string]schema.Block{ - "asset": schema.SetNestedBlock{ - CustomType: fwtypes.NewSetNestedObjectTypeOf[assetTypeModel](ctx), - Validators: []validator.Set{ - setvalidator.SizeBetween(0, 40), + "asset": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[assetTypeModel](ctx), + Validators: []validator.List{ + listvalidator.SizeBetween(0, 40), }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ @@ -235,9 +239,13 @@ func (r *managedLoginBrandingResource) Delete(ctx context.Context, request resou } func (r *managedLoginBrandingResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { - parts := strings.Split(request.ID, "/") - if len(parts) != 2 { - response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(fmt.Errorf("wrong format of import ID (%s), use: 'user-pool-id/managed-login-branding-id'", request.ID))) + const ( + managedLoginBrandingIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, managedLoginBrandingIDParts, true) + + if err != nil { + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(err)) return } @@ -275,12 +283,12 @@ func findManagedLoginBrandingByTwoPartKey(ctx context.Context, conn *cognitoiden type managedLoginBrandingResourceModel struct { framework.WithRegionModel - Asset fwtypes.SetNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` - ClientID types.String `tfsdk:"client_id"` - ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` - Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` - UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` - UserPoolID types.String `tfsdk:"user_pool_id"` + Asset fwtypes.ListNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` + ClientID types.String `tfsdk:"client_id"` + ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` + Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` + UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` + UserPoolID types.String `tfsdk:"user_pool_id"` } type assetTypeModel struct { diff --git a/website/docs/r/cognito_managed_login_branding.markdown.html b/website/docs/r/cognito_managed_login_branding.markdown.html new file mode 100644 index 000000000000..67f0978c2fd0 --- /dev/null +++ b/website/docs/r/cognito_managed_login_branding.markdown.html @@ -0,0 +1,79 @@ +--- +subcategory: "Cognito IDP (Identity Provider)" +layout: "aws" +page_title: "AWS: aws_cognito_managed_login_branding" +description: |- + Manages branding settings for a user pool style and associates it with an app client. +--- + +# Resource: aws_cognito_managed_login_branding + +Manages branding settings for a user pool style and associates it with an app client. + +## Example Usage + +### Default Branding Style + +```terraform +resource "aws_cognito_managed_login_branding" "client" { + client_id = aws_cognito_user_pool_client.example.id + user_pool_id = aws_cognito_user_pool.example.id + + use_cognito_provided_values = true +} +``` + +### Custom Branding Style + +```terraform +resource "aws_cognito_managed_login_branding" "client" { + client_id = aws_cognito_user_pool_client.example.id + user_pool_id = aws_cognito_user_pool.example.id + +} +``` + +## Argument Reference + +The following arguments are required: + +* `client_id` - (Required) App client that the branding style is for. +* `user_pool_id` - (Required) User pool the client belongs to. + +The following arguments are optional: + +* `asset` - (Optional) Image files to apply to roles like backgrounds, logos, and icons. See [details below](#asset). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `settings` - (Optional) JSON document with the the settings to apply to the style. +* `use_cognito_provided_values` - (Optional) When `true`, applies the default branding style options. + +### asset + +* `bytes` - (Optional) Image file, in Base64-encoded binary. +* `category` - (Required) Category that the image corresponds to. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Category) for valid values. +* `color_mode` - (Required) Display-mode target of the asset. Valid values: `LIGHT`, `DARK`, `DYNAMIC`. +* `extensions` - (Required) File type of the image file. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Extension) for valid values. +* `resource_id` - (Optional) Asset ID. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `managed_login_branding_id` - ID of the managed login branding style. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Cognito branding settings using `user_pool_id` and `managed_login_branding_id` separated by `,`. For example: + +```terraform +import { + to = aws_cognito_managed_login_branding.example + id = "us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd" +} +``` + +Using `terraform import`, import Cognito branding settings using `user_pool_id` and `managed_login_branding_id` separated by `,`. For example: + +```console +% terraform import aws_cognito_managed_login_branding.example us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd +``` From 201428acb36a9b41aa9fb0060979f47c7d410974 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 4 Aug 2025 16:07:50 -0400 Subject: [PATCH 0085/2115] Update prefixes for 'cognitoidp' resource names. --- .github/labeler-issue-triage.yml | 2 +- .github/labeler-pr-triage.yml | 5 +++-- names/data/names_data.hcl | 14 +++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml index 72e963ea2033..7dd92befe19f 100644 --- a/.github/labeler-issue-triage.yml +++ b/.github/labeler-issue-triage.yml @@ -170,7 +170,7 @@ service/codestarnotifications: service/cognitoidentity: - '((\*|-)\s*`?|(data|resource)\s+"?)aws_cognito_identity_(?!provider)' service/cognitoidp: - - '((\*|-)\s*`?|(data|resource)\s+"?)aws_cognito_(identity_provider|resource|user|risk|log)' + - '((\*|-)\s*`?|(data|resource)\s+"?)aws_cognito_(identity_provider|log|managed_login_branding|managed_user|resource|risk|user)' service/cognitosync: - '((\*|-)\s*`?|(data|resource)\s+"?)aws_cognitosync_' service/comprehend: diff --git a/.github/labeler-pr-triage.yml b/.github/labeler-pr-triage.yml index ff2b9384a0a3..023bca0872d6 100644 --- a/.github/labeler-pr-triage.yml +++ b/.github/labeler-pr-triage.yml @@ -556,11 +556,12 @@ service/cognitoidp: - any-glob-to-any-file: - 'internal/service/cognitoidp/**/*' - 'website/**/cognito_identity_provider*' + - 'website/**/cognito_log*' + - 'website/**/cognito_managed_login_branding*' - 'website/**/cognito_managed_user*' - 'website/**/cognito_resource_*' - - 'website/**/cognito_user*' - 'website/**/cognito_risk*' - - 'website/**/cognito_log*' + - 'website/**/cognito_user*' service/cognitosync: - any: - changed-files: diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index f0f9bf00cb8e..4fa4e4e619c0 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -2068,13 +2068,21 @@ service "cognitoidp" { } resource_prefix { - actual = "aws_cognito_(identity_provider|resource|user|risk|log)" + actual = "aws_cognito_(identity_provider|log|managed_login_branding|managed_user|resource|risk|user)" correct = "aws_cognitoidp_" } provider_package_correct = "cognitoidp" - doc_prefix = ["cognito_identity_provider", "cognito_managed_user", "cognito_resource_", "cognito_user", "cognito_risk", "cognito_log"] - brand = "AWS" + doc_prefix = [ + "cognito_identity_provider", + "cognito_log", + "cognito_managed_login_branding", + "cognito_managed_user", + "cognito_resource_", + "cognito_risk", + "cognito_user" + ] + brand = "AWS" } service "cognitosync" { From a6d7b9b70d71536e4cc4177845b0164985267e68 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 4 Aug 2025 16:11:38 -0400 Subject: [PATCH 0086/2115] r/aws_cognito_managed_login_branding: Update example. --- .../r/cognito_managed_login_branding.markdown.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/docs/r/cognito_managed_login_branding.markdown.html b/website/docs/r/cognito_managed_login_branding.markdown.html index 67f0978c2fd0..3f83602276e3 100644 --- a/website/docs/r/cognito_managed_login_branding.markdown.html +++ b/website/docs/r/cognito_managed_login_branding.markdown.html @@ -30,6 +30,16 @@ client_id = aws_cognito_user_pool_client.example.id user_pool_id = aws_cognito_user_pool.example.id + asset { + bytes = filebase64("login_branding_asset.svg") + category = "PAGE_HEADER_BACKGROUND" + color_mode = "DARK" + extension = "SVG" + } + + settings = jsonencode({ + # Your settings here. + }) } ``` From 242ff5a74f921715d9f768dfe15689483eda6087 Mon Sep 17 00:00:00 2001 From: Andrew Tulloch Date: Tue, 5 Aug 2025 10:33:33 +0100 Subject: [PATCH 0087/2115] Changelog --- .changelog/43708.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43708.txt diff --git a/.changelog/43708.txt b/.changelog/43708.txt new file mode 100644 index 000000000000..a7ce91e1dbc1 --- /dev/null +++ b/.changelog/43708.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_nat_gateway: Fix inconsistent final plan for `secondary_private_ip_addresses` +``` From ba5207397ea144437ef013574666dcb0710a35ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 5 Aug 2025 14:03:09 -0400 Subject: [PATCH 0088/2115] 'use_cognito_provided_values' is Computed. --- .../service/cognitoidp/managed_login_branding.go | 7 ++++++- .../test-fixtures/login_branding_asset.svg | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 internal/service/cognitoidp/test-fixtures/login_branding_asset.svg diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 36dbb75adaad..b4fb4c33509a 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" @@ -64,16 +65,19 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou }, "use_cognito_provided_values": schema.BoolAttribute{ Optional: true, + Computed: true, Validators: []validator.Bool{ boolvalidator.ExactlyOneOf( path.MatchRoot("settings"), - path.MatchRoot("use_cognito_provided_values"), ), boolvalidator.ConflictsWith( path.MatchRoot("asset"), path.MatchRoot("settings"), ), }, + PlanModifiers: []planmodifier.Bool{ + boolplanmodifier.UseStateForUnknown(), + }, }, names.AttrUserPoolID: schema.StringAttribute{ Required: true, @@ -141,6 +145,7 @@ func (r *managedLoginBrandingResource) Create(ctx context.Context, request resou // Set values for unknowns. mlb := output.ManagedLoginBranding data.ManagedLoginBrandingID = fwflex.StringToFramework(ctx, mlb.ManagedLoginBrandingId) + data.UseCognitoProvidedValues = fwflex.BoolValueToFramework(ctx, mlb.UseCognitoProvidedValues) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } diff --git a/internal/service/cognitoidp/test-fixtures/login_branding_asset.svg b/internal/service/cognitoidp/test-fixtures/login_branding_asset.svg new file mode 100644 index 000000000000..ce0d19364a59 --- /dev/null +++ b/internal/service/cognitoidp/test-fixtures/login_branding_asset.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 1d3bf6d7e896e10dcbb7655cc7ae420cade2a622 Mon Sep 17 00:00:00 2001 From: Dave DeRicco <30156588+ddericco@users.noreply.github.com> Date: Wed, 6 Aug 2025 18:59:13 +0000 Subject: [PATCH 0089/2115] Add DNS and SG referencing support for VPC attachments --- .../service/networkmanager/vpc_attachment.go | 50 +++++++++++- .../networkmanager/vpc_attachment_test.go | 78 ++++++++++++++++++- ...etworkmanager_vpc_attachment.html.markdown | 19 +++++ 3 files changed, 141 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 56085348cc1b..0a816a952c27 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -71,6 +71,34 @@ func resourceVPCAttachment() *schema.Resource { } return nil }, + func(ctx context.Context, d *schema.ResourceDiff, meta any) error { + if d.Id() == "" { + return nil + } + + if !d.HasChange("options.0.dns_support") { + return nil + } + + if state := awstypes.AttachmentState(d.Get(names.AttrState).(string)); state == awstypes.AttachmentStatePendingAttachmentAcceptance { + return d.ForceNew("options.0.dns_support") + } + return nil + }, + func(ctx context.Context, d *schema.ResourceDiff, meta any) error { + if d.Id() == "" { + return nil + } + + if !d.HasChange("options.0.security_group_referencing_support") { + return nil + } + + if state := awstypes.AttachmentState(d.Get(names.AttrState).(string)); state == awstypes.AttachmentStatePendingAttachmentAcceptance { + return d.ForceNew("options.0.security_group_referencing_support") + } + return nil + }, ), Timeouts: &schema.ResourceTimeout{ @@ -115,10 +143,18 @@ func resourceVPCAttachment() *schema.Resource { Type: schema.TypeBool, Optional: true, }, + "dns_support": { + Type: schema.TypeBool, + Optional: true, + }, "ipv6_support": { Type: schema.TypeBool, Optional: true, }, + "security_group_referencing_support": { + Type: schema.TypeBool, + Optional: true, + }, }, }, DiffSuppressFunc: verify.SuppressMissingOptionalConfigurationBlock, @@ -485,10 +521,18 @@ func expandVpcOptions(tfMap map[string]any) *awstypes.VpcOptions { // nosemgrep: apiObject.ApplianceModeSupport = aws.Bool(v) } + if v, ok := tfMap["dns_support"].(bool); ok { + apiObject.DnsSupport = aws.Bool(v) + } + if v, ok := tfMap["ipv6_support"].(bool); ok { apiObject.Ipv6Support = aws.Bool(v) } + if v, ok := tfMap["security_group_referencing_support"].(bool); ok { + apiObject.SecurityGroupReferencingSupport = aws.Bool(v) + } + return apiObject } @@ -498,8 +542,10 @@ func flattenVpcOptions(apiObject *awstypes.VpcOptions) map[string]any { // nosem } tfMap := map[string]any{ - "appliance_mode_support": aws.ToBool(apiObject.ApplianceModeSupport), - "ipv6_support": aws.ToBool(apiObject.Ipv6Support), + "appliance_mode_support": aws.ToBool(apiObject.ApplianceModeSupport), + "dns_support": aws.ToBool(apiObject.DnsSupport), + "ipv6_support": aws.ToBool(apiObject.Ipv6Support), + "security_group_referencing_support": aws.ToBool(apiObject.SecurityGroupReferencingSupport), } return tfMap diff --git a/internal/service/networkmanager/vpc_attachment_test.go b/internal/service/networkmanager/vpc_attachment_test.go index 825880529321..87f2a514214b 100644 --- a/internal/service/networkmanager/vpc_attachment_test.go +++ b/internal/service/networkmanager/vpc_attachment_test.go @@ -70,7 +70,9 @@ func TestAccNetworkManagerVPCAttachment_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtFalse), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), @@ -136,7 +138,9 @@ func TestAccNetworkManagerVPCAttachment_Attached_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtFalse), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), @@ -465,6 +469,49 @@ func TestAccNetworkManagerVPCAttachment_Attached_update(t *testing.T) { } } +func TestAccNetworkManagerVPCAttachment_attachmentOptions(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.VpcAttachment + resourceName := "aws_networkmanager_vpc_attachment.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.NetworkManagerServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckVPCAttachmentDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccVPCAttachmentConfig_attachmentOptions(rName, false, true, false, true, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckVPCAttachmentExists(ctx, resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtTrue), + ), + }, + { + Config: testAccVPCAttachmentConfig_attachmentOptions(rName, true, false, true, false, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckVPCAttachmentExists(ctx, resourceName, &v), + resource.TestCheckResourceAttr(resourceName, "options.#", "1"), + resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtFalse), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckVPCAttachmentExists(ctx context.Context, n string, v *awstypes.VpcAttachment) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -567,8 +614,10 @@ resource "aws_networkmanager_vpc_attachment" "test" { vpc_arn = aws_vpc.test.arn options { - appliance_mode_support = %[3]t - ipv6_support = %[4]t + appliance_mode_support = %[3]t + dns_support = false + ipv6_support = %[4]t + security_group_referencing_support = false } } `, rName, nSubnets, applianceModeSupport, ipv6Support)) @@ -584,8 +633,10 @@ resource "aws_networkmanager_vpc_attachment" "test" { vpc_arn = aws_vpc.test.arn options { - appliance_mode_support = %[3]t - ipv6_support = %[4]t + appliance_mode_support = %[3]t + dns_support = false + ipv6_support = %[4]t + security_group_referencing_support = false } } @@ -659,3 +710,22 @@ data "aws_networkmanager_core_network_policy_document" "test" { } `, rName, requireAcceptance)) } + +func testAccVPCAttachmentConfig_attachmentOptions(rName string, applianceModeSupport, dnsSupport, ipv6Support, securityGroupReferencingSupport bool, requireAcceptance bool) string { + return acctest.ConfigCompose( + testAccVPCAttachmentConfig_base(rName, requireAcceptance), + fmt.Sprintf(` +resource "aws_networkmanager_vpc_attachment" "test" { + subnet_arns = aws_subnet.test[*].arn + core_network_id = aws_networkmanager_core_network_policy_attachment.test.core_network_id + vpc_arn = aws_vpc.test.arn + + options { + appliance_mode_support = %[2]t + dns_support = %[3]t + ipv6_support = %[4]t + security_group_referencing_support = %[5]t + } +} +`, rName, applianceModeSupport, dnsSupport, ipv6Support, securityGroupReferencingSupport)) +} diff --git a/website/docs/r/networkmanager_vpc_attachment.html.markdown b/website/docs/r/networkmanager_vpc_attachment.html.markdown index 9ba65fb0428d..5dec7a754e1a 100644 --- a/website/docs/r/networkmanager_vpc_attachment.html.markdown +++ b/website/docs/r/networkmanager_vpc_attachment.html.markdown @@ -22,6 +22,23 @@ resource "aws_networkmanager_vpc_attachment" "example" { } ``` +### Usage with Options + +```terraform +resource "aws_networkmanager_vpc_attachment" "example" { + subnet_arns = [aws_subnet.example.arn] + core_network_id = awscc_networkmanager_core_network.example.id + vpc_arn = aws_vpc.example.arn + + options { + appliance_mode_support = false + dns_support = true + ipv6_support = false + security_group_referencing_support = true + } +} +``` + ## Argument Reference The following arguments are required: @@ -38,7 +55,9 @@ The following arguments are optional: ### options * `appliance_mode_support` - (Optional) Whether to enable appliance mode support. If enabled, traffic flow between a source and destination use the same Availability Zone for the VPC attachment for the lifetime of that flow. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `dns_support` - (Optional) Whether to enable DNS support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. * `ipv6_support` - (Optional) Whether to enable IPv6 support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `security_group_referencing_support` - (Optional) Whether to enable security group referencing support for this VPC attachment. The default is `true`. However, at the core network policy-level the default is set to `false`. If the VPC attachment is pending acceptance, changing this value will recreate the resource. ## Attribute Reference From 2b601cf041fd13d36426c3572719d80cb7e9624a Mon Sep 17 00:00:00 2001 From: Dave DeRicco <30156588+ddericco@users.noreply.github.com> Date: Wed, 6 Aug 2025 19:04:16 +0000 Subject: [PATCH 0090/2115] Add changelog --- .changelog/43742.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43742.txt diff --git a/.changelog/43742.txt b/.changelog/43742.txt new file mode 100644 index 000000000000..a58c334857d7 --- /dev/null +++ b/.changelog/43742.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_networkmanager_vpc_attachment: Add dns_support and security_group_referencing_support arguments +``` \ No newline at end of file From 001304daa21041ce7669697d1bd6a337c22b2575 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 7 Aug 2025 14:57:25 -0400 Subject: [PATCH 0091/2115] Change import alias. --- internal/framework/types/smithy_json.go | 22 ++++++------ internal/framework/types/smithy_json_test.go | 38 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index 83e792a91816..916757129329 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -14,19 +14,19 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) var ( - _ basetypes.StringTypable = (*SmithyJSONType[smithyjson.JSONStringer])(nil) + _ basetypes.StringTypable = (*SmithyJSONType[tfjson.JSONStringer])(nil) ) -type SmithyJSONType[T smithyjson.JSONStringer] struct { +type SmithyJSONType[T tfjson.JSONStringer] struct { basetypes.StringType f func(any) T } -func NewSmithyJSONType[T smithyjson.JSONStringer](_ context.Context, f func(any) T) SmithyJSONType[T] { +func NewSmithyJSONType[T tfjson.JSONStringer](_ context.Context, f func(any) T) SmithyJSONType[T] { return SmithyJSONType[T]{ f: f, } @@ -95,12 +95,12 @@ func (t SmithyJSONType[T]) ValueFromString(ctx context.Context, in basetypes.Str } var ( - _ basetypes.StringValuable = (*SmithyJSON[smithyjson.JSONStringer])(nil) - _ basetypes.StringValuableWithSemanticEquals = (*SmithyJSON[smithyjson.JSONStringer])(nil) - _ xattr.ValidateableAttribute = (*SmithyJSON[smithyjson.JSONStringer])(nil) + _ basetypes.StringValuable = (*SmithyJSON[tfjson.JSONStringer])(nil) + _ basetypes.StringValuableWithSemanticEquals = (*SmithyJSON[tfjson.JSONStringer])(nil) + _ xattr.ValidateableAttribute = (*SmithyJSON[tfjson.JSONStringer])(nil) ) -type SmithyJSON[T smithyjson.JSONStringer] struct { +type SmithyJSON[T tfjson.JSONStringer] struct { basetypes.StringValue f func(any) T } @@ -180,19 +180,19 @@ func (v SmithyJSON[T]) StringSemanticEquals(ctx context.Context, newValuable bas return result, diags } -func SmithyJSONValue[T smithyjson.JSONStringer](value string, f func(any) T) SmithyJSON[T] { +func SmithyJSONValue[T tfjson.JSONStringer](value string, f func(any) T) SmithyJSON[T] { return SmithyJSON[T]{ StringValue: basetypes.NewStringValue(value), f: f, } } -func SmithyJSONNull[T smithyjson.JSONStringer]() SmithyJSON[T] { +func SmithyJSONNull[T tfjson.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ StringValue: basetypes.NewStringNull(), } } -func SmithyJSONUnknown[T smithyjson.JSONStringer]() SmithyJSON[T] { +func SmithyJSONUnknown[T tfjson.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ StringValue: basetypes.NewStringUnknown(), } diff --git a/internal/framework/types/smithy_json_test.go b/internal/framework/types/smithy_json_test.go index ca45f243d932..0454132e78ab 100644 --- a/internal/framework/types/smithy_json_test.go +++ b/internal/framework/types/smithy_json_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr/xattr" "github.com/hashicorp/terraform-plugin-go/tftypes" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { @@ -25,19 +25,19 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { }{ "null value": { val: tftypes.NewValue(tftypes.String, nil), - expected: fwtypes.SmithyJSONNull[smithyjson.JSONStringer](), + expected: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { val: tftypes.NewValue(tftypes.String, tftypes.UnknownValue), - expected: fwtypes.SmithyJSONUnknown[smithyjson.JSONStringer](), + expected: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { val: tftypes.NewValue(tftypes.String, `{"test": "value"}`), - expected: fwtypes.SmithyJSONValue[smithyjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 + expected: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, "invalid SmithyJSON": { val: tftypes.NewValue(tftypes.String, "not ok"), - expected: fwtypes.SmithyJSONUnknown[smithyjson.JSONStringer](), + expected: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), }, } @@ -46,7 +46,7 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { t.Parallel() ctx := context.Background() - val, err := fwtypes.SmithyJSONType[smithyjson.JSONStringer]{}.ValueFromTerraform(ctx, test.val) + val, err := fwtypes.SmithyJSONType[tfjson.JSONStringer]{}.ValueFromTerraform(ctx, test.val) if err != nil { t.Fatalf("got unexpected error: %s", err) @@ -63,20 +63,20 @@ func TestSmithyJSONValidateAttribute(t *testing.T) { t.Parallel() tests := map[string]struct { - val fwtypes.SmithyJSON[smithyjson.JSONStringer] + val fwtypes.SmithyJSON[tfjson.JSONStringer] expectError bool }{ "null value": { - val: fwtypes.SmithyJSONNull[smithyjson.JSONStringer](), + val: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { - val: fwtypes.SmithyJSONUnknown[smithyjson.JSONStringer](), + val: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[smithyjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, "invalid SmithyJSON": { - val: fwtypes.SmithyJSONValue[smithyjson.JSONStringer]("not ok", nil), + val: fwtypes.SmithyJSONValue[tfjson.JSONStringer]("not ok", nil), expectError: true, }, } @@ -102,7 +102,7 @@ type testJSONDocument struct { Value any } -func newTestJSONDocument(v any) smithyjson.JSONStringer { +func newTestJSONDocument(v any) tfjson.JSONStringer { return &testJSONDocument{Value: v} } @@ -122,18 +122,18 @@ func TestSmithyJSONValueInterface(t *testing.T) { t.Parallel() tests := map[string]struct { - val fwtypes.SmithyJSON[smithyjson.JSONStringer] - expected smithyjson.JSONStringer + val fwtypes.SmithyJSON[tfjson.JSONStringer] + expected tfjson.JSONStringer expectError bool }{ "null value": { - val: fwtypes.SmithyJSONNull[smithyjson.JSONStringer](), + val: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { - val: fwtypes.SmithyJSONUnknown[smithyjson.JSONStringer](), + val: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[smithyjson.JSONStringer](`{"test": "value"}`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expected: &testJSONDocument{ Value: map[string]any{ "test": "value", @@ -141,13 +141,13 @@ func TestSmithyJSONValueInterface(t *testing.T) { }, }, "valid SmithyJSON slice": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[smithyjson.JSONStringer](`["value1","value"]`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`["value1","value"]`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expected: &testJSONDocument{ Value: []any{"value1", "value"}, }, }, "invalid SmithyJSON": { - val: fwtypes.SmithyJSONValue[smithyjson.JSONStringer]("not ok", newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.SmithyJSONValue[tfjson.JSONStringer]("not ok", newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expectError: true, }, } From 8a06d578dad21c3a62ac5a5b234e02c43c7d89ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 7 Aug 2025 16:56:41 -0400 Subject: [PATCH 0092/2115] Support more formats in 'SmithyDocumentFromString' and 'SmithyDocumentToString'. --- internal/json/smithy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/json/smithy.go b/internal/json/smithy.go index c1964f1ff5b5..3dafd0b5a097 100644 --- a/internal/json/smithy.go +++ b/internal/json/smithy.go @@ -8,7 +8,7 @@ import ( ) func SmithyDocumentFromString[T smithydocument.Marshaler](s string, f func(any) T) (T, error) { - var v map[string]any + var v any err := DecodeFromString(s, &v) if err != nil { @@ -21,7 +21,7 @@ func SmithyDocumentFromString[T smithydocument.Marshaler](s string, f func(any) // SmithyDocumentToString converts a [Smithy document](https://smithy.io/2.0/spec/simple-types.html#document) to a JSON string. func SmithyDocumentToString(document smithydocument.Unmarshaler) (string, error) { - var v map[string]any + var v any err := document.UnmarshalSmithyDocument(&v) if err != nil { From a10f96da2224b3fe13081bdb60cfe1d5bee11bf8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 7 Aug 2025 17:04:52 -0400 Subject: [PATCH 0093/2115] SmithyJSON -- use 'jsontypes.Normalized'. --- internal/framework/flex/auto_expand_test.go | 2 +- internal/framework/flex/auto_flatten_test.go | 4 +- .../types/list_nested_objectof_test.go | 4 +- internal/framework/types/objectof_test.go | 4 +- .../types/set_nested_objectof_test.go | 4 +- internal/framework/types/smithy_json.go | 85 ++++--------------- internal/framework/types/smithy_json_test.go | 32 +++---- 7 files changed, 41 insertions(+), 94 deletions(-) diff --git a/internal/framework/flex/auto_expand_test.go b/internal/framework/flex/auto_expand_test.go index bae2cac63e07..98049f9ffcd5 100644 --- a/internal/framework/flex/auto_expand_test.go +++ b/internal/framework/flex/auto_expand_test.go @@ -546,7 +546,7 @@ func TestExpand(t *testing.T) { }, }, "JSONValue Source to json interface Target": { - Source: &tfJSONStringer{Field1: fwtypes.SmithyJSONValue(`{"field1": "a"}`, newTestJSONDocument)}, + Source: &tfJSONStringer{Field1: fwtypes.NewSmithyJSONValue(`{"field1": "a"}`, newTestJSONDocument)}, Target: &awsJSONStringer{}, WantTarget: &awsJSONStringer{ Field1: &testJSONDocument{ diff --git a/internal/framework/flex/auto_flatten_test.go b/internal/framework/flex/auto_flatten_test.go index 3033900e9269..1018f9d2a2b6 100644 --- a/internal/framework/flex/auto_flatten_test.go +++ b/internal/framework/flex/auto_flatten_test.go @@ -4393,7 +4393,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { }, Target: &tfJSONStringer{}, WantTarget: &tfJSONStringer{ - Field1: fwtypes.SmithyJSONValue(`{"test":"a"}`, newTestJSONDocument), + Field1: fwtypes.NewSmithyJSONValue(`{"test":"a"}`, newTestJSONDocument), }, expectedLogLines: []map[string]any{ infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), @@ -4410,7 +4410,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { }, Target: &tfJSONStringer{}, WantTarget: &tfJSONStringer{ - Field1: fwtypes.SmithyJSONNull[smithyjson.JSONStringer](), + Field1: fwtypes.NewSmithyJSONNull[smithyjson.JSONStringer](), }, expectedLogLines: []map[string]any{ infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), diff --git a/internal/framework/types/list_nested_objectof_test.go b/internal/framework/types/list_nested_objectof_test.go index bfc20e143f62..1a1216557055 100644 --- a/internal/framework/types/list_nested_objectof_test.go +++ b/internal/framework/types/list_nested_objectof_test.go @@ -91,11 +91,11 @@ func TestListNestedObjectTypeOfValueFromTerraform(t *testing.T) { }, "valid value": { tfVal: objectAListValue, - wantVal: fwtypes.NewListNestedObjectValueOfPtrMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &objectA), }, "invalid Terraform value": { tfVal: objectBListValue, - wantVal: fwtypes.NewListNestedObjectValueOfPtrMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &objectA), wantErr: true, }, } diff --git a/internal/framework/types/objectof_test.go b/internal/framework/types/objectof_test.go index d210e86504a4..f405e45bf60b 100644 --- a/internal/framework/types/objectof_test.go +++ b/internal/framework/types/objectof_test.go @@ -94,11 +94,11 @@ func TestObjectTypeOfValueFromTerraform(t *testing.T) { }, "valid value": { tfVal: objectAValue, - wantVal: fwtypes.NewObjectValueOfMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewObjectValueOfMust(ctx, &objectA), }, "invalid Terraform value": { tfVal: objectBValue, - wantVal: fwtypes.NewObjectValueOfMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewObjectValueOfMust(ctx, &objectA), wantErr: true, }, } diff --git a/internal/framework/types/set_nested_objectof_test.go b/internal/framework/types/set_nested_objectof_test.go index 9ad63464ce08..aa0d318f240c 100644 --- a/internal/framework/types/set_nested_objectof_test.go +++ b/internal/framework/types/set_nested_objectof_test.go @@ -91,11 +91,11 @@ func TestSetNestedObjectTypeOfValueFromTerraform(t *testing.T) { }, "valid value": { tfVal: objectASetValue, - wantVal: fwtypes.NewSetNestedObjectValueOfPtrMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewSetNestedObjectValueOfPtrMust(ctx, &objectA), }, "invalid Terraform value": { tfVal: objectBSetValue, - wantVal: fwtypes.NewSetNestedObjectValueOfPtrMust[ObjectA](ctx, &objectA), + wantVal: fwtypes.NewSetNestedObjectValueOfPtrMust(ctx, &objectA), wantErr: true, }, } diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index 916757129329..1bc4f8200a32 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -5,7 +5,6 @@ package types import ( "context" - "encoding/json" "fmt" "github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes" @@ -22,7 +21,7 @@ var ( ) type SmithyJSONType[T tfjson.JSONStringer] struct { - basetypes.StringType + jsontypes.NormalizedType f func(any) T } @@ -45,29 +44,25 @@ func (t SmithyJSONType[T]) ValueType(context.Context) attr.Value { // Equal returns true if the given type is equivalent. func (t SmithyJSONType[T]) Equal(o attr.Type) bool { other, ok := o.(SmithyJSONType[T]) - if !ok { return false } - return t.StringType.Equal(other.StringType) + return t.NormalizedType.Equal(other.NormalizedType) } func (t SmithyJSONType[T]) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) { attrValue, err := t.StringType.ValueFromTerraform(ctx, in) - if err != nil { return nil, err } stringValue, ok := attrValue.(basetypes.StringValue) - if !ok { return nil, fmt.Errorf("unexpected value type of %T", attrValue) } stringValuable, diags := t.ValueFromString(ctx, stringValue) - if diags.HasError() { return nil, fmt.Errorf("unexpected error converting StringValue to StringValuable: %v", diags) } @@ -79,19 +74,14 @@ func (t SmithyJSONType[T]) ValueFromString(ctx context.Context, in basetypes.Str var diags diag.Diagnostics if in.IsNull() { - return SmithyJSONNull[T](), diags + return NewSmithyJSONNull[T](), diags } if in.IsUnknown() { - return SmithyJSONUnknown[T](), diags + return NewSmithyJSONUnknown[T](), diags } - var data any - if err := json.Unmarshal([]byte(in.ValueString()), &data); err != nil { - return SmithyJSONUnknown[T](), diags - } - - return SmithyJSONValue(in.ValueString(), t.f), diags + return NewSmithyJSONValue(in.ValueString(), t.f), diags } var ( @@ -101,31 +91,28 @@ var ( ) type SmithyJSON[T tfjson.JSONStringer] struct { - basetypes.StringValue + jsontypes.Normalized f func(any) T } func (v SmithyJSON[T]) Equal(o attr.Value) bool { other, ok := o.(SmithyJSON[T]) - if !ok { return false } - return v.StringValue.Equal(other.StringValue) + return v.Normalized.Equal(other.Normalized) } func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { var diags diag.Diagnostics var zero T - if v.IsNull() || v.IsUnknown() { + if v.IsNull() || v.IsUnknown() || v.f == nil { return zero, diags } - var data any - err := json.Unmarshal([]byte(v.ValueString()), &data) - + t, err := tfjson.SmithyDocumentFromString(v.ValueString(), v.f) if err != nil { diags.AddError( "JSON Unmarshal Error", @@ -136,64 +123,28 @@ func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { return zero, diags } - return v.f(data), diags + return t, diags } func (v SmithyJSON[T]) Type(context.Context) attr.Type { return SmithyJSONType[T]{} } -func (v SmithyJSON[T]) ValidateAttribute(ctx context.Context, req xattr.ValidateAttributeRequest, resp *xattr.ValidateAttributeResponse) { - if v.IsNull() || v.IsUnknown() { - return - } - - jsontypes.NewNormalizedValue(v.ValueString()).ValidateAttribute(ctx, req, resp) -} - -func (v SmithyJSON[T]) StringSemanticEquals(ctx context.Context, newValuable basetypes.StringValuable) (bool, diag.Diagnostics) { - var diags diag.Diagnostics - - oldString := jsontypes.NewNormalizedValue(v.ValueString()) - - newValue, ok := newValuable.(SmithyJSON[T]) - if !ok { - diags.AddError( - "Semantic Equality Check Error", - "An unexpected value type was received while performing semantic equality checks. "+ - "Please report this to the provider developers.\n\n"+ - "Expected Value Type: "+fmt.Sprintf("%T", v)+"\n"+ - "Got Value Type: "+fmt.Sprintf("%T", newValuable), - ) - - return false, diags - } - newString := jsontypes.NewNormalizedValue(newValue.ValueString()) - - result, err := oldString.StringSemanticEquals(ctx, newString) - diags.Append(err...) - - if diags.HasError() { - return false, diags - } - - return result, diags -} - -func SmithyJSONValue[T tfjson.JSONStringer](value string, f func(any) T) SmithyJSON[T] { +func NewSmithyJSONValue[T tfjson.JSONStringer](value string, f func(any) T) SmithyJSON[T] { return SmithyJSON[T]{ - StringValue: basetypes.NewStringValue(value), - f: f, + Normalized: jsontypes.NewNormalizedValue(value), + f: f, } } -func SmithyJSONNull[T tfjson.JSONStringer]() SmithyJSON[T] { + +func NewSmithyJSONNull[T tfjson.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ - StringValue: basetypes.NewStringNull(), + Normalized: jsontypes.NewNormalizedNull(), } } -func SmithyJSONUnknown[T tfjson.JSONStringer]() SmithyJSON[T] { +func NewSmithyJSONUnknown[T tfjson.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ - StringValue: basetypes.NewStringUnknown(), + Normalized: jsontypes.NewNormalizedUnknown(), } } diff --git a/internal/framework/types/smithy_json_test.go b/internal/framework/types/smithy_json_test.go index 0454132e78ab..d6423e691fa4 100644 --- a/internal/framework/types/smithy_json_test.go +++ b/internal/framework/types/smithy_json_test.go @@ -25,19 +25,15 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { }{ "null value": { val: tftypes.NewValue(tftypes.String, nil), - expected: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), + expected: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { val: tftypes.NewValue(tftypes.String, tftypes.UnknownValue), - expected: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), + expected: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { val: tftypes.NewValue(tftypes.String, `{"test": "value"}`), - expected: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 - }, - "invalid SmithyJSON": { - val: tftypes.NewValue(tftypes.String, "not ok"), - expected: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), + expected: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, } @@ -52,8 +48,8 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { t.Fatalf("got unexpected error: %s", err) } - if diff := cmp.Diff(val, test.expected); diff != "" { - t.Errorf("unexpected diff (+wanted, -got): %s", diff) + if got, want := val, test.expected; !got.Equal(want) { + t.Errorf("got %T %v, want %T %v", got, got, want, want) } }) } @@ -67,16 +63,16 @@ func TestSmithyJSONValidateAttribute(t *testing.T) { expectError bool }{ "null value": { - val: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { - val: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, "invalid SmithyJSON": { - val: fwtypes.SmithyJSONValue[tfjson.JSONStringer]("not ok", nil), + val: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer]("not ok", nil), expectError: true, }, } @@ -127,13 +123,13 @@ func TestSmithyJSONValueInterface(t *testing.T) { expectError bool }{ "null value": { - val: fwtypes.SmithyJSONNull[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), }, "unknown value": { - val: fwtypes.SmithyJSONUnknown[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.NewSmithyJSONValue(`{"test": "value"}`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expected: &testJSONDocument{ Value: map[string]any{ "test": "value", @@ -141,13 +137,13 @@ func TestSmithyJSONValueInterface(t *testing.T) { }, }, "valid SmithyJSON slice": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.SmithyJSONValue[tfjson.JSONStringer](`["value1","value"]`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.NewSmithyJSONValue(`["value1","value"]`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expected: &testJSONDocument{ Value: []any{"value1", "value"}, }, }, "invalid SmithyJSON": { - val: fwtypes.SmithyJSONValue[tfjson.JSONStringer]("not ok", newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.NewSmithyJSONValue("not ok", newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 expectError: true, }, } From c1b8b7c1d739c978469d336d2ca98c01927e826d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 12:20:48 -0400 Subject: [PATCH 0094/2115] Add 'internal/smithy' package. --- internal/framework/flex/auto_expand.go | 4 +-- internal/framework/flex/auto_expand_test.go | 4 +-- internal/framework/flex/auto_flatten.go | 6 ++-- internal/framework/flex/auto_flatten_test.go | 30 +++++++++---------- internal/framework/flex/autoflex_test.go | 12 ++++---- internal/framework/types/smithy_json.go | 24 +++++++-------- internal/framework/types/smithy_json_test.go | 30 +++++++++---------- internal/service/bedrockagent/flow.go | 6 ++-- internal/service/bedrockagent/prompt.go | 10 +++---- internal/service/controltower/landing_zone.go | 8 ++--- internal/smithy/README.md | 3 ++ internal/{json => smithy}/smithy.go | 7 +++-- 12 files changed, 74 insertions(+), 70 deletions(-) create mode 100644 internal/smithy/README.md rename internal/{json => smithy}/smithy.go (83%) diff --git a/internal/framework/flex/auto_expand.go b/internal/framework/flex/auto_expand.go index 67c40106e73e..1da137a715f0 100644 --- a/internal/framework/flex/auto_expand.go +++ b/internal/framework/flex/auto_expand.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfreflect "github.com/hashicorp/terraform-provider-aws/internal/reflect" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) // Expand = TF --> AWS @@ -487,7 +487,7 @@ func (expander autoExpander) string(ctx context.Context, vFrom basetypes.StringV } case reflect.Interface: - if s, ok := vFrom.(fwtypes.SmithyJSON[smithyjson.JSONStringer]); ok { + if s, ok := vFrom.(fwtypes.SmithyJSON[tfsmithy.JSONStringer]); ok { v, d := s.ValueInterface() diags.Append(d...) if diags.HasError() { diff --git a/internal/framework/flex/auto_expand_test.go b/internal/framework/flex/auto_expand_test.go index 98049f9ffcd5..f50b4593d5b5 100644 --- a/internal/framework/flex/auto_expand_test.go +++ b/internal/framework/flex/auto_expand_test.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflogtest" "github.com/hashicorp/terraform-provider-aws/internal/errs" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) func TestExpand(t *testing.T) { @@ -559,7 +559,7 @@ func TestExpand(t *testing.T) { infoExpanding(reflect.TypeFor[*tfJSONStringer](), reflect.TypeFor[*awsJSONStringer]()), infoConverting(reflect.TypeFor[tfJSONStringer](), reflect.TypeFor[*awsJSONStringer]()), traceMatchedFields("Field1", reflect.TypeFor[tfJSONStringer](), "Field1", reflect.TypeFor[*awsJSONStringer]()), - infoConvertingWithPath("Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]](), "Field1", reflect.TypeFor[smithyjson.JSONStringer]()), + infoConvertingWithPath("Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]](), "Field1", reflect.TypeFor[tfsmithy.JSONStringer]()), }, }, } diff --git a/internal/framework/flex/auto_flatten.go b/internal/framework/flex/auto_flatten.go index 02919cadf4d8..9c98a96b7a4d 100644 --- a/internal/framework/flex/auto_flatten.go +++ b/internal/framework/flex/auto_flatten.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfreflect "github.com/hashicorp/terraform-provider-aws/internal/reflect" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/shopspring/decimal" ) @@ -619,7 +619,7 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val // // JSONStringer -> types.String-ish. // - if vFrom.Type().Implements(reflect.TypeFor[smithyjson.JSONStringer]()) { + if vFrom.Type().Implements(reflect.TypeFor[tfsmithy.JSONStringer]()) { tflog.SubsystemInfo(ctx, subsystemName, "Source implements json.JSONStringer") stringValue := types.StringNull() @@ -627,7 +627,7 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val if vFrom.IsNil() { tflog.SubsystemTrace(ctx, subsystemName, "Flattening null value") } else { - doc := vFrom.Interface().(smithyjson.JSONStringer) + doc := vFrom.Interface().(tfsmithy.JSONStringer) b, err := doc.MarshalSmithyDocument() if err != nil { // An error here would be an upstream error in the AWS SDK, because errors in json.Marshal diff --git a/internal/framework/flex/auto_flatten_test.go b/internal/framework/flex/auto_flatten_test.go index 1018f9d2a2b6..4a442ca40d18 100644 --- a/internal/framework/flex/auto_flatten_test.go +++ b/internal/framework/flex/auto_flatten_test.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) func TestFlatten(t *testing.T) { @@ -4357,9 +4357,9 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField]()), - infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), + infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[types.String]()), - infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type + infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type }, }, "null json interface Source string Target": { @@ -4374,10 +4374,10 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField]()), - infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), + infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[types.String]()), - infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type - traceFlatteningNullValue("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), + infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type + traceFlatteningNullValue("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), }, }, @@ -4399,9 +4399,9 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfJSONStringer]()), - infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), + infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), - infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), // TODO: fix source type + infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]]()), // TODO: fix source type }, }, "null json interface Source JSONValue Target": { @@ -4410,16 +4410,16 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { }, Target: &tfJSONStringer{}, WantTarget: &tfJSONStringer{ - Field1: fwtypes.NewSmithyJSONNull[smithyjson.JSONStringer](), + Field1: fwtypes.NewSmithyJSONNull[tfsmithy.JSONStringer](), }, expectedLogLines: []map[string]any{ infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfJSONStringer]()), traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfJSONStringer]()), - infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), + infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), - infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), // TODO: fix source type - traceFlatteningNullValue("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[smithyjson.JSONStringer]]()), + infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]]()), // TODO: fix source type + traceFlatteningNullValue("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[fwtypes.SmithyJSON[tfsmithy.JSONStringer]]()), }, }, @@ -4435,10 +4435,10 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), infoConverting(reflect.TypeFor[awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), traceMatchedFields("Field1", reflect.TypeFor[awsJSONStringer](), "Field1", reflect.TypeFor[*tfSingleStringField]()), - infoConvertingWithPath("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), + infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[types.String]()), - infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type - errorMarshallingJSONDocument("Field1", reflect.TypeFor[smithyjson.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errMarshallSmithyDocument), + infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type + errorMarshallingJSONDocument("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errMarshallSmithyDocument), }, }, diff --git a/internal/framework/flex/autoflex_test.go b/internal/framework/flex/autoflex_test.go index 94195dbe62f8..5b87d2c08d3c 100644 --- a/internal/framework/flex/autoflex_test.go +++ b/internal/framework/flex/autoflex_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) type emptyStruct struct{} @@ -436,14 +436,14 @@ type tfMapBlockElementNoKey struct { Attr2 types.String `tfsdk:"attr2"` } -var _ smithyjson.JSONStringer = (*testJSONDocument)(nil) +var _ tfsmithy.JSONStringer = (*testJSONDocument)(nil) var _ smithydocument.Marshaler = (*testJSONDocument)(nil) type testJSONDocument struct { Value any } -func newTestJSONDocument(v any) smithyjson.JSONStringer { +func newTestJSONDocument(v any) tfsmithy.JSONStringer { return &testJSONDocument{Value: v} } @@ -459,7 +459,7 @@ func (m *testJSONDocument) MarshalSmithyDocument() ([]byte, error) { return json.Marshal(m.Value) } -var _ smithyjson.JSONStringer = &testJSONDocumentError{} +var _ tfsmithy.JSONStringer = &testJSONDocumentError{} type testJSONDocumentError struct{} @@ -477,11 +477,11 @@ var ( ) type awsJSONStringer struct { - Field1 smithyjson.JSONStringer `json:"field1"` + Field1 tfsmithy.JSONStringer `json:"field1"` } type tfJSONStringer struct { - Field1 fwtypes.SmithyJSON[smithyjson.JSONStringer] `tfsdk:"field1"` + Field1 fwtypes.SmithyJSON[tfsmithy.JSONStringer] `tfsdk:"field1"` } type tfListNestedObject[T any] struct { diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index 1bc4f8200a32..cc34ae66d5e6 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -13,19 +13,19 @@ import ( "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-go/tftypes" - tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) var ( - _ basetypes.StringTypable = (*SmithyJSONType[tfjson.JSONStringer])(nil) + _ basetypes.StringTypable = (*SmithyJSONType[tfsmithy.JSONStringer])(nil) ) -type SmithyJSONType[T tfjson.JSONStringer] struct { +type SmithyJSONType[T tfsmithy.JSONStringer] struct { jsontypes.NormalizedType f func(any) T } -func NewSmithyJSONType[T tfjson.JSONStringer](_ context.Context, f func(any) T) SmithyJSONType[T] { +func NewSmithyJSONType[T tfsmithy.JSONStringer](_ context.Context, f func(any) T) SmithyJSONType[T] { return SmithyJSONType[T]{ f: f, } @@ -85,12 +85,12 @@ func (t SmithyJSONType[T]) ValueFromString(ctx context.Context, in basetypes.Str } var ( - _ basetypes.StringValuable = (*SmithyJSON[tfjson.JSONStringer])(nil) - _ basetypes.StringValuableWithSemanticEquals = (*SmithyJSON[tfjson.JSONStringer])(nil) - _ xattr.ValidateableAttribute = (*SmithyJSON[tfjson.JSONStringer])(nil) + _ basetypes.StringValuable = (*SmithyJSON[tfsmithy.JSONStringer])(nil) + _ basetypes.StringValuableWithSemanticEquals = (*SmithyJSON[tfsmithy.JSONStringer])(nil) + _ xattr.ValidateableAttribute = (*SmithyJSON[tfsmithy.JSONStringer])(nil) ) -type SmithyJSON[T tfjson.JSONStringer] struct { +type SmithyJSON[T tfsmithy.JSONStringer] struct { jsontypes.Normalized f func(any) T } @@ -112,7 +112,7 @@ func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { return zero, diags } - t, err := tfjson.SmithyDocumentFromString(v.ValueString(), v.f) + t, err := tfsmithy.SmithyDocumentFromString(v.ValueString(), v.f) if err != nil { diags.AddError( "JSON Unmarshal Error", @@ -130,20 +130,20 @@ func (v SmithyJSON[T]) Type(context.Context) attr.Type { return SmithyJSONType[T]{} } -func NewSmithyJSONValue[T tfjson.JSONStringer](value string, f func(any) T) SmithyJSON[T] { +func NewSmithyJSONValue[T tfsmithy.JSONStringer](value string, f func(any) T) SmithyJSON[T] { return SmithyJSON[T]{ Normalized: jsontypes.NewNormalizedValue(value), f: f, } } -func NewSmithyJSONNull[T tfjson.JSONStringer]() SmithyJSON[T] { +func NewSmithyJSONNull[T tfsmithy.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ Normalized: jsontypes.NewNormalizedNull(), } } -func NewSmithyJSONUnknown[T tfjson.JSONStringer]() SmithyJSON[T] { +func NewSmithyJSONUnknown[T tfsmithy.JSONStringer]() SmithyJSON[T] { return SmithyJSON[T]{ Normalized: jsontypes.NewNormalizedUnknown(), } diff --git a/internal/framework/types/smithy_json_test.go b/internal/framework/types/smithy_json_test.go index d6423e691fa4..16c327ea5219 100644 --- a/internal/framework/types/smithy_json_test.go +++ b/internal/framework/types/smithy_json_test.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr/xattr" "github.com/hashicorp/terraform-plugin-go/tftypes" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { @@ -25,15 +25,15 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { }{ "null value": { val: tftypes.NewValue(tftypes.String, nil), - expected: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), + expected: fwtypes.NewSmithyJSONNull[tfsmithy.JSONStringer](), }, "unknown value": { val: tftypes.NewValue(tftypes.String, tftypes.UnknownValue), - expected: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), + expected: fwtypes.NewSmithyJSONUnknown[tfsmithy.JSONStringer](), }, "valid SmithyJSON": { val: tftypes.NewValue(tftypes.String, `{"test": "value"}`), - expected: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 + expected: fwtypes.NewSmithyJSONValue[tfsmithy.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, } @@ -42,7 +42,7 @@ func TestSmithyJSONTypeValueFromTerraform(t *testing.T) { t.Parallel() ctx := context.Background() - val, err := fwtypes.SmithyJSONType[tfjson.JSONStringer]{}.ValueFromTerraform(ctx, test.val) + val, err := fwtypes.SmithyJSONType[tfsmithy.JSONStringer]{}.ValueFromTerraform(ctx, test.val) if err != nil { t.Fatalf("got unexpected error: %s", err) @@ -59,20 +59,20 @@ func TestSmithyJSONValidateAttribute(t *testing.T) { t.Parallel() tests := map[string]struct { - val fwtypes.SmithyJSON[tfjson.JSONStringer] + val fwtypes.SmithyJSON[tfsmithy.JSONStringer] expectError bool }{ "null value": { - val: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONNull[tfsmithy.JSONStringer](), }, "unknown value": { - val: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONUnknown[tfsmithy.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 - val: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 + val: fwtypes.NewSmithyJSONValue[tfsmithy.JSONStringer](`{"test": "value"}`, nil), // lintignore:AWSAT003,AWSAT005 }, "invalid SmithyJSON": { - val: fwtypes.NewSmithyJSONValue[tfjson.JSONStringer]("not ok", nil), + val: fwtypes.NewSmithyJSONValue[tfsmithy.JSONStringer]("not ok", nil), expectError: true, }, } @@ -98,7 +98,7 @@ type testJSONDocument struct { Value any } -func newTestJSONDocument(v any) tfjson.JSONStringer { +func newTestJSONDocument(v any) tfsmithy.JSONStringer { return &testJSONDocument{Value: v} } @@ -118,15 +118,15 @@ func TestSmithyJSONValueInterface(t *testing.T) { t.Parallel() tests := map[string]struct { - val fwtypes.SmithyJSON[tfjson.JSONStringer] - expected tfjson.JSONStringer + val fwtypes.SmithyJSON[tfsmithy.JSONStringer] + expected tfsmithy.JSONStringer expectError bool }{ "null value": { - val: fwtypes.NewSmithyJSONNull[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONNull[tfsmithy.JSONStringer](), }, "unknown value": { - val: fwtypes.NewSmithyJSONUnknown[tfjson.JSONStringer](), + val: fwtypes.NewSmithyJSONUnknown[tfsmithy.JSONStringer](), }, "valid SmithyJSON": { // lintignore:AWSAT003,AWSAT005 val: fwtypes.NewSmithyJSONValue(`{"test": "value"}`, newTestJSONDocument), // lintignore:AWSAT003,AWSAT005 diff --git a/internal/service/bedrockagent/flow.go b/internal/service/bedrockagent/flow.go index 01b59a7a5adf..8a3313424d82 100644 --- a/internal/service/bedrockagent/flow.go +++ b/internal/service/bedrockagent/flow.go @@ -34,7 +34,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -1684,7 +1684,7 @@ func (m *promptFlowNodeSourceConfigurationModel) Flatten(ctx context.Context, v } if t.Value.AdditionalModelRequestFields != nil { - json, err := smithyjson.SmithyDocumentToString(t.Value.AdditionalModelRequestFields) + json, err := tfsmithy.SmithyDocumentToString(t.Value.AdditionalModelRequestFields) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", @@ -1733,7 +1733,7 @@ func (m promptFlowNodeSourceConfigurationModel) Expand(ctx context.Context) (res additionalFields := promptFlowNodeSourceConfigurationInline.AdditionalModelRequestFields if !additionalFields.IsNull() { - json, err := smithyjson.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, additionalFields), document.NewLazyDocument) + json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, additionalFields), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", diff --git a/internal/service/bedrockagent/prompt.go b/internal/service/bedrockagent/prompt.go index 8eadbde187ad..0d0601e72fb2 100644 --- a/internal/service/bedrockagent/prompt.go +++ b/internal/service/bedrockagent/prompt.go @@ -30,7 +30,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - smithyjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -685,7 +685,7 @@ func (m promptVariantModel) Expand(ctx context.Context) (any, diag.Diagnostics) } if !m.AdditionalModelRequestFields.IsNull() { - json, err := smithyjson.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.AdditionalModelRequestFields), document.NewLazyDocument) + json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.AdditionalModelRequestFields), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", @@ -723,7 +723,7 @@ func (m *promptVariantModel) Flatten(ctx context.Context, v any) diag.Diagnostic } if v.AdditionalModelRequestFields != nil { - json, err := smithyjson.SmithyDocumentToString(v.AdditionalModelRequestFields) + json, err := tfsmithy.SmithyDocumentToString(v.AdditionalModelRequestFields) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", @@ -1182,7 +1182,7 @@ func (m toolInputSchemaModel) Expand(ctx context.Context) (any, diag.Diagnostics switch { case !m.JSON.IsNull(): - json, err := smithyjson.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.JSON), document.NewLazyDocument) + json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.JSON), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", @@ -1207,7 +1207,7 @@ func (m *toolInputSchemaModel) Flatten(ctx context.Context, v any) diag.Diagnost switch v := v.(type) { case awstypes.ToolInputSchemaMemberJson: if v.Value != nil { - json, err := smithyjson.SmithyDocumentToString(v.Value) + json, err := tfsmithy.SmithyDocumentToString(v.Value) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", diff --git a/internal/service/controltower/landing_zone.go b/internal/service/controltower/landing_zone.go index e7b8eee7307f..65c2f373a99d 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -24,7 +24,7 @@ import ( "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/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -96,7 +96,7 @@ func resourceLandingZoneCreate(ctx context.Context, d *schema.ResourceData, meta var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ControlTowerClient(ctx) - manifest, err := json.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) + manifest, err := tfsmithy.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -153,7 +153,7 @@ func resourceLandingZoneRead(ctx context.Context, d *schema.ResourceData, meta a } d.Set("latest_available_version", landingZone.LatestAvailableVersion) if landingZone.Manifest != nil { - v, err := json.SmithyDocumentToString(landingZone.Manifest) + v, err := tfsmithy.SmithyDocumentToString(landingZone.Manifest) if err != nil { return sdkdiag.AppendFromErr(diags, err) @@ -173,7 +173,7 @@ func resourceLandingZoneUpdate(ctx context.Context, d *schema.ResourceData, meta conn := meta.(*conns.AWSClient).ControlTowerClient(ctx) if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { - manifest, err := json.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) + manifest, err := tfsmithy.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) if err != nil { return sdkdiag.AppendFromErr(diags, err) } diff --git a/internal/smithy/README.md b/internal/smithy/README.md new file mode 100644 index 000000000000..20d5bf99f0ee --- /dev/null +++ b/internal/smithy/README.md @@ -0,0 +1,3 @@ +# Smithy Helpers + +[Smithy](https://smithy.io/) helpers. diff --git a/internal/json/smithy.go b/internal/smithy/smithy.go similarity index 83% rename from internal/json/smithy.go rename to internal/smithy/smithy.go index 3dafd0b5a097..269c8796d8c2 100644 --- a/internal/json/smithy.go +++ b/internal/smithy/smithy.go @@ -1,16 +1,17 @@ // Copyright (c) HashiCorp, Inc. // SPDX-License-Identifier: MPL-2.0 -package json +package smithy import ( smithydocument "github.com/aws/smithy-go/document" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func SmithyDocumentFromString[T smithydocument.Marshaler](s string, f func(any) T) (T, error) { var v any - err := DecodeFromString(s, &v) + err := tfjson.DecodeFromString(s, &v) if err != nil { var zero T return zero, err @@ -28,7 +29,7 @@ func SmithyDocumentToString(document smithydocument.Unmarshaler) (string, error) return "", err } - return EncodeToString(v) + return tfjson.EncodeToString(v) } // JSONStringer interface is used to marshal and unmarshal JSON interface objects. From a4346d649302643ce1d062aacd09084ad6956995 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 12:24:42 -0400 Subject: [PATCH 0095/2115] Rename some functions. --- internal/framework/flex/auto_flatten.go | 2 +- internal/framework/flex/logging_test.go | 2 +- internal/framework/types/smithy_json.go | 6 ++++-- internal/service/bedrockagent/flow.go | 4 ++-- internal/service/bedrockagent/prompt.go | 8 ++++---- internal/service/controltower/landing_zone.go | 6 +++--- internal/smithy/smithy.go | 7 ++++--- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/internal/framework/flex/auto_flatten.go b/internal/framework/flex/auto_flatten.go index 9c98a96b7a4d..b12cd4c007d2 100644 --- a/internal/framework/flex/auto_flatten.go +++ b/internal/framework/flex/auto_flatten.go @@ -620,7 +620,7 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val // JSONStringer -> types.String-ish. // if vFrom.Type().Implements(reflect.TypeFor[tfsmithy.JSONStringer]()) { - tflog.SubsystemInfo(ctx, subsystemName, "Source implements json.JSONStringer") + tflog.SubsystemInfo(ctx, subsystemName, "Source implements tfsmithy.JSONStringer") stringValue := types.StringNull() diff --git a/internal/framework/flex/logging_test.go b/internal/framework/flex/logging_test.go index ad0b5fa04ea4..a91ef30a7c0e 100644 --- a/internal/framework/flex/logging_test.go +++ b/internal/framework/flex/logging_test.go @@ -477,7 +477,7 @@ func infoSourceImplementsJSONStringer(sourcePath string, sourceType reflect.Type return map[string]any{ "@level": hclog.Info.String(), "@module": logModule, - "@message": "Source implements json.JSONStringer", + "@message": "Source implements tfsmithy.JSONStringer", logAttrKeySourcePath: sourcePath, logAttrKeySourceType: fullTypeName(sourceType), logAttrKeyTargetPath: targetPath, diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index cc34ae66d5e6..323586fd56e5 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -112,7 +112,7 @@ func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { return zero, diags } - t, err := tfsmithy.SmithyDocumentFromString(v.ValueString(), v.f) + t, err := tfsmithy.DocumentFromJSONString(v.ValueString(), v.f) if err != nil { diags.AddError( "JSON Unmarshal Error", @@ -127,7 +127,9 @@ func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { } func (v SmithyJSON[T]) Type(context.Context) attr.Type { - return SmithyJSONType[T]{} + return SmithyJSONType[T]{ + f: v.f, + } } func NewSmithyJSONValue[T tfsmithy.JSONStringer](value string, f func(any) T) SmithyJSON[T] { diff --git a/internal/service/bedrockagent/flow.go b/internal/service/bedrockagent/flow.go index 8a3313424d82..16f27f694013 100644 --- a/internal/service/bedrockagent/flow.go +++ b/internal/service/bedrockagent/flow.go @@ -1684,7 +1684,7 @@ func (m *promptFlowNodeSourceConfigurationModel) Flatten(ctx context.Context, v } if t.Value.AdditionalModelRequestFields != nil { - json, err := tfsmithy.SmithyDocumentToString(t.Value.AdditionalModelRequestFields) + json, err := tfsmithy.DocumentToJSONString(t.Value.AdditionalModelRequestFields) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", @@ -1733,7 +1733,7 @@ func (m promptFlowNodeSourceConfigurationModel) Expand(ctx context.Context) (res additionalFields := promptFlowNodeSourceConfigurationInline.AdditionalModelRequestFields if !additionalFields.IsNull() { - json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, additionalFields), document.NewLazyDocument) + json, err := tfsmithy.DocumentFromJSONString(fwflex.StringValueFromFramework(ctx, additionalFields), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", diff --git a/internal/service/bedrockagent/prompt.go b/internal/service/bedrockagent/prompt.go index 0d0601e72fb2..32b720f0a00d 100644 --- a/internal/service/bedrockagent/prompt.go +++ b/internal/service/bedrockagent/prompt.go @@ -685,7 +685,7 @@ func (m promptVariantModel) Expand(ctx context.Context) (any, diag.Diagnostics) } if !m.AdditionalModelRequestFields.IsNull() { - json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.AdditionalModelRequestFields), document.NewLazyDocument) + json, err := tfsmithy.DocumentFromJSONString(fwflex.StringValueFromFramework(ctx, m.AdditionalModelRequestFields), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", @@ -723,7 +723,7 @@ func (m *promptVariantModel) Flatten(ctx context.Context, v any) diag.Diagnostic } if v.AdditionalModelRequestFields != nil { - json, err := tfsmithy.SmithyDocumentToString(v.AdditionalModelRequestFields) + json, err := tfsmithy.DocumentToJSONString(v.AdditionalModelRequestFields) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", @@ -1182,7 +1182,7 @@ func (m toolInputSchemaModel) Expand(ctx context.Context) (any, diag.Diagnostics switch { case !m.JSON.IsNull(): - json, err := tfsmithy.SmithyDocumentFromString(fwflex.StringValueFromFramework(ctx, m.JSON), document.NewLazyDocument) + json, err := tfsmithy.DocumentFromJSONString(fwflex.StringValueFromFramework(ctx, m.JSON), document.NewLazyDocument) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Decoding JSON", @@ -1207,7 +1207,7 @@ func (m *toolInputSchemaModel) Flatten(ctx context.Context, v any) diag.Diagnost switch v := v.(type) { case awstypes.ToolInputSchemaMemberJson: if v.Value != nil { - json, err := tfsmithy.SmithyDocumentToString(v.Value) + json, err := tfsmithy.DocumentToJSONString(v.Value) if err != nil { diags.Append(diag.NewErrorDiagnostic( "Encoding JSON", diff --git a/internal/service/controltower/landing_zone.go b/internal/service/controltower/landing_zone.go index 65c2f373a99d..adf27edd188c 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -96,7 +96,7 @@ func resourceLandingZoneCreate(ctx context.Context, d *schema.ResourceData, meta var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ControlTowerClient(ctx) - manifest, err := tfsmithy.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) + manifest, err := tfsmithy.DocumentFromJSONString(d.Get("manifest_json").(string), document.NewLazyDocument) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -153,7 +153,7 @@ func resourceLandingZoneRead(ctx context.Context, d *schema.ResourceData, meta a } d.Set("latest_available_version", landingZone.LatestAvailableVersion) if landingZone.Manifest != nil { - v, err := tfsmithy.SmithyDocumentToString(landingZone.Manifest) + v, err := tfsmithy.DocumentToJSONString(landingZone.Manifest) if err != nil { return sdkdiag.AppendFromErr(diags, err) @@ -173,7 +173,7 @@ func resourceLandingZoneUpdate(ctx context.Context, d *schema.ResourceData, meta conn := meta.(*conns.AWSClient).ControlTowerClient(ctx) if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { - manifest, err := tfsmithy.SmithyDocumentFromString(d.Get("manifest_json").(string), document.NewLazyDocument) + manifest, err := tfsmithy.DocumentFromJSONString(d.Get("manifest_json").(string), document.NewLazyDocument) if err != nil { return sdkdiag.AppendFromErr(diags, err) } diff --git a/internal/smithy/smithy.go b/internal/smithy/smithy.go index 269c8796d8c2..8c579645f935 100644 --- a/internal/smithy/smithy.go +++ b/internal/smithy/smithy.go @@ -8,7 +8,8 @@ import ( tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) -func SmithyDocumentFromString[T smithydocument.Marshaler](s string, f func(any) T) (T, error) { +// DocumentFromJSONString converts a JSON string to a [Smithy document](https://smithy.io/2.0/spec/simple-types.html#document). +func DocumentFromJSONString[T any](s string, f func(any) T) (T, error) { var v any err := tfjson.DecodeFromString(s, &v) @@ -20,8 +21,8 @@ func SmithyDocumentFromString[T smithydocument.Marshaler](s string, f func(any) return f(v), nil } -// SmithyDocumentToString converts a [Smithy document](https://smithy.io/2.0/spec/simple-types.html#document) to a JSON string. -func SmithyDocumentToString(document smithydocument.Unmarshaler) (string, error) { +// DocumentToJSONString converts a [Smithy document](https://smithy.io/2.0/spec/simple-types.html#document) to a JSON string. +func DocumentToJSONString(document smithydocument.Unmarshaler) (string, error) { var v any err := document.UnmarshalSmithyDocument(&v) From daa44816f6ee6bfa804d3af4441b102825dfdec6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 14:24:23 -0400 Subject: [PATCH 0096/2115] Flattening is unmarshalling. --- internal/framework/flex/auto_flatten.go | 22 +++++++++----------- internal/framework/flex/auto_flatten_test.go | 4 ++-- internal/framework/flex/autoflex_test.go | 8 +++---- internal/framework/flex/logging_test.go | 6 +++--- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/internal/framework/flex/auto_flatten.go b/internal/framework/flex/auto_flatten.go index b12cd4c007d2..2955894aa2d5 100644 --- a/internal/framework/flex/auto_flatten.go +++ b/internal/framework/flex/auto_flatten.go @@ -11,6 +11,7 @@ import ( "strings" "time" + smithydocument "github.com/aws/smithy-go/document" "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" @@ -619,27 +620,24 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val // // JSONStringer -> types.String-ish. // - if vFrom.Type().Implements(reflect.TypeFor[tfsmithy.JSONStringer]()) { - tflog.SubsystemInfo(ctx, subsystemName, "Source implements tfsmithy.JSONStringer") + if vFrom.Type().Implements(reflect.TypeFor[smithydocument.Unmarshaler]()) { + tflog.SubsystemInfo(ctx, subsystemName, "Source implements smithydocument.Unmarshaler") stringValue := types.StringNull() if vFrom.IsNil() { tflog.SubsystemTrace(ctx, subsystemName, "Flattening null value") } else { - doc := vFrom.Interface().(tfsmithy.JSONStringer) - b, err := doc.MarshalSmithyDocument() + doc := vFrom.Interface().(smithydocument.Unmarshaler) + s, err := tfsmithy.DocumentToJSONString(doc) if err != nil { - // An error here would be an upstream error in the AWS SDK, because errors in json.Marshal - // are caused by conditions such as cyclic structures - // See https://pkg.go.dev/encoding/json#Marshal - tflog.SubsystemError(ctx, subsystemName, "Marshalling JSON document", map[string]any{ + tflog.SubsystemError(ctx, subsystemName, "Unmarshalling JSON document", map[string]any{ logAttrKeyError: err.Error(), }) - diags.Append(diagFlatteningMarshalSmithyDocument(reflect.TypeOf(doc), err)) + diags.Append(diagFlatteningUnmarshalSmithyDocument(reflect.TypeOf(doc), err)) return diags } - stringValue = types.StringValue(string(b)) + stringValue = types.StringValue(strings.TrimSpace(s)) } v, d := tTo.ValueFromString(ctx, stringValue) diags.Append(d...) @@ -1752,13 +1750,13 @@ func diagFlatteningNoMapBlockKey(sourceType reflect.Type) diag.ErrorDiagnostic { ) } -func diagFlatteningMarshalSmithyDocument(sourceType reflect.Type, err error) diag.ErrorDiagnostic { +func diagFlatteningUnmarshalSmithyDocument(sourceType reflect.Type, err error) diag.ErrorDiagnostic { return diag.NewErrorDiagnostic( "Incompatible Types", "An unexpected error occurred while flattening configuration. "+ "This is always an error in the provider. "+ "Please report the following to the provider developer:\n\n"+ - fmt.Sprintf("Marshalling JSON document of type %q failed: %s", fullTypeName(sourceType), err.Error()), + fmt.Sprintf("Unmarshalling JSON document of type %q failed: %s", fullTypeName(sourceType), err.Error()), ) } diff --git a/internal/framework/flex/auto_flatten_test.go b/internal/framework/flex/auto_flatten_test.go index 4a442ca40d18..c94efa6bf68f 100644 --- a/internal/framework/flex/auto_flatten_test.go +++ b/internal/framework/flex/auto_flatten_test.go @@ -4429,7 +4429,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { }, Target: &tfSingleStringField{}, expectedDiags: diag.Diagnostics{ - diagFlatteningMarshalSmithyDocument(reflect.TypeFor[*testJSONDocumentError](), errMarshallSmithyDocument), + diagFlatteningUnmarshalSmithyDocument(reflect.TypeFor[*testJSONDocumentError](), errUnmarshallSmithyDocument), }, expectedLogLines: []map[string]any{ infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), @@ -4438,7 +4438,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[types.String]()), infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type - errorMarshallingJSONDocument("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errMarshallSmithyDocument), + errorUnmarshallingJSONDocument("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errUnmarshallSmithyDocument), }, }, diff --git a/internal/framework/flex/autoflex_test.go b/internal/framework/flex/autoflex_test.go index 5b87d2c08d3c..ad1ffa1475aa 100644 --- a/internal/framework/flex/autoflex_test.go +++ b/internal/framework/flex/autoflex_test.go @@ -5,7 +5,6 @@ package flex import ( "context" - "encoding/json" "errors" "reflect" "time" @@ -16,6 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) @@ -448,15 +448,15 @@ func newTestJSONDocument(v any) tfsmithy.JSONStringer { } func (m *testJSONDocument) UnmarshalSmithyDocument(v any) error { - data, err := json.Marshal(m.Value) + data, err := tfjson.EncodeToBytes(m.Value) if err != nil { return err } - return json.Unmarshal(data, v) + return tfjson.DecodeFromBytes(data, v) } func (m *testJSONDocument) MarshalSmithyDocument() ([]byte, error) { - return json.Marshal(m.Value) + return tfjson.EncodeToBytes(m.Value) } var _ tfsmithy.JSONStringer = &testJSONDocumentError{} diff --git a/internal/framework/flex/logging_test.go b/internal/framework/flex/logging_test.go index a91ef30a7c0e..bb928ab98610 100644 --- a/internal/framework/flex/logging_test.go +++ b/internal/framework/flex/logging_test.go @@ -477,7 +477,7 @@ func infoSourceImplementsJSONStringer(sourcePath string, sourceType reflect.Type return map[string]any{ "@level": hclog.Info.String(), "@module": logModule, - "@message": "Source implements tfsmithy.JSONStringer", + "@message": "Source implements smithydocument.Unmarshaler", logAttrKeySourcePath: sourcePath, logAttrKeySourceType: fullTypeName(sourceType), logAttrKeyTargetPath: targetPath, @@ -569,11 +569,11 @@ func errorTargetHasNoMapBlockKey(sourcePath string, sourceType reflect.Type, tar } } -func errorMarshallingJSONDocument(sourcePath string, sourceType reflect.Type, targetPath string, targetType reflect.Type, err error) map[string]any { +func errorUnmarshallingJSONDocument(sourcePath string, sourceType reflect.Type, targetPath string, targetType reflect.Type, err error) map[string]any { return map[string]any{ "@level": hclog.Error.String(), "@module": logModule, - "@message": "Marshalling JSON document", + "@message": "Unmarshalling JSON document", logAttrKeySourcePath: sourcePath, logAttrKeySourceType: fullTypeName(sourceType), logAttrKeyTargetPath: targetPath, From bca35eaab8b9cbbf697b31dcff10790dbb84fa21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 14:44:14 -0400 Subject: [PATCH 0097/2115] Rename file. --- internal/smithy/{smithy.go => json.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename internal/smithy/{smithy.go => json.go} (100%) diff --git a/internal/smithy/smithy.go b/internal/smithy/json.go similarity index 100% rename from internal/smithy/smithy.go rename to internal/smithy/json.go From eb5b28ecd948623312f40b4a7a90090af13642d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 15:06:04 -0400 Subject: [PATCH 0098/2115] Expansion of SmithJSON working. --- internal/framework/flex/auto_expand.go | 5 ++--- internal/framework/types/smithy_json.go | 16 +++++++++++++++- internal/framework/types/smithy_json_test.go | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/internal/framework/flex/auto_expand.go b/internal/framework/flex/auto_expand.go index 1da137a715f0..33ce1725d7fb 100644 --- a/internal/framework/flex/auto_expand.go +++ b/internal/framework/flex/auto_expand.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfreflect "github.com/hashicorp/terraform-provider-aws/internal/reflect" - tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" ) // Expand = TF --> AWS @@ -487,8 +486,8 @@ func (expander autoExpander) string(ctx context.Context, vFrom basetypes.StringV } case reflect.Interface: - if s, ok := vFrom.(fwtypes.SmithyJSON[tfsmithy.JSONStringer]); ok { - v, d := s.ValueInterface() + if s, ok := vFrom.(fwtypes.SmithyDocumentValue); ok { + v, d := s.ToSmithyObjectDocument(ctx) diags.Append(d...) if diags.HasError() { return diags diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index 323586fd56e5..450125fd53c1 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -88,6 +88,7 @@ var ( _ basetypes.StringValuable = (*SmithyJSON[tfsmithy.JSONStringer])(nil) _ basetypes.StringValuableWithSemanticEquals = (*SmithyJSON[tfsmithy.JSONStringer])(nil) _ xattr.ValidateableAttribute = (*SmithyJSON[tfsmithy.JSONStringer])(nil) + _ SmithyDocumentValue = (*SmithyJSON[tfsmithy.JSONStringer])(nil) ) type SmithyJSON[T tfsmithy.JSONStringer] struct { @@ -104,7 +105,11 @@ func (v SmithyJSON[T]) Equal(o attr.Value) bool { return v.Normalized.Equal(other.Normalized) } -func (v SmithyJSON[T]) ValueInterface() (T, diag.Diagnostics) { +func (v SmithyJSON[T]) ToSmithyObjectDocument(ctx context.Context) (any, diag.Diagnostics) { + return v.ToSmithyDocument(ctx) +} + +func (v SmithyJSON[T]) ToSmithyDocument(context.Context) (T, diag.Diagnostics) { var diags diag.Diagnostics var zero T @@ -150,3 +155,12 @@ func NewSmithyJSONUnknown[T tfsmithy.JSONStringer]() SmithyJSON[T] { Normalized: jsontypes.NewNormalizedUnknown(), } } + +// SmithyDocumentValue extends the Value interface for values that represent Smithy documents. +// It isn't generic on the Go interface type as it's referenced within AutoFlEx. +type SmithyDocumentValue interface { + attr.Value + + // ToSmithyObjectDocument returns the value as a Smithy document. + ToSmithyObjectDocument(context.Context) (any, diag.Diagnostics) +} diff --git a/internal/framework/types/smithy_json_test.go b/internal/framework/types/smithy_json_test.go index 16c327ea5219..28564cd87980 100644 --- a/internal/framework/types/smithy_json_test.go +++ b/internal/framework/types/smithy_json_test.go @@ -152,7 +152,7 @@ func TestSmithyJSONValueInterface(t *testing.T) { t.Run(name, func(t *testing.T) { t.Parallel() - s, err := test.val.ValueInterface() + s, err := test.val.ToSmithyDocument(t.Context()) gotErr := err.HasError() if gotErr != test.expectError { From a0b66add3e8230a9d9a137a207640f733359770e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 8 Aug 2025 15:19:16 -0400 Subject: [PATCH 0099/2115] SmithyJSON.StringSemanticEquals: Implement. --- internal/framework/types/smithy_json.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/internal/framework/types/smithy_json.go b/internal/framework/types/smithy_json.go index 450125fd53c1..71410cd1484a 100644 --- a/internal/framework/types/smithy_json.go +++ b/internal/framework/types/smithy_json.go @@ -137,6 +137,25 @@ func (v SmithyJSON[T]) Type(context.Context) attr.Type { } } +func (v SmithyJSON[T]) StringSemanticEquals(ctx context.Context, newValuable basetypes.StringValuable) (bool, diag.Diagnostics) { + var diags diag.Diagnostics + + newValue, ok := newValuable.(SmithyJSON[T]) + if !ok { + diags.AddError( + "Semantic Equality Check Error", + "An unexpected value type was received while performing semantic equality checks. "+ + "Please report this to the provider developers.\n\n"+ + "Expected Value Type: "+fmt.Sprintf("%T", v)+"\n"+ + "Got Value Type: "+fmt.Sprintf("%T", newValuable), + ) + + return false, diags + } + + return v.Normalized.StringSemanticEquals(ctx, newValue.Normalized) +} + func NewSmithyJSONValue[T tfsmithy.JSONStringer](value string, f func(any) T) SmithyJSON[T] { return SmithyJSON[T]{ Normalized: jsontypes.NewNormalizedValue(value), From 9944d750984e5ca6c18da8f06343cce5ca600abf Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Tue, 24 Jun 2025 12:46:26 +0000 Subject: [PATCH 0100/2115] Added resource aws_workspacesweb_trust_store. --- .../service/workspacesweb/exports_test.go | 8 + .../workspacesweb/service_package_gen.go | 8 + .../testdata/TrustStore/tags/main_gen.tf | 41 + .../TrustStore/tagsComputed1/main_gen.tf | 45 + .../TrustStore/tagsComputed2/main_gen.tf | 56 + .../TrustStore/tags_defaults/main_gen.tf | 52 + .../TrustStore/tags_ignore/main_gen.tf | 61 + .../testdata/tmpl/trust_store_tags.gtpl | 30 + internal/service/workspacesweb/trust_store.go | 270 ++ .../trust_store_tags_gen_test.go | 2309 +++++++++++++++++ .../service/workspacesweb/trust_store_test.go | 260 ++ .../r/workspacesweb_trust_store.html.markdown | 69 + 12 files changed, 3209 insertions(+) create mode 100644 internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl create mode 100644 internal/service/workspacesweb/trust_store.go create mode 100644 internal/service/workspacesweb/trust_store_tags_gen_test.go create mode 100644 internal/service/workspacesweb/trust_store_test.go create mode 100644 website/docs/r/workspacesweb_trust_store.html.markdown diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 61ec728a6790..d4cefa95899c 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -9,6 +9,10 @@ var ( ResourceDataProtectionSettings = newDataProtectionSettingsResource ResourceIPAccessSettings = newIPAccessSettingsResource ResourceNetworkSettings = newNetworkSettingsResource +<<<<<<< HEAD +======= + ResourceTrustStore = newTrustStoreResource +>>>>>>> 414521b8b0 (Added resource aws_workspacesweb_trust_store.) ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserSettings = newUserSettingsResource @@ -16,6 +20,10 @@ var ( FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN FindIPAccessSettingsByARN = findIPAccessSettingsByARN FindNetworkSettingsByARN = findNetworkSettingsByARN +<<<<<<< HEAD +======= + FindTrustStoreByARN = findTrustStoreByARN +>>>>>>> 414521b8b0 (Added resource aws_workspacesweb_trust_store.) FindUserAccessLoggingSettingsByARN = findUserAccessLoggingSettingsByARN FindUserSettingsByARN = findUserSettingsByARN ) diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index bd38debde273..709c6456595b 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -60,6 +60,14 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newTrustStoreResource, + TypeName: "aws_workspacesweb_trust_store", + Name: "Trust Store", + Tags: &types.ServicePackageResourceTags{ + IdentifierAttribute: "trust_store_arn", + }, + }, { Factory: newUserAccessLoggingSettingsResource, TypeName: "aws_workspacesweb_user_access_logging_settings", diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf new file mode 100644 index 000000000000..4168eda2e7a3 --- /dev/null +++ b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf @@ -0,0 +1,41 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] + + tags = var.resource_tags +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf new file mode 100644 index 000000000000..00de80faea55 --- /dev/null +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf @@ -0,0 +1,45 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] + + tags = { + (var.unknownTagKey) = null_resource.test.id + } +} + +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf new file mode 100644 index 000000000000..794639d1a764 --- /dev/null +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf @@ -0,0 +1,56 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } +} + +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} + +variable "knownTagKey" { + type = string + nullable = false +} + +variable "knownTagValue" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf new file mode 100644 index 000000000000..fcf42730c050 --- /dev/null +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf @@ -0,0 +1,52 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } +} + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] + + tags = var.resource_tags +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf new file mode 100644 index 000000000000..c057002d330d --- /dev/null +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf @@ -0,0 +1,61 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } + ignore_tags { + keys = var.ignore_tag_keys + } +} + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] + + tags = var.resource_tags +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = true + default = null +} + +variable "ignore_tag_keys" { + type = set(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl new file mode 100644 index 000000000000..8af35c5e6931 --- /dev/null +++ b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl @@ -0,0 +1,30 @@ +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test.certificate] +{{- template "tags" . }} +} diff --git a/internal/service/workspacesweb/trust_store.go b/internal/service/workspacesweb/trust_store.go new file mode 100644 index 000000000000..b1412edf1f7f --- /dev/null +++ b/internal/service/workspacesweb/trust_store.go @@ -0,0 +1,270 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "strings" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @FrameworkResource("aws_workspacesweb_trust_store", name="Trust Store") +// @Tags(identifierAttribute="trust_store_arn") +// @Testing(tagsTest=true) +// @Testing(generator=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.TrustStore") +// @Testing(importStateIdAttribute="trust_store_arn") +// @Testing(importIgnore="certificate_list") +func newTrustStoreResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &trustStoreResource{}, nil +} + +type trustStoreResource struct { + framework.ResourceWithConfigure +} + +func (r *trustStoreResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "associated_portal_arns": schema.ListAttribute{ + CustomType: fwtypes.ListOfStringType, + ElementType: types.StringType, + Computed: true, + PlanModifiers: []planmodifier.List{ + listplanmodifier.UseStateForUnknown(), + }, + }, + "certificate_list": schema.ListAttribute{ + CustomType: fwtypes.ListOfStringType, + ElementType: types.StringType, + Required: true, + Validators: []validator.List{ + listvalidator.SizeAtLeast(1), + }, + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + "trust_store_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + }, + } +} + +func (r *trustStoreResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data trustStoreResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := &workspacesweb.CreateTrustStoreInput{ + ClientToken: aws.String(sdkid.UniqueId()), + Tags: getTagsIn(ctx), + } + + // Convert string certificates to byte slices + for _, cert := range data.CertificateList.Elements() { + // Remove the leading and trailing double quotes. Also remove the literals "\n" to replace with line feeds + formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") + input.CertificateList = append(input.CertificateList, []byte(formatted_cert)) + } + + output, err := conn.CreateTrustStore(ctx, input) + + if err != nil { + response.Diagnostics.AddError("creating WorkSpacesWeb Trust Store", err.Error()) + return + } + + data.TrustStoreARN = fwflex.StringToFramework(ctx, output.TrustStoreArn) + + // Get the trust store details to populate other fields + trustStore, err := findTrustStoreByARN(ctx, conn, data.TrustStoreARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Trust Store (%s)", data.TrustStoreARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, trustStore, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *trustStoreResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data trustStoreResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + output, err := findTrustStoreByARN(ctx, conn, data.TrustStoreARN.ValueString()) + if tfresource.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Trust Store (%s)", data.TrustStoreARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *trustStoreResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old trustStoreResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + if !new.CertificateList.Equal(old.CertificateList) { + input := &workspacesweb.UpdateTrustStoreInput{ + TrustStoreArn: aws.String(new.TrustStoreARN.ValueString()), + ClientToken: aws.String(sdkid.UniqueId()), + } + + // Handle certificate additions and deletions + oldCerts := make(map[string]bool) + for _, cert := range old.CertificateList.Elements() { + oldCerts[cert.String()] = true + } + + newCerts := make(map[string]bool) + for _, cert := range new.CertificateList.Elements() { + newCerts[cert.String()] = true + } + + // Find certificates to add + for _, cert := range new.CertificateList.Elements() { + if !oldCerts[cert.String()] { + formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") + input.CertificatesToAdd = append(input.CertificatesToAdd, []byte(formatted_cert)) + } + } + + // Find certificates to delete + for _, cert := range old.CertificateList.Elements() { + if !newCerts[cert.String()] { + formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") + input.CertificatesToDelete = append(input.CertificatesToDelete, formatted_cert) + } + } + + _, err := conn.UpdateTrustStore(ctx, input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Trust Store (%s)", new.TrustStoreARN.ValueString()), err.Error()) + return + } + } + + response.Diagnostics.Append(response.State.Set(ctx, &new)...) +} + +func (r *trustStoreResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data trustStoreResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DeleteTrustStoreInput{ + TrustStoreArn: aws.String(data.TrustStoreARN.ValueString()), + } + _, err := conn.DeleteTrustStore(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Trust Store (%s)", data.TrustStoreARN.ValueString()), err.Error()) + return + } +} + +func (r *trustStoreResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("trust_store_arn"), request, response) +} + +func findTrustStoreByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.TrustStore, error) { + input := workspacesweb.GetTrustStoreInput{ + TrustStoreArn: &arn, + } + output, err := conn.GetTrustStore(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.TrustStore == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.TrustStore, nil +} + +type trustStoreResourceModel struct { + AssociatedPortalARNs fwtypes.ListOfString `tfsdk:"associated_portal_arns"` + CertificateList fwtypes.ListOfString `tfsdk:"certificate_list"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TrustStoreARN types.String `tfsdk:"trust_store_arn"` +} diff --git a/internal/service/workspacesweb/trust_store_tags_gen_test.go b/internal/service/workspacesweb/trust_store_tags_gen_test.go new file mode 100644 index 000000000000..719743600393 --- /dev/null +++ b/internal/service/workspacesweb/trust_store_tags_gen_test.go @@ -0,0 +1,2309 @@ +// Code generated by internal/generate/tagstests/main.go; DO NOT EDIT. + +package workspacesweb_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebTrustStore_tags(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_null(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_EmptyMap(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_AddOnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_providerOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nonOverlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_overlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToProviderOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToResourceOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "tags.resourcekey1", // The canonical value returned by the AWS API is "" + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey(acctest.CtKey1)), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + ImportStateVerifyIgnore: []string{ + "certificate_list", + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 2: Update ignored tag only + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Again), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 2: Update ignored tag + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/TrustStore/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go new file mode 100644 index 000000000000..0fc08be2b837 --- /dev/null +++ b/internal/service/workspacesweb/trust_store_test.go @@ -0,0 +1,260 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebTrustStore_basic(t *testing.T) { + ctx := acctest.Context(t) + var trustStore awstypes.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"certificate_list"}, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_disappears(t *testing.T) { + ctx := acctest.Context(t) + var trustStore awstypes.TrustStore + //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceTrustStore, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { + ctx := acctest.Context(t) + var trustStore awstypes.TrustStore + //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) + resourceName := "aws_workspacesweb_trust_store.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"certificate_list"}, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + }, + { + Config: testAccTrustStoreConfig_updatedAdd(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "2"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"certificate_list"}, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + }, + { + Config: testAccTrustStoreConfig_updatedRemove(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + ), + }, + }, + }) +} + +func testAccCheckTrustStoreDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_trust_store" { + continue + } + + _, err := tfworkspacesweb.FindTrustStoreByARN(ctx, conn, rs.Primary.Attributes["trust_store_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + return fmt.Errorf("WorkSpaces Web Trust Store %s still exists", rs.Primary.Attributes["trust_store_arn"]) + } + + return nil + } +} + +func testAccCheckTrustStoreExists(ctx context.Context, n string, v *awstypes.TrustStore) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindTrustStoreByARN(ctx, conn, rs.Primary.Attributes["trust_store_arn"]) + + if err != nil { + return err + } + + *v = *output + + return nil + } +} +func testAccTrustStoreConfig_acmBase() string { + return (` +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test1" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_acmpca_certificate" "test2" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} +`) +} + +func testAccTrustStoreConfig_basic() string { + return acctest.ConfigCompose( + testAccTrustStoreConfig_acmBase(), + ` +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test1.certificate] +} +`) +} + +func testAccTrustStoreConfig_updatedAdd() string { + return acctest.ConfigCompose( + testAccTrustStoreConfig_acmBase(), + ` +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test1.certificate, aws_acmpca_certificate.test2.certificate] +} +`) +} + +func testAccTrustStoreConfig_updatedRemove() string { + return acctest.ConfigCompose( + testAccTrustStoreConfig_acmBase(), + ` +resource "aws_workspacesweb_trust_store" "test" { + certificate_list = [aws_acmpca_certificate.test2.certificate] +} +`) +} diff --git a/website/docs/r/workspacesweb_trust_store.html.markdown b/website/docs/r/workspacesweb_trust_store.html.markdown new file mode 100644 index 000000000000..bf26fc962666 --- /dev/null +++ b/website/docs/r/workspacesweb_trust_store.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store. +--- +` +# Resource: aws_workspacesweb_trust_store + +Terraform resource for managing an AWS WorkSpaces Web Trust Store. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_trust_store" "example" { +} +``` + +## Argument Reference + +The following arguments are required: + +* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +The following arguments are optional: + +* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Trust Store. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store using the `example_id_arg`. For example: + +```terraform +import { + to = aws_workspacesweb_trust_store.example + id = "trust_store-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Trust Store using the `example_id_arg`. For example: + +```console +% terraform import aws_workspacesweb_trust_store.example trust_store-id-12345678 +``` From 94802f1f85b48fb4736d205f62cf81c54fa242ec Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Thu, 26 Jun 2025 11:32:12 +0000 Subject: [PATCH 0101/2115] Acceptance tests pass --- .../testdata/TrustStore/tags/main_gen.tf | 4 +- .../TrustStore/tagsComputed1/main_gen.tf | 4 +- .../TrustStore/tagsComputed2/main_gen.tf | 4 +- .../TrustStore/tags_defaults/main_gen.tf | 4 +- .../TrustStore/tags_ignore/main_gen.tf | 4 +- .../testdata/tmpl/trust_store_tags.gtpl | 4 +- internal/service/workspacesweb/trust_store.go | 212 +++++++++++++++--- .../service/workspacesweb/trust_store_test.go | 121 +++++++++- .../r/workspacesweb_trust_store.html.markdown | 55 +++-- 9 files changed, 348 insertions(+), 64 deletions(-) diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf index 4168eda2e7a3..0b8bcbab8cf9 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf @@ -28,7 +28,9 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } tags = var.resource_tags } diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf index 00de80faea55..ca0d3d49dcd0 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf @@ -30,7 +30,9 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } tags = { (var.unknownTagKey) = null_resource.test.id diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf index 794639d1a764..ff4df5a369e6 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf @@ -30,7 +30,9 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } tags = { (var.unknownTagKey) = null_resource.test.id diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf index fcf42730c050..36360aee4e73 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf @@ -34,7 +34,9 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } tags = var.resource_tags } diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf index c057002d330d..fcb259581b57 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf @@ -37,7 +37,9 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } tags = var.resource_tags } diff --git a/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl index 8af35c5e6931..725c326d60f3 100644 --- a/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl @@ -25,6 +25,8 @@ resource "aws_acmpca_certificate" "test" { } resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test.certificate] + certificate { + body = aws_acmpca_certificate.test.certificate + } {{- template "tags" . }} } diff --git a/internal/service/workspacesweb/trust_store.go b/internal/service/workspacesweb/trust_store.go index b1412edf1f7f..4dbd2a4ad790 100644 --- a/internal/service/workspacesweb/trust_store.go +++ b/internal/service/workspacesweb/trust_store.go @@ -5,20 +5,25 @@ package workspacesweb import ( "context" + "encoding/base64" "fmt" "strings" + "time" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" - "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" @@ -58,14 +63,6 @@ func (r *trustStoreResource) Schema(ctx context.Context, request resource.Schema listplanmodifier.UseStateForUnknown(), }, }, - "certificate_list": schema.ListAttribute{ - CustomType: fwtypes.ListOfStringType, - ElementType: types.StringType, - Required: true, - Validators: []validator.List{ - listvalidator.SizeAtLeast(1), - }, - }, names.AttrTags: tftags.TagsAttribute(), names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), "trust_store_arn": schema.StringAttribute{ @@ -75,6 +72,39 @@ func (r *trustStoreResource) Schema(ctx context.Context, request resource.Schema }, }, }, + Blocks: map[string]schema.Block{ + "certificate": schema.SetNestedBlock{ + CustomType: fwtypes.NewSetNestedObjectTypeOf[certificateModel](ctx), + Validators: []validator.Set{ + setvalidator.SizeAtLeast(0), + }, + PlanModifiers: []planmodifier.Set{ + setplanmodifier.UseStateForUnknown(), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "body": schema.StringAttribute{ + Required: true, + }, + "issuer": schema.StringAttribute{ + Computed: true, + }, + "not_valid_after": schema.StringAttribute{ + Computed: true, + }, + "not_valid_before": schema.StringAttribute{ + Computed: true, + }, + "subject": schema.StringAttribute{ + Computed: true, + }, + "thumbprint": schema.StringAttribute{ + Computed: true, + }, + }, + }, + }, + }, } } @@ -93,9 +123,12 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create } // Convert string certificates to byte slices - for _, cert := range data.CertificateList.Elements() { - // Remove the leading and trailing double quotes. Also remove the literals "\n" to replace with line feeds - formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") + for _, cert := range data.Certificates.Elements() { + var certValue certificateModel + if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { + continue + } + formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") input.CertificateList = append(input.CertificateList, []byte(formatted_cert)) } @@ -120,6 +153,27 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create return } + // Populate certificate details + certificates, err := listTrustStoreCertificates(ctx, conn, data.TrustStoreARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("listing WorkSpacesWeb Trust Store Certificates (%s)", data.TrustStoreARN.ValueString()), err.Error()) + return + } + + var d diag.Diagnostics + data.Certificates, d = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { + return + } + + for _, cert := range data.Certificates.Elements() { + var certValue certificateModel + if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { + continue + } + } response.Diagnostics.Append(response.State.Set(ctx, data)...) } @@ -149,6 +203,15 @@ func (r *trustStoreResource) Read(ctx context.Context, request resource.ReadRequ return } + // Populate certificate details by merging existing state with computed values + certificates, err := listTrustStoreCertificates(ctx, conn, data.TrustStoreARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("listing WorkSpacesWeb Trust Store Certificates (%s)", data.TrustStoreARN.ValueString()), err.Error()) + return + } + + data.Certificates, _ = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } @@ -165,36 +228,49 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update conn := r.Meta().WorkSpacesWebClient(ctx) - if !new.CertificateList.Equal(old.CertificateList) { + if !new.Certificates.Equal(old.Certificates) { input := &workspacesweb.UpdateTrustStoreInput{ TrustStoreArn: aws.String(new.TrustStoreARN.ValueString()), ClientToken: aws.String(sdkid.UniqueId()), } // Handle certificate additions and deletions - oldCerts := make(map[string]bool) - for _, cert := range old.CertificateList.Elements() { - oldCerts[cert.String()] = true + oldCerts := make(map[string]string) // cert content -> thumbprint + for _, cert := range old.Certificates.Elements() { + var certValue certificateModel + if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { + continue + } + oldCerts[base64.StdEncoding.EncodeToString([]byte(certValue.Body.ValueString()))] = certValue.Thumbprint.ValueString() } - newCerts := make(map[string]bool) - for _, cert := range new.CertificateList.Elements() { - newCerts[cert.String()] = true + newCertContents := make(map[string]bool) + for _, cert := range new.Certificates.Elements() { + var certValue certificateModel + if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { + continue + } + formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") + newCertContents[base64.StdEncoding.EncodeToString([]byte(formatted_cert))] = true } // Find certificates to add - for _, cert := range new.CertificateList.Elements() { - if !oldCerts[cert.String()] { - formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") + for _, cert := range new.Certificates.Elements() { + var certValue certificateModel + if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { + continue + } + formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") + certEncoded := base64.StdEncoding.EncodeToString([]byte(formatted_cert)) + if _, exists := oldCerts[certEncoded]; !exists { input.CertificatesToAdd = append(input.CertificatesToAdd, []byte(formatted_cert)) } } - // Find certificates to delete - for _, cert := range old.CertificateList.Elements() { - if !newCerts[cert.String()] { - formatted_cert := strings.ReplaceAll(strings.Trim(cert.String(), "\""), `\n`, "\n") - input.CertificatesToDelete = append(input.CertificatesToDelete, formatted_cert) + // Find certificates to delete (by thumbprint) + for certEncoded, thumbprint := range oldCerts { + if !newCertContents[certEncoded] { + input.CertificatesToDelete = append(input.CertificatesToDelete, thumbprint) } } @@ -206,6 +282,27 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update } } + // Read the updated state to get computed values + updatedTrustStore, err := findTrustStoreByARN(ctx, conn, new.TrustStoreARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Trust Store (%s) after update", new.TrustStoreARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, updatedTrustStore, &new)...) + if response.Diagnostics.HasError() { + return + } + + // Populate certificate details by merging planned data with computed values + certificates, err := listTrustStoreCertificates(ctx, conn, new.TrustStoreARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("listing WorkSpacesWeb Trust Store Certificates (%s) after update", new.TrustStoreARN.ValueString()), err.Error()) + return + } + + new.Certificates, _ = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } @@ -261,10 +358,61 @@ func findTrustStoreByARN(ctx context.Context, conn *workspacesweb.Client, arn st return output.TrustStore, nil } +func listTrustStoreCertificates(ctx context.Context, conn *workspacesweb.Client, arn string) ([]certificateModel, error) { + input := &workspacesweb.ListTrustStoreCertificatesInput{ + TrustStoreArn: aws.String(arn), + } + + var certificates []certificateModel + paginator := workspacesweb.NewListTrustStoreCertificatesPaginator(conn, input) + + for paginator.HasMorePages() { + output, err := paginator.NextPage(ctx) + if err != nil { + return nil, err + } + + for _, certSummary := range output.CertificateList { + // Get detailed certificate information + certInput := &workspacesweb.GetTrustStoreCertificateInput{ + TrustStoreArn: aws.String(arn), + Thumbprint: certSummary.Thumbprint, + } + + certOutput, err := conn.GetTrustStoreCertificate(ctx, certInput) + if err != nil { + return nil, err + } + if certOutput.Certificate != nil { + cert := certificateModel{ + Body: types.StringValue(string(certOutput.Certificate.Body)), + Issuer: types.StringPointerValue(certOutput.Certificate.Issuer), + NotValidAfter: types.StringValue(aws.ToTime(certOutput.Certificate.NotValidAfter).Format(time.RFC3339)), + NotValidBefore: types.StringValue(aws.ToTime(certOutput.Certificate.NotValidBefore).Format(time.RFC3339)), + Subject: types.StringPointerValue(certOutput.Certificate.Subject), + Thumbprint: types.StringPointerValue(certOutput.Certificate.Thumbprint), + } + certificates = append(certificates, cert) + } + } + } + + return certificates, nil +} + type trustStoreResourceModel struct { - AssociatedPortalARNs fwtypes.ListOfString `tfsdk:"associated_portal_arns"` - CertificateList fwtypes.ListOfString `tfsdk:"certificate_list"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` - TrustStoreARN types.String `tfsdk:"trust_store_arn"` + AssociatedPortalARNs fwtypes.ListOfString `tfsdk:"associated_portal_arns"` + Certificates fwtypes.SetNestedObjectValueOf[certificateModel] `tfsdk:"certificate"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TrustStoreARN types.String `tfsdk:"trust_store_arn"` +} + +type certificateModel struct { + Body types.String `tfsdk:"body"` + Issuer types.String `tfsdk:"issuer"` + NotValidAfter types.String `tfsdk:"not_valid_after"` + NotValidBefore types.String `tfsdk:"not_valid_before"` + Subject types.String `tfsdk:"subject"` + Thumbprint types.String `tfsdk:"thumbprint"` } diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index 0fc08be2b837..928b443a890b 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -39,15 +39,67 @@ func TestAccWorkSpacesWebTrustStore_basic(t *testing.T) { Config: testAccTrustStoreConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), - resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStore_multipleCerts(t *testing.T) { + ctx := acctest.Context(t) + var trustStore awstypes.TrustStore + resourceName := "aws_workspacesweb_trust_store.test" + //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreConfig_multipleCerts(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttr(resourceName, "certificate.#", "2"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.thumbprint"), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"certificate_list"}, ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), ImportStateVerifyIdentifierAttribute: "trust_store_arn", }, @@ -103,14 +155,20 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { Config: testAccTrustStoreConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), - resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"certificate_list"}, ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), ImportStateVerifyIdentifierAttribute: "trust_store_arn", }, @@ -118,14 +176,26 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { Config: testAccTrustStoreConfig_updatedAdd(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), - resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "2"), + resource.TestCheckResourceAttr(resourceName, "certificate.#", "2"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.1.thumbprint"), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"certificate_list"}, ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "trust_store_arn"), ImportStateVerifyIdentifierAttribute: "trust_store_arn", }, @@ -133,7 +203,14 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { Config: testAccTrustStoreConfig_updatedRemove(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), - resource.TestCheckResourceAttr(resourceName, "certificate_list.#", "1"), + resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), + resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), ), }, }, @@ -234,7 +311,24 @@ func testAccTrustStoreConfig_basic() string { testAccTrustStoreConfig_acmBase(), ` resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test1.certificate] + certificate { + body = aws_acmpca_certificate.test1.certificate + } +} +`) +} + +func testAccTrustStoreConfig_multipleCerts() string { + return acctest.ConfigCompose( + testAccTrustStoreConfig_acmBase(), + ` +resource "aws_workspacesweb_trust_store" "test" { + certificate { + body = aws_acmpca_certificate.test1.certificate + } + certificate { + body = aws_acmpca_certificate.test2.certificate + } } `) } @@ -244,7 +338,12 @@ func testAccTrustStoreConfig_updatedAdd() string { testAccTrustStoreConfig_acmBase(), ` resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test1.certificate, aws_acmpca_certificate.test2.certificate] + certificate { + body = aws_acmpca_certificate.test1.certificate + } + certificate { + body = aws_acmpca_certificate.test2.certificate + } } `) } @@ -254,7 +353,9 @@ func testAccTrustStoreConfig_updatedRemove() string { testAccTrustStoreConfig_acmBase(), ` resource "aws_workspacesweb_trust_store" "test" { - certificate_list = [aws_acmpca_certificate.test2.certificate] + certificate { + body = aws_acmpca_certificate.test2.certificate + } } `) } diff --git a/website/docs/r/workspacesweb_trust_store.html.markdown b/website/docs/r/workspacesweb_trust_store.html.markdown index bf26fc962666..4ea52d364518 100644 --- a/website/docs/r/workspacesweb_trust_store.html.markdown +++ b/website/docs/r/workspacesweb_trust_store.html.markdown @@ -23,47 +23,70 @@ Terraform resource for managing an AWS WorkSpaces Web Trust Store. ```terraform resource "aws_workspacesweb_trust_store" "example" { + certificate { + body = file("certificate.pem") + } } ``` -## Argument Reference +### Multiple Certificates -The following arguments are required: +```terraform +resource "aws_workspacesweb_trust_store" "example" { + certificate { + body = file("certificate1.pem") + } + + certificate { + body = file("certificate2.pem") + } + + tags = { + Name = "example-trust-store" + } +} +``` -* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +## Argument Reference The following arguments are optional: -* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `certificate` - (Optional) Set of certificates to include in the trust store. See [Certificate](#certificate) below. +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Certificate + +* `body` - (Required) Certificate body in PEM format. ## Attribute Reference This resource exports the following attributes in addition to the arguments above: -* `arn` - ARN of the Trust Store. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. -* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. - -## Timeouts +* `associated_portal_arns` - List of ARNs of the web portals associated with the trust store. +* `trust_store_arn` - ARN of the trust store. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). -[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): +The `certificate` block exports the following additional attributes: -* `create` - (Default `60m`) -* `update` - (Default `180m`) -* `delete` - (Default `90m`) +* `issuer` - Certificate issuer. +* `not_valid_after` - Date and time when the certificate expires in RFC3339 format. +* `not_valid_before` - Date and time when the certificate becomes valid in RFC3339 format. +* `subject` - Certificate subject. +* `thumbprint` - Certificate thumbprint. ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store using the `example_id_arg`. For example: +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store using the `trust_store_arn`. For example: ```terraform import { to = aws_workspacesweb_trust_store.example - id = "trust_store-id-12345678" + id = "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678" } ``` -Using `terraform import`, import WorkSpaces Web Trust Store using the `example_id_arg`. For example: +Using `terraform import`, import WorkSpaces Web Trust Store using the `trust_store_arn`. For example: ```console -% terraform import aws_workspacesweb_trust_store.example trust_store-id-12345678 +% terraform import aws_workspacesweb_trust_store.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678 ``` From 00feb82525e7034424efdefa0f2d15fc55e78f13 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 16 Jul 2025 16:17:44 +0000 Subject: [PATCH 0102/2115] Fixed lint, doc and other bugs --- .../service/workspacesweb/exports_test.go | 6 -- .../workspacesweb/service_package_gen.go | 5 +- .../testdata/TrustStore/tags/main_gen.tf | 10 ++-- .../TrustStore/tagsComputed1/main_gen.tf | 10 ++-- .../TrustStore/tagsComputed2/main_gen.tf | 10 ++-- .../TrustStore/tags_defaults/main_gen.tf | 10 ++-- .../TrustStore/tags_ignore/main_gen.tf | 10 ++-- .../testdata/tmpl/trust_store_tags.gtpl | 10 ++-- internal/service/workspacesweb/trust_store.go | 23 ++++---- .../trust_store_tags_gen_test.go | 54 +++++++++--------- .../service/workspacesweb/trust_store_test.go | 55 +++++++++---------- .../r/workspacesweb_trust_store.html.markdown | 4 +- 12 files changed, 101 insertions(+), 106 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index d4cefa95899c..59becb135b2d 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -9,10 +9,7 @@ var ( ResourceDataProtectionSettings = newDataProtectionSettingsResource ResourceIPAccessSettings = newIPAccessSettingsResource ResourceNetworkSettings = newNetworkSettingsResource -<<<<<<< HEAD -======= ResourceTrustStore = newTrustStoreResource ->>>>>>> 414521b8b0 (Added resource aws_workspacesweb_trust_store.) ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserSettings = newUserSettingsResource @@ -20,10 +17,7 @@ var ( FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN FindIPAccessSettingsByARN = findIPAccessSettingsByARN FindNetworkSettingsByARN = findNetworkSettingsByARN -<<<<<<< HEAD -======= FindTrustStoreByARN = findTrustStoreByARN ->>>>>>> 414521b8b0 (Added resource aws_workspacesweb_trust_store.) FindUserAccessLoggingSettingsByARN = findUserAccessLoggingSettingsByARN FindUserSettingsByARN = findUserSettingsByARN ) diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 709c6456595b..b1b470fbc33e 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -64,9 +64,10 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Factory: newTrustStoreResource, TypeName: "aws_workspacesweb_trust_store", Name: "Trust Store", - Tags: &types.ServicePackageResourceTags{ + Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: "trust_store_arn", - }, + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), }, { Factory: newUserAccessLoggingSettingsResource, diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf index 0b8bcbab8cf9..bad3f7af8411 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags/main_gen.tf @@ -3,11 +3,11 @@ resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -17,10 +17,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf index ca0d3d49dcd0..f3df14a6aff7 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed1/main_gen.tf @@ -5,11 +5,11 @@ provider "null" {} resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -19,10 +19,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf index ff4df5a369e6..9919aee9fb88 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tagsComputed2/main_gen.tf @@ -5,11 +5,11 @@ provider "null" {} resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -19,10 +19,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf index 36360aee4e73..62fa9ecde689 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_defaults/main_gen.tf @@ -9,11 +9,11 @@ provider "aws" { resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -23,10 +23,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf index fcb259581b57..fb60b0ee3c65 100644 --- a/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/TrustStore/tags_ignore/main_gen.tf @@ -12,11 +12,11 @@ provider "aws" { resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -26,10 +26,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl index 725c326d60f3..e1b5497a5769 100644 --- a/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/trust_store_tags.gtpl @@ -1,10 +1,10 @@ resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -14,10 +14,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 diff --git a/internal/service/workspacesweb/trust_store.go b/internal/service/workspacesweb/trust_store.go index 4dbd2a4ad790..3636d6da8ff8 100644 --- a/internal/service/workspacesweb/trust_store.go +++ b/internal/service/workspacesweb/trust_store.go @@ -49,7 +49,7 @@ func newTrustStoreResource(_ context.Context) (resource.ResourceWithConfigure, e } type trustStoreResource struct { - framework.ResourceWithConfigure + framework.ResourceWithModel[trustStoreResourceModel] } func (r *trustStoreResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { @@ -73,7 +73,7 @@ func (r *trustStoreResource) Schema(ctx context.Context, request resource.Schema }, }, Blocks: map[string]schema.Block{ - "certificate": schema.SetNestedBlock{ + names.AttrCertificate: schema.SetNestedBlock{ CustomType: fwtypes.NewSetNestedObjectTypeOf[certificateModel](ctx), Validators: []validator.Set{ setvalidator.SizeAtLeast(0), @@ -86,7 +86,7 @@ func (r *trustStoreResource) Schema(ctx context.Context, request resource.Schema "body": schema.StringAttribute{ Required: true, }, - "issuer": schema.StringAttribute{ + names.AttrIssuer: schema.StringAttribute{ Computed: true, }, "not_valid_after": schema.StringAttribute{ @@ -117,7 +117,7 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create conn := r.Meta().WorkSpacesWebClient(ctx) - input := &workspacesweb.CreateTrustStoreInput{ + input := workspacesweb.CreateTrustStoreInput{ ClientToken: aws.String(sdkid.UniqueId()), Tags: getTagsIn(ctx), } @@ -132,7 +132,7 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create input.CertificateList = append(input.CertificateList, []byte(formatted_cert)) } - output, err := conn.CreateTrustStore(ctx, input) + output, err := conn.CreateTrustStore(ctx, &input) if err != nil { response.Diagnostics.AddError("creating WorkSpacesWeb Trust Store", err.Error()) @@ -229,8 +229,8 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update conn := r.Meta().WorkSpacesWebClient(ctx) if !new.Certificates.Equal(old.Certificates) { - input := &workspacesweb.UpdateTrustStoreInput{ - TrustStoreArn: aws.String(new.TrustStoreARN.ValueString()), + input := workspacesweb.UpdateTrustStoreInput{ + TrustStoreArn: new.TrustStoreARN.ValueStringPointer(), ClientToken: aws.String(sdkid.UniqueId()), } @@ -274,7 +274,7 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update } } - _, err := conn.UpdateTrustStore(ctx, input) + _, err := conn.UpdateTrustStore(ctx, &input) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Trust Store (%s)", new.TrustStoreARN.ValueString()), err.Error()) @@ -316,7 +316,7 @@ func (r *trustStoreResource) Delete(ctx context.Context, request resource.Delete conn := r.Meta().WorkSpacesWebClient(ctx) input := workspacesweb.DeleteTrustStoreInput{ - TrustStoreArn: aws.String(data.TrustStoreARN.ValueString()), + TrustStoreArn: data.TrustStoreARN.ValueStringPointer(), } _, err := conn.DeleteTrustStore(ctx, &input) @@ -374,12 +374,12 @@ func listTrustStoreCertificates(ctx context.Context, conn *workspacesweb.Client, for _, certSummary := range output.CertificateList { // Get detailed certificate information - certInput := &workspacesweb.GetTrustStoreCertificateInput{ + certInput := workspacesweb.GetTrustStoreCertificateInput{ TrustStoreArn: aws.String(arn), Thumbprint: certSummary.Thumbprint, } - certOutput, err := conn.GetTrustStoreCertificate(ctx, certInput) + certOutput, err := conn.GetTrustStoreCertificate(ctx, &certInput) if err != nil { return nil, err } @@ -401,6 +401,7 @@ func listTrustStoreCertificates(ctx context.Context, conn *workspacesweb.Client, } type trustStoreResourceModel struct { + framework.WithRegionModel AssociatedPortalARNs fwtypes.ListOfString `tfsdk:"associated_portal_arns"` Certificates fwtypes.SetNestedObjectValueOf[certificateModel] `tfsdk:"certificate"` Tags tftags.Map `tfsdk:"tags"` diff --git a/internal/service/workspacesweb/trust_store_tags_gen_test.go b/internal/service/workspacesweb/trust_store_tags_gen_test.go index 719743600393..ed81dfe3bd34 100644 --- a/internal/service/workspacesweb/trust_store_tags_gen_test.go +++ b/internal/service/workspacesweb/trust_store_tags_gen_test.go @@ -21,7 +21,7 @@ func TestAccWorkSpacesWebTrustStore_tags(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -214,7 +214,7 @@ func TestAccWorkSpacesWebTrustStore_tags_null(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -276,7 +276,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyMap(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -326,7 +326,7 @@ func TestAccWorkSpacesWebTrustStore_tags_AddOnUpdate(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -407,7 +407,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnCreate(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -502,7 +502,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Add(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -645,7 +645,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Replace(t *testing.T) var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -736,7 +736,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_providerOnly(t *testing.T) var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -928,7 +928,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nonOverlapping(t *testing.T var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1096,7 +1096,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_overlapping(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1280,7 +1280,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToProviderOnly(t *tes var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1371,7 +1371,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToResourceOnly(t *tes var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1461,7 +1461,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyResourceTag(t *testing var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1529,7 +1529,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyProviderOnlyTag(t *tes var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1589,7 +1589,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullOverlappingResourceTag( var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1658,7 +1658,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullNonOverlappingResourceT var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1729,7 +1729,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnCreate(t *testing.T) { var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1786,7 +1786,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Add(t *testing.T) var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1884,7 +1884,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Replace(t *testing var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -1972,7 +1972,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testin var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -2002,7 +2002,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testin statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), @@ -2050,7 +2050,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testin statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), })), @@ -2098,7 +2098,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testin statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), })), @@ -2130,7 +2130,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testi var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), CheckDestroy: testAccCheckTrustStoreDestroy(ctx), @@ -2159,7 +2159,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testi statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), @@ -2216,7 +2216,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testi statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), })), @@ -2272,7 +2272,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testi statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), })), - expectFullResourceTags(resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), })), diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index 928b443a890b..031edb4e9a66 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -41,7 +41,7 @@ func TestAccWorkSpacesWebTrustStore_basic(t *testing.T) { testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), - resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), @@ -82,13 +82,13 @@ func TestAccWorkSpacesWebTrustStore_multipleCerts(t *testing.T) { testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), resource.TestCheckResourceAttr(resourceName, "certificate.#", "2"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), - resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), - resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_before"), @@ -157,7 +157,7 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), - resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test1", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), @@ -178,13 +178,13 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), resource.TestCheckResourceAttr(resourceName, "certificate.#", "2"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), - resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", "certificate"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test1", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.subject"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.thumbprint"), - resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckTypeSetElemAttrPair(resourceName, "certificate.*.body", "aws_acmpca_certificate.test2", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.1.not_valid_before"), @@ -205,7 +205,7 @@ func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { testAccCheckTrustStoreExists(ctx, resourceName, &trustStore), resource.TestCheckResourceAttr(resourceName, "certificate.#", "1"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "trust_store_arn", "workspaces-web", regexache.MustCompile(`trustStore/.+$`)), - resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test2", "certificate"), + resource.TestCheckResourceAttrPair(resourceName, "certificate.0.body", "aws_acmpca_certificate.test2", names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.issuer"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_after"), resource.TestCheckResourceAttrSet(resourceName, "certificate.0.not_valid_before"), @@ -249,7 +249,6 @@ func testAccCheckTrustStoreExists(ctx context.Context, n string, v *awstypes.Tru if !ok { return fmt.Errorf("Not found: %s", n) } - conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) output, err := tfworkspacesweb.FindTrustStoreByARN(ctx, conn, rs.Primary.Attributes["trust_store_arn"]) @@ -267,11 +266,11 @@ func testAccTrustStoreConfig_acmBase() string { return (` resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" - + certificate_authority_configuration { key_algorithm = "RSA_2048" signing_algorithm = "SHA256WITHRSA" - + subject { common_name = "example.com" } @@ -281,10 +280,10 @@ resource "aws_acmpca_certificate_authority" "test" { resource "aws_acmpca_certificate" "test1" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 @@ -294,10 +293,10 @@ resource "aws_acmpca_certificate" "test1" { resource "aws_acmpca_certificate" "test2" { certificate_authority_arn = aws_acmpca_certificate_authority.test.arn certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request - signing_algorithm = "SHA256WITHRSA" - + signing_algorithm = "SHA256WITHRSA" + template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" - + validity { type = "YEARS" value = 1 @@ -312,8 +311,8 @@ func testAccTrustStoreConfig_basic() string { ` resource "aws_workspacesweb_trust_store" "test" { certificate { - body = aws_acmpca_certificate.test1.certificate - } + body = aws_acmpca_certificate.test1.certificate + } } `) } @@ -324,11 +323,11 @@ func testAccTrustStoreConfig_multipleCerts() string { ` resource "aws_workspacesweb_trust_store" "test" { certificate { - body = aws_acmpca_certificate.test1.certificate - } + body = aws_acmpca_certificate.test1.certificate + } certificate { - body = aws_acmpca_certificate.test2.certificate - } + body = aws_acmpca_certificate.test2.certificate + } } `) } @@ -339,11 +338,11 @@ func testAccTrustStoreConfig_updatedAdd() string { ` resource "aws_workspacesweb_trust_store" "test" { certificate { - body = aws_acmpca_certificate.test1.certificate - } + body = aws_acmpca_certificate.test1.certificate + } certificate { - body = aws_acmpca_certificate.test2.certificate - } + body = aws_acmpca_certificate.test2.certificate + } } `) } @@ -354,8 +353,8 @@ func testAccTrustStoreConfig_updatedRemove() string { ` resource "aws_workspacesweb_trust_store" "test" { certificate { - body = aws_acmpca_certificate.test2.certificate - } + body = aws_acmpca_certificate.test2.certificate + } } `) } diff --git a/website/docs/r/workspacesweb_trust_store.html.markdown b/website/docs/r/workspacesweb_trust_store.html.markdown index 4ea52d364518..d3adaa772ad1 100644 --- a/website/docs/r/workspacesweb_trust_store.html.markdown +++ b/website/docs/r/workspacesweb_trust_store.html.markdown @@ -36,11 +36,11 @@ resource "aws_workspacesweb_trust_store" "example" { certificate { body = file("certificate1.pem") } - + certificate { body = file("certificate2.pem") } - + tags = { Name = "example-trust-store" } From 2007cbbd09861a90d2f178468128d6a9ca7827cc Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 16 Jul 2025 16:45:41 +0000 Subject: [PATCH 0103/2115] Added change long and fixed some lint issues --- .changelog/43408.txt | 3 +++ internal/service/workspacesweb/trust_store.go | 4 ++-- internal/service/workspacesweb/trust_store_test.go | 4 ++-- website/docs/r/workspacesweb_trust_store.html.markdown | 10 ++-------- 4 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 .changelog/43408.txt diff --git a/.changelog/43408.txt b/.changelog/43408.txt new file mode 100644 index 000000000000..851196e82ded --- /dev/null +++ b/.changelog/43408.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_trust_store +``` \ No newline at end of file diff --git a/internal/service/workspacesweb/trust_store.go b/internal/service/workspacesweb/trust_store.go index 3636d6da8ff8..0839125157c6 100644 --- a/internal/service/workspacesweb/trust_store.go +++ b/internal/service/workspacesweb/trust_store.go @@ -359,12 +359,12 @@ func findTrustStoreByARN(ctx context.Context, conn *workspacesweb.Client, arn st } func listTrustStoreCertificates(ctx context.Context, conn *workspacesweb.Client, arn string) ([]certificateModel, error) { - input := &workspacesweb.ListTrustStoreCertificatesInput{ + input := workspacesweb.ListTrustStoreCertificatesInput{ TrustStoreArn: aws.String(arn), } var certificates []certificateModel - paginator := workspacesweb.NewListTrustStoreCertificatesPaginator(conn, input) + paginator := workspacesweb.NewListTrustStoreCertificatesPaginator(conn, &input) for paginator.HasMorePages() { output, err := paginator.NextPage(ctx) diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index 031edb4e9a66..04c0dfe66227 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -282,7 +282,7 @@ resource "aws_acmpca_certificate" "test1" { certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request signing_algorithm = "SHA256WITHRSA" - template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + template_arn = "arn:${data.aws_partition.current.partition}:acm-pca:::template/RootCACertificate/V1" validity { type = "YEARS" @@ -295,7 +295,7 @@ resource "aws_acmpca_certificate" "test2" { certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request signing_algorithm = "SHA256WITHRSA" - template_arn = "arn:aws:acm-pca:::template/RootCACertificate/V1" + template_arn = "arn:${data.aws_partition.current.partition}:acm-pca:::template/RootCACertificate/V1" validity { type = "YEARS" diff --git a/website/docs/r/workspacesweb_trust_store.html.markdown b/website/docs/r/workspacesweb_trust_store.html.markdown index d3adaa772ad1..ad3e51231b4c 100644 --- a/website/docs/r/workspacesweb_trust_store.html.markdown +++ b/website/docs/r/workspacesweb_trust_store.html.markdown @@ -5,14 +5,7 @@ page_title: "AWS: aws_workspacesweb_trust_store" description: |- Terraform resource for managing an AWS WorkSpaces Web Trust Store. --- -` + # Resource: aws_workspacesweb_trust_store Terraform resource for managing an AWS WorkSpaces Web Trust Store. @@ -51,6 +44,7 @@ resource "aws_workspacesweb_trust_store" "example" { The following arguments are optional: +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the * `certificate` - (Optional) Set of certificates to include in the trust store. See [Certificate](#certificate) below. * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From 80cdaa8a1a5f62ab1704da625020879aaf3a4c8d Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 16 Jul 2025 16:45:41 +0000 Subject: [PATCH 0104/2115] Added change long and fixed some lint issues --- internal/service/workspacesweb/trust_store_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index 04c0dfe66227..df458e35b3ca 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -264,6 +264,9 @@ func testAccCheckTrustStoreExists(ctx context.Context, n string, v *awstypes.Tru } func testAccTrustStoreConfig_acmBase() string { return (` + +data "aws_partition" "current" {} + resource "aws_acmpca_certificate_authority" "test" { type = "ROOT" From dd8841ea43a0784b174003f9efa57c26ab46ab5f Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Thu, 17 Jul 2025 08:09:58 +0000 Subject: [PATCH 0105/2115] Fixed typo in markdown file --- website/docs/r/workspacesweb_trust_store.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/workspacesweb_trust_store.html.markdown b/website/docs/r/workspacesweb_trust_store.html.markdown index ad3e51231b4c..38a8e5f54a87 100644 --- a/website/docs/r/workspacesweb_trust_store.html.markdown +++ b/website/docs/r/workspacesweb_trust_store.html.markdown @@ -44,7 +44,7 @@ resource "aws_workspacesweb_trust_store" "example" { The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `certificate` - (Optional) Set of certificates to include in the trust store. See [Certificate](#certificate) below. * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From d1927516750d40a0f8e862c011b29a8cc51cf375 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Mon, 11 Aug 2025 09:04:40 +0000 Subject: [PATCH 0106/2115] Regenerated tags tests --- .../trust_store_tags_gen_test.go | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/internal/service/workspacesweb/trust_store_tags_gen_test.go b/internal/service/workspacesweb/trust_store_tags_gen_test.go index ed81dfe3bd34..dd06651003cf 100644 --- a/internal/service/workspacesweb/trust_store_tags_gen_test.go +++ b/internal/service/workspacesweb/trust_store_tags_gen_test.go @@ -18,6 +18,7 @@ import ( func TestAccWorkSpacesWebTrustStore_tags(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -211,6 +212,7 @@ func TestAccWorkSpacesWebTrustStore_tags(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_null(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -273,6 +275,7 @@ func TestAccWorkSpacesWebTrustStore_tags_null(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_EmptyMap(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -323,6 +326,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyMap(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_AddOnUpdate(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -404,6 +408,7 @@ func TestAccWorkSpacesWebTrustStore_tags_AddOnUpdate(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -499,6 +504,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnCreate(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -642,6 +648,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Add(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -733,6 +740,7 @@ func TestAccWorkSpacesWebTrustStore_tags_EmptyTag_OnUpdate_Replace(t *testing.T) func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_providerOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -925,6 +933,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_providerOnly(t *testing.T) func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nonOverlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1093,6 +1102,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nonOverlapping(t *testing.T func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_overlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1277,6 +1287,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_overlapping(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1368,6 +1379,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToProviderOnly(t *tes func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1458,6 +1470,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_updateToResourceOnly(t *tes func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1526,6 +1539,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyResourceTag(t *testing func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1586,6 +1600,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_emptyProviderOnlyTag(t *tes func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1655,6 +1670,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullOverlappingResourceTag( func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1726,6 +1742,7 @@ func TestAccWorkSpacesWebTrustStore_tags_DefaultTags_nullNonOverlappingResourceT func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1783,6 +1800,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnCreate(t *testing.T) { func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1881,6 +1899,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Add(t *testing.T) func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -1969,6 +1988,7 @@ func TestAccWorkSpacesWebTrustStore_tags_ComputedTag_OnUpdate_Replace(t *testing func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" @@ -2127,6 +2147,7 @@ func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_DefaultTag(t *testin func TestAccWorkSpacesWebTrustStore_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.TrustStore resourceName := "aws_workspacesweb_trust_store.test" From 0d8ced1ebbd02bfd297f579be887e59584aca9e9 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Tue, 3 Jun 2025 08:56:27 +0000 Subject: [PATCH 0107/2115] Skaff Generated Code --- internal/service/workspacesweb/portal.go | 649 ++++++++++++++++++ internal/service/workspacesweb/portal_test.go | 331 +++++++++ .../docs/r/workspacesweb_portal.html.markdown | 69 ++ 3 files changed, 1049 insertions(+) create mode 100644 internal/service/workspacesweb/portal.go create mode 100644 internal/service/workspacesweb/portal_test.go create mode 100644 website/docs/r/workspacesweb_portal.html.markdown diff --git a/internal/service/workspacesweb/portal.go b/internal/service/workspacesweb/portal.go new file mode 100644 index 000000000000..e16b15c4febc --- /dev/null +++ b/internal/service/workspacesweb/portal.go @@ -0,0 +1,649 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb +// **PLEASE DELETE THIS AND ALL TIP COMMENTS BEFORE SUBMITTING A PR FOR REVIEW!** +// +// TIP: ==== INTRODUCTION ==== +// Thank you for trying the skaff tool! +// +// You have opted to include these helpful comments. They all include "TIP:" +// to help you find and remove them when you're done with them. +// +// While some aspects of this file are customized to your input, the +// scaffold tool does *not* look at the AWS API and ensure it has correct +// function, structure, and variable names. It makes guesses based on +// commonalities. You will need to make significant adjustments. +// +// In other words, as generated, this is a rough outline of the work you will +// need to do. If something doesn't make sense for your situation, get rid of +// it. + +import ( + // TIP: ==== IMPORTS ==== + // This is a common set of imports but not customized to your code since + // your code hasn't been written yet. Make sure you, your IDE, or + // goimports -w fixes these imports. + // + // The provider linter wants your imports to be in two groups: first, + // standard library (i.e., "fmt" or "strings"), second, everything else. + // + // Also, AWS Go SDK v2 may handle nested structures differently than v1, + // using the services/workspacesweb/types package. If so, you'll + // need to import types and reference the nested types, e.g., as + // awstypes.. + "context" + "errors" + "time" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) +// TIP: ==== FILE STRUCTURE ==== +// All resources should follow this basic outline. Improve this resource's +// maintainability by sticking to it. +// +// 1. Package declaration +// 2. Imports +// 3. Main resource struct with schema method +// 4. Create, read, update, delete methods (in that order) +// 5. Other functions (flatteners, expanders, waiters, finders, etc.) + +// Function annotations are used for resource registration to the Provider. DO NOT EDIT. +// @FrameworkResource("aws_workspacesweb_portal", name="Portal") +func newResourcePortal(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &resourcePortal{} + + // TIP: ==== CONFIGURABLE TIMEOUTS ==== + // Users can configure timeout lengths but you need to use the times they + // provide. Access the timeout they configure (or the defaults) using, + // e.g., r.CreateTimeout(ctx, plan.Timeouts) (see below). The times here are + // the defaults if they don't configure timeouts. + r.SetDefaultCreateTimeout(30 * time.Minute) + r.SetDefaultUpdateTimeout(30 * time.Minute) + r.SetDefaultDeleteTimeout(30 * time.Minute) + + return r, nil +} + +const ( + ResNamePortal = "Portal" +) + +type resourcePortal struct { + framework.ResourceWithConfigure + framework.WithTimeouts +} + +func (r *resourcePortal) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) { + resp.TypeName = "aws_workspacesweb_portal" +} + +// TIP: ==== SCHEMA ==== +// In the schema, add each of the attributes in snake case (e.g., +// delete_automated_backups). +// +// Formatting rules: +// * Alphabetize attributes to make them easier to find. +// * Do not add a blank line between attributes. +// +// Attribute basics: +// * If a user can provide a value ("configure a value") for an +// attribute (e.g., instances = 5), we call the attribute an +// "argument." +// * You change the way users interact with attributes using: +// - Required +// - Optional +// - Computed +// * There are only four valid combinations: +// +// 1. Required only - the user must provide a value +// Required: true, +// +// 2. Optional only - the user can configure or omit a value; do not +// use Default or DefaultFunc +// Optional: true, +// +// 3. Computed only - the provider can provide a value but the user +// cannot, i.e., read-only +// Computed: true, +// +// 4. Optional AND Computed - the provider or user can provide a value; +// use this combination if you are using Default +// Optional: true, +// Computed: true, +// +// You will typically find arguments in the input struct +// (e.g., CreateDBInstanceInput) for the create operation. Sometimes +// they are only in the input struct (e.g., ModifyDBInstanceInput) for +// the modify operation. +// +// For more about schema options, visit +// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/schemas?page=schemas +func (r *resourcePortal) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { + resp.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "arn": framework.ARNAttributeComputedOnly(), + "description": schema.StringAttribute{ + Optional: true, + }, + // TIP: ==== "ID" ATTRIBUTE ==== + // When using the Terraform Plugin Framework, there is no required "id" attribute. + // This is different from the Terraform Plugin SDK. + // + // Only include an "id" attribute if the AWS API has an "Id" field, such as "PortalId" + "id": framework.IDAttribute(), + "name": schema.StringAttribute{ + Required: true, + // TIP: ==== PLAN MODIFIERS ==== + // Plan modifiers were introduced with Plugin-Framework to provide a mechanism + // for adjusting planned changes prior to apply. The planmodifier subpackage + // provides built-in modifiers for many common use cases such as + // requiring replacement on a value change ("ForceNew: true" in Plugin-SDK + // resources). + // + // See more: + // https://developer.hashicorp.com/terraform/plugin/framework/resources/plan-modification + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "type": schema.StringAttribute{ + Required: true, + }, + }, + Blocks: map[string]schema.Block{ + "complex_argument": schema.ListNestedBlock{ + // TIP: ==== CUSTOM TYPES ==== + // Use a custom type to identify the model type of the tested object + CustomType: fwtypes.NewListNestedObjectTypeOf[complexArgumentModel](ctx), + // TIP: ==== LIST VALIDATORS ==== + // List and set validators take the place of MaxItems and MinItems in + // Plugin-Framework based resources. Use listvalidator.SizeAtLeast(1) to + // make a nested object required. Similar to Plugin-SDK, complex objects + // can be represented as lists or sets with listvalidator.SizeAtMost(1). + // + // For a complete mapping of Plugin-SDK to Plugin-Framework schema fields, + // see: + // https://developer.hashicorp.com/terraform/plugin/framework/migrating/attributes-blocks/blocks + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "nested_required": schema.StringAttribute{ + Required: true, + }, + "nested_computed": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + }, + }, + }, + "timeouts": timeouts.Block(ctx, timeouts.Opts{ + Create: true, + Update: true, + Delete: true, + }), + }, + } +} + +func (r *resourcePortal) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { + // TIP: ==== RESOURCE CREATE ==== + // Generally, the Create function should do the following things. Make + // sure there is a good reason if you don't do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the plan + // 3. Populate a create input structure + // 4. Call the AWS create/put function + // 5. Using the output from the create function, set the minimum arguments + // and attributes for the Read function to work, as well as any computed + // only attributes. + // 6. Use a waiter to wait for create to complete + // 7. Save the request plan to response state + + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().WorkSpacesWebClient(ctx) + + // TIP: -- 2. Fetch the plan + var plan resourcePortalModel + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a Create input structure + var input workspacesweb.CreatePortalInput + // TIP: Using a field name prefix allows mapping fields such as `ID` to `PortalId` + resp.Diagnostics.Append(flex.Expand(ctx, plan, &input, flex.WithFieldNamePrefix("Portal"))...) + if resp.Diagnostics.HasError() { + return + } + + + // TIP: -- 4. Call the AWS Create function + out, err := conn.CreatePortal(ctx, &input) + if err != nil { + // TIP: Since ID has not been set yet, you cannot use plan.ID.String() + // in error messages at this point. + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionCreating, ResNamePortal, plan.Name.String(), err), + err.Error(), + ) + return + } + if out == nil || out.Portal == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionCreating, ResNamePortal, plan.Name.String(), nil), + errors.New("empty output").Error(), + ) + return + } + + // TIP: -- 5. Using the output from the create function, set attributes + resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 6. Use a waiter to wait for create to complete + createTimeout := r.CreateTimeout(ctx, plan.Timeouts) + _, err = waitPortalCreated(ctx, conn, plan.ID.ValueString(), createTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForCreation, ResNamePortal, plan.Name.String(), err), + err.Error(), + ) + return + } + + // TIP: -- 7. Save the request plan to response state + resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) +} + +func (r *resourcePortal) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { + // TIP: ==== RESOURCE READ ==== + // Generally, the Read function should do the following things. Make + // sure there is a good reason if you don't do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the state + // 3. Get the resource from AWS + // 4. Remove resource from state if it is not found + // 5. Set the arguments and attributes + // 6. Set the state + + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().WorkSpacesWebClient(ctx) + + // TIP: -- 2. Fetch the state + var state resourcePortalModel + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Get the resource from AWS using an API Get, List, or Describe- + // type function, or, better yet, using a finder. + out, err := findPortalByID(ctx, conn, state.ID.ValueString()) + // TIP: -- 4. Remove resource from state if it is not found + if tfresource.NotFound(err) { + resp.State.RemoveResource(ctx) + return + } + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionSetting, ResNamePortal, state.ID.String(), err), + err.Error(), + ) + return + } + + // TIP: -- 5. Set the arguments and attributes + resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 6. Set the state + resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) +} + +func (r *resourcePortal) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { + // TIP: ==== RESOURCE UPDATE ==== + // Not all resources have Update functions. There are a few reasons: + // a. The AWS API does not support changing a resource + // b. All arguments have RequiresReplace() plan modifiers + // c. The AWS API uses a create call to modify an existing resource + // + // In the cases of a. and b., the resource will not have an update method + // defined. In the case of c., Update and Create can be refactored to call + // the same underlying function. + // + // The rest of the time, there should be an Update function and it should + // do the following things. Make sure there is a good reason if you don't + // do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the plan and state + // 3. Populate a modify input structure and check for changes + // 4. Call the AWS modify/update function + // 5. Use a waiter to wait for update to complete + // 6. Save the request plan to response state + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().WorkSpacesWebClient(ctx) + + // TIP: -- 2. Fetch the plan + var plan, state resourcePortalModel + resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a modify input structure and check for changes + if !plan.Name.Equal(state.Name) || + !plan.Description.Equal(state.Description) || + !plan.ComplexArgument.Equal(state.ComplexArgument) || + !plan.Type.Equal(state.Type) { + + var input workspacesweb.UpdatePortalInput + resp.Diagnostics.Append(flex.Expand(ctx, plan, &input, flex.WithFieldNamePrefix("Test"))...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 4. Call the AWS modify/update function + out, err := conn.UpdatePortal(ctx, &input) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionUpdating, ResNamePortal, plan.ID.String(), err), + err.Error(), + ) + return + } + if out == nil || out.Portal == nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionUpdating, ResNamePortal, plan.ID.String(), nil), + errors.New("empty output").Error(), + ) + return + } + + // TIP: Using the output from the update function, re-set any computed attributes + resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) + if resp.Diagnostics.HasError() { + return + } + } + + // TIP: -- 5. Use a waiter to wait for update to complete + updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) + _, err := waitPortalUpdated(ctx, conn, plan.ID.ValueString(), updateTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForUpdate, ResNamePortal, plan.ID.String(), err), + err.Error(), + ) + return + } + + // TIP: -- 6. Save the request plan to response state + resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) +} + +func (r *resourcePortal) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { + // TIP: ==== RESOURCE DELETE ==== + // Most resources have Delete functions. There are rare situations + // where you might not need a delete: + // a. The AWS API does not provide a way to delete the resource + // b. The point of your resource is to perform an action (e.g., reboot a + // server) and deleting serves no purpose. + // + // The Delete function should do the following things. Make sure there + // is a good reason if you don't do one of these. + // + // 1. Get a client connection to the relevant service + // 2. Fetch the state + // 3. Populate a delete input structure + // 4. Call the AWS delete function + // 5. Use a waiter to wait for delete to complete + // TIP: -- 1. Get a client connection to the relevant service + conn := r.Meta().WorkSpacesWebClient(ctx) + + // TIP: -- 2. Fetch the state + var state resourcePortalModel + resp.Diagnostics.Append(req.State.Get(ctx, &state)...) + if resp.Diagnostics.HasError() { + return + } + + // TIP: -- 3. Populate a delete input structure + input := workspacesweb.DeletePortalInput{ + PortalId: state.ID.ValueStringPointer(), + } + + // TIP: -- 4. Call the AWS delete function + _, err := conn.DeletePortal(ctx, &input) + // TIP: On rare occassions, the API returns a not found error after deleting a + // resource. If that happens, we don't want it to show up as an error. + if err != nil { + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionDeleting, ResNamePortal, state.ID.String(), err), + err.Error(), + ) + return + } + + // TIP: -- 5. Use a waiter to wait for delete to complete + deleteTimeout := r.DeleteTimeout(ctx, state.Timeouts) + _, err = waitPortalDeleted(ctx, conn, state.ID.ValueString(), deleteTimeout) + if err != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForDeletion, ResNamePortal, state.ID.String(), err), + err.Error(), + ) + return + } +} + +// TIP: ==== TERRAFORM IMPORTING ==== +// If Read can get all the information it needs from the Identifier +// (i.e., path.Root("id")), you can use the PassthroughID importer. Otherwise, +// you'll need a custom import function. +// +// See more: +// https://developer.hashicorp.com/terraform/plugin/framework/resources/import +func (r *resourcePortal) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) +} + + + + +// TIP: ==== STATUS CONSTANTS ==== +// Create constants for states and statuses if the service does not +// already have suitable constants. We prefer that you use the constants +// provided in the service if available (e.g., awstypes.StatusInProgress). +const ( + statusChangePending = "Pending" + statusDeleting = "Deleting" + statusNormal = "Normal" + statusUpdated = "Updated" +) + +// TIP: ==== WAITERS ==== +// Some resources of some services have waiters provided by the AWS API. +// Unless they do not work properly, use them rather than defining new ones +// here. +// +// Sometimes we define the wait, status, and find functions in separate +// files, wait.go, status.go, and find.go. Follow the pattern set out in the +// service and define these where it makes the most sense. +// +// If these functions are used in the _test.go file, they will need to be +// exported (i.e., capitalized). +// +// You will need to adjust the parameters and names to fit the service. +func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { + stateConf := &retry.StateChangeConf{ + Pending: []string{}, + Target: []string{statusNormal}, + Refresh: statusPortal(ctx, conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*workspacesweb.Portal); ok { + return out, err + } + + return nil, err +} + +// TIP: It is easier to determine whether a resource is updated for some +// resources than others. The best case is a status flag that tells you when +// the update has been fully realized. Other times, you can check to see if a +// key resource argument is updated to a new value or not. +func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { + stateConf := &retry.StateChangeConf{ + Pending: []string{statusChangePending}, + Target: []string{statusUpdated}, + Refresh: statusPortal(ctx, conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*workspacesweb.Portal); ok { + return out, err + } + + return nil, err +} + +// TIP: A deleted waiter is almost like a backwards created waiter. There may +// be additional pending states, however. +func waitPortalDeleted(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { + stateConf := &retry.StateChangeConf{ + Pending: []string{statusDeleting, statusNormal}, + Target: []string{}, + Refresh: statusPortal(ctx, conn, id), + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*workspacesweb.Portal); ok { + return out, err + } + + return nil, err +} + +// TIP: ==== STATUS ==== +// The status function can return an actual status when that field is +// available from the API (e.g., out.Status). Otherwise, you can use custom +// statuses to communicate the states of the resource. +// +// Waiters consume the values returned by status functions. Design status so +// that it can be reused by a create, update, and delete waiter, if possible. +func statusPortal(ctx context.Context, conn *workspacesweb.Client, id string) retry.StateRefreshFunc { + return func() (interface{}, string, error) { + out, err := findPortalByID(ctx, conn, id) + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + return out, aws.ToString(out.Status), nil + } +} + +// TIP: ==== FINDERS ==== +// The find function is not strictly necessary. You could do the API +// request from the status function. However, we have found that find often +// comes in handy in other places besides the status function. As a result, it +// is good practice to define it separately. +func findPortalByID(ctx context.Context, conn *workspacesweb.Client, id string) (*awstypes.Portal, error) { + in := &workspacesweb.GetPortalInput{ + Id: aws.String(id), + } + + out, err := conn.GetPortal(ctx, in) + if err != nil { + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, + } + } + + return nil, err + } + + if out == nil || out.Portal == nil { + return nil, tfresource.NewEmptyResultError(in) + } + + return out.Portal, nil +} + +// TIP: ==== DATA STRUCTURES ==== +// With Terraform Plugin-Framework configurations are deserialized into +// Go types, providing type safety without the need for type assertions. +// These structs should match the schema definition exactly, and the `tfsdk` +// tag value should match the attribute name. +// +// Nested objects are represented in their own data struct. These will +// also have a corresponding attribute type mapping for use inside flex +// functions. +// +// See more: +// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values +type resourcePortalModel struct { + ARN types.String `tfsdk:"arn"` + ComplexArgument fwtypes.ListNestedObjectValueOf[complexArgumentModel] `tfsdk:"complex_argument"` + Description types.String `tfsdk:"description"` + ID types.String `tfsdk:"id"` + Name types.String `tfsdk:"name"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + Type types.String `tfsdk:"type"` +} + +type complexArgumentModel struct { + NestedRequired types.String `tfsdk:"nested_required"` + NestedOptional types.String `tfsdk:"nested_optional"` +} diff --git a/internal/service/workspacesweb/portal_test.go b/internal/service/workspacesweb/portal_test.go new file mode 100644 index 000000000000..c743aa21e1a2 --- /dev/null +++ b/internal/service/workspacesweb/portal_test.go @@ -0,0 +1,331 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test +// **PLEASE DELETE THIS AND ALL TIP COMMENTS BEFORE SUBMITTING A PR FOR REVIEW!** +// +// TIP: ==== INTRODUCTION ==== +// Thank you for trying the skaff tool! +// +// You have opted to include these helpful comments. They all include "TIP:" +// to help you find and remove them when you're done with them. +// +// While some aspects of this file are customized to your input, the +// scaffold tool does *not* look at the AWS API and ensure it has correct +// function, structure, and variable names. It makes guesses based on +// commonalities. You will need to make significant adjustments. +// +// In other words, as generated, this is a rough outline of the work you will +// need to do. If something doesn't make sense for your situation, get rid of +// it. + +import ( + // TIP: ==== IMPORTS ==== + // This is a common set of imports but not customized to your code since + // your code hasn't been written yet. Make sure you, your IDE, or + // goimports -w fixes these imports. + // + // The provider linter wants your imports to be in two groups: first, + // standard library (i.e., "fmt" or "strings"), second, everything else. + // + // Also, AWS Go SDK v2 may handle nested structures differently than v1, + // using the services/workspacesweb/types package. If so, you'll + // need to import types and reference the nested types, e.g., as + // types.. + "context" + "errors" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/names" + + // TIP: You will often need to import the package that this test file lives + // in. Since it is in the "test" context, it must import the package to use + // any normal context constants, variables, or functions. + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" +) + +// TIP: File Structure. The basic outline for all test files should be as +// follows. Improve this resource's maintainability by following this +// outline. +// +// 1. Package declaration (add "_test" since this is a test file) +// 2. Imports +// 3. Unit tests +// 4. Basic test +// 5. Disappears test +// 6. All the other tests +// 7. Helper functions (exists, destroy, check, etc.) +// 8. Functions that return Terraform configurations + +// TIP: ==== UNIT TESTS ==== +// This is an example of a unit test. Its name is not prefixed with +// "TestAcc" like an acceptance test. +// +// Unlike acceptance tests, unit tests do not access AWS and are focused on a +// function (or method). Because of this, they are quick and cheap to run. +// +// In designing a resource's implementation, isolate complex bits from AWS bits +// so that they can be tested through a unit test. We encourage more unit tests +// in the provider. +// +// Cut and dry functions using well-used patterns, like typical flatteners and +// expanders, don't need unit testing. However, if they are complex or +// intricate, they should be unit tested. +func TestPortalExampleUnitTest(t *testing.T) { + t.Parallel() + + testCases := []struct { + TestName string + Input string + Expected string + Error bool + }{ + { + TestName: "empty", + Input: "", + Expected: "", + Error: true, + }, + { + TestName: "descriptive name", + Input: "some input", + Expected: "some output", + Error: false, + }, + { + TestName: "another descriptive name", + Input: "more input", + Expected: "more output", + Error: false, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.TestName, func(t *testing.T) { + t.Parallel() + got, err := tfworkspacesweb.FunctionFromResource(testCase.Input) + + if err != nil && !testCase.Error { + t.Errorf("got error (%s), expected no error", err) + } + + if err == nil && testCase.Error { + t.Errorf("got (%s) and no error, expected error", got) + } + + if got != testCase.Expected { + t.Errorf("got %s, expected %s", got, testCase.Expected) + } + }) + } +} + +// TIP: ==== ACCEPTANCE TESTS ==== +// This is an example of a basic acceptance test. This should test as much of +// standard functionality of the resource as possible, and test importing, if +// applicable. We prefix its name with "TestAcc", the service, and the +// resource name. +// +// Acceptance test access AWS and cost money to run. +func TestAccWorkSpacesWebPortal_basic(t *testing.T) { + ctx := acctest.Context(t) + // TIP: This is a long-running test guard for tests that run longer than + // 300s (5 min) generally. + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var portal workspacesweb.DescribePortalResponse + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPortalConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &portal), + resource.TestCheckResourceAttr(resourceName, "auto_minor_version_upgrade", "false"), + resource.TestCheckResourceAttrSet(resourceName, "maintenance_window_start_time.0.day_of_week"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "user.*", map[string]string{ + "console_access": "false", + "groups.#": "0", + "username": "Test", + "password": "TestTest1234", + }), + // TIP: If the ARN can be partially or completely determined by the parameters passed, e.g. it contains the + // value of `rName`, either include the values in the regex or check for an exact match using `acctest.CheckResourceAttrRegionalARN` + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "workspacesweb", regexache.MustCompile(`portal:.+$`)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_disappears(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var portal workspacesweb.DescribePortalResponse + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPortalConfig_basic(rName, testAccPortalVersionNewer), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &portal), + // TIP: The Plugin-Framework disappears helper is similar to the Plugin-SDK version, + // but expects a new resource factory function as the third argument. To expose this + // private function to the testing package, you may need to add a line like the following + // to exports_test.go: + // + // var ResourcePortal = newResourcePortal + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourcePortal, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckPortalDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_portal" { + continue + } + + + // TIP: ==== FINDERS ==== + // The find function should be exported. Since it won't be used outside of the package, it can be exported + // in the `exports_test.go` file. + _, err := tfworkspacesweb.FindPortalByID(ctx, conn, rs.Primary.ID) + if tfresource.NotFound(err) { + return nil + } + if err != nil { + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) + } + + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func testAccCheckPortalExists(ctx context.Context, name string, portal *workspacesweb.DescribePortalResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, name, errors.New("not found")) + } + + if rs.Primary.ID == "" { + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, name, errors.New("not set")) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + resp, err := tfworkspacesweb.FindPortalByID(ctx, conn, rs.Primary.ID) + if err != nil { + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) + } + + *portal = *resp + + return nil + } +} + +func testAccPreCheck(ctx context.Context, t *testing.T) { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + input := &workspacesweb.ListPortalsInput{} + + _, err := conn.ListPortals(ctx, input) + + if acctest.PreCheckSkipError(err) { + t.Skipf("skipping acceptance testing: %s", err) + } + if err != nil { + t.Fatalf("unexpected PreCheck error: %s", err) + } +} + +func testAccCheckPortalNotRecreated(before, after *workspacesweb.DescribePortalResponse) resource.TestCheckFunc { + return func(s *terraform.State) error { + if before, after := aws.ToString(before.PortalId), aws.ToString(after.PortalId); before != after { + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingNotRecreated, tfworkspacesweb.ResNamePortal, aws.ToString(before.PortalId), errors.New("recreated")) + } + + return nil + } +} + +func testAccPortalConfig_basic(rName, version string) string { + return fmt.Sprintf(` +resource "aws_security_group" "test" { + name = %[1]q +} + +resource "aws_workspacesweb_portal" "test" { + portal_name = %[1]q + engine_type = "ActiveWorkSpacesWeb" + engine_version = %[2]q + host_instance_type = "workspacesweb.t2.micro" + security_groups = [aws_security_group.test.id] + authentication_strategy = "simple" + storage_type = "efs" + + logs { + general = true + } + + user { + username = "Test" + password = "TestTest1234" + } +} +`, rName, version) +} diff --git a/website/docs/r/workspacesweb_portal.html.markdown b/website/docs/r/workspacesweb_portal.html.markdown new file mode 100644 index 000000000000..6e67c180dd0f --- /dev/null +++ b/website/docs/r/workspacesweb_portal.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_portal" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Portal. +--- +` +# Resource: aws_workspacesweb_portal + +Terraform resource for managing an AWS WorkSpaces Web Portal. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { +} +``` + +## Argument Reference + +The following arguments are required: + +* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +The following arguments are optional: + +* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Portal. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Portal using the `example_id_arg`. For example: + +```terraform +import { + to = aws_workspacesweb_portal.example + id = "portal-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Portal using the `example_id_arg`. For example: + +```console +% terraform import aws_workspacesweb_portal.example portal-id-12345678 +``` From bc46f1838220ba1425a3a863c8cd08cd243d9220 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Tue, 3 Jun 2025 10:10:13 +0000 Subject: [PATCH 0108/2115] Removed duplicate test precheck function --- internal/service/workspacesweb/portal_test.go | 22 +++---------------- .../testdata/tmpl/portal_tags.gtpl | 0 2 files changed, 3 insertions(+), 19 deletions(-) create mode 100644 internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl diff --git a/internal/service/workspacesweb/portal_test.go b/internal/service/workspacesweb/portal_test.go index c743aa21e1a2..25320faf5d2d 100644 --- a/internal/service/workspacesweb/portal_test.go +++ b/internal/service/workspacesweb/portal_test.go @@ -2,6 +2,7 @@ // SPDX-License-Identifier: MPL-2.0 package workspacesweb_test + // **PLEASE DELETE THIS AND ALL TIP COMMENTS BEFORE SUBMITTING A PR FOR REVIEW!** // // TIP: ==== INTRODUCTION ==== @@ -40,14 +41,13 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" - "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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/create" - "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" // TIP: You will often need to import the package that this test file lives @@ -235,7 +235,6 @@ func testAccCheckPortalDestroy(ctx context.Context) resource.TestCheckFunc { continue } - // TIP: ==== FINDERS ==== // The find function should be exported. Since it won't be used outside of the package, it can be exported // in the `exports_test.go` file. @@ -244,7 +243,7 @@ func testAccCheckPortalDestroy(ctx context.Context) resource.TestCheckFunc { return nil } if err != nil { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) + return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) } return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, errors.New("not destroyed")) @@ -278,21 +277,6 @@ func testAccCheckPortalExists(ctx context.Context, name string, portal *workspac } } -func testAccPreCheck(ctx context.Context, t *testing.T) { - conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) - - input := &workspacesweb.ListPortalsInput{} - - _, err := conn.ListPortals(ctx, input) - - if acctest.PreCheckSkipError(err) { - t.Skipf("skipping acceptance testing: %s", err) - } - if err != nil { - t.Fatalf("unexpected PreCheck error: %s", err) - } -} - func testAccCheckPortalNotRecreated(before, after *workspacesweb.DescribePortalResponse) resource.TestCheckFunc { return func(s *terraform.State) error { if before, after := aws.ToString(before.PortalId), aws.ToString(after.PortalId); before != after { diff --git a/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl new file mode 100644 index 000000000000..e69de29bb2d1 From bf573d9c3b10c9720ed2d78054fcc27e3e29faac Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 18 Jul 2025 10:00:16 +0000 Subject: [PATCH 0109/2115] Added Portal Resource --- .../service/workspacesweb/exports_test.go | 2 + internal/service/workspacesweb/portal.go | 776 +++--- .../workspacesweb/portal_tags_gen_test.go | 2224 +++++++++++++++++ internal/service/workspacesweb/portal_test.go | 378 ++- .../workspacesweb/service_package_gen.go | 9 + .../testdata/Portal/tagsComputed1/main_gen.tf | 18 + .../testdata/Portal/tagsComputed2/main_gen.tf | 29 + .../testdata/Portal/tags_defaults/main_gen.tf | 25 + .../testdata/Portal/tags_ignore/main_gen.tf | 34 + .../testdata/tmpl/portal_tags.gtpl | 5 + .../docs/r/workspacesweb_portal.html.markdown | 84 +- 11 files changed, 2898 insertions(+), 686 deletions(-) create mode 100644 internal/service/workspacesweb/portal_tags_gen_test.go create mode 100644 internal/service/workspacesweb/testdata/Portal/tagsComputed1/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/Portal/tagsComputed2/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/Portal/tags_defaults/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/Portal/tags_ignore/main_gen.tf diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 59becb135b2d..15612376d031 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -9,6 +9,7 @@ var ( ResourceDataProtectionSettings = newDataProtectionSettingsResource ResourceIPAccessSettings = newIPAccessSettingsResource ResourceNetworkSettings = newNetworkSettingsResource + ResourcePortal = newPortalResource ResourceTrustStore = newTrustStoreResource ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserSettings = newUserSettingsResource @@ -17,6 +18,7 @@ var ( FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN FindIPAccessSettingsByARN = findIPAccessSettingsByARN FindNetworkSettingsByARN = findNetworkSettingsByARN + FindPortalByARN = findPortalByARN FindTrustStoreByARN = findTrustStoreByARN FindUserAccessLoggingSettingsByARN = findUserAccessLoggingSettingsByARN FindUserSettingsByARN = findUserSettingsByARN diff --git a/internal/service/workspacesweb/portal.go b/internal/service/workspacesweb/portal.go index e16b15c4febc..2518c80d2829 100644 --- a/internal/service/workspacesweb/portal.go +++ b/internal/service/workspacesweb/portal.go @@ -2,84 +2,48 @@ // SPDX-License-Identifier: MPL-2.0 package workspacesweb -// **PLEASE DELETE THIS AND ALL TIP COMMENTS BEFORE SUBMITTING A PR FOR REVIEW!** -// -// TIP: ==== INTRODUCTION ==== -// Thank you for trying the skaff tool! -// -// You have opted to include these helpful comments. They all include "TIP:" -// to help you find and remove them when you're done with them. -// -// While some aspects of this file are customized to your input, the -// scaffold tool does *not* look at the AWS API and ensure it has correct -// function, structure, and variable names. It makes guesses based on -// commonalities. You will need to make significant adjustments. -// -// In other words, as generated, this is a rough outline of the work you will -// need to do. If something doesn't make sense for your situation, get rid of -// it. import ( - // TIP: ==== IMPORTS ==== - // This is a common set of imports but not customized to your code since - // your code hasn't been written yet. Make sure you, your IDE, or - // goimports -w fixes these imports. - // - // The provider linter wants your imports to be in two groups: first, - // standard library (i.e., "fmt" or "strings"), second, everything else. - // - // Also, AWS Go SDK v2 may handle nested structures differently than v1, - // using the services/workspacesweb/types package. If so, you'll - // need to import types and reference the nested types, e.g., as - // awstypes.. "context" - "errors" + "fmt" "time" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" - "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// TIP: ==== FILE STRUCTURE ==== -// All resources should follow this basic outline. Improve this resource's -// maintainability by sticking to it. -// -// 1. Package declaration -// 2. Imports -// 3. Main resource struct with schema method -// 4. Create, read, update, delete methods (in that order) -// 5. Other functions (flatteners, expanders, waiters, finders, etc.) - -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. + // @FrameworkResource("aws_workspacesweb_portal", name="Portal") -func newResourcePortal(_ context.Context) (resource.ResourceWithConfigure, error) { - r := &resourcePortal{} - - // TIP: ==== CONFIGURABLE TIMEOUTS ==== - // Users can configure timeout lengths but you need to use the times they - // provide. Access the timeout they configure (or the defaults) using, - // e.g., r.CreateTimeout(ctx, plan.Timeouts) (see below). The times here are - // the defaults if they don't configure timeouts. - r.SetDefaultCreateTimeout(30 * time.Minute) - r.SetDefaultUpdateTimeout(30 * time.Minute) - r.SetDefaultDeleteTimeout(30 * time.Minute) +// @Tags(identifierAttribute="portal_arn") +// @Testing(tagsTest=true) +// @Testing(generator=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.Portal") +// @Testing(importStateIdAttribute="portal_arn") +func newPortalResource(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &portalResource{} + + r.SetDefaultCreateTimeout(5 * time.Minute) + r.SetDefaultUpdateTimeout(5 * time.Minute) + r.SetDefaultDeleteTimeout(5 * time.Minute) return r, nil } @@ -88,120 +52,143 @@ const ( ResNamePortal = "Portal" ) -type resourcePortal struct { - framework.ResourceWithConfigure +type portalResource struct { + framework.ResourceWithModel[portalResourceModel] framework.WithTimeouts } -func (r *resourcePortal) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) { - resp.TypeName = "aws_workspacesweb_portal" -} - -// TIP: ==== SCHEMA ==== -// In the schema, add each of the attributes in snake case (e.g., -// delete_automated_backups). -// -// Formatting rules: -// * Alphabetize attributes to make them easier to find. -// * Do not add a blank line between attributes. -// -// Attribute basics: -// * If a user can provide a value ("configure a value") for an -// attribute (e.g., instances = 5), we call the attribute an -// "argument." -// * You change the way users interact with attributes using: -// - Required -// - Optional -// - Computed -// * There are only four valid combinations: -// -// 1. Required only - the user must provide a value -// Required: true, -// -// 2. Optional only - the user can configure or omit a value; do not -// use Default or DefaultFunc -// Optional: true, -// -// 3. Computed only - the provider can provide a value but the user -// cannot, i.e., read-only -// Computed: true, -// -// 4. Optional AND Computed - the provider or user can provide a value; -// use this combination if you are using Default -// Optional: true, -// Computed: true, -// -// You will typically find arguments in the input struct -// (e.g., CreateDBInstanceInput) for the create operation. Sometimes -// they are only in the input struct (e.g., ModifyDBInstanceInput) for -// the modify operation. -// -// For more about schema options, visit -// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/schemas?page=schemas -func (r *resourcePortal) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ - "arn": framework.ARNAttributeComputedOnly(), - "description": schema.StringAttribute{ + "additional_encryption_context": schema.MapAttribute{ + CustomType: fwtypes.MapOfStringType, + ElementType: types.StringType, + Optional: true, + PlanModifiers: []planmodifier.Map{ + mapplanmodifier.RequiresReplace(), + }, + }, + "authentication_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.AuthenticationType](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "browser_settings_arn": schema.StringAttribute{ Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, }, - // TIP: ==== "ID" ATTRIBUTE ==== - // When using the Terraform Plugin Framework, there is no required "id" attribute. - // This is different from the Terraform Plugin SDK. - // - // Only include an "id" attribute if the AWS API has an "Id" field, such as "PortalId" - "id": framework.IDAttribute(), - "name": schema.StringAttribute{ - Required: true, - // TIP: ==== PLAN MODIFIERS ==== - // Plan modifiers were introduced with Plugin-Framework to provide a mechanism - // for adjusting planned changes prior to apply. The planmodifier subpackage - // provides built-in modifiers for many common use cases such as - // requiring replacement on a value change ("ForceNew: true" in Plugin-SDK - // resources). - // - // See more: - // https://developer.hashicorp.com/terraform/plugin/framework/resources/plan-modification + "browser_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.BrowserType](), + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "creation_date": schema.StringAttribute{ + CustomType: timetypes.RFC3339Type{}, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "customer_managed_key": schema.StringAttribute{ + Optional: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, - "type": schema.StringAttribute{ - Required: true, + "data_protection_settings_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, }, - }, - Blocks: map[string]schema.Block{ - "complex_argument": schema.ListNestedBlock{ - // TIP: ==== CUSTOM TYPES ==== - // Use a custom type to identify the model type of the tested object - CustomType: fwtypes.NewListNestedObjectTypeOf[complexArgumentModel](ctx), - // TIP: ==== LIST VALIDATORS ==== - // List and set validators take the place of MaxItems and MinItems in - // Plugin-Framework based resources. Use listvalidator.SizeAtLeast(1) to - // make a nested object required. Similar to Plugin-SDK, complex objects - // can be represented as lists or sets with listvalidator.SizeAtMost(1). - // - // For a complete mapping of Plugin-SDK to Plugin-Framework schema fields, - // see: - // https://developer.hashicorp.com/terraform/plugin/framework/migrating/attributes-blocks/blocks - Validators: []validator.List{ - listvalidator.SizeAtMost(1), + "display_name": schema.StringAttribute{ + Optional: true, + Computed: true, + }, + "instance_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.InstanceType](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "ip_access_settings_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), }, - NestedObject: schema.NestedBlockObject{ - Attributes: map[string]schema.Attribute{ - "nested_required": schema.StringAttribute{ - Required: true, - }, - "nested_computed": schema.StringAttribute{ - Computed: true, - PlanModifiers: []planmodifier.String{ - stringplanmodifier.UseStateForUnknown(), - }, - }, - }, + }, + "max_concurrent_sessions": schema.Int64Attribute{ + Optional: true, + Computed: true, + }, + "network_settings_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "portal_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "portal_endpoint": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "portal_status": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.PortalStatus](), + Computed: true, + }, + "renderer_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.RendererType](), + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), }, }, - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + "status_reason": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "trust_store_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "user_access_logging_settings_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "user_settings_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + }, + Blocks: map[string]schema.Block{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ Create: true, Update: true, Delete: true, @@ -210,376 +197,234 @@ func (r *resourcePortal) Schema(ctx context.Context, req resource.SchemaRequest, } } -func (r *resourcePortal) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - // TIP: ==== RESOURCE CREATE ==== - // Generally, the Create function should do the following things. Make - // sure there is a good reason if you don't do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the plan - // 3. Populate a create input structure - // 4. Call the AWS create/put function - // 5. Using the output from the create function, set the minimum arguments - // and attributes for the Read function to work, as well as any computed - // only attributes. - // 6. Use a waiter to wait for create to complete - // 7. Save the request plan to response state - - // TIP: -- 1. Get a client connection to the relevant service - conn := r.Meta().WorkSpacesWebClient(ctx) - - // TIP: -- 2. Fetch the plan - var plan resourcePortalModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *portalResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data portalResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - // TIP: -- 3. Populate a Create input structure + conn := r.Meta().WorkSpacesWebClient(ctx) + var input workspacesweb.CreatePortalInput - // TIP: Using a field name prefix allows mapping fields such as `ID` to `PortalId` - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input, flex.WithFieldNamePrefix("Portal"))...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 4. Call the AWS Create function - out, err := conn.CreatePortal(ctx, &input) + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.Tags = getTagsIn(ctx) + + output, err := conn.CreatePortal(ctx, &input) + if err != nil { - // TIP: Since ID has not been set yet, you cannot use plan.ID.String() - // in error messages at this point. - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionCreating, ResNamePortal, plan.Name.String(), err), - err.Error(), - ) - return - } - if out == nil || out.Portal == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionCreating, ResNamePortal, plan.Name.String(), nil), - errors.New("empty output").Error(), - ) + response.Diagnostics.AddError("creating WorkSpacesWeb Portal", err.Error()) return } - // TIP: -- 5. Using the output from the create function, set attributes - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { + data.PortalARN = fwflex.StringToFramework(ctx, output.PortalArn) + data.PortalEndpoint = fwflex.StringToFramework(ctx, output.PortalEndpoint) + + createTimeout := r.CreateTimeout(ctx, data.Timeouts) + // Wait for portal to be created + portal, err := waitPortalCreated(ctx, conn, data.PortalARN.ValueString(), createTimeout) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) creation", data.PortalARN.ValueString()), err.Error()) return } - // TIP: -- 6. Use a waiter to wait for create to complete - createTimeout := r.CreateTimeout(ctx, plan.Timeouts) - _, err = waitPortalCreated(ctx, conn, plan.ID.ValueString(), createTimeout) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForCreation, ResNamePortal, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.Append(fwflex.Flatten(ctx, portal, &data)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 7. Save the request plan to response state - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *resourcePortal) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - // TIP: ==== RESOURCE READ ==== - // Generally, the Read function should do the following things. Make - // sure there is a good reason if you don't do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the state - // 3. Get the resource from AWS - // 4. Remove resource from state if it is not found - // 5. Set the arguments and attributes - // 6. Set the state - - // TIP: -- 1. Get a client connection to the relevant service - conn := r.Meta().WorkSpacesWebClient(ctx) - - // TIP: -- 2. Fetch the state - var state resourcePortalModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *portalResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data portalResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 3. Get the resource from AWS using an API Get, List, or Describe- - // type function, or, better yet, using a finder. - out, err := findPortalByID(ctx, conn, state.ID.ValueString()) - // TIP: -- 4. Remove resource from state if it is not found + + conn := r.Meta().WorkSpacesWebClient(ctx) + + output, err := findPortalByARN(ctx, conn, data.PortalARN.ValueString()) if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionSetting, ResNamePortal, state.ID.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Portal (%s)", data.PortalARN.ValueString()), err.Error()) return } - - // TIP: -- 5. Set the arguments and attributes - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 6. Set the state - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *resourcePortal) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - // TIP: ==== RESOURCE UPDATE ==== - // Not all resources have Update functions. There are a few reasons: - // a. The AWS API does not support changing a resource - // b. All arguments have RequiresReplace() plan modifiers - // c. The AWS API uses a create call to modify an existing resource - // - // In the cases of a. and b., the resource will not have an update method - // defined. In the case of c., Update and Create can be refactored to call - // the same underlying function. - // - // The rest of the time, there should be an Update function and it should - // do the following things. Make sure there is a good reason if you don't - // do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the plan and state - // 3. Populate a modify input structure and check for changes - // 4. Call the AWS modify/update function - // 5. Use a waiter to wait for update to complete - // 6. Save the request plan to response state - // TIP: -- 1. Get a client connection to the relevant service - conn := r.Meta().WorkSpacesWebClient(ctx) - - // TIP: -- 2. Fetch the plan - var plan, state resourcePortalModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *portalResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old portalResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 3. Populate a modify input structure and check for changes - if !plan.Name.Equal(state.Name) || - !plan.Description.Equal(state.Description) || - !plan.ComplexArgument.Equal(state.ComplexArgument) || - !plan.Type.Equal(state.Type) { + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + if !new.AuthenticationType.Equal(old.AuthenticationType) || + !new.BrowserSettingsARN.Equal(old.BrowserSettingsARN) || + !new.DataProtectionSettingsARN.Equal(old.DataProtectionSettingsARN) || + !new.DisplayName.Equal(old.DisplayName) || + !new.InstanceType.Equal(old.InstanceType) || + !new.IPAccessSettingsARN.Equal(old.IPAccessSettingsARN) || + !new.MaxConcurrentSessions.Equal(old.MaxConcurrentSessions) || + !new.NetworkSettingsARN.Equal(old.NetworkSettingsARN) || + !new.TrustStoreARN.Equal(old.TrustStoreARN) || + !new.UserAccessLoggingSettingsARN.Equal(old.UserAccessLoggingSettingsARN) || + !new.UserSettingsARN.Equal(old.UserSettingsARN) { var input workspacesweb.UpdatePortalInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input, flex.WithFieldNamePrefix("Test"))...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 4. Call the AWS modify/update function - out, err := conn.UpdatePortal(ctx, &input) + + _, err := conn.UpdatePortal(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionUpdating, ResNamePortal, plan.ID.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Portal (%s)", new.PortalARN.ValueString()), err.Error()) return } - if out == nil || out.Portal == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionUpdating, ResNamePortal, plan.ID.String(), nil), - errors.New("empty output").Error(), - ) + + updateTimeout := r.CreateTimeout(ctx, new.Timeouts) + // Wait for portal to be updated + portal, err := waitPortalUpdated(ctx, conn, new.PortalARN.ValueString(), updateTimeout) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) update", new.PortalARN.ValueString()), err.Error()) return } - - // TIP: Using the output from the update function, re-set any computed attributes - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { + + response.Diagnostics.Append(fwflex.Flatten(ctx, portal, &new)...) + if response.Diagnostics.HasError() { return } } - // TIP: -- 5. Use a waiter to wait for update to complete - updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) - _, err := waitPortalUpdated(ctx, conn, plan.ID.ValueString(), updateTimeout) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForUpdate, ResNamePortal, plan.ID.String(), err), - err.Error(), - ) - return - } - - // TIP: -- 6. Save the request plan to response state - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } -func (r *resourcePortal) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - // TIP: ==== RESOURCE DELETE ==== - // Most resources have Delete functions. There are rare situations - // where you might not need a delete: - // a. The AWS API does not provide a way to delete the resource - // b. The point of your resource is to perform an action (e.g., reboot a - // server) and deleting serves no purpose. - // - // The Delete function should do the following things. Make sure there - // is a good reason if you don't do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the state - // 3. Populate a delete input structure - // 4. Call the AWS delete function - // 5. Use a waiter to wait for delete to complete - // TIP: -- 1. Get a client connection to the relevant service - conn := r.Meta().WorkSpacesWebClient(ctx) - - // TIP: -- 2. Fetch the state - var state resourcePortalModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *portalResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data portalResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - - // TIP: -- 3. Populate a delete input structure + + conn := r.Meta().WorkSpacesWebClient(ctx) + input := workspacesweb.DeletePortalInput{ - PortalId: state.ID.ValueStringPointer(), + PortalArn: aws.String(data.PortalARN.ValueString()), } - - // TIP: -- 4. Call the AWS delete function _, err := conn.DeletePortal(ctx, &input) - // TIP: On rare occassions, the API returns a not found error after deleting a - // resource. If that happens, we don't want it to show up as an error. - if err != nil { - if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return - } - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionDeleting, ResNamePortal, state.ID.String(), err), - err.Error(), - ) + if errs.IsA[*awstypes.ResourceNotFoundException](err) { return } - - // TIP: -- 5. Use a waiter to wait for delete to complete - deleteTimeout := r.DeleteTimeout(ctx, state.Timeouts) - _, err = waitPortalDeleted(ctx, conn, state.ID.ValueString(), deleteTimeout) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.WorkSpacesWeb, create.ErrActionWaitingForDeletion, ResNamePortal, state.ID.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Portal (%s)", data.PortalARN.ValueString()), err.Error()) return } -} -// TIP: ==== TERRAFORM IMPORTING ==== -// If Read can get all the information it needs from the Identifier -// (i.e., path.Root("id")), you can use the PassthroughID importer. Otherwise, -// you'll need a custom import function. -// -// See more: -// https://developer.hashicorp.com/terraform/plugin/framework/resources/import -func (r *resourcePortal) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) + deleteTimeout := r.DeleteTimeout(ctx, data.Timeouts) + // Wait for portal to be deleted + _, err = waitPortalDeleted(ctx, conn, data.PortalARN.ValueString(), deleteTimeout) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) deletion", data.PortalARN.ValueString()), err.Error()) + return + } } +func (r *portalResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("portal_arn"), request, response) +} - - -// TIP: ==== STATUS CONSTANTS ==== -// Create constants for states and statuses if the service does not -// already have suitable constants. We prefer that you use the constants -// provided in the service if available (e.g., awstypes.StatusInProgress). +// Status constants const ( - statusChangePending = "Pending" - statusDeleting = "Deleting" - statusNormal = "Normal" - statusUpdated = "Updated" + statusPending = "Pending" + statusActive = "Active" + statusDeleting = "Deleting" ) -// TIP: ==== WAITERS ==== -// Some resources of some services have waiters provided by the AWS API. -// Unless they do not work properly, use them rather than defining new ones -// here. -// -// Sometimes we define the wait, status, and find functions in separate -// files, wait.go, status.go, and find.go. Follow the pattern set out in the -// service and define these where it makes the most sense. -// -// If these functions are used in the _test.go file, they will need to be -// exported (i.e., capitalized). -// -// You will need to adjust the parameters and names to fit the service. -func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { +// Waiters +func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{}, - Target: []string{statusNormal}, - Refresh: statusPortal(ctx, conn, id), + Pending: []string{string(awstypes.PortalStatusPending)}, + Target: []string{string(awstypes.PortalStatusIncomplete), string(awstypes.PortalStatusActive)}, + Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, } outputRaw, err := stateConf.WaitForStateContext(ctx) - if out, ok := outputRaw.(*workspacesweb.Portal); ok { + if out, ok := outputRaw.(*awstypes.Portal); ok { return out, err } return nil, err } -// TIP: It is easier to determine whether a resource is updated for some -// resources than others. The best case is a status flag that tells you when -// the update has been fully realized. Other times, you can check to see if a -// key resource argument is updated to a new value or not. -func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { +func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{statusChangePending}, - Target: []string{statusUpdated}, - Refresh: statusPortal(ctx, conn, id), + Pending: []string{string(awstypes.PortalStatusPending)}, + Target: []string{string(awstypes.PortalStatusIncomplete), string(awstypes.PortalStatusActive)}, + Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, } outputRaw, err := stateConf.WaitForStateContext(ctx) - if out, ok := outputRaw.(*workspacesweb.Portal); ok { + if out, ok := outputRaw.(*awstypes.Portal); ok { return out, err } return nil, err } -// TIP: A deleted waiter is almost like a backwards created waiter. There may -// be additional pending states, however. -func waitPortalDeleted(ctx context.Context, conn *workspacesweb.Client, id string, timeout time.Duration) (*awstypes.Portal, error) { +func waitPortalDeleted(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{statusDeleting, statusNormal}, - Target: []string{}, - Refresh: statusPortal(ctx, conn, id), - Timeout: timeout, + Pending: []string{statusDeleting, string(awstypes.PortalStatusActive), string(awstypes.PortalStatusPending), string(awstypes.PortalStatusIncomplete)}, + Target: []string{}, + Refresh: statusPortal(ctx, conn, arn), + Timeout: timeout, } outputRaw, err := stateConf.WaitForStateContext(ctx) - if out, ok := outputRaw.(*workspacesweb.Portal); ok { + if out, ok := outputRaw.(*awstypes.Portal); ok { return out, err } return nil, err } -// TIP: ==== STATUS ==== -// The status function can return an actual status when that field is -// available from the API (e.g., out.Status). Otherwise, you can use custom -// statuses to communicate the states of the resource. -// -// Waiters consume the values returned by status functions. Design status so -// that it can be reused by a create, update, and delete waiter, if possible. -func statusPortal(ctx context.Context, conn *workspacesweb.Client, id string) retry.StateRefreshFunc { +// Status function +func statusPortal(ctx context.Context, conn *workspacesweb.Client, arn string) retry.StateRefreshFunc { return func() (interface{}, string, error) { - out, err := findPortalByID(ctx, conn, id) + out, err := findPortalByARN(ctx, conn, arn) if tfresource.NotFound(err) { return nil, "", nil } @@ -588,62 +433,59 @@ func statusPortal(ctx context.Context, conn *workspacesweb.Client, id string) re return nil, "", err } - return out, aws.ToString(out.Status), nil + return out, string(out.PortalStatus), nil } } -// TIP: ==== FINDERS ==== -// The find function is not strictly necessary. You could do the API -// request from the status function. However, we have found that find often -// comes in handy in other places besides the status function. As a result, it -// is good practice to define it separately. -func findPortalByID(ctx context.Context, conn *workspacesweb.Client, id string) (*awstypes.Portal, error) { - in := &workspacesweb.GetPortalInput{ - Id: aws.String(id), +// Finder function +func findPortalByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.Portal, error) { + input := &workspacesweb.GetPortalInput{ + PortalArn: aws.String(arn), } - out, err := conn.GetPortal(ctx, in) - if err != nil { - if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + output, err := conn.GetPortal(ctx, input) + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, } + } + if err != nil { return nil, err } - if out == nil || out.Portal == nil { - return nil, tfresource.NewEmptyResultError(in) + if output == nil || output.Portal == nil { + return nil, tfresource.NewEmptyResultError(input) } - return out.Portal, nil -} - -// TIP: ==== DATA STRUCTURES ==== -// With Terraform Plugin-Framework configurations are deserialized into -// Go types, providing type safety without the need for type assertions. -// These structs should match the schema definition exactly, and the `tfsdk` -// tag value should match the attribute name. -// -// Nested objects are represented in their own data struct. These will -// also have a corresponding attribute type mapping for use inside flex -// functions. -// -// See more: -// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values -type resourcePortalModel struct { - ARN types.String `tfsdk:"arn"` - ComplexArgument fwtypes.ListNestedObjectValueOf[complexArgumentModel] `tfsdk:"complex_argument"` - Description types.String `tfsdk:"description"` - ID types.String `tfsdk:"id"` - Name types.String `tfsdk:"name"` - Timeouts timeouts.Value `tfsdk:"timeouts"` - Type types.String `tfsdk:"type"` + return output.Portal, nil } -type complexArgumentModel struct { - NestedRequired types.String `tfsdk:"nested_required"` - NestedOptional types.String `tfsdk:"nested_optional"` +// Data model +type portalResourceModel struct { + framework.WithRegionModel + AdditionalEncryptionContext fwtypes.MapOfString `tfsdk:"additional_encryption_context"` + AuthenticationType fwtypes.StringEnum[awstypes.AuthenticationType] `tfsdk:"authentication_type"` + BrowserSettingsARN types.String `tfsdk:"browser_settings_arn"` + BrowserType fwtypes.StringEnum[awstypes.BrowserType] `tfsdk:"browser_type"` + CreationDate timetypes.RFC3339 `tfsdk:"creation_date"` + CustomerManagedKey types.String `tfsdk:"customer_managed_key"` + DataProtectionSettingsARN types.String `tfsdk:"data_protection_settings_arn"` + DisplayName types.String `tfsdk:"display_name"` + InstanceType fwtypes.StringEnum[awstypes.InstanceType] `tfsdk:"instance_type"` + IPAccessSettingsARN types.String `tfsdk:"ip_access_settings_arn"` + MaxConcurrentSessions types.Int64 `tfsdk:"max_concurrent_sessions"` + NetworkSettingsARN types.String `tfsdk:"network_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` + PortalEndpoint types.String `tfsdk:"portal_endpoint"` + PortalStatus fwtypes.StringEnum[awstypes.PortalStatus] `tfsdk:"portal_status"` + RendererType fwtypes.StringEnum[awstypes.RendererType] `tfsdk:"renderer_type"` + StatusReason types.String `tfsdk:"status_reason"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + TrustStoreARN types.String `tfsdk:"trust_store_arn"` + UserAccessLoggingSettingsARN types.String `tfsdk:"user_access_logging_settings_arn"` + UserSettingsARN types.String `tfsdk:"user_settings_arn"` } diff --git a/internal/service/workspacesweb/portal_tags_gen_test.go b/internal/service/workspacesweb/portal_tags_gen_test.go new file mode 100644 index 000000000000..e585d0295d60 --- /dev/null +++ b/internal/service/workspacesweb/portal_tags_gen_test.go @@ -0,0 +1,2224 @@ +// Code generated by internal/generate/tagstests/main.go; DO NOT EDIT. + +package workspacesweb_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebPortal_tags(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_null(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_EmptyMap(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_AddOnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_providerOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_nonOverlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_overlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToProviderOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToResourceOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + ImportStateVerifyIgnore: []string{ + "tags.resourcekey1", // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey(acctest.CtKey1)), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 2: Update ignored tag only + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Again), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebPortal_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.Portal + resourceName := "aws_workspacesweb_portal.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 2: Update ignored tag + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Portal/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} diff --git a/internal/service/workspacesweb/portal_test.go b/internal/service/workspacesweb/portal_test.go index 25320faf5d2d..a20c5f8902b0 100644 --- a/internal/service/workspacesweb/portal_test.go +++ b/internal/service/workspacesweb/portal_test.go @@ -3,152 +3,89 @@ package workspacesweb_test -// **PLEASE DELETE THIS AND ALL TIP COMMENTS BEFORE SUBMITTING A PR FOR REVIEW!** -// -// TIP: ==== INTRODUCTION ==== -// Thank you for trying the skaff tool! -// -// You have opted to include these helpful comments. They all include "TIP:" -// to help you find and remove them when you're done with them. -// -// While some aspects of this file are customized to your input, the -// scaffold tool does *not* look at the AWS API and ensure it has correct -// function, structure, and variable names. It makes guesses based on -// commonalities. You will need to make significant adjustments. -// -// In other words, as generated, this is a rough outline of the work you will -// need to do. If something doesn't make sense for your situation, get rid of -// it. - import ( - // TIP: ==== IMPORTS ==== - // This is a common set of imports but not customized to your code since - // your code hasn't been written yet. Make sure you, your IDE, or - // goimports -w fixes these imports. - // - // The provider linter wants your imports to be in two groups: first, - // standard library (i.e., "fmt" or "strings"), second, everything else. - // - // Also, AWS Go SDK v2 may handle nested structures differently than v1, - // using the services/workspacesweb/types package. If so, you'll - // need to import types and reference the nested types, e.g., as - // types.. "context" - "errors" "fmt" "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/workspacesweb" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" "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/create" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" - - // TIP: You will often need to import the package that this test file lives - // in. Since it is in the "test" context, it must import the package to use - // any normal context constants, variables, or functions. - tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" ) -// TIP: File Structure. The basic outline for all test files should be as -// follows. Improve this resource's maintainability by following this -// outline. -// -// 1. Package declaration (add "_test" since this is a test file) -// 2. Imports -// 3. Unit tests -// 4. Basic test -// 5. Disappears test -// 6. All the other tests -// 7. Helper functions (exists, destroy, check, etc.) -// 8. Functions that return Terraform configurations - -// TIP: ==== UNIT TESTS ==== -// This is an example of a unit test. Its name is not prefixed with -// "TestAcc" like an acceptance test. -// -// Unlike acceptance tests, unit tests do not access AWS and are focused on a -// function (or method). Because of this, they are quick and cheap to run. -// -// In designing a resource's implementation, isolate complex bits from AWS bits -// so that they can be tested through a unit test. We encourage more unit tests -// in the provider. -// -// Cut and dry functions using well-used patterns, like typical flatteners and -// expanders, don't need unit testing. However, if they are complex or -// intricate, they should be unit tested. -func TestPortalExampleUnitTest(t *testing.T) { - t.Parallel() +func TestAccWorkSpacesWebPortal_basic(t *testing.T) { + ctx := acctest.Context(t) + var portal awstypes.Portal + resourceName := "aws_workspacesweb_portal.test" - testCases := []struct { - TestName string - Input string - Expected string - Error bool - }{ - { - TestName: "empty", - Input: "", - Expected: "", - Error: true, - }, - { - TestName: "descriptive name", - Input: "some input", - Expected: "some output", - Error: false, + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) }, - { - TestName: "another descriptive name", - Input: "more input", - Expected: "more output", - Error: false, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPortalConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &portal), + resource.TestCheckResourceAttr(resourceName, "display_name", "test"), + resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardRegular)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "portal_arn", "workspaces-web", regexache.MustCompile(`portal/.+$`)), + resource.TestCheckResourceAttrSet(resourceName, "portal_endpoint"), + resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusIncomplete)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, }, - } - - for _, testCase := range testCases { - t.Run(testCase.TestName, func(t *testing.T) { - t.Parallel() - got, err := tfworkspacesweb.FunctionFromResource(testCase.Input) - - if err != nil && !testCase.Error { - t.Errorf("got error (%s), expected no error", err) - } + }) +} - if err == nil && testCase.Error { - t.Errorf("got (%s) and no error, expected error", got) - } +func TestAccWorkSpacesWebPortal_disappears(t *testing.T) { + ctx := acctest.Context(t) + var portal awstypes.Portal + resourceName := "aws_workspacesweb_portal.test" - if got != testCase.Expected { - t.Errorf("got %s, expected %s", got, testCase.Expected) - } - }) - } + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPortalDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPortalConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &portal), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourcePortal, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) } -// TIP: ==== ACCEPTANCE TESTS ==== -// This is an example of a basic acceptance test. This should test as much of -// standard functionality of the resource as possible, and test importing, if -// applicable. We prefix its name with "TestAcc", the service, and the -// resource name. -// -// Acceptance test access AWS and cost money to run. -func TestAccWorkSpacesWebPortal_basic(t *testing.T) { +func TestAccWorkSpacesWebPortal_update(t *testing.T) { ctx := acctest.Context(t) - // TIP: This is a long-running test guard for tests that run longer than - // 300s (5 min) generally. - if testing.Short() { - t.Skip("skipping long-running test in short mode") - } - - var portal workspacesweb.DescribePortalResponse - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + var portal awstypes.Portal resourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ @@ -162,41 +99,43 @@ func TestAccWorkSpacesWebPortal_basic(t *testing.T) { CheckDestroy: testAccCheckPortalDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccPortalConfig_basic(rName), + Config: testAccPortalConfig_updateBefore(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - resource.TestCheckResourceAttr(resourceName, "auto_minor_version_upgrade", "false"), - resource.TestCheckResourceAttrSet(resourceName, "maintenance_window_start_time.0.day_of_week"), - resource.TestCheckTypeSetElemNestedAttrs(resourceName, "user.*", map[string]string{ - "console_access": "false", - "groups.#": "0", - "username": "Test", - "password": "TestTest1234", - }), - // TIP: If the ARN can be partially or completely determined by the parameters passed, e.g. it contains the - // value of `rName`, either include the values in the regex or check for an exact match using `acctest.CheckResourceAttrRegionalARN` - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "workspacesweb", regexache.MustCompile(`portal:.+$`)), + resource.TestCheckResourceAttr(resourceName, "display_name", "test-before"), + resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardRegular)), + resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "1"), + resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeStandard)), + resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusIncomplete)), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"apply_immediately", "user"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerifyIdentifierAttribute: "portal_arn", + }, + { + Config: testAccPortalConfig_updateAfter(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPortalExists(ctx, resourceName, &portal), + resource.TestCheckResourceAttr(resourceName, "display_name", "test-after"), + resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardLarge)), + resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "2"), + resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeIamIdentityCenter)), + resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusActive)), + ), }, }, }) } -func TestAccWorkSpacesWebPortal_disappears(t *testing.T) { +func TestAccWorkSpacesWebPortal_complete(t *testing.T) { ctx := acctest.Context(t) - if testing.Short() { - t.Skip("skipping long-running test in short mode") - } - - var portal workspacesweb.DescribePortalResponse - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + var portal awstypes.Portal resourceName := "aws_workspacesweb_portal.test" + kmsKeyResourceName := "aws_kms_key.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -209,18 +148,24 @@ func TestAccWorkSpacesWebPortal_disappears(t *testing.T) { CheckDestroy: testAccCheckPortalDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccPortalConfig_basic(rName, testAccPortalVersionNewer), + Config: testAccPortalConfig_complete(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - // TIP: The Plugin-Framework disappears helper is similar to the Plugin-SDK version, - // but expects a new resource factory function as the third argument. To expose this - // private function to the testing package, you may need to add a line like the following - // to exports_test.go: - // - // var ResourcePortal = newResourcePortal - acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourcePortal, resourceName), + resource.TestCheckResourceAttr(resourceName, "display_name", "test-complete"), + resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardLarge)), + resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "2"), + resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeStandard)), + resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", kmsKeyResourceName, names.AttrARN), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.Environment", "Production"), + resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusIncomplete)), ), - ExpectNonEmptyPlan: true, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "portal_arn"), + ImportStateVerifyIdentifierAttribute: "portal_arn", }, }, }) @@ -235,81 +180,118 @@ func testAccCheckPortalDestroy(ctx context.Context) resource.TestCheckFunc { continue } - // TIP: ==== FINDERS ==== - // The find function should be exported. Since it won't be used outside of the package, it can be exported - // in the `exports_test.go` file. - _, err := tfworkspacesweb.FindPortalByID(ctx, conn, rs.Primary.ID) + _, err := tfworkspacesweb.FindPortalByARN(ctx, conn, rs.Primary.Attributes["portal_arn"]) + if tfresource.NotFound(err) { - return nil + continue } + if err != nil { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) + return err } - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingDestroyed, tfworkspacesweb.ResNamePortal, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("WorkSpaces Web Portal %s still exists", rs.Primary.Attributes["portal_arn"]) } return nil } } -func testAccCheckPortalExists(ctx context.Context, name string, portal *workspacesweb.DescribePortalResponse) resource.TestCheckFunc { +func testAccCheckPortalExists(ctx context.Context, n string, v *awstypes.Portal) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, name, errors.New("not found")) - } - - if rs.Primary.ID == "" { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) - resp, err := tfworkspacesweb.FindPortalByID(ctx, conn, rs.Primary.ID) + output, err := tfworkspacesweb.FindPortalByARN(ctx, conn, rs.Primary.Attributes["portal_arn"]) + if err != nil { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingExistence, tfworkspacesweb.ResNamePortal, rs.Primary.ID, err) + return err } - *portal = *resp + *v = *output return nil } } -func testAccCheckPortalNotRecreated(before, after *workspacesweb.DescribePortalResponse) resource.TestCheckFunc { - return func(s *terraform.State) error { - if before, after := aws.ToString(before.PortalId), aws.ToString(after.PortalId); before != after { - return create.Error(names.WorkSpacesWeb, create.ErrActionCheckingNotRecreated, tfworkspacesweb.ResNamePortal, aws.ToString(before.PortalId), errors.New("recreated")) - } +func testAccPortalConfig_basic() string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" + instance_type = %q +} +`, string(awstypes.InstanceTypeStandardRegular)) +} - return nil - } +func testAccPortalConfig_updateBefore() string { + return testAccPortalConfig_template("test-before", string(awstypes.InstanceTypeStandardRegular), 1, string(awstypes.AuthenticationTypeStandard)) } -func testAccPortalConfig_basic(rName, version string) string { - return fmt.Sprintf(` -resource "aws_security_group" "test" { - name = %[1]q +func testAccPortalConfig_updateAfter() string { + return testAccPortalConfig_template("test-after", string(awstypes.InstanceTypeStandardLarge), 2, string(awstypes.AuthenticationTypeIamIdentityCenter)) } +func testAccPortalConfig_template(displayName, instanceType string, maxConcurrentSessions int, authenticationType string) string { + return fmt.Sprintf(` resource "aws_workspacesweb_portal" "test" { - portal_name = %[1]q - engine_type = "ActiveWorkSpacesWeb" - engine_version = %[2]q - host_instance_type = "workspacesweb.t2.micro" - security_groups = [aws_security_group.test.id] - authentication_strategy = "simple" - storage_type = "efs" + display_name = %q + instance_type = %q + max_concurrent_sessions = %d + authentication_type = %q +} +`, displayName, instanceType, maxConcurrentSessions, authenticationType) +} - logs { - general = true - } +func testAccPortalConfig_complete() string { + return fmt.Sprintf(` +resource "aws_kms_key" "test" { + deletion_window_in_days = 7 + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Sid = "Enable IAM User Permissions" + Effect = "Allow" + Principal = { + AWS = "*" + } + Action = "kms:*" + Resource = "*" + }, + { + Sid = "Allow WorkSpacesWeb to use the key" + Effect = "Allow" + Principal = { + Service = "workspaces-web.amazonaws.com" + } + Action = [ + "kms:DescribeKey", + "kms:GenerateDataKey", + "kms:GenerateDataKeyWithoutPlaintext", + "kms:Decrypt", + "kms:ReEncryptTo", + "kms:ReEncryptFrom" + ] + Resource = "*" + } + ] + }) +} - user { - username = "Test" - password = "TestTest1234" +resource "aws_workspacesweb_portal" "test" { + display_name = "test-complete" + instance_type = %q + max_concurrent_sessions = 2 + authentication_type = %q + customer_managed_key = aws_kms_key.test.arn + + additional_encryption_context = { + Environment = "Production" } } -`, rName, version) +`, string(awstypes.InstanceTypeStandardLarge), string(awstypes.AuthenticationTypeStandard)) } diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index b1b470fbc33e..35b470746645 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -60,6 +60,15 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newPortalResource, + TypeName: "aws_workspacesweb_portal", + Name: "Portal", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: "portal_arn", + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newTrustStoreResource, TypeName: "aws_workspacesweb_trust_store", diff --git a/internal/service/workspacesweb/testdata/Portal/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/Portal/tagsComputed1/main_gen.tf new file mode 100644 index 000000000000..06ca9e3767de --- /dev/null +++ b/internal/service/workspacesweb/testdata/Portal/tagsComputed1/main_gen.tf @@ -0,0 +1,18 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_portal" "test" { + + tags = { + (var.unknownTagKey) = null_resource.test.id + } + +} +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/Portal/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/Portal/tagsComputed2/main_gen.tf new file mode 100644 index 000000000000..3b0b2bd5429d --- /dev/null +++ b/internal/service/workspacesweb/testdata/Portal/tagsComputed2/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_portal" "test" { + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } + +} +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} + +variable "knownTagKey" { + type = string + nullable = false +} + +variable "knownTagValue" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/Portal/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/Portal/tags_defaults/main_gen.tf new file mode 100644 index 000000000000..b06385ac778d --- /dev/null +++ b/internal/service/workspacesweb/testdata/Portal/tags_defaults/main_gen.tf @@ -0,0 +1,25 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } +} + +resource "aws_workspacesweb_portal" "test" { + + tags = var.resource_tags + +} +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/Portal/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/Portal/tags_ignore/main_gen.tf new file mode 100644 index 000000000000..7961dbff780f --- /dev/null +++ b/internal/service/workspacesweb/testdata/Portal/tags_ignore/main_gen.tf @@ -0,0 +1,34 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } + ignore_tags { + keys = var.ignore_tag_keys + } +} + +resource "aws_workspacesweb_portal" "test" { + + tags = var.resource_tags + +} +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = true + default = null +} + +variable "ignore_tag_keys" { + type = set(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl index e69de29bb2d1..4589075edacf 100644 --- a/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/portal_tags.gtpl @@ -0,0 +1,5 @@ +resource "aws_workspacesweb_portal" "test" { + +{{- template "tags" . }} + +} \ No newline at end of file diff --git a/website/docs/r/workspacesweb_portal.html.markdown b/website/docs/r/workspacesweb_portal.html.markdown index 6e67c180dd0f..edce08f80a55 100644 --- a/website/docs/r/workspacesweb_portal.html.markdown +++ b/website/docs/r/workspacesweb_portal.html.markdown @@ -5,14 +5,7 @@ page_title: "AWS: aws_workspacesweb_portal" description: |- Terraform resource for managing an AWS WorkSpaces Web Portal. --- -` + # Resource: aws_workspacesweb_portal Terraform resource for managing an AWS WorkSpaces Web Portal. @@ -23,47 +16,96 @@ Terraform resource for managing an AWS WorkSpaces Web Portal. ```terraform resource "aws_workspacesweb_portal" "example" { + display_name = "example-portal" + instance_type = "standard.regular" } ``` -## Argument Reference +### Complete Usage -The following arguments are required: +```terraform +resource "aws_kms_key" "example" { + description = "KMS key for WorkSpaces Web Portal" + deletion_window_in_days = 7 +} -* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +resource "aws_workspacesweb_portal" "example" { + display_name = "example-portal" + instance_type = "standard.large" + authentication_type = "IAM_Identity_Center" + customer_managed_key = aws_kms_key.example.arn + max_concurrent_sessions = 10 + + additional_encryption_context = { + Environment = "Production" + } + + tags = { + Name = "example-portal" + } + + timeouts { + create = "10m" + update = "10m" + delete = "10m" + } +} +``` + +## Argument Reference The following arguments are optional: -* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `additional_encryption_context` - (Optional) Additional encryption context for the customer managed key. Forces replacement if changed. +* `authentication_type` - (Optional) Authentication type for the portal. Valid values: `Standard`, `IAM_Identity_Center`. +* `browser_settings_arn` - (Optional) ARN of the browser settings to use for the portal. +* `customer_managed_key` - (Optional) ARN of the customer managed key. Forces replacement if changed. +* `display_name` - (Optional) Display name of the portal. +* `instance_type` - (Optional) Instance type for the portal. Valid values: `standard.regular`, `standard.large`. +* `max_concurrent_sessions` - (Optional) Maximum number of concurrent sessions for the portal. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ## Attribute Reference This resource exports the following attributes in addition to the arguments above: -* `arn` - ARN of the Portal. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. -* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `browser_type` - Browser type of the portal. +* `creation_date` - Creation date of the portal. +* `data_protection_settings_arn` - ARN of the data protection settings associated with the portal. +* `ip_access_settings_arn` - ARN of the IP access settings associated with the portal. +* `network_settings_arn` - ARN of the network settings associated with the portal. +* `portal_arn` - ARN of the portal. +* `portal_endpoint` - Endpoint URL of the portal. +* `portal_status` - Status of the portal. +* `renderer_type` - Renderer type of the portal. +* `status_reason` - Reason for the current status of the portal. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +* `trust_store_arn` - ARN of the trust store associated with the portal. +* `user_access_logging_settings_arn` - ARN of the user access logging settings associated with the portal. +* `user_settings_arn` - ARN of the user settings associated with the portal. ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): -* `create` - (Default `60m`) -* `update` - (Default `180m`) -* `delete` - (Default `90m`) +* `create` - (Default `5m`) +* `update` - (Default `5m`) +* `delete` - (Default `5m`) ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Portal using the `example_id_arg`. For example: +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Portal using the `portal_arn`. For example: ```terraform import { to = aws_workspacesweb_portal.example - id = "portal-id-12345678" + id = "arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678" } ``` -Using `terraform import`, import WorkSpaces Web Portal using the `example_id_arg`. For example: +Using `terraform import`, import WorkSpaces Web Portal using the `portal_arn`. For example: ```console -% terraform import aws_workspacesweb_portal.example portal-id-12345678 +% terraform import aws_workspacesweb_portal.example arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678 ``` From d020b03f846198c9ee0fd2fc0df6cb83ca4eaba5 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 18 Jul 2025 12:06:29 +0000 Subject: [PATCH 0110/2115] Fixed lint errors, added change log --- .changelog/43444.txt | 3 ++ internal/service/workspacesweb/portal.go | 43 ++++++++----------- internal/service/workspacesweb/portal_test.go | 30 +++++++------ .../docs/r/workspacesweb_portal.html.markdown | 6 +-- 4 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 .changelog/43444.txt diff --git a/.changelog/43444.txt b/.changelog/43444.txt new file mode 100644 index 000000000000..82c91c88bf90 --- /dev/null +++ b/.changelog/43444.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_portal +``` \ No newline at end of file diff --git a/internal/service/workspacesweb/portal.go b/internal/service/workspacesweb/portal.go index 2518c80d2829..3f6609201602 100644 --- a/internal/service/workspacesweb/portal.go +++ b/internal/service/workspacesweb/portal.go @@ -22,11 +22,13 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -90,7 +92,7 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, - "creation_date": schema.StringAttribute{ + names.AttrCreationDate: schema.StringAttribute{ CustomType: timetypes.RFC3339Type{}, Computed: true, PlanModifiers: []planmodifier.String{ @@ -109,11 +111,11 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, - "display_name": schema.StringAttribute{ + names.AttrDisplayName: schema.StringAttribute{ Optional: true, Computed: true, }, - "instance_type": schema.StringAttribute{ + names.AttrInstanceType: schema.StringAttribute{ CustomType: fwtypes.StringEnumType[awstypes.InstanceType](), Optional: true, Computed: true, @@ -160,7 +162,7 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, - "status_reason": schema.StringAttribute{ + names.AttrStatusReason: schema.StringAttribute{ Computed: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.UseStateForUnknown(), @@ -252,7 +254,7 @@ func (r *portalResource) Read(ctx context.Context, request resource.ReadRequest, conn := r.Meta().WorkSpacesWebClient(ctx) output, err := findPortalByARN(ctx, conn, data.PortalARN.ValueString()) - if tfresource.NotFound(err) { + if tfretry.NotFound(err) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) response.State.RemoveResource(ctx) return @@ -335,7 +337,7 @@ func (r *portalResource) Delete(ctx context.Context, request resource.DeleteRequ conn := r.Meta().WorkSpacesWebClient(ctx) input := workspacesweb.DeletePortalInput{ - PortalArn: aws.String(data.PortalARN.ValueString()), + PortalArn: data.PortalARN.ValueStringPointer(), } _, err := conn.DeletePortal(ctx, &input) @@ -361,18 +363,11 @@ func (r *portalResource) ImportState(ctx context.Context, request resource.Impor resource.ImportStatePassthroughID(ctx, path.Root("portal_arn"), request, response) } -// Status constants -const ( - statusPending = "Pending" - statusActive = "Active" - statusDeleting = "Deleting" -) - // Waiters func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{string(awstypes.PortalStatusPending)}, - Target: []string{string(awstypes.PortalStatusIncomplete), string(awstypes.PortalStatusActive)}, + Pending: enum.Slice(awstypes.PortalStatusPending), + Target: enum.Slice(awstypes.PortalStatusIncomplete, awstypes.PortalStatusActive), Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, NotFoundChecks: 20, @@ -389,8 +384,8 @@ func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, arn stri func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{string(awstypes.PortalStatusPending)}, - Target: []string{string(awstypes.PortalStatusIncomplete), string(awstypes.PortalStatusActive)}, + Pending: enum.Slice(awstypes.PortalStatusPending), + Target: enum.Slice(awstypes.PortalStatusIncomplete, awstypes.PortalStatusActive), Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, NotFoundChecks: 20, @@ -407,7 +402,7 @@ func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, arn stri func waitPortalDeleted(ctx context.Context, conn *workspacesweb.Client, arn string, timeout time.Duration) (*awstypes.Portal, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{statusDeleting, string(awstypes.PortalStatusActive), string(awstypes.PortalStatusPending), string(awstypes.PortalStatusIncomplete)}, + Pending: enum.Slice(awstypes.PortalStatusActive, awstypes.PortalStatusIncomplete, awstypes.PortalStatusPending), Target: []string{}, Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, @@ -423,9 +418,9 @@ func waitPortalDeleted(ctx context.Context, conn *workspacesweb.Client, arn stri // Status function func statusPortal(ctx context.Context, conn *workspacesweb.Client, arn string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { + return func() (any, string, error) { out, err := findPortalByARN(ctx, conn, arn) - if tfresource.NotFound(err) { + if tfretry.NotFound(err) { return nil, "", nil } @@ -439,15 +434,15 @@ func statusPortal(ctx context.Context, conn *workspacesweb.Client, arn string) r // Finder function func findPortalByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.Portal, error) { - input := &workspacesweb.GetPortalInput{ + input := workspacesweb.GetPortalInput{ PortalArn: aws.String(arn), } - output, err := conn.GetPortal(ctx, input) + output, err := conn.GetPortal(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, - LastRequest: input, + LastRequest: &input, } } @@ -456,7 +451,7 @@ func findPortalByARN(ctx context.Context, conn *workspacesweb.Client, arn string } if output == nil || output.Portal == nil { - return nil, tfresource.NewEmptyResultError(input) + return nil, tfresource.NewEmptyResultError(&input) } return output.Portal, nil diff --git a/internal/service/workspacesweb/portal_test.go b/internal/service/workspacesweb/portal_test.go index a20c5f8902b0..28cefa9876de 100644 --- a/internal/service/workspacesweb/portal_test.go +++ b/internal/service/workspacesweb/portal_test.go @@ -38,8 +38,8 @@ func TestAccWorkSpacesWebPortal_basic(t *testing.T) { Config: testAccPortalConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - resource.TestCheckResourceAttr(resourceName, "display_name", "test"), - resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardRegular)), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, "test"), + resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, string(awstypes.InstanceTypeStandardRegular)), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "portal_arn", "workspaces-web", regexache.MustCompile(`portal/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "portal_endpoint"), resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusIncomplete)), @@ -102,8 +102,8 @@ func TestAccWorkSpacesWebPortal_update(t *testing.T) { Config: testAccPortalConfig_updateBefore(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - resource.TestCheckResourceAttr(resourceName, "display_name", "test-before"), - resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardRegular)), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, "test-before"), + resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, string(awstypes.InstanceTypeStandardRegular)), resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "1"), resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeStandard)), resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusIncomplete)), @@ -120,8 +120,8 @@ func TestAccWorkSpacesWebPortal_update(t *testing.T) { Config: testAccPortalConfig_updateAfter(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - resource.TestCheckResourceAttr(resourceName, "display_name", "test-after"), - resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardLarge)), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, "test-after"), + resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, string(awstypes.InstanceTypeStandardLarge)), resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "2"), resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeIamIdentityCenter)), resource.TestCheckResourceAttr(resourceName, "portal_status", string(awstypes.PortalStatusActive)), @@ -151,8 +151,8 @@ func TestAccWorkSpacesWebPortal_complete(t *testing.T) { Config: testAccPortalConfig_complete(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPortalExists(ctx, resourceName, &portal), - resource.TestCheckResourceAttr(resourceName, "display_name", "test-complete"), - resource.TestCheckResourceAttr(resourceName, "instance_type", string(awstypes.InstanceTypeStandardLarge)), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, "test-complete"), + resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, string(awstypes.InstanceTypeStandardLarge)), resource.TestCheckResourceAttr(resourceName, "max_concurrent_sessions", "2"), resource.TestCheckResourceAttr(resourceName, "authentication_type", string(awstypes.AuthenticationTypeStandard)), resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", kmsKeyResourceName, names.AttrARN), @@ -238,16 +238,20 @@ func testAccPortalConfig_updateAfter() string { func testAccPortalConfig_template(displayName, instanceType string, maxConcurrentSessions int, authenticationType string) string { return fmt.Sprintf(` resource "aws_workspacesweb_portal" "test" { - display_name = %q - instance_type = %q + display_name = %q + instance_type = %q max_concurrent_sessions = %d - authentication_type = %q + authentication_type = %q } `, displayName, instanceType, maxConcurrentSessions, authenticationType) } func testAccPortalConfig_complete() string { return fmt.Sprintf(` + +data "aws_caller_identity" "current" {} +data "aws_partition" "current" {} + resource "aws_kms_key" "test" { deletion_window_in_days = 7 policy = jsonencode({ @@ -257,7 +261,7 @@ resource "aws_kms_key" "test" { Sid = "Enable IAM User Permissions" Effect = "Allow" Principal = { - AWS = "*" + AWS = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root" } Action = "kms:*" Resource = "*" @@ -288,7 +292,7 @@ resource "aws_workspacesweb_portal" "test" { max_concurrent_sessions = 2 authentication_type = %q customer_managed_key = aws_kms_key.test.arn - + additional_encryption_context = { Environment = "Production" } diff --git a/website/docs/r/workspacesweb_portal.html.markdown b/website/docs/r/workspacesweb_portal.html.markdown index edce08f80a55..20162cdab8be 100644 --- a/website/docs/r/workspacesweb_portal.html.markdown +++ b/website/docs/r/workspacesweb_portal.html.markdown @@ -35,15 +35,15 @@ resource "aws_workspacesweb_portal" "example" { authentication_type = "IAM_Identity_Center" customer_managed_key = aws_kms_key.example.arn max_concurrent_sessions = 10 - + additional_encryption_context = { Environment = "Production" } - + tags = { Name = "example-portal" } - + timeouts { create = "10m" update = "10m" From b62669a0e6ea91ee47b5755541e64f1770b1f472 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 18 Jul 2025 13:34:04 +0000 Subject: [PATCH 0111/2115] Added missing tags.go file --- .../workspacesweb/testdata/Portal/tags/main_gen.tf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 internal/service/workspacesweb/testdata/Portal/tags/main_gen.tf diff --git a/internal/service/workspacesweb/testdata/Portal/tags/main_gen.tf b/internal/service/workspacesweb/testdata/Portal/tags/main_gen.tf new file mode 100644 index 000000000000..df9d9fce75b8 --- /dev/null +++ b/internal/service/workspacesweb/testdata/Portal/tags/main_gen.tf @@ -0,0 +1,14 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_workspacesweb_portal" "test" { + + tags = var.resource_tags + +} +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} From 6c3bab4bc5f068bb1b589d2b39568c7f473b23fc Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Mon, 11 Aug 2025 09:51:17 +0000 Subject: [PATCH 0112/2115] Re-ran make gen --- .../workspacesweb/portal_tags_gen_test.go | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/internal/service/workspacesweb/portal_tags_gen_test.go b/internal/service/workspacesweb/portal_tags_gen_test.go index e585d0295d60..75bd3f583e1a 100644 --- a/internal/service/workspacesweb/portal_tags_gen_test.go +++ b/internal/service/workspacesweb/portal_tags_gen_test.go @@ -18,6 +18,7 @@ import ( func TestAccWorkSpacesWebPortal_tags(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -199,6 +200,7 @@ func TestAccWorkSpacesWebPortal_tags(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_null(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -260,6 +262,7 @@ func TestAccWorkSpacesWebPortal_tags_null(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_EmptyMap(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -309,6 +312,7 @@ func TestAccWorkSpacesWebPortal_tags_EmptyMap(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_AddOnUpdate(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -387,6 +391,7 @@ func TestAccWorkSpacesWebPortal_tags_AddOnUpdate(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -476,6 +481,7 @@ func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnCreate(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -613,6 +619,7 @@ func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Add(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -701,6 +708,7 @@ func TestAccWorkSpacesWebPortal_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_DefaultTags_providerOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -881,6 +889,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_providerOnly(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_DefaultTags_nonOverlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1040,6 +1049,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_nonOverlapping(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_DefaultTags_overlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1215,6 +1225,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_overlapping(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1303,6 +1314,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToProviderOnly(t *testing func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1390,6 +1402,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_updateToResourceOnly(t *testing func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1455,6 +1468,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyResourceTag(t *testing.T) func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1512,6 +1526,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_emptyProviderOnlyTag(t *testing func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1580,6 +1595,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullOverlappingResourceTag(t *t func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1650,6 +1666,7 @@ func TestAccWorkSpacesWebPortal_tags_DefaultTags_nullNonOverlappingResourceTag(t func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1704,6 +1721,7 @@ func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnCreate(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1799,6 +1817,7 @@ func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Add(t *testing.T) { func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -1884,6 +1903,7 @@ func TestAccWorkSpacesWebPortal_tags_ComputedTag_OnUpdate_Replace(t *testing.T) func TestAccWorkSpacesWebPortal_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" @@ -2042,6 +2062,7 @@ func TestAccWorkSpacesWebPortal_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) func TestAccWorkSpacesWebPortal_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.Portal resourceName := "aws_workspacesweb_portal.test" From fe54d2975ed50c4e5538523fde69fc524d204d95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 10:08:46 -0400 Subject: [PATCH 0113/2115] r/aws_opensearchserverless_access_policy: Use 'jsontypes.Normalized'. --- .../opensearchserverless/access_policy.go | 209 ++++++++---------- .../access_policy_test.go | 36 +-- .../service/opensearchserverless/const.go | 2 +- .../opensearchserverless/lifecycle_policy.go | 4 +- .../opensearchserverless/security_config.go | 2 +- .../opensearchserverless/security_policy.go | 4 +- 6 files changed, 113 insertions(+), 144 deletions(-) diff --git a/internal/service/opensearchserverless/access_policy.go b/internal/service/opensearchserverless/access_policy.go index 8a6d1b7c6ca5..2e59b69e9c7d 100644 --- a/internal/service/opensearchserverless/access_policy.go +++ b/internal/service/opensearchserverless/access_policy.go @@ -10,21 +10,21 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" - "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/document" awstypes "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types" + "github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "github.com/hashicorp/terraform-provider-aws/internal/create" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,26 +35,12 @@ func newAccessPolicyResource(_ context.Context) (resource.ResourceWithConfigure, return &accessPolicyResource{}, nil } -type accessPolicyResourceModel struct { - framework.WithRegionModel - Description types.String `tfsdk:"description"` - ID types.String `tfsdk:"id"` - Name types.String `tfsdk:"name"` - Policy fwtypes.SmithyJSON[document.Interface] `tfsdk:"policy"` - PolicyVersion types.String `tfsdk:"policy_version"` - Type fwtypes.StringEnum[awstypes.AccessPolicyType] `tfsdk:"type"` -} - -const ( - ResNameAccessPolicy = "Access Policy" -) - type accessPolicyResource struct { framework.ResourceWithModel[accessPolicyResourceModel] } -func (r *accessPolicyResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *accessPolicyResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrDescription: schema.StringAttribute{ Description: "Description of the policy. Typically used to store information about the permissions defined in the policy.", @@ -76,7 +62,7 @@ func (r *accessPolicyResource) Schema(ctx context.Context, req resource.SchemaRe }, names.AttrPolicy: schema.StringAttribute{ Description: "JSON policy document to use as the content for the new policy.", - CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), + CustomType: jsontypes.NormalizedType{}, Required: true, Validators: []validator.String{ stringvalidator.LengthBetween(1, 20480), @@ -98,162 +84,161 @@ func (r *accessPolicyResource) Schema(ctx context.Context, req resource.SchemaRe } } -func (r *accessPolicyResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - var plan accessPolicyResourceModel - - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - - if resp.Diagnostics.HasError() { +func (r *accessPolicyResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data accessPolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } conn := r.Meta().OpenSearchServerlessClient(ctx) - in := &opensearchserverless.CreateAccessPolicyInput{} - - resp.Diagnostics.Append(flex.Expand(ctx, plan, in)...) - - if resp.Diagnostics.HasError() { + name := fwflex.StringValueFromFramework(ctx, data.Name) + var input opensearchserverless.CreateAccessPolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } - in.ClientToken = aws.String(id.UniqueId()) + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) - out, err := conn.CreateAccessPolicy(ctx, in) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionCreating, ResNameAccessPolicy, plan.Name.String(), nil), - err.Error(), - ) - return - } + output, err := conn.CreateAccessPolicy(ctx, &input) - state := plan - resp.Diagnostics.Append(flex.Flatten(ctx, out.AccessPolicyDetail, &state)...) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating OpenSearch Serverless Access Policy (%s)", name), err.Error()) - if resp.Diagnostics.HasError() { return } - state.ID = flex.StringToFramework(ctx, out.AccessPolicyDetail.Name) + // Set values for unknowns. + data.ID = fwflex.StringValueToFramework(ctx, name) + data.PolicyVersion = fwflex.StringToFramework(ctx, output.AccessPolicyDetail.PolicyVersion) - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *accessPolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var state accessPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *accessPolicyResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data accessPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findAccessPolicyByNameAndType(ctx, conn, state.ID.ValueString(), state.Type.ValueString()) + conn := r.Meta().OpenSearchServerlessClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.ID) + output, err := findAccessPolicyByNameAndType(ctx, conn, name, data.Type.ValueString()) + if tfresource.NotFound(err) { - resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionReading, ResNameAccessPolicy, state.ID.ValueString(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading OpenSearch Serverless Access Policy (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + // Set attributes for import. + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *accessPolicyResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var plan, state accessPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *accessPolicyResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old accessPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } - if !plan.Description.Equal(state.Description) || - !plan.Policy.Equal(state.Policy) { - input := &opensearchserverless.UpdateAccessPolicyInput{} + conn := r.Meta().OpenSearchServerlessClient(ctx) - resp.Diagnostics.Append(flex.Expand(ctx, plan, input)...) - if resp.Diagnostics.HasError() { + if !new.Description.Equal(old.Description) || !new.Policy.Equal(old.Policy) { + name := fwflex.StringValueFromFramework(ctx, new.ID) + var input opensearchserverless.UpdateAccessPolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } - input.ClientToken = aws.String(id.UniqueId()) - input.PolicyVersion = state.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.PolicyVersion = old.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update + + output, err := conn.UpdateAccessPolicy(ctx, &input) - out, err := conn.UpdateAccessPolicy(ctx, input) if err != nil { - resp.Diagnostics.AddError(fmt.Sprintf("updating Security Policy (%s)", plan.Name.ValueString()), err.Error()) - return - } + response.Diagnostics.AddError(fmt.Sprintf("updating OpenSearch Serverless Access Policy (%s)", name), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out.AccessPolicyDetail, &plan)...) - if resp.Diagnostics.HasError() { return } + + // Set values for unknowns. + new.PolicyVersion = fwflex.StringToFramework(ctx, output.AccessPolicyDetail.PolicyVersion) } - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } -func (r *accessPolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var state accessPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *accessPolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data accessPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - _, err := conn.DeleteAccessPolicy(ctx, &opensearchserverless.DeleteAccessPolicyInput{ - ClientToken: aws.String(id.UniqueId()), - Name: state.Name.ValueStringPointer(), - Type: awstypes.AccessPolicyType(state.Type.ValueString()), - }) + conn := r.Meta().OpenSearchServerlessClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.ID) + input := opensearchserverless.DeleteAccessPolicyInput{ + ClientToken: aws.String(sdkid.UniqueId()), + Name: aws.String(name), + Type: data.Type.ValueEnum(), + } + _, err := conn.DeleteAccessPolicy(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return } if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionDeleting, ResNameAccessPolicy, state.Name.String(), nil), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("deleting OpenSearch Serverless Access Policy (%s)", name), err.Error()) + return } } -func (r *accessPolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, idSeparator) +func (r *accessPolicyResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + parts := strings.Split(request.ID, resourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", req.ID, idSeparator) - resp.Diagnostics.AddError(fmt.Sprintf("importing Security Policy (%s)", req.ID), err.Error()) + err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", request.ID, resourceIDSeparator) + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(err)) + return } - state := accessPolicyResourceModel{ - ID: types.StringValue(parts[0]), - Name: types.StringValue(parts[0]), - Type: fwtypes.StringEnumValue(awstypes.AccessPolicyType(parts[1])), - } + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrID), parts[0])...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrType), parts[1])...) +} - diags := resp.State.Set(ctx, &state) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } +type accessPolicyResourceModel struct { + framework.WithRegionModel + Description types.String `tfsdk:"description"` + ID types.String `tfsdk:"id"` + Name types.String `tfsdk:"name"` + Policy jsontypes.Normalized `tfsdk:"policy"` + PolicyVersion types.String `tfsdk:"policy_version"` + Type fwtypes.StringEnum[awstypes.AccessPolicyType] `tfsdk:"type"` } diff --git a/internal/service/opensearchserverless/access_policy_test.go b/internal/service/opensearchserverless/access_policy_test.go index bc3cdb550f07..d2172a006083 100644 --- a/internal/service/opensearchserverless/access_policy_test.go +++ b/internal/service/opensearchserverless/access_policy_test.go @@ -5,7 +5,6 @@ package opensearchserverless_test import ( "context" - "errors" "fmt" "testing" @@ -16,7 +15,6 @@ import ( "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/create" tfopensearchserverless "github.com/hashicorp/terraform-provider-aws/internal/service/opensearchserverless" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,7 +45,7 @@ func TestAccOpenSearchServerlessAccessPolicy_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAccessPolicyImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), ImportState: true, ImportStateVerify: true, }, @@ -98,7 +96,7 @@ func TestAccOpenSearchServerlessAccessPolicy_update(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccAccessPolicyImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), ImportState: true, ImportStateVerify: true, }, @@ -154,48 +152,34 @@ func testAccCheckAccessPolicyDestroy(ctx context.Context) resource.TestCheckFunc return err } - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingDestroyed, tfopensearchserverless.ResNameAccessPolicy, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("OpenSearch Serverless Access Policy %s still exists", rs.Primary.ID) } return nil } } -func testAccCheckAccessPolicyExists(ctx context.Context, name string, accesspolicy *types.AccessPolicyDetail) resource.TestCheckFunc { +func testAccCheckAccessPolicyExists(ctx context.Context, n string, v *types.AccessPolicyDetail) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameAccessPolicy, name, errors.New("not found")) - } - - if rs.Primary.ID == "" { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameAccessPolicy, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) - resp, err := tfopensearchserverless.FindAccessPolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) + + output, err := tfopensearchserverless.FindAccessPolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) if err != nil { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameAccessPolicy, rs.Primary.ID, err) + return err } - *accesspolicy = *resp + *v = *output return nil } } -func testAccAccessPolicyImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { - return func(s *terraform.State) (string, error) { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return "", fmt.Errorf("not found: %s", resourceName) - } - - return fmt.Sprintf("%s/%s", rs.Primary.Attributes[names.AttrName], rs.Primary.Attributes[names.AttrType]), nil - } -} - func testAccPreCheckAccessPolicy(ctx context.Context, t *testing.T) { conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) diff --git a/internal/service/opensearchserverless/const.go b/internal/service/opensearchserverless/const.go index 37e4c45a83b8..47416c4e98b5 100644 --- a/internal/service/opensearchserverless/const.go +++ b/internal/service/opensearchserverless/const.go @@ -3,4 +3,4 @@ package opensearchserverless -const idSeparator = "/" +const resourceIDSeparator = "/" diff --git a/internal/service/opensearchserverless/lifecycle_policy.go b/internal/service/opensearchserverless/lifecycle_policy.go index e12ce7b62dfa..46243d5fd048 100644 --- a/internal/service/opensearchserverless/lifecycle_policy.go +++ b/internal/service/opensearchserverless/lifecycle_policy.go @@ -243,9 +243,9 @@ func (r *lifecyclePolicyResource) Delete(ctx context.Context, req resource.Delet } func (r *lifecyclePolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, idSeparator) + parts := strings.Split(req.ID, resourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - err := fmt.Errorf("unexpected format for ID (%[1]s), expected lifecycle-policy-name%[2]slifecycle-policy-type", req.ID, idSeparator) + err := fmt.Errorf("unexpected format for ID (%[1]s), expected lifecycle-policy-name%[2]slifecycle-policy-type", req.ID, resourceIDSeparator) resp.Diagnostics.AddError(fmt.Sprintf("importing %s (%s)", ResNameLifecyclePolicy, req.ID), err.Error()) return } diff --git a/internal/service/opensearchserverless/security_config.go b/internal/service/opensearchserverless/security_config.go index d0a976a6f815..71bf6b37d09c 100644 --- a/internal/service/opensearchserverless/security_config.go +++ b/internal/service/opensearchserverless/security_config.go @@ -274,7 +274,7 @@ func (r *securityConfigResource) Delete(ctx context.Context, req resource.Delete } func (r *securityConfigResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, idSeparator) + parts := strings.Split(req.ID, resourceIDSeparator) if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" { err := fmt.Errorf("unexpected format for ID (%[1]s), expected saml/account-id/name", req.ID) resp.Diagnostics.AddError(fmt.Sprintf("importing Security Policy (%s)", req.ID), err.Error()) diff --git a/internal/service/opensearchserverless/security_policy.go b/internal/service/opensearchserverless/security_policy.go index a10c5dcab0b4..2ddc58325d00 100644 --- a/internal/service/opensearchserverless/security_policy.go +++ b/internal/service/opensearchserverless/security_policy.go @@ -238,9 +238,9 @@ func (r *securityPolicyResource) Delete(ctx context.Context, req resource.Delete } func (r *securityPolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, idSeparator) + parts := strings.Split(req.ID, resourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", req.ID, idSeparator) + err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", req.ID, resourceIDSeparator) resp.Diagnostics.AddError(fmt.Sprintf("importing Security Policy (%s)", req.ID), err.Error()) return } From 6feb03138ef6874b17639c221c5382a166d7605b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 10:27:06 -0400 Subject: [PATCH 0114/2115] r/aws_opensearchserverless_lifecycle_policy: Use 'jsontypes.Normalized'. --- .../opensearchserverless/lifecycle_policy.go | 210 ++++++++---------- .../lifecycle_policy_test.go | 37 +-- 2 files changed, 101 insertions(+), 146 deletions(-) diff --git a/internal/service/opensearchserverless/lifecycle_policy.go b/internal/service/opensearchserverless/lifecycle_policy.go index 46243d5fd048..cf07ff87464a 100644 --- a/internal/service/opensearchserverless/lifecycle_policy.go +++ b/internal/service/opensearchserverless/lifecycle_policy.go @@ -5,27 +5,26 @@ package opensearchserverless import ( "context" - "errors" "fmt" "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" - "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/document" awstypes "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types" + "github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "github.com/hashicorp/terraform-provider-aws/internal/create" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -36,16 +35,12 @@ func newLifecyclePolicyResource(_ context.Context) (resource.ResourceWithConfigu return &lifecyclePolicyResource{}, nil } -const ( - ResNameLifecyclePolicy = "Lifecycle Policy" -) - type lifecyclePolicyResource struct { framework.ResourceWithModel[lifecyclePolicyResourceModel] } -func (r *lifecyclePolicyResource) Schema(ctx context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *lifecyclePolicyResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrDescription: schema.StringAttribute{ Description: "Description of the policy.", @@ -67,7 +62,7 @@ func (r *lifecyclePolicyResource) Schema(ctx context.Context, _ resource.SchemaR }, names.AttrPolicy: schema.StringAttribute{ Description: "JSON policy document to use as the content for the new policy.", - CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), + CustomType: jsontypes.NormalizedType{}, Required: true, Validators: []validator.String{ stringvalidator.LengthBetween(1, 20480), @@ -89,178 +84,153 @@ func (r *lifecyclePolicyResource) Schema(ctx context.Context, _ resource.SchemaR } } -func (r *lifecyclePolicyResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var plan lifecyclePolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *lifecyclePolicyResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data lifecyclePolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - in := &opensearchserverless.CreateLifecyclePolicyInput{} - - resp.Diagnostics.Append(flex.Expand(ctx, plan, in)...) + conn := r.Meta().OpenSearchServerlessClient(ctx) - if resp.Diagnostics.HasError() { + name := fwflex.StringValueFromFramework(ctx, data.Name) + var input opensearchserverless.CreateLifecyclePolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } - in.ClientToken = aws.String(id.UniqueId()) + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + + output, err := conn.CreateLifecyclePolicy(ctx, &input) - out, err := conn.CreateLifecyclePolicy(ctx, in) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionCreating, ResNameLifecyclePolicy, plan.Name.ValueString(), err), - err.Error(), - ) - return - } - if out == nil || out.LifecyclePolicyDetail == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionCreating, ResNameLifecyclePolicy, plan.Name.ValueString(), nil), - errors.New("empty output").Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("creating OpenSearch Serverless Lifecycle Policy (%s)", name), err.Error()) + return } - state := plan - - resp.Diagnostics.Append(flex.Flatten(ctx, out.LifecyclePolicyDetail, &state)...) + // Set values for unknowns. + data.ID = fwflex.StringValueToFramework(ctx, name) + data.PolicyVersion = fwflex.StringToFramework(ctx, output.LifecyclePolicyDetail.PolicyVersion) - state.ID = flex.StringToFramework(ctx, out.LifecyclePolicyDetail.Name) - - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *lifecyclePolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var state lifecyclePolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *lifecyclePolicyResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data lifecyclePolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findLifecyclePolicyByNameAndType(ctx, conn, state.ID.ValueString(), state.Type.ValueString()) + conn := r.Meta().OpenSearchServerlessClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.ID) + output, err := findLifecyclePolicyByNameAndType(ctx, conn, name, data.Type.ValueString()) if tfresource.NotFound(err) { - resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionReading, ResNameLifecyclePolicy, state.ID.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading OpenSearch Serverless Lifecycle Policy (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + // Set attributes for import. + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *lifecyclePolicyResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var plan, state lifecyclePolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *lifecyclePolicyResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old lifecyclePolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { return } - if !plan.Description.Equal(state.Description) || !plan.Policy.Equal(state.Policy) { - in := &opensearchserverless.UpdateLifecyclePolicyInput{} - - resp.Diagnostics.Append(flex.Expand(ctx, plan, in)...) + conn := r.Meta().OpenSearchServerlessClient(ctx) - if resp.Diagnostics.HasError() { + if !new.Description.Equal(old.Description) || !new.Policy.Equal(old.Policy) { + name := fwflex.StringValueFromFramework(ctx, new.ID) + var input opensearchserverless.UpdateLifecyclePolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } - in.ClientToken = aws.String(id.UniqueId()) - in.PolicyVersion = state.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.PolicyVersion = old.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update + + output, err := conn.UpdateLifecyclePolicy(ctx, &input) - out, err := conn.UpdateLifecyclePolicy(ctx, in) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionUpdating, ResNameLifecyclePolicy, plan.ID.ValueString(), err), - err.Error(), - ) - return - } - if out == nil || out.LifecyclePolicyDetail == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionUpdating, ResNameLifecyclePolicy, plan.ID.ValueString(), nil), - errors.New("empty output").Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("updating OpenSearch Serverless Lifecycle Policy (%s)", name), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out.LifecyclePolicyDetail, &state)...) - if resp.Diagnostics.HasError() { return } + + // Set values for unknowns. + new.PolicyVersion = fwflex.StringToFramework(ctx, output.LifecyclePolicyDetail.PolicyVersion) } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &old)...) } -func (r *lifecyclePolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var state lifecyclePolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *lifecyclePolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data lifecyclePolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - in := &opensearchserverless.DeleteLifecyclePolicyInput{ - ClientToken: aws.String(id.UniqueId()), - Name: flex.StringFromFramework(ctx, state.Name), - Type: awstypes.LifecyclePolicyType(state.Type.ValueString()), - } + conn := r.Meta().OpenSearchServerlessClient(ctx) - _, err := conn.DeleteLifecyclePolicy(ctx, in) + name := fwflex.StringValueFromFramework(ctx, data.ID) + input := opensearchserverless.DeleteLifecyclePolicyInput{ + ClientToken: aws.String(sdkid.UniqueId()), + Name: aws.String(name), + Type: data.Type.ValueEnum(), + } + _, err := conn.DeleteLifecyclePolicy(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return } if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionDeleting, ResNameLifecyclePolicy, state.ID.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("deleting OpenSearch Serverless Lifecycle Policy (%s)", name), err.Error()) + return } } -func (r *lifecyclePolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, resourceIDSeparator) +func (r *lifecyclePolicyResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + parts := strings.Split(request.ID, resourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - err := fmt.Errorf("unexpected format for ID (%[1]s), expected lifecycle-policy-name%[2]slifecycle-policy-type", req.ID, resourceIDSeparator) - resp.Diagnostics.AddError(fmt.Sprintf("importing %s (%s)", ResNameLifecyclePolicy, req.ID), err.Error()) - return - } + err := fmt.Errorf("unexpected format for ID (%[1]s), expected lifecycle-policy-name%[2]slifecycle-policy-type", request.ID, resourceIDSeparator) + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(err)) - state := lifecyclePolicyResourceModel{ - ID: types.StringValue(parts[0]), - Name: types.StringValue(parts[0]), - Type: fwtypes.StringEnumValue(awstypes.LifecyclePolicyType(parts[1])), - } - - diags := resp.State.Set(ctx, &state) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { return } + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrID), parts[0])...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrType), parts[1])...) } type lifecyclePolicyResourceModel struct { @@ -268,7 +238,7 @@ type lifecyclePolicyResourceModel struct { Description types.String `tfsdk:"description"` ID types.String `tfsdk:"id"` Name types.String `tfsdk:"name"` - Policy fwtypes.SmithyJSON[document.Interface] `tfsdk:"policy"` + Policy jsontypes.Normalized `tfsdk:"policy"` PolicyVersion types.String `tfsdk:"policy_version"` Type fwtypes.StringEnum[awstypes.LifecyclePolicyType] `tfsdk:"type"` } diff --git a/internal/service/opensearchserverless/lifecycle_policy_test.go b/internal/service/opensearchserverless/lifecycle_policy_test.go index 3654dee55297..8d707eb67cb2 100644 --- a/internal/service/opensearchserverless/lifecycle_policy_test.go +++ b/internal/service/opensearchserverless/lifecycle_policy_test.go @@ -5,7 +5,6 @@ package opensearchserverless_test import ( "context" - "errors" "fmt" "testing" @@ -16,7 +15,6 @@ import ( "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/create" tfopensearchserverless "github.com/hashicorp/terraform-provider-aws/internal/service/opensearchserverless" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -50,7 +48,7 @@ func TestAccOpenSearchServerlessLifecyclePolicy_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccLifecyclePolicyImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), ImportState: true, ImportStateVerify: true, }, @@ -137,52 +135,39 @@ func testAccCheckLifecyclePolicyDestroy(ctx context.Context) resource.TestCheckF if tfresource.NotFound(err) { continue } + if err != nil { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingDestroyed, tfopensearchserverless.ResNameLifecyclePolicy, rs.Primary.ID, err) + return err } - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingDestroyed, tfopensearchserverless.ResNameLifecyclePolicy, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("OpenSearch Serverless Lifecycle Policy %s still exists", rs.Primary.ID) } return nil } } -func testAccCheckLifecyclePolicyExists(ctx context.Context, name string, lifecyclepolicy *types.LifecyclePolicyDetail) resource.TestCheckFunc { +func testAccCheckLifecyclePolicyExists(ctx context.Context, n string, v *types.LifecyclePolicyDetail) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameLifecyclePolicy, name, errors.New("not found")) - } - - if rs.Primary.ID == "" { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameLifecyclePolicy, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) - resp, err := tfopensearchserverless.FindLifecyclePolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) + + output, err := tfopensearchserverless.FindLifecyclePolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) if err != nil { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameLifecyclePolicy, rs.Primary.ID, err) + return err } - *lifecyclepolicy = *resp + *v = *output return nil } } -func testAccLifecyclePolicyImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { - return func(s *terraform.State) (string, error) { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return "", fmt.Errorf("not found: %s", resourceName) - } - - return fmt.Sprintf("%s/%s", rs.Primary.Attributes[names.AttrName], rs.Primary.Attributes[names.AttrType]), nil - } -} - func testAccPreCheckLifecyclePolicy(ctx context.Context, t *testing.T) { conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) From f54be1e6a751694f0a40f527bf686ecfdd9159a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 10:43:20 -0400 Subject: [PATCH 0115/2115] r/aws_opensearchserverless_security_policy: Use 'jsontypes.Normalized'. --- .../opensearchserverless/security_policy.go | 217 ++++++++---------- .../security_policy_test.go | 43 ++-- 2 files changed, 114 insertions(+), 146 deletions(-) diff --git a/internal/service/opensearchserverless/security_policy.go b/internal/service/opensearchserverless/security_policy.go index 2ddc58325d00..22f009c37bfe 100644 --- a/internal/service/opensearchserverless/security_policy.go +++ b/internal/service/opensearchserverless/security_policy.go @@ -5,26 +5,26 @@ package opensearchserverless import ( "context" - "errors" "fmt" "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" - "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/document" awstypes "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types" + "github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" + "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "github.com/hashicorp/terraform-provider-aws/internal/create" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -35,26 +35,12 @@ func newSecurityPolicyResource(_ context.Context) (resource.ResourceWithConfigur return &securityPolicyResource{}, nil } -type securityPolicyResourceModel struct { - framework.WithRegionModel - Description types.String `tfsdk:"description"` - ID types.String `tfsdk:"id"` - Name types.String `tfsdk:"name"` - Policy fwtypes.SmithyJSON[document.Interface] `tfsdk:"policy"` - PolicyVersion types.String `tfsdk:"policy_version"` - Type fwtypes.StringEnum[awstypes.SecurityPolicyType] `tfsdk:"type"` -} - -const ( - ResNameSecurityPolicy = "Security Policy" -) - type securityPolicyResource struct { framework.ResourceWithModel[securityPolicyResourceModel] } -func (r *securityPolicyResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *securityPolicyResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrDescription: schema.StringAttribute{ Description: "Description of the policy. Typically used to store information about the permissions defined in the policy.", @@ -76,7 +62,7 @@ func (r *securityPolicyResource) Schema(ctx context.Context, req resource.Schema }, names.AttrPolicy: schema.StringAttribute{ Description: "JSON policy document to use as the content for the new policy.", - CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), + CustomType: jsontypes.NormalizedType{}, Required: true, Validators: []validator.String{ stringvalidator.LengthBetween(1, 20480), @@ -98,162 +84,161 @@ func (r *securityPolicyResource) Schema(ctx context.Context, req resource.Schema } } -func (r *securityPolicyResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - var plan securityPolicyResourceModel - - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - - if resp.Diagnostics.HasError() { +func (r *securityPolicyResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data securityPolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } conn := r.Meta().OpenSearchServerlessClient(ctx) - in := &opensearchserverless.CreateSecurityPolicyInput{} - - resp.Diagnostics.Append(flex.Expand(ctx, plan, in)...) - if resp.Diagnostics.HasError() { + name := fwflex.StringValueFromFramework(ctx, data.Name) + var input opensearchserverless.CreateSecurityPolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } - in.ClientToken = aws.String(id.UniqueId()) + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + + output, err := conn.CreateSecurityPolicy(ctx, &input) - out, err := conn.CreateSecurityPolicy(ctx, in) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionCreating, ResNameSecurityPolicy, plan.Name.String(), nil), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("creating OpenSearch Serverless Security Policy (%s)", name), err.Error()) - state := plan - resp.Diagnostics.Append(flex.Flatten(ctx, out.SecurityPolicyDetail, &state)...) - if resp.Diagnostics.HasError() { return } - state.ID = flex.StringToFramework(ctx, out.SecurityPolicyDetail.Name) - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) -} + // Set values for unknowns. + data.ID = fwflex.StringValueToFramework(ctx, name) + data.PolicyVersion = fwflex.StringToFramework(ctx, output.SecurityPolicyDetail.PolicyVersion) -func (r *securityPolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} - var state securityPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *securityPolicyResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data securityPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findSecurityPolicyByNameAndType(ctx, conn, state.ID.ValueString(), state.Type.ValueString()) + conn := r.Meta().OpenSearchServerlessClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.ID) + output, err := findSecurityPolicyByNameAndType(ctx, conn, name, data.Type.ValueString()) + if tfresource.NotFound(err) { - resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionReading, ResNameSecurityPolicy, state.ID.ValueString(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading OpenSearch Serverless Security Policy (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + // Set attributes for import. + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *securityPolicyResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - conn := r.Meta().OpenSearchServerlessClient(ctx) - - var plan, state securityPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *securityPolicyResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old securityPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { return } - - diff, diags := flex.Diff(ctx, plan, state) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } - if diff.HasChanges() { - input := &opensearchserverless.UpdateSecurityPolicyInput{} + conn := r.Meta().OpenSearchServerlessClient(ctx) - resp.Diagnostics.Append(flex.Expand(ctx, plan, input)...) - if resp.Diagnostics.HasError() { + if !new.Description.Equal(old.Description) || !new.Policy.Equal(old.Policy) { + name := fwflex.StringValueFromFramework(ctx, new.ID) + var input opensearchserverless.UpdateSecurityPolicyInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } - input.ClientToken = aws.String(id.UniqueId()) - input.PolicyVersion = state.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.PolicyVersion = old.PolicyVersion.ValueStringPointer() // use policy version from state since it can be recalculated on update - out, err := conn.UpdateSecurityPolicy(ctx, input) + output, err := conn.UpdateSecurityPolicy(ctx, &input) if err != nil { - resp.Diagnostics.AddError(fmt.Sprintf("updating Security Policy (%s)", plan.Name.ValueString()), err.Error()) - return - } - resp.Diagnostics.Append(flex.Flatten(ctx, out.SecurityPolicyDetail, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.AddError(fmt.Sprintf("updating OpenSearch Serverless Security Policy (%s)", name), err.Error()) + return } + + // Set values for unknowns. + new.PolicyVersion = fwflex.StringToFramework(ctx, output.SecurityPolicyDetail.PolicyVersion) } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &old)...) } -func (r *securityPolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { +func (r *securityPolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data securityPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + conn := r.Meta().OpenSearchServerlessClient(ctx) - var state securityPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { + name := fwflex.StringValueFromFramework(ctx, data.ID) + input := opensearchserverless.DeleteSecurityPolicyInput{ + ClientToken: aws.String(sdkid.UniqueId()), + Name: aws.String(name), + Type: data.Type.ValueEnum(), + } + _, err := conn.DeleteSecurityPolicy(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { return } - _, err := conn.DeleteSecurityPolicy(ctx, &opensearchserverless.DeleteSecurityPolicyInput{ - ClientToken: aws.String(id.UniqueId()), - Name: state.Name.ValueStringPointer(), - Type: state.Type.ValueEnum(), - }) if err != nil { - var nfe *awstypes.ResourceNotFoundException - if errors.As(err, &nfe) { - return - } - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.OpenSearchServerless, create.ErrActionDeleting, ResNameSecurityPolicy, state.Name.String(), nil), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("deleting OpenSearch Serverless Security Policy (%s)", name), err.Error()) + + return } } -func (r *securityPolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - parts := strings.Split(req.ID, resourceIDSeparator) +func (r *securityPolicyResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + parts := strings.Split(request.ID, resourceIDSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", req.ID, resourceIDSeparator) - resp.Diagnostics.AddError(fmt.Sprintf("importing Security Policy (%s)", req.ID), err.Error()) + err := fmt.Errorf("unexpected format for ID (%[1]s), expected security-policy-name%[2]ssecurity-policy-type", request.ID, resourceIDSeparator) + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(err)) + return } - state := securityPolicyResourceModel{ - ID: types.StringValue(parts[0]), - Name: types.StringValue(parts[0]), - Type: fwtypes.StringEnumValue(awstypes.SecurityPolicyType(parts[1])), - } + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrID), parts[0])...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrType), parts[1])...) +} - diags := resp.State.Set(ctx, &state) - resp.Diagnostics.Append(diags...) - if resp.Diagnostics.HasError() { - return - } +type securityPolicyResourceModel struct { + framework.WithRegionModel + Description types.String `tfsdk:"description"` + ID types.String `tfsdk:"id"` + Name types.String `tfsdk:"name"` + Policy jsontypes.Normalized `tfsdk:"policy"` + PolicyVersion types.String `tfsdk:"policy_version"` + Type fwtypes.StringEnum[awstypes.SecurityPolicyType] `tfsdk:"type"` } diff --git a/internal/service/opensearchserverless/security_policy_test.go b/internal/service/opensearchserverless/security_policy_test.go index 130aed3b2b0f..46757f3601b7 100644 --- a/internal/service/opensearchserverless/security_policy_test.go +++ b/internal/service/opensearchserverless/security_policy_test.go @@ -5,7 +5,6 @@ package opensearchserverless_test import ( "context" - "errors" "fmt" "testing" @@ -17,7 +16,6 @@ import ( "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/create" tfopensearchserverless "github.com/hashicorp/terraform-provider-aws/internal/service/opensearchserverless" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -49,7 +47,7 @@ func TestAccOpenSearchServerlessSecurityPolicy_basic(t *testing.T) { }, { ResourceName: resourceName, - ImportStateIdFunc: testAccSecurityPolicyImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), ImportState: true, ImportStateVerify: true, }, @@ -163,11 +161,10 @@ func TestAccOpenSearchServerlessSecurityPolicy_string(t *testing.T) { }, }, { - ResourceName: resourceName, - ImportStateIdFunc: testAccSecurityPolicyImportStateIdFunc(resourceName), - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrPolicy}, // JSON is semantically correct but can be set in state in a different order + ResourceName: resourceName, + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -226,48 +223,34 @@ func testAccCheckSecurityPolicyDestroy(ctx context.Context) resource.TestCheckFu return err } - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingDestroyed, tfopensearchserverless.ResNameSecurityPolicy, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("OpenSearch Serverless Security Policy %s still exists", rs.Primary.ID) } return nil } } -func testAccCheckSecurityPolicyExists(ctx context.Context, name string, securitypolicy *types.SecurityPolicyDetail) resource.TestCheckFunc { +func testAccCheckSecurityPolicyExists(ctx context.Context, n string, v *types.SecurityPolicyDetail) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameSecurityPolicy, name, errors.New("not found")) - } - - if rs.Primary.ID == "" { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameSecurityPolicy, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) - resp, err := tfopensearchserverless.FindSecurityPolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) + + output, err := tfopensearchserverless.FindSecurityPolicyByNameAndType(ctx, conn, rs.Primary.ID, rs.Primary.Attributes[names.AttrType]) if err != nil { - return create.Error(names.OpenSearchServerless, create.ErrActionCheckingExistence, tfopensearchserverless.ResNameSecurityPolicy, rs.Primary.ID, err) + return err } - *securitypolicy = *resp + *v = *output return nil } } -func testAccSecurityPolicyImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { - return func(s *terraform.State) (string, error) { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return "", fmt.Errorf("not found: %s", resourceName) - } - - return fmt.Sprintf("%s/%s", rs.Primary.Attributes[names.AttrName], rs.Primary.Attributes[names.AttrType]), nil - } -} - func testAccPreCheck(ctx context.Context, t *testing.T) { conn := acctest.Provider.Meta().(*conns.AWSClient).OpenSearchServerlessClient(ctx) From a6aa6b7e9a4e9c539d1a9588f98ccf132ef2870c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 11:06:09 -0400 Subject: [PATCH 0116/2115] Corrections. --- .../service/opensearchserverless/lifecycle_policy.go | 2 +- internal/service/opensearchserverless/security_policy.go | 2 +- .../service/opensearchserverless/security_policy_test.go | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/service/opensearchserverless/lifecycle_policy.go b/internal/service/opensearchserverless/lifecycle_policy.go index cf07ff87464a..c445fb6bf85d 100644 --- a/internal/service/opensearchserverless/lifecycle_policy.go +++ b/internal/service/opensearchserverless/lifecycle_policy.go @@ -189,7 +189,7 @@ func (r *lifecyclePolicyResource) Update(ctx context.Context, request resource.U new.PolicyVersion = fwflex.StringToFramework(ctx, output.LifecyclePolicyDetail.PolicyVersion) } - response.Diagnostics.Append(response.State.Set(ctx, &old)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } func (r *lifecyclePolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { diff --git a/internal/service/opensearchserverless/security_policy.go b/internal/service/opensearchserverless/security_policy.go index 22f009c37bfe..9ca2bb13c6e5 100644 --- a/internal/service/opensearchserverless/security_policy.go +++ b/internal/service/opensearchserverless/security_policy.go @@ -189,7 +189,7 @@ func (r *securityPolicyResource) Update(ctx context.Context, request resource.Up new.PolicyVersion = fwflex.StringToFramework(ctx, output.SecurityPolicyDetail.PolicyVersion) } - response.Diagnostics.Append(response.State.Set(ctx, &old)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } func (r *securityPolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { diff --git a/internal/service/opensearchserverless/security_policy_test.go b/internal/service/opensearchserverless/security_policy_test.go index 46757f3601b7..a6ce5173ca52 100644 --- a/internal/service/opensearchserverless/security_policy_test.go +++ b/internal/service/opensearchserverless/security_policy_test.go @@ -161,10 +161,11 @@ func TestAccOpenSearchServerlessSecurityPolicy_string(t *testing.T) { }, }, { - ResourceName: resourceName, - ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, "/", names.AttrName, names.AttrType), + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrPolicy}, // JSON is semantically correct but can be set in state in a different order }, }, }) From f3cf1f8cd1f4d8fbd831312369ce11cc75c3d5dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 11:58:59 -0400 Subject: [PATCH 0117/2115] Correct file extension. --- ...markdown.html => cognito_managed_login_branding.html.markdown} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename website/docs/r/{cognito_managed_login_branding.markdown.html => cognito_managed_login_branding.html.markdown} (100%) diff --git a/website/docs/r/cognito_managed_login_branding.markdown.html b/website/docs/r/cognito_managed_login_branding.html.markdown similarity index 100% rename from website/docs/r/cognito_managed_login_branding.markdown.html rename to website/docs/r/cognito_managed_login_branding.html.markdown From 60cd18061629edc7f2af203ac9bdfdc4612bb759 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 14:15:30 -0400 Subject: [PATCH 0118/2115] Run 'make gen'. --- .teamcity/scripts/provider_tests/acceptance_tests.sh | 1 + .teamcity/scripts/provider_tests/unit_tests.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.teamcity/scripts/provider_tests/acceptance_tests.sh b/.teamcity/scripts/provider_tests/acceptance_tests.sh index ef7cfbdc05ec..b3d31b0029d6 100644 --- a/.teamcity/scripts/provider_tests/acceptance_tests.sh +++ b/.teamcity/scripts/provider_tests/acceptance_tests.sh @@ -60,6 +60,7 @@ TF_ACC=1 go test \ ./internal/semver/... \ ./internal/slices/... \ ./internal/smerr/... \ + ./internal/smithy/... \ ./internal/sweep/... \ ./internal/tags/... \ ./internal/tfresource/... \ diff --git a/.teamcity/scripts/provider_tests/unit_tests.sh b/.teamcity/scripts/provider_tests/unit_tests.sh index b023b2790400..a9b0a441f6f2 100644 --- a/.teamcity/scripts/provider_tests/unit_tests.sh +++ b/.teamcity/scripts/provider_tests/unit_tests.sh @@ -32,6 +32,7 @@ go test \ ./internal/semver/... \ ./internal/slices/... \ ./internal/smerr/... \ + ./internal/smithy/... \ ./internal/sweep/... \ ./internal/tags/... \ ./internal/tfresource/... \ From 2af1b9c385862ae09922daff36d63049bb297858 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 11 Aug 2025 14:18:11 -0400 Subject: [PATCH 0119/2115] Run 'make fix-constants PKG=cognitoidp'. --- internal/service/cognitoidp/managed_login_branding.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index b4fb4c33509a..c905622e2bfb 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -109,7 +109,7 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou CustomType: fwtypes.StringEnumType[awstypes.AssetExtensionType](), Required: true, }, - "resource_id": schema.StringAttribute{ + names.AttrResourceID: schema.StringAttribute{ Optional: true, }, }, From 97eba8957a306ad7cfe284f01de3284734ceab68 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Wed, 13 Aug 2025 08:01:26 -0400 Subject: [PATCH 0120/2115] Initial pass for adding witness support --- internal/service/dynamodb/table.go | 74 +++++++++---- internal/service/dynamodb/table_test.go | 137 +++++++++++++++++++++++- 2 files changed, 192 insertions(+), 19 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index a69a51054aa8..1b8a59ceb56e 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -284,6 +284,11 @@ func resourceTable() *schema.Resource { Computed: true, ConflictsWith: []string{"on_demand_throughput"}, }, + "global_table_witness_region_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, "replica": { Type: schema.TypeSet, Optional: true, @@ -826,7 +831,11 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) } if v := d.Get("replica").(*schema.Set); v.Len() > 0 { - if err := createReplicas(ctx, conn, d.Id(), v.List(), true, d.Timeout(schema.TimeoutCreate)); err != nil { + var global_table_witness_region_name = "" + if v, ok := d.GetOk("global_table_witness_region_name"); ok { + global_table_witness_region_name = v.(string) + } + if err := createReplicas(ctx, conn, d.Id(), v.List(), true, d.Timeout(schema.TimeoutCreate), global_table_witness_region_name); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, resNameTable, d.Id(), fmt.Errorf("replicas: %w", err)) } @@ -1288,7 +1297,11 @@ func resourceTableDelete(ctx context.Context, d *schema.ResourceData, meta any) if replicas := d.Get("replica").(*schema.Set).List(); len(replicas) > 0 { log.Printf("[DEBUG] Deleting DynamoDB Table replicas: %s", d.Id()) - if err := deleteReplicas(ctx, conn, d.Id(), replicas, d.Timeout(schema.TimeoutDelete)); err != nil { + var global_table_witness_region_name = "" + if v, ok := d.GetOk("global_table_witness_region_name"); ok { + global_table_witness_region_name = v.(string) + } + if err := deleteReplicas(ctx, conn, d.Id(), replicas, d.Timeout(schema.TimeoutDelete), global_table_witness_region_name); err != nil { // ValidationException: Replica specified in the Replica Update or Replica Delete action of the request was not found. // ValidationException: Cannot add, delete, or update the local region through ReplicaUpdates. Use CreateTable, DeleteTable, or UpdateTable as required. if !tfawserr.ErrMessageContains(err, errCodeValidationException, "request was not found") && @@ -1366,7 +1379,7 @@ func cycleStreamEnabled(ctx context.Context, conn *dynamodb.Client, id string, s return nil } -func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, create bool, timeout time.Duration) error { +func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, create bool, timeout time.Duration, gt_witness_reg_name string) error { // Duplicating this for MRSC Adoption. If using MRSC and CreateReplicationGroupMemberAction list isn't initiated for at least 2 replicas // then the update table action will fail with // "Unsupported table replica count for global tables with MultiRegionConsistency set to STRONG" @@ -1385,16 +1398,21 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string } } } + fmt.Printf("[DEBUG] global table witness region: %v and numReplicas (%v) and numReplicasMRSC (%v)\n", gt_witness_reg_name, numReplicas, numReplicasMRSC) if numReplicasMRSC > 0 { + MRSCErrorMsg := "creating replicas: Using MultiRegionStrongConsistency requires exactly 2 replicas, or 1 replica and 1 witness region." if numReplicasMRSC > 0 && numReplicasMRSC != numReplicas { - return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency requires all replicas to use 'consistency_mode' set to 'STRONG' ") + return fmt.Errorf("%s", MRSCErrorMsg) } - if numReplicasMRSC == 1 { - return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency requires exactly 2 replicas. ") + if numReplicasMRSC == 1 && gt_witness_reg_name == "" { + return fmt.Errorf("%s Only MRSC Replica count of 1 was provided but no Witness region was provided.", MRSCErrorMsg) + } + if numReplicasMRSC == 2 && numReplicasMRSC == numReplicas && gt_witness_reg_name != "" { + return fmt.Errorf("%s MRSC Replica count of 2 was provided and a Witness region was also provided.", MRSCErrorMsg) } if numReplicasMRSC > 2 { - return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency supports at most 2 replicas. ") + return fmt.Errorf("%s Too many Replicas were provided %v", MRSCErrorMsg, numReplicasMRSC) } mrscInput = awstypes.MultiRegionConsistencyStrong @@ -1425,10 +1443,21 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string }) } + var witnessCreate []awstypes.GlobalTableWitnessGroupUpdate + if gt_witness_reg_name != "" { + var witnessInput = &awstypes.CreateGlobalTableWitnessGroupMemberAction{ + RegionName: aws.String(gt_witness_reg_name), + } + witnessCreate = append(witnessCreate, awstypes.GlobalTableWitnessGroupUpdate{ + Create: witnessInput, + }) + } + input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: replicaCreates, - MultiRegionConsistency: mrscInput, + TableName: aws.String(tableName), + ReplicaUpdates: replicaCreates, + GlobalTableWitnessUpdates: witnessCreate, + MultiRegionConsistency: mrscInput, } err := retry.RetryContext(ctx, max(replicaUpdateTimeout, timeout), func() *retry.RetryError { @@ -1558,7 +1587,7 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string // ValidationException: One or more parameter values were invalid: KMSMasterKeyId must be specified for each replica. if create && tfawserr.ErrMessageContains(err, errCodeValidationException, "already exist") { - return createReplicas(ctx, conn, tableName, tfList, false, timeout) + return createReplicas(ctx, conn, tableName, tfList, false, timeout, gt_witness_reg_name) } if err != nil && !tfawserr.ErrMessageContains(err, errCodeValidationException, "no actions specified") { @@ -1772,19 +1801,19 @@ func updateReplica(ctx context.Context, conn *dynamodb.Client, d *schema.Resourc } if len(removeFirst) > 0 { // mini ForceNew, recreates replica but doesn't recreate the table - if err := deleteReplicas(ctx, conn, d.Id(), removeFirst, d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := deleteReplicas(ctx, conn, d.Id(), removeFirst, d.Timeout(schema.TimeoutUpdate), ""); err != nil { return fmt.Errorf("updating replicas, while deleting: %w", err) } } if len(toRemove) > 0 { - if err := deleteReplicas(ctx, conn, d.Id(), toRemove, d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := deleteReplicas(ctx, conn, d.Id(), toRemove, d.Timeout(schema.TimeoutUpdate), ""); err != nil { return fmt.Errorf("updating replicas, while deleting: %w", err) } } if len(toAdd) > 0 { - if err := createReplicas(ctx, conn, d.Id(), toAdd, true, d.Timeout(schema.TimeoutCreate)); err != nil { + if err := createReplicas(ctx, conn, d.Id(), toAdd, true, d.Timeout(schema.TimeoutCreate), ""); err != nil { return fmt.Errorf("updating replicas, while creating: %w", err) } } @@ -1965,10 +1994,11 @@ func deleteTable(ctx context.Context, conn *dynamodb.Client, tableName string) e return err } -func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, timeout time.Duration) error { +func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, timeout time.Duration, gt_witness_reg_name string) error { var g multierror.Group var replicaDeletes []awstypes.ReplicationGroupUpdate + var witnessDeletes []awstypes.GlobalTableWitnessGroupUpdate for _, tfMapRaw := range tfList { tfMap, ok := tfMapRaw.(map[string]any) @@ -1996,14 +2026,22 @@ func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string } } } - + if gt_witness_reg_name != "" { + witnessDeletes = append(witnessDeletes, awstypes.GlobalTableWitnessGroupUpdate{ + Delete: &awstypes.DeleteGlobalTableWitnessGroupMemberAction{ + RegionName: aws.String(gt_witness_reg_name), + }, + }) + } // We built an array of MultiRegionStrongConsistency replicas that need deletion. // These need to all happen concurrently if len(replicaDeletes) > 0 { input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: replicaDeletes, + TableName: aws.String(tableName), + ReplicaUpdates: replicaDeletes, + GlobalTableWitnessUpdates: witnessDeletes, } + fmt.Printf("[DEBUG] Deleting Replicas: %+v", input) err := retry.RetryContext(ctx, updateTableTimeout, func() *retry.RetryError { _, err := conn.UpdateTable(ctx, input) notFoundRetries := 0 diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index cdcc07803489..2feaa37d755f 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -3239,6 +3239,68 @@ func TestAccDynamoDBTable_Replica_MRSC_Create(t *testing.T) { }) } +func TestAccDynamoDBTable_Replica_MRSC_Create_witness(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var conf, replica1 awstypes.TableDescription + resourceName := "aws_dynamodb_table.test_mrsc" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckMultipleRegion(t, 3) + }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 3), // 3 due to shared test configuration + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_MRSC_replica_witness(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + testAccCheckReplicaExists(ctx, resourceName, acctest.AlternateRegion(), &replica1), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("replica"), knownvalue.SetExact([]knownvalue.Check{ + knownvalue.ObjectPartial(map[string]knownvalue.Check{ + "region_name": knownvalue.StringExact(acctest.AlternateRegion()), + "consistency_mode": knownvalue.StringExact((string(awstypes.MultiRegionConsistencyStrong))), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("global_table_witness_region_name"), knownvalue.StringExact(acctest.ThirdRegion())), + }, + }, + }, + }) +} + +func TestAccDynamoDBTable_Replica_MRSC_Create_witness_too_many_replicas(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckMultipleRegion(t, 3) + }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 3), // 3 due to shared test configuration + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_MRSC_replica_witness_too_many_replicas(rName), + ExpectError: regexache.MustCompile(`MRSC Replica count of 2 was provided and a Witness region was also provided`), + }, + }, + }) +} + func TestAccDynamoDBTable_Replica_MRSC_doubleAddCMK(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -4071,7 +4133,7 @@ func TestAccDynamoDBTable_Replica_MRSC_TooManyReplicas(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccTableConfig_MRSC_replica_count3(rName), - ExpectError: regexache.MustCompile(`Using MultiRegionStrongConsistency supports at most 2 replicas`), + ExpectError: regexache.MustCompile(`Too many Replicas were provided 3`), }, }, }) @@ -5832,6 +5894,79 @@ resource "aws_dynamodb_table" "test_mrsc" { `, rName)) } +func testAccTableConfig_MRSC_replica_witness(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors + fmt.Sprintf(` +data "aws_region" "alternate" { + provider = "awsalternate" +} + +data "aws_region" "third" { + provider = "awsthird" +} + +resource "aws_dynamodb_table" "test_mrsc" { + name = %[1]q + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } + + replica { + region_name = data.aws_region.alternate.name + consistency_mode = "STRONG" + } + + global_table_witness_region_name = data.aws_region.third.name +} +`, rName)) +} + +func testAccTableConfig_MRSC_replica_witness_too_many_replicas(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors + fmt.Sprintf(` +data "aws_region" "alternate" { + provider = "awsalternate" +} + +data "aws_region" "third" { + provider = "awsthird" +} + +resource "aws_dynamodb_table" "test_mrsc" { + name = %[1]q + hash_key = "TestTableHashKey" + billing_mode = "PAY_PER_REQUEST" + stream_enabled = true + stream_view_type = "NEW_AND_OLD_IMAGES" + + attribute { + name = "TestTableHashKey" + type = "S" + } + + replica { + region_name = data.aws_region.alternate.name + consistency_mode = "STRONG" + } + + replica { + region_name = data.aws_region.third.name + consistency_mode = "STRONG" + } + + global_table_witness_region_name = data.aws_region.third.name +} +`, rName)) +} + func testAccTableConfig_replicaEncryptedDefault(rName string, sseEnabled bool) string { return acctest.ConfigCompose( acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors From 9b16ffcde1a7515e8047a1feece973efb4d3dd34 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Wed, 13 Aug 2025 10:11:33 -0400 Subject: [PATCH 0121/2115] Added Mode support for CCI --- .../service/dynamodb/contributor_insights.go | 29 ++++ .../dynamodb/contributor_insights_test.go | 130 +++++++++++++++--- 2 files changed, 141 insertions(+), 18 deletions(-) diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index 4bf07705ce19..da31ccbf0281 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -24,6 +24,24 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) +type ContributorInsightsMode string + +const ( + AccessedAndThrottledKeys ContributorInsightsMode = "ACCESS_AND_THROTTLED_KEYS" + ThrottledKeys ContributorInsightsMode = "THROTTLED_KEYS" +) + +// Values returns all known values for AttributeAction. Note that this can be +// expanded in the future, and so it is only as up to date as the client. +// +// The ordering of this slice is not guaranteed to be stable across updates. +func (ContributorInsightsMode) Values() []ContributorInsightsMode { + return []ContributorInsightsMode{ + "ACCESS_AND_THROTTLED_KEYS", + "THROTTLED_KEYS", + } +} + // @SDKResource("aws_dynamodb_contributor_insights", name="Contributor Insights") func resourceContributorInsights() *schema.Resource { return &schema.Resource{ @@ -51,6 +69,12 @@ func resourceContributorInsights() *schema.Resource { Required: true, ForceNew: true, }, + "mode": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[ContributorInsightsMode](), + }, }, } } @@ -71,6 +95,10 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa input.IndexName = aws.String(indexName) } + if v, ok := d.GetOk("mode"); ok { + input.mode = ContributorInsightsMode(v.(string)) + } + _, err := conn.UpdateContributorInsights(ctx, input) if err != nil { @@ -109,6 +137,7 @@ func resourceContributorInsightsRead(ctx context.Context, d *schema.ResourceData d.Set("index_name", output.IndexName) d.Set(names.AttrTableName, output.TableName) + d.Set("mode", output.ContributorInsightsStatus) return diags } diff --git a/internal/service/dynamodb/contributor_insights_test.go b/internal/service/dynamodb/contributor_insights_test.go index d586fd022cd0..773b6eae324c 100644 --- a/internal/service/dynamodb/contributor_insights_test.go +++ b/internal/service/dynamodb/contributor_insights_test.go @@ -55,6 +55,78 @@ func TestAccDynamoDBContributorInsights_basic(t *testing.T) { }) } +func TestAccDynamoDBContributorInsights_ModeAccessedAndThrottled(t *testing.T) { + ctx := acctest.Context(t) + var conf dynamodb.DescribeContributorInsightsOutput + rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(8)) + indexName := fmt.Sprintf("%s-index", rName) + resourceName := "aws_dynamodb_contributor_insights.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckContributorInsightsDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccContributorInsightsConfig_AccessedAndThrottledKeys(rName, ""), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckContributorInsightsExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContributorInsightsConfig_AccessedAndThrottledKeys(rName, indexName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckContributorInsightsExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "index_name", indexName), + ), + }, + }, + }) +} + +func TestAccDynamoDBContributorInsights_ModeThrottledOnly(t *testing.T) { + ctx := acctest.Context(t) + var conf dynamodb.DescribeContributorInsightsOutput + rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(8)) + indexName := fmt.Sprintf("%s-index", rName) + resourceName := "aws_dynamodb_contributor_insights.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckContributorInsightsDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccContributorInsightsConfig_ThrottledKeys(rName, ""), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckContributorInsightsExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccContributorInsightsConfig_ThrottledKeys(rName, indexName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckContributorInsightsExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "index_name", indexName), + ), + }, + }, + }) +} + func TestAccDynamoDBContributorInsights_disappears(t *testing.T) { ctx := acctest.Context(t) var conf dynamodb.DescribeContributorInsightsOutput @@ -81,26 +153,26 @@ func TestAccDynamoDBContributorInsights_disappears(t *testing.T) { func testAccContributorInsightsBaseConfig(rName string) string { return fmt.Sprintf(` -resource "aws_dynamodb_table" "test" { - name = %[1]q - read_capacity = 2 - write_capacity = 2 - hash_key = %[1]q - - attribute { - name = %[1]q - type = "S" - } + resource "aws_dynamodb_table" "test" { + name = %[1]q + read_capacity = 2 + write_capacity = 2 + hash_key = %[1]q + + attribute { + name = %[1]q + type = "S" + } - global_secondary_index { - name = "%[1]s-index" - hash_key = %[1]q - projection_type = "ALL" - read_capacity = 1 - write_capacity = 1 + global_secondary_index { + name = "%[1]s-index" + hash_key = %[1]q + projection_type = "ALL" + read_capacity = 1 + write_capacity = 1 + } } -} -`, rName) + `, rName) } func testAccContributorInsightsConfig_basic(rName, indexName string) string { @@ -112,6 +184,28 @@ resource "aws_dynamodb_contributor_insights" "test" { `, rName, indexName)) } +func testAccContributorInsightsConfig_AccessedAndThrottledKeys(rName, indexName string) string { + return acctest.ConfigCompose(testAccContributorInsightsBaseConfig(rName), fmt.Sprintf(` +resource "aws_dynamodb_contributor_insights" "test" { + table_name = aws_dynamodb_table.test.name + index_name = %[2]q + + mode = "ACCESSED_AND_THROTTLED_KEYS" +} +`, rName, indexName)) +} + +func testAccContributorInsightsConfig_ThrottledKeys(rName, indexName string) string { + return acctest.ConfigCompose(testAccContributorInsightsBaseConfig(rName), fmt.Sprintf(` +resource "aws_dynamodb_contributor_insights" "test" { + table_name = aws_dynamodb_table.test.name + index_name = %[2]q + + mode = "THROTTLED_KEYS" +} +`, rName, indexName)) +} + func testAccCheckContributorInsightsExists(ctx context.Context, n string, v *dynamodb.DescribeContributorInsightsOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] From 8e98e3fd7ce0a4824901f9e04d2dd54f2cf12db7 Mon Sep 17 00:00:00 2001 From: Marc <157699+digitalfiz@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:34:10 -0400 Subject: [PATCH 0122/2115] Update api_gateway_gateway_response response_type argument reference with a link to the documentation of response types --- website/docs/r/api_gateway_gateway_response.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/api_gateway_gateway_response.html.markdown b/website/docs/r/api_gateway_gateway_response.html.markdown index 94bdcedde45f..38f936f8a79a 100644 --- a/website/docs/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/r/api_gateway_gateway_response.html.markdown @@ -38,7 +38,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `rest_api_id` - (Required) String identifier of the associated REST API. -* `response_type` - (Required) Response type of the associated GatewayResponse. +* `response_type` - (Required) [Response type](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) of the associated GatewayResponse. * `status_code` - (Optional) HTTP status code of the Gateway Response. * `response_templates` - (Optional) Map of templates used to transform the response body. * `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. From d3f03f14c8f1ba24f770697e6a2a208c2b6233d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 15:51:00 -0400 Subject: [PATCH 0123/2115] d/aws_opensearchserverless_security_policy: Use 'tfsmithy.DocumentToJSONString'. --- internal/flex/flex.go | 5 +++ internal/framework/flex/auto_flatten.go | 2 +- .../security_policy_data_source.go | 37 ++++++++++--------- .../service_package_gen.go | 2 +- internal/smithy/json.go | 9 ++++- 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/internal/flex/flex.go b/internal/flex/flex.go index 11e4c42caa71..afc808d0b6fa 100644 --- a/internal/flex/flex.go +++ b/internal/flex/flex.go @@ -413,6 +413,11 @@ func StringValueToInt64Value(v string) int64 { return i } +// Int64ToRFC3339StringValue converts an int64 timestamp pointer to an RFC3339 Go string value. +func Int64ToRFC3339StringValue(v *int64) string { + return time.UnixMilli(aws.ToInt64(v)).Format(time.RFC3339) +} + // Takes a string of resource attributes separated by the ResourceIdSeparator constant // returns the number of parts func ResourceIdPartCount(id string) int { diff --git a/internal/framework/flex/auto_flatten.go b/internal/framework/flex/auto_flatten.go index 2955894aa2d5..2955e76511e4 100644 --- a/internal/framework/flex/auto_flatten.go +++ b/internal/framework/flex/auto_flatten.go @@ -637,7 +637,7 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val diags.Append(diagFlatteningUnmarshalSmithyDocument(reflect.TypeOf(doc), err)) return diags } - stringValue = types.StringValue(strings.TrimSpace(s)) + stringValue = types.StringValue(s) } v, d := tTo.ValueFromString(ctx, stringValue) diags.Append(d...) diff --git a/internal/service/opensearchserverless/security_policy_data_source.go b/internal/service/opensearchserverless/security_policy_data_source.go index ea7494c167e0..3dc2a45d11af 100644 --- a/internal/service/opensearchserverless/security_policy_data_source.go +++ b/internal/service/opensearchserverless/security_policy_data_source.go @@ -5,7 +5,6 @@ package opensearchserverless import ( "context" - "time" "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" @@ -16,11 +15,13 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/flex" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/hashicorp/terraform-provider-aws/names" ) // @SDKDataSource("aws_opensearchserverless_security_policy", name="Security Policy") -func DataSourceSecurityPolicy() *schema.Resource { +func dataSourceSecurityPolicy() *schema.Resource { return &schema.Resource{ ReadWithoutTimeout: dataSourceSecurityPolicyRead, @@ -73,31 +74,31 @@ func dataSourceSecurityPolicyRead(ctx context.Context, d *schema.ResourceData, m var diags diag.Diagnostics conn := meta.(*conns.AWSClient).OpenSearchServerlessClient(ctx) - securityPolicyName := d.Get(names.AttrName).(string) - securityPolicyType := d.Get(names.AttrType).(string) - securityPolicy, err := findSecurityPolicyByNameAndType(ctx, conn, securityPolicyName, securityPolicyType) + name := d.Get(names.AttrName).(string) + securityPolicy, err := findSecurityPolicyByNameAndType(ctx, conn, name, d.Get(names.AttrType).(string)) if err != nil { - return sdkdiag.AppendErrorf(diags, "reading OpenSearch Security Policy with name (%s) and type (%s): %s", securityPolicyName, securityPolicyType, err) - } - - policyBytes, err := securityPolicy.Policy.MarshalSmithyDocument() - if err != nil { - return sdkdiag.AppendErrorf(diags, "reading JSON policy document for OpenSearch Security Policy with name %s and type %s: %s", securityPolicyName, securityPolicyType, err) + return sdkdiag.AppendErrorf(diags, "reading OpenSearch Serverless Security Policy (%s): %s", name, err) } d.SetId(aws.ToString(securityPolicy.Name)) + d.Set(names.AttrCreatedDate, flex.Int64ToRFC3339StringValue(securityPolicy.CreatedDate)) d.Set(names.AttrDescription, securityPolicy.Description) + d.Set("last_modified_date", flex.Int64ToRFC3339StringValue(securityPolicy.LastModifiedDate)) d.Set(names.AttrName, securityPolicy.Name) - d.Set(names.AttrPolicy, string(policyBytes)) - d.Set("policy_version", securityPolicy.PolicyVersion) - d.Set(names.AttrType, securityPolicy.Type) + if securityPolicy.Policy != nil { + v, err := tfsmithy.DocumentToJSONString(securityPolicy.Policy) - createdDate := time.UnixMilli(aws.ToInt64(securityPolicy.CreatedDate)) - d.Set(names.AttrCreatedDate, createdDate.Format(time.RFC3339)) + if err != nil { + return sdkdiag.AppendFromErr(diags, err) + } - lastModifiedDate := time.UnixMilli(aws.ToInt64(securityPolicy.LastModifiedDate)) - d.Set("last_modified_date", lastModifiedDate.Format(time.RFC3339)) + d.Set(names.AttrPolicy, v) + } else { + d.Set(names.AttrPolicy, nil) + } + d.Set("policy_version", securityPolicy.PolicyVersion) + d.Set(names.AttrType, securityPolicy.Type) return diags } diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index 3384cb1182b3..5355814c7f15 100644 --- a/internal/service/opensearchserverless/service_package_gen.go +++ b/internal/service/opensearchserverless/service_package_gen.go @@ -97,7 +97,7 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { return []*inttypes.ServicePackageSDKDataSource{ { - Factory: DataSourceSecurityPolicy, + Factory: dataSourceSecurityPolicy, TypeName: "aws_opensearchserverless_security_policy", Name: "Security Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), diff --git a/internal/smithy/json.go b/internal/smithy/json.go index 8c579645f935..144438ed7c54 100644 --- a/internal/smithy/json.go +++ b/internal/smithy/json.go @@ -4,6 +4,8 @@ package smithy import ( + "strings" + smithydocument "github.com/aws/smithy-go/document" tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) @@ -30,7 +32,12 @@ func DocumentToJSONString(document smithydocument.Unmarshaler) (string, error) { return "", err } - return tfjson.EncodeToString(v) + s, err := tfjson.EncodeToString(v) + if err != nil { + return "", err + } + + return strings.TrimSpace(s), nil } // JSONStringer interface is used to marshal and unmarshal JSON interface objects. From cafda86bb09ccf8ed5f14a583fb05cb8c41540aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 16:09:37 -0400 Subject: [PATCH 0124/2115] r/aws_kendra_data_source: Use 'tfsmithy.DocumentToJSONString'. --- internal/service/kendra/data_source.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index fa0b8aa4f5db..96b891c9c786 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -1531,12 +1532,12 @@ func flattenTemplateConfiguration(apiObject *types.TemplateConfiguration) ([]any tfMap := map[string]any{} if v := apiObject.Template; v != nil { - bytes, err := apiObject.Template.MarshalSmithyDocument() + v, err := tfsmithy.DocumentToJSONString(v) if err != nil { return nil, err } - tfMap["template"] = string(bytes[:]) + tfMap["template"] = v } return []any{tfMap}, nil From 8b9691c959830ecd550d51dd0ff53b803f97d9ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 16:48:44 -0400 Subject: [PATCH 0125/2115] r/aws_controltower_control: Use 'tfsmithy.DocumentToJSONString'. --- internal/service/controltower/control.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/controltower/control.go b/internal/service/controltower/control.go index 13b5d480eadd..9df15bfc2bc3 100644 --- a/internal/service/controltower/control.go +++ b/internal/service/controltower/control.go @@ -23,6 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" @@ -307,20 +308,14 @@ func flattenControlParameters(input []types.EnabledControlParameterSummary) (*sc names.AttrKey: aws.ToString(v.Key), } - var va any - err := v.Value.UnmarshalSmithyDocument(&va) + va, err := tfsmithy.DocumentToJSONString(v.Value) if err != nil { log.Printf("[WARN] Error unmarshalling control parameter value: %s", err) return nil, err } - out, err := json.Marshal(va) - if err != nil { - return nil, err - } - - val[names.AttrValue] = string(out) + val[names.AttrValue] = va output = append(output, val) } From 3e18c7275c51783c9ec1cfcc8b25b9fc9db7af53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 14 Aug 2025 11:03:45 -0400 Subject: [PATCH 0126/2115] Add 'tfjson.CreatePatchFromStrings'. --- internal/json/decode_test.go | 4 +- internal/json/encode_test.go | 6 +-- internal/json/equal_test.go | 4 +- internal/json/patch.go | 15 +++++++ internal/json/patch_test.go | 85 ++++++++++++++++++++++++++++++++++++ internal/json/remove_test.go | 6 +-- 6 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 internal/json/patch.go create mode 100644 internal/json/patch_test.go diff --git a/internal/json/decode_test.go b/internal/json/decode_test.go index 9c36f6980a86..2edc3ed00434 100644 --- a/internal/json/decode_test.go +++ b/internal/json/decode_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func TestDecodeFromString(t *testing.T) { @@ -62,7 +62,7 @@ func TestDecodeFromString(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - err := json.DecodeFromString(testCase.input, testCase.output) + err := tfjson.DecodeFromString(testCase.input, testCase.output) if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { t.Errorf("DecodeFromString(%s) err %t, want %t", testCase.input, got, want) } diff --git a/internal/json/encode_test.go b/internal/json/encode_test.go index 4a6446c62ddc..e013a6e3720d 100644 --- a/internal/json/encode_test.go +++ b/internal/json/encode_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform-provider-aws/internal/acctest/jsoncmp" - "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func TestEncodeToString(t *testing.T) { @@ -54,7 +54,7 @@ func TestEncodeToString(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - output, err := json.EncodeToString(testCase.input) + output, err := tfjson.EncodeToString(testCase.input) if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { t.Errorf("EncodeToString(%v) err %t, want %t", testCase.input, got, want) } @@ -110,7 +110,7 @@ func TestEncodeToStringIndent(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - output, err := json.EncodeToStringIndent(testCase.input, "", " ") + output, err := tfjson.EncodeToStringIndent(testCase.input, "", " ") if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { t.Errorf("EncodeToStringIndent(%v) err %t, want %t", testCase.input, got, want) } diff --git a/internal/json/equal_test.go b/internal/json/equal_test.go index 1e80913d7138..4f8fc792ea1a 100644 --- a/internal/json/equal_test.go +++ b/internal/json/equal_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func TestEqualStrings(t *testing.T) { @@ -64,7 +64,7 @@ func TestEqualStrings(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - equal := json.EqualStrings(testCase.x, testCase.y) + equal := tfjson.EqualStrings(testCase.x, testCase.y) if got, want := equal, testCase.wantEqual; !cmp.Equal(got, want) { t.Errorf("EqualStrings(%s, %s) = %t, want %t", testCase.x, testCase.y, got, want) } diff --git a/internal/json/patch.go b/internal/json/patch.go new file mode 100644 index 000000000000..c81d6d1c54c8 --- /dev/null +++ b/internal/json/patch.go @@ -0,0 +1,15 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package json + +import ( + "github.com/mattbaird/jsonpatch" +) + +// `CreatePatchFromStrings` creates an [RFC6902](https://datatracker.ietf.org/doc/html/rfc6902) JSON PATCH from two JSON strings. +// `a` is the original JSON document and `b` is the modified JSON document. +// The patch is returned as an array of operations (which can be encoded to JSON). +func CreatePatchFromStrings(a, b string) ([]jsonpatch.JsonPatchOperation, error) { + return jsonpatch.CreatePatch([]byte(a), []byte(b)) +} diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go new file mode 100644 index 000000000000..34a1588f12e4 --- /dev/null +++ b/internal/json/patch_test.go @@ -0,0 +1,85 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package json_test + +import ( + "testing" + + "github.com/google/go-cmp/cmp" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" + "github.com/mattbaird/jsonpatch" +) + +func TestCreatePatchFromStrings(t *testing.T) { + t.Parallel() + + testCases := []struct { + testName string + a, b string + wantPatch []jsonpatch.JsonPatchOperation + wantErr bool + }{ + { + testName: "invalid JSON", + a: `test`, + b: `{}`, + wantErr: true, + }, + { + testName: "empty patch, empty JSON", + a: `{}`, + b: `{}`, + wantPatch: []jsonpatch.JsonPatchOperation{}, + }, + { + testName: "empty patch, non-empty JSON", + a: `{"A": "test1", "B": 42}`, + b: `{"B": 42, "A": "test1"}`, + wantPatch: []jsonpatch.JsonPatchOperation{}, + }, + { + testName: "from empty JSON", + a: `{}`, + b: `{"A": "test1", "B": 42}`, + wantPatch: []jsonpatch.JsonPatchOperation{ + {Operation: "add", Path: "/A", Value: "test1"}, + {Operation: "add", Path: "/B", Value: float64(42)}, + }, + }, + { + testName: "to empty JSON", + a: `{"A": "test1", "B": 42}`, + b: `{}`, + wantPatch: []jsonpatch.JsonPatchOperation{ + {Operation: "remove", Path: "/A"}, + {Operation: "remove", Path: "/B"}, + }, + }, + { + testName: "change values", + a: `{"A": "test1", "B": 42}`, + b: `{"A": ["test2"], "B": false}`, + wantPatch: []jsonpatch.JsonPatchOperation{ + {Operation: "replace", Path: "/A", Value: []any{"test2"}}, + {Operation: "replace", Path: "/B", Value: false}, + }, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.testName, func(t *testing.T) { + t.Parallel() + + got, err := tfjson.CreatePatchFromStrings(testCase.a, testCase.b) + if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { + t.Errorf("CreatePatchFromStrings(%s, %s) err %t, want %t", testCase.a, testCase.b, got, want) + } + if err == nil { + if diff := cmp.Diff(got, testCase.wantPatch); diff != "" { + t.Errorf("unexpected diff (+wanted, -got): %s", diff) + } + } + }) + } +} diff --git a/internal/json/remove_test.go b/internal/json/remove_test.go index 33d313d5d6a8..16c4b808dacb 100644 --- a/internal/json/remove_test.go +++ b/internal/json/remove_test.go @@ -6,7 +6,7 @@ package json_test import ( "testing" - "github.com/hashicorp/terraform-provider-aws/internal/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" ) func TestRemoveFields(t *testing.T) { @@ -38,7 +38,7 @@ func TestRemoveFields(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - if got, want := json.RemoveFields(testCase.input, `"plugins"`), testCase.want; got != want { + if got, want := tfjson.RemoveFields(testCase.input, `"plugins"`), testCase.want; got != want { t.Errorf("RemoveReadOnlyFields(%q) = %q, want %q", testCase.input, got, want) } }) @@ -119,7 +119,7 @@ func TestRemoveEmptyFields(t *testing.T) { t.Run(testCase.testName, func(t *testing.T) { t.Parallel() - if got, want := json.RemoveEmptyFields([]byte(testCase.input)), testCase.want; string(got) != want { + if got, want := tfjson.RemoveEmptyFields([]byte(testCase.input)), testCase.want; string(got) != want { t.Errorf("RemoveEmptyFields(%q) = %q, want %q", testCase.input, got, want) } }) From b9e9f7c9b54a7772e6619b70d0671b05ca4db09b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 14 Aug 2025 11:16:31 -0400 Subject: [PATCH 0127/2115] aws_cloudcontrolapi_resource: Use 'tfjson.CreatePatchFromStrings'. --- internal/service/cloudcontrol/exports_test.go | 2 +- internal/service/cloudcontrol/resource.go | 65 ++++++++----------- .../cloudcontrol/resource_data_source.go | 3 +- .../cloudcontrol/resource_data_source_test.go | 1 - .../service/cloudcontrol/resource_test.go | 2 +- 5 files changed, 29 insertions(+), 44 deletions(-) diff --git a/internal/service/cloudcontrol/exports_test.go b/internal/service/cloudcontrol/exports_test.go index 3673ef69a0b3..78c06ec6570c 100644 --- a/internal/service/cloudcontrol/exports_test.go +++ b/internal/service/cloudcontrol/exports_test.go @@ -7,5 +7,5 @@ package cloudcontrol var ( ResourceResource = resourceResource - FindResource = findResource + FindResourceByFourPartKey = findResourceByFourPartKey ) diff --git a/internal/service/cloudcontrol/resource.go b/internal/service/cloudcontrol/resource.go index 8750bc37b134..b0e4a3a676ff 100644 --- a/internal/service/cloudcontrol/resource.go +++ b/internal/service/cloudcontrol/resource.go @@ -5,7 +5,6 @@ package cloudcontrol import ( "context" - "encoding/json" "fmt" "log" "time" @@ -17,7 +16,7 @@ import ( cfschema "github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "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" @@ -25,10 +24,10 @@ import ( "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" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfcloudformation "github.com/hashicorp/terraform-provider-aws/internal/service/cloudformation" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" - "github.com/mattbaird/jsonpatch" ) // @SDKResource("aws_cloudcontrolapi_resource", name="Resource") @@ -88,25 +87,22 @@ func resourceResource() *schema.Resource { func resourceResourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).CloudControlClient(ctx) typeName := d.Get("type_name").(string) - input := &cloudcontrol.CreateResourceInput{ - ClientToken: aws.String(id.UniqueId()), + input := cloudcontrol.CreateResourceInput{ + ClientToken: aws.String(sdkid.UniqueId()), DesiredState: aws.String(d.Get("desired_state").(string)), TypeName: aws.String(typeName), } - if v, ok := d.GetOk(names.AttrRoleARN); ok { input.RoleArn = aws.String(v.(string)) } - if v, ok := d.GetOk("type_version_id"); ok { input.TypeVersionId = aws.String(v.(string)) } - output, err := conn.CreateResource(ctx, input) + output, err := conn.CreateResource(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating Cloud Control API (%s) Resource: %s", typeName, err) @@ -131,11 +127,10 @@ func resourceResourceCreate(ctx context.Context, d *schema.ResourceData, meta an func resourceResourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).CloudControlClient(ctx) typeName := d.Get("type_name").(string) - resourceDescription, err := findResource(ctx, conn, + resourceDescription, err := findResourceByFourPartKey(ctx, conn, d.Id(), typeName, d.Get("type_version_id").(string), @@ -159,12 +154,10 @@ func resourceResourceRead(ctx context.Context, d *schema.ResourceData, meta any) func resourceResourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).CloudControlClient(ctx) if d.HasChange("desired_state") { oldRaw, newRaw := d.GetChange("desired_state") - patchDocument, err := patchDocument(oldRaw.(string), newRaw.(string)) if err != nil { @@ -172,22 +165,20 @@ func resourceResourceUpdate(ctx context.Context, d *schema.ResourceData, meta an } typeName := d.Get("type_name").(string) - input := &cloudcontrol.UpdateResourceInput{ - ClientToken: aws.String(id.UniqueId()), + input := cloudcontrol.UpdateResourceInput{ + ClientToken: aws.String(sdkid.UniqueId()), Identifier: aws.String(d.Id()), PatchDocument: aws.String(patchDocument), TypeName: aws.String(typeName), } - if v, ok := d.GetOk(names.AttrRoleARN); ok { input.RoleArn = aws.String(v.(string)) } - if v, ok := d.GetOk("type_version_id"); ok { input.TypeVersionId = aws.String(v.(string)) } - output, err := conn.UpdateResource(ctx, input) + output, err := conn.UpdateResource(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Cloud Control API (%s) Resource (%s): %s", typeName, d.Id(), err) @@ -203,26 +194,23 @@ func resourceResourceUpdate(ctx context.Context, d *schema.ResourceData, meta an func resourceResourceDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).CloudControlClient(ctx) typeName := d.Get("type_name").(string) - input := &cloudcontrol.DeleteResourceInput{ - ClientToken: aws.String(id.UniqueId()), + input := cloudcontrol.DeleteResourceInput{ + ClientToken: aws.String(sdkid.UniqueId()), Identifier: aws.String(d.Id()), TypeName: aws.String(typeName), } - if v, ok := d.GetOk(names.AttrRoleARN); ok { input.RoleArn = aws.String(v.(string)) } - if v, ok := d.GetOk("type_version_id"); ok { input.TypeVersionId = aws.String(v.(string)) } log.Printf("[INFO] Deleting Cloud Control API (%s) Resource: %s", typeName, d.Id()) - output, err := conn.DeleteResource(ctx, input) + output, err := conn.DeleteResource(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "deleting Cloud Control API (%s) Resource (%s): %s", typeName, d.Id(), err) @@ -245,13 +233,11 @@ func resourceResourceCustomizeDiffGetSchema(ctx context.Context, diff *schema.Re conn := meta.(*conns.AWSClient).CloudFormationClient(ctx) resourceSchema := diff.Get(names.AttrSchema).(string) - if resourceSchema != "" { return nil } typeName := diff.Get("type_name").(string) - output, err := tfcloudformation.FindTypeByName(ctx, conn, typeName) if err != nil { @@ -270,7 +256,6 @@ func resourceResourceCustomizeDiffSchemaDiff(ctx context.Context, diff *schema.R newSchema := diff.Get(names.AttrSchema).(string) newDesiredState, ok := newDesiredStateRaw.(string) - if !ok { return fmt.Errorf("unexpected new desired_state value type: %T", newDesiredStateRaw) } @@ -307,7 +292,7 @@ func resourceResourceCustomizeDiffSchemaDiff(ctx context.Context, diff *schema.R return fmt.Errorf("converting CloudFormation Resource Schema JSON: %w", err) } - patches, err := jsonpatch.CreatePatch([]byte(oldDesiredStateRaw.(string)), []byte(newDesiredStateRaw.(string))) + patches, err := tfjson.CreatePatchFromStrings(oldDesiredStateRaw.(string), newDesiredState) if err != nil { return fmt.Errorf("creating desired_state JSON Patch: %w", err) @@ -326,8 +311,8 @@ func resourceResourceCustomizeDiffSchemaDiff(ctx context.Context, diff *schema.R return nil } -func findResource(ctx context.Context, conn *cloudcontrol.Client, resourceID, typeName, typeVersionID, roleARN string) (*types.ResourceDescription, error) { - input := &cloudcontrol.GetResourceInput{ +func findResourceByFourPartKey(ctx context.Context, conn *cloudcontrol.Client, resourceID, typeName, typeVersionID, roleARN string) (*types.ResourceDescription, error) { + input := cloudcontrol.GetResourceInput{ Identifier: aws.String(resourceID), TypeName: aws.String(typeName), } @@ -338,6 +323,10 @@ func findResource(ctx context.Context, conn *cloudcontrol.Client, resourceID, ty input.TypeVersionId = aws.String(typeVersionID) } + return findResource(ctx, conn, &input) +} + +func findResource(ctx context.Context, conn *cloudcontrol.Client, input *cloudcontrol.GetResourceInput) (*types.ResourceDescription, error) { output, err := conn.GetResource(ctx, input) if errs.IsA[*types.ResourceNotFoundException](err) { @@ -368,10 +357,14 @@ func findResource(ctx context.Context, conn *cloudcontrol.Client, resourceID, ty } func findProgressEventByRequestToken(ctx context.Context, conn *cloudcontrol.Client, requestToken string) (*types.ProgressEvent, error) { - input := &cloudcontrol.GetResourceRequestStatusInput{ + input := cloudcontrol.GetResourceRequestStatusInput{ RequestToken: aws.String(requestToken), } + return findProgressEvent(ctx, conn, &input) +} + +func findProgressEvent(ctx context.Context, conn *cloudcontrol.Client, input *cloudcontrol.GetResourceRequestStatusInput) (*types.ProgressEvent, error) { output, err := conn.GetResourceRequestStatus(ctx, input) if errs.IsA[*types.RequestTokenNotFoundException](err) { @@ -431,17 +424,11 @@ func waitProgressEventOperationStatusSuccess(ctx context.Context, conn *cloudcon // patchDocument returns a JSON Patch document describing the difference between `old` and `new`. func patchDocument(old, new string) (string, error) { - patch, err := jsonpatch.CreatePatch([]byte(old), []byte(new)) - - if err != nil { - return "", err - } - - b, err := json.Marshal(patch) + patch, err := tfjson.CreatePatchFromStrings(old, new) if err != nil { return "", err } - return string(b), nil + return tfjson.EncodeToString(patch) } diff --git a/internal/service/cloudcontrol/resource_data_source.go b/internal/service/cloudcontrol/resource_data_source.go index 187557097914..09ebb40c58e4 100644 --- a/internal/service/cloudcontrol/resource_data_source.go +++ b/internal/service/cloudcontrol/resource_data_source.go @@ -54,7 +54,7 @@ func dataSourceResourceRead(ctx context.Context, d *schema.ResourceData, meta an identifier := d.Get(names.AttrIdentifier).(string) typeName := d.Get("type_name").(string) - resourceDescription, err := findResource(ctx, conn, + resourceDescription, err := findResourceByFourPartKey(ctx, conn, identifier, typeName, d.Get("type_version_id").(string), @@ -66,7 +66,6 @@ func dataSourceResourceRead(ctx context.Context, d *schema.ResourceData, meta an } d.SetId(aws.ToString(resourceDescription.Identifier)) - d.Set(names.AttrProperties, resourceDescription.Properties) return diags diff --git a/internal/service/cloudcontrol/resource_data_source_test.go b/internal/service/cloudcontrol/resource_data_source_test.go index f39de71bb6cc..0c035ca78ae0 100644 --- a/internal/service/cloudcontrol/resource_data_source_test.go +++ b/internal/service/cloudcontrol/resource_data_source_test.go @@ -23,7 +23,6 @@ func TestAccCloudControlResourceDataSource_basic(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.CloudControlServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckResourceDestroy(ctx), Steps: []resource.TestStep{ { Config: testAccResourceDataSourceConfig_basic(rName), diff --git a/internal/service/cloudcontrol/resource_test.go b/internal/service/cloudcontrol/resource_test.go index 37c4e20d5493..1cc55b7e9ab1 100644 --- a/internal/service/cloudcontrol/resource_test.go +++ b/internal/service/cloudcontrol/resource_test.go @@ -528,7 +528,7 @@ func testAccCheckResourceDestroy(ctx context.Context) resource.TestCheckFunc { continue } - _, err := tfcloudcontrol.FindResource(ctx, conn, rs.Primary.ID, rs.Primary.Attributes["type_name"], "", "") + _, err := tfcloudcontrol.FindResourceByFourPartKey(ctx, conn, rs.Primary.ID, rs.Primary.Attributes["type_name"], "", "") if tfresource.NotFound(err) { continue From 95408ffb407be7de58a6bd59c08789fc2fc7f08a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 14 Aug 2025 14:37:53 -0400 Subject: [PATCH 0128/2115] Add 'tfjson.CreateMergePatchFromStrings'. --- go.mod | 3 +- internal/json/patch.go | 21 ++++++++-- internal/json/patch_test.go | 79 +++++++++++++++++++++++++++++++++---- 3 files changed, 91 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 71c4d39cae54..4b615b137868 100644 --- a/go.mod +++ b/go.mod @@ -274,6 +274,7 @@ require ( github.com/cedar-policy/cedar-go v1.2.6 github.com/davecgh/go-spew v1.1.1 github.com/dlclark/regexp2 v1.11.5 + github.com/evanphx/json-patch v0.5.2 github.com/gertd/go-pluralize v0.2.1 github.com/google/go-cmp v0.7.0 github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 @@ -335,7 +336,6 @@ require ( github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect - github.com/evanphx/json-patch v0.5.2 // indirect github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -358,6 +358,7 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/posener/complete v1.2.3 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect diff --git a/internal/json/patch.go b/internal/json/patch.go index c81d6d1c54c8..b1aba4c15282 100644 --- a/internal/json/patch.go +++ b/internal/json/patch.go @@ -4,12 +4,25 @@ package json import ( - "github.com/mattbaird/jsonpatch" + evanphxjsonpatch "github.com/evanphx/json-patch" + mattbairdjsonpatch "github.com/mattbaird/jsonpatch" ) -// `CreatePatchFromStrings` creates an [RFC6902](https://datatracker.ietf.org/doc/html/rfc6902) JSON PATCH from two JSON strings. +// `CreatePatchFromStrings` creates an [RFC6902](https://datatracker.ietf.org/doc/html/rfc6902) JSON Patch from two JSON strings. // `a` is the original JSON document and `b` is the modified JSON document. // The patch is returned as an array of operations (which can be encoded to JSON). -func CreatePatchFromStrings(a, b string) ([]jsonpatch.JsonPatchOperation, error) { - return jsonpatch.CreatePatch([]byte(a), []byte(b)) +func CreatePatchFromStrings(a, b string) ([]mattbairdjsonpatch.JsonPatchOperation, error) { + return mattbairdjsonpatch.CreatePatch([]byte(a), []byte(b)) +} + +// `CreateMergePatchFromStrings` creates an [RFC7396](https://datatracker.ietf.org/doc/html/rfc7396) JSON merge patch from two JSON strings. +// `a` is the original JSON document and `b` is the modified JSON document. +// The patch is returned as a JSON string. +func CreateMergePatchFromStrings(a, b string) (string, error) { + patch, err := evanphxjsonpatch.CreateMergePatch([]byte(a), []byte(b)) + if err != nil { + return "", err + } + + return string(patch), nil } diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go index 34a1588f12e4..81a95a2a6273 100644 --- a/internal/json/patch_test.go +++ b/internal/json/patch_test.go @@ -7,8 +7,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/terraform-provider-aws/internal/acctest/jsoncmp" tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" - "github.com/mattbaird/jsonpatch" + mattbairdjsonpatch "github.com/mattbaird/jsonpatch" ) func TestCreatePatchFromStrings(t *testing.T) { @@ -17,7 +18,7 @@ func TestCreatePatchFromStrings(t *testing.T) { testCases := []struct { testName string a, b string - wantPatch []jsonpatch.JsonPatchOperation + wantPatch []mattbairdjsonpatch.JsonPatchOperation wantErr bool }{ { @@ -30,19 +31,19 @@ func TestCreatePatchFromStrings(t *testing.T) { testName: "empty patch, empty JSON", a: `{}`, b: `{}`, - wantPatch: []jsonpatch.JsonPatchOperation{}, + wantPatch: []mattbairdjsonpatch.JsonPatchOperation{}, }, { testName: "empty patch, non-empty JSON", a: `{"A": "test1", "B": 42}`, b: `{"B": 42, "A": "test1"}`, - wantPatch: []jsonpatch.JsonPatchOperation{}, + wantPatch: []mattbairdjsonpatch.JsonPatchOperation{}, }, { testName: "from empty JSON", a: `{}`, b: `{"A": "test1", "B": 42}`, - wantPatch: []jsonpatch.JsonPatchOperation{ + wantPatch: []mattbairdjsonpatch.JsonPatchOperation{ {Operation: "add", Path: "/A", Value: "test1"}, {Operation: "add", Path: "/B", Value: float64(42)}, }, @@ -51,7 +52,7 @@ func TestCreatePatchFromStrings(t *testing.T) { testName: "to empty JSON", a: `{"A": "test1", "B": 42}`, b: `{}`, - wantPatch: []jsonpatch.JsonPatchOperation{ + wantPatch: []mattbairdjsonpatch.JsonPatchOperation{ {Operation: "remove", Path: "/A"}, {Operation: "remove", Path: "/B"}, }, @@ -60,7 +61,7 @@ func TestCreatePatchFromStrings(t *testing.T) { testName: "change values", a: `{"A": "test1", "B": 42}`, b: `{"A": ["test2"], "B": false}`, - wantPatch: []jsonpatch.JsonPatchOperation{ + wantPatch: []mattbairdjsonpatch.JsonPatchOperation{ {Operation: "replace", Path: "/A", Value: []any{"test2"}}, {Operation: "replace", Path: "/B", Value: false}, }, @@ -83,3 +84,67 @@ func TestCreatePatchFromStrings(t *testing.T) { }) } } + +func TestCreateMergePatchFromStrings(t *testing.T) { + t.Parallel() + + testCases := []struct { + testName string + a, b string + wantPatch string + wantErr bool + }{ + { + testName: "invalid JSON", + a: `test`, + b: `{}`, + wantErr: true, + }, + { + testName: "empty patch, empty JSON", + a: `{}`, + b: `{}`, + wantPatch: `{}`, + }, + { + testName: "empty patch, non-empty JSON", + a: `{"A": "test1", "B": 42}`, + b: `{"B": 42, "A": "test1"}`, + wantPatch: `{}`, + }, + { + testName: "from empty JSON", + a: `{}`, + b: `{"A": "test1", "B": 42}`, + wantPatch: `{"A":"test1", "B":42}`, + }, + { + testName: "to empty JSON", + a: `{"A": "test1", "B": 42}`, + b: `{}`, + wantPatch: `{"A":null, "B":null}`, + }, + { + testName: "change values", + a: `{"A": "test1", "B": 42}`, + b: `{"A": ["test2"], "B": 42}`, + wantPatch: `{"A": ["test2"]}`, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.testName, func(t *testing.T) { + t.Parallel() + + got, err := tfjson.CreateMergePatchFromStrings(testCase.a, testCase.b) + if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { + t.Errorf("CreateMergePatchFromStrings(%s, %s) err %t, want %t", testCase.a, testCase.b, got, want) + } + if err == nil { + if diff := jsoncmp.Diff(got, testCase.wantPatch); diff != "" { + t.Errorf("unexpected diff (+wanted, -got): %s", diff) + } + } + }) + } +} From 4c0adee0a7729889290cf6ee529ff173f86a8e9e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 14 Aug 2025 15:04:30 -0400 Subject: [PATCH 0129/2115] r/aws_cognito_managed_login_branding: Updated settings work in a PATCH model. --- .../cognitoidp/managed_login_branding.go | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index c905622e2bfb..856802d3ca3b 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -29,6 +29,8 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -202,7 +204,25 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou return } - _, err := conn.UpdateManagedLoginBranding(ctx, &input) + // Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api. + oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings) + patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) + + if err != nil { + response.Diagnostics.AddError("creating JSON merge patch", err.Error()) + + return + } + + input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument) + + if err != nil { + response.Diagnostics.AddError("creating Smithy document", err.Error()) + + return + } + + _, err = conn.UpdateManagedLoginBranding(ctx, &input) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("updating Cognito Managed Login Branding (%s)", new.ManagedLoginBrandingID.ValueString()), err.Error()) From 86918450b3cf88ae35cb785ee17f154fba4606a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 14 Aug 2025 15:43:32 -0400 Subject: [PATCH 0130/2115] r/aws_cognito_managed_login_branding: Correct encoding/decoding of 'asset.bytes'. --- .../cognitoidp/managed_login_branding.go | 97 ++++++++++++++++--- 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 856802d3ca3b..cc59f8ebdd10 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -12,12 +12,14 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/document" awstypes "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" "github.com/hashicorp/terraform-plugin-framework-validators/boolvalidator" - "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" + "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" @@ -32,6 +34,7 @@ import ( tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -72,10 +75,6 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou boolvalidator.ExactlyOneOf( path.MatchRoot("settings"), ), - boolvalidator.ConflictsWith( - path.MatchRoot("asset"), - path.MatchRoot("settings"), - ), }, PlanModifiers: []planmodifier.Bool{ boolplanmodifier.UseStateForUnknown(), @@ -89,30 +88,54 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou }, }, Blocks: map[string]schema.Block{ - "asset": schema.ListNestedBlock{ - CustomType: fwtypes.NewListNestedObjectTypeOf[assetTypeModel](ctx), - Validators: []validator.List{ - listvalidator.SizeBetween(0, 40), + "asset": schema.SetNestedBlock{ + CustomType: fwtypes.NewSetNestedObjectTypeOf[assetTypeModel](ctx), + Validators: []validator.Set{ + setvalidator.SizeBetween(0, 40), + }, + PlanModifiers: []planmodifier.Set{ + // The update API allows updating an asset. + // However, if the (`category`, `color`) pair differs from existing ones, + // the API treats the asset as new and adds it accordingly. + // This can result in a mismatch between the Terraform plan and the actual state + // (e.g., the plan contains one asset, but the state contains two or more). + // To preserve declarative behavior, the resource is replaced whenever the `asset` is modified. + setplanmodifier.RequiresReplace(), }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ "bytes": schema.StringAttribute{ Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, "category": schema.StringAttribute{ CustomType: fwtypes.StringEnumType[awstypes.AssetCategoryType](), Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, "color_mode": schema.StringAttribute{ CustomType: fwtypes.StringEnumType[awstypes.ColorSchemeModeType](), Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, "extension": schema.StringAttribute{ CustomType: fwtypes.StringEnumType[awstypes.AssetExtensionType](), Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, names.AttrResourceID: schema.StringAttribute{ Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, }, }, @@ -308,12 +331,12 @@ func findManagedLoginBrandingByTwoPartKey(ctx context.Context, conn *cognitoiden type managedLoginBrandingResourceModel struct { framework.WithRegionModel - Asset fwtypes.ListNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` - ClientID types.String `tfsdk:"client_id"` - ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` - Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` - UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` - UserPoolID types.String `tfsdk:"user_pool_id"` + Asset fwtypes.SetNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` + ClientID types.String `tfsdk:"client_id"` + ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` + Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` + UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` + UserPoolID types.String `tfsdk:"user_pool_id"` } type assetTypeModel struct { @@ -323,3 +346,47 @@ type assetTypeModel struct { Extension fwtypes.StringEnum[awstypes.AssetExtensionType] `tfsdk:"extension"` ResourceID types.String `tfsdk:"resource_id"` } + +var ( + _ fwflex.Expander = assetTypeModel{} + _ fwflex.Flattener = &assetTypeModel{} +) + +func (m assetTypeModel) Expand(ctx context.Context) (any, diag.Diagnostics) { + var diags diag.Diagnostics + r := awstypes.AssetType{ + Category: m.Category.ValueEnum(), + ColorMode: m.ColorMode.ValueEnum(), + Extension: m.Extension.ValueEnum(), + ResourceId: fwflex.StringFromFramework(ctx, m.ResourceID), + } + + if v, err := inttypes.Base64Decode(m.Bytes.ValueString()); err == nil { + r.Bytes = v + } else { + diags.AddError( + "decoding asset bytes", + err.Error(), + ) + + return nil, diags + } + + return &r, diags +} + +func (m *assetTypeModel) Flatten(ctx context.Context, v any) diag.Diagnostics { + var diags diag.Diagnostics + + switch v := v.(type) { + case awstypes.AssetType: + m.Bytes = fwflex.StringValueToFramework(ctx, inttypes.Base64Encode(v.Bytes)) + m.Category = fwtypes.StringEnumValue(v.Category) + m.ColorMode = fwtypes.StringEnumValue(v.ColorMode) + m.Extension = fwtypes.StringEnumValue(v.Extension) + m.ResourceID = fwflex.StringToFramework(ctx, v.ResourceId) + default: + } + + return diags +} From 865169fc92fe84832beb4922542881e6d5dbc43d Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 12:00:58 +0000 Subject: [PATCH 0131/2115] Added the field session_logger_arn --- internal/service/workspacesweb/portal.go | 7 +++++++ website/docs/r/workspacesweb_portal.html.markdown | 1 + 2 files changed, 8 insertions(+) diff --git a/internal/service/workspacesweb/portal.go b/internal/service/workspacesweb/portal.go index 3f6609201602..ca69aa4ef188 100644 --- a/internal/service/workspacesweb/portal.go +++ b/internal/service/workspacesweb/portal.go @@ -162,6 +162,12 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, + "session_logger_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, names.AttrStatusReason: schema.StringAttribute{ Computed: true, PlanModifiers: []planmodifier.String{ @@ -476,6 +482,7 @@ type portalResourceModel struct { PortalEndpoint types.String `tfsdk:"portal_endpoint"` PortalStatus fwtypes.StringEnum[awstypes.PortalStatus] `tfsdk:"portal_status"` RendererType fwtypes.StringEnum[awstypes.RendererType] `tfsdk:"renderer_type"` + SessionLoggerARN types.String `tfsdk:"session_logger_arn"` StatusReason types.String `tfsdk:"status_reason"` Tags tftags.Map `tfsdk:"tags"` TagsAll tftags.Map `tfsdk:"tags_all"` diff --git a/website/docs/r/workspacesweb_portal.html.markdown b/website/docs/r/workspacesweb_portal.html.markdown index 20162cdab8be..62302cbdd205 100644 --- a/website/docs/r/workspacesweb_portal.html.markdown +++ b/website/docs/r/workspacesweb_portal.html.markdown @@ -79,6 +79,7 @@ This resource exports the following attributes in addition to the arguments abov * `portal_endpoint` - Endpoint URL of the portal. * `portal_status` - Status of the portal. * `renderer_type` - Renderer type of the portal. +* `session_logger_arn` - ARN of the session logger associated with the portal. * `status_reason` - Reason for the current status of the portal. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). * `trust_store_arn` - ARN of the trust store associated with the portal. From 129a56b2171cb65d175f0dba69080fc979622cfd Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Mon, 21 Jul 2025 09:47:37 +0000 Subject: [PATCH 0132/2115] Added CRUD functions and test cases. Yet to be tested --- .../service/workspacesweb/exports_test.go | 2 + .../workspacesweb/identity_provider.go | 257 ++ .../identity_provider_tags_gen_test.go | 2224 +++++++++++++++++ .../workspacesweb/identity_provider_test.go | 218 ++ .../workspacesweb/service_package_gen.go | 9 + .../IdentityProvider/tags/main_gen.tf | 26 + .../tagsComputed1/main_gen.tf | 30 + .../tagsComputed2/main_gen.tf | 41 + .../tags_defaults/main_gen.tf | 37 + .../IdentityProvider/tags_ignore/main_gen.tf | 46 + .../testdata/tmpl/identity_provider_tags.gtpl | 16 + ...kspacesweb_identity_provider.html.markdown | 69 + 12 files changed, 2975 insertions(+) create mode 100644 internal/service/workspacesweb/identity_provider.go create mode 100644 internal/service/workspacesweb/identity_provider_tags_gen_test.go create mode 100644 internal/service/workspacesweb/identity_provider_test.go create mode 100644 internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl create mode 100644 website/docs/r/workspacesweb_identity_provider.html.markdown diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 15612376d031..c98aa444d371 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -7,6 +7,7 @@ package workspacesweb var ( ResourceBrowserSettings = newBrowserSettingsResource ResourceDataProtectionSettings = newDataProtectionSettingsResource + ResourceIdentityProvider = newIdentityProviderResource ResourceIPAccessSettings = newIPAccessSettingsResource ResourceNetworkSettings = newNetworkSettingsResource ResourcePortal = newPortalResource @@ -16,6 +17,7 @@ var ( FindBrowserSettingsByARN = findBrowserSettingsByARN FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN + FindIdentityProviderByARN = findIdentityProviderByARN FindIPAccessSettingsByARN = findIPAccessSettingsByARN FindNetworkSettingsByARN = findNetworkSettingsByARN FindPortalByARN = findPortalByARN diff --git a/internal/service/workspacesweb/identity_provider.go b/internal/service/workspacesweb/identity_provider.go new file mode 100644 index 000000000000..a55214477889 --- /dev/null +++ b/internal/service/workspacesweb/identity_provider.go @@ -0,0 +1,257 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @FrameworkResource("aws_workspacesweb_identity_provider", name="Identity Provider") +// @Tags(identifierAttribute="identity_provider_arn") +// @Testing(tagsTest=true) +// @Testing(generator=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.IdentityProvider") +// @Testing(importStateIdAttribute="identity_provider_arn") +func newIdentityProviderResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &identityProviderResource{}, nil +} + +const ( + ResNameIdentityProvider = "Identity Provider" +) + +type identityProviderResource struct { + framework.ResourceWithModel[identityProviderResourceModel] +} + +func (r *identityProviderResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "identity_provider_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + "identity_provider_details": schema.MapAttribute{ + CustomType: fwtypes.MapOfStringType, + ElementType: types.StringType, + Required: true, + }, + "identity_provider_name": schema.StringAttribute{ + Required: true, + }, + "identity_provider_type": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.IdentityProviderType](), + Required: true, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + }, + } +} + +func (r *identityProviderResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data identityProviderResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + var input workspacesweb.CreateIdentityProviderInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { + return + } + + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.Tags = getTagsIn(ctx) + + output, err := conn.CreateIdentityProvider(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameIdentityProvider), err.Error()) + return + } + + data.IdentityProviderARN = fwflex.StringToFramework(ctx, output.IdentityProviderArn) + + // Get the identity provider details to populate other fields + identityProvider, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, identityProvider, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *identityProviderResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data identityProviderResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + output, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *identityProviderResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new, old identityProviderResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + if !new.IdentityProviderDetails.Equal(old.IdentityProviderDetails) || + !new.IdentityProviderName.Equal(old.IdentityProviderName) || + !new.IdentityProviderType.Equal(old.IdentityProviderType) { + var input workspacesweb.UpdateIdentityProviderInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { + return + } + + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + + output, err := conn.UpdateIdentityProvider(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb %s (%s)", ResNameIdentityProvider, new.IdentityProviderARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output.IdentityProvider, &new)...) + if response.Diagnostics.HasError() { + return + } + } + + response.Diagnostics.Append(response.State.Set(ctx, &new)...) +} + +func (r *identityProviderResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data identityProviderResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DeleteIdentityProviderInput{ + IdentityProviderArn: aws.String(data.IdentityProviderARN.ValueString()), + } + _, err := conn.DeleteIdentityProvider(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + return + } +} + +func (r *identityProviderResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("identity_provider_arn"), request, response) +} + +func findIdentityProviderByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.IdentityProvider, error) { + input := workspacesweb.GetIdentityProviderInput{ + IdentityProviderArn: &arn, + } + output, err := conn.GetIdentityProvider(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.IdentityProvider == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.IdentityProvider, nil +} + +type identityProviderResourceModel struct { + framework.WithRegionModel + IdentityProviderARN types.String `tfsdk:"identity_provider_arn"` + IdentityProviderDetails fwtypes.MapOfString `tfsdk:"identity_provider_details"` + IdentityProviderName types.String `tfsdk:"identity_provider_name"` + IdentityProviderType fwtypes.StringEnum[awstypes.IdentityProviderType] `tfsdk:"identity_provider_type"` + PortalARN types.String `tfsdk:"portal_arn"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` +} diff --git a/internal/service/workspacesweb/identity_provider_tags_gen_test.go b/internal/service/workspacesweb/identity_provider_tags_gen_test.go new file mode 100644 index 000000000000..ef91874448e6 --- /dev/null +++ b/internal/service/workspacesweb/identity_provider_tags_gen_test.go @@ -0,0 +1,2224 @@ +// Code generated by internal/generate/tagstests/main.go; DO NOT EDIT. + +package workspacesweb_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebIdentityProvider_tags(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_null(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_EmptyMap(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_AddOnUpdate(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_providerOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nonOverlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_overlapping(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToProviderOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToResourceOnly(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + ImportStateVerifyIgnore: []string{ + "tags.resourcekey1", // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed2/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey(acctest.CtKey1)), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tagsComputed1/"), + ConfigVariables: config.Variables{ + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 2: Update ignored tag only + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Again), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { + ctx := acctest.Context(t) + var v types.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 2: Update ignored tag + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/IdentityProvider/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} diff --git a/internal/service/workspacesweb/identity_provider_test.go b/internal/service/workspacesweb/identity_provider_test.go new file mode 100644 index 000000000000..9ad26e4c43f2 --- /dev/null +++ b/internal/service/workspacesweb/identity_provider_test.go @@ -0,0 +1,218 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebIdentityProvider_basic(t *testing.T) { + ctx := acctest.Context(t) + var identityProvider awstypes.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIdentityProviderConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeSaml)), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "identity_provider_arn", "workspaces-web", regexache.MustCompile(`identityProvider/.+$`)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_disappears(t *testing.T) { + ctx := acctest.Context(t) + var identityProvider awstypes.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIdentityProviderConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceIdentityProvider, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccWorkSpacesWebIdentityProvider_update(t *testing.T) { + ctx := acctest.Context(t) + var identityProvider awstypes.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIdentityProviderConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeSaml)), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata"), + ), + }, + { + Config: testAccIdentityProviderConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test-updated"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeOidc)), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata-updated"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_id", "test-client-id"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_secret", "test-client-secret"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.oidc_issuer", "https://example.com/issuer"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + +func testAccCheckIdentityProviderDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_identity_provider" { + continue + } + + _, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + return fmt.Errorf("WorkSpaces Web Identity Provider %s still exists", rs.Primary.Attributes["identity_provider_arn"]) + } + + return nil + } +} + +func testAccCheckIdentityProviderExists(ctx context.Context, n string, v *awstypes.IdentityProvider) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) + + if err != nil { + return err + } + + *v = *output + + return nil + } +} + +func testAccIdentityProviderConfig_basic() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } +} +` +} + +func testAccIdentityProviderConfig_updated() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test-updated" + identity_provider_type = "OIDC" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata-updated" + client_id = "test-client-id" + client_secret = "test-client-secret" + oidc_issuer = "https://example.com/issuer" + } +} +` +} diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 35b470746645..5b18a6e274aa 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -42,6 +42,15 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newIdentityProviderResource, + TypeName: "aws_workspacesweb_identity_provider", + Name: "Identity Provider", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: "identity_provider_arn", + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newIPAccessSettingsResource, TypeName: "aws_workspacesweb_ip_access_settings", diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf new file mode 100644 index 000000000000..2fdffc5ee29e --- /dev/null +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + + tags = var.resource_tags + +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf new file mode 100644 index 000000000000..775b01dc18b7 --- /dev/null +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf @@ -0,0 +1,30 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + + tags = { + (var.unknownTagKey) = null_resource.test.id + } + +} + +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf new file mode 100644 index 000000000000..35d8681d3d65 --- /dev/null +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf @@ -0,0 +1,41 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } + +} + +resource "null_resource" "test" {} + +variable "unknownTagKey" { + type = string + nullable = false +} + +variable "knownTagKey" { + type = string + nullable = false +} + +variable "knownTagValue" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf new file mode 100644 index 000000000000..0e1bb2708be6 --- /dev/null +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf @@ -0,0 +1,37 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } +} + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + + tags = var.resource_tags + +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf new file mode 100644 index 000000000000..2a94d43f7531 --- /dev/null +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf @@ -0,0 +1,46 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } + ignore_tags { + keys = var.ignore_tag_keys + } +} + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + + tags = var.resource_tags + +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = true + default = null +} + +variable "ignore_tag_keys" { + type = set(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl new file mode 100644 index 000000000000..f4e091cce5fa --- /dev/null +++ b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl @@ -0,0 +1,16 @@ +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.test.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } + +{{- template "tags" . }} + +} diff --git a/website/docs/r/workspacesweb_identity_provider.html.markdown b/website/docs/r/workspacesweb_identity_provider.html.markdown new file mode 100644 index 000000000000..860e7b765384 --- /dev/null +++ b/website/docs/r/workspacesweb_identity_provider.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_identity_provider" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Identity Provider. +--- +` +# Resource: aws_workspacesweb_identity_provider + +Terraform resource for managing an AWS WorkSpaces Web Identity Provider. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_identity_provider" "example" { +} +``` + +## Argument Reference + +The following arguments are required: + +* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +The following arguments are optional: + +* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Identity Provider. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `60m`) +* `update` - (Default `180m`) +* `delete` - (Default `90m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Identity Provider using the `example_id_arg`. For example: + +```terraform +import { + to = aws_workspacesweb_identity_provider.example + id = "identity_provider-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Identity Provider using the `example_id_arg`. For example: + +```console +% terraform import aws_workspacesweb_identity_provider.example identity_provider-id-12345678 +``` From 3851074abd4e689a37b989378a233ea79ae7894b Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 11:53:33 +0000 Subject: [PATCH 0133/2115] Basic test worked --- .../workspacesweb/identity_provider.go | 42 +++++-- .../workspacesweb/identity_provider_test.go | 63 +++++++++-- .../testfixtures/saml-metadata.xml | 20 ++++ ...kspacesweb_identity_provider.html.markdown | 106 +++++++++++++----- 4 files changed, 187 insertions(+), 44 deletions(-) create mode 100644 internal/service/workspacesweb/testfixtures/saml-metadata.xml diff --git a/internal/service/workspacesweb/identity_provider.go b/internal/service/workspacesweb/identity_provider.go index a55214477889..1ad0b3a6d1f7 100644 --- a/internal/service/workspacesweb/identity_provider.go +++ b/internal/service/workspacesweb/identity_provider.go @@ -6,6 +6,7 @@ package workspacesweb import ( "context" "fmt" + "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" @@ -109,12 +110,14 @@ func (r *identityProviderResource) Create(ctx context.Context, request resource. data.IdentityProviderARN = fwflex.StringToFramework(ctx, output.IdentityProviderArn) // Get the identity provider details to populate other fields - identityProvider, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) + identityProvider, portalARN, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) return } + data.PortalARN = types.StringValue(portalARN) + response.Diagnostics.Append(fwflex.Flatten(ctx, identityProvider, &data)...) if response.Diagnostics.HasError() { return @@ -132,7 +135,7 @@ func (r *identityProviderResource) Read(ctx context.Context, request resource.Re conn := r.Meta().WorkSpacesWebClient(ctx) - output, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) + output, portalARN, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) if tfretry.NotFound(err) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) response.State.RemoveResource(ctx) @@ -144,6 +147,7 @@ func (r *identityProviderResource) Read(ctx context.Context, request resource.Re return } + data.PortalARN = types.StringValue(portalARN) response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) if response.Diagnostics.HasError() { return @@ -221,28 +225,52 @@ func (r *identityProviderResource) ImportState(ctx context.Context, request reso resource.ImportStatePassthroughID(ctx, path.Root("identity_provider_arn"), request, response) } -func findIdentityProviderByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.IdentityProvider, error) { +func portalARNFromIdentityProviderARN(identityProviderARN string) (string, error) { + // Identity Provider ARN format: arn:{PARTITION}:workspaces-web:{REGION}:{ACCOUNT_ID}:identityProvider/{PORTAL_ID}/{IDP_RESOURCE_ID} + // Portal ARN format: arn:{PARTITION}:workspaces-web:{REGION}:{ACCOUNT_ID}:portal/{PORTAL_ID} + parts := strings.Split(identityProviderARN, ":") + if len(parts) != 6 { + return "", fmt.Errorf("invalid identity provider ARN format: %s", identityProviderARN) + } + + resourcePart := parts[5] // identityProvider/{PORTAL_ID}/{IDP_RESOURCE_ID} + resourceParts := strings.Split(resourcePart, "/") + if len(resourceParts) != 3 || resourceParts[0] != "identityProvider" { + return "", fmt.Errorf("invalid identity provider ARN resource format: %s", identityProviderARN) + } + + portalID := resourceParts[1] + portalARN := fmt.Sprintf("%s:%s:%s:%s:%s:portal/%s", parts[0], parts[1], parts[2], parts[3], parts[4], portalID) + return portalARN, nil +} + +func findIdentityProviderByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.IdentityProvider, string, error) { input := workspacesweb.GetIdentityProviderInput{ IdentityProviderArn: &arn, } output, err := conn.GetIdentityProvider(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return nil, &retry.NotFoundError{ + return nil, "", &retry.NotFoundError{ LastError: err, LastRequest: input, } } if err != nil { - return nil, err + return nil, "", err } if output == nil || output.IdentityProvider == nil { - return nil, tfresource.NewEmptyResultError(input) + return nil, "", tfresource.NewEmptyResultError(input) + } + + portalARN, err := portalARNFromIdentityProviderARN(arn) + if err != nil { + return nil, "", err } - return output.IdentityProvider, nil + return output.IdentityProvider, portalARN, nil } type identityProviderResourceModel struct { diff --git a/internal/service/workspacesweb/identity_provider_test.go b/internal/service/workspacesweb/identity_provider_test.go index 9ad26e4c43f2..34d5152946b0 100644 --- a/internal/service/workspacesweb/identity_provider_test.go +++ b/internal/service/workspacesweb/identity_provider_test.go @@ -14,8 +14,8 @@ import ( "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/retry" tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -41,7 +41,7 @@ func TestAccWorkSpacesWebIdentityProvider_basic(t *testing.T) { testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test"), resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeSaml)), - resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata"), + resource.TestCheckResourceAttrSet(resourceName, "identity_provider_details.MetadataFile"), resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "identity_provider_arn", "workspaces-web", regexache.MustCompile(`identityProvider/.+$`)), ), @@ -84,6 +84,45 @@ func TestAccWorkSpacesWebIdentityProvider_disappears(t *testing.T) { }) } +func TestAccWorkSpacesWebIdentityProvider_oidc_basic(t *testing.T) { + ctx := acctest.Context(t) + var identityProvider awstypes.IdentityProvider + resourceName := "aws_workspacesweb_identity_provider.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIdentityProviderDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIdentityProviderConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), + resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test-updated"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeOidc)), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_id", "test-client-id"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_secret", "test-client-secret"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.oidc_issuer", "https://accounts.google.com"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.authorize_scopes", "openid, email"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.attributes_request_method", "POST"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "identity_provider_arn"), + ImportStateVerifyIdentifierAttribute: "identity_provider_arn", + }, + }, + }) +} + func TestAccWorkSpacesWebIdentityProvider_update(t *testing.T) { ctx := acctest.Context(t) var identityProvider awstypes.IdentityProvider @@ -105,7 +144,7 @@ func TestAccWorkSpacesWebIdentityProvider_update(t *testing.T) { testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test"), resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeSaml)), - resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata"), + resource.TestCheckResourceAttrSet(resourceName, "identity_provider_details.MetadataFile"), ), }, { @@ -114,10 +153,11 @@ func TestAccWorkSpacesWebIdentityProvider_update(t *testing.T) { testAccCheckIdentityProviderExists(ctx, resourceName, &identityProvider), resource.TestCheckResourceAttr(resourceName, "identity_provider_name", "test-updated"), resource.TestCheckResourceAttr(resourceName, "identity_provider_type", string(awstypes.IdentityProviderTypeOidc)), - resource.TestCheckResourceAttr(resourceName, "identity_provider_details.MetadataURL", "https://example.com/metadata-updated"), resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_id", "test-client-id"), resource.TestCheckResourceAttr(resourceName, "identity_provider_details.client_secret", "test-client-secret"), - resource.TestCheckResourceAttr(resourceName, "identity_provider_details.oidc_issuer", "https://example.com/issuer"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.oidc_issuer", "https://accounts.google.com"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.authorize_scopes", "openid, email"), + resource.TestCheckResourceAttr(resourceName, "identity_provider_details.attributes_request_method", "POST"), ), }, { @@ -140,9 +180,9 @@ func testAccCheckIdentityProviderDestroy(ctx context.Context) resource.TestCheck continue } - _, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) + _, _, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) - if tfresource.NotFound(err) { + if retry.NotFound(err) { continue } @@ -166,7 +206,7 @@ func testAccCheckIdentityProviderExists(ctx context.Context, n string, v *awstyp conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) - output, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) + output, _, err := tfworkspacesweb.FindIdentityProviderByARN(ctx, conn, rs.Primary.Attributes["identity_provider_arn"]) if err != nil { return err @@ -190,7 +230,7 @@ resource "aws_workspacesweb_identity_provider" "test" { portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } } ` @@ -208,10 +248,11 @@ resource "aws_workspacesweb_identity_provider" "test" { portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata-updated" client_id = "test-client-id" client_secret = "test-client-secret" - oidc_issuer = "https://example.com/issuer" + oidc_issuer = "https://accounts.google.com" + attributes_request_method = "POST" + authorize_scopes = "openid, email" } } ` diff --git a/internal/service/workspacesweb/testfixtures/saml-metadata.xml b/internal/service/workspacesweb/testfixtures/saml-metadata.xml new file mode 100644 index 000000000000..f961397cf528 --- /dev/null +++ b/internal/service/workspacesweb/testfixtures/saml-metadata.xml @@ -0,0 +1,20 @@ + + + + + + + + + MIICfjCCAeegAwIBAgIBADANBgkqhkiG9w0BAQ0FADBbMQswCQYDVQQGEwJ1czELMAkGA1UECAwCQ0ExEjAQBgNVBAoMCVRlcnJhZm9ybTErMCkGA1UEAwwidGVycmFmb3JtLWRldi1lZC5teS5zYWxlc2ZvcmNlLmNvbTAgFw0yMDA4MjkxNDQ4MzlaGA8yMDcwMDgxNzE0NDgzOVowWzELMAkGA1UEBhMCdXMxCzAJBgNVBAgMAkNBMRIwEAYDVQQKDAlUZXJyYWZvcm0xKzApBgNVBAMMInRlcnJhZm9ybS1kZXYtZWQubXkuc2FsZXNmb3JjZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOxUTzEKdivVjfZ/BERGpX/ZWQsBKHut17dQTKW/3jox1N9EJ3ULj9qEDen6zQ74Ce8hSEkrG7MP9mcP1oEhQZSca5tTAop1GejJG+bfF4v6cXM9pqHlllrYrmXMfESiahqhBhE8VvoGJkvp393TcB1lX+WxO8Q74demTrQn5tgvAgMBAAGjUDBOMB0GA1UdDgQWBBREKZt4Av70WKQE4aLD2tvbSLnBlzAfBgNVHSMEGDAWgBREKZt4Av70WKQE4aLD2tvbSLnBlzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4GBACxeC29WMGqeOlQF4JWwsYwIC82SUaZvMDqjAm9ieIrAZRH6J6Cu40c/rvsUGUjQ9logKX15RAyI7Rn0jBUgopRkNL71HyyM7ug4qN5An05VmKQWIbVfxkNVB2Ipb/ICMc5UE38G4y4VbANZFvbFbkVq6OAP2GGNl22o/XSnhFY8 + + + + urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified + + + + diff --git a/website/docs/r/workspacesweb_identity_provider.html.markdown b/website/docs/r/workspacesweb_identity_provider.html.markdown index 860e7b765384..69efa6f990fa 100644 --- a/website/docs/r/workspacesweb_identity_provider.html.markdown +++ b/website/docs/r/workspacesweb_identity_provider.html.markdown @@ -5,24 +5,52 @@ page_title: "AWS: aws_workspacesweb_identity_provider" description: |- Terraform resource for managing an AWS WorkSpaces Web Identity Provider. --- -` + # Resource: aws_workspacesweb_identity_provider Terraform resource for managing an AWS WorkSpaces Web Identity Provider. ## Example Usage -### Basic Usage +### Basic Usage with SAML + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_identity_provider" "example" { + identity_provider_name = "example-saml" + identity_provider_type = "SAML" + portal_arn = aws_workspacesweb_portal.example.portal_arn + + identity_provider_details = { + MetadataURL = "https://example.com/metadata" + } +} +``` + +### OIDC Identity Provider ```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + resource "aws_workspacesweb_identity_provider" "example" { + identity_provider_name = "example-oidc" + identity_provider_type = "OIDC" + portal_arn = aws_workspacesweb_portal.example.portal_arn + + identity_provider_details = { + client_id = "example-client-id" + client_secret = "example-client-secret" + oidc_issuer = "https://example.com/issuer" + } + + tags = { + Name = "example-identity-provider" + } } ``` @@ -30,40 +58,66 @@ resource "aws_workspacesweb_identity_provider" "example" { The following arguments are required: -* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `identity_provider_details` - (Required) Identity provider details. The following list describes the provider detail keys for each identity provider type: + * For Google and Login with Amazon: + * `client_id` + * `client_secret` + * `authorize_scopes` + * For Facebook: + * `client_id` + * `client_secret` + * `authorize_scopes` + * `api_version` + * For Sign in with Apple: + * `client_id` + * `team_id` + * `key_id` + * `private_key` + * `authorize_scopes` + * For OIDC providers: + * `client_id` + * `client_secret` + * `attributes_request_method` + * `oidc_issuer` + * `authorize_scopes` + * `authorize_url` if not available from discovery URL specified by `oidc_issuer` key + * `token_url` if not available from discovery URL specified by `oidc_issuer` key + * `attributes_url` if not available from discovery URL specified by `oidc_issuer` key + * `jwks_uri` if not available from discovery URL specified by `oidc_issuer` key + * For SAML providers: + * `MetadataFile` OR `MetadataURL` + * `IDPSignout` (boolean) optional + * `IDPInit` (boolean) optional + * `RequestSigningAlgorithm` (string) optional - Only accepts rsa-sha256 + * `EncryptedResponses` (boolean) optional +* `identity_provider_name` - (Required) Identity provider name. +* `identity_provider_type` - (Required) Identity provider type. Valid values: `SAML`, `Facebook`, `Google`, `LoginWithAmazon`, `SignInWithApple`, `OIDC`. +* `portal_arn` - (Required) ARN of the web portal. Forces replacement if changed. The following arguments are optional: -* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ## Attribute Reference This resource exports the following attributes in addition to the arguments above: -* `arn` - ARN of the Identity Provider. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. -* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. - -## Timeouts - -[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): - -* `create` - (Default `60m`) -* `update` - (Default `180m`) -* `delete` - (Default `90m`) +* `identity_provider_arn` - ARN of the identity provider. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Identity Provider using the `example_id_arg`. For example: +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Identity Provider using the `identity_provider_arn`. For example: ```terraform import { to = aws_workspacesweb_identity_provider.example - id = "identity_provider-id-12345678" + id = "arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012" } ``` -Using `terraform import`, import WorkSpaces Web Identity Provider using the `example_id_arg`. For example: +Using `terraform import`, import WorkSpaces Web Identity Provider using the `identity_provider_arn`. For example: ```console -% terraform import aws_workspacesweb_identity_provider.example identity_provider-id-12345678 -``` +% terraform import aws_workspacesweb_identity_provider.example arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012 +``` \ No newline at end of file From 06548d7cd8235061253c407103f1d7868e5aa113 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 12:15:01 +0000 Subject: [PATCH 0134/2115] Tested all other test cases --- .../workspacesweb/identity_provider_test.go | 14 +++++++------- .../testdata/IdentityProvider/tags/main_gen.tf | 4 ++-- .../IdentityProvider/tagsComputed1/main_gen.tf | 4 ++-- .../IdentityProvider/tagsComputed2/main_gen.tf | 4 ++-- .../IdentityProvider/tags_defaults/main_gen.tf | 4 ++-- .../IdentityProvider/tags_ignore/main_gen.tf | 4 ++-- .../testdata/tmpl/identity_provider_tags.gtpl | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/service/workspacesweb/identity_provider_test.go b/internal/service/workspacesweb/identity_provider_test.go index 34d5152946b0..308d52b38391 100644 --- a/internal/service/workspacesweb/identity_provider_test.go +++ b/internal/service/workspacesweb/identity_provider_test.go @@ -227,7 +227,7 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { MetadataFile = file("./testfixtures/saml-metadata.xml") @@ -245,14 +245,14 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test-updated" identity_provider_type = "OIDC" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - client_id = "test-client-id" - client_secret = "test-client-secret" - oidc_issuer = "https://accounts.google.com" - attributes_request_method = "POST" - authorize_scopes = "openid, email" + client_id = "test-client-id" + client_secret = "test-client-secret" + oidc_issuer = "https://accounts.google.com" + attributes_request_method = "POST" + authorize_scopes = "openid, email" } } ` diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf index 2fdffc5ee29e..315a53ab052b 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf @@ -8,10 +8,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } tags = var.resource_tags diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf index 775b01dc18b7..44c938101466 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf @@ -10,10 +10,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } tags = { diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf index 35d8681d3d65..6bfddc53109a 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf @@ -10,10 +10,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } tags = { diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf index 0e1bb2708be6..37c291796db0 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf @@ -14,10 +14,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } tags = var.resource_tags diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf index 2a94d43f7531..bb9a08e01ef9 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf @@ -17,10 +17,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } tags = var.resource_tags diff --git a/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl index f4e091cce5fa..e0370c766c82 100644 --- a/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl @@ -5,10 +5,10 @@ resource "aws_workspacesweb_portal" "test" { resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.test.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - MetadataURL = "https://example.com/metadata" + MetadataFile = file("./testfixtures/saml-metadata.xml") } {{- template "tags" . }} From 516bd69137a47258c1d3528916fc06255a782e36 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 12:51:11 +0000 Subject: [PATCH 0135/2115] Cleared semgrep and terrafmt lint findings in markdown --- .../workspacesweb/identity_provider.go | 2 +- ...kspacesweb_identity_provider.html.markdown | 88 +++++++++---------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/internal/service/workspacesweb/identity_provider.go b/internal/service/workspacesweb/identity_provider.go index 1ad0b3a6d1f7..ed2436b32bcd 100644 --- a/internal/service/workspacesweb/identity_provider.go +++ b/internal/service/workspacesweb/identity_provider.go @@ -207,7 +207,7 @@ func (r *identityProviderResource) Delete(ctx context.Context, request resource. conn := r.Meta().WorkSpacesWebClient(ctx) input := workspacesweb.DeleteIdentityProviderInput{ - IdentityProviderArn: aws.String(data.IdentityProviderARN.ValueString()), + IdentityProviderArn: data.IdentityProviderARN.ValueStringPointer(), } _, err := conn.DeleteIdentityProvider(ctx, &input) diff --git a/website/docs/r/workspacesweb_identity_provider.html.markdown b/website/docs/r/workspacesweb_identity_provider.html.markdown index 69efa6f990fa..f184c54ac3ba 100644 --- a/website/docs/r/workspacesweb_identity_provider.html.markdown +++ b/website/docs/r/workspacesweb_identity_provider.html.markdown @@ -22,7 +22,7 @@ resource "aws_workspacesweb_portal" "example" { resource "aws_workspacesweb_identity_provider" "example" { identity_provider_name = "example-saml" identity_provider_type = "SAML" - portal_arn = aws_workspacesweb_portal.example.portal_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn identity_provider_details = { MetadataURL = "https://example.com/metadata" @@ -33,23 +33,21 @@ resource "aws_workspacesweb_identity_provider" "example" { ### OIDC Identity Provider ```terraform -resource "aws_workspacesweb_portal" "example" { - display_name = "example" +resource "aws_workspacesweb_portal" "test" { + display_name = "test" } -resource "aws_workspacesweb_identity_provider" "example" { - identity_provider_name = "example-oidc" +resource "aws_workspacesweb_identity_provider" "test" { + identity_provider_name = "test-updated" identity_provider_type = "OIDC" - portal_arn = aws_workspacesweb_portal.example.portal_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn identity_provider_details = { - client_id = "example-client-id" - client_secret = "example-client-secret" - oidc_issuer = "https://example.com/issuer" - } - - tags = { - Name = "example-identity-provider" + client_id = "test-client-id" + client_secret = "test-client-secret" + oidc_issuer = "https://accounts.google.com" + attributes_request_method = "POST" + authorize_scopes = "openid, email" } } ``` @@ -59,37 +57,37 @@ resource "aws_workspacesweb_identity_provider" "example" { The following arguments are required: * `identity_provider_details` - (Required) Identity provider details. The following list describes the provider detail keys for each identity provider type: - * For Google and Login with Amazon: - * `client_id` - * `client_secret` - * `authorize_scopes` - * For Facebook: - * `client_id` - * `client_secret` - * `authorize_scopes` - * `api_version` - * For Sign in with Apple: - * `client_id` - * `team_id` - * `key_id` - * `private_key` - * `authorize_scopes` - * For OIDC providers: - * `client_id` - * `client_secret` - * `attributes_request_method` - * `oidc_issuer` - * `authorize_scopes` - * `authorize_url` if not available from discovery URL specified by `oidc_issuer` key - * `token_url` if not available from discovery URL specified by `oidc_issuer` key - * `attributes_url` if not available from discovery URL specified by `oidc_issuer` key - * `jwks_uri` if not available from discovery URL specified by `oidc_issuer` key - * For SAML providers: - * `MetadataFile` OR `MetadataURL` - * `IDPSignout` (boolean) optional - * `IDPInit` (boolean) optional - * `RequestSigningAlgorithm` (string) optional - Only accepts rsa-sha256 - * `EncryptedResponses` (boolean) optional + * For Google and Login with Amazon: + * `client_id` + * `client_secret` + * `authorize_scopes` + * For Facebook: + * `client_id` + * `client_secret` + * `authorize_scopes` + * `api_version` + * For Sign in with Apple: + * `client_id` + * `team_id` + * `key_id` + * `private_key` + * `authorize_scopes` + * For OIDC providers: + * `client_id` + * `client_secret` + * `attributes_request_method` + * `oidc_issuer` + * `authorize_scopes` + * `authorize_url` if not available from discovery URL specified by `oidc_issuer` key + * `token_url` if not available from discovery URL specified by `oidc_issuer` key + * `attributes_url` if not available from discovery URL specified by `oidc_issuer` key + * `jwks_uri` if not available from discovery URL specified by `oidc_issuer` key + * For SAML providers: + * `MetadataFile` OR `MetadataURL` + * `IDPSignout` (boolean) optional + * `IDPInit` (boolean) optional + * `RequestSigningAlgorithm` (string) optional - Only accepts rsa-sha256 + * `EncryptedResponses` (boolean) optional * `identity_provider_name` - (Required) Identity provider name. * `identity_provider_type` - (Required) Identity provider type. Valid values: `SAML`, `Facebook`, `Google`, `LoginWithAmazon`, `SignInWithApple`, `OIDC`. * `portal_arn` - (Required) ARN of the web portal. Forces replacement if changed. @@ -120,4 +118,4 @@ Using `terraform import`, import WorkSpaces Web Identity Provider using the `ide ```console % terraform import aws_workspacesweb_identity_provider.example arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012 -``` \ No newline at end of file +``` From 300a5d49870afa98d9d413c68f25c8e5b1d55690 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 13:28:01 +0000 Subject: [PATCH 0136/2115] Added changelog entry and optional region parameter to the markdown file --- .changelog/43729.txt | 3 +++ website/docs/r/workspacesweb_identity_provider.html.markdown | 1 + 2 files changed, 4 insertions(+) create mode 100644 .changelog/43729.txt diff --git a/.changelog/43729.txt b/.changelog/43729.txt new file mode 100644 index 000000000000..143f37af70d8 --- /dev/null +++ b/.changelog/43729.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_identity_provider +``` \ No newline at end of file diff --git a/website/docs/r/workspacesweb_identity_provider.html.markdown b/website/docs/r/workspacesweb_identity_provider.html.markdown index f184c54ac3ba..a5a986db914b 100644 --- a/website/docs/r/workspacesweb_identity_provider.html.markdown +++ b/website/docs/r/workspacesweb_identity_provider.html.markdown @@ -94,6 +94,7 @@ The following arguments are required: The following arguments are optional: +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ## Attribute Reference From fc65bb191f81c170b7947f02c8aa555575662a97 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Mon, 11 Aug 2025 10:01:28 +0000 Subject: [PATCH 0137/2115] Re-ran make gen --- .../identity_provider_tags_gen_test.go | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/internal/service/workspacesweb/identity_provider_tags_gen_test.go b/internal/service/workspacesweb/identity_provider_tags_gen_test.go index ef91874448e6..ac27d02aba67 100644 --- a/internal/service/workspacesweb/identity_provider_tags_gen_test.go +++ b/internal/service/workspacesweb/identity_provider_tags_gen_test.go @@ -18,6 +18,7 @@ import ( func TestAccWorkSpacesWebIdentityProvider_tags(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -199,6 +200,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags(t *testing.T) { func TestAccWorkSpacesWebIdentityProvider_tags_null(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -260,6 +262,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_null(t *testing.T) { func TestAccWorkSpacesWebIdentityProvider_tags_EmptyMap(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -309,6 +312,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_EmptyMap(t *testing.T) { func TestAccWorkSpacesWebIdentityProvider_tags_AddOnUpdate(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -387,6 +391,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_AddOnUpdate(t *testing.T) { func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -476,6 +481,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnCreate(t *testing.T) { func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -613,6 +619,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Add(t *testing. func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -701,6 +708,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_EmptyTag_OnUpdate_Replace(t *test func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_providerOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -881,6 +889,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_providerOnly(t *testi func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nonOverlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1040,6 +1049,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nonOverlapping(t *tes func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_overlapping(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1215,6 +1225,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_overlapping(t *testin func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1303,6 +1314,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToProviderOnly( func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1390,6 +1402,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_updateToResourceOnly( func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1455,6 +1468,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyResourceTag(t *t func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1512,6 +1526,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_emptyProviderOnlyTag( func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1580,6 +1595,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullOverlappingResour func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1650,6 +1666,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_DefaultTags_nullNonOverlappingRes func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1704,6 +1721,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnCreate(t *testing.T func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1799,6 +1817,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Add(t *testi func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -1884,6 +1903,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_ComputedTag_OnUpdate_Replace(t *t func TestAccWorkSpacesWebIdentityProvider_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" @@ -2042,6 +2062,7 @@ func TestAccWorkSpacesWebIdentityProvider_tags_IgnoreTags_Overlap_DefaultTag(t * func TestAccWorkSpacesWebIdentityProvider_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v types.IdentityProvider resourceName := "aws_workspacesweb_identity_provider.test" From 606284da383bdd6e489cd38db1b57c60bdf07545 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 16:35:17 +0000 Subject: [PATCH 0138/2115] Added resource browser_settings_association --- .../browser_settings_association.go | 177 ++++++++++++++ .../browser_settings_association_test.go | 224 ++++++++++++++++++ .../workspacesweb/service_package_gen.go | 6 + ...browser_settings_association.html.markdown | 72 ++++++ 4 files changed, 479 insertions(+) create mode 100644 internal/service/workspacesweb/browser_settings_association.go create mode 100644 internal/service/workspacesweb/browser_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_browser_settings_association.html.markdown diff --git a/internal/service/workspacesweb/browser_settings_association.go b/internal/service/workspacesweb/browser_settings_association.go new file mode 100644 index 000000000000..3fb96251a1c5 --- /dev/null +++ b/internal/service/workspacesweb/browser_settings_association.go @@ -0,0 +1,177 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_browser_settings_association", name="Browser Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.BrowserSettings") +// @Testing(importStateIdFunc="testAccBrowserSettingsAssociationImportStateIdFunc)" +func newBrowserSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &browserSettingsAssociationResource{}, nil +} + +const ( + ResNameBrowserSettingsAssociation = "Browser Settings Association" +) + +type browserSettingsAssociationResource struct { + framework.ResourceWithModel[browserSettingsAssociationResourceModel] +} + +func (r *browserSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "browser_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *browserSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data browserSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateBrowserSettingsInput{ + BrowserSettingsArn: data.BrowserSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateBrowserSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameBrowserSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *browserSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data browserSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the browser settings and checking associated portals + output, err := findBrowserSettingsByARN(ctx, conn, data.BrowserSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameBrowserSettingsAssociation, data.BrowserSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + found := false + for _, portalARN := range output.AssociatedPortalArns { + if portalARN == data.PortalARN.ValueString() { + found = true + break + } + } + + if !found { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *browserSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *browserSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data browserSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateBrowserSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateBrowserSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameBrowserSettingsAssociation, data.BrowserSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *browserSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + browserSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, browserSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: function_name,qualifier. Got: %q", request.ID), + ) + return + } + browserSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("browser_settings_arn"), browserSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type browserSettingsAssociationResourceModel struct { + framework.WithRegionModel + BrowserSettingsARN types.String `tfsdk:"browser_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/browser_settings_association_test.go b/internal/service/workspacesweb/browser_settings_association_test.go new file mode 100644 index 000000000000..42c6ccfa4bd3 --- /dev/null +++ b/internal/service/workspacesweb/browser_settings_association_test.go @@ -0,0 +1,224 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebBrowserSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var browserSettings awstypes.BrowserSettings + resourceName := "aws_workspacesweb_browser_settings_association.test" + browserSettingsResourceName := "aws_workspacesweb_browser_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + browserPolicy1 := `{ + "chromePolicies": + { + "DefaultDownloadDirectory": { + "value": "/home/as2-streaming-user/MyFiles/TemporaryFiles1" + } + } + } ` + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBrowserSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBrowserSettingsAssociationConfig_basic(browserPolicy1), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings), + resource.TestCheckResourceAttrPair(resourceName, "browser_settings_arn", browserSettingsResourceName, "browser_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccBrowserSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "browser_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var browserSettings1, browserSettings2 awstypes.BrowserSettings + resourceName := "aws_workspacesweb_browser_settings_association.test" + browserPolicy1 := `{ + "chromePolicies": + { + "DefaultDownloadDirectory": { + "value": "/home/as2-streaming-user/MyFiles/TemporaryFiles1" + } + } + } ` + browserPolicy2 := `{ + "chromePolicies": + { + "DefaultDownloadDirectory": { + "value": "/home/as2-streaming-user/MyFiles/TemporaryFiles2" + } + } + } ` + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBrowserSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBrowserSettingsAssociationConfig_basic(browserPolicy1), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings1), + ), + }, + { + Config: testAccBrowserSettingsAssociationConfig_updated(browserPolicy1, browserPolicy2), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings2), + ), + }, + }, + }) +} + +func testAccCheckBrowserSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_browser_settings_association" { + continue + } + + browserSettings, err := tfworkspacesweb.FindBrowserSettingsByARN(ctx, conn, rs.Primary.Attributes["browser_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + for _, associatedPortalARN := range browserSettings.AssociatedPortalArns { + if associatedPortalARN == portalARN { + return fmt.Errorf("WorkSpaces Web Browser Settings Association %s still exists", rs.Primary.Attributes["browser_settings_arn"]) + } + } + } + + return nil + } +} + +func testAccCheckBrowserSettingsAssociationExists(ctx context.Context, n string, v *awstypes.BrowserSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindBrowserSettingsByARN(ctx, conn, rs.Primary.Attributes["browser_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + found := false + for _, associatedPortalARN := range output.AssociatedPortalArns { + if associatedPortalARN == portalARN { + found = true + break + } + } + + if !found { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccBrowserSettingsAssociationConfig_basic(browserPolicy string) string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_browser_settings" "test" { + browser_policy = %[1]q +} + +resource "aws_workspacesweb_browser_settings_association" "test" { + browser_settings_arn = aws_workspacesweb_browser_settings.test.browser_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`, browserPolicy) +} + +func testAccBrowserSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["browser_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccBrowserSettingsAssociationConfig_updated(browserPolicy1, browserPolicy2 string) string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_browser_settings" "test" { + browser_policy = %[1]q +} + +resource "aws_workspacesweb_browser_settings" "test2" { + browser_policy = %[2]q +} + +resource "aws_workspacesweb_browser_settings_association" "test" { + browser_settings_arn = aws_workspacesweb_browser_settings.test2.browser_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`, browserPolicy1, browserPolicy2) +} diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 5b18a6e274aa..fdca0550784f 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -33,6 +33,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newBrowserSettingsAssociationResource, + TypeName: "aws_workspacesweb_browser_settings_association", + Name: "Browser Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newDataProtectionSettingsResource, TypeName: "aws_workspacesweb_data_protection_settings", diff --git a/website/docs/r/workspacesweb_browser_settings_association.html.markdown b/website/docs/r/workspacesweb_browser_settings_association.html.markdown new file mode 100644 index 000000000000..27024d041e17 --- /dev/null +++ b/website/docs/r/workspacesweb_browser_settings_association.html.markdown @@ -0,0 +1,72 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_browser_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. +--- + +# Resource: aws_workspacesweb_browser_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_browser_settings" "example" { + browser_policy = jsonencode({ + chromePolicies = { + DefaultDownloadDirectory = { + value = "/home/as2-streaming-user/MyFiles/TemporaryFiles1" + } + } + }) +} + +resource "aws_workspacesweb_browser_settings_association" "example" { + browser_settings_arn = aws_workspacesweb_browser_settings.example.browser_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + + + +## Argument Reference + +The following arguments are required: + +* `browser_settings_arn` - (Required) ARN of the browser settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the browser settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_browser_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_browser_settings_association.example arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` From 4f0fb434999c7bee70c2613d8ca322b3281df8af Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 6 Aug 2025 21:09:46 +0000 Subject: [PATCH 0139/2115] Fixed lint errors and refactored for loops --- .changelog/43735.txt | 3 +++ .../browser_settings_association.go | 11 ++--------- .../browser_settings_association_test.go | 17 ++++------------- ...b_browser_settings_association.html.markdown | 4 +--- 4 files changed, 10 insertions(+), 25 deletions(-) create mode 100644 .changelog/43735.txt diff --git a/.changelog/43735.txt b/.changelog/43735.txt new file mode 100644 index 000000000000..f864e6a54db9 --- /dev/null +++ b/.changelog/43735.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_browser_settings_association +``` \ No newline at end of file diff --git a/internal/service/workspacesweb/browser_settings_association.go b/internal/service/workspacesweb/browser_settings_association.go index 3fb96251a1c5..2e3f835d460f 100644 --- a/internal/service/workspacesweb/browser_settings_association.go +++ b/internal/service/workspacesweb/browser_settings_association.go @@ -6,6 +6,7 @@ package workspacesweb import ( "context" "fmt" + "slices" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" @@ -104,15 +105,7 @@ func (r *browserSettingsAssociationResource) Read(ctx context.Context, request r } // Check if the portal is in the associated portals list - found := false - for _, portalARN := range output.AssociatedPortalArns { - if portalARN == data.PortalARN.ValueString() { - found = true - break - } - } - - if !found { + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) response.State.RemoveResource(ctx) return diff --git a/internal/service/workspacesweb/browser_settings_association_test.go b/internal/service/workspacesweb/browser_settings_association_test.go index 42c6ccfa4bd3..4f8af04989fe 100644 --- a/internal/service/workspacesweb/browser_settings_association_test.go +++ b/internal/service/workspacesweb/browser_settings_association_test.go @@ -6,6 +6,7 @@ package workspacesweb_test import ( "context" "fmt" + "slices" "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" @@ -128,10 +129,8 @@ func testAccCheckBrowserSettingsAssociationDestroy(ctx context.Context) resource // Check if the portal is still associated portalARN := rs.Primary.Attributes["portal_arn"] - for _, associatedPortalARN := range browserSettings.AssociatedPortalArns { - if associatedPortalARN == portalARN { - return fmt.Errorf("WorkSpaces Web Browser Settings Association %s still exists", rs.Primary.Attributes["browser_settings_arn"]) - } + if slices.Contains(browserSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web Browser Settings Association %s still exists", rs.Primary.Attributes["browser_settings_arn"]) } } @@ -156,15 +155,7 @@ func testAccCheckBrowserSettingsAssociationExists(ctx context.Context, n string, // Check if the portal is associated portalARN := rs.Primary.Attributes["portal_arn"] - found := false - for _, associatedPortalARN := range output.AssociatedPortalArns { - if associatedPortalARN == portalARN { - found = true - break - } - } - - if !found { + if !slices.Contains(output.AssociatedPortalArns, portalARN) { return fmt.Errorf("Association not found") } diff --git a/website/docs/r/workspacesweb_browser_settings_association.html.markdown b/website/docs/r/workspacesweb_browser_settings_association.html.markdown index 27024d041e17..fe47353d8aee 100644 --- a/website/docs/r/workspacesweb_browser_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_browser_settings_association.html.markdown @@ -31,12 +31,10 @@ resource "aws_workspacesweb_browser_settings" "example" { resource "aws_workspacesweb_browser_settings_association" "example" { browser_settings_arn = aws_workspacesweb_browser_settings.example.browser_settings_arn - portal_arn = aws_workspacesweb_portal.example.portal_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn } ``` - - ## Argument Reference The following arguments are required: From 78cab95fae358fff0a205046ea4526db22acb333 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 10:57:22 +0000 Subject: [PATCH 0140/2115] Fixed a typo in the error message --- internal/service/workspacesweb/browser_settings_association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/workspacesweb/browser_settings_association.go b/internal/service/workspacesweb/browser_settings_association.go index 2e3f835d460f..dff24e3524d6 100644 --- a/internal/service/workspacesweb/browser_settings_association.go +++ b/internal/service/workspacesweb/browser_settings_association.go @@ -152,7 +152,7 @@ func (r *browserSettingsAssociationResource) ImportState(ctx context.Context, re if err != nil { response.Diagnostics.AddError( "Unexpected Import Identifier", - fmt.Sprintf("Expected import identifier with format: function_name,qualifier. Got: %q", request.ID), + fmt.Sprintf("Expected import identifier with format: browser_settings_arn,portal_arn. Got: %q", request.ID), ) return } From d8ee666f34a4c8d9b5e0fd6a0c2fe730d3dbdf11 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Thu, 14 Aug 2025 14:43:18 +0000 Subject: [PATCH 0141/2115] Added testcase for computed attributes in the two associated reources --- .../browser_settings_association_test.go | 20 +++++++++++++++++++ ...browser_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/browser_settings_association_test.go b/internal/service/workspacesweb/browser_settings_association_test.go index 4f8af04989fe..cf1c1e574c2a 100644 --- a/internal/service/workspacesweb/browser_settings_association_test.go +++ b/internal/service/workspacesweb/browser_settings_association_test.go @@ -58,6 +58,19 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccBrowserSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "browser_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccBrowserSettingsAssociationConfig_basic(browserPolicy1), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the BrowserSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(browserSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(browserSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "browser_settings_arn", browserSettingsResourceName, "browser_settings_arn"), + ), + }, }, }) } @@ -66,6 +79,9 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { ctx := acctest.Context(t) var browserSettings1, browserSettings2 awstypes.BrowserSettings resourceName := "aws_workspacesweb_browser_settings_association.test" + browserSettingsResourceName1 := "aws_workspacesweb_browser_settings.test" + browserSettingsResourceName2 := "aws_workspacesweb_browser_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" browserPolicy1 := `{ "chromePolicies": { @@ -96,12 +112,16 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { Config: testAccBrowserSettingsAssociationConfig_basic(browserPolicy1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings1), + resource.TestCheckResourceAttrPair(resourceName, "browser_settings_arn", browserSettingsResourceName1, "browser_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccBrowserSettingsAssociationConfig_updated(browserPolicy1, browserPolicy2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings2), + resource.TestCheckResourceAttrPair(resourceName, "browser_settings_arn", browserSettingsResourceName2, "browser_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_browser_settings_association.html.markdown b/website/docs/r/workspacesweb_browser_settings_association.html.markdown index fe47353d8aee..dd677ea79d4a 100644 --- a/website/docs/r/workspacesweb_browser_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_browser_settings_association.html.markdown @@ -48,9 +48,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From 42d6ec30ff313ceb64c3f50977870dc4aea43968 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 10:44:43 +0000 Subject: [PATCH 0142/2115] Added resource WorkSpacesWebDataProtectionSettingsAssociation --- .../data_protection_settings_association.go | 170 +++++++++++++++ ...ta_protection_settings_association_test.go | 193 ++++++++++++++++++ .../workspacesweb/service_package_gen.go | 6 + ...tection_settings_association.html.markdown | 58 ++++++ 4 files changed, 427 insertions(+) create mode 100644 internal/service/workspacesweb/data_protection_settings_association.go create mode 100644 internal/service/workspacesweb/data_protection_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_data_protection_settings_association.html.markdown diff --git a/internal/service/workspacesweb/data_protection_settings_association.go b/internal/service/workspacesweb/data_protection_settings_association.go new file mode 100644 index 000000000000..f80bda4ef3b0 --- /dev/null +++ b/internal/service/workspacesweb/data_protection_settings_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_data_protection_settings_association", name="Data Protection Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.DataProtectionSettings") +// @Testing(importStateIdAttribute="data_protection_settings_arn,portal_arn") +func newDataProtectionSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &dataProtectionSettingsAssociationResource{}, nil +} + +const ( + ResNameDataProtectionSettingsAssociation = "Data Protection Settings Association" +) + +type dataProtectionSettingsAssociationResource struct { + framework.ResourceWithModel[dataProtectionSettingsAssociationResourceModel] +} + +func (r *dataProtectionSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "data_protection_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *dataProtectionSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data dataProtectionSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateDataProtectionSettingsInput{ + DataProtectionSettingsArn: data.DataProtectionSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateDataProtectionSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameDataProtectionSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *dataProtectionSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data dataProtectionSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the data protection settings and checking associated portals + output, err := findDataProtectionSettingsByARN(ctx, conn, data.DataProtectionSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameDataProtectionSettingsAssociation, data.DataProtectionSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *dataProtectionSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *dataProtectionSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data dataProtectionSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateDataProtectionSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateDataProtectionSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameDataProtectionSettingsAssociation, data.DataProtectionSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *dataProtectionSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + dataProtectionSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, dataProtectionSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: data_protection_settings_arn,portal_arn. Got: %q", request.ID), + ) + return + } + dataProtectionSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("data_protection_settings_arn"), dataProtectionSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type dataProtectionSettingsAssociationResourceModel struct { + framework.WithRegionModel + DataProtectionSettingsARN types.String `tfsdk:"data_protection_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/data_protection_settings_association_test.go b/internal/service/workspacesweb/data_protection_settings_association_test.go new file mode 100644 index 000000000000..e7443ce414ef --- /dev/null +++ b/internal/service/workspacesweb/data_protection_settings_association_test.go @@ -0,0 +1,193 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebDataProtectionSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var dataProtectionSettings awstypes.DataProtectionSettings + resourceName := "aws_workspacesweb_data_protection_settings_association.test" + dataProtectionSettingsResourceName := "aws_workspacesweb_data_protection_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDataProtectionSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDataProtectionSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings), + resource.TestCheckResourceAttrPair(resourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName, "data_protection_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccDataProtectionSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "data_protection_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebDataProtectionSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var dataProtectionSettings1, dataProtectionSettings2 awstypes.DataProtectionSettings + resourceName := "aws_workspacesweb_data_protection_settings_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDataProtectionSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDataProtectionSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings1), + ), + }, + { + Config: testAccDataProtectionSettingsAssociationConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings2), + ), + }, + }, + }) +} + +func testAccCheckDataProtectionSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_data_protection_settings_association" { + continue + } + + dataProtectionSettings, err := tfworkspacesweb.FindDataProtectionSettingsByARN(ctx, conn, rs.Primary.Attributes["data_protection_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(dataProtectionSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web Data Protection Settings Association %s still exists", rs.Primary.Attributes["data_protection_settings_arn"]) + } + } + + return nil + } +} + +func testAccCheckDataProtectionSettingsAssociationExists(ctx context.Context, n string, v *awstypes.DataProtectionSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindDataProtectionSettingsByARN(ctx, conn, rs.Primary.Attributes["data_protection_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccDataProtectionSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["data_protection_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccDataProtectionSettingsAssociationConfig_basic() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_data_protection_settings" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_data_protection_settings_association" "test" { + data_protection_settings_arn = aws_workspacesweb_data_protection_settings.test.data_protection_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} + +func testAccDataProtectionSettingsAssociationConfig_updated() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_data_protection_settings" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_data_protection_settings" "test2" { + display_name = "test2" +} + +resource "aws_workspacesweb_data_protection_settings_association" "test" { + data_protection_settings_arn = aws_workspacesweb_data_protection_settings.test2.data_protection_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index fdca0550784f..fb7d5ca5cbc1 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -48,6 +48,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newDataProtectionSettingsAssociationResource, + TypeName: "aws_workspacesweb_data_protection_settings_association", + Name: "Data Protection Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newIdentityProviderResource, TypeName: "aws_workspacesweb_identity_provider", diff --git a/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown b/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown new file mode 100644 index 000000000000..39c568db1953 --- /dev/null +++ b/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown @@ -0,0 +1,58 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_data_protection_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. +--- + +# Resource: aws_workspacesweb_data_protection_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_data_protection_settings" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_data_protection_settings_association" "example" { + data_protection_settings_arn = aws_workspacesweb_data_protection_settings.example.data_protection_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `data_protection_settings_arn` - (Required) ARN of the data protection settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the data protection settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Data Protection Settings Association using the `data_protection_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_data_protection_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:dataProtectionSettings/data_protection_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` From 2b663d68367630abe762b68f92a62d2d8405fc76 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 12:07:02 +0000 Subject: [PATCH 0143/2115] Added changelog entry --- .changelog/43773.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43773.txt diff --git a/.changelog/43773.txt b/.changelog/43773.txt new file mode 100644 index 000000000000..0179cb457aca --- /dev/null +++ b/.changelog/43773.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_data_protection_settings_association +``` \ No newline at end of file From e4daa62c86606d6fa2e45c9922b5569a2b9f1cae Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 09:39:22 +0000 Subject: [PATCH 0144/2115] Added testcase for computed attributes in the two associated reources --- ...ta_protection_settings_association_test.go | 20 +++++++++++++++++++ ...tection_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/data_protection_settings_association_test.go b/internal/service/workspacesweb/data_protection_settings_association_test.go index e7443ce414ef..dad2caff3b6a 100644 --- a/internal/service/workspacesweb/data_protection_settings_association_test.go +++ b/internal/service/workspacesweb/data_protection_settings_association_test.go @@ -51,6 +51,19 @@ func TestAccWorkSpacesWebDataProtectionSettingsAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccDataProtectionSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "data_protection_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccDataProtectionSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the DataProtectionSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(dataProtectionSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(dataProtectionSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName, "data_protection_settings_arn"), + ), + }, }, }) } @@ -59,6 +72,9 @@ func TestAccWorkSpacesWebDataProtectionSettingsAssociation_update(t *testing.T) ctx := acctest.Context(t) var dataProtectionSettings1, dataProtectionSettings2 awstypes.DataProtectionSettings resourceName := "aws_workspacesweb_data_protection_settings_association.test" + dataProtectionSettingsResourceName1 := "aws_workspacesweb_data_protection_settings.test" + dataProtectionSettingsResourceName2 := "aws_workspacesweb_data_protection_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -74,12 +90,16 @@ func TestAccWorkSpacesWebDataProtectionSettingsAssociation_update(t *testing.T) Config: testAccDataProtectionSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings1), + resource.TestCheckResourceAttrPair(resourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName1, "data_protection_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccDataProtectionSettingsAssociationConfig_updated(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings2), + resource.TestCheckResourceAttrPair(resourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName2, "data_protection_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown b/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown index 39c568db1953..ac99b95741c8 100644 --- a/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_data_protection_settings_association.html.markdown @@ -42,9 +42,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From ef0f2312d37f45f6366730cbff52612238359fab Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 11:33:21 +0000 Subject: [PATCH 0145/2115] Added resource IPAccessSettingsAssociation --- .../ip_access_settings_association.go | 170 +++++++++++++++ .../ip_access_settings_association_test.go | 205 ++++++++++++++++++ .../workspacesweb/service_package_gen.go | 6 + ..._access_settings_association.html.markdown | 62 ++++++ 4 files changed, 443 insertions(+) create mode 100644 internal/service/workspacesweb/ip_access_settings_association.go create mode 100644 internal/service/workspacesweb/ip_access_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_ip_access_settings_association.html.markdown diff --git a/internal/service/workspacesweb/ip_access_settings_association.go b/internal/service/workspacesweb/ip_access_settings_association.go new file mode 100644 index 000000000000..b5242a8ea6c7 --- /dev/null +++ b/internal/service/workspacesweb/ip_access_settings_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_ip_access_settings_association", name="IP Access Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.IpAccessSettings") +// @Testing(importStateIdAttribute="ip_access_settings_arn,portal_arn") +func newIPAccessSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &ipAccessSettingsAssociationResource{}, nil +} + +const ( + ResNameIPAccessSettingsAssociation = "IP Access Settings Association" +) + +type ipAccessSettingsAssociationResource struct { + framework.ResourceWithModel[ipAccessSettingsAssociationResourceModel] +} + +func (r *ipAccessSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "ip_access_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *ipAccessSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data ipAccessSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateIpAccessSettingsInput{ + IpAccessSettingsArn: data.IPAccessSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateIpAccessSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameIPAccessSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *ipAccessSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data ipAccessSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the IP access settings and checking associated portals + output, err := findIPAccessSettingsByARN(ctx, conn, data.IPAccessSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIPAccessSettingsAssociation, data.IPAccessSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *ipAccessSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *ipAccessSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data ipAccessSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateIpAccessSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateIpAccessSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameIPAccessSettingsAssociation, data.IPAccessSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *ipAccessSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + ipAccessSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, ipAccessSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: ip_access_settings_arn,portal_arn. Got: %q", request.ID), + ) + return + } + ipAccessSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("ip_access_settings_arn"), ipAccessSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type ipAccessSettingsAssociationResourceModel struct { + framework.WithRegionModel + IPAccessSettingsARN types.String `tfsdk:"ip_access_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/ip_access_settings_association_test.go b/internal/service/workspacesweb/ip_access_settings_association_test.go new file mode 100644 index 000000000000..7540007890cb --- /dev/null +++ b/internal/service/workspacesweb/ip_access_settings_association_test.go @@ -0,0 +1,205 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebIPAccessSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var ipAccessSettings awstypes.IpAccessSettings + resourceName := "aws_workspacesweb_ip_access_settings_association.test" + ipAccessSettingsResourceName := "aws_workspacesweb_ip_access_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIPAccessSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIPAccessSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings), + resource.TestCheckResourceAttrPair(resourceName, "ip_access_settings_arn", ipAccessSettingsResourceName, "ip_access_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccIPAccessSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "ip_access_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebIPAccessSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var ipAccessSettings1, ipAccessSettings2 awstypes.IpAccessSettings + resourceName := "aws_workspacesweb_ip_access_settings_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIPAccessSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIPAccessSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings1), + ), + }, + { + Config: testAccIPAccessSettingsAssociationConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings2), + ), + }, + }, + }) +} + +func testAccCheckIPAccessSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_ip_access_settings_association" { + continue + } + + ipAccessSettings, err := tfworkspacesweb.FindIPAccessSettingsByARN(ctx, conn, rs.Primary.Attributes["ip_access_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(ipAccessSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web IP Access Settings Association %s still exists", rs.Primary.Attributes["ip_access_settings_arn"]) + } + } + + return nil + } +} + +func testAccCheckIPAccessSettingsAssociationExists(ctx context.Context, n string, v *awstypes.IpAccessSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindIPAccessSettingsByARN(ctx, conn, rs.Primary.Attributes["ip_access_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccIPAccessSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["ip_access_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccIPAccessSettingsAssociationConfig_basic() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_ip_access_settings" "test" { + display_name = "test" + + ip_rule { + ip_range = "10.0.0.0/16" + } +} + +resource "aws_workspacesweb_ip_access_settings_association" "test" { + ip_access_settings_arn = aws_workspacesweb_ip_access_settings.test.ip_access_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} + +func testAccIPAccessSettingsAssociationConfig_updated() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_ip_access_settings" "test" { + display_name = "test" + + ip_rule { + ip_range = "10.0.0.0/16" + } +} + +resource "aws_workspacesweb_ip_access_settings" "test2" { + display_name = "test2" + + ip_rule { + ip_range = "192.168.0.0/24" + } +} + +resource "aws_workspacesweb_ip_access_settings_association" "test" { + ip_access_settings_arn = aws_workspacesweb_ip_access_settings.test2.ip_access_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index fb7d5ca5cbc1..293bb10ab064 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -72,6 +72,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newIPAccessSettingsAssociationResource, + TypeName: "aws_workspacesweb_ip_access_settings_association", + Name: "IP Access Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newNetworkSettingsResource, TypeName: "aws_workspacesweb_network_settings", diff --git a/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown b/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown new file mode 100644 index 000000000000..6f3ac897348a --- /dev/null +++ b/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown @@ -0,0 +1,62 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_ip_access_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. +--- + +# Resource: aws_workspacesweb_ip_access_settings_association + +Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_ip_access_settings" "example" { + display_name = "example" + + ip_rule { + ip_range = "10.0.0.0/16" + } +} + +resource "aws_workspacesweb_ip_access_settings_association" "example" { + ip_access_settings_arn = aws_workspacesweb_ip_access_settings.example.ip_access_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `ip_access_settings_arn` - (Required) ARN of the IP access settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the IP access settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web IP Access Settings Association using the `ip_access_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_ip_access_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:ipAccessSettings/ip_access_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` From 4159436656b4f1dc1910884b558b55076921c032 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 12:10:13 +0000 Subject: [PATCH 0146/2115] Added changelog entry --- .changelog/43774.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43774.txt diff --git a/.changelog/43774.txt b/.changelog/43774.txt new file mode 100644 index 000000000000..01e3edf0e656 --- /dev/null +++ b/.changelog/43774.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_ip_access_settings_association +``` \ No newline at end of file From 7537bf45c262d7a372516f24eebfe5d35360db72 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 09:47:53 +0000 Subject: [PATCH 0147/2115] Added testcase for computed attributes in the two associated reources --- .../ip_access_settings_association_test.go | 20 +++++++++++++++++++ ..._access_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/ip_access_settings_association_test.go b/internal/service/workspacesweb/ip_access_settings_association_test.go index 7540007890cb..73541f413fd0 100644 --- a/internal/service/workspacesweb/ip_access_settings_association_test.go +++ b/internal/service/workspacesweb/ip_access_settings_association_test.go @@ -51,6 +51,19 @@ func TestAccWorkSpacesWebIPAccessSettingsAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccIPAccessSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "ip_access_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccIPAccessSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the IPAccessSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(ipAccessSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(ipAccessSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "ip_access_settings_arn", ipAccessSettingsResourceName, "ip_access_settings_arn"), + ), + }, }, }) } @@ -59,6 +72,9 @@ func TestAccWorkSpacesWebIPAccessSettingsAssociation_update(t *testing.T) { ctx := acctest.Context(t) var ipAccessSettings1, ipAccessSettings2 awstypes.IpAccessSettings resourceName := "aws_workspacesweb_ip_access_settings_association.test" + ipAccessSettingsResourceName1 := "aws_workspacesweb_ip_access_settings.test" + ipAccessSettingsResourceName2 := "aws_workspacesweb_ip_access_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -74,12 +90,16 @@ func TestAccWorkSpacesWebIPAccessSettingsAssociation_update(t *testing.T) { Config: testAccIPAccessSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings1), + resource.TestCheckResourceAttrPair(resourceName, "ip_access_settings_arn", ipAccessSettingsResourceName1, "ip_access_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccIPAccessSettingsAssociationConfig_updated(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings2), + resource.TestCheckResourceAttrPair(resourceName, "ip_access_settings_arn", ipAccessSettingsResourceName2, "ip_access_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown b/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown index 6f3ac897348a..acbcb0d2b8df 100644 --- a/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_ip_access_settings_association.html.markdown @@ -46,9 +46,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From c941f6336749154e29bcb9583a9413002faf828b Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 12:51:10 +0000 Subject: [PATCH 0148/2115] Added resource aws_workspacesweb_network_settings_association --- .../network_settings_association.go | 170 +++++++++++++++ .../network_settings_association_test.go | 202 ++++++++++++++++++ .../workspacesweb/service_package_gen.go | 6 + ...network_settings_association.html.markdown | 100 +++++++++ 4 files changed, 478 insertions(+) create mode 100644 internal/service/workspacesweb/network_settings_association.go create mode 100644 internal/service/workspacesweb/network_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_network_settings_association.html.markdown diff --git a/internal/service/workspacesweb/network_settings_association.go b/internal/service/workspacesweb/network_settings_association.go new file mode 100644 index 000000000000..6fec214a1423 --- /dev/null +++ b/internal/service/workspacesweb/network_settings_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_network_settings_association", name="Network Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.NetworkSettings") +// @Testing(importStateIdAttribute="network_settings_arn,portal_arn") +func newNetworkSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &networkSettingsAssociationResource{}, nil +} + +const ( + ResNameNetworkSettingsAssociation = "Network Settings Association" +) + +type networkSettingsAssociationResource struct { + framework.ResourceWithModel[networkSettingsAssociationResourceModel] +} + +func (r *networkSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "network_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *networkSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data networkSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateNetworkSettingsInput{ + NetworkSettingsArn: data.NetworkSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateNetworkSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameNetworkSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *networkSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data networkSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the network settings and checking associated portals + output, err := findNetworkSettingsByARN(ctx, conn, data.NetworkSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameNetworkSettingsAssociation, data.NetworkSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *networkSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *networkSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data networkSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateNetworkSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateNetworkSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameNetworkSettingsAssociation, data.NetworkSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *networkSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + networkSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, networkSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: network_settings_arn,portal_arn. Got: %q", request.ID), + ) + return + } + networkSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("network_settings_arn"), networkSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type networkSettingsAssociationResourceModel struct { + framework.WithRegionModel + NetworkSettingsARN types.String `tfsdk:"network_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/network_settings_association_test.go b/internal/service/workspacesweb/network_settings_association_test.go new file mode 100644 index 000000000000..29fc97bc06dd --- /dev/null +++ b/internal/service/workspacesweb/network_settings_association_test.go @@ -0,0 +1,202 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebNetworkSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var networkSettings awstypes.NetworkSettings + resourceName := "aws_workspacesweb_network_settings_association.test" + networkSettingsResourceName := "aws_workspacesweb_network_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckNetworkSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccNetworkSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings), + resource.TestCheckResourceAttrPair(resourceName, "network_settings_arn", networkSettingsResourceName, "network_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccNetworkSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "network_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebNetworkSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var networkSettings1, networkSettings2 awstypes.NetworkSettings + resourceName := "aws_workspacesweb_network_settings_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckNetworkSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccNetworkSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings1), + ), + }, + { + Config: testAccNetworkSettingsAssociationConfig_updated(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings2), + ), + }, + }, + }) +} + +func testAccCheckNetworkSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_network_settings_association" { + continue + } + + networkSettings, err := tfworkspacesweb.FindNetworkSettingsByARN(ctx, conn, rs.Primary.Attributes["network_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(networkSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web Network Settings Association %s still exists", rs.Primary.Attributes["network_settings_arn"]) + } + } + + return nil + } +} + +func testAccCheckNetworkSettingsAssociationExists(ctx context.Context, n string, v *awstypes.NetworkSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindNetworkSettingsByARN(ctx, conn, rs.Primary.Attributes["network_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccNetworkSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["network_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccNetworkSettingsAssociationConfig_basic(rName string) string { + return acctest.ConfigCompose(testAccNetworkSettingsConfig_base(rName), ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_network_settings" "test" { + vpc_id = aws_vpc.test.id + subnet_ids = [aws_subnet.test[0].id, aws_subnet.test[1].id] + security_group_ids = [aws_security_group.test[0].id, aws_security_group.test[1].id] +} + +resource "aws_workspacesweb_network_settings_association" "test" { + network_settings_arn = aws_workspacesweb_network_settings.test.network_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`) +} + +func testAccNetworkSettingsAssociationConfig_updated(rName string) string { + return acctest.ConfigCompose(testAccNetworkSettingsConfig_base(rName), ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_network_settings" "test" { + vpc_id = aws_vpc.test.id + subnet_ids = [aws_subnet.test[0].id, aws_subnet.test[1].id] + security_group_ids = [aws_security_group.test[0].id, aws_security_group.test[1].id] +} + +resource "aws_workspacesweb_network_settings" "test2" { + vpc_id = aws_vpc.test2.id + subnet_ids = [aws_subnet.test2[0].id, aws_subnet.test2[1].id] + security_group_ids = [aws_security_group.test2[0].id, aws_security_group.test2[1].id] +} + +resource "aws_workspacesweb_network_settings_association" "test" { + network_settings_arn = aws_workspacesweb_network_settings.test2.network_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`) +} diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 293bb10ab064..e345b70285f2 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -87,6 +87,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newNetworkSettingsAssociationResource, + TypeName: "aws_workspacesweb_network_settings_association", + Name: "Network Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newPortalResource, TypeName: "aws_workspacesweb_portal", diff --git a/website/docs/r/workspacesweb_network_settings_association.html.markdown b/website/docs/r/workspacesweb_network_settings_association.html.markdown new file mode 100644 index 000000000000..647b6816c768 --- /dev/null +++ b/website/docs/r/workspacesweb_network_settings_association.html.markdown @@ -0,0 +1,100 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_network_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. +--- + +# Resource: aws_workspacesweb_network_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +data "aws_availability_zones" "available" { + state = "available" + + filter { + name = "opt-in-status" + values = ["opt-in-not-required"] + } +} + +resource "aws_vpc" "example" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = "example" + } +} + +resource "aws_subnet" "example" { + count = 2 + + vpc_id = aws_vpc.example.id + cidr_block = cidrsubnet(aws_vpc.example.cidr_block, 8, count.index) + availability_zone = data.aws_availability_zones.available.names[count.index] + + tags = { + Name = "example" + } +} + +resource "aws_security_group" "example" { + count = 2 + + vpc_id = aws_vpc.example.id + name = "example-${count.index}" + + tags = { + Name = "example" + } +} + +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_network_settings" "example" { + vpc_id = aws_vpc.example.id + subnet_ids = [aws_subnet.example[0].id, aws_subnet.example[1].id] + security_group_ids = [aws_security_group.example[0].id, aws_security_group.example[1].id] +} + +resource "aws_workspacesweb_network_settings_association" "example" { + network_settings_arn = aws_workspacesweb_network_settings.example.network_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `network_settings_arn` - (Required) ARN of the network settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the network settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Network Settings Association using the `network_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_network_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:networkSettings/network_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` From fb122cd1cca8a635032d974ad86df7140db2eeea Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 12:53:04 +0000 Subject: [PATCH 0149/2115] Added ChangeLog entry --- .changelog/43775.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43775.txt diff --git a/.changelog/43775.txt b/.changelog/43775.txt new file mode 100644 index 000000000000..8c83f9156c77 --- /dev/null +++ b/.changelog/43775.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_network_settings_association +``` \ No newline at end of file From 146240295396de0920354276aef76fb309f1da4a Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 10:03:04 +0000 Subject: [PATCH 0150/2115] Added testcase for computed attributes in the two associated reources --- .../network_settings_association_test.go | 20 +++++++++++++++++++ ...network_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/network_settings_association_test.go b/internal/service/workspacesweb/network_settings_association_test.go index 29fc97bc06dd..597580d12ef7 100644 --- a/internal/service/workspacesweb/network_settings_association_test.go +++ b/internal/service/workspacesweb/network_settings_association_test.go @@ -53,6 +53,19 @@ func TestAccWorkSpacesWebNetworkSettingsAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccNetworkSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "network_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccNetworkSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the NetworkSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(networkSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(networkSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "network_settings_arn", networkSettingsResourceName, "network_settings_arn"), + ), + }, }, }) } @@ -61,6 +74,9 @@ func TestAccWorkSpacesWebNetworkSettingsAssociation_update(t *testing.T) { ctx := acctest.Context(t) var networkSettings1, networkSettings2 awstypes.NetworkSettings resourceName := "aws_workspacesweb_network_settings_association.test" + networkSettingsResourceName1 := "aws_workspacesweb_network_settings.test" + networkSettingsResourceName2 := "aws_workspacesweb_network_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -77,12 +93,16 @@ func TestAccWorkSpacesWebNetworkSettingsAssociation_update(t *testing.T) { Config: testAccNetworkSettingsAssociationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings1), + resource.TestCheckResourceAttrPair(resourceName, "network_settings_arn", networkSettingsResourceName1, "network_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccNetworkSettingsAssociationConfig_updated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings2), + resource.TestCheckResourceAttrPair(resourceName, "network_settings_arn", networkSettingsResourceName2, "network_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_network_settings_association.html.markdown b/website/docs/r/workspacesweb_network_settings_association.html.markdown index 647b6816c768..e90a65c1f2c5 100644 --- a/website/docs/r/workspacesweb_network_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_network_settings_association.html.markdown @@ -84,9 +84,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From 32b8e6b3d56578c84cf0f3cab7e293bc4d02784a Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 13:10:24 +0000 Subject: [PATCH 0151/2115] Added resource aws_workspacesweb_user_access_logging_settings_association --- .../workspacesweb/service_package_gen.go | 6 + ...ser_access_logging_settings_association.go | 170 ++++++++++++++ ...ccess_logging_settings_association_test.go | 211 ++++++++++++++++++ ...logging_settings_association.html.markdown | 63 ++++++ 4 files changed, 450 insertions(+) create mode 100644 internal/service/workspacesweb/user_access_logging_settings_association.go create mode 100644 internal/service/workspacesweb/user_access_logging_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index e345b70285f2..99c3337e7318 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -120,6 +120,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newUserAccessLoggingSettingsAssociationResource, + TypeName: "aws_workspacesweb_user_access_logging_settings_association", + Name: "User Access Logging Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newUserSettingsResource, TypeName: "aws_workspacesweb_user_settings", diff --git a/internal/service/workspacesweb/user_access_logging_settings_association.go b/internal/service/workspacesweb/user_access_logging_settings_association.go new file mode 100644 index 000000000000..eb965664f381 --- /dev/null +++ b/internal/service/workspacesweb/user_access_logging_settings_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_user_access_logging_settings_association", name="User Access Logging Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.UserAccessLoggingSettings") +// @Testing(importStateIdAttribute="user_access_logging_settings_arn,portal_arn") +func newUserAccessLoggingSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &userAccessLoggingSettingsAssociationResource{}, nil +} + +const ( + ResNameUserAccessLoggingSettingsAssociation = "User Access Logging Settings Association" +) + +type userAccessLoggingSettingsAssociationResource struct { + framework.ResourceWithModel[userAccessLoggingSettingsAssociationResourceModel] +} + +func (r *userAccessLoggingSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "user_access_logging_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *userAccessLoggingSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data userAccessLoggingSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateUserAccessLoggingSettingsInput{ + UserAccessLoggingSettingsArn: data.UserAccessLoggingSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateUserAccessLoggingSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameUserAccessLoggingSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *userAccessLoggingSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data userAccessLoggingSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the user access logging settings and checking associated portals + output, err := findUserAccessLoggingSettingsByARN(ctx, conn, data.UserAccessLoggingSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameUserAccessLoggingSettingsAssociation, data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *userAccessLoggingSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *userAccessLoggingSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data userAccessLoggingSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateUserAccessLoggingSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateUserAccessLoggingSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameUserAccessLoggingSettingsAssociation, data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *userAccessLoggingSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + userAccessLoggingSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, userAccessLoggingSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: user_access_logging_settings_arn,portal_arn. Got: %q", request.ID), + ) + return + } + userAccessLoggingSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("user_access_logging_settings_arn"), userAccessLoggingSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type userAccessLoggingSettingsAssociationResourceModel struct { + framework.WithRegionModel + UserAccessLoggingSettingsARN types.String `tfsdk:"user_access_logging_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/user_access_logging_settings_association_test.go b/internal/service/workspacesweb/user_access_logging_settings_association_test.go new file mode 100644 index 000000000000..e8ed2caa10c7 --- /dev/null +++ b/internal/service/workspacesweb/user_access_logging_settings_association_test.go @@ -0,0 +1,211 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var userAccessLoggingSettings awstypes.UserAccessLoggingSettings + resourceName := "aws_workspacesweb_user_access_logging_settings_association.test" + userAccessLoggingSettingsResourceName := "aws_workspacesweb_user_access_logging_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckUserAccessLoggingSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccUserAccessLoggingSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings), + resource.TestCheckResourceAttrPair(resourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName, "user_access_logging_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccUserAccessLoggingSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "user_access_logging_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var userAccessLoggingSettings1, userAccessLoggingSettings2 awstypes.UserAccessLoggingSettings + resourceName := "aws_workspacesweb_user_access_logging_settings_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckUserAccessLoggingSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccUserAccessLoggingSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings1), + ), + }, + { + Config: testAccUserAccessLoggingSettingsAssociationConfig_updated(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings2), + ), + }, + }, + }) +} + +func testAccCheckUserAccessLoggingSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_user_access_logging_settings_association" { + continue + } + + userAccessLoggingSettings, err := tfworkspacesweb.FindUserAccessLoggingSettingsByARN(ctx, conn, rs.Primary.Attributes["user_access_logging_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(userAccessLoggingSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web User Access Logging Settings Association %s still exists", rs.Primary.Attributes["user_access_logging_settings_arn"]) + } + } + + return nil + } +} + +func testAccCheckUserAccessLoggingSettingsAssociationExists(ctx context.Context, n string, v *awstypes.UserAccessLoggingSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindUserAccessLoggingSettingsByARN(ctx, conn, rs.Primary.Attributes["user_access_logging_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccUserAccessLoggingSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["user_access_logging_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccUserAccessLoggingSettingsAssociationConfig_basic(rName string) string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_kinesis_stream" "test" { + name = "amazon-workspaces-web-%[1]s" + shard_count = 1 +} + +resource "aws_workspacesweb_user_access_logging_settings" "test" { + kinesis_stream_arn = aws_kinesis_stream.test.arn +} + +resource "aws_workspacesweb_user_access_logging_settings_association" "test" { + user_access_logging_settings_arn = aws_workspacesweb_user_access_logging_settings.test.user_access_logging_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`, rName) +} + +func testAccUserAccessLoggingSettingsAssociationConfig_updated(rName string) string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_kinesis_stream" "test" { + name = "amazon-workspaces-web-%[1]s" + shard_count = 1 +} + +resource "aws_kinesis_stream" "test2" { + name = "amazon-workspaces-web-%[1]s-2" + shard_count = 1 +} + +resource "aws_workspacesweb_user_access_logging_settings" "test" { + kinesis_stream_arn = aws_kinesis_stream.test.arn +} + +resource "aws_workspacesweb_user_access_logging_settings" "test2" { + kinesis_stream_arn = aws_kinesis_stream.test2.arn +} + +resource "aws_workspacesweb_user_access_logging_settings_association" "test" { + user_access_logging_settings_arn = aws_workspacesweb_user_access_logging_settings.test2.user_access_logging_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`, rName) +} diff --git a/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown b/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown new file mode 100644 index 000000000000..f2e3c73373b7 --- /dev/null +++ b/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown @@ -0,0 +1,63 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_access_logging_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. +--- + +# Resource: aws_workspacesweb_user_access_logging_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_kinesis_stream" "example" { + name = "amazon-workspaces-web-example" + shard_count = 1 +} + +resource "aws_workspacesweb_user_access_logging_settings" "example" { + kinesis_stream_arn = aws_kinesis_stream.example.arn +} + +resource "aws_workspacesweb_user_access_logging_settings_association" "example" { + user_access_logging_settings_arn = aws_workspacesweb_user_access_logging_settings.example.user_access_logging_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `user_access_logging_settings_arn` - (Required) ARN of the user access logging settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the user access logging settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Access Logging Settings Association using the `user_access_logging_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_user_access_logging_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:userAccessLoggingSettings/user_access_logging_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` From f4cd5351d31683d89f5e315800003ed9c7330c1a Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 13:12:52 +0000 Subject: [PATCH 0152/2115] Added ChangeLog entry --- .changelog/43776.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43776.txt diff --git a/.changelog/43776.txt b/.changelog/43776.txt new file mode 100644 index 000000000000..423671d48fb3 --- /dev/null +++ b/.changelog/43776.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_user_access_logging_settings_association +``` \ No newline at end of file From 272cf5a855111b9e5c95108f32ba14c8faf71d08 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 10:24:44 +0000 Subject: [PATCH 0153/2115] Added testcase for computed attributes in the two associated reources --- ...ccess_logging_settings_association_test.go | 20 +++++++++++++++++++ ...logging_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/user_access_logging_settings_association_test.go b/internal/service/workspacesweb/user_access_logging_settings_association_test.go index e8ed2caa10c7..901f1d39870d 100644 --- a/internal/service/workspacesweb/user_access_logging_settings_association_test.go +++ b/internal/service/workspacesweb/user_access_logging_settings_association_test.go @@ -53,6 +53,19 @@ func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_basic(t *testing.T ImportStateIdFunc: testAccUserAccessLoggingSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "user_access_logging_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccUserAccessLoggingSettingsAssociationConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the UserAccessLoggingSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(userAccessLoggingSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(userAccessLoggingSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName, "user_access_logging_settings_arn"), + ), + }, }, }) } @@ -61,6 +74,9 @@ func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_update(t *testing. ctx := acctest.Context(t) var userAccessLoggingSettings1, userAccessLoggingSettings2 awstypes.UserAccessLoggingSettings resourceName := "aws_workspacesweb_user_access_logging_settings_association.test" + userAccessLoggingSettingsResourceName1 := "aws_workspacesweb_user_access_logging_settings.test" + userAccessLoggingSettingsResourceName2 := "aws_workspacesweb_user_access_logging_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -77,12 +93,16 @@ func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_update(t *testing. Config: testAccUserAccessLoggingSettingsAssociationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings1), + resource.TestCheckResourceAttrPair(resourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName1, "user_access_logging_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccUserAccessLoggingSettingsAssociationConfig_updated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings2), + resource.TestCheckResourceAttrPair(resourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName2, "user_access_logging_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown b/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown index f2e3c73373b7..4dbaa27c57b3 100644 --- a/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_user_access_logging_settings_association.html.markdown @@ -47,9 +47,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From 74e95476494fc900ea6bf64fbf76426386af837a Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 13:19:01 +0000 Subject: [PATCH 0154/2115] Added resource aws_workspacesweb_user_settings_association --- .changelog/43777.txt | 3 + .../workspacesweb/service_package_gen.go | 6 + .../user_settings_association.go | 170 +++++++++++++++ .../user_settings_association_test.go | 205 ++++++++++++++++++ ...eb_user_settings_association.html.markdown | 62 ++++++ 5 files changed, 446 insertions(+) create mode 100644 .changelog/43777.txt create mode 100644 internal/service/workspacesweb/user_settings_association.go create mode 100644 internal/service/workspacesweb/user_settings_association_test.go create mode 100644 website/docs/r/workspacesweb_user_settings_association.html.markdown diff --git a/.changelog/43777.txt b/.changelog/43777.txt new file mode 100644 index 000000000000..99d66e2a4bea --- /dev/null +++ b/.changelog/43777.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_user_settings_association +``` \ No newline at end of file diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 99c3337e7318..285b8c2ece0c 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -135,6 +135,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newUserSettingsAssociationResource, + TypeName: "aws_workspacesweb_user_settings_association", + Name: "User Settings Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, } } diff --git a/internal/service/workspacesweb/user_settings_association.go b/internal/service/workspacesweb/user_settings_association.go new file mode 100644 index 000000000000..f4b2d2d93816 --- /dev/null +++ b/internal/service/workspacesweb/user_settings_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_user_settings_association", name="User Settings Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.UserSettings") +// @Testing(importStateIdAttribute="user_settings_arn,portal_arn") +func newUserSettingsAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &userSettingsAssociationResource{}, nil +} + +const ( + ResNameUserSettingsAssociation = "User Settings Association" +) + +type userSettingsAssociationResource struct { + framework.ResourceWithModel[userSettingsAssociationResourceModel] +} + +func (r *userSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "user_settings_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *userSettingsAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data userSettingsAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateUserSettingsInput{ + UserSettingsArn: data.UserSettingsARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateUserSettings(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameUserSettingsAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *userSettingsAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data userSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the user settings and checking associated portals + output, err := findUserSettingsByARN(ctx, conn, data.UserSettingsARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameUserSettingsAssociation, data.UserSettingsARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *userSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *userSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data userSettingsAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateUserSettingsInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateUserSettings(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameUserSettingsAssociation, data.UserSettingsARN.ValueString()), err.Error()) + return + } +} + +func (r *userSettingsAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + userSettingsAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, userSettingsAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: user_settings_arn,portal_arn. Got: %q", request.ID), + ) + return + } + userSettingsARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("user_settings_arn"), userSettingsARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type userSettingsAssociationResourceModel struct { + framework.WithRegionModel + UserSettingsARN types.String `tfsdk:"user_settings_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/user_settings_association_test.go b/internal/service/workspacesweb/user_settings_association_test.go new file mode 100644 index 000000000000..7a4a33ea7a9c --- /dev/null +++ b/internal/service/workspacesweb/user_settings_association_test.go @@ -0,0 +1,205 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebUserSettingsAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var userSettings awstypes.UserSettings + resourceName := "aws_workspacesweb_user_settings_association.test" + userSettingsResourceName := "aws_workspacesweb_user_settings.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckUserSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccUserSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings), + resource.TestCheckResourceAttrPair(resourceName, "user_settings_arn", userSettingsResourceName, "user_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccUserSettingsAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "user_settings_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebUserSettingsAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var userSettings1, userSettings2 awstypes.UserSettings + resourceName := "aws_workspacesweb_user_settings_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckUserSettingsAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccUserSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings1), + ), + }, + { + Config: testAccUserSettingsAssociationConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings2), + ), + }, + }, + }) +} + +func testAccCheckUserSettingsAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_user_settings_association" { + continue + } + + userSettings, err := tfworkspacesweb.FindUserSettingsByARN(ctx, conn, rs.Primary.Attributes["user_settings_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(userSettings.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web User Settings Association %s still exists", rs.Primary.Attributes["user_settings_arn"]) + } + } + + return nil + } +} + +func testAccCheckUserSettingsAssociationExists(ctx context.Context, n string, v *awstypes.UserSettings) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindUserSettingsByARN(ctx, conn, rs.Primary.Attributes["user_settings_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccUserSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["user_settings_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccUserSettingsAssociationConfig_basic() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_user_settings" "test" { + copy_allowed = "Enabled" + download_allowed = "Enabled" + paste_allowed = "Enabled" + print_allowed = "Enabled" + upload_allowed = "Enabled" +} + +resource "aws_workspacesweb_user_settings_association" "test" { + user_settings_arn = aws_workspacesweb_user_settings.test.user_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} + +func testAccUserSettingsAssociationConfig_updated() string { + return ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_user_settings" "test" { + copy_allowed = "Enabled" + download_allowed = "Enabled" + paste_allowed = "Enabled" + print_allowed = "Enabled" + upload_allowed = "Enabled" +} + +resource "aws_workspacesweb_user_settings" "test2" { + copy_allowed = "Disabled" + download_allowed = "Disabled" + paste_allowed = "Disabled" + print_allowed = "Disabled" + upload_allowed = "Disabled" +} + +resource "aws_workspacesweb_user_settings_association" "test" { + user_settings_arn = aws_workspacesweb_user_settings.test2.user_settings_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +` +} diff --git a/website/docs/r/workspacesweb_user_settings_association.html.markdown b/website/docs/r/workspacesweb_user_settings_association.html.markdown new file mode 100644 index 000000000000..6e664454e90a --- /dev/null +++ b/website/docs/r/workspacesweb_user_settings_association.html.markdown @@ -0,0 +1,62 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Settings Association. +--- + +# Resource: aws_workspacesweb_user_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Settings Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_user_settings" "example" { + copy_allowed = "Enabled" + download_allowed = "Enabled" + paste_allowed = "Enabled" + print_allowed = "Enabled" + upload_allowed = "Enabled" +} + +resource "aws_workspacesweb_user_settings_association" "example" { + user_settings_arn = aws_workspacesweb_user_settings.example.user_settings_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `user_settings_arn` - (Required) ARN of the user settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the user settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Settings Association using the `user_settings_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_user_settings_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:userSettings/user_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` From 8846a6c8a2b1c8c1ed0254daf48af8af2809a871 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 10:27:25 +0000 Subject: [PATCH 0155/2115] Added testcase for computed attributes in the two associated reources --- .../user_settings_association_test.go | 20 +++++++++++++++++++ ...eb_user_settings_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/user_settings_association_test.go b/internal/service/workspacesweb/user_settings_association_test.go index 7a4a33ea7a9c..4686b3b3c28d 100644 --- a/internal/service/workspacesweb/user_settings_association_test.go +++ b/internal/service/workspacesweb/user_settings_association_test.go @@ -51,6 +51,19 @@ func TestAccWorkSpacesWebUserSettingsAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccUserSettingsAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "user_settings_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccUserSettingsAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the UserSettings Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(userSettingsResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(userSettingsResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "user_settings_arn", userSettingsResourceName, "user_settings_arn"), + ), + }, }, }) } @@ -59,6 +72,9 @@ func TestAccWorkSpacesWebUserSettingsAssociation_update(t *testing.T) { ctx := acctest.Context(t) var userSettings1, userSettings2 awstypes.UserSettings resourceName := "aws_workspacesweb_user_settings_association.test" + userSettingsResourceName1 := "aws_workspacesweb_user_settings.test" + userSettingsResourceName2 := "aws_workspacesweb_user_settings.test2" + portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -74,12 +90,16 @@ func TestAccWorkSpacesWebUserSettingsAssociation_update(t *testing.T) { Config: testAccUserSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings1), + resource.TestCheckResourceAttrPair(resourceName, "user_settings_arn", userSettingsResourceName1, "user_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccUserSettingsAssociationConfig_updated(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings2), + resource.TestCheckResourceAttrPair(resourceName, "user_settings_arn", userSettingsResourceName2, "user_settings_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_user_settings_association.html.markdown b/website/docs/r/workspacesweb_user_settings_association.html.markdown index 6e664454e90a..1f403cf2ecb1 100644 --- a/website/docs/r/workspacesweb_user_settings_association.html.markdown +++ b/website/docs/r/workspacesweb_user_settings_association.html.markdown @@ -46,9 +46,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From 758af2cc12f34061120aba3937ba98356b31cdeb Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 15:02:22 +0000 Subject: [PATCH 0156/2115] Added new resource aws_workspacesweb_trust_store_association --- .changelog/43778.txt | 3 + .../workspacesweb/service_package_gen.go | 6 + .../workspacesweb/trust_store_association.go | 170 ++++++++++++ .../trust_store_association_test.go | 248 ++++++++++++++++++ ...sweb_trust_store_association.html.markdown | 64 +++++ 5 files changed, 491 insertions(+) create mode 100644 .changelog/43778.txt create mode 100644 internal/service/workspacesweb/trust_store_association.go create mode 100644 internal/service/workspacesweb/trust_store_association_test.go create mode 100644 website/docs/r/workspacesweb_trust_store_association.html.markdown diff --git a/.changelog/43778.txt b/.changelog/43778.txt new file mode 100644 index 000000000000..60714b3ec13c --- /dev/null +++ b/.changelog/43778.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_trust_store_association +``` \ No newline at end of file diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 285b8c2ece0c..5958bc90737b 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -111,6 +111,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newTrustStoreAssociationResource, + TypeName: "aws_workspacesweb_trust_store_association", + Name: "Trust Store Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newUserAccessLoggingSettingsResource, TypeName: "aws_workspacesweb_user_access_logging_settings", diff --git a/internal/service/workspacesweb/trust_store_association.go b/internal/service/workspacesweb/trust_store_association.go new file mode 100644 index 000000000000..a801ab0d69b0 --- /dev/null +++ b/internal/service/workspacesweb/trust_store_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_trust_store_association", name="Trust Store Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.TrustStore") +// @Testing(importStateIdAttribute="trust_store_arn,portal_arn") +func newTrustStoreAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &trustStoreAssociationResource{}, nil +} + +const ( + ResNameTrustStoreAssociation = "Trust Store Association" +) + +type trustStoreAssociationResource struct { + framework.ResourceWithModel[trustStoreAssociationResourceModel] +} + +func (r *trustStoreAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "trust_store_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *trustStoreAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data trustStoreAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateTrustStoreInput{ + TrustStoreArn: data.TrustStoreARN.ValueStringPointer(), + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.AssociateTrustStore(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameTrustStoreAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *trustStoreAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data trustStoreAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the trust store and checking associated portals + output, err := findTrustStoreByARN(ctx, conn, data.TrustStoreARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameTrustStoreAssociation, data.TrustStoreARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *trustStoreAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *trustStoreAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data trustStoreAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateTrustStoreInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateTrustStore(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameTrustStoreAssociation, data.TrustStoreARN.ValueString()), err.Error()) + return + } +} + +func (r *trustStoreAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + trustStoreAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, trustStoreAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: trust_store_arn,portal_arn. Got: %q", request.ID), + ) + return + } + trustStoreARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("trust_store_arn"), trustStoreARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type trustStoreAssociationResourceModel struct { + framework.WithRegionModel + TrustStoreARN types.String `tfsdk:"trust_store_arn"` + PortalARN types.String `tfsdk:"portal_arn"` +} diff --git a/internal/service/workspacesweb/trust_store_association_test.go b/internal/service/workspacesweb/trust_store_association_test.go new file mode 100644 index 000000000000..54de5341b9ea --- /dev/null +++ b/internal/service/workspacesweb/trust_store_association_test.go @@ -0,0 +1,248 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebTrustStoreAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var trustStore awstypes.TrustStore + resourceName := "aws_workspacesweb_trust_store_association.test" + trustStoreResourceName := "aws_workspacesweb_trust_store.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore), + resource.TestCheckResourceAttrPair(resourceName, "trust_store_arn", trustStoreResourceName, "trust_store_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccTrustStoreAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "trust_store_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebTrustStoreAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var trustStore1, trustStore2 awstypes.TrustStore + resourceName := "aws_workspacesweb_trust_store_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTrustStoreAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTrustStoreAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore1), + ), + }, + { + Config: testAccTrustStoreAssociationConfig_updated(), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore2), + ), + }, + }, + }) +} + +func testAccCheckTrustStoreAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_trust_store_association" { + continue + } + + trustStore, err := tfworkspacesweb.FindTrustStoreByARN(ctx, conn, rs.Primary.Attributes["trust_store_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(trustStore.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web Trust Store Association %s still exists", rs.Primary.Attributes["trust_store_arn"]) + } + } + + return nil + } +} + +func testAccCheckTrustStoreAssociationExists(ctx context.Context, n string, v *awstypes.TrustStore) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindTrustStoreByARN(ctx, conn, rs.Primary.Attributes["trust_store_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccTrustStoreAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["trust_store_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccTrustStoreAssociationConfig_acmBase() string { + return ` +data "aws_partition" "current" {} + +resource "aws_acmpca_certificate_authority" "test" { + type = "ROOT" + + certificate_authority_configuration { + key_algorithm = "RSA_2048" + signing_algorithm = "SHA256WITHRSA" + + subject { + common_name = "example.com" + } + } +} + +resource "aws_acmpca_certificate" "test1" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:${data.aws_partition.current.partition}:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} + +resource "aws_acmpca_certificate" "test2" { + certificate_authority_arn = aws_acmpca_certificate_authority.test.arn + certificate_signing_request = aws_acmpca_certificate_authority.test.certificate_signing_request + signing_algorithm = "SHA256WITHRSA" + + template_arn = "arn:${data.aws_partition.current.partition}:acm-pca:::template/RootCACertificate/V1" + + validity { + type = "YEARS" + value = 1 + } +} +` +} + +func testAccTrustStoreAssociationConfig_basic() string { + return acctest.ConfigCompose( + testAccTrustStoreAssociationConfig_acmBase(), + ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate { + body = aws_acmpca_certificate.test1.certificate + } +} + +resource "aws_workspacesweb_trust_store_association" "test" { + trust_store_arn = aws_workspacesweb_trust_store.test.trust_store_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`) +} + +func testAccTrustStoreAssociationConfig_updated() string { + return acctest.ConfigCompose( + testAccTrustStoreAssociationConfig_acmBase(), + ` +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + +resource "aws_workspacesweb_trust_store" "test" { + certificate { + body = aws_acmpca_certificate.test1.certificate + } +} + +resource "aws_workspacesweb_trust_store" "test2" { + certificate { + body = aws_acmpca_certificate.test2.certificate + } +} + +resource "aws_workspacesweb_trust_store_association" "test" { + trust_store_arn = aws_workspacesweb_trust_store.test2.trust_store_arn + portal_arn = aws_workspacesweb_portal.test.portal_arn +} +`) +} diff --git a/website/docs/r/workspacesweb_trust_store_association.html.markdown b/website/docs/r/workspacesweb_trust_store_association.html.markdown new file mode 100644 index 000000000000..f0629291a98a --- /dev/null +++ b/website/docs/r/workspacesweb_trust_store_association.html.markdown @@ -0,0 +1,64 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. +--- + +# Resource: aws_workspacesweb_trust_store_association + +Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_workspacesweb_trust_store" "example" { + certificate_list = [base64encode(file("certificate.pem"))] +} + +resource "aws_workspacesweb_trust_store_association" "example" { + trust_store_arn = aws_workspacesweb_trust_store.example.trust_store_arn + portal_arn = aws_workspacesweb_portal.example.portal_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `trust_store_arn` - (Required) ARN of the trust store to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the trust store. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `region` - AWS region where the resource is located. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_trust_store_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_trust_store_association.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` From 37a8095b11ba354276914f1e9764811509f15162 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 8 Aug 2025 15:06:37 +0000 Subject: [PATCH 0157/2115] Reduced the deletion time period to 7 days from the default of 30 days --- internal/service/workspacesweb/trust_store_association_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/workspacesweb/trust_store_association_test.go b/internal/service/workspacesweb/trust_store_association_test.go index 54de5341b9ea..95a90dffeb90 100644 --- a/internal/service/workspacesweb/trust_store_association_test.go +++ b/internal/service/workspacesweb/trust_store_association_test.go @@ -169,6 +169,7 @@ resource "aws_acmpca_certificate_authority" "test" { common_name = "example.com" } } + permanent_deletion_time_in_days = 7 } resource "aws_acmpca_certificate" "test1" { From 01cfb39fd8a2cf9987889c844d0d78c597af15ff Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 10:31:20 +0000 Subject: [PATCH 0158/2115] Added testcase for computed attributes in the two associated reources --- .../trust_store_association_test.go | 20 +++++++++++++++++++ ...sweb_trust_store_association.html.markdown | 4 +--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/internal/service/workspacesweb/trust_store_association_test.go b/internal/service/workspacesweb/trust_store_association_test.go index 95a90dffeb90..a37a19438fc2 100644 --- a/internal/service/workspacesweb/trust_store_association_test.go +++ b/internal/service/workspacesweb/trust_store_association_test.go @@ -51,6 +51,19 @@ func TestAccWorkSpacesWebTrustStoreAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccTrustStoreAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "trust_store_arn", }, + { + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccTrustStoreAssociationConfig_basic(), + Check: resource.ComposeAggregateTestCheckFunc( + //The following checks are for the TrustStore Resource and the PortalResource (and not for the association resource). + resource.TestCheckResourceAttr(trustStoreResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(trustStoreResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "trust_store_arn", trustStoreResourceName, "trust_store_arn"), + ), + }, }, }) } @@ -59,6 +72,9 @@ func TestAccWorkSpacesWebTrustStoreAssociation_update(t *testing.T) { ctx := acctest.Context(t) var trustStore1, trustStore2 awstypes.TrustStore resourceName := "aws_workspacesweb_trust_store_association.test" + trustStoreResourceName1 := "aws_workspacesweb_trust_store.test" + trustStoreResourceName2 := "aws_workspacesweb_trust_store.test2" + portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -74,12 +90,16 @@ func TestAccWorkSpacesWebTrustStoreAssociation_update(t *testing.T) { Config: testAccTrustStoreAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore1), + resource.TestCheckResourceAttrPair(resourceName, "trust_store_arn", trustStoreResourceName1, "trust_store_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccTrustStoreAssociationConfig_updated(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore2), + resource.TestCheckResourceAttrPair(resourceName, "trust_store_arn", trustStoreResourceName2, "trust_store_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, diff --git a/website/docs/r/workspacesweb_trust_store_association.html.markdown b/website/docs/r/workspacesweb_trust_store_association.html.markdown index f0629291a98a..93536311fa8a 100644 --- a/website/docs/r/workspacesweb_trust_store_association.html.markdown +++ b/website/docs/r/workspacesweb_trust_store_association.html.markdown @@ -42,9 +42,7 @@ The following arguments are optional: ## Attribute Reference -This resource exports the following attributes in addition to the arguments above: - -* `region` - AWS region where the resource is located. +This resource exports no additional attributes. ## Import From a5342b2d39ed438d96b092bca42f991e3067ea84 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Mon, 11 Aug 2025 18:47:18 +0000 Subject: [PATCH 0159/2115] Added resource SessionLogger --- .../service/workspacesweb/exports_test.go | 2 + .../workspacesweb/service_package_gen.go | 9 + .../service/workspacesweb/session_logger.go | 367 +++ .../session_logger_tags_gen_test.go | 2341 +++++++++++++++++ .../workspacesweb/session_logger_test.go | 564 ++++ .../testdata/SessionLogger/tags/main_gen.tf | 64 + .../SessionLogger/tagsComputed1/main_gen.tf | 68 + .../SessionLogger/tagsComputed2/main_gen.tf | 79 + .../SessionLogger/tags_defaults/main_gen.tf | 75 + .../SessionLogger/tags_ignore/main_gen.tf | 84 + .../testdata/tmpl/session_logger_tags.gtpl | 48 + ...workspacesweb_session_logger.html.markdown | 212 ++ 12 files changed, 3913 insertions(+) create mode 100644 internal/service/workspacesweb/session_logger.go create mode 100644 internal/service/workspacesweb/session_logger_tags_gen_test.go create mode 100644 internal/service/workspacesweb/session_logger_test.go create mode 100644 internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf create mode 100644 internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl create mode 100644 website/docs/r/workspacesweb_session_logger.html.markdown diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index c98aa444d371..3943b9362870 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -11,6 +11,7 @@ var ( ResourceIPAccessSettings = newIPAccessSettingsResource ResourceNetworkSettings = newNetworkSettingsResource ResourcePortal = newPortalResource + ResourceSessionLogger = newSessionLoggerResource ResourceTrustStore = newTrustStoreResource ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserSettings = newUserSettingsResource @@ -21,6 +22,7 @@ var ( FindIPAccessSettingsByARN = findIPAccessSettingsByARN FindNetworkSettingsByARN = findNetworkSettingsByARN FindPortalByARN = findPortalByARN + FindSessionLoggerByARN = findSessionLoggerByARN FindTrustStoreByARN = findTrustStoreByARN FindUserAccessLoggingSettingsByARN = findUserAccessLoggingSettingsByARN FindUserSettingsByARN = findUserSettingsByARN diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 5958bc90737b..7ac3287258ed 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -102,6 +102,15 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newSessionLoggerResource, + TypeName: "aws_workspacesweb_session_logger", + Name: "Session Logger", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: "session_logger_arn", + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newTrustStoreResource, TypeName: "aws_workspacesweb_trust_store", diff --git a/internal/service/workspacesweb/session_logger.go b/internal/service/workspacesweb/session_logger.go new file mode 100644 index 000000000000..fecfadab54f5 --- /dev/null +++ b/internal/service/workspacesweb/session_logger.go @@ -0,0 +1,367 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework/diag" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/schema/validator" + "github.com/hashicorp/terraform-plugin-framework/types" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @FrameworkResource("aws_workspacesweb_session_logger", name="Session Logger") +// @Tags(identifierAttribute="session_logger_arn") +// @Testing(tagsTest=true) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.SessionLogger") +// @Testing(importStateIdAttribute="session_logger_arn") +func newSessionLoggerResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &sessionLoggerResource{}, nil +} + +type sessionLoggerResource struct { + framework.ResourceWithModel[sessionLoggerResourceModel] +} + +func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "additional_encryption_context": schema.MapAttribute{ + CustomType: fwtypes.MapOfStringType, + ElementType: types.StringType, + Optional: true, + PlanModifiers: []planmodifier.Map{ + mapplanmodifier.RequiresReplace(), + }, + }, + "associated_portal_arns": schema.ListAttribute{ + CustomType: fwtypes.ListOfStringType, + ElementType: types.StringType, + Computed: true, + PlanModifiers: []planmodifier.List{ + listplanmodifier.UseStateForUnknown(), + }, + }, + "customer_managed_key": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Optional: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + names.AttrDisplayName: schema.StringAttribute{ + Optional: true, + }, + "event_filter": schema.ListAttribute{ + CustomType: fwtypes.NewListNestedObjectTypeOf[eventFilterModel](ctx), + Required: true, + PlanModifiers: []planmodifier.List{ + listplanmodifier.UseStateForUnknown(), + }, + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + }, + "session_logger_arn": schema.StringAttribute{ + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, + }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), + }, + Blocks: map[string]schema.Block{ + "log_configuration": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[logConfigurationModel](ctx), + NestedObject: schema.NestedBlockObject{ + Blocks: map[string]schema.Block{ + "s3": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[s3LogConfigurationModel](ctx), + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "bucket": schema.StringAttribute{ + Required: true, + }, + "bucket_owner": schema.StringAttribute{ + Optional: true, + Computed: true, + }, + "folder_structure": schema.StringAttribute{ + Required: true, + }, + "key_prefix": schema.StringAttribute{ + Optional: true, + }, + "log_file_format": schema.StringAttribute{ + Required: true, + }, + }, + }, + }, + }, + }, + }, + }, + } +} + +func (r *sessionLoggerResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data sessionLoggerResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + var input workspacesweb.CreateSessionLoggerInput + + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { + return + } + + // Additional fields. + input.ClientToken = aws.String(sdkid.UniqueId()) + input.Tags = getTagsIn(ctx) + + output, err := conn.CreateSessionLogger(ctx, &input) + + if err != nil { + response.Diagnostics.AddError("creating WorkSpacesWeb Session Logger", err.Error()) + return + } + + data.SessionLoggerARN = fwflex.StringToFramework(ctx, output.SessionLoggerArn) + + // Get the session logger details to populate other fields + sessionLogger, err := findSessionLoggerByARN(ctx, conn, data.SessionLoggerARN.ValueString()) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Session Logger (%s)", data.SessionLoggerARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, sessionLogger, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *sessionLoggerResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data sessionLoggerResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + output, err := findSessionLoggerByARN(ctx, conn, data.SessionLoggerARN.ValueString()) + if tfresource.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Session Logger (%s)", data.SessionLoggerARN.ValueString()), err.Error()) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *sessionLoggerResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var old, new sessionLoggerResourceModel + + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { + return + } + if !new.DisplayName.Equal(old.DisplayName) || + !new.EventFilter.Equal(old.EventFilter) || + !new.CustomerManagedKey.Equal(old.CustomerManagedKey) || + !new.AdditionalEncryptionContext.Equal(old.AdditionalEncryptionContext) || + !new.LogConfiguration.Equal(old.LogConfiguration) { + conn := r.Meta().WorkSpacesWebClient(ctx) + + var input workspacesweb.UpdateSessionLoggerInput + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { + return + } + + output, err := conn.UpdateSessionLogger(ctx, &input) + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Session Logger (%s)", old.SessionLoggerARN.ValueString()), err.Error()) + return + } + + // Use new as base and flatten the response into it + response.Diagnostics.Append(fwflex.Flatten(ctx, output.SessionLogger, &new)...) + if response.Diagnostics.HasError() { + return + } + } + + response.Diagnostics.Append(response.State.Set(ctx, new)...) + +} + +func (r *sessionLoggerResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data sessionLoggerResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DeleteSessionLoggerInput{ + SessionLoggerArn: data.SessionLoggerARN.ValueStringPointer(), + } + _, err := conn.DeleteSessionLogger(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Session Logger (%s)", data.SessionLoggerARN.ValueString()), err.Error()) + return + } +} + +func (r *sessionLoggerResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("session_logger_arn"), request, response) +} + +func findSessionLoggerByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.SessionLogger, error) { + input := workspacesweb.GetSessionLoggerInput{ + SessionLoggerArn: &arn, + } + output, err := conn.GetSessionLogger(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.SessionLogger == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.SessionLogger, nil +} + +type sessionLoggerResourceModel struct { + framework.WithRegionModel + AdditionalEncryptionContext fwtypes.MapOfString `tfsdk:"additional_encryption_context"` + AssociatedPortalARNs fwtypes.ListOfString `tfsdk:"associated_portal_arns"` + CustomerManagedKey fwtypes.ARN `tfsdk:"customer_managed_key"` + DisplayName types.String `tfsdk:"display_name"` + EventFilter fwtypes.ListNestedObjectValueOf[eventFilterModel] `tfsdk:"event_filter"` + LogConfiguration fwtypes.ListNestedObjectValueOf[logConfigurationModel] `tfsdk:"log_configuration"` + SessionLoggerARN types.String `tfsdk:"session_logger_arn"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` +} + +type logConfigurationModel struct { + S3 fwtypes.ListNestedObjectValueOf[s3LogConfigurationModel] `tfsdk:"s3"` +} + +type eventFilterModel struct { + All types.Object `tfsdk:"all"` + Include fwtypes.SetOfString `tfsdk:"include"` +} + +var ( + _ fwflex.Expander = eventFilterModel{} + _ fwflex.Flattener = &eventFilterModel{} +) + +func (m eventFilterModel) Expand(ctx context.Context) (any, diag.Diagnostics) { + if !m.All.IsNull() { + return &awstypes.EventFilterMemberAll{Value: awstypes.Unit{}}, nil + } + if !m.Include.IsNull() { + var events []awstypes.Event + for _, event := range m.Include.Elements() { + events = append(events, awstypes.Event(event.(types.String).ValueString())) + } + return &awstypes.EventFilterMemberInclude{Value: events}, nil + } + return nil, nil +} + +func (m *eventFilterModel) Flatten(ctx context.Context, v any) diag.Diagnostics { + switch val := v.(type) { + case awstypes.EventFilterMemberAll: + m.All = types.ObjectValueMust(map[string]attr.Type{}, map[string]attr.Value{}) + m.Include = fwtypes.NewSetValueOfNull[types.String](ctx) + case awstypes.EventFilterMemberInclude: + m.All = types.ObjectNull(map[string]attr.Type{}) + var events []string + for _, event := range val.Value { + events = append(events, string(event)) + } + var elements []attr.Value + for _, event := range events { + elements = append(elements, types.StringValue(event)) + } + m.Include, _ = fwtypes.NewSetValueOf[types.String](ctx, elements) + } + return nil +} + +type s3LogConfigurationModel struct { + Bucket types.String `tfsdk:"bucket"` + BucketOwner types.String `tfsdk:"bucket_owner"` + FolderStructure types.String `tfsdk:"folder_structure"` + KeyPrefix types.String `tfsdk:"key_prefix"` + LogFileFormat types.String `tfsdk:"log_file_format"` +} diff --git a/internal/service/workspacesweb/session_logger_tags_gen_test.go b/internal/service/workspacesweb/session_logger_tags_gen_test.go new file mode 100644 index 000000000000..32abfcb85a18 --- /dev/null +++ b/internal/service/workspacesweb/session_logger_tags_gen_test.go @@ -0,0 +1,2341 @@ +// Code generated by internal/generate/tagstests/main.go; DO NOT EDIT. + +package workspacesweb_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebSessionLogger_tags(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_null(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_EmptyMap(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_AddOnUpdate(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_EmptyTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_EmptyTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + acctest.CtKey2: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + acctest.CtKey2: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_providerOnly(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1Updated), + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1Updated), + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey2: knownvalue.StringExact(acctest.CtValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey2: config.StringVariable(acctest.CtValue2), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_nonOverlapping(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1Updated), + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{})), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_overlapping(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtOverlapKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + acctest.CtOverlapKey2: config.StringVariable("providervalue2"), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtOverlapKey2: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtOverlapKey1: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtOverlapKey1: config.StringVariable(acctest.CtResourceValue2), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_updateToProviderOnly(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_updateToResourceOnly(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_emptyResourceTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(""), + }), + acctest.CtResourceTags: nil, + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(""), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + ImportStateVerifyIgnore: []string{ + acctest.CtTagsKey1, // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.Null(), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(""), + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_defaults/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: nil, + }), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + ImportStateVerifyIgnore: []string{ + "tags.resourcekey1", // The canonical value returned by the AWS API is "" + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_ComputedTag_OnCreate(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_ComputedTag_OnUpdate_Add(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed2/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(2)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapPartial(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey("computedkey1")), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed2/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable("computedkey1"), + "knownTagKey": config.StringVariable(acctest.CtKey1), + "knownTagValue": config.StringVariable(acctest.CtValue1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtKey1: config.StringVariable(acctest.CtValue1), + }), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtKey1: knownvalue.StringExact(acctest.CtValue1), + })), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapSizeExact(1)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapSizeExact(1)), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTags).AtMapKey(acctest.CtKey1)), + plancheck.ExpectUnknownValue(resourceName, tfjsonpath.New(names.AttrTagsAll)), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tagsComputed1/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "unknownTagKey": config.StringVariable(acctest.CtKey1), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 2: Update ignored tag only + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Updated), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtProviderTags: config.MapVariable(map[string]config.Variable{ + acctest.CtProviderKey1: config.StringVariable(acctest.CtProviderValue1Again), + }), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtProviderKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtProviderKey1: knownvalue.StringExact(acctest.CtProviderValue1), // TODO: Should not be set + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + }, + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { + ctx := acctest.Context(t) + + var v types.SessionLogger + resourceName := "aws_workspacesweb_session_logger.test" + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + // 1: Create + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 2: Update ignored tag + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Updated), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + // 3: Update both tags + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SessionLogger/tags_ignore/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{ + acctest.CtResourceKey1: config.StringVariable(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: config.StringVariable(acctest.CtResourceValue2Updated), + }), + "ignore_tag_keys": config.SetVariable( + config.StringVariable(acctest.CtResourceKey1), + ), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + expectFullResourceTags(ctx, resourceName, knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1), // TODO: Should not be set + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + PostApplyPreRefresh: []plancheck.PlanCheck{ + plancheck.ExpectEmptyPlan(), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), // TODO: Should be NoOp + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey1: knownvalue.StringExact(acctest.CtResourceValue1Again), + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTagsAll), knownvalue.MapExact(map[string]knownvalue.Check{ + acctest.CtResourceKey2: knownvalue.StringExact(acctest.CtResourceValue2Updated), + })), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} diff --git a/internal/service/workspacesweb/session_logger_test.go b/internal/service/workspacesweb/session_logger_test.go new file mode 100644 index 000000000000..b385b879735f --- /dev/null +++ b/internal/service/workspacesweb/session_logger_test.go @@ -0,0 +1,564 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "testing" + + "github.com/YakDriver/regexache" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebSessionLogger_basic(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, "log_configuration.0.s3.0.bucket", "aws_s3_bucket.test", "id"), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.%", "0"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "session_logger_arn", "workspaces-web", regexache.MustCompile(`sessionLogger/.+$`)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, "session_logger_arn"), + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_complete(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_complete(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson), string(awstypes.EventSessionStart)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttrSet(resourceName, "customer_managed_key"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "1"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", "value"), + resource.TestCheckResourceAttrSet(resourceName, "log_configuration.0.s3.0.bucket_owner"), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.key_prefix", "logs/"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.include.#", "1"), + resource.TestCheckTypeSetElemAttr(resourceName, "event_filter.0.include.*", string(awstypes.EventSessionStart)), + ), + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_update(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.%", "0"), + ), + }, + { + Config: testAccSessionLoggerConfig_update(rName2, string(awstypes.FolderStructureNestedByDate), string(awstypes.LogFileFormatJsonLines), string(awstypes.EventSessionStart), string(awstypes.EventSessionEnd)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName2), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureNestedByDate)), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJsonLines)), + resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.key_prefix", "updated-logs/"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.include.#", "2"), + resource.TestCheckTypeSetElemAttr(resourceName, "event_filter.0.include.*", string(awstypes.EventSessionStart)), + resource.TestCheckTypeSetElemAttr(resourceName, "event_filter.0.include.*", string(awstypes.EventSessionEnd)), + ), + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_customerManagedKeyUpdate(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_customerManagedKey(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test", "arn"), + ), + }, + { + Config: testAccSessionLoggerConfig_customerManagedKeyUpdated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test2", "arn"), + ), + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_additionalEncryptionContextUpdate(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_additionalEncryptionContext(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "1"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", "value"), + ), + }, + { + Config: testAccSessionLoggerConfig_additionalEncryptionContextUpdated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "2"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.environment", "production"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.application", "workspaces"), + ), + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLogger_disappears(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceSessionLogger, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckSessionLoggerDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_session_logger" { + continue + } + + _, err := tfworkspacesweb.FindSessionLoggerByARN(ctx, conn, rs.Primary.Attributes["session_logger_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + return fmt.Errorf("WorkSpaces Web Session Logger %s still exists", rs.Primary.Attributes["session_logger_arn"]) + } + + return nil + } +} + +func testAccCheckSessionLoggerExists(ctx context.Context, n string, v *awstypes.SessionLogger) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindSessionLoggerByARN(ctx, conn, rs.Primary.Attributes["session_logger_arn"]) + + if err != nil { + return err + } + + *v = *output + + return nil + } +} + +func testAccSessionLoggerConfig_s3Base(rName string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} +`, rName) +} + +func testAccSessionLoggerConfig_kmsBase(rName string) string { + return testAccSessionLoggerConfig_s3Base(rName) + ` +data "aws_iam_policy_document" "kms_key_policy" { + statement { + principals { + type = "AWS" + identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + } + actions = ["kms:*"] + resources = ["*"] + } + + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "kms:Encrypt", + "kms:GenerateDataKey*", + "kms:ReEncrypt*", + "kms:Decrypt" + ] + resources = ["*"] + } +} + +resource "aws_kms_key" "test" { + description = "Test key for session logger" + policy = data.aws_iam_policy_document.kms_key_policy.json +} + +data "aws_caller_identity" "current" {} +` +} + +func testAccSessionLoggerConfig_basic(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerConfig_s3Base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + event_filter { + all = {} + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat) +} + +func testAccSessionLoggerConfig_complete(rName, folderStructureType, logFileFormat, event string) string { + return testAccSessionLoggerConfig_kmsBase(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + customer_managed_key = aws_kms_key.test.arn + additional_encryption_context = { + test = "value" + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + bucket_owner = data.aws_caller_identity.current.account_id + folder_structure = %[2]q + key_prefix = "logs/" + log_file_format = %[3]q + } + } + + event_filter { + include = [%[4]q] + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat, event) +} + +func testAccSessionLoggerConfig_update(rName, folderStructureType, logFileFormat, event1, event2 string) string { + return testAccSessionLoggerConfig_s3Base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + key_prefix = "updated-logs/" + log_file_format = %[3]q + } + } + + event_filter { + include = [%[4]q, %[5]q] + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat, event1, event2) +} + +func testAccSessionLoggerConfig_customerManagedKey(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerConfig_kmsBase(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + customer_managed_key = aws_kms_key.test.arn + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + event_filter { + all = {} + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat) +} + +func testAccSessionLoggerConfig_additionalEncryptionContext(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerConfig_s3Base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + additional_encryption_context = { + test = "value" + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + event_filter { + all = {} + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat) +} + +func testAccSessionLoggerConfig_additionalEncryptionContextUpdated(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerConfig_s3Base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + additional_encryption_context = { + environment = "production" + application = "workspaces" + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + event_filter { + all = {} + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat) +} + +func testAccSessionLoggerConfig_customerManagedKeyUpdated(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerConfig_s3Base(rName) + ` +data "aws_iam_policy_document" "kms_key_policy" { + statement { + principals { + type = "AWS" + identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + } + actions = ["kms:*"] + resources = ["*"] + } + + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "kms:Encrypt", + "kms:GenerateDataKey*", + "kms:ReEncrypt*", + "kms:Decrypt" + ] + resources = ["*"] + } +} + +resource "aws_kms_key" "test" { + description = "Test key for session logger" + policy = data.aws_iam_policy_document.kms_key_policy.json +} + +resource "aws_kms_key" "test2" { + description = "Test key 2 for session logger" + policy = data.aws_iam_policy_document.kms_key_policy.json +} + +data "aws_caller_identity" "current" {} +` + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + customer_managed_key = aws_kms_key.test2.arn + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + event_filter { + all = {} + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} +`, rName, folderStructureType, logFileFormat) +} diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf new file mode 100644 index 000000000000..e66156311e86 --- /dev/null +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf @@ -0,0 +1,64 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + + tags = var.resource_tags + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf new file mode 100644 index 000000000000..1bf8cf122e3f --- /dev/null +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf @@ -0,0 +1,68 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + + tags = { + (var.unknownTagKey) = null_resource.test.id + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} + +resource "null_resource" "test" {} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "unknownTagKey" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf new file mode 100644 index 000000000000..ef2b8b9d94f2 --- /dev/null +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf @@ -0,0 +1,79 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "null" {} + +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} + +resource "null_resource" "test" {} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "unknownTagKey" { + type = string + nullable = false +} + +variable "knownTagKey" { + type = string + nullable = false +} + +variable "knownTagValue" { + type = string + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf new file mode 100644 index 000000000000..e007c8e1fd8b --- /dev/null +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf @@ -0,0 +1,75 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } +} + +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + + tags = var.resource_tags + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf new file mode 100644 index 000000000000..75eeb0f1822d --- /dev/null +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf @@ -0,0 +1,84 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +provider "aws" { + default_tags { + tags = var.provider_tags + } + ignore_tags { + keys = var.ignore_tag_keys + } +} + +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + + tags = var.resource_tags + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "resource_tags" { + description = "Tags to set on resource. To specify no tags, set to `null`" + # Not setting a default, so that this must explicitly be set to `null` to specify no tags + type = map(string) + nullable = true +} + +variable "provider_tags" { + type = map(string) + nullable = true + default = null +} + +variable "ignore_tag_keys" { + type = set(string) + nullable = false +} diff --git a/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl new file mode 100644 index 000000000000..7776ef12c6e1 --- /dev/null +++ b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl @@ -0,0 +1,48 @@ +resource "aws_workspacesweb_session_logger" "test" { + display_name = var.rName + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.bucket + folder_structure = "Flat" + log_file_format = "Json" + } + } + +{{- template "tags" . }} + + depends_on = [aws_s3_bucket_policy.allow_write_access] + +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + "${aws_s3_bucket.test.arn}", + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} diff --git a/website/docs/r/workspacesweb_session_logger.html.markdown b/website/docs/r/workspacesweb_session_logger.html.markdown new file mode 100644 index 000000000000..3afbfdd1743d --- /dev/null +++ b/website/docs/r/workspacesweb_session_logger.html.markdown @@ -0,0 +1,212 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger. +--- + +# Resource: aws_workspacesweb_session_logger + +Terraform resource for managing an AWS WorkSpaces Web Session Logger. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_s3_bucket" "example" { + bucket = "example-session-logs" +} + +data "aws_iam_policy_document" "example" { + statement { + effect = "Allow" + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "s3:PutObject" + ] + resources = ["${aws_s3_bucket.example.arn}/*"] + } +} + +resource "aws_s3_bucket_policy" "example" { + bucket = aws_s3_bucket.example.id + policy = data.aws_iam_policy_document.example.json +} + +resource "aws_workspacesweb_session_logger" "example" { + display_name = "example-session-logger" + + event_filter { + all = true + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.example.id + folder_structure = "Flat" + log_file_format = "Json" + } + } + + depends_on = [aws_s3_bucket_policy.example] +} +``` + +### Complete Configuration with KMS Encryption + +```terraform +resource "aws_s3_bucket" "example" { + bucket = "example-session-logs" + force_destroy = true +} + +data "aws_iam_policy_document" "example" { + statement { + effect = "Allow" + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "s3:PutObject" + ] + resources = [ + "${aws_s3_bucket.example.arn}", + "${aws_s3_bucket.example.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "example" { + bucket = aws_s3_bucket.example.id + policy = data.aws_iam_policy_document.example.json +} + +data "aws_caller_identity" "current" {} + +data "aws_iam_policy_document" "kms_key_policy" { + statement { + principals { + type = "AWS" + identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + } + actions = ["kms:*"] + resources = ["*"] + } + + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "kms:Encrypt", + "kms:GenerateDataKey*", + "kms:ReEncrypt*", + "kms:Decrypt" + ] + resources = ["*"] + } +} + +resource "aws_kms_key" "example" { + description = "KMS key for WorkSpaces Web Session Logger" + policy = data.aws_iam_policy_document.kms_key_policy.json +} + +resource "aws_workspacesweb_session_logger" "example" { + display_name = "example-session-logger" + customer_managed_key = aws_kms_key.example.arn + additional_encryption_context = { + Environment = "Production" + Application = "WorkSpacesWeb" + } + + event_filter { + include = ["SessionStart", "SessionEnd"] + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.example.id + bucket_owner = data.aws_caller_identity.current.account_id + folder_structure = "NestedByDate" + key_prefix = "workspaces-web-logs/" + log_file_format = "JsonLines" + } + } + + tags = { + Name = "example-session-logger" + Environment = "Production" + } + + depends_on = [aws_s3_bucket_policy.example, aws_kms_key.example] +} +``` + +## Argument Reference + +The following arguments are required: + +* `event_filter` - (Required) Event filter that determines which events are logged. See [Event Filter](#event-filter) below. +* `log_configuration` - (Required) Configuration block for specifying where logs are delivered. See [Log Configuration](#log-configuration) below. + +The following arguments are optional: + +* `additional_encryption_context` - (Optional) Map of additional encryption context key-value pairs. +* `customer_managed_key` - (Optional) ARN of the customer managed KMS key used to encrypt sensitive information. +* `display_name` - (Optional) Human-readable display name for the session logger resource. Forces replacement if changed. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Log Configuration + +* `s3` - (Required) Configuration block for S3 log delivery. See [S3 Configuration](#s3-configuration) below. + +### Event Filter + +Exactly one of the following must be specified: + +* `all` - (Optional) Boolean that specifies to monitor all events. Set to `true` to monitor all events. +* `include` - (Optional) List of specific events to monitor. Valid values include session events like `SessionStart`, `SessionEnd`, etc. + +### S3 Configuration + +* `bucket` - (Required) S3 bucket name where logs are delivered. +* `folder_structure` - (Required) Folder structure that defines the organizational structure for log files in S3. Valid values: `FlatStructure`, `DateBasedStructure`. +* `log_file_format` - (Required) Format of the log file written to S3. Valid values: `Json`, `Parquet`. +* `bucket_owner` - (Optional) Expected bucket owner of the target S3 bucket. +* `key_prefix` - (Optional) S3 path prefix that determines where log files are stored. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `associated_portal_arns` - List of ARNs of the web portals associated with the session logger. +* `session_logger_arn` - ARN of the session logger. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +~> **Note:** The `additional_encryption_context` and `customer_managed_key` attributes are computed when not specified and will be populated with values from the AWS API response. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger using the `session_logger_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_session_logger.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Session Logger using the `session_logger_arn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678 +``` From 761f3b71a158a82bc5cd61e732f53d8bc8866ee2 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 13 Aug 2025 13:40:27 +0000 Subject: [PATCH 0160/2115] Cleaned up lint and semgrep findings --- .../service/workspacesweb/session_logger.go | 12 ++++---- .../workspacesweb/session_logger_test.go | 28 +++++++++++-------- .../testdata/SessionLogger/tags/main_gen.tf | 2 +- .../SessionLogger/tagsComputed1/main_gen.tf | 2 +- .../SessionLogger/tagsComputed2/main_gen.tf | 2 +- .../SessionLogger/tags_defaults/main_gen.tf | 2 +- .../SessionLogger/tags_ignore/main_gen.tf | 2 +- .../testdata/tmpl/session_logger_tags.gtpl | 2 +- ...workspacesweb_session_logger.html.markdown | 6 ++-- 9 files changed, 33 insertions(+), 25 deletions(-) diff --git a/internal/service/workspacesweb/session_logger.go b/internal/service/workspacesweb/session_logger.go index fecfadab54f5..1fcd373edd0b 100644 --- a/internal/service/workspacesweb/session_logger.go +++ b/internal/service/workspacesweb/session_logger.go @@ -48,7 +48,6 @@ type sessionLoggerResource struct { } func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { - response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "additional_encryption_context": schema.MapAttribute{ @@ -105,7 +104,7 @@ func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.Sch CustomType: fwtypes.NewListNestedObjectTypeOf[s3LogConfigurationModel](ctx), NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ - "bucket": schema.StringAttribute{ + names.AttrBucket: schema.StringAttribute{ Required: true, }, "bucket_owner": schema.StringAttribute{ @@ -242,7 +241,6 @@ func (r *sessionLoggerResource) Update(ctx context.Context, request resource.Upd } response.Diagnostics.Append(response.State.Set(ctx, new)...) - } func (r *sessionLoggerResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { @@ -325,6 +323,8 @@ var ( ) func (m eventFilterModel) Expand(ctx context.Context) (any, diag.Diagnostics) { + var diags diag.Diagnostics + if !m.All.IsNull() { return &awstypes.EventFilterMemberAll{Value: awstypes.Unit{}}, nil } @@ -335,10 +335,12 @@ func (m eventFilterModel) Expand(ctx context.Context) (any, diag.Diagnostics) { } return &awstypes.EventFilterMemberInclude{Value: events}, nil } - return nil, nil + return nil, diags } func (m *eventFilterModel) Flatten(ctx context.Context, v any) diag.Diagnostics { + var diags diag.Diagnostics + switch val := v.(type) { case awstypes.EventFilterMemberAll: m.All = types.ObjectValueMust(map[string]attr.Type{}, map[string]attr.Value{}) @@ -355,7 +357,7 @@ func (m *eventFilterModel) Flatten(ctx context.Context, v any) diag.Diagnostics } m.Include, _ = fwtypes.NewSetValueOf[types.String](ctx, elements) } - return nil + return diags } type s3LogConfigurationModel struct { diff --git a/internal/service/workspacesweb/session_logger_test.go b/internal/service/workspacesweb/session_logger_test.go index b385b879735f..3a04ee63a68d 100644 --- a/internal/service/workspacesweb/session_logger_test.go +++ b/internal/service/workspacesweb/session_logger_test.go @@ -43,7 +43,7 @@ func TestAccWorkSpacesWebSessionLogger_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.#", "1"), - resource.TestCheckResourceAttrPair(resourceName, "log_configuration.0.s3.0.bucket", "aws_s3_bucket.test", "id"), + resource.TestCheckResourceAttrPair(resourceName, "log_configuration.0.s3.0.bucket", "aws_s3_bucket.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.%", "0"), @@ -84,7 +84,7 @@ func TestAccWorkSpacesWebSessionLogger_complete(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), resource.TestCheckResourceAttrSet(resourceName, "customer_managed_key"), resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "1"), - resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", "value"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", names.AttrValue), resource.TestCheckResourceAttrSet(resourceName, "log_configuration.0.s3.0.bucket_owner"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.key_prefix", "logs/"), resource.TestCheckResourceAttr(resourceName, "event_filter.0.include.#", "1"), @@ -160,7 +160,7 @@ func TestAccWorkSpacesWebSessionLogger_customerManagedKeyUpdate(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), - resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test", names.AttrARN), ), }, { @@ -168,7 +168,7 @@ func TestAccWorkSpacesWebSessionLogger_customerManagedKeyUpdate(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), - resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test2", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test2", names.AttrARN), ), }, }, @@ -197,7 +197,7 @@ func TestAccWorkSpacesWebSessionLogger_additionalEncryptionContextUpdate(t *test testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "1"), - resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", "value"), + resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", names.AttrValue), ), }, { @@ -307,7 +307,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } @@ -322,11 +322,15 @@ resource "aws_s3_bucket_policy" "allow_write_access" { func testAccSessionLoggerConfig_kmsBase(rName string) string { return testAccSessionLoggerConfig_s3Base(rName) + ` +data "aws_partition" "current" {} + +data "aws_caller_identity" "current" {} + data "aws_iam_policy_document" "kms_key_policy" { statement { principals { type = "AWS" - identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] } actions = ["kms:*"] resources = ["*"] @@ -351,8 +355,6 @@ resource "aws_kms_key" "test" { description = "Test key for session logger" policy = data.aws_iam_policy_document.kms_key_policy.json } - -data "aws_caller_identity" "current" {} ` } @@ -505,11 +507,15 @@ resource "aws_workspacesweb_session_logger" "test" { func testAccSessionLoggerConfig_customerManagedKeyUpdated(rName, folderStructureType, logFileFormat string) string { return testAccSessionLoggerConfig_s3Base(rName) + ` +data "aws_partition" "current" {} + +data "aws_caller_identity" "current" {} + data "aws_iam_policy_document" "kms_key_policy" { statement { principals { type = "AWS" - identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] } actions = ["kms:*"] resources = ["*"] @@ -539,8 +545,6 @@ resource "aws_kms_key" "test2" { description = "Test key 2 for session logger" policy = data.aws_iam_policy_document.kms_key_policy.json } - -data "aws_caller_identity" "current" {} ` + fmt.Sprintf(` resource "aws_workspacesweb_session_logger" "test" { display_name = %[1]q diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf index e66156311e86..889735224e83 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf @@ -39,7 +39,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf index 1bf8cf122e3f..5290a91c84b5 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf @@ -43,7 +43,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf index ef2b8b9d94f2..bab46be5841d 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf @@ -44,7 +44,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf index e007c8e1fd8b..b8cb124c9d35 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf @@ -45,7 +45,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf index 75eeb0f1822d..e6a0120853ed 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf @@ -48,7 +48,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl index 7776ef12c6e1..36e9a616631f 100644 --- a/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl @@ -36,7 +36,7 @@ data "aws_iam_policy_document" "allow_write_access" { ] resources = [ - "${aws_s3_bucket.test.arn}", + aws_s3_bucket.test.arn, "${aws_s3_bucket.test.arn}/*" ] } diff --git a/website/docs/r/workspacesweb_session_logger.html.markdown b/website/docs/r/workspacesweb_session_logger.html.markdown index 3afbfdd1743d..5d96c253c60c 100644 --- a/website/docs/r/workspacesweb_session_logger.html.markdown +++ b/website/docs/r/workspacesweb_session_logger.html.markdown @@ -76,7 +76,7 @@ data "aws_iam_policy_document" "example" { "s3:PutObject" ] resources = [ - "${aws_s3_bucket.example.arn}", + aws_s3_bucket.example.arn, "${aws_s3_bucket.example.arn}/*" ] } @@ -87,13 +87,15 @@ resource "aws_s3_bucket_policy" "example" { policy = data.aws_iam_policy_document.example.json } +data "aws_partition" "current" {} + data "aws_caller_identity" "current" {} data "aws_iam_policy_document" "kms_key_policy" { statement { principals { type = "AWS" - identifiers = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"] + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] } actions = ["kms:*"] resources = ["*"] From 78ce38820d231f8c0b9bc46c931bc45a41536cd8 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 13 Aug 2025 14:38:35 +0000 Subject: [PATCH 0161/2115] Added Changelog entry --- .changelog/43863.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43863.txt diff --git a/.changelog/43863.txt b/.changelog/43863.txt new file mode 100644 index 000000000000..d0b2f6d8fa5e --- /dev/null +++ b/.changelog/43863.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_session_logger +``` \ No newline at end of file From f0a360d2c79ee48d36cb252a6ca2a46c3d0c13f2 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 13 Aug 2025 15:43:36 +0000 Subject: [PATCH 0162/2115] Added resource SessionLoggerAssociation --- .../workspacesweb/service_package_gen.go | 6 + .../session_logger_association.go | 170 +++++++++++ .../session_logger_association_test.go | 266 ++++++++++++++++++ ...b_session_logger_association.html.markdown | 101 +++++++ 4 files changed, 543 insertions(+) create mode 100644 internal/service/workspacesweb/session_logger_association.go create mode 100644 internal/service/workspacesweb/session_logger_association_test.go create mode 100644 website/docs/r/workspacesweb_session_logger_association.html.markdown diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index 7ac3287258ed..e39363118036 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -111,6 +111,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser }), Region: unique.Make(inttypes.ResourceRegionDefault()), }, + { + Factory: newSessionLoggerAssociationResource, + TypeName: "aws_workspacesweb_session_logger_association", + Name: "Session Logger Association", + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, { Factory: newTrustStoreResource, TypeName: "aws_workspacesweb_trust_store", diff --git a/internal/service/workspacesweb/session_logger_association.go b/internal/service/workspacesweb/session_logger_association.go new file mode 100644 index 000000000000..1a8eacdb153f --- /dev/null +++ b/internal/service/workspacesweb/session_logger_association.go @@ -0,0 +1,170 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/service/workspacesweb" + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" +) + +// @FrameworkResource("aws_workspacesweb_session_logger_association", name="Session Logger Association") +// @Testing(tagsTest=false) +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/workspacesweb/types;types.SessionLogger") +// @Testing(importStateIdAttribute="session_logger_arn,portal_arn") +func newSessionLoggerAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + return &sessionLoggerAssociationResource{}, nil +} + +const ( + ResNameSessionLoggerAssociation = "Session Logger Association" +) + +type sessionLoggerAssociationResource struct { + framework.ResourceWithModel[sessionLoggerAssociationResourceModel] +} + +func (r *sessionLoggerAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "portal_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "session_logger_arn": schema.StringAttribute{ + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *sessionLoggerAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data sessionLoggerAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.AssociateSessionLoggerInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + SessionLoggerArn: data.SessionLoggerARN.ValueStringPointer(), + } + + _, err := conn.AssociateSessionLogger(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameSessionLoggerAssociation), err.Error()) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *sessionLoggerAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data sessionLoggerAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + // Check if the association exists by getting the session logger and checking associated portals + output, err := findSessionLoggerByARN(ctx, conn, data.SessionLoggerARN.ValueString()) + if tfretry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameSessionLoggerAssociation, data.SessionLoggerARN.ValueString()), err.Error()) + return + } + + // Check if the portal is in the associated portals list + if !slices.Contains(output.AssociatedPortalArns, data.PortalARN.ValueString()) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(fmt.Errorf("association not found"))) + response.State.RemoveResource(ctx) + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *sessionLoggerAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + // This resource requires replacement on update since there's no true update operation + response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") +} + +func (r *sessionLoggerAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data sessionLoggerAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().WorkSpacesWebClient(ctx) + + input := workspacesweb.DisassociateSessionLoggerInput{ + PortalArn: data.PortalARN.ValueStringPointer(), + } + + _, err := conn.DisassociateSessionLogger(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameSessionLoggerAssociation, data.SessionLoggerARN.ValueString()), err.Error()) + return + } +} + +func (r *sessionLoggerAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + sessionLoggerAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, sessionLoggerAssociationIDParts, true) + if err != nil { + response.Diagnostics.AddError( + "Unexpected Import Identifier", + fmt.Sprintf("Expected import identifier with format: session_logger_arn,portal_arn. Got: %q", request.ID), + ) + return + } + sessionLoggerARN := parts[0] + portalARN := parts[1] + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("session_logger_arn"), sessionLoggerARN)...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("portal_arn"), portalARN)...) +} + +type sessionLoggerAssociationResourceModel struct { + framework.WithRegionModel + PortalARN types.String `tfsdk:"portal_arn"` + SessionLoggerARN types.String `tfsdk:"session_logger_arn"` +} diff --git a/internal/service/workspacesweb/session_logger_association_test.go b/internal/service/workspacesweb/session_logger_association_test.go new file mode 100644 index 000000000000..f7161abe46d6 --- /dev/null +++ b/internal/service/workspacesweb/session_logger_association_test.go @@ -0,0 +1,266 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package workspacesweb_test + +import ( + "context" + "fmt" + "slices" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/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" + tfworkspacesweb "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccWorkSpacesWebSessionLoggerAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger_association.test" + sessionLoggerResourceName := "aws_workspacesweb_session_logger.test" + portalResourceName := "aws_workspacesweb_portal.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerAssociationConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName, "session_logger_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccSessionLoggerAssociationImportStateIdFunc(resourceName), + ImportStateVerifyIdentifierAttribute: "session_logger_arn", + }, + }, + }) +} + +func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { + ctx := acctest.Context(t) + var sessionLogger1, sessionLogger2 awstypes.SessionLogger + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_workspacesweb_session_logger_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSessionLoggerAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSessionLoggerAssociationConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger1), + ), + }, + { + Config: testAccSessionLoggerAssociationConfig_updated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger2), + ), + }, + }, + }) +} + +func testAccCheckSessionLoggerAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_workspacesweb_session_logger_association" { + continue + } + + sessionLogger, err := tfworkspacesweb.FindSessionLoggerByARN(ctx, conn, rs.Primary.Attributes["session_logger_arn"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + // Check if the portal is still associated + portalARN := rs.Primary.Attributes["portal_arn"] + if slices.Contains(sessionLogger.AssociatedPortalArns, portalARN) { + return fmt.Errorf("WorkSpaces Web Session Logger Association %s still exists", rs.Primary.Attributes["session_logger_arn"]) + } + } + + return nil + } +} + +func testAccCheckSessionLoggerAssociationExists(ctx context.Context, n string, v *awstypes.SessionLogger) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).WorkSpacesWebClient(ctx) + + output, err := tfworkspacesweb.FindSessionLoggerByARN(ctx, conn, rs.Primary.Attributes["session_logger_arn"]) + + if err != nil { + return err + } + + // Check if the portal is associated + portalARN := rs.Primary.Attributes["portal_arn"] + if !slices.Contains(output.AssociatedPortalArns, portalARN) { + return fmt.Errorf("Association not found") + } + + *v = *output + + return nil + } +} + +func testAccSessionLoggerAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s,%s", rs.Primary.Attributes["session_logger_arn"], rs.Primary.Attributes["portal_arn"]), nil + } +} + +func testAccSessionLoggerAssociationConfig_base(rName string) string { + return fmt.Sprintf(` +resource "aws_workspacesweb_portal" "test" { + display_name = %[1]q +} + +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +data "aws_iam_policy_document" "allow_write_access" { + statement { + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + + actions = [ + "s3:PutObject" + ] + + resources = [ + aws_s3_bucket.test.arn, + "${aws_s3_bucket.test.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "allow_write_access" { + bucket = aws_s3_bucket.test.id + policy = data.aws_iam_policy_document.allow_write_access.json +} +`, rName) +} + +func testAccSessionLoggerAssociationConfig_basic(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerAssociationConfig_base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} + +resource "aws_workspacesweb_session_logger_association" "test" { + portal_arn = aws_workspacesweb_portal.test.portal_arn + session_logger_arn = aws_workspacesweb_session_logger.test.session_logger_arn +} +`, rName, folderStructureType, logFileFormat) +} + +func testAccSessionLoggerAssociationConfig_updated(rName, folderStructureType, logFileFormat string) string { + return testAccSessionLoggerAssociationConfig_base(rName) + fmt.Sprintf(` +resource "aws_workspacesweb_session_logger" "test" { + display_name = %[1]q + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} + +resource "aws_workspacesweb_session_logger" "test2" { + display_name = "%[1]s-2" + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.test.id + folder_structure = %[2]q + log_file_format = %[3]q + } + } + + depends_on = [aws_s3_bucket_policy.allow_write_access] +} + +resource "aws_workspacesweb_session_logger_association" "test" { + portal_arn = aws_workspacesweb_portal.test.portal_arn + session_logger_arn = aws_workspacesweb_session_logger.test2.session_logger_arn +} +`, rName, folderStructureType, logFileFormat) +} diff --git a/website/docs/r/workspacesweb_session_logger_association.html.markdown b/website/docs/r/workspacesweb_session_logger_association.html.markdown new file mode 100644 index 000000000000..3fec375516b0 --- /dev/null +++ b/website/docs/r/workspacesweb_session_logger_association.html.markdown @@ -0,0 +1,101 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. +--- + +# Resource: aws_workspacesweb_session_logger_association + +Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_workspacesweb_portal" "example" { + display_name = "example" +} + +resource "aws_s3_bucket" "example" { + bucket = "example-session-logs" + force_destroy = true +} + +data "aws_iam_policy_document" "example" { + statement { + effect = "Allow" + principals { + type = "Service" + identifiers = ["workspaces-web.amazonaws.com"] + } + actions = [ + "s3:PutObject" + ] + resources = [ + "${aws_s3_bucket.example.arn}/*" + ] + } +} + +resource "aws_s3_bucket_policy" "example" { + bucket = aws_s3_bucket.example.id + policy = data.aws_iam_policy_document.example.json +} + +resource "aws_workspacesweb_session_logger" "example" { + display_name = "example" + + event_filter { + all = {} + } + + log_configuration { + s3 { + bucket = aws_s3_bucket.example.id + folder_structure = "Flat" + log_file_format = "Json" + } + } + + depends_on = [aws_s3_bucket_policy.example] +} + +resource "aws_workspacesweb_session_logger_association" "example" { + portal_arn = aws_workspacesweb_portal.example.portal_arn + session_logger_arn = aws_workspacesweb_session_logger.example.session_logger_arn +} +``` + +## Argument Reference + +The following arguments are required: + +* `portal_arn` - (Required) ARN of the web portal. +* `session_logger_arn` - (Required) ARN of the session logger. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `portal_arn` - ARN of the web portal. +* `session_logger_arn` - ARN of the session logger. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```terraform +import { + to = aws_workspacesweb_session_logger_association.example + id = "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" +} +``` + +Using `terraform import`, import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger_association.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` From 28978e709a97d7bc114fb6cb79124f628e6c1fe8 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Wed, 13 Aug 2025 16:58:51 +0000 Subject: [PATCH 0163/2115] Added changelog entry --- .changelog/43866.txt | 3 +++ ...orkspacesweb_session_logger_association.html.markdown | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .changelog/43866.txt diff --git a/.changelog/43866.txt b/.changelog/43866.txt new file mode 100644 index 000000000000..9c4649a3dfab --- /dev/null +++ b/.changelog/43866.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_workspacesweb_session_logger_association +``` \ No newline at end of file diff --git a/website/docs/r/workspacesweb_session_logger_association.html.markdown b/website/docs/r/workspacesweb_session_logger_association.html.markdown index 3fec375516b0..e8d6b026f307 100644 --- a/website/docs/r/workspacesweb_session_logger_association.html.markdown +++ b/website/docs/r/workspacesweb_session_logger_association.html.markdown @@ -76,12 +76,13 @@ The following arguments are required: * `portal_arn` - (Required) ARN of the web portal. * `session_logger_arn` - (Required) ARN of the session logger. -## Attribute Reference +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -This resource exports the following attributes in addition to the arguments above: +## Attribute Reference -* `portal_arn` - ARN of the web portal. -* `session_logger_arn` - ARN of the session logger. +This resource does not export any attributes in addition to the arguments above: ## Import From b6771bbc9b462d228bd5f8acbb7a014a5400b816 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Thu, 14 Aug 2025 08:16:52 +0000 Subject: [PATCH 0164/2115] Updated attribute section byline --- .../r/workspacesweb_session_logger_association.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/workspacesweb_session_logger_association.html.markdown b/website/docs/r/workspacesweb_session_logger_association.html.markdown index e8d6b026f307..8d6ac70a268c 100644 --- a/website/docs/r/workspacesweb_session_logger_association.html.markdown +++ b/website/docs/r/workspacesweb_session_logger_association.html.markdown @@ -82,7 +82,7 @@ The following arguments are optional: ## Attribute Reference -This resource does not export any attributes in addition to the arguments above: +This resource exports no additional attributes. ## Import From fac9b0b520840ce53f3806826b0844e7eea9f28d Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Thu, 14 Aug 2025 12:50:41 +0000 Subject: [PATCH 0165/2115] Added test case to check associated_portal_arns --- .../session_logger_association_test.go | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/internal/service/workspacesweb/session_logger_association_test.go b/internal/service/workspacesweb/session_logger_association_test.go index f7161abe46d6..96ca84cb7789 100644 --- a/internal/service/workspacesweb/session_logger_association_test.go +++ b/internal/service/workspacesweb/session_logger_association_test.go @@ -39,7 +39,7 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_basic(t *testing.T) { CheckDestroy: testAccCheckSessionLoggerAssociationDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccSessionLoggerAssociationConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Config: testAccSessionLoggerAssociationConfig_basic(rName, rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger), resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName, "session_logger_arn"), @@ -53,6 +53,17 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_basic(t *testing.T) { ImportStateIdFunc: testAccSessionLoggerAssociationImportStateIdFunc(resourceName), ImportStateVerifyIdentifierAttribute: "session_logger_arn", }, + { + // The test case below updates the SessionLogger resource (thereby forcing a refresh of that resource) so that we can test if associated_portal_arns are populated after the association was created in the first testcase above + Config: testAccSessionLoggerAssociationConfig_basic(rName, rName+"-updated", string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger), + resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName, "session_logger_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttr(sessionLoggerResourceName, "associated_portal_arns.#", "1"), + resource.TestCheckResourceAttrPair(sessionLoggerResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + ), + }, }, }) } @@ -74,7 +85,7 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { CheckDestroy: testAccCheckSessionLoggerAssociationDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccSessionLoggerAssociationConfig_basic(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + Config: testAccSessionLoggerAssociationConfig_basic(rName, rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger1), ), @@ -193,7 +204,7 @@ resource "aws_s3_bucket_policy" "allow_write_access" { `, rName) } -func testAccSessionLoggerAssociationConfig_basic(rName, folderStructureType, logFileFormat string) string { +func testAccSessionLoggerAssociationConfig_basic(rName, sessionLoggerName, folderStructureType, logFileFormat string) string { return testAccSessionLoggerAssociationConfig_base(rName) + fmt.Sprintf(` resource "aws_workspacesweb_session_logger" "test" { display_name = %[1]q @@ -217,7 +228,7 @@ resource "aws_workspacesweb_session_logger_association" "test" { portal_arn = aws_workspacesweb_portal.test.portal_arn session_logger_arn = aws_workspacesweb_session_logger.test.session_logger_arn } -`, rName, folderStructureType, logFileFormat) +`, sessionLoggerName, folderStructureType, logFileFormat) } func testAccSessionLoggerAssociationConfig_updated(rName, folderStructureType, logFileFormat string) string { From 2f0a42d3636d14787fd58ffecce2d3a6cf0a1139 Mon Sep 17 00:00:00 2001 From: Madhav Vishnubhatta Date: Fri, 15 Aug 2025 10:57:36 +0000 Subject: [PATCH 0166/2115] Added testcase for computed attributes in the two associated reources --- .../session_logger_association_test.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/internal/service/workspacesweb/session_logger_association_test.go b/internal/service/workspacesweb/session_logger_association_test.go index 96ca84cb7789..ad68ed5a5202 100644 --- a/internal/service/workspacesweb/session_logger_association_test.go +++ b/internal/service/workspacesweb/session_logger_association_test.go @@ -54,14 +54,16 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_basic(t *testing.T) { ImportStateVerifyIdentifierAttribute: "session_logger_arn", }, { - // The test case below updates the SessionLogger resource (thereby forcing a refresh of that resource) so that we can test if associated_portal_arns are populated after the association was created in the first testcase above - Config: testAccSessionLoggerAssociationConfig_basic(rName, rName+"-updated", string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), + ResourceName: resourceName, + RefreshState: true, + }, + { + Config: testAccSessionLoggerAssociationConfig_basic(rName, rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger), - resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName, "session_logger_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + //The following checks are for the SessionLogger Resource and the PortalResource (and not for the association resource). resource.TestCheckResourceAttr(sessionLoggerResourceName, "associated_portal_arns.#", "1"), resource.TestCheckResourceAttrPair(sessionLoggerResourceName, "associated_portal_arns.0", portalResourceName, "portal_arn"), + resource.TestCheckResourceAttrPair(portalResourceName, "session_logger_arn", sessionLoggerResourceName, "session_logger_arn"), ), }, }, @@ -73,6 +75,9 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { var sessionLogger1, sessionLogger2 awstypes.SessionLogger rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_workspacesweb_session_logger_association.test" + sessionLoggerResourceName1 := "aws_workspacesweb_session_logger.test" + sessionLoggerResourceName2 := "aws_workspacesweb_session_logger.test2" + portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -88,12 +93,16 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { Config: testAccSessionLoggerAssociationConfig_basic(rName, rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger1), + resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName1, "session_logger_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, { Config: testAccSessionLoggerAssociationConfig_updated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger2), + resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName2, "session_logger_arn"), + resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), ), }, }, From 0df02646b5213a07ac0154b6c69e68e12ae01ae8 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 15 Aug 2025 13:22:38 +0100 Subject: [PATCH 0167/2115] review feedback addressed. --- examples/odb/exadata_infra.tf | 66 +- .../odb/cloud_exadata_infrastructure.go | 450 ++++--------- ...loud_exadata_infrastructure_data_source.go | 279 ++++---- ...exadata_infrastructure_data_source_test.go | 35 +- .../odb/cloud_exadata_infrastructure_test.go | 146 ++--- internal/service/odb/generate.go | 6 - .../odb/service_endpoint_resolver_gen.go | 82 --- .../service/odb/service_endpoints_gen_test.go | 602 ------------------ internal/service/odb/service_package.go | 22 - internal/service/odb/service_package_gen.go | 55 -- names/data/names_data.hcl | 3 - 11 files changed, 369 insertions(+), 1377 deletions(-) delete mode 100644 internal/service/odb/generate.go delete mode 100644 internal/service/odb/service_endpoint_resolver_gen.go delete mode 100644 internal/service/odb/service_endpoints_gen_test.go delete mode 100644 internal/service/odb/service_package.go delete mode 100644 internal/service/odb/service_package_gen.go diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf index 5285bd2160c1..30b8ff2f03cd 100644 --- a/examples/odb/exadata_infra.tf +++ b/examples/odb/exadata_infra.tf @@ -1,48 +1,48 @@ -# Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. # Exadata Infrastructure with customer managed maintenance window -resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_X11M_all_param" { - display_name = "Ofake_my_odb_exadata_infra" - shape = "Exadata.X11M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = ["abc@example.com"] - database_server_type = "X11M" - storage_server_type = "X11M-HC" - maintenance_window = { - custom_action_timeout_in_mins = 16 - days_of_week = ["MONDAY", "TUESDAY"] - hours_of_day = [11, 16] - is_custom_action_timeout_enabled = true - lead_time_in_weeks = 3 - months = ["FEBRUARY", "MAY", "AUGUST", "NOVEMBER"] - patching_mode = "ROLLING" - preference = "CUSTOM_PREFERENCE" - weeks_of_month = [2, 4] +resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_all_params" { + display_name = "Ofake-my-exa-infra" + shape = "Exadata.X11M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window { + custom_action_timeout_in_mins = 16 + days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] + hours_of_day = [11,16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month =[2,4] } tags = { - "env" = "dev" + "env"= "dev" } } # Exadata Infrastructure with default maintenance window with X9M system shape. with minimum parameters -resource "aws_odb_cloud_exadata_infrastructure" "test_X9M" { +resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_basic" { display_name = "Ofake_my_exa_X9M" shape = "Exadata.X9M" storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - maintenance_window = { - custom_action_timeout_in_mins = 16 - days_of_week = [] - hours_of_day = [] - is_custom_action_timeout_enabled = true - lead_time_in_weeks = 0 - months = [] - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" - weeks_of_month = [] - } + maintenance_window { + custom_action_timeout_in_mins = 16 + is_custom_action_timeout_enabled = true + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + } +} + +# data source for exa infra +data "aws_odb_cloud_exadata_infrastructure" "get-exa-infra" { + id = "" } \ No newline at end of file diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index 29f4f94f68f2..b826bab858ba 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -1,4 +1,4 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. package odb @@ -6,36 +6,35 @@ import ( "context" "errors" "fmt" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" - tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "time" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/odb" odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" - + "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" + "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - + "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" + "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/sweep" sweepfw "github.com/hashicorp/terraform-provider-aws/internal/sweep/framework" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -64,8 +63,6 @@ type resourceCloudExadataInfrastructure struct { framework.WithTimeouts } -// For more about schema options, visit -// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/schemas?page=schemas func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { statusType := fwtypes.StringEnumType[odbtypes.ResourceStatus]() computeModelType := fwtypes.StringEnumType[odbtypes.ComputeModel]() @@ -130,16 +127,6 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res Computed: true, Description: "The total number of CPU cores that are allocated to the Exadata infrastructure", }, - "customer_contacts_to_send_to_oci": schema.SetAttribute{ - ElementType: types.StringType, - CustomType: fwtypes.SetOfStringType, - Optional: true, - PlanModifiers: []planmodifier.Set{ - setplanmodifier.RequiresReplace(), - setplanmodifier.UseStateForUnknown(), - }, - Description: "The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure. Changing this will force terraform to create new resource", - }, "data_storage_size_in_tbs": schema.Float64Attribute{ Computed: true, Description: "The size of the Exadata infrastructure's data disk group, in terabytes (TB)", @@ -247,7 +234,8 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res }, "created_at": schema.StringAttribute{ Computed: true, - Description: "The time when the Exadata infrastructure was created", + CustomType: timetypes.RFC3339Type{}, + Description: "The time when the Exadata infrastructure was created.", }, "compute_model": schema.StringAttribute{ CustomType: computeModelType, @@ -260,29 +248,14 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res "are based on the physical core of a processor with\n " + " hyper-threading enabled."), }, - "maintenance_window": schema.ObjectAttribute{ - Required: true, - CustomType: fwtypes.NewObjectTypeOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx), - Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", - AttributeTypes: map[string]attr.Type{ - "custom_action_timeout_in_mins": types.Int32Type, - "days_of_week": types.SetType{ - ElemType: fwtypes.StringEnumType[odbtypes.DayOfWeekName](), - }, - "hours_of_day": types.SetType{ - ElemType: types.Int32Type, - }, - "is_custom_action_timeout_enabled": types.BoolType, - "lead_time_in_weeks": types.Int32Type, - "months": types.SetType{ - ElemType: fwtypes.StringEnumType[odbtypes.MonthName](), - }, - "patching_mode": fwtypes.StringEnumType[odbtypes.PatchingModeType](), - "preference": fwtypes.StringEnumType[odbtypes.PreferenceType](), - "weeks_of_month": types.SetType{ - ElemType: types.Int32Type, - }, + "customer_contacts_to_send_to_oci": schema.SetAttribute{ + CustomType: fwtypes.NewSetNestedObjectTypeOf[customerContactExaInfraResourceModel](ctx), + Optional: true, + PlanModifiers: []planmodifier.Set{ + setplanmodifier.RequiresReplace(), + setplanmodifier.UseStateForUnknown(), }, + Description: "The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure. Changing this will force terraform to create new resource", }, }, Blocks: map[string]schema.Block{ @@ -291,6 +264,56 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res Update: true, Delete: true, }), + "maintenance_window": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx), + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + listvalidator.SizeAtLeast(1), + }, + Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "custom_action_timeout_in_mins": schema.Int32Attribute{ + Required: true, + }, + "days_of_week": schema.SetAttribute{ + ElementType: fwtypes.NewObjectTypeOf[dayOfWeekExaInfraMaintenanceWindowResourceModel](ctx), + Optional: true, + Computed: true, + }, + "hours_of_day": schema.SetAttribute{ + ElementType: types.Int32Type, + Optional: true, + Computed: true, + }, + "is_custom_action_timeout_enabled": schema.BoolAttribute{ + Required: true, + }, + "lead_time_in_weeks": schema.Int32Attribute{ + Optional: true, + Computed: true, + }, + "months": schema.SetAttribute{ + ElementType: fwtypes.NewObjectTypeOf[monthExaInfraMaintenanceWindowResourceModel](ctx), + Optional: true, + Computed: true, + }, + "patching_mode": schema.StringAttribute{ + Required: true, + CustomType: fwtypes.StringEnumType[odbtypes.PatchingModeType](), + }, + "preference": schema.StringAttribute{ + Required: true, + CustomType: fwtypes.StringEnumType[odbtypes.PreferenceType](), + }, + "weeks_of_month": schema.SetAttribute{ + ElementType: types.Int32Type, + Optional: true, + Computed: true, + }, + }, + }, + }, }, } } @@ -306,12 +329,7 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res } input := odb.CreateCloudExadataInfrastructureInput{ - Tags: getTagsIn(ctx), - MaintenanceWindow: r.expandMaintenanceWindow(ctx, plan.MaintenanceWindow), - } - - if !plan.CustomerContactsToSendToOCI.IsNull() && !plan.CustomerContactsToSendToOCI.IsUnknown() { - input.CustomerContactsToSendToOCI = r.expandCustomerContacts(ctx, plan.CustomerContactsToSendToOCI) + Tags: getTagsIn(ctx), } resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) @@ -337,6 +355,7 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res createTimeout := r.CreateTimeout(ctx, plan.Timeouts) createdExaInfra, err := waitCloudExadataInfrastructureCreated(ctx, conn, *out.CloudExadataInfrastructureId, createTimeout) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrID), aws.ToString(out.CloudExadataInfrastructureId))...) if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudExadataInfrastructure, plan.DisplayName.ValueString(), err), @@ -345,17 +364,6 @@ func (r *resourceCloudExadataInfrastructure) Create(ctx context.Context, req res return } - plan.CustomerContactsToSendToOCI = r.flattenCustomerContacts(createdExaInfra.CustomerContactsToSendToOCI) - plan.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, createdExaInfra.MaintenanceWindow) - - plan.CreatedAt = types.StringValue(createdExaInfra.CreatedAt.Format(time.RFC3339)) - - if createdExaInfra.DatabaseServerType != nil { - plan.DatabaseServerType = types.StringValue(*createdExaInfra.DatabaseServerType) - } - if createdExaInfra.StorageServerType != nil { - plan.StorageServerType = types.StringValue(*createdExaInfra.StorageServerType) - } resp.Diagnostics.Append(flex.Flatten(ctx, createdExaInfra, &plan)...) if resp.Diagnostics.HasError() { @@ -386,17 +394,6 @@ func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resou return } - state.CustomerContactsToSendToOCI = r.flattenCustomerContacts(out.CustomerContactsToSendToOCI) - state.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) - - state.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, out.MaintenanceWindow) - - if out.DatabaseServerType != nil { - state.DatabaseServerType = types.StringValue(*out.DatabaseServerType) - } - if out.StorageServerType != nil { - state.StorageServerType = types.StringValue(*out.StorageServerType) - } resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) if resp.Diagnostics.HasError() { @@ -415,14 +412,14 @@ func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req res } conn := r.Meta().ODBClient(ctx) - if !state.MaintenanceWindow.Equal(plan.MaintenanceWindow) { - - //we need to call update maintenance window - - updatedMW := odb.UpdateCloudExadataInfrastructureInput{ - CloudExadataInfrastructureId: plan.CloudExadataInfrastructureId.ValueStringPointer(), - MaintenanceWindow: r.expandMaintenanceWindow(ctx, plan.MaintenanceWindow), - } + diff, d := flex.Diff(ctx, plan, state) + resp.Diagnostics.Append(d...) + if resp.Diagnostics.HasError() { + return + } + if diff.HasChanges() { + updatedMW := odb.UpdateCloudExadataInfrastructureInput{} + resp.Diagnostics.Append(flex.Expand(ctx, plan, &updatedMW)...) out, err := conn.UpdateCloudExadataInfrastructure(ctx, &updatedMW) if err != nil { @@ -451,18 +448,7 @@ func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req res ) return } - plan.CustomerContactsToSendToOCI = r.flattenCustomerContacts(updatedExaInfra.CustomerContactsToSendToOCI) - plan.CreatedAt = types.StringValue(updatedExaInfra.CreatedAt.Format(time.RFC3339)) - plan.MaintenanceWindow = r.flattenMaintenanceWindow(ctx, updatedExaInfra.MaintenanceWindow) - if updatedExaInfra.DatabaseServerType != nil { - plan.DatabaseServerType = types.StringValue(*updatedExaInfra.DatabaseServerType) - } - if updatedExaInfra.StorageServerType != nil { - plan.StorageServerType = types.StringValue(*updatedExaInfra.StorageServerType) - } - resp.Diagnostics.Append(flex.Flatten(ctx, updatedExaInfra, &plan)...) - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) } @@ -571,46 +557,6 @@ func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id return out, string(out.Status), nil } } -func (r *resourceCloudExadataInfrastructure) expandCustomerContacts(ctx context.Context, contactsList fwtypes.SetValueOf[types.String]) []odbtypes.CustomerContact { - if contactsList.IsNull() || contactsList.IsUnknown() { - return nil - } - - var contacts []types.String - - contactsList.ElementsAs(ctx, &contacts, false) - - result := make([]odbtypes.CustomerContact, 0, len(contacts)) - for _, element := range contacts { - result = append(result, odbtypes.CustomerContact{ - Email: element.ValueStringPointer(), - }) - } - - return result -} - -func (r *resourceCloudExadataInfrastructure) flattenCustomerContacts(contacts []odbtypes.CustomerContact) fwtypes.SetValueOf[types.String] { - if len(contacts) == 0 { - return fwtypes.SetValueOf[types.String]{ - SetValue: basetypes.NewSetNull(types.StringType), - } - } - - elements := make([]attr.Value, 0, len(contacts)) - for _, contact := range contacts { - if contact.Email != nil { - stringValue := types.StringValue(*contact.Email) - elements = append(elements, stringValue) - } - } - - list, _ := basetypes.NewSetValue(types.StringType, elements) - - return fwtypes.SetValueOf[types.String]{ - SetValue: list, - } -} func FindOdbExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { input := odb.GetCloudExadataInfrastructureInput{ @@ -635,194 +581,74 @@ func FindOdbExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id s return out.CloudExadataInfrastructure, nil } -func (r *resourceCloudExadataInfrastructure) expandMaintenanceWindow(ctx context.Context, exaInfraMWResourceObj fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel]) *odbtypes.MaintenanceWindow { - - var exaInfraMWResource cloudExadataInfraMaintenanceWindowResourceModel - - exaInfraMWResourceObj.As(ctx, &exaInfraMWResource, basetypes.ObjectAsOptions{ - UnhandledNullAsEmpty: true, - UnhandledUnknownAsEmpty: true, - }) - - var daysOfWeekNames []odbtypes.DayOfWeekName - exaInfraMWResource.DaysOfWeek.ElementsAs(ctx, &daysOfWeekNames, false) - daysOfWeek := make([]odbtypes.DayOfWeek, 0, len(daysOfWeekNames)) - - for _, dayOfWeek := range daysOfWeekNames { - daysOfWeek = append(daysOfWeek, odbtypes.DayOfWeek{ - Name: dayOfWeek, - }) - } - - var hoursOfTheDay []int32 - exaInfraMWResource.HoursOfDay.ElementsAs(ctx, &hoursOfTheDay, false) - - var monthNames []odbtypes.MonthName - exaInfraMWResource.Months.ElementsAs(ctx, &monthNames, false) - months := make([]odbtypes.Month, 0, len(monthNames)) - for _, month := range monthNames { - months = append(months, odbtypes.Month{ - Name: month, - }) - } - - var weeksOfMonth []int32 - exaInfraMWResource.WeeksOfMonth.ElementsAs(ctx, &weeksOfMonth, false) - odbTypeMW := odbtypes.MaintenanceWindow{ - CustomActionTimeoutInMins: exaInfraMWResource.CustomActionTimeoutInMins.ValueInt32Pointer(), - DaysOfWeek: daysOfWeek, - HoursOfDay: hoursOfTheDay, - IsCustomActionTimeoutEnabled: exaInfraMWResource.IsCustomActionTimeoutEnabled.ValueBoolPointer(), - LeadTimeInWeeks: exaInfraMWResource.LeadTimeInWeeks.ValueInt32Pointer(), - Months: months, - PatchingMode: exaInfraMWResource.PatchingMode.ValueEnum(), - Preference: exaInfraMWResource.Preference.ValueEnum(), - WeeksOfMonth: weeksOfMonth, - } - if len(odbTypeMW.DaysOfWeek) == 0 { - odbTypeMW.DaysOfWeek = nil - } - if len(odbTypeMW.HoursOfDay) == 0 { - odbTypeMW.HoursOfDay = nil - } - if len(odbTypeMW.WeeksOfMonth) == 0 { - odbTypeMW.WeeksOfMonth = nil - } - if len(odbTypeMW.Months) == 0 { - odbTypeMW.Months = nil - } - if *odbTypeMW.LeadTimeInWeeks == 0 { - odbTypeMW.LeadTimeInWeeks = nil - } - - return &odbTypeMW +type cloudExadataInfrastructureResourceModel struct { + framework.WithRegionModel + ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` + AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` + DatabaseServerType types.String `tfsdk:"database_server_type" ` + StorageServerType types.String `tfsdk:"storage_server_type" ` + AvailabilityZone types.String `tfsdk:"availability_zone"` + AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` + AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` + CloudExadataInfrastructureArn types.String `tfsdk:"arn"` + CloudExadataInfrastructureId types.String `tfsdk:"id"` + ComputeCount types.Int32 `tfsdk:"compute_count"` + CpuCount types.Int32 `tfsdk:"cpu_count"` + CustomerContactsToSendToOCI fwtypes.SetNestedObjectValueOf[customerContactExaInfraResourceModel] `tfsdk:"customer_contacts_to_send_to_oci"` + DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` + DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` + DbServerVersion types.String `tfsdk:"db_server_version"` + DisplayName types.String `tfsdk:"display_name"` + LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` + MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` + MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` + MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` + MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` + MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` + MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` + MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` + NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` + Ocid types.String `tfsdk:"ocid"` + OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` + OciUrl types.String `tfsdk:"oci_url"` + PercentProgress types.Float64 `tfsdk:"percent_progress"` + Shape types.String `tfsdk:"shape"` + Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` + StatusReason types.String `tfsdk:"status_reason"` + StorageCount types.Int32 `tfsdk:"storage_count"` + StorageServerVersion types.String `tfsdk:"storage_server_version"` + TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` + Timeouts timeouts.Value `tfsdk:"timeouts"` + CreatedAt timetypes.RFC3339 `tfsdk:"created_at" ` + ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + MaintenanceWindow fwtypes.ListNestedObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel] `tfsdk:"maintenance_window"` } -func (r *resourceCloudExadataInfrastructure) flattenMaintenanceWindow(ctx context.Context, obdExaInfraMW *odbtypes.MaintenanceWindow) fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel] { - //days of week - daysOfWeek := make([]attr.Value, 0, len(obdExaInfraMW.DaysOfWeek)) - for _, dayOfWeek := range obdExaInfraMW.DaysOfWeek { - dayOfWeekStringValue := fwtypes.StringEnumValue(dayOfWeek.Name).StringValue - daysOfWeek = append(daysOfWeek, dayOfWeekStringValue) - } - setValueOfDaysOfWeek, _ := basetypes.NewSetValue(types.StringType, daysOfWeek) - daysOfWeekRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]]{ - SetValue: setValueOfDaysOfWeek, - } - //hours of the day - hoursOfTheDay := make([]attr.Value, 0, len(obdExaInfraMW.HoursOfDay)) - for _, hourOfTheDay := range obdExaInfraMW.HoursOfDay { - daysOfWeekInt32Value := types.Int32Value(hourOfTheDay) - hoursOfTheDay = append(hoursOfTheDay, daysOfWeekInt32Value) - } - setValuesOfHoursOfTheDay, _ := basetypes.NewSetValue(types.Int32Type, hoursOfTheDay) - hoursOfTheDayRead := fwtypes.SetValueOf[types.Int64]{ - SetValue: setValuesOfHoursOfTheDay, - } - //months - months := make([]attr.Value, 0, len(obdExaInfraMW.Months)) - for _, month := range obdExaInfraMW.Months { - monthStringValue := fwtypes.StringEnumValue(month.Name).StringValue - months = append(months, monthStringValue) - } - setValuesOfMonth, _ := basetypes.NewSetValue(types.StringType, months) - monthsRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]]{ - SetValue: setValuesOfMonth, - } - //weeks of month - weeksOfMonth := make([]attr.Value, 0, len(obdExaInfraMW.WeeksOfMonth)) - for _, weekOfMonth := range obdExaInfraMW.WeeksOfMonth { - weeksOfMonthInt32Value := types.Int32Value(weekOfMonth) - weeksOfMonth = append(weeksOfMonth, weeksOfMonthInt32Value) - } - setValuesOfWeekOfMonth, _ := basetypes.NewSetValue(types.Int32Type, weeksOfMonth) - weeksOfMonthRead := fwtypes.SetValueOf[types.Int64]{ - SetValue: setValuesOfWeekOfMonth, - } - - flattenMW := cloudExadataInfraMaintenanceWindowResourceModel{ - CustomActionTimeoutInMins: types.Int32PointerValue(obdExaInfraMW.CustomActionTimeoutInMins), - DaysOfWeek: daysOfWeekRead, - HoursOfDay: hoursOfTheDayRead, - IsCustomActionTimeoutEnabled: types.BoolPointerValue(obdExaInfraMW.IsCustomActionTimeoutEnabled), - LeadTimeInWeeks: types.Int32PointerValue(obdExaInfraMW.LeadTimeInWeeks), - Months: monthsRead, - PatchingMode: fwtypes.StringEnumValue(obdExaInfraMW.PatchingMode), - Preference: fwtypes.StringEnumValue(obdExaInfraMW.Preference), - WeeksOfMonth: weeksOfMonthRead, - } - if obdExaInfraMW.LeadTimeInWeeks == nil { - flattenMW.LeadTimeInWeeks = types.Int32Value(0) - } - if obdExaInfraMW.CustomActionTimeoutInMins == nil { - flattenMW.CustomActionTimeoutInMins = types.Int32Value(0) - } - if obdExaInfraMW.IsCustomActionTimeoutEnabled == nil { - flattenMW.IsCustomActionTimeoutEnabled = types.BoolValue(false) - } +type cloudExadataInfraMaintenanceWindowResourceModel struct { + CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` + DaysOfWeek fwtypes.SetNestedObjectValueOf[dayOfWeekExaInfraMaintenanceWindowResourceModel] `tfsdk:"days_of_week" ` + HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` + IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` + LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` + Months fwtypes.SetNestedObjectValueOf[monthExaInfraMaintenanceWindowResourceModel] `tfsdk:"months" ` + PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` + Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` + WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` +} - result, _ := fwtypes.NewObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx, &flattenMW) - return result +type dayOfWeekExaInfraMaintenanceWindowResourceModel struct { + Name fwtypes.StringEnum[odbtypes.DayOfWeekName] `tfsdk:"name"` } -// See more: -// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values -type cloudExadataInfrastructureResourceModel struct { - framework.WithRegionModel - ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` - AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` - DatabaseServerType types.String `tfsdk:"database_server_type" autoflex:",noflatten"` - StorageServerType types.String `tfsdk:"storage_server_type" autoflex:",noflatten"` - AvailabilityZone types.String `tfsdk:"availability_zone"` - AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` - AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` - CloudExadataInfrastructureArn types.String `tfsdk:"arn"` - CloudExadataInfrastructureId types.String `tfsdk:"id"` - ComputeCount types.Int32 `tfsdk:"compute_count"` - CpuCount types.Int32 `tfsdk:"cpu_count"` - CustomerContactsToSendToOCI fwtypes.SetValueOf[types.String] `tfsdk:"customer_contacts_to_send_to_oci" autoflex:"-"` - DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` - DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` - DbServerVersion types.String `tfsdk:"db_server_version"` - DisplayName types.String `tfsdk:"display_name"` - LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` - MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` - MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` - MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` - MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` - MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` - MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` - MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` - NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` - Ocid types.String `tfsdk:"ocid"` - OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` - OciUrl types.String `tfsdk:"oci_url"` - PercentProgress types.Float64 `tfsdk:"percent_progress"` - Shape types.String `tfsdk:"shape"` - Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` - StatusReason types.String `tfsdk:"status_reason"` - StorageCount types.Int32 `tfsdk:"storage_count"` - StorageServerVersion types.String `tfsdk:"storage_server_version"` - TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` - Timeouts timeouts.Value `tfsdk:"timeouts"` - CreatedAt types.String `tfsdk:"created_at" autoflex:",noflatten"` - ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` - MaintenanceWindow fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowResourceModel] `tfsdk:"maintenance_window" autoflex:"-"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` +type monthExaInfraMaintenanceWindowResourceModel struct { + Name fwtypes.StringEnum[odbtypes.MonthName] `tfsdk:"name"` } -type cloudExadataInfraMaintenanceWindowResourceModel struct { - CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` - DaysOfWeek fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]] `tfsdk:"days_of_week"` - HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` - IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` - LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` - Months fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]] `tfsdk:"months"` - PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` - Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` - WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` +type customerContactExaInfraResourceModel struct { + Email types.String `tfsdk:"email"` } func sweepCloudExadataInfrastructures(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index 5fb59a3fbf80..a513d8c81ba4 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -1,32 +1,31 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. package odb import ( "context" - "github.com/hashicorp/terraform-plugin-framework/attr" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/errs" - tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "time" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/odb" odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" + "github.com/hashicorp/terraform-plugin-framework-timetypes/timetypes" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/framework" "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) // Function annotations are used for datasource registration to the Provider. DO NOT EDIT. // @FrameworkDataSource("aws_odb_cloud_exadata_infrastructure", name="Cloud Exadata Infrastructure") +// @Tags(identifierAttribute="arn") func newDataSourceCloudExadataInfrastructure(context.Context) (datasource.DataSourceWithConfigure, error) { return &dataSourceCloudExadataInfrastructure{}, nil } @@ -185,6 +184,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d }, "created_at": schema.StringAttribute{ Computed: true, + CustomType: timetypes.RFC3339Type{}, Description: "The time when the Exadata infrastructure was created.", }, "database_server_type": schema.StringAttribute{ @@ -195,45 +195,61 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d Computed: true, Description: "The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation.", }, + "customer_contacts_to_send_to_oci": schema.SetAttribute{ + CustomType: fwtypes.NewSetNestedObjectTypeOf[customerContactExaInfraDataSourceModel](ctx), + Computed: true, + Description: "The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure.", + }, names.AttrTags: tftags.TagsAttributeComputedOnly(), - "maintenance_window": schema.ObjectAttribute{ - Computed: true, - CustomType: fwtypes.NewObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), - Description: "The maintenance window for the Exadata infrastructure.", - AttributeTypes: map[string]attr.Type{ - "custom_action_timeout_in_mins": types.Int32Type, - "days_of_week": types.SetType{ - ElemType: fwtypes.StringEnumType[odbtypes.DayOfWeekName](), - }, - "hours_of_day": types.SetType{ - ElemType: types.Int32Type, - }, - "is_custom_action_timeout_enabled": types.BoolType, - "lead_time_in_weeks": types.Int32Type, - "months": types.SetType{ - ElemType: fwtypes.StringEnumType[odbtypes.MonthName](), - }, - "patching_mode": fwtypes.StringEnumType[odbtypes.PatchingModeType](), - "preference": fwtypes.StringEnumType[odbtypes.PreferenceType](), - "weeks_of_month": types.SetType{ - ElemType: types.Int32Type, - }, - }, + "maintenance_window": schema.ListAttribute{ + Computed: true, + Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", + CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), }, }, - Blocks: map[string]schema.Block{ - "customer_contacts_to_send_to_oci": schema.SetNestedBlock{ - Description: "Customer contact emails to send to OCI.", - CustomType: fwtypes.NewSetNestedObjectTypeOf[customerContactDataSourceModel](ctx), + /*Blocks: map[string]schema.Block{ + "maintenance_window": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), + Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ - "email": schema.StringAttribute{ + "custom_action_timeout_in_mins": schema.Int32Attribute{ + Computed: true, + }, + "days_of_week": schema.SetAttribute{ + ElementType: fwtypes.NewObjectTypeOf[dayOfWeekExaInfraMaintenanceWindowDataSourceModel](ctx), + Computed: true, + }, + "hours_of_day": schema.SetAttribute{ + ElementType: types.Int32Type, + Computed: true, + }, + "is_custom_action_timeout_enabled": schema.BoolAttribute{ + Computed: true, + }, + "lead_time_in_weeks": schema.Int32Attribute{ Computed: true, }, + "months": schema.SetAttribute{ + ElementType: fwtypes.NewObjectTypeOf[monthExaInfraMaintenanceWindowDataSourceModel](ctx), + Computed: true, + }, + "patching_mode": schema.StringAttribute{ + Computed: true, + CustomType: fwtypes.StringEnumType[odbtypes.PatchingModeType](), + }, + "preference": schema.StringAttribute{ + Computed: true, + CustomType: fwtypes.StringEnumType[odbtypes.PreferenceType](), + }, + "weeks_of_month": schema.SetAttribute{ + ElementType: types.Int32Type, + Computed: true, + }, }, }, }, - }, + },*/ } } @@ -254,19 +270,8 @@ func (d *dataSourceCloudExadataInfrastructure) Read(ctx context.Context, req dat ) return } - tagsRead, err := listTags(ctx, conn, *out.CloudExadataInfrastructureArn) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameCloudExadataInfrastructure, data.CloudExadataInfrastructureId.String(), err), - err.Error(), - ) - return - } - if tagsRead != nil { - data.Tags = tftags.FlattenStringValueMap(ctx, tagsRead.Map()) - } - data.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) - data.MaintenanceWindow = d.flattenMaintenanceWindow(ctx, out.MaintenanceWindow) + + //data.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) resp.Diagnostics.Append(flex.Flatten(ctx, out, &data)...) if resp.Diagnostics.HasError() { return @@ -299,127 +304,69 @@ func FindOdbExaDataInfraForDataSourceByID(ctx context.Context, conn *odb.Client, return out.CloudExadataInfrastructure, nil } -func (d *dataSourceCloudExadataInfrastructure) flattenMaintenanceWindow(ctx context.Context, obdExaInfraMW *odbtypes.MaintenanceWindow) fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel] { - //days of week - daysOfWeek := make([]attr.Value, 0, len(obdExaInfraMW.DaysOfWeek)) - for _, dayOfWeek := range obdExaInfraMW.DaysOfWeek { - dayOfWeekStringValue := fwtypes.StringEnumValue(dayOfWeek.Name).StringValue - daysOfWeek = append(daysOfWeek, dayOfWeekStringValue) - } - setValueOfDaysOfWeek, _ := basetypes.NewSetValue(types.StringType, daysOfWeek) - daysOfWeekRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]]{ - SetValue: setValueOfDaysOfWeek, - } - //hours of the day - hoursOfTheDay := make([]attr.Value, 0, len(obdExaInfraMW.HoursOfDay)) - for _, hourOfTheDay := range obdExaInfraMW.HoursOfDay { - daysOfWeekInt32Value := types.Int32Value(hourOfTheDay) - hoursOfTheDay = append(hoursOfTheDay, daysOfWeekInt32Value) - } - setValuesOfHoursOfTheDay, _ := basetypes.NewSetValue(types.Int32Type, hoursOfTheDay) - hoursOfTheDayRead := fwtypes.SetValueOf[types.Int64]{ - SetValue: setValuesOfHoursOfTheDay, - } - //months - months := make([]attr.Value, 0, len(obdExaInfraMW.Months)) - for _, month := range obdExaInfraMW.Months { - monthStringValue := fwtypes.StringEnumValue(month.Name).StringValue - months = append(months, monthStringValue) - } - setValuesOfMonth, _ := basetypes.NewSetValue(types.StringType, months) - monthsRead := fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]]{ - SetValue: setValuesOfMonth, - } - //weeks of month - weeksOfMonth := make([]attr.Value, 0, len(obdExaInfraMW.WeeksOfMonth)) - for _, weekOfMonth := range obdExaInfraMW.WeeksOfMonth { - weeksOfMonthInt32Value := types.Int32Value(weekOfMonth) - weeksOfMonth = append(weeksOfMonth, weeksOfMonthInt32Value) - } - setValuesOfWeekOfMonth, _ := basetypes.NewSetValue(types.Int32Type, weeksOfMonth) - weeksOfMonthRead := fwtypes.SetValueOf[types.Int64]{ - SetValue: setValuesOfWeekOfMonth, - } - - flattenMW := cloudExadataInfraMaintenanceWindowDataSourceModel{ - CustomActionTimeoutInMins: types.Int32PointerValue(obdExaInfraMW.CustomActionTimeoutInMins), - DaysOfWeek: daysOfWeekRead, - HoursOfDay: hoursOfTheDayRead, - IsCustomActionTimeoutEnabled: types.BoolPointerValue(obdExaInfraMW.IsCustomActionTimeoutEnabled), - LeadTimeInWeeks: types.Int32PointerValue(obdExaInfraMW.LeadTimeInWeeks), - Months: monthsRead, - PatchingMode: fwtypes.StringEnumValue(obdExaInfraMW.PatchingMode), - Preference: fwtypes.StringEnumValue(obdExaInfraMW.Preference), - WeeksOfMonth: weeksOfMonthRead, - } - if obdExaInfraMW.LeadTimeInWeeks == nil { - flattenMW.LeadTimeInWeeks = types.Int32Value(0) - } - if obdExaInfraMW.CustomActionTimeoutInMins == nil { - flattenMW.CustomActionTimeoutInMins = types.Int32Value(0) - } - if obdExaInfraMW.IsCustomActionTimeoutEnabled == nil { - flattenMW.IsCustomActionTimeoutEnabled = types.BoolValue(false) - } - - result, _ := fwtypes.NewObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx, &flattenMW) - return result -} - type cloudExadataInfrastructureDataSourceModel struct { framework.WithRegionModel - ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` - AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` - AvailabilityZone types.String `tfsdk:"availability_zone"` - AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` - AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` - CloudExadataInfrastructureArn types.String `tfsdk:"arn"` - CloudExadataInfrastructureId types.String `tfsdk:"id"` - ComputeCount types.Int32 `tfsdk:"compute_count"` - CpuCount types.Int32 `tfsdk:"cpu_count"` - DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` - DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` - DbServerVersion types.String `tfsdk:"db_server_version"` - DisplayName types.String `tfsdk:"display_name"` - LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` - MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` - MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` - MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` - MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` - MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` - MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` - MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` - NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` - OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` - OciUrl types.String `tfsdk:"oci_url"` - Ocid types.String `tfsdk:"ocid"` - PercentProgress types.Float64 `tfsdk:"percent_progress"` - Shape types.String `tfsdk:"shape"` - Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` - StatusReason types.String `tfsdk:"status_reason"` - StorageCount types.Int32 `tfsdk:"storage_count"` - StorageServerVersion types.String `tfsdk:"storage_server_version"` - TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` - CustomerContactsToSendToOCI fwtypes.SetNestedObjectValueOf[customerContactDataSourceModel] `tfsdk:"customer_contacts_to_send_to_oci"` - ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` - CreatedAt types.String `tfsdk:"created_at" autoflex:",noflatten"` - DatabaseServerType types.String `tfsdk:"database_server_type"` - StorageServerType types.String `tfsdk:"storage_server_type"` - MaintenanceWindow fwtypes.ObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel] `tfsdk:"maintenance_window" autoflex:",noflatten"` - Tags tftags.Map `tfsdk:"tags"` + ActivatedStorageCount types.Int32 `tfsdk:"activated_storage_count"` + AdditionalStorageCount types.Int32 `tfsdk:"additional_storage_count"` + AvailabilityZone types.String `tfsdk:"availability_zone"` + AvailabilityZoneId types.String `tfsdk:"availability_zone_id"` + AvailableStorageSizeInGBs types.Int32 `tfsdk:"available_storage_size_in_gbs"` + CloudExadataInfrastructureArn types.String `tfsdk:"arn"` + CloudExadataInfrastructureId types.String `tfsdk:"id"` + ComputeCount types.Int32 `tfsdk:"compute_count"` + CpuCount types.Int32 `tfsdk:"cpu_count"` + DataStorageSizeInTBs types.Float64 `tfsdk:"data_storage_size_in_tbs"` + DbNodeStorageSizeInGBs types.Int32 `tfsdk:"db_node_storage_size_in_gbs"` + DbServerVersion types.String `tfsdk:"db_server_version"` + DisplayName types.String `tfsdk:"display_name"` + LastMaintenanceRunId types.String `tfsdk:"last_maintenance_run_id"` + MaxCpuCount types.Int32 `tfsdk:"max_cpu_count"` + MaxDataStorageInTBs types.Float64 `tfsdk:"max_data_storage_in_tbs"` + MaxDbNodeStorageSizeInGBs types.Int32 `tfsdk:"max_db_node_storage_size_in_gbs"` + MaxMemoryInGBs types.Int32 `tfsdk:"max_memory_in_gbs"` + MemorySizeInGBs types.Int32 `tfsdk:"memory_size_in_gbs"` + MonthlyDbServerVersion types.String `tfsdk:"monthly_db_server_version"` + MonthlyStorageServerVersion types.String `tfsdk:"monthly_storage_server_version"` + NextMaintenanceRunId types.String `tfsdk:"next_maintenance_run_id"` + OciResourceAnchorName types.String `tfsdk:"oci_resource_anchor_name"` + OciUrl types.String `tfsdk:"oci_url"` + Ocid types.String `tfsdk:"ocid"` + PercentProgress types.Float64 `tfsdk:"percent_progress"` + Shape types.String `tfsdk:"shape"` + Status fwtypes.StringEnum[odbtypes.ResourceStatus] `tfsdk:"status"` + StatusReason types.String `tfsdk:"status_reason"` + StorageCount types.Int32 `tfsdk:"storage_count"` + StorageServerVersion types.String `tfsdk:"storage_server_version"` + TotalStorageSizeInGBs types.Int32 `tfsdk:"total_storage_size_in_gbs"` + CustomerContactsToSendToOCI fwtypes.SetNestedObjectValueOf[customerContactExaInfraDataSourceModel] `tfsdk:"customer_contacts_to_send_to_oci"` + ComputeModel fwtypes.StringEnum[odbtypes.ComputeModel] `tfsdk:"compute_model"` + CreatedAt timetypes.RFC3339 `tfsdk:"created_at" ` + DatabaseServerType types.String `tfsdk:"database_server_type"` + StorageServerType types.String `tfsdk:"storage_server_type"` + MaintenanceWindow fwtypes.ListNestedObjectValueOf[cloudExadataInfraMaintenanceWindowDataSourceModel] `tfsdk:"maintenance_window" ` + Tags tftags.Map `tfsdk:"tags"` } type cloudExadataInfraMaintenanceWindowDataSourceModel struct { - CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` - DaysOfWeek fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.DayOfWeekName]] `tfsdk:"days_of_week"` - HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` - IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` - LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` - Months fwtypes.SetValueOf[fwtypes.StringEnum[odbtypes.MonthName]] `tfsdk:"months"` - PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` - Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` - WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` + CustomActionTimeoutInMins types.Int32 `tfsdk:"custom_action_timeout_in_mins"` + DaysOfWeek fwtypes.SetNestedObjectValueOf[dayOfWeekExaInfraMaintenanceWindowDataSourceModel] `tfsdk:"days_of_week" ` + HoursOfDay fwtypes.SetValueOf[types.Int64] `tfsdk:"hours_of_day"` + IsCustomActionTimeoutEnabled types.Bool `tfsdk:"is_custom_action_timeout_enabled"` + LeadTimeInWeeks types.Int32 `tfsdk:"lead_time_in_weeks"` + Months fwtypes.SetNestedObjectValueOf[monthExaInfraMaintenanceWindowDataSourceModel] `tfsdk:"months" ` + PatchingMode fwtypes.StringEnum[odbtypes.PatchingModeType] `tfsdk:"patching_mode"` + Preference fwtypes.StringEnum[odbtypes.PreferenceType] `tfsdk:"preference"` + WeeksOfMonth fwtypes.SetValueOf[types.Int64] `tfsdk:"weeks_of_month"` +} + +type dayOfWeekExaInfraMaintenanceWindowDataSourceModel struct { + Name fwtypes.StringEnum[odbtypes.DayOfWeekName] `tfsdk:"name"` } -type customerContactDataSourceModel struct { + +type monthExaInfraMaintenanceWindowDataSourceModel struct { + Name fwtypes.StringEnum[odbtypes.MonthName] `tfsdk:"name"` +} + +type customerContactExaInfraDataSourceModel struct { Email types.String `tfsdk:"email"` } diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index 28f0cb416572..262cb37c4def 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -1,5 +1,4 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 +// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. package odb_test @@ -7,6 +6,8 @@ import ( "context" "errors" "fmt" + "testing" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -16,10 +17,17 @@ import ( tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" - "testing" ) // Acceptance test access AWS and cost money to run. +type cloudExaDataInfraDataSourceTest struct { + displayNamePrefix string +} + +var exaInfraDataSourceTestEntity = cloudExaDataInfraDataSourceTest{ + displayNamePrefix: "Ofake-exa", +} + func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -27,7 +35,7 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { } exaInfraResource := "aws_odb_cloud_exadata_infrastructure.test" exaInfraDataSource := "data.aws_odb_cloud_exadata_infrastructure.test" - displayNameSuffix := sdkacctest.RandomWithPrefix("tf_") + displayNameSuffix := sdkacctest.RandomWithPrefix(exaInfraDataSourceTestEntity.displayNamePrefix) resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -35,10 +43,10 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { }, ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckCloudExadataInfrastructureDestroy(ctx), + CheckDestroy: exaInfraDataSourceTestEntity.testAccCheckCloudExadataInfrastructureDestroy(ctx), Steps: []resource.TestStep{ { - Config: basicExaInfraDataSource(displayNameSuffix), + Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrPair(exaInfraResource, "id", exaInfraDataSource, "id"), resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"), @@ -51,7 +59,7 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { }) } -func testAccCheckCloudExadataInfrastructureDestroy(ctx context.Context) resource.TestCheckFunc { +func (cloudExaDataInfraDataSourceTest) testAccCheckCloudExadataInfrastructureDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) @@ -74,28 +82,23 @@ func testAccCheckCloudExadataInfrastructureDestroy(ctx context.Context) resource } } -func basicExaInfraDataSource(displayNameSuffix string) string { +func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix string) string { testData := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = "Ofake_exa_%[1]s" + display_name = %[1]q shape = "Exadata.X9M" storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = ["abc@example.com"] -maintenance_window = { + customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] + maintenance_window { custom_action_timeout_in_mins = 16 - days_of_week = [] - hours_of_day = [] is_custom_action_timeout_enabled = true - lead_time_in_weeks = 0 - months = [] patching_mode = "ROLLING" preference = "NO_PREFERENCE" - weeks_of_month =[] } } diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index 702a44c07952..558bf63bee76 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -1,4 +1,4 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright © 2025, Oracle and/or its affiliates. All rights reserved. package odb_test @@ -6,19 +6,19 @@ import ( "context" "errors" "fmt" - odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/types" - "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-provider-aws/internal/create" - tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "strings" "testing" "github.com/aws/aws-sdk-go-v2/service/odb" + odbtypes "github.com/aws/aws-sdk-go-v2/service/odb/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/create" + tfodb "github.com/hashicorp/terraform-provider-aws/internal/service/odb" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -32,7 +32,7 @@ var exaInfraTestResource = cloudExaDataInfraResourceTest{ displayNamePrefix: "Ofake-exa", } -func TestAccODBCloudExadataInfrastructureCreate_basic(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResourceCreateBasic(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -65,7 +65,7 @@ func TestAccODBCloudExadataInfrastructureCreate_basic(t *testing.T) { }, }) } -func TestAccODBCloudExadataInfrastructureCreateWithAllParameters(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResourceCreateWithAllParameters(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -99,7 +99,7 @@ func TestAccODBCloudExadataInfrastructureCreateWithAllParameters(t *testing.T) { }) } -func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResourceTagging(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -107,7 +107,6 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { var cloudExaDataInfrastructure1 odbtypes.CloudExadataInfrastructure var cloudExaDataInfrastructure2 odbtypes.CloudExadataInfrastructure - var cloudExaDataInfrastructure3 odbtypes.CloudExadataInfrastructure resourceName := "aws_odb_cloud_exadata_infrastructure.test" rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) resource.Test(t, resource.TestCase{ @@ -120,10 +119,11 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), Steps: []resource.TestStep{ { - Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), + Config: exaInfraTestResource.exaDataInfraResourceBasicConfigWithTags(rName), Check: resource.ComposeAggregateTestCheckFunc( exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"), ), }, { @@ -132,7 +132,7 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { ImportStateVerify: true, }, { - Config: exaInfraTestResource.exaDataInfraResourceBasicConfigAddTags(rName), + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure2), resource.ComposeTestCheckFunc(func(state *terraform.State) error { @@ -141,8 +141,7 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { } return nil }), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), - resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"), + resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { @@ -150,17 +149,50 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { ImportState: true, ImportStateVerify: true, }, + }, + }) +} + +func TestAccODBCloudExadataInfrastructureResourceUpdateDisplayName(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var cloudExaDataInfrastructure1 odbtypes.CloudExadataInfrastructure + var cloudExaDataInfrastructure2 odbtypes.CloudExadataInfrastructure + resourceName := "aws_odb_cloud_exadata_infrastructure.test" + rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + exaInfraTestResource.testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ODBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), + Steps: []resource.TestStep{ { - Config: exaInfraTestResource.exaDataInfraResourceBasicConfigRemoveTags(rName), + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( - exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure3), + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName + "-u"), + Check: resource.ComposeAggregateTestCheckFunc( + exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure2), resource.ComposeTestCheckFunc(func(state *terraform.State) error { - if strings.Compare(*(cloudExaDataInfrastructure1.CloudExadataInfrastructureId), *(cloudExaDataInfrastructure3.CloudExadataInfrastructureId)) != 0 { - return errors.New("Should not create a new cloud exa basicExaInfraDataSource after update") + if strings.Compare(*(cloudExaDataInfrastructure1.CloudExadataInfrastructureId), *(cloudExaDataInfrastructure2.CloudExadataInfrastructureId)) == 0 { + return errors.New("Should create a new cloud exa basicExaInfraDataSource after update") } return nil }), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), ), }, { @@ -172,7 +204,7 @@ func TestAccODBCloudExadataInfrastructureTagging(t *testing.T) { }) } -func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResourceUpdateMaintenanceWindow(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -182,7 +214,7 @@ func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { var cloudExaDataInfrastructure2 odbtypes.CloudExadataInfrastructure resourceName := "aws_odb_cloud_exadata_infrastructure.test" rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) - resource.Test(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) exaInfraTestResource.testAccPreCheck(ctx, t) @@ -195,7 +227,6 @@ func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { Config: exaInfraTestResource.exaDataInfraResourceBasicConfig(rName), Check: resource.ComposeAggregateTestCheckFunc( exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), - resource.TestCheckResourceAttr(resourceName, "maintenance_window.preference", "NO_PREFERENCE"), ), }, { @@ -213,7 +244,6 @@ func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { } return nil }), - resource.TestCheckResourceAttr(resourceName, "maintenance_window.preference", "CUSTOM_PREFERENCE"), ), }, { @@ -225,7 +255,7 @@ func TestAccODBCloudExadataUpdateMaintenanceWindow(t *testing.T) { }) } -func TestAccODBCloudExadataInfrastructure_disappears(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResourceDisappears(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -319,17 +349,6 @@ func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *tes } } -/* - func testAccCheckCloudExadataInfrastructureNotRecreated(before, after *odb.DescribeCloudExadataInfrastructureResponse) resource.TestCheckFunc { - return func(s *terraform.State) error { - if before, after := aws.ToString(before.CloudExadataInfrastructureId), aws.ToString(after.CloudExadataInfrastructureId); before != after { - return create.Error(names.ODB, create.ErrActionCheckingNotRecreated, tfodb.ResNameCloudExadataInfrastructure, aws.ToString(before.CloudExadataInfrastructureId), errors.New("recreated")) - } - - return nil - } - } -*/ func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId string) string { exaDataInfra := fmt.Sprintf(` @@ -339,16 +358,16 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = ["abc@example.com"] + customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] database_server_type = "X11M" storage_server_type = "X11M-HC" - maintenance_window = { + maintenance_window { custom_action_timeout_in_mins = 16 - days_of_week = ["MONDAY", "TUESDAY"] + days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] hours_of_day = [11,16] is_custom_action_timeout_enabled = true lead_time_in_weeks = 3 - months = ["FEBRUARY","MAY","AUGUST","NOVEMBER"] + months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] patching_mode = "ROLLING" preference = "CUSTOM_PREFERENCE" weeks_of_month =[2,4] @@ -369,22 +388,17 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - maintenance_window = { + maintenance_window { custom_action_timeout_in_mins = 16 - days_of_week = [] - hours_of_day = [] is_custom_action_timeout_enabled = true - lead_time_in_weeks = 0 - months = [] patching_mode = "ROLLING" preference = "NO_PREFERENCE" - weeks_of_month =[] } } `, displayName) return exaInfra } -func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigAddTags(displayName string) string { +func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigWithTags(displayName string) string { exaInfra := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { display_name = %[1]q @@ -392,18 +406,13 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" -maintenance_window = { + maintenance_window { custom_action_timeout_in_mins = 16 - days_of_week = [] - hours_of_day = [] is_custom_action_timeout_enabled = true - lead_time_in_weeks = 0 - months = [] patching_mode = "ROLLING" preference = "NO_PREFERENCE" - weeks_of_month =[] } - tags = { + tags = { "env"= "dev" } } @@ -411,29 +420,6 @@ maintenance_window = { return exaInfra } -func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigRemoveTags(displayName string) string { - exaInfra := fmt.Sprintf(` -resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" -maintenance_window = { - custom_action_timeout_in_mins = 16 - days_of_week = [] - hours_of_day = [] - is_custom_action_timeout_enabled = true - lead_time_in_weeks = 0 - months = [] - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" - weeks_of_month =[] - } -} -`, displayName) - return exaInfra -} func (cloudExaDataInfraResourceTest) basicWithCustomMaintenanceWindow(displayName string) string { exaInfra := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { @@ -442,13 +428,13 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - maintenance_window = { + maintenance_window { custom_action_timeout_in_mins = 16 - days_of_week = ["MONDAY", "TUESDAY"] + days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] hours_of_day = [11,16] is_custom_action_timeout_enabled = true lead_time_in_weeks = 3 - months = ["FEBRUARY","MAY","AUGUST","NOVEMBER"] + months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] patching_mode = "ROLLING" preference = "CUSTOM_PREFERENCE" weeks_of_month =[2,4] diff --git a/internal/service/odb/generate.go b/internal/service/odb/generate.go deleted file mode 100644 index 2fef8ab1a1c7..000000000000 --- a/internal/service/odb/generate.go +++ /dev/null @@ -1,6 +0,0 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. -//go:generate go run ../../generate/tags/main.go -ServiceTagsMap -ListTags -KVTValues -UpdateTags -//go:generate go run ../../generate/servicepackage/main.go -// ONLY generate directives and package declaration! Do not add anything else to this file. - -package odb diff --git a/internal/service/odb/service_endpoint_resolver_gen.go b/internal/service/odb/service_endpoint_resolver_gen.go deleted file mode 100644 index 103f29abab6b..000000000000 --- a/internal/service/odb/service_endpoint_resolver_gen.go +++ /dev/null @@ -1,82 +0,0 @@ -// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. - -package odb - -import ( - "context" - "fmt" - "net" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/odb" - smithyendpoints "github.com/aws/smithy-go/endpoints" - "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/hashicorp/terraform-provider-aws/internal/errs" -) - -var _ odb.EndpointResolverV2 = resolverV2{} - -type resolverV2 struct { - defaultResolver odb.EndpointResolverV2 -} - -func newEndpointResolverV2() resolverV2 { - return resolverV2{ - defaultResolver: odb.NewDefaultEndpointResolverV2(), - } -} - -func (r resolverV2) ResolveEndpoint(ctx context.Context, params odb.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { - params = params.WithDefaults() - useFIPS := aws.ToBool(params.UseFIPS) - - if eps := params.Endpoint; aws.ToString(eps) != "" { - tflog.Debug(ctx, "setting endpoint", map[string]any{ - "tf_aws.endpoint": endpoint, - }) - - if useFIPS { - tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") - params.UseFIPS = aws.Bool(false) - } - - return r.defaultResolver.ResolveEndpoint(ctx, params) - } else if useFIPS { - ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) - - endpoint, err = r.defaultResolver.ResolveEndpoint(ctx, params) - if err != nil { - return endpoint, err - } - - tflog.Debug(ctx, "endpoint resolved", map[string]any{ - "tf_aws.endpoint": endpoint.URI.String(), - }) - - hostname := endpoint.URI.Hostname() - _, err = net.LookupHost(hostname) - if err != nil { - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ - "tf_aws.hostname": hostname, - }) - params.UseFIPS = aws.Bool(false) - } else { - err = fmt.Errorf("looking up odb endpoint %q: %s", hostname, err) - return - } - } else { - return endpoint, err - } - } - - return r.defaultResolver.ResolveEndpoint(ctx, params) -} - -func withBaseEndpoint(endpoint string) func(*odb.Options) { - return func(o *odb.Options) { - if endpoint != "" { - o.BaseEndpoint = aws.String(endpoint) - } - } -} diff --git a/internal/service/odb/service_endpoints_gen_test.go b/internal/service/odb/service_endpoints_gen_test.go deleted file mode 100644 index 3e14b47bd0f5..000000000000 --- a/internal/service/odb/service_endpoints_gen_test.go +++ /dev/null @@ -1,602 +0,0 @@ -// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. - -package odb_test - -import ( - "context" - "errors" - "fmt" - "maps" - "net" - "net/url" - "os" - "path/filepath" - "reflect" - "strings" - "testing" - - "github.com/aws/aws-sdk-go-v2/aws" - awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/service/odb" - "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" - terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "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/provider/sdkv2" - "github.com/hashicorp/terraform-provider-aws/names" -) - -type endpointTestCase struct { - with []setupFunc - expected caseExpectations -} - -type caseSetup struct { - config map[string]any - configFile configFile - environmentVariables map[string]string -} - -type configFile struct { - baseUrl string - serviceUrl string -} - -type caseExpectations struct { - diags diag.Diagnostics - endpoint string - region string -} - -type apiCallParams struct { - endpoint string - region string -} - -type setupFunc func(setup *caseSetup) - -type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams - -const ( - packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" - awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" - baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" - serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" - baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" -) - -const ( - packageName = "odb" - awsEnvVar = "AWS_ENDPOINT_URL_ODB" - baseEnvVar = "AWS_ENDPOINT_URL" - configParam = "odb" -) - -const ( - expectedCallRegion = "us-east-1" //lintignore:AWSAT003 -) - -func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv - ctx := t.Context() - const providerRegion = "us-west-2" //lintignore:AWSAT003 - const expectedEndpointRegion = providerRegion - - testcases := map[string]endpointTestCase{ - "no config": { - with: []setupFunc{withNoConfig}, - expected: expectDefaultEndpoint(ctx, t, expectedEndpointRegion), - }, - - // Package name endpoint on Config - - "package name endpoint config": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides aws service envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withAwsEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides service config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withServiceEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - // Service endpoint in AWS envvar - - "service aws envvar": { - with: []setupFunc{ - withAwsEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base envvar": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides service config file": { - with: []setupFunc{ - withAwsEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base config file": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - // Base endpoint in envvar - - "base endpoint envvar": { - with: []setupFunc{ - withBaseEnvVar, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides service config file": { - with: []setupFunc{ - withBaseEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides base config file": { - with: []setupFunc{ - withBaseEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - // Service endpoint in config file - - "service config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - "service config file overrides base config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - withBaseEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - // Base endpoint in config file - - "base endpoint config file": { - with: []setupFunc{ - withBaseEndpointInConfigFile, - }, - expected: expectBaseConfigFileEndpoint(), - }, - - // Use FIPS endpoint on Config - - "use fips config": { - with: []setupFunc{ - withUseFIPSInConfig, - }, - expected: expectDefaultFIPSEndpoint(ctx, t, expectedEndpointRegion), - }, - - "use fips config with package name endpoint config": { - with: []setupFunc{ - withUseFIPSInConfig, - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - } - - for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv - t.Run(name, func(t *testing.T) { - testEndpointCase(ctx, t, providerRegion, testcase, callService) - }) - } -} - -func defaultEndpoint(ctx context.Context, region string) (url.URL, error) { - r := odb.NewDefaultEndpointResolverV2() - - ep, err := r.ResolveEndpoint(ctx, odb.EndpointParameters{ - Region: aws.String(region), - }) - if err != nil { - return url.URL{}, err - } - - if ep.URI.Path == "" { - ep.URI.Path = "/" - } - - return ep.URI, nil -} - -func defaultFIPSEndpoint(ctx context.Context, region string) (url.URL, error) { - r := odb.NewDefaultEndpointResolverV2() - - ep, err := r.ResolveEndpoint(ctx, odb.EndpointParameters{ - Region: aws.String(region), - UseFIPS: aws.Bool(true), - }) - if err != nil { - return url.URL{}, err - } - - if ep.URI.Path == "" { - ep.URI.Path = "/" - } - - return ep.URI, nil -} - -func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { - t.Helper() - - client := meta.ODBClient(ctx) - - var result apiCallParams - - input := odb.ListGiVersionsInput{} - _, err := client.ListGiVersions(ctx, &input, - func(opts *odb.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) { - // no-op -} - -func withPackageNameEndpointInConfig(setup *caseSetup) { - if _, ok := setup.config[names.AttrEndpoints]; !ok { - setup.config[names.AttrEndpoints] = []any{ - map[string]any{}, - } - } - endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) - endpoints[packageName] = packageNameConfigEndpoint -} - -func withAwsEnvVar(setup *caseSetup) { - setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint -} - -func withBaseEnvVar(setup *caseSetup) { - setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint -} - -func withServiceEndpointInConfigFile(setup *caseSetup) { - setup.configFile.serviceUrl = serviceConfigFileEndpoint -} - -func withBaseEndpointInConfigFile(setup *caseSetup) { - setup.configFile.baseUrl = baseConfigFileEndpoint -} - -func withUseFIPSInConfig(setup *caseSetup) { - setup.config["use_fips_endpoint"] = true -} - -func expectDefaultEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultEndpoint(ctx, region) - if err != nil { - t.Fatalf("resolving accessanalyzer default endpoint: %s", err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectDefaultFIPSEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultFIPSEndpoint(ctx, region) - if err != nil { - t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) - } - - hostname := endpoint.Hostname() - _, err = net.LookupHost(hostname) - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - return expectDefaultEndpoint(ctx, t, region) - } else if err != nil { - t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectPackageNameConfigEndpoint() caseExpectations { - return caseExpectations{ - endpoint: packageNameConfigEndpoint, - region: expectedCallRegion, - } -} - -func expectAwsEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: awsServiceEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectServiceConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: serviceConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func testEndpointCase(ctx context.Context, t *testing.T, region string, testcase endpointTestCase, callF callFunc) { - t.Helper() - - setup := caseSetup{ - config: map[string]any{}, - environmentVariables: map[string]string{}, - } - - for _, f := range testcase.with { - f(&setup) - } - - config := map[string]any{ - names.AttrAccessKey: servicemocks.MockStaticAccessKey, - names.AttrSecretKey: servicemocks.MockStaticSecretKey, - names.AttrRegion: region, - names.AttrSkipCredentialsValidation: true, - names.AttrSkipRequestingAccountID: true, - } - - maps.Copy(config, setup.config) - - if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { - config[names.AttrProfile] = "default" - tempDir := t.TempDir() - writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) - } - - for k, v := range setup.environmentVariables { - t.Setenv(k, v) - } - - p, err := sdkv2.NewProvider(ctx) - if err != nil { - t.Fatal(err) - } - - p.TerraformVersion = "1.0.0" - - expectedDiags := testcase.expected.diags - diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) - - if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { - t.Errorf("unexpected diagnostics difference: %s", diff) - } - - if diags.HasError() { - return - } - - meta := p.Meta().(*conns.AWSClient) - - callParams := callF(ctx, t, meta) - - if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { - t.Errorf("expected endpoint %q, got %q", e, a) - } - - if e, a := testcase.expected.region, callParams.region; e != a { - t.Errorf("expected region %q, got %q", e, a) - } -} - -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 any) 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 - - buf.WriteString(` -[default] -aws_access_key_id = DefaultSharedCredentialsAccessKey -aws_secret_access_key = DefaultSharedCredentialsSecretKey -`) - if config.baseUrl != "" { - fmt.Fprintf(&buf, "endpoint_url = %s\n", config.baseUrl) - } - - if config.serviceUrl != "" { - fmt.Fprintf(&buf, ` -services = endpoint-test - -[services endpoint-test] -%[1]s = - endpoint_url = %[2]s -`, configParam, serviceConfigFileEndpoint) - } - - return buf.String() -} - -func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { - t.Helper() - - file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) - if err != nil { - t.Fatalf("creating shared configuration file: %s", err) - } - - _, err = file.WriteString(content) - if err != nil { - t.Fatalf(" writing shared configuration file: %s", err) - } - - if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { - (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} - } else { - (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) - } - - return file.Name() -} diff --git a/internal/service/odb/service_package.go b/internal/service/odb/service_package.go deleted file mode 100644 index 5278c3224650..000000000000 --- a/internal/service/odb/service_package.go +++ /dev/null @@ -1,22 +0,0 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. - -package odb - -import ( - "context" - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/odb" - "github.com/hashicorp/terraform-provider-aws/names" -) - -func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (*odb.Client, error) { - cfg := *(config["aws_sdkv2_config"].(*aws.Config)) - - return odb.NewFromConfig(cfg, - odb.WithEndpointResolverV2(newEndpointResolverV2()), - withBaseEndpoint(config[names.AttrEndpoint].(string)), - func(o *odb.Options) { - - }, - ), nil -} diff --git a/internal/service/odb/service_package_gen.go b/internal/service/odb/service_package_gen.go deleted file mode 100644 index cd5cffdd14ed..000000000000 --- a/internal/service/odb/service_package_gen.go +++ /dev/null @@ -1,55 +0,0 @@ -// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. - -package odb - -import ( - "context" - "unique" - - "github.com/hashicorp/terraform-provider-aws/internal/conns" - inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" - "github.com/hashicorp/terraform-provider-aws/names" -) - -type servicePackage struct{} - -func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.ServicePackageFrameworkDataSource { - return []*inttypes.ServicePackageFrameworkDataSource{ - { - Factory: newDataSourceCloudExadataInfrastructure, - TypeName: "aws_odb_cloud_exadata_infrastructure", - Name: "Cloud Exadata Infrastructure", - Region: unique.Make(inttypes.ResourceRegionDefault()), - }, - } -} - -func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.ServicePackageFrameworkResource { - return []*inttypes.ServicePackageFrameworkResource{ - { - Factory: newResourceCloudExadataInfrastructure, - TypeName: "aws_odb_cloud_exadata_infrastructure", - Name: "Cloud Exadata Infrastructure", - Tags: unique.Make(inttypes.ServicePackageResourceTags{ - IdentifierAttribute: names.AttrARN, - }), - Region: unique.Make(inttypes.ResourceRegionDefault()), - }, - } -} - -func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { - return []*inttypes.ServicePackageSDKDataSource{} -} - -func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePackageSDKResource { - return []*inttypes.ServicePackageSDKResource{} -} - -func (p *servicePackage) ServicePackageName() string { - return names.ODB -} - -func ServicePackage(ctx context.Context) conns.ServicePackage { - return &servicePackage{} -} diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index b67beb4f52a0..98b946aa2da3 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -9462,9 +9462,6 @@ service "odb" { v1_package = "" v2_package = "odb" } - client{ - skip_client_generate = true - } resource_prefix{ correct = "aws_odb_" } From a9f6643da9708a2b7c98b93f44640672ae7c074c Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 15 Aug 2025 14:32:24 +0100 Subject: [PATCH 0168/2115] removed commented code --- ...loud_exadata_infrastructure_data_source.go | 43 ------------------- internal/service/odb/generate.go | 6 +++ 2 files changed, 6 insertions(+), 43 deletions(-) create mode 100644 internal/service/odb/generate.go diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index a513d8c81ba4..88ff4b92227a 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -207,49 +207,6 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), }, }, - /*Blocks: map[string]schema.Block{ - "maintenance_window": schema.ListNestedBlock{ - CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowDataSourceModel](ctx), - Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", - NestedObject: schema.NestedBlockObject{ - Attributes: map[string]schema.Attribute{ - "custom_action_timeout_in_mins": schema.Int32Attribute{ - Computed: true, - }, - "days_of_week": schema.SetAttribute{ - ElementType: fwtypes.NewObjectTypeOf[dayOfWeekExaInfraMaintenanceWindowDataSourceModel](ctx), - Computed: true, - }, - "hours_of_day": schema.SetAttribute{ - ElementType: types.Int32Type, - Computed: true, - }, - "is_custom_action_timeout_enabled": schema.BoolAttribute{ - Computed: true, - }, - "lead_time_in_weeks": schema.Int32Attribute{ - Computed: true, - }, - "months": schema.SetAttribute{ - ElementType: fwtypes.NewObjectTypeOf[monthExaInfraMaintenanceWindowDataSourceModel](ctx), - Computed: true, - }, - "patching_mode": schema.StringAttribute{ - Computed: true, - CustomType: fwtypes.StringEnumType[odbtypes.PatchingModeType](), - }, - "preference": schema.StringAttribute{ - Computed: true, - CustomType: fwtypes.StringEnumType[odbtypes.PreferenceType](), - }, - "weeks_of_month": schema.SetAttribute{ - ElementType: types.Int32Type, - Computed: true, - }, - }, - }, - }, - },*/ } } diff --git a/internal/service/odb/generate.go b/internal/service/odb/generate.go new file mode 100644 index 000000000000..2fef8ab1a1c7 --- /dev/null +++ b/internal/service/odb/generate.go @@ -0,0 +1,6 @@ +//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +//go:generate go run ../../generate/tags/main.go -ServiceTagsMap -ListTags -KVTValues -UpdateTags +//go:generate go run ../../generate/servicepackage/main.go +// ONLY generate directives and package declaration! Do not add anything else to this file. + +package odb From ecc87b70a361c7a4efdedb4f3635af7be851271c Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 15 Aug 2025 14:34:16 +0100 Subject: [PATCH 0169/2115] removed commented code --- .../service/odb/cloud_exadata_infrastructure_data_source.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index 88ff4b92227a..e2644a80c761 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -227,8 +227,6 @@ func (d *dataSourceCloudExadataInfrastructure) Read(ctx context.Context, req dat ) return } - - //data.CreatedAt = types.StringValue(out.CreatedAt.Format(time.RFC3339)) resp.Diagnostics.Append(flex.Flatten(ctx, out, &data)...) if resp.Diagnostics.HasError() { return From bbf07d4234c71b950c85c1ee90cd69dcc77211b3 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 15 Aug 2025 14:39:51 +0100 Subject: [PATCH 0170/2115] removed conflicted file. --- internal/service/odb/generate.go | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 internal/service/odb/generate.go diff --git a/internal/service/odb/generate.go b/internal/service/odb/generate.go deleted file mode 100644 index 2fef8ab1a1c7..000000000000 --- a/internal/service/odb/generate.go +++ /dev/null @@ -1,6 +0,0 @@ -//Copyright © 2025, Oracle and/or its affiliates. All rights reserved. -//go:generate go run ../../generate/tags/main.go -ServiceTagsMap -ListTags -KVTValues -UpdateTags -//go:generate go run ../../generate/servicepackage/main.go -// ONLY generate directives and package declaration! Do not add anything else to this file. - -package odb From 274724555623381a946cd5d530088a02adc14c1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 15 Aug 2025 09:50:17 -0400 Subject: [PATCH 0171/2115] Intermediate commit. --- .../cognitoidp/managed_login_branding.go | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index cc59f8ebdd10..2e3992906afe 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -184,7 +184,9 @@ func (r *managedLoginBrandingResource) Read(ctx context.Context, request resourc conn := r.Meta().CognitoIDPClient(ctx) - mlb, err := findManagedLoginBrandingByTwoPartKey(ctx, conn, data.UserPoolID.ValueString(), data.ManagedLoginBrandingID.ValueString()) + userPoolID, managedLoginBrandingID := fwflex.StringValueFromFramework(ctx, data.UserPoolID), fwflex.StringValueFromFramework(ctx, data.ManagedLoginBrandingID) + // Return only customized values. + mlb, err := findManagedLoginBrandingByThreePartKey(ctx, conn, userPoolID, managedLoginBrandingID, false) if tfresource.NotFound(err) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) @@ -194,7 +196,7 @@ func (r *managedLoginBrandingResource) Read(ctx context.Context, request resourc } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", data.ManagedLoginBrandingID.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) return } @@ -221,6 +223,7 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou conn := r.Meta().CognitoIDPClient(ctx) + userPoolID, managedLoginBrandingID := fwflex.StringValueFromFramework(ctx, new.UserPoolID), fwflex.StringValueFromFramework(ctx, new.ManagedLoginBrandingID) var input cognitoidentityprovider.UpdateManagedLoginBrandingInput response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) if response.Diagnostics.HasError() { @@ -248,7 +251,7 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou _, err = conn.UpdateManagedLoginBranding(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("updating Cognito Managed Login Branding (%s)", new.ManagedLoginBrandingID.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("updating Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) return } @@ -265,13 +268,14 @@ func (r *managedLoginBrandingResource) Delete(ctx context.Context, request resou conn := r.Meta().CognitoIDPClient(ctx) + userPoolID, managedLoginBrandingID := fwflex.StringValueFromFramework(ctx, data.UserPoolID), fwflex.StringValueFromFramework(ctx, data.ManagedLoginBrandingID) tflog.Debug(ctx, "deleting Cognito Managed Login Branding", map[string]any{ - "managed_login_branding_id": data.ManagedLoginBrandingID.ValueString(), - names.AttrUserPoolID: data.UserPoolID.ValueString(), + "managed_login_branding_id": managedLoginBrandingID, + names.AttrUserPoolID: userPoolID, }) input := cognitoidentityprovider.DeleteManagedLoginBrandingInput{ - ManagedLoginBrandingId: fwflex.StringFromFramework(ctx, data.ManagedLoginBrandingID), - UserPoolId: fwflex.StringFromFramework(ctx, data.UserPoolID), + ManagedLoginBrandingId: aws.String(managedLoginBrandingID), + UserPoolId: aws.String(userPoolID), } _, err := conn.DeleteManagedLoginBranding(ctx, &input) @@ -280,7 +284,7 @@ func (r *managedLoginBrandingResource) Delete(ctx context.Context, request resou } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting Cognito Managed Login Branding (%s)", data.ManagedLoginBrandingID.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) return } @@ -302,14 +306,18 @@ func (r *managedLoginBrandingResource) ImportState(ctx context.Context, request response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("managed_login_branding_id"), parts[1])...) } -func findManagedLoginBrandingByTwoPartKey(ctx context.Context, conn *cognitoidentityprovider.Client, userPoolID, managedLoginBrandingID string) (*awstypes.ManagedLoginBrandingType, error) { +func findManagedLoginBrandingByThreePartKey(ctx context.Context, conn *cognitoidentityprovider.Client, userPoolID, managedLoginBrandingID string, returnMergedResources bool) (*awstypes.ManagedLoginBrandingType, error) { input := cognitoidentityprovider.DescribeManagedLoginBrandingInput{ ManagedLoginBrandingId: aws.String(managedLoginBrandingID), - ReturnMergedResources: false, // Return only customized values. + ReturnMergedResources: returnMergedResources, UserPoolId: aws.String(userPoolID), } - output, err := conn.DescribeManagedLoginBranding(ctx, &input) + return findManagedLoginBranding(ctx, conn, &input) +} + +func findManagedLoginBranding(ctx context.Context, conn *cognitoidentityprovider.Client, input *cognitoidentityprovider.DescribeManagedLoginBrandingInput) (*awstypes.ManagedLoginBrandingType, error) { + output, err := conn.DescribeManagedLoginBranding(ctx, input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ From cf7846aed601e2c1251da803ebebc3147f31dd17 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 11:08:47 -0400 Subject: [PATCH 0172/2115] Adding new types for ContributorInsightsMode from the latest ddb sdk release --- .../service/dynamodb/contributor_insights.go | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index da31ccbf0281..9db68e9cc1c5 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -24,24 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -type ContributorInsightsMode string - -const ( - AccessedAndThrottledKeys ContributorInsightsMode = "ACCESS_AND_THROTTLED_KEYS" - ThrottledKeys ContributorInsightsMode = "THROTTLED_KEYS" -) - -// Values returns all known values for AttributeAction. Note that this can be -// expanded in the future, and so it is only as up to date as the client. -// -// The ordering of this slice is not guaranteed to be stable across updates. -func (ContributorInsightsMode) Values() []ContributorInsightsMode { - return []ContributorInsightsMode{ - "ACCESS_AND_THROTTLED_KEYS", - "THROTTLED_KEYS", - } -} - // @SDKResource("aws_dynamodb_contributor_insights", name="Contributor Insights") func resourceContributorInsights() *schema.Resource { return &schema.Resource{ @@ -73,7 +55,7 @@ func resourceContributorInsights() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - ValidateDiagFunc: enum.Validate[ContributorInsightsMode](), + ValidateDiagFunc: enum.Validate[awstypes.ContributorInsightsMode](), }, }, } @@ -96,7 +78,7 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa } if v, ok := d.GetOk("mode"); ok { - input.mode = ContributorInsightsMode(v.(string)) + input.ContributorInsightsMode = awstypes.ContributorInsightsMode(v.(string)) } _, err := conn.UpdateContributorInsights(ctx, input) @@ -137,7 +119,7 @@ func resourceContributorInsightsRead(ctx context.Context, d *schema.ResourceData d.Set("index_name", output.IndexName) d.Set(names.AttrTableName, output.TableName) - d.Set("mode", output.ContributorInsightsStatus) + d.Set("mode", output.ContributorInsightsMode) return diags } From b6f4a34f7c982680213f3d66cfb48ed4c3461e48 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 11:12:28 -0400 Subject: [PATCH 0173/2115] Adding new types for ContributorInsightsMode from the latest ddb sdk release --- website/docs/r/dynamodb_contributor_insights.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/dynamodb_contributor_insights.html.markdown b/website/docs/r/dynamodb_contributor_insights.html.markdown index 2055410ff2d2..b38b5ff54926 100644 --- a/website/docs/r/dynamodb_contributor_insights.html.markdown +++ b/website/docs/r/dynamodb_contributor_insights.html.markdown @@ -25,7 +25,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `table_name` - (Required) The name of the table to enable contributor insights * `index_name` - (Optional) The global secondary index name - +* `mode` - (Optional) argument to specify the [CloudWatch contributor insights mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 505f19aec831e61163d061aadc51c9a6c2607e6b Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 11:28:31 -0400 Subject: [PATCH 0174/2115] Add changelog for CCI Mode --- .changelog/43914.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43914.txt diff --git a/.changelog/43914.txt b/.changelog/43914.txt new file mode 100644 index 000000000000..2f76ec5ec3a0 --- /dev/null +++ b/.changelog/43914.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_dynamodb_contributor_insights: Adds `mode` argument in support of [CloudWatch Contributor Insights Mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html) +``` From 751a841f822808657a393b326cb8f2026ee56df1 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 11:48:08 -0400 Subject: [PATCH 0175/2115] fix terrafmt issues --- .../dynamodb/contributor_insights_test.go | 36 ++--- internal/service/dynamodb/table.go | 74 +++------- internal/service/dynamodb/table_test.go | 137 +----------------- 3 files changed, 37 insertions(+), 210 deletions(-) diff --git a/internal/service/dynamodb/contributor_insights_test.go b/internal/service/dynamodb/contributor_insights_test.go index 773b6eae324c..831a28d1d007 100644 --- a/internal/service/dynamodb/contributor_insights_test.go +++ b/internal/service/dynamodb/contributor_insights_test.go @@ -153,25 +153,25 @@ func TestAccDynamoDBContributorInsights_disappears(t *testing.T) { func testAccContributorInsightsBaseConfig(rName string) string { return fmt.Sprintf(` - resource "aws_dynamodb_table" "test" { - name = %[1]q - read_capacity = 2 - write_capacity = 2 - hash_key = %[1]q - - attribute { - name = %[1]q - type = "S" - } - - global_secondary_index { - name = "%[1]s-index" - hash_key = %[1]q - projection_type = "ALL" - read_capacity = 1 - write_capacity = 1 - } +resource "aws_dynamodb_table" "test" { + name = %[1]q + read_capacity = 2 + write_capacity = 2 + hash_key = %[1]q + + attribute { + name = %[1]q + type = "S" } + + global_secondary_index { + name = "%[1]s-index" + hash_key = %[1]q + projection_type = "ALL" + read_capacity = 1 + write_capacity = 1 + } +} `, rName) } diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 2816ad0bf49f..2537b5bb95c8 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -284,11 +284,6 @@ func resourceTable() *schema.Resource { Computed: true, ConflictsWith: []string{"on_demand_throughput"}, }, - "global_table_witness_region_name": { - Type: schema.TypeString, - Optional: true, - Computed: true, - }, "replica": { Type: schema.TypeSet, Optional: true, @@ -836,11 +831,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) } if v := d.Get("replica").(*schema.Set); v.Len() > 0 { - var global_table_witness_region_name = "" - if v, ok := d.GetOk("global_table_witness_region_name"); ok { - global_table_witness_region_name = v.(string) - } - if err := createReplicas(ctx, conn, d.Id(), v.List(), true, d.Timeout(schema.TimeoutCreate), global_table_witness_region_name); err != nil { + if err := createReplicas(ctx, conn, d.Id(), v.List(), true, d.Timeout(schema.TimeoutCreate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, resNameTable, d.Id(), fmt.Errorf("replicas: %w", err)) } @@ -1302,11 +1293,7 @@ func resourceTableDelete(ctx context.Context, d *schema.ResourceData, meta any) if replicas := d.Get("replica").(*schema.Set).List(); len(replicas) > 0 { log.Printf("[DEBUG] Deleting DynamoDB Table replicas: %s", d.Id()) - var global_table_witness_region_name = "" - if v, ok := d.GetOk("global_table_witness_region_name"); ok { - global_table_witness_region_name = v.(string) - } - if err := deleteReplicas(ctx, conn, d.Id(), replicas, d.Timeout(schema.TimeoutDelete), global_table_witness_region_name); err != nil { + if err := deleteReplicas(ctx, conn, d.Id(), replicas, d.Timeout(schema.TimeoutDelete)); err != nil { // ValidationException: Replica specified in the Replica Update or Replica Delete action of the request was not found. // ValidationException: Cannot add, delete, or update the local region through ReplicaUpdates. Use CreateTable, DeleteTable, or UpdateTable as required. if !tfawserr.ErrMessageContains(err, errCodeValidationException, "request was not found") && @@ -1384,7 +1371,7 @@ func cycleStreamEnabled(ctx context.Context, conn *dynamodb.Client, id string, s return nil } -func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, create bool, timeout time.Duration, gt_witness_reg_name string) error { +func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, create bool, timeout time.Duration) error { // Duplicating this for MRSC Adoption. If using MRSC and CreateReplicationGroupMemberAction list isn't initiated for at least 2 replicas // then the update table action will fail with // "Unsupported table replica count for global tables with MultiRegionConsistency set to STRONG" @@ -1403,21 +1390,16 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string } } } - fmt.Printf("[DEBUG] global table witness region: %v and numReplicas (%v) and numReplicasMRSC (%v)\n", gt_witness_reg_name, numReplicas, numReplicasMRSC) if numReplicasMRSC > 0 { - MRSCErrorMsg := "creating replicas: Using MultiRegionStrongConsistency requires exactly 2 replicas, or 1 replica and 1 witness region." if numReplicasMRSC > 0 && numReplicasMRSC != numReplicas { - return fmt.Errorf("%s", MRSCErrorMsg) + return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency requires all replicas to use 'consistency_mode' set to 'STRONG' ") } - if numReplicasMRSC == 1 && gt_witness_reg_name == "" { - return fmt.Errorf("%s Only MRSC Replica count of 1 was provided but no Witness region was provided.", MRSCErrorMsg) - } - if numReplicasMRSC == 2 && numReplicasMRSC == numReplicas && gt_witness_reg_name != "" { - return fmt.Errorf("%s MRSC Replica count of 2 was provided and a Witness region was also provided.", MRSCErrorMsg) + if numReplicasMRSC == 1 { + return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency requires exactly 2 replicas. ") } if numReplicasMRSC > 2 { - return fmt.Errorf("%s Too many Replicas were provided %v", MRSCErrorMsg, numReplicasMRSC) + return fmt.Errorf("creating replicas: Using MultiRegionStrongConsistency supports at most 2 replicas. ") } mrscInput = awstypes.MultiRegionConsistencyStrong @@ -1448,21 +1430,10 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string }) } - var witnessCreate []awstypes.GlobalTableWitnessGroupUpdate - if gt_witness_reg_name != "" { - var witnessInput = &awstypes.CreateGlobalTableWitnessGroupMemberAction{ - RegionName: aws.String(gt_witness_reg_name), - } - witnessCreate = append(witnessCreate, awstypes.GlobalTableWitnessGroupUpdate{ - Create: witnessInput, - }) - } - input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: replicaCreates, - GlobalTableWitnessUpdates: witnessCreate, - MultiRegionConsistency: mrscInput, + TableName: aws.String(tableName), + ReplicaUpdates: replicaCreates, + MultiRegionConsistency: mrscInput, } err := retry.RetryContext(ctx, max(replicaUpdateTimeout, timeout), func() *retry.RetryError { @@ -1592,7 +1563,7 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string // ValidationException: One or more parameter values were invalid: KMSMasterKeyId must be specified for each replica. if create && tfawserr.ErrMessageContains(err, errCodeValidationException, "already exist") { - return createReplicas(ctx, conn, tableName, tfList, false, timeout, gt_witness_reg_name) + return createReplicas(ctx, conn, tableName, tfList, false, timeout) } if err != nil && !tfawserr.ErrMessageContains(err, errCodeValidationException, "no actions specified") { @@ -1840,19 +1811,19 @@ func updateReplica(ctx context.Context, conn *dynamodb.Client, d *schema.Resourc } if len(removeFirst) > 0 { // mini ForceNew, recreates replica but doesn't recreate the table - if err := deleteReplicas(ctx, conn, d.Id(), removeFirst, d.Timeout(schema.TimeoutUpdate), ""); err != nil { + if err := deleteReplicas(ctx, conn, d.Id(), removeFirst, d.Timeout(schema.TimeoutUpdate)); err != nil { return fmt.Errorf("updating replicas, while deleting: %w", err) } } if len(toRemove) > 0 { - if err := deleteReplicas(ctx, conn, d.Id(), toRemove, d.Timeout(schema.TimeoutUpdate), ""); err != nil { + if err := deleteReplicas(ctx, conn, d.Id(), toRemove, d.Timeout(schema.TimeoutUpdate)); err != nil { return fmt.Errorf("updating replicas, while deleting: %w", err) } } if len(toAdd) > 0 { - if err := createReplicas(ctx, conn, d.Id(), toAdd, true, d.Timeout(schema.TimeoutCreate), ""); err != nil { + if err := createReplicas(ctx, conn, d.Id(), toAdd, true, d.Timeout(schema.TimeoutCreate)); err != nil { return fmt.Errorf("updating replicas, while creating: %w", err) } } @@ -2033,11 +2004,10 @@ func deleteTable(ctx context.Context, conn *dynamodb.Client, tableName string) e return err } -func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, timeout time.Duration, gt_witness_reg_name string) error { +func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string, tfList []any, timeout time.Duration) error { var g multierror.Group var replicaDeletes []awstypes.ReplicationGroupUpdate - var witnessDeletes []awstypes.GlobalTableWitnessGroupUpdate for _, tfMapRaw := range tfList { tfMap, ok := tfMapRaw.(map[string]any) @@ -2065,22 +2035,14 @@ func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string } } } - if gt_witness_reg_name != "" { - witnessDeletes = append(witnessDeletes, awstypes.GlobalTableWitnessGroupUpdate{ - Delete: &awstypes.DeleteGlobalTableWitnessGroupMemberAction{ - RegionName: aws.String(gt_witness_reg_name), - }, - }) - } + // We built an array of MultiRegionStrongConsistency replicas that need deletion. // These need to all happen concurrently if len(replicaDeletes) > 0 { input := &dynamodb.UpdateTableInput{ - TableName: aws.String(tableName), - ReplicaUpdates: replicaDeletes, - GlobalTableWitnessUpdates: witnessDeletes, + TableName: aws.String(tableName), + ReplicaUpdates: replicaDeletes, } - fmt.Printf("[DEBUG] Deleting Replicas: %+v", input) err := retry.RetryContext(ctx, updateTableTimeout, func() *retry.RetryError { _, err := conn.UpdateTable(ctx, input) notFoundRetries := 0 diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index e6f5e1519daa..7d1a45ba8d1a 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -3245,68 +3245,6 @@ func TestAccDynamoDBTable_Replica_MRSC_Create(t *testing.T) { }) } -func TestAccDynamoDBTable_Replica_MRSC_Create_witness(t *testing.T) { - ctx := acctest.Context(t) - if testing.Short() { - t.Skip("skipping long-running test in short mode") - } - - var conf, replica1 awstypes.TableDescription - resourceName := "aws_dynamodb_table.test_mrsc" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { - acctest.PreCheck(ctx, t) - acctest.PreCheckMultipleRegion(t, 3) - }, - ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 3), // 3 due to shared test configuration - CheckDestroy: testAccCheckTableDestroy(ctx), - Steps: []resource.TestStep{ - { - Config: testAccTableConfig_MRSC_replica_witness(rName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckInitialTableExists(ctx, resourceName, &conf), - testAccCheckReplicaExists(ctx, resourceName, acctest.AlternateRegion(), &replica1), - ), - ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("replica"), knownvalue.SetExact([]knownvalue.Check{ - knownvalue.ObjectPartial(map[string]knownvalue.Check{ - "region_name": knownvalue.StringExact(acctest.AlternateRegion()), - "consistency_mode": knownvalue.StringExact((string(awstypes.MultiRegionConsistencyStrong))), - }), - })), - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("global_table_witness_region_name"), knownvalue.StringExact(acctest.ThirdRegion())), - }, - }, - }, - }) -} - -func TestAccDynamoDBTable_Replica_MRSC_Create_witness_too_many_replicas(t *testing.T) { - ctx := acctest.Context(t) - if testing.Short() { - t.Skip("skipping long-running test in short mode") - } - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { - acctest.PreCheck(ctx, t) - acctest.PreCheckMultipleRegion(t, 3) - }, - ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 3), // 3 due to shared test configuration - Steps: []resource.TestStep{ - { - Config: testAccTableConfig_MRSC_replica_witness_too_many_replicas(rName), - ExpectError: regexache.MustCompile(`MRSC Replica count of 2 was provided and a Witness region was also provided`), - }, - }, - }) -} - func TestAccDynamoDBTable_Replica_MRSC_doubleAddCMK(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -4139,7 +4077,7 @@ func TestAccDynamoDBTable_Replica_MRSC_TooManyReplicas(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccTableConfig_MRSC_replica_count3(rName), - ExpectError: regexache.MustCompile(`Too many Replicas were provided 3`), + ExpectError: regexache.MustCompile(`Using MultiRegionStrongConsistency supports at most 2 replicas`), }, }, }) @@ -5960,79 +5898,6 @@ resource "aws_dynamodb_table" "test_mrsc" { `, rName)) } -func testAccTableConfig_MRSC_replica_witness(rName string) string { - return acctest.ConfigCompose( - acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors - fmt.Sprintf(` -data "aws_region" "alternate" { - provider = "awsalternate" -} - -data "aws_region" "third" { - provider = "awsthird" -} - -resource "aws_dynamodb_table" "test_mrsc" { - name = %[1]q - hash_key = "TestTableHashKey" - billing_mode = "PAY_PER_REQUEST" - stream_enabled = true - stream_view_type = "NEW_AND_OLD_IMAGES" - - attribute { - name = "TestTableHashKey" - type = "S" - } - - replica { - region_name = data.aws_region.alternate.name - consistency_mode = "STRONG" - } - - global_table_witness_region_name = data.aws_region.third.name -} -`, rName)) -} - -func testAccTableConfig_MRSC_replica_witness_too_many_replicas(rName string) string { - return acctest.ConfigCompose( - acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors - fmt.Sprintf(` -data "aws_region" "alternate" { - provider = "awsalternate" -} - -data "aws_region" "third" { - provider = "awsthird" -} - -resource "aws_dynamodb_table" "test_mrsc" { - name = %[1]q - hash_key = "TestTableHashKey" - billing_mode = "PAY_PER_REQUEST" - stream_enabled = true - stream_view_type = "NEW_AND_OLD_IMAGES" - - attribute { - name = "TestTableHashKey" - type = "S" - } - - replica { - region_name = data.aws_region.alternate.name - consistency_mode = "STRONG" - } - - replica { - region_name = data.aws_region.third.name - consistency_mode = "STRONG" - } - - global_table_witness_region_name = data.aws_region.third.name -} -`, rName)) -} - func testAccTableConfig_replicaEncryptedDefault(rName string, sseEnabled bool) string { return acctest.ConfigCompose( acctest.ConfigMultipleRegionProvider(3), // Prevent "Provider configuration not present" errors From 52385b396fe60ef0d42201fb81250e3936dc5b23 Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 12:00:58 -0400 Subject: [PATCH 0176/2115] fix webdocs formatting --- website/docs/r/dynamodb_contributor_insights.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/dynamodb_contributor_insights.html.markdown b/website/docs/r/dynamodb_contributor_insights.html.markdown index b38b5ff54926..8439028df109 100644 --- a/website/docs/r/dynamodb_contributor_insights.html.markdown +++ b/website/docs/r/dynamodb_contributor_insights.html.markdown @@ -26,6 +26,7 @@ This resource supports the following arguments: * `table_name` - (Required) The name of the table to enable contributor insights * `index_name` - (Optional) The global secondary index name * `mode` - (Optional) argument to specify the [CloudWatch contributor insights mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 44adece92c396bddeb5dc49908248934de65aca8 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:18:23 +0900 Subject: [PATCH 0177/2115] add the schema of thing_pricipal_type --- internal/service/iot/thing_principal_attachment.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index 772c1e131e6a..2ff438a145a5 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -15,6 +15,7 @@ import ( "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" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" @@ -40,6 +41,13 @@ func resourceThingPrincipalAttachment() *schema.Resource { Required: true, ForceNew: true, }, + "thing_principal_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateDiagFunc: enum.Validate[awstypes.ThingPrincipalType](), + }, }, } } From 634640edf4d80fd1aaba613e221c8067d83ada70 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:19:30 +0900 Subject: [PATCH 0178/2115] Migrate to ListThingPrincipalsV2 API --- .../service/iot/thing_principal_attachment.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index 2ff438a145a5..71bfb6cb002f 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -118,8 +118,8 @@ func resourceThingPrincipalAttachmentDelete(ctx context.Context, d *schema.Resou return diags } -func findThingPrincipalAttachmentByTwoPartKey(ctx context.Context, conn *iot.Client, thing, principal string) (*string, error) { - input := &iot.ListThingPrincipalsInput{ +func findThingPrincipalAttachmentByTwoPartKey(ctx context.Context, conn *iot.Client, thing, principal string) (*awstypes.ThingPrincipalObject, error) { + input := &iot.ListThingPrincipalsV2Input{ ThingName: aws.String(thing), } @@ -128,7 +128,7 @@ func findThingPrincipalAttachmentByTwoPartKey(ctx context.Context, conn *iot.Cli }) } -func findThingPrincipal(ctx context.Context, conn *iot.Client, input *iot.ListThingPrincipalsInput, filter tfslices.Predicate[string]) (*string, error) { +func findThingPrincipal(ctx context.Context, conn *iot.Client, input *iot.ListThingPrincipalsV2Input, filter tfslices.Predicate[string]) (*awstypes.ThingPrincipalObject, error) { output, err := findThingPrincipals(ctx, conn, input, filter) if err != nil { @@ -138,10 +138,10 @@ func findThingPrincipal(ctx context.Context, conn *iot.Client, input *iot.ListTh return tfresource.AssertSingleValueResult(output) } -func findThingPrincipals(ctx context.Context, conn *iot.Client, input *iot.ListThingPrincipalsInput, filter tfslices.Predicate[string]) ([]string, error) { - var output []string +func findThingPrincipals(ctx context.Context, conn *iot.Client, input *iot.ListThingPrincipalsV2Input, filter tfslices.Predicate[string]) ([]awstypes.ThingPrincipalObject, error) { + var output []awstypes.ThingPrincipalObject - pages := iot.NewListThingPrincipalsPaginator(conn, input) + pages := iot.NewListThingPrincipalsV2Paginator(conn, input) for pages.HasMorePages() { page, err := pages.NextPage(ctx) @@ -156,8 +156,8 @@ func findThingPrincipals(ctx context.Context, conn *iot.Client, input *iot.ListT return nil, err } - for _, v := range page.Principals { - if filter(v) { + for _, v := range page.ThingPrincipalObjects { + if filter(aws.ToString(v.Principal)) { output = append(output, v) } } From 8b59b63fb1d8400d44ee0edeac0545dec97e6404 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:24:32 +0900 Subject: [PATCH 0179/2115] Implement an expander for thing_principal_type parameter --- internal/service/iot/thing_principal_attachment.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index 71bfb6cb002f..8aecec7acf53 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -64,6 +64,10 @@ func resourceThingPrincipalAttachmentCreate(ctx context.Context, d *schema.Resou ThingName: aws.String(thing), } + if v, ok := d.Get("thing_principal_type").(string); ok { + input.ThingPrincipalType = awstypes.ThingPrincipalType(v) + } + _, err := conn.AttachThingPrincipal(ctx, input) if err != nil { From 27c26d303e74030148562fd1a950e3352404ef7e Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:25:22 +0900 Subject: [PATCH 0180/2115] Use d.Id() to obtain pricipal and thing --- internal/service/iot/thing_principal_attachment.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index 8aecec7acf53..c697def65e2c 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -7,6 +7,7 @@ import ( "context" "fmt" "log" + "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iot" @@ -83,8 +84,13 @@ func resourceThingPrincipalAttachmentRead(ctx context.Context, d *schema.Resourc var diags diag.Diagnostics conn := meta.(*conns.AWSClient).IoTClient(ctx) - principal := d.Get(names.AttrPrincipal).(string) - thing := d.Get("thing").(string) + id := d.Id() + parts := strings.Split(id, "|") + if len(parts) != 2 { + return sdkdiag.AppendErrorf(diags, "unexpected format for ID (%s), expected thing|principal", id) + } + thing := parts[0] + principal := parts[1] _, err := findThingPrincipalAttachmentByTwoPartKey(ctx, conn, thing, principal) From b26a9ea535503d28f9a43a84deadb9167aea48c8 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:25:59 +0900 Subject: [PATCH 0181/2115] Use ListThingPrincipalsV2 output for d.Set() --- internal/service/iot/thing_principal_attachment.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index c697def65e2c..8a2a9300e95e 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -92,7 +92,7 @@ func resourceThingPrincipalAttachmentRead(ctx context.Context, d *schema.Resourc thing := parts[0] principal := parts[1] - _, err := findThingPrincipalAttachmentByTwoPartKey(ctx, conn, thing, principal) + out, err := findThingPrincipalAttachmentByTwoPartKey(ctx, conn, thing, principal) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] IoT Thing Principal Attachment (%s) not found, removing from state", d.Id()) @@ -104,6 +104,10 @@ func resourceThingPrincipalAttachmentRead(ctx context.Context, d *schema.Resourc return sdkdiag.AppendErrorf(diags, "reading IoT Thing Principal Attachment (%s): %s", d.Id(), err) } + d.Set(names.AttrPrincipal, out.Principal) + d.Set("thing", thing) + d.Set("thing_principal_type", out.ThingPrincipalType) + return diags } From e673f059002e83c9d884c7de34681788510e5395 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:27:21 +0900 Subject: [PATCH 0182/2115] add Importer --- internal/service/iot/thing_principal_attachment.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/iot/thing_principal_attachment.go b/internal/service/iot/thing_principal_attachment.go index 8a2a9300e95e..552905ad4c34 100644 --- a/internal/service/iot/thing_principal_attachment.go +++ b/internal/service/iot/thing_principal_attachment.go @@ -31,6 +31,10 @@ func resourceThingPrincipalAttachment() *schema.Resource { ReadWithoutTimeout: resourceThingPrincipalAttachmentRead, DeleteWithoutTimeout: resourceThingPrincipalAttachmentDelete, + Importer: &schema.ResourceImporter{ + StateContext: schema.ImportStatePassthroughContext, + }, + Schema: map[string]*schema.Schema{ names.AttrPrincipal: { Type: schema.TypeString, From e87db76796504e67d413abc0d87d0bacd27fa320 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:27:46 +0900 Subject: [PATCH 0183/2115] add an acctest --- .../iot/thing_principal_attachment_test.go | 163 ++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/internal/service/iot/thing_principal_attachment_test.go b/internal/service/iot/thing_principal_attachment_test.go index 544649b7d699..c56094aca4fd 100644 --- a/internal/service/iot/thing_principal_attachment_test.go +++ b/internal/service/iot/thing_principal_attachment_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/iot" awstypes "github.com/aws/aws-sdk-go-v2/service/iot/types" @@ -26,6 +27,7 @@ func TestAccIoTThingPrincipalAttachment_basic(t *testing.T) { ctx := acctest.Context(t) thingName := sdkacctest.RandomWithPrefix("tf-acc") thingName2 := sdkacctest.RandomWithPrefix("tf-acc2") + resourceName := "aws_iot_thing_principal_attachment.att" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -38,8 +40,14 @@ func TestAccIoTThingPrincipalAttachment_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckThingPrincipalAttachmentExists(ctx, "aws_iot_thing_principal_attachment.att"), testAccCheckThingPrincipalAttachmentStatus(ctx, thingName, true, []string{"aws_iot_certificate.cert"}), + resource.TestCheckResourceAttr(resourceName, "thing_principal_type", string(awstypes.ThingPrincipalTypeNonExclusiveThing)), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, { Config: testAccThingPrincipalAttachmentConfig_update1(thingName, thingName2), Check: resource.ComposeTestCheckFunc( @@ -76,6 +84,63 @@ func TestAccIoTThingPrincipalAttachment_basic(t *testing.T) { }, }) } +func TestAccIoTThingPrincipalAttachment_thingPrincipalType(t *testing.T) { + ctx := acctest.Context(t) + thingName := sdkacctest.RandomWithPrefix("tf-acc") + thingName2 := sdkacctest.RandomWithPrefix("tf-acc2") + resourceName := "aws_iot_thing_principal_attachment.att" + resourceThingName := "aws_iot_thing.thing" + resourceCertName := "aws_iot_certificate.cert" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.IoTServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckThingPrincipalAttachmentDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccThingPrincipalAttachmentConfig_thingPrincipalType(thingName), + Check: resource.ComposeTestCheckFunc( + testAccCheckThingPrincipalAttachmentExists(ctx, "aws_iot_thing_principal_attachment.att"), + testAccCheckThingPrincipalAttachmentStatus(ctx, thingName, true, []string{"aws_iot_certificate.cert"}), + resource.TestCheckResourceAttr(resourceName, "thing_principal_type", string(awstypes.ThingPrincipalTypeExclusiveThing)), + resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "principal", resourceCertName, "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + // The first attachment is specified as EXCLUSIVE_THING. + // Try to attach the same principal to another Thing, which should fail + // because exclusive principals can only be attached to one thing. + Config: testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate1(thingName, thingName2), + ExpectError: regexache.MustCompile(`InvalidRequestException: Principal already has an exclusive Thing attached to it`), + }, + { + // Reset to one attachment with NON_EXCLUSIVE_THING. + Config: testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate2(thingName), + Check: resource.ComposeTestCheckFunc( + testAccCheckThingPrincipalAttachmentExists(ctx, "aws_iot_thing_principal_attachment.att"), + testAccCheckThingPrincipalAttachmentStatus(ctx, thingName, true, []string{"aws_iot_certificate.cert"}), + resource.TestCheckResourceAttr(resourceName, "thing_principal_type", string(awstypes.ThingPrincipalTypeNonExclusiveThing)), + resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, "name"), + resource.TestCheckResourceAttrPair(resourceName, "principal", resourceCertName, "arn"), + ), + }, + { + // Try to attach the same principal to another Thing specifying EXCLUSIVE_THING, + // which should fail because the principal already has a non-exclusive attachment + // and exclusive attachments cannot coexist with any other attachments. + Config: testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate3(thingName, thingName2), + ExpectError: regexache.MustCompile(`InvalidRequestException: Principal already has a Thing attached to it`), + }, + }, + }) +} func testAccCheckThingPrincipalAttachmentDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { @@ -282,3 +347,101 @@ resource "aws_iot_thing_principal_attachment" "att2" { } `, thingName) } + +func testAccThingPrincipalAttachmentConfig_thingPrincipalType(thingName string) string { + return fmt.Sprintf(` +resource "aws_iot_certificate" "cert" { + csr = file("test-fixtures/iot-csr.pem") + active = true +} + +resource "aws_iot_thing" "thing" { + name = "%s" +} + +resource "aws_iot_thing_principal_attachment" "att" { + thing = aws_iot_thing.thing.name + principal = aws_iot_certificate.cert.arn + + thing_principal_type = "EXCLUSIVE_THING" +} +`, thingName) +} + +func testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate1(thingName, thingName2 string) string { + return fmt.Sprintf(` +resource "aws_iot_certificate" "cert" { + csr = file("test-fixtures/iot-csr.pem") + active = true +} + +resource "aws_iot_thing" "thing" { + name = %[1]q +} + +resource "aws_iot_thing" "thing2" { + name = %[2]q +} + +resource "aws_iot_thing_principal_attachment" "att" { + thing = aws_iot_thing.thing.name + principal = aws_iot_certificate.cert.arn + + thing_principal_type = "EXCLUSIVE_THING" +} + +resource "aws_iot_thing_principal_attachment" "att2" { + thing = aws_iot_thing.thing2.name + principal = aws_iot_certificate.cert.arn +} +`, thingName, thingName2) +} + +func testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate2(thingName string) string { + return fmt.Sprintf(` +resource "aws_iot_certificate" "cert" { + csr = file("test-fixtures/iot-csr.pem") + active = true +} + +resource "aws_iot_thing" "thing" { + name = "%s" +} + +resource "aws_iot_thing_principal_attachment" "att" { + thing = aws_iot_thing.thing.name + principal = aws_iot_certificate.cert.arn + + thing_principal_type = "NON_EXCLUSIVE_THING" +} +`, thingName) +} + +func testAccThingPrincipalAttachmentConfig_thingPrincipalTypeUpdate3(thingName, thingName2 string) string { + return fmt.Sprintf(` +resource "aws_iot_certificate" "cert" { + csr = file("test-fixtures/iot-csr.pem") + active = true +} + +resource "aws_iot_thing" "thing" { + name = %[1]q +} + +resource "aws_iot_thing" "thing2" { + name = %[2]q +} + +resource "aws_iot_thing_principal_attachment" "att" { + thing = aws_iot_thing.thing.name + principal = aws_iot_certificate.cert.arn +} + +resource "aws_iot_thing_principal_attachment" "att2" { + thing = aws_iot_thing.thing2.name + principal = aws_iot_certificate.cert.arn + + thing_principal_type = "EXCLUSIVE_THING" +} +`, thingName, thingName2) +} From 6811d63f90f0c89978f14a785f2f586774dc7815 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:27:57 +0900 Subject: [PATCH 0184/2115] Update the documentation --- website/docs/r/iot_thing_principal_attachment.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/iot_thing_principal_attachment.html.markdown b/website/docs/r/iot_thing_principal_attachment.html.markdown index 457170b54803..9c8ff59afdaf 100644 --- a/website/docs/r/iot_thing_principal_attachment.html.markdown +++ b/website/docs/r/iot_thing_principal_attachment.html.markdown @@ -35,6 +35,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `principal` - (Required) The AWS IoT Certificate ARN or Amazon Cognito Identity ID. * `thing` - (Required) The name of the thing. +* `thing_principal_type` - (Optional) The type of relationship to specify when attaching a principal to a thing. Valid values are `EXCLUSIVE_THING` (the thing will be the only one attached to the principal) or `NON_EXCLUSIVE_THING` (multiple things can be attached to the principal). Defaults to `NON_EXCLUSIVE_THING`. ## Attribute Reference From 87a6f0f11362d2148a4b4f9dd30aa7ddfe999c5d Mon Sep 17 00:00:00 2001 From: Shawn Chasse Date: Fri, 15 Aug 2025 12:28:48 -0400 Subject: [PATCH 0185/2115] fix attribute naming --- internal/service/dynamodb/contributor_insights.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index 9db68e9cc1c5..2abf150f9faf 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -51,7 +51,7 @@ func resourceContributorInsights() *schema.Resource { Required: true, ForceNew: true, }, - "mode": { + names.AttrMode: { Type: schema.TypeString, Optional: true, Computed: true, @@ -77,7 +77,7 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa input.IndexName = aws.String(indexName) } - if v, ok := d.GetOk("mode"); ok { + if v, ok := d.GetOk(names.AttrMode); ok { input.ContributorInsightsMode = awstypes.ContributorInsightsMode(v.(string)) } @@ -119,7 +119,7 @@ func resourceContributorInsightsRead(ctx context.Context, d *schema.ResourceData d.Set("index_name", output.IndexName) d.Set(names.AttrTableName, output.TableName) - d.Set("mode", output.ContributorInsightsMode) + d.Set(names.AttrMode, output.ContributorInsightsMode) return diags } From 1a1f9aa1de60b8e476a7750d1f8663a3d7a2fa80 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 01:41:37 +0900 Subject: [PATCH 0186/2115] add changelog --- .changelog/43916.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43916.txt diff --git a/.changelog/43916.txt b/.changelog/43916.txt new file mode 100644 index 000000000000..6730b51425a7 --- /dev/null +++ b/.changelog/43916.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument +``` From 066be087bbcad7490a8b091cda79d245d56affe6 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 16 Aug 2025 02:01:45 +0900 Subject: [PATCH 0187/2115] fix issues reported by the linter --- internal/service/iot/thing_principal_attachment_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/iot/thing_principal_attachment_test.go b/internal/service/iot/thing_principal_attachment_test.go index c56094aca4fd..f93f73d51ac6 100644 --- a/internal/service/iot/thing_principal_attachment_test.go +++ b/internal/service/iot/thing_principal_attachment_test.go @@ -104,8 +104,8 @@ func TestAccIoTThingPrincipalAttachment_thingPrincipalType(t *testing.T) { testAccCheckThingPrincipalAttachmentExists(ctx, "aws_iot_thing_principal_attachment.att"), testAccCheckThingPrincipalAttachmentStatus(ctx, thingName, true, []string{"aws_iot_certificate.cert"}), resource.TestCheckResourceAttr(resourceName, "thing_principal_type", string(awstypes.ThingPrincipalTypeExclusiveThing)), - resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, "name"), - resource.TestCheckResourceAttrPair(resourceName, "principal", resourceCertName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, names.AttrName), + resource.TestCheckResourceAttrPair(resourceName, names.AttrPrincipal, resourceCertName, names.AttrARN), ), }, { @@ -127,8 +127,8 @@ func TestAccIoTThingPrincipalAttachment_thingPrincipalType(t *testing.T) { testAccCheckThingPrincipalAttachmentExists(ctx, "aws_iot_thing_principal_attachment.att"), testAccCheckThingPrincipalAttachmentStatus(ctx, thingName, true, []string{"aws_iot_certificate.cert"}), resource.TestCheckResourceAttr(resourceName, "thing_principal_type", string(awstypes.ThingPrincipalTypeNonExclusiveThing)), - resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, "name"), - resource.TestCheckResourceAttrPair(resourceName, "principal", resourceCertName, "arn"), + resource.TestCheckResourceAttrPair(resourceName, "thing", resourceThingName, names.AttrName), + resource.TestCheckResourceAttrPair(resourceName, names.AttrPrincipal, resourceCertName, names.AttrARN), ), }, { From 27d3d196657631b99e3d607847297b840f20e735 Mon Sep 17 00:00:00 2001 From: Eddie Bachle Date: Thu, 8 May 2025 14:01:17 -0400 Subject: [PATCH 0188/2115] fix: aws_rds_cluster needs performance insights retention passed to enable database insights --- internal/service/rds/cluster.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 36e804df8ba2..161b370b6565 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -1615,6 +1615,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any if d.HasChange("database_insights_mode") { input.DatabaseInsightsMode = types.DatabaseInsightsMode(d.Get("database_insights_mode").(string)) input.EnablePerformanceInsights = aws.Bool(d.Get("performance_insights_enabled").(bool)) + input.PerformanceInsightsRetentionPeriod = aws.Int32(int32(d.Get("performance_insights_retention_period").(int))) } if d.HasChange("db_cluster_instance_class") { From e987371607d9d106ed5a1e854e15d3cb8ca1d21e Mon Sep 17 00:00:00 2001 From: Eddie Bachle Date: Thu, 8 May 2025 14:15:23 -0400 Subject: [PATCH 0189/2115] add changelog --- .changelog/43919.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43919.txt diff --git a/.changelog/43919.txt b/.changelog/43919.txt new file mode 100644 index 000000000000..92546b610342 --- /dev/null +++ b/.changelog/43919.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_cluster: Fixes the behavior when enabling database_insights_mode="advanced" without changing performance insights retention window +``` From 11fd351c9e44b286db93fe11e6aec0d066a27def Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 14 Aug 2025 16:59:50 -0700 Subject: [PATCH 0190/2115] Adds `performance_insights_*` attributes to `basic` test --- internal/service/rds/cluster_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 586acfa628fe..9a506d0480dc 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -109,6 +109,9 @@ func TestAccRDSCluster_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "monitoring_interval", "0"), resource.TestCheckResourceAttr(resourceName, "monitoring_role_arn", ""), resource.TestCheckResourceAttr(resourceName, "network_type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "performance_insights_kms_key_id", ""), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "0"), resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint"), resource.TestCheckResourceAttr(resourceName, "scaling_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrStorageEncrypted, acctest.CtFalse), From 7c6eefb4ead5040cde04ce89f529ad9ffcff1b0e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 14 Aug 2025 17:01:16 -0700 Subject: [PATCH 0191/2115] Allows Performance Insights tests to run when default VPC does not have internet gateway --- internal/service/rds/cluster_test.go | 92 ++++++++++++++++------------ 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 9a506d0480dc..49f6417a8aaa 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -6521,62 +6521,74 @@ resource "aws_rds_cluster" "test" { } func testAccClusterConfig_performanceInsightsEnabled(rName string, performanceInsightsEnabled bool) string { - return fmt.Sprintf(` + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` resource "aws_rds_cluster" "test" { - cluster_identifier = %[1]q - engine = %[3]q - db_cluster_instance_class = "db.m6gd.large" - storage_type = "io1" - allocated_storage = 100 - iops = 1000 - master_username = "tfacctest" - master_password = "avoid-plaintext-passwords" - skip_final_snapshot = true + cluster_identifier = %[1]q + engine = %[3]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + db_subnet_group_name = aws_db_subnet_group.test.name + performance_insights_enabled = %[2]t } -`, rName, performanceInsightsEnabled, tfrds.ClusterEngineMySQL) +`, rName, performanceInsightsEnabled, tfrds.ClusterEngineMySQL)) } func testAccClusterConfig_performanceInsightsKMSKeyID(rName string) string { - return fmt.Sprintf(` + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = %[2]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + db_subnet_group_name = aws_db_subnet_group.test.name + + performance_insights_enabled = true + performance_insights_kms_key_id = aws_kms_key.test.arn +} + resource "aws_kms_key" "test" { description = %[1]q deletion_window_in_days = 7 enable_key_rotation = true } - -resource "aws_rds_cluster" "test" { - cluster_identifier = %[1]q - engine = %[2]q - db_cluster_instance_class = "db.m6gd.large" - storage_type = "io1" - allocated_storage = 100 - iops = 1000 - master_username = "tfacctest" - master_password = "avoid-plaintext-passwords" - skip_final_snapshot = true - performance_insights_enabled = true - performance_insights_kms_key_id = aws_kms_key.test.arn -} -`, rName, tfrds.ClusterEngineMySQL) +`, rName, tfrds.ClusterEngineMySQL)) } -func testAccClusterConfig_performanceInsightsRetentionPeriod(rName string) string { - return fmt.Sprintf(` +func testAccClusterConfig_performanceInsightsRetentionPeriod(rName string, period int) string { + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` resource "aws_rds_cluster" "test" { - cluster_identifier = %[1]q - engine = %[2]q - db_cluster_instance_class = "db.m6gd.large" - storage_type = "io1" - allocated_storage = 100 - iops = 1000 - master_username = "tfacctest" - master_password = "avoid-plaintext-passwords" - skip_final_snapshot = true + cluster_identifier = %[1]q + engine = %[2]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + db_subnet_group_name = aws_db_subnet_group.test.name + performance_insights_enabled = true - performance_insights_retention_period = 62 + performance_insights_retention_period = %d } -`, rName, tfrds.ClusterEngineMySQL) +`, rName, tfrds.ClusterEngineMySQL, period)) } func testAccClusterConfig_GlobalClusterID_performanceInsightsEnabled(rName string, performanceInsightsEnabled bool) string { From 8ad46e0a3535943091c36d00437d3f77ba3e72a5 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 14 Aug 2025 19:28:07 -0700 Subject: [PATCH 0192/2115] Adds defaults and additional test for Performance Insights --- internal/service/rds/cluster_test.go | 118 +++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 16 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 49f6417a8aaa..7ee7f64ccf38 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -3123,7 +3123,7 @@ func TestAccRDSCluster_engineLifecycleSupport_disabled(t *testing.T) { }) } -func TestAccRDSCluster_performanceInsightsEnabled(t *testing.T) { +func TestAccRDSCluster_performanceInsights_Enabled(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -3140,24 +3140,28 @@ func TestAccRDSCluster_performanceInsightsEnabled(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_performanceInsightsEnabled(rName, true), - Check: resource.ComposeTestCheckFunc( + Config: testAccClusterConfig_performanceInsights_Enabled(rName, true), + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", "arn"), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "0"), ), }, { - Config: testAccClusterConfig_performanceInsightsEnabled(rName, false), - Check: resource.ComposeTestCheckFunc( + Config: testAccClusterConfig_performanceInsights_Enabled(rName, false), + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtFalse), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", "arn"), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "0"), ), }, }, }) } -func TestAccRDSCluster_performanceInsightsKMSKeyID(t *testing.T) { +func TestAccRDSCluster_performanceInsights_KMSKeyID(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -3175,9 +3179,10 @@ func TestAccRDSCluster_performanceInsightsKMSKeyID(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_performanceInsightsKMSKeyID(rName), - Check: resource.ComposeTestCheckFunc( + Config: testAccClusterConfig_performanceInsights_KMSKeyID(rName), + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), ), }, @@ -3185,7 +3190,7 @@ func TestAccRDSCluster_performanceInsightsKMSKeyID(t *testing.T) { }) } -func TestAccRDSCluster_performanceInsightsRetentionPeriod(t *testing.T) { +func TestAccRDSCluster_performanceInsights_RetentionPeriod(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -3202,10 +3207,58 @@ func TestAccRDSCluster_performanceInsightsRetentionPeriod(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_performanceInsightsRetentionPeriod(rName), - Check: resource.ComposeTestCheckFunc( + Config: testAccClusterConfig_performanceInsights_RetentionPeriod(rName, 62), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "62"), + ), + }, + { + Config: testAccClusterConfig_performanceInsights_RetentionPeriod(rName, 124), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "124"), + ), + }, + }, + }) +} + +func TestAccRDSCluster_performanceInsights_KMSKey_RetentionPeriod(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + kmsKeyResourceName := "aws_kms_key.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_performanceInsights_KMSKey_RetentionPeriod(rName, 62), + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "62"), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), + ), + }, + { + Config: testAccClusterConfig_performanceInsights_KMSKey_RetentionPeriod(rName, 124), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "124"), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), ), }, }, @@ -3226,7 +3279,7 @@ func TestAccRDSCluster_GlobalClusterIdentifier_performanceInsightsEnabled(t *tes Steps: []resource.TestStep{ { Config: testAccClusterConfig_GlobalClusterID_performanceInsightsEnabled(rName, true), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), ), @@ -3243,7 +3296,7 @@ func TestAccRDSCluster_GlobalClusterIdentifier_performanceInsightsEnabled(t *tes }, { Config: testAccClusterConfig_GlobalClusterID_performanceInsightsEnabled(rName, false), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtFalse), ), @@ -6520,7 +6573,7 @@ resource "aws_rds_cluster" "test" { `, rName, tfrds.ClusterEngineAuroraPostgreSQL) } -func testAccClusterConfig_performanceInsightsEnabled(rName string, performanceInsightsEnabled bool) string { +func testAccClusterConfig_performanceInsights_Enabled(rName string, performanceInsightsEnabled bool) string { return acctest.ConfigCompose( testAccClusterConfig_clusterSubnetGroup(rName), fmt.Sprintf(` @@ -6538,10 +6591,14 @@ resource "aws_rds_cluster" "test" { performance_insights_enabled = %[2]t } + +data "aws_kms_key" "rds" { + key_id = "alias/aws/rds" +} `, rName, performanceInsightsEnabled, tfrds.ClusterEngineMySQL)) } -func testAccClusterConfig_performanceInsightsKMSKeyID(rName string) string { +func testAccClusterConfig_performanceInsights_KMSKeyID(rName string) string { return acctest.ConfigCompose( testAccClusterConfig_clusterSubnetGroup(rName), fmt.Sprintf(` @@ -6569,7 +6626,7 @@ resource "aws_kms_key" "test" { `, rName, tfrds.ClusterEngineMySQL)) } -func testAccClusterConfig_performanceInsightsRetentionPeriod(rName string, period int) string { +func testAccClusterConfig_performanceInsights_RetentionPeriod(rName string, period int) string { return acctest.ConfigCompose( testAccClusterConfig_clusterSubnetGroup(rName), fmt.Sprintf(` @@ -6591,6 +6648,35 @@ resource "aws_rds_cluster" "test" { `, rName, tfrds.ClusterEngineMySQL, period)) } +func testAccClusterConfig_performanceInsights_KMSKey_RetentionPeriod(rName string, period int) string { + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = %[2]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + db_subnet_group_name = aws_db_subnet_group.test.name + + performance_insights_enabled = true + performance_insights_kms_key_id = aws_kms_key.test.arn + performance_insights_retention_period = %d +} + +resource "aws_kms_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + enable_key_rotation = true +} +`, rName, tfrds.ClusterEngineMySQL, period)) +} + func testAccClusterConfig_GlobalClusterID_performanceInsightsEnabled(rName string, performanceInsightsEnabled bool) string { return fmt.Sprintf(` data "aws_rds_engine_version" "test" { From 8591ed05c12df721a6157c41ad6ff9b934efa315 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 17:06:32 -0700 Subject: [PATCH 0193/2115] Allows Database Insights tests to run when default VPC does not have internet gateway --- internal/service/rds/cluster_test.go | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 7ee7f64ccf38..24d19daeeb46 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -6846,21 +6846,25 @@ func testAccClusterConfig_databaseInsightsMode(rName, databaseInsightsMode strin databaseInsightsMode = strconv.Quote(databaseInsightsMode) } - return fmt.Sprintf(` + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` resource "aws_rds_cluster" "test" { - cluster_identifier = %[1]q - engine = %[2]q - db_cluster_instance_class = "db.m6gd.large" - storage_type = "io1" - allocated_storage = 100 - iops = 1000 - master_username = "tfacctest" - master_password = "avoid-plaintext-passwords" - skip_final_snapshot = true + cluster_identifier = %[1]q + engine = %[2]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + apply_immediately = true + db_subnet_group_name = aws_db_subnet_group.test.name + database_insights_mode = %[3]s performance_insights_enabled = %[4]t performance_insights_retention_period = %[5]s - apply_immediately = true } -`, rName, tfrds.ClusterEngineMySQL, databaseInsightsMode, performanceInsightsEnabled, performanceInsightsRetentionPeriod) +`, rName, tfrds.ClusterEngineMySQL, databaseInsightsMode, performanceInsightsEnabled, performanceInsightsRetentionPeriod)) } From df5a732a181aa7c4ee34b7ba509c5b18571a27b8 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 17:35:07 -0700 Subject: [PATCH 0194/2115] `semgrep` --- internal/service/rds/cluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 24d19daeeb46..c4e72c114c1c 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -3144,7 +3144,7 @@ func TestAccRDSCluster_performanceInsights_Enabled(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), - resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "0"), ), }, @@ -3153,7 +3153,7 @@ func TestAccRDSCluster_performanceInsights_Enabled(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtFalse), - resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", "data.aws_kms_key.rds", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "performance_insights_retention_period", "0"), ), }, From b301e0dd8b3de331fa930a92ebcd3a06e52340a1 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:20:43 +0900 Subject: [PATCH 0195/2115] implement signing_paramters for the resource --- internal/service/signer/signing_profile.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/service/signer/signing_profile.go b/internal/service/signer/signing_profile.go index a6c4ab512450..9a1e4ba495eb 100644 --- a/internal/service/signer/signing_profile.go +++ b/internal/service/signer/signing_profile.go @@ -21,6 +21,7 @@ import ( "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" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -128,6 +129,14 @@ func resourceSigningProfile() *schema.Resource { }, }, }, + "signing_parameters": { + Type: schema.TypeMap, + Optional: true, + ForceNew: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, names.AttrStatus: { Type: schema.TypeString, Computed: true, @@ -173,6 +182,10 @@ func resourceSigningProfileCreate(ctx context.Context, d *schema.ResourceData, m input.SigningMaterial = expandSigningMaterial(v) } + if v, ok := d.Get("signing_parameters").(map[string]any); ok && len(v) > 0 { + input.SigningParameters = flex.ExpandStringValueMap(v) + } + _, err := conn.PutSigningProfile(ctx, input) if err != nil { @@ -223,6 +236,11 @@ func resourceSigningProfileRead(ctx context.Context, d *schema.ResourceData, met return sdkdiag.AppendErrorf(diags, "setting signing_material: %s", err) } } + if output.SigningParameters != nil { + if err := d.Set("signing_parameters", flex.FlattenStringValueMap(output.SigningParameters)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting signing_parameters: %s", err) + } + } d.Set(names.AttrStatus, output.Status) d.Set(names.AttrVersion, output.ProfileVersion) d.Set("version_arn", output.ProfileVersionArn) From 1fd790c7a74de3d65f92c0904febd1f80a12fa40 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:21:20 +0900 Subject: [PATCH 0196/2115] Add signing_material and signing_paramters for the data source --- .../signer/signing_profile_data_source.go | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/internal/service/signer/signing_profile_data_source.go b/internal/service/signer/signing_profile_data_source.go index 0c264888ef2e..55e8f302892f 100644 --- a/internal/service/signer/signing_profile_data_source.go +++ b/internal/service/signer/signing_profile_data_source.go @@ -12,6 +12,7 @@ import ( "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/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/flex" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -74,6 +75,25 @@ func dataSourceSigningProfile() *schema.Resource { }, }, }, + "signing_material": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrCertificateARN: { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "signing_parameters": { + Type: schema.TypeMap, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, names.AttrStatus: { Type: schema.TypeString, Computed: true, @@ -134,6 +154,18 @@ func dataSourceSigningProfileRead(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "setting signer signing profile version arn: %s", err) } + if signingProfileOutput.SigningMaterial != nil { + if err := d.Set("signing_material", flattenSigningMaterial(signingProfileOutput.SigningMaterial)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting signing_material: %s", err) + } + } + + if signingProfileOutput.SigningParameters != nil { + if err := d.Set("signing_parameters", flex.FlattenStringValueMap(signingProfileOutput.SigningParameters)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting signing_parameters: %s", err) + } + } + if err := d.Set(names.AttrStatus, signingProfileOutput.Status); err != nil { return sdkdiag.AppendErrorf(diags, "setting signer signing profile status: %s", err) } From 4902dee09a1c533bf88971482109eef103d4dff7 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:21:54 +0900 Subject: [PATCH 0197/2115] fix the flattener for signature_validity_period of the data source --- .../signer/signing_profile_data_source.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/service/signer/signing_profile_data_source.go b/internal/service/signer/signing_profile_data_source.go index 55e8f302892f..0f644f471577 100644 --- a/internal/service/signer/signing_profile_data_source.go +++ b/internal/service/signer/signing_profile_data_source.go @@ -129,13 +129,15 @@ func dataSourceSigningProfileRead(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "setting signer signing profile platform id: %s", err) } - if err := d.Set("signature_validity_period", []any{ - map[string]any{ - names.AttrValue: signingProfileOutput.SignatureValidityPeriod.Value, - names.AttrType: signingProfileOutput.SignatureValidityPeriod.Type, - }, - }); err != nil { - return sdkdiag.AppendErrorf(diags, "setting signer signing profile signature validity period: %s", err) + if v := signingProfileOutput.SignatureValidityPeriod; v != nil { + if err := d.Set("signature_validity_period", []any{ + map[string]any{ + names.AttrValue: v.Value, + names.AttrType: v.Type, + }, + }); err != nil { + return sdkdiag.AppendErrorf(diags, "setting signature_validity_period: %s", err) + } } if err := d.Set("platform_display_name", signingProfileOutput.PlatformDisplayName); err != nil { From 0b47b3a55ae948b2961b855445957f3fca957bff Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:23:10 +0900 Subject: [PATCH 0198/2115] add an acctest for signing_material and signing_parameters in the resource --- .../service/signer/signing_profile_test.go | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/internal/service/signer/signing_profile_test.go b/internal/service/signer/signing_profile_test.go index 9937043107ea..3299333a6046 100644 --- a/internal/service/signer/signing_profile_test.go +++ b/internal/service/signer/signing_profile_test.go @@ -49,6 +49,7 @@ func TestAccSignerSigningProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "revocation_record.#", "0"), resource.TestCheckResourceAttr(resourceName, "signature_validity_period.#", "1"), resource.TestCheckNoResourceAttr(resourceName, "signing_material"), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.%", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "Active"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrVersion), @@ -231,6 +232,49 @@ func TestAccSignerSigningProfile_signatureValidityPeriod(t *testing.T) { }) } +func TestAccSignerSigningProfile_signingParameters(t *testing.T) { + ctx := acctest.Context(t) + rootDomain := acctest.ACMCertificateDomainFromEnv(t) + domainName := acctest.ACMCertificateRandomSubDomain(rootDomain) + var conf signer.GetSigningProfileOutput + rName := fmt.Sprintf("tf_acc_test_%d", sdkacctest.RandInt()) + resourceName := "aws_signer_signing_profile.test_sp" + certificateName := "aws_acm_certificate.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckSingerSigningProfile(ctx, t, "AmazonFreeRTOS-Default") + }, + ErrorCheck: acctest.ErrorCheck(t, signer.ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckSigningProfileDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccSigningProfileConfig_signingParameters(rName, rootDomain, domainName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSigningProfileExists(ctx, resourceName, &conf), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "signer", "/signing-profiles/{name}"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "platform_id", "AmazonFreeRTOS-Default"), + resource.TestCheckResourceAttrPair(resourceName, "signing_material.0.certificate_arn", certificateName, names.AttrARN), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.%", "2"), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.param1", "value1"), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.param2", "value2"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrVersion), + resource.TestCheckResourceAttrSet(resourceName, "version_arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccPreCheckSingerSigningProfile(ctx context.Context, t *testing.T, platformID string) { conn := acctest.Provider.Meta().(*conns.AWSClient).SignerClient(ctx) @@ -370,3 +414,44 @@ resource "aws_signer_signing_profile" "test_sp" { } `, rName) } + +func testAccSigningProfileConfig_signingParameters(rName, rootDomain, domainName string) string { + return fmt.Sprintf(` +data "aws_route53_zone" "test" { + name = %[2]q + private_zone = false +} + +resource "aws_acm_certificate" "test" { + domain_name = %[3]q + validation_method = "DNS" +} + +resource "aws_route53_record" "test" { + allow_overwrite = true + name = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_name + records = [tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_value] + ttl = 60 + type = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_type + zone_id = data.aws_route53_zone.test.zone_id +} + +resource "aws_acm_certificate_validation" "test" { + certificate_arn = aws_acm_certificate.test.arn + validation_record_fqdns = [aws_route53_record.test.fqdn] +} + +resource "aws_signer_signing_profile" "test_sp" { + platform_id = "AmazonFreeRTOS-Default" + name = %[1]q + + signing_material { + certificate_arn = aws_acm_certificate.test.arn + } + signing_parameters = { + "param1" = "value1" + "param2" = "value2" + } + depends_on = [aws_acm_certificate_validation.test] +}`, rName, rootDomain, domainName) +} From f9a563f47e5f8d9948a4057e0bb4a0affc6ddbe5 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:23:58 +0900 Subject: [PATCH 0199/2115] add an acctest for signing_material and signing_parameters in the data source --- .../signing_profile_data_source_test.go | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/internal/service/signer/signing_profile_data_source_test.go b/internal/service/signer/signing_profile_data_source_test.go index 5d928f1bc812..df907672d9b4 100644 --- a/internal/service/signer/signing_profile_data_source_test.go +++ b/internal/service/signer/signing_profile_data_source_test.go @@ -46,6 +46,39 @@ func TestAccSignerSigningProfileDataSource_basic(t *testing.T) { }) } +func TestAccSignerSigningProfileDataSource_signingParameters(t *testing.T) { + ctx := acctest.Context(t) + rootDomain := acctest.ACMCertificateDomainFromEnv(t) + domainName := acctest.ACMCertificateRandomSubDomain(rootDomain) + var conf signer.GetSigningProfileOutput + rName := fmt.Sprintf("tf_acc_test_%d", sdkacctest.RandInt()) + dataSourceName := "data.aws_signer_signing_profile.test" + resourceName := "aws_signer_signing_profile.test_sp" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheckSingerSigningProfile(ctx, t, "AmazonFreeRTOS-Default") + }, + ErrorCheck: acctest.ErrorCheck(t, signer.ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + Config: testAccSigningProfileDataSourceConfig_signingParameters(rName, rootDomain, domainName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSigningProfileExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttrPair(dataSourceName, "platform_id", resourceName, "platform_id"), + resource.TestCheckResourceAttrPair(dataSourceName, "signing_material.#", resourceName, "signing_material.#"), + resource.TestCheckResourceAttrPair(dataSourceName, "signing_material.0.certificate_arn", resourceName, "signing_material.0.certificate_arn"), + resource.TestCheckResourceAttrPair(dataSourceName, "signing_parameters.%", resourceName, "signing_parameters.%"), + resource.TestCheckResourceAttrPair(dataSourceName, "signing_parameters.param1", resourceName, "signing_parameters.param1"), + resource.TestCheckResourceAttrPair(dataSourceName, "signing_parameters.param2", resourceName, "signing_parameters.param2"), + ), + }, + }, + }) +} + func testAccSigningProfileDataSourceConfig_basic(profileName string) string { return fmt.Sprintf(` resource "aws_signer_signing_profile" "test" { @@ -57,3 +90,48 @@ data "aws_signer_signing_profile" "test" { name = aws_signer_signing_profile.test.name }`, profileName) } + +func testAccSigningProfileDataSourceConfig_signingParameters(rName, rootDomain, domainName string) string { + return fmt.Sprintf(` +data "aws_route53_zone" "test" { + name = %[2]q + private_zone = false +} + +resource "aws_acm_certificate" "test" { + domain_name = %[3]q + validation_method = "DNS" +} + +resource "aws_route53_record" "test" { + allow_overwrite = true + name = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_name + records = [tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_value] + ttl = 60 + type = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_type + zone_id = data.aws_route53_zone.test.zone_id +} + +resource "aws_acm_certificate_validation" "test" { + certificate_arn = aws_acm_certificate.test.arn + validation_record_fqdns = [aws_route53_record.test.fqdn] +} + +resource "aws_signer_signing_profile" "test_sp" { + platform_id = "AmazonFreeRTOS-Default" + name = %[1]q + + signing_material { + certificate_arn = aws_acm_certificate.test.arn + } + signing_parameters = { + "param1" = "value1" + "param2" = "value2" + } + depends_on = [aws_acm_certificate_validation.test] +} + +data "aws_signer_signing_profile" "test" { + name = aws_signer_signing_profile.test_sp.name +}`, rName, rootDomain, domainName) +} From 0a2110b7b0f91077e273e9767fea5879baf1773a Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:32:24 +0900 Subject: [PATCH 0200/2115] Update the documentation for the resource --- website/docs/r/signer_signing_profile.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/signer_signing_profile.html.markdown b/website/docs/r/signer_signing_profile.html.markdown index 00c1341ff5c5..11aaebd88c61 100644 --- a/website/docs/r/signer_signing_profile.html.markdown +++ b/website/docs/r/signer_signing_profile.html.markdown @@ -43,6 +43,7 @@ This resource supports the following arguments: * `name_prefix` - (Optional, Forces new resource) A signing profile name prefix. Terraform will generate a unique suffix. Conflicts with `name`. * `signature_validity_period` - (Optional, Forces new resource) The validity period for a signing job. See [`signature_validity_period` Block](#signature_validity_period-block) below for details. * `signing_material` - (Optional, Forces new resource) The AWS Certificate Manager certificate that will be used to sign code with the new signing profile. See [`signing_material` Block](#signing_material-block) below for details. +* `signing_parameters` - (Optional, Forces new resource) Map of key-value pairs for signing. These can include any information that you want to use during signing. * `tags` - (Optional) A list of tags associated with the signing profile. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `signature_validity_period` Block From 93865ef4ff7967090e23d9739488324b5231a210 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:32:47 +0900 Subject: [PATCH 0201/2115] Update the documentation for the data source --- website/docs/d/signer_signing_profile.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/docs/d/signer_signing_profile.html.markdown b/website/docs/d/signer_signing_profile.html.markdown index bc6ae22f6259..897dae9e71bf 100644 --- a/website/docs/d/signer_signing_profile.html.markdown +++ b/website/docs/d/signer_signing_profile.html.markdown @@ -34,6 +34,9 @@ This data source exports the following attributes in addition to the arguments a * `platform_id` - ID of the platform that is used by the target signing profile. * `revocation_record` - Revocation information for a signing profile. * `signature_validity_period` - The validity period for a signing job. +* `signing_material` - AWS Certificate Manager certificate that will be used to sign code with the new signing profile. + * `certificate_arn` - ARN of the certificate used for signing. +* `signing_parameters` - Map of key-value pairs for signing. * `status` - Status of the target signing profile. * `tags` - List of tags associated with the signing profile. * `version` - Current version of the signing profile. From ccc148db24f224041018419ae58ae098c826330c Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:50:32 +0900 Subject: [PATCH 0202/2115] add changelog --- .changelog/43921.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/43921.txt diff --git a/.changelog/43921.txt b/.changelog/43921.txt new file mode 100644 index 000000000000..56f25ff5dbca --- /dev/null +++ b/.changelog/43921.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_signer_signing_profile: Add `signing_parameters` argument +``` + +```release-note:enhancement +data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes +``` From 63831105f5c221ccbaf3a1960386ecc1acf83caf Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 02:52:05 +0900 Subject: [PATCH 0203/2115] terraform fmt in acctests --- internal/service/signer/signing_profile_data_source_test.go | 4 ++-- internal/service/signer/signing_profile_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/signer/signing_profile_data_source_test.go b/internal/service/signer/signing_profile_data_source_test.go index df907672d9b4..e35703a17458 100644 --- a/internal/service/signer/signing_profile_data_source_test.go +++ b/internal/service/signer/signing_profile_data_source_test.go @@ -125,8 +125,8 @@ resource "aws_signer_signing_profile" "test_sp" { certificate_arn = aws_acm_certificate.test.arn } signing_parameters = { - "param1" = "value1" - "param2" = "value2" + "param1" = "value1" + "param2" = "value2" } depends_on = [aws_acm_certificate_validation.test] } diff --git a/internal/service/signer/signing_profile_test.go b/internal/service/signer/signing_profile_test.go index 3299333a6046..acafe8b08c99 100644 --- a/internal/service/signer/signing_profile_test.go +++ b/internal/service/signer/signing_profile_test.go @@ -449,8 +449,8 @@ resource "aws_signer_signing_profile" "test_sp" { certificate_arn = aws_acm_certificate.test.arn } signing_parameters = { - "param1" = "value1" - "param2" = "value2" + "param1" = "value1" + "param2" = "value2" } depends_on = [aws_acm_certificate_validation.test] }`, rName, rootDomain, domainName) From 436c47acfacdb23e0b1fa9ca9fb390698ca7dee8 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 03:21:25 +0900 Subject: [PATCH 0204/2115] fix issues reported by a linter --- internal/service/signer/signing_profile_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/signer/signing_profile_test.go b/internal/service/signer/signing_profile_test.go index acafe8b08c99..88121a5f4f45 100644 --- a/internal/service/signer/signing_profile_test.go +++ b/internal/service/signer/signing_profile_test.go @@ -260,8 +260,8 @@ func TestAccSignerSigningProfile_signingParameters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "platform_id", "AmazonFreeRTOS-Default"), resource.TestCheckResourceAttrPair(resourceName, "signing_material.0.certificate_arn", certificateName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "signing_parameters.%", "2"), - resource.TestCheckResourceAttr(resourceName, "signing_parameters.param1", "value1"), - resource.TestCheckResourceAttr(resourceName, "signing_parameters.param2", "value2"), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.param1", acctest.CtValue1), + resource.TestCheckResourceAttr(resourceName, "signing_parameters.param2", acctest.CtValue2), resource.TestCheckResourceAttrSet(resourceName, names.AttrVersion), resource.TestCheckResourceAttrSet(resourceName, "version_arn"), ), From 152fca844c38426514bbd8f075221404300404c2 Mon Sep 17 00:00:00 2001 From: Anthony Wat Date: Sat, 16 Aug 2025 19:33:08 -0400 Subject: [PATCH 0205/2115] feat: Add force_destroy arg to r/aws_s3tables_table_bucket --- .changelog/43922.txt | 3 + internal/service/s3tables/table_bucket.go | 113 +++++++++++++++++ .../service/s3tables/table_bucket_test.go | 114 +++++++++++++++++- .../r/s3tables_table_bucket.html.markdown | 1 + 4 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 .changelog/43922.txt diff --git a/.changelog/43922.txt b/.changelog/43922.txt new file mode 100644 index 000000000000..a832774e42a8 --- /dev/null +++ b/.changelog/43922.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_s3tables_table_bucket: Add `force_destroy` argument +``` \ No newline at end of file diff --git a/internal/service/s3tables/table_bucket.go b/internal/service/s3tables/table_bucket.go index 3f599fe834e4..1eff18da4741 100644 --- a/internal/service/s3tables/table_bucket.go +++ b/internal/service/s3tables/table_bucket.go @@ -6,6 +6,7 @@ package s3tables import ( "context" "errors" + "fmt" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3tables" @@ -16,6 +17,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" @@ -61,6 +63,11 @@ func (r *tableBucketResource) Schema(ctx context.Context, req resource.SchemaReq CustomType: fwtypes.NewObjectTypeOf[encryptionConfigurationModel](ctx), Optional: true, }, + names.AttrForceDestroy: schema.BoolAttribute{ + Optional: true, + Computed: true, + Default: booldefault.StaticBool(false), + }, // TODO: Once Protocol v6 is supported, convert this to a `schema.SingleNestedAttribute` with full schema information // Validations needed: // * iceberg_unreferenced_file_removal.settings.non_current_days: int32validator.AtLeast(1) @@ -397,6 +404,29 @@ func (r *tableBucketResource) Delete(ctx context.Context, req resource.DeleteReq if errs.IsA[*awstypes.NotFoundException](err) { return } + + // If deletion fails due to bucket not being empty and force_destroy is enabled + if err != nil && state.ForceDestroy.ValueBool() { + // Check if the error indicates the bucket is not empty + if errs.IsA[*awstypes.ConflictException](err) || errs.IsA[*awstypes.BadRequestException](err) { + tflog.Debug(ctx, "Table bucket not empty, attempting to empty it", map[string]any{ + "table_bucket_arn": state.ARN.ValueString(), + }) + + // Empty the table bucket by deleting all tables + if emptyErr := emptyTableBucket(ctx, conn, state.ARN.ValueString()); emptyErr != nil { + resp.Diagnostics.AddError( + create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, resNameTableBucket, state.Name.String(), emptyErr), + fmt.Sprintf("Failed to empty table bucket before deletion: %s", emptyErr.Error()), + ) + return + } + + // Retry deletion after emptying + _, err = conn.DeleteTableBucket(ctx, input) + } + } + if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, resNameTableBucket, state.Name.String(), err), @@ -408,6 +438,9 @@ func (r *tableBucketResource) Delete(ctx context.Context, req resource.DeleteReq func (r *tableBucketResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), req, resp) + + // Set force_destroy to false on import to prevent accidental deletion + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrForceDestroy), types.BoolValue(false))...) } func findTableBucket(ctx context.Context, conn *s3tables.Client, arn string) (*s3tables.GetTableBucketOutput, error) { @@ -479,6 +512,7 @@ type tableBucketResourceModel struct { ARN types.String `tfsdk:"arn"` CreatedAt timetypes.RFC3339 `tfsdk:"created_at"` EncryptionConfiguration fwtypes.ObjectValueOf[encryptionConfigurationModel] `tfsdk:"encryption_configuration"` + ForceDestroy types.Bool `tfsdk:"force_destroy"` MaintenanceConfiguration fwtypes.ObjectValueOf[tableBucketMaintenanceConfigurationModel] `tfsdk:"maintenance_configuration" autoflex:"-"` Name types.String `tfsdk:"name"` OwnerAccountID types.String `tfsdk:"owner_account_id"` @@ -601,3 +635,82 @@ func flattenIcebergUnreferencedFileRemovalSettings(ctx context.Context, in awsty } return result, diags } + +// emptyTableBucket deletes all tables in all namespaces within the specified table bucket. +// This is used when force_destroy is enabled to allow deletion of non-empty table buckets. +func emptyTableBucket(ctx context.Context, conn *s3tables.Client, tableBucketARN string) error { + tflog.Debug(ctx, "Starting to empty table bucket", map[string]any{ + "table_bucket_arn": tableBucketARN, + }) + + // First, list all namespaces in the table bucket + namespaces := s3tables.NewListNamespacesPaginator(conn, &s3tables.ListNamespacesInput{ + TableBucketARN: aws.String(tableBucketARN), + }) + + for namespaces.HasMorePages() { + namespacePage, err := namespaces.NextPage(ctx) + if err != nil { + return fmt.Errorf("listing namespaces in table bucket %s: %w", tableBucketARN, err) + } + + // For each namespace, list and delete all tables + for _, namespace := range namespacePage.Namespaces { + namespaceName := namespace.Namespace[0] + tflog.Debug(ctx, "Processing namespace", map[string]any{ + names.AttrNamespace: namespaceName, + }) + + tables := s3tables.NewListTablesPaginator(conn, &s3tables.ListTablesInput{ + TableBucketARN: aws.String(tableBucketARN), + Namespace: aws.String(namespaceName), + }) + + for tables.HasMorePages() { + tablePage, err := tables.NextPage(ctx) + if err != nil { + return fmt.Errorf("listing tables in namespace %s: %w", namespaceName, err) + } + + // Delete each table + for _, table := range tablePage.Tables { + tableName := aws.ToString(table.Name) + tflog.Debug(ctx, "Deleting table", map[string]any{ + names.AttrTableName: tableName, + names.AttrNamespace: namespaceName, + }) + + _, err := conn.DeleteTable(ctx, &s3tables.DeleteTableInput{ + TableBucketARN: aws.String(tableBucketARN), + Namespace: aws.String(namespaceName), + Name: aws.String(tableName), + }) + + if err != nil && !errs.IsA[*awstypes.NotFoundException](err) { + return fmt.Errorf("deleting table %s in namespace %s: %w", tableName, namespaceName, err) + } + } + } + + // After deleting all tables in the namespace, delete the namespace itself + tflog.Debug(ctx, "Deleting namespace", map[string]any{ + names.AttrNamespace: namespaceName, + }) + + _, err = conn.DeleteNamespace(ctx, &s3tables.DeleteNamespaceInput{ + TableBucketARN: aws.String(tableBucketARN), + Namespace: aws.String(namespaceName), + }) + + if err != nil && !errs.IsA[*awstypes.NotFoundException](err) { + return fmt.Errorf("deleting namespace %s: %w", namespaceName, err) + } + } + } + + tflog.Debug(ctx, "Successfully emptied table bucket", map[string]any{ + "table_bucket_arn": tableBucketARN, + }) + + return nil +} diff --git a/internal/service/s3tables/table_bucket_test.go b/internal/service/s3tables/table_bucket_test.go index 19cf66336fe4..7d52c0598c46 100644 --- a/internal/service/s3tables/table_bucket_test.go +++ b/internal/service/s3tables/table_bucket_test.go @@ -9,6 +9,7 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3tables" awstypes "github.com/aws/aws-sdk-go-v2/service/s3tables/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" @@ -21,6 +22,7 @@ import ( tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/errs" tfs3tables "github.com/hashicorp/terraform-provider-aws/internal/service/s3tables" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -48,6 +50,7 @@ func TestAccS3TablesTableBucket_basic(t *testing.T) { testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), + resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), ), @@ -69,6 +72,7 @@ func TestAccS3TablesTableBucket_basic(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrForceDestroy}, }, }, }) @@ -98,6 +102,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), + resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "encryption_configuration.kms_key_arn", resourceKeyOne, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.sse_algorithm", "aws:kms"), @@ -121,6 +126,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), + resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "encryption_configuration.kms_key_arn", resourceKeyTwo, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.sse_algorithm", "aws:kms"), @@ -144,6 +150,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrForceDestroy}, }, }, }) @@ -216,6 +223,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrForceDestroy}, }, { Config: testAccTableBucketConfig_maintenanceConfiguration(rName, awstypes.MaintenanceStatusEnabled, 15, 4), @@ -240,6 +248,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrForceDestroy}, }, { Config: testAccTableBucketConfig_maintenanceConfiguration(rName, awstypes.MaintenanceStatusDisabled, 15, 4), @@ -264,11 +273,103 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrForceDestroy}, }, }, }) } +func TestAccS3TablesTableBucket_forceDestroy(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_s3tables_table_bucket.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.S3TablesServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableBucketDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableBucketConfig_forceDestroy(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTableBucketExists(ctx, resourceName, nil), + resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtTrue), + testAccCheckTableBucketAddTables(ctx, resourceName, "namespace1", "table1"), + ), + }, + }, + }) +} + +func TestAccS3TablesTableBucket_forceDestroyMultipleNamespacesAndTables(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_s3tables_table_bucket.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.S3TablesServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableBucketDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableBucketConfig_forceDestroy(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTableBucketExists(ctx, resourceName, nil), + resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtTrue), + testAccCheckTableBucketAddTables(ctx, resourceName, "namespace1", "table1"), + testAccCheckTableBucketAddTables(ctx, resourceName, "namespace2", "table2", "table3"), + testAccCheckTableBucketAddTables(ctx, resourceName, "namespace3", "table4", "table5", "table6"), + ), + }, + }, + }) +} + +func testAccCheckTableBucketAddTables(ctx context.Context, n string, namespace string, tableNames ...string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs := s.RootModule().Resources[n] + conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) + + // First, create the namespace if it doesn't exist + _, err := conn.CreateNamespace(ctx, &s3tables.CreateNamespaceInput{ + TableBucketARN: aws.String(rs.Primary.Attributes[names.AttrARN]), + Namespace: []string{namespace}, + }) + if err != nil { + // Ignore if namespace already exists + if !errs.IsA[*awstypes.ConflictException](err) { + return fmt.Errorf("CreateNamespace error: %w", err) + } + } + + // Create each table + for _, tableName := range tableNames { + _, err := conn.CreateTable(ctx, &s3tables.CreateTableInput{ + TableBucketARN: aws.String(rs.Primary.Attributes[names.AttrARN]), + Namespace: aws.String(namespace), + Name: aws.String(tableName), + Format: awstypes.OpenTableFormatIceberg, + }) + if err != nil { + // Ignore if table already exists + if !errs.IsA[*awstypes.ConflictException](err) { + return fmt.Errorf("CreateTable error for table %s: %w", tableName, err) + } + } + } + + return nil + } +} + func testAccCheckTableBucketDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) @@ -311,7 +412,9 @@ func testAccCheckTableBucketExists(ctx context.Context, name string, tablebucket return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucket, rs.Primary.ID, err) } - *tablebucket = *resp + if tablebucket != nil { + *tablebucket = *resp + } return nil } @@ -376,3 +479,12 @@ resource "aws_s3tables_table_bucket" "test" { } `, rName, status, nonCurrentDays, unreferencedDays) } + +func testAccTableBucketConfig_forceDestroy(rName string) string { + return fmt.Sprintf(` +resource "aws_s3tables_table_bucket" "test" { + name = %[1]q + force_destroy = true +} +`, rName) +} diff --git a/website/docs/r/s3tables_table_bucket.html.markdown b/website/docs/r/s3tables_table_bucket.html.markdown index b2aeae573af3..85baa1f026c0 100644 --- a/website/docs/r/s3tables_table_bucket.html.markdown +++ b/website/docs/r/s3tables_table_bucket.html.markdown @@ -34,6 +34,7 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `encryption_configuration` - (Optional) A single table bucket encryption configuration object. [See `encryption_configuration` below](#encryption_configuration). +* `force_destroy` - (Optional) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. Defaults to `false`. * `maintenance_configuration` - (Optional) A single table bucket maintenance configuration object. [See `maintenance_configuration` below](#maintenance_configuration). From c8bca9c7a99f61aca0b0cc0bf4f6ff48c3da646d Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 10 Apr 2025 09:58:46 +0900 Subject: [PATCH 0206/2115] add netword_card_index argument --- internal/service/ec2/vpc_network_interface.go | 28 +++++++++++++++++-- .../ec2/vpc_network_interface_attachment.go | 8 ++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 12f69bfba217..f3699ff822da 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -68,6 +68,11 @@ func resourceNetworkInterface() *schema.Resource { Type: schema.TypeString, Required: true, }, + "network_card_index": { + Type: schema.TypeInt, + Optional: true, + Default: 0, + }, }, }, }, @@ -489,8 +494,14 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, if v, ok := d.GetOk("attachment"); ok && v.(*schema.Set).Len() > 0 { attachment := v.(*schema.Set).List()[0].(map[string]any) + var networkCardIndex int + if attachment["network_card_index"] != nil { + networkCardIndex = attachment["network_card_index"].(int) + } else { + networkCardIndex = 0 + } - _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkInterfaceAttachedTimeout) + _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkCardIndex, networkInterfaceAttachedTimeout) if err != nil { return sdkdiag.AppendFromErr(diags, err) @@ -591,8 +602,14 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if na != nil && na.(*schema.Set).Len() > 0 { attachment := na.(*schema.Set).List()[0].(map[string]any) + var networkCardIndex int + if attachment["network_card_index"] != nil { + networkCardIndex = attachment["network_card_index"].(int) + } else { + networkCardIndex = 0 + } - if _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkInterfaceAttachedTimeout); err != nil { + if _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkCardIndex, networkInterfaceAttachedTimeout); err != nil { return sdkdiag.AppendFromErr(diags, err) } } @@ -1074,10 +1091,11 @@ func resourceNetworkInterfaceDelete(ctx context.Context, d *schema.ResourceData, return diags } -func attachNetworkInterface(ctx context.Context, conn *ec2.Client, networkInterfaceID, instanceID string, deviceIndex int, timeout time.Duration) (string, error) { +func attachNetworkInterface(ctx context.Context, conn *ec2.Client, networkInterfaceID, instanceID string, deviceIndex int, networkCardIndex int, timeout time.Duration) (string, error) { input := &ec2.AttachNetworkInterfaceInput{ DeviceIndex: aws.Int32(int32(deviceIndex)), InstanceId: aws.String(instanceID), + NetworkCardIndex: aws.Int32(int32(networkCardIndex)), NetworkInterfaceId: aws.String(networkInterfaceID), } @@ -1204,6 +1222,10 @@ func flattenNetworkInterfaceAttachment(apiObject *awstypes.NetworkInterfaceAttac tfMap["instance"] = aws.ToString(v) } + if v := apiObject.NetworkCardIndex; v != nil { + tfMap["network_card_index"] = aws.ToInt32(v) + } + return tfMap } diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index 332eef7f9b1d..2fbdbc23a41e 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -40,6 +40,12 @@ func resourceNetworkInterfaceAttachment() *schema.Resource { Required: true, ForceNew: true, }, + "network_card_index": { + Type: schema.TypeInt, + Optional: true, + Default: 0, + ForceNew: true, + }, names.AttrNetworkInterfaceID: { Type: schema.TypeString, Required: true, @@ -61,6 +67,7 @@ func resourceNetworkInterfaceAttachmentCreate(ctx context.Context, d *schema.Res d.Get(names.AttrNetworkInterfaceID).(string), d.Get(names.AttrInstanceID).(string), d.Get("device_index").(int), + d.Get("network_card_index").(int), networkInterfaceAttachedTimeout, ) @@ -95,6 +102,7 @@ func resourceNetworkInterfaceAttachmentRead(ctx context.Context, d *schema.Resou d.Set("attachment_id", network_interface.Attachment.AttachmentId) d.Set("device_index", network_interface.Attachment.DeviceIndex) d.Set(names.AttrInstanceID, network_interface.Attachment.InstanceId) + d.Set("network_card_index", network_interface.Attachment.NetworkCardIndex) d.Set(names.AttrStatus, network_interface.Attachment.Status) return diags From 81f13307d1128688d1c12ad6faac208415f03695 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 10 Apr 2025 09:59:11 +0900 Subject: [PATCH 0207/2115] add acctests --- .../vpc_network_interface_attachment_test.go | 89 ++++++++++++++++++ .../service/ec2/vpc_network_interface_test.go | 91 ++++++++++++++++++- 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/internal/service/ec2/vpc_network_interface_attachment_test.go b/internal/service/ec2/vpc_network_interface_attachment_test.go index 883c422fe78f..cc5d3bdc4522 100644 --- a/internal/service/ec2/vpc_network_interface_attachment_test.go +++ b/internal/service/ec2/vpc_network_interface_attachment_test.go @@ -5,6 +5,7 @@ package ec2_test import ( "fmt" + "github.com/YakDriver/regexache" "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" @@ -33,6 +34,7 @@ func TestAccVPCNetworkInterfaceAttachment_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "attachment_id"), resource.TestCheckResourceAttr(resourceName, "device_index", "1"), resource.TestCheckResourceAttrSet(resourceName, names.AttrInstanceID), + resource.TestCheckResourceAttr(resourceName, "network_card_index", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrNetworkInterfaceID), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), ), @@ -46,6 +48,28 @@ func TestAccVPCNetworkInterfaceAttachment_basic(t *testing.T) { }) } +// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards. +// Only specialized (and expensive) instance types support multiple network cards (and hence network_card_index > 0). +// This test verifies that the resource is not created when a non-zero network_card_index is specified on an instance that does not support multiple network cards. +// This ensures that network_card_index is passed when calling the AttachNetworkInterface API. +func TestAccVPCNetworkInterfaceAttachment_networkCardIndex(t *testing.T) { + ctx := acctest.Context(t) + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckENIDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName), + ExpectError: regexache.MustCompile("NetworkCard index 1 exceeds the limit for"), + }, + }, + }) +} + func testAccVPCNetworkInterfaceAttachmentConfig_basic(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), @@ -109,3 +133,68 @@ resource "aws_network_interface_attachment" "test" { } `, rName)) } + +func testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + acctest.ConfigAvailableAZsNoOptIn(), + fmt.Sprintf(` +resource "aws_vpc" "test" { + cidr_block = "172.16.0.0/16" + + tags = { + Name = %[1]q + } +} + +resource "aws_subnet" "test" { + vpc_id = aws_vpc.test.id + cidr_block = "172.16.10.0/24" + availability_zone = data.aws_availability_zones.available.names[0] + + tags = { + Name = %[1]q + } +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id + name = %[1]q + + egress { + from_port = 0 + to_port = 0 + protocol = "tcp" + cidr_blocks = ["10.0.0.0/16"] + } +} + +resource "aws_network_interface" "test" { + subnet_id = aws_subnet.test.id + private_ips = ["172.16.10.100"] + security_groups = [aws_security_group.test.id] + + tags = { + Name = %[1]q + } +} + +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = data.aws_ec2_instance_type_offering.available.instance_type + subnet_id = aws_subnet.test.id + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface_attachment" "test" { + device_index = 1 + network_card_index = 1 + instance_id = aws_instance.test.id + network_interface_id = aws_network_interface.test.id +} +`, rName)) +} diff --git a/internal/service/ec2/vpc_network_interface_test.go b/internal/service/ec2/vpc_network_interface_test.go index e5fe7768166f..f48f9f8b25ab 100644 --- a/internal/service/ec2/vpc_network_interface_test.go +++ b/internal/service/ec2/vpc_network_interface_test.go @@ -418,7 +418,8 @@ func TestAccVPCNetworkInterface_attachment(t *testing.T) { testAccCheckENIExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "attachment.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "attachment.*", map[string]string{ - "device_index": "1", + "device_index": "1", + "network_card_index": "0", }), resource.TestCheckResourceAttr(resourceName, "private_ip", "172.16.10.100"), resource.TestCheckResourceAttr(resourceName, "private_ips.#", "1"), @@ -435,6 +436,48 @@ func TestAccVPCNetworkInterface_attachment(t *testing.T) { }) } +// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards. +// Only specialized (and expensive) instance types support multiple network cards (and hence network_card_index > 0). +// This test verifies that the resource is not created when a non-zero network_card_index is specified on an instance that does not support multiple network cards. +// This ensures that network_card_index is passed when calling the API. +func TestAccVPCNetworkInterface_attachmentNetworkCardIndex(t *testing.T) { + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + ctx := acctest.Context(t) + var conf types.NetworkInterface + resourceName := "aws_network_interface.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckENIDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName, 1), + ExpectError: regexache.MustCompile("NetworkCard index 1 exceeds the limit for"), + }, + { + Config: testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName, 0), + Check: resource.ComposeTestCheckFunc( + testAccCheckENIExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "attachment.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "attachment.*", map[string]string{ + "device_index": "1", + "network_card_index": "0", + }), + resource.TestCheckResourceAttr(resourceName, "private_ip", "172.16.10.100"), + resource.TestCheckResourceAttr(resourceName, "private_ips.#", "1"), + resource.TestCheckTypeSetElemAttr(resourceName, "private_ips.*", "172.16.10.100"), + ), + }, + }, + }) +} + func TestAccVPCNetworkInterface_ignoreExternalAttachment(t *testing.T) { ctx := acctest.Context(t) var conf awstypes.NetworkInterface @@ -1446,6 +1489,52 @@ resource "aws_network_interface" "test" { `, rName)) } +func testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName string, networkCardIndex int) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + testAccVPCNetworkInterfaceConfig_baseIPV4(rName), + fmt.Sprintf(` +resource "aws_subnet" "test2" { + vpc_id = aws_vpc.test.id + cidr_block = "172.16.11.0/24" + availability_zone = data.aws_availability_zones.available.names[0] + + tags = { + Name = %[1]q + } +} + +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = data.aws_ec2_instance_type_offering.available.instance_type + subnet_id = aws_subnet.test2.id + associate_public_ip_address = false + private_ip = "172.16.11.50" + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "test" { + subnet_id = aws_subnet.test.id + private_ips = ["172.16.10.100"] + security_groups = [aws_security_group.test.id] + + attachment { + instance = aws_instance.test.id + device_index = 1 + network_card_index = %[2]d + } + + tags = { + Name = %[1]q + } +} +`, rName, networkCardIndex)) +} + func testAccVPCNetworkInterfaceConfig_externalAttachment(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), From 1710da5da10479cd645adb4b570a963f8ae564f3 Mon Sep 17 00:00:00 2001 From: "tabito.hara" Date: Thu, 10 Apr 2025 11:26:07 +0900 Subject: [PATCH 0208/2115] sort import --- internal/service/ec2/vpc_network_interface_attachment_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ec2/vpc_network_interface_attachment_test.go b/internal/service/ec2/vpc_network_interface_attachment_test.go index cc5d3bdc4522..ae4fbb37c48a 100644 --- a/internal/service/ec2/vpc_network_interface_attachment_test.go +++ b/internal/service/ec2/vpc_network_interface_attachment_test.go @@ -5,9 +5,9 @@ package ec2_test import ( "fmt" - "github.com/YakDriver/regexache" "testing" + "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" From e0f5fb4230309508b596e3507340ad7cb0cac278 Mon Sep 17 00:00:00 2001 From: "tabito.hara" Date: Thu, 10 Apr 2025 11:46:15 +0900 Subject: [PATCH 0209/2115] add network_card_index to data source --- internal/service/ec2/vpc_network_interface_data_source.go | 8 ++++++++ .../service/ec2/vpc_network_interface_data_source_test.go | 1 + 2 files changed, 9 insertions(+) diff --git a/internal/service/ec2/vpc_network_interface_data_source.go b/internal/service/ec2/vpc_network_interface_data_source.go index e012b38c7973..c5e085d7adf4 100644 --- a/internal/service/ec2/vpc_network_interface_data_source.go +++ b/internal/service/ec2/vpc_network_interface_data_source.go @@ -92,6 +92,10 @@ func dataSourceNetworkInterface() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "network_card_index": { + Type: schema.TypeInt, + Computed: true, + }, }, }, }, @@ -246,5 +250,9 @@ func flattenNetworkInterfaceAttachmentForDataSource(apiObject *awstypes.NetworkI tfMap["instance_owner_id"] = aws.ToString(v) } + if v := apiObject.NetworkCardIndex; v != nil { + tfMap["network_card_index"] = aws.ToInt32(v) + } + return tfMap } diff --git a/internal/service/ec2/vpc_network_interface_data_source_test.go b/internal/service/ec2/vpc_network_interface_data_source_test.go index 1014bb9b20fe..fc2ec4f6266f 100644 --- a/internal/service/ec2/vpc_network_interface_data_source_test.go +++ b/internal/service/ec2/vpc_network_interface_data_source_test.go @@ -185,6 +185,7 @@ func TestAccVPCNetworkInterfaceDataSource_attachment(t *testing.T) { resource.TestCheckResourceAttr(datasourceName, "attachment.0.device_index", "1"), resource.TestCheckResourceAttrPair(datasourceName, "attachment.0.instance_id", instanceResourceName, names.AttrID), acctest.CheckResourceAttrAccountID(ctx, datasourceName, "attachment.0.instance_owner_id"), + resource.TestCheckResourceAttr(datasourceName, "attachment.0.network_card_index", "0"), resource.TestCheckResourceAttrSet(datasourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttr(datasourceName, "interface_type", "interface"), From 825ce379629337af3474ae6d611524f32cd16cf0 Mon Sep 17 00:00:00 2001 From: "tabito.hara" Date: Thu, 10 Apr 2025 12:42:52 +0900 Subject: [PATCH 0210/2115] update documents --- website/docs/d/network_interface.html.markdown | 9 +++++++++ website/docs/r/network_interface.html.markdown | 1 + .../docs/r/network_interface_attachment.html.markdown | 1 + 3 files changed, 11 insertions(+) diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index ed611309037f..ae80b75a000c 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -32,6 +32,7 @@ This data source exports the following attributes in addition to the arguments a * `arn` - ARN of the network interface. * `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See supported fields below. +* `attachment` - Attachment of the ENI. See supported fields below. * `availability_zone` - Availability Zone. * `description` - Description of the network interface. * `interface_type` - Type of interface. @@ -58,6 +59,14 @@ This data source exports the following attributes in addition to the arguments a * `public_dns_name` - Public DNS name. * `public_ip` - Address of the Elastic IP address bound to the network interface. +### `attachment` +* `attachment_id` - The ID of the network interface attachment. +* `device_index` - The device index of the network interface attachment on the instance. +* `instance_id` - The ID of the instance. +* `instance_owner_id` - The AWS account ID of the owner of the instance. +* `network_card_index` - The index of the network card. + + ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index f783129e37bf..4dc55dc09347 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -77,6 +77,7 @@ The `attachment` block supports the following: * `instance` - (Required) ID of the instance to attach to. * `device_index` - (Required) Integer to define the devices index. +* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. ## Attribute Reference diff --git a/website/docs/r/network_interface_attachment.html.markdown b/website/docs/r/network_interface_attachment.html.markdown index ef3750b6ee08..ac7b85809886 100644 --- a/website/docs/r/network_interface_attachment.html.markdown +++ b/website/docs/r/network_interface_attachment.html.markdown @@ -28,6 +28,7 @@ This resource supports the following arguments: * `instance_id` - (Required) Instance ID to attach. * `network_interface_id` - (Required) ENI ID to attach. * `device_index` - (Required) Network interface index (int). +* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. ## Attribute Reference From 9916490125e64b6f5f509e978a913786ba3bba1e Mon Sep 17 00:00:00 2001 From: "tabito.hara" Date: Thu, 10 Apr 2025 12:47:57 +0900 Subject: [PATCH 0211/2115] add changelog --- .changelog/42188.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .changelog/42188.txt diff --git a/.changelog/42188.txt b/.changelog/42188.txt new file mode 100644 index 000000000000..944ad4642d28 --- /dev/null +++ b/.changelog/42188.txt @@ -0,0 +1,11 @@ +```release-note:enhancement +resource/aws_network_interface: Add `network_card_index` argument in the `attachment` block to support multiple network interfaces, which is supported by some instance types. +``` + +```release-note:enhancement +resource/aws_network_interface_attachment: Add `network_card_index` argument to support multiple network interfaces, which is supported by some instance types. +``` + +```release-note:enhancement +data-source/aws_network_interfaces: Add `network_card_index` attribute in the `attachment` block. +``` From 2dafc0fee66f70b868e32267119177de45585d2e Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 10 Apr 2025 23:35:18 +0900 Subject: [PATCH 0212/2115] markdown lint --- website/docs/d/network_interface.html.markdown | 2 +- website/docs/r/network_interface.html.markdown | 2 +- website/docs/r/network_interface_attachment.html.markdown | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index ae80b75a000c..6fa1a56ff931 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -60,13 +60,13 @@ This data source exports the following attributes in addition to the arguments a * `public_ip` - Address of the Elastic IP address bound to the network interface. ### `attachment` + * `attachment_id` - The ID of the network interface attachment. * `device_index` - The device index of the network interface attachment on the instance. * `instance_id` - The ID of the instance. * `instance_owner_id` - The AWS account ID of the owner of the instance. * `network_card_index` - The index of the network card. - ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index 4dc55dc09347..ec7f9b3c55b2 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -77,7 +77,7 @@ The `attachment` block supports the following: * `instance` - (Required) ID of the instance to attach to. * `device_index` - (Required) Integer to define the devices index. -* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. +* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. ## Attribute Reference diff --git a/website/docs/r/network_interface_attachment.html.markdown b/website/docs/r/network_interface_attachment.html.markdown index ac7b85809886..04b6aad53d6f 100644 --- a/website/docs/r/network_interface_attachment.html.markdown +++ b/website/docs/r/network_interface_attachment.html.markdown @@ -28,7 +28,7 @@ This resource supports the following arguments: * `instance_id` - (Required) Instance ID to attach. * `network_interface_id` - (Required) ENI ID to attach. * `device_index` - (Required) Network interface index (int). -* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. +* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. ## Attribute Reference From c6335cc47a54806a18f4e1e273b31e2cc45d14ad Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:18:01 +0900 Subject: [PATCH 0213/2115] remove "Default" --- internal/service/ec2/vpc_network_interface.go | 1 - internal/service/ec2/vpc_network_interface_attachment.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index f3699ff822da..90eb0ae3e1a9 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -71,7 +71,6 @@ func resourceNetworkInterface() *schema.Resource { "network_card_index": { Type: schema.TypeInt, Optional: true, - Default: 0, }, }, }, diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index 2fbdbc23a41e..4b7b425a9e16 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -43,7 +43,6 @@ func resourceNetworkInterfaceAttachment() *schema.Resource { "network_card_index": { Type: schema.TypeInt, Optional: true, - Default: 0, ForceNew: true, }, names.AttrNetworkInterfaceID: { From 8c578d6d3c27197dbda2995000f68b8afc7b2900 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:19:04 +0900 Subject: [PATCH 0214/2115] fix attachNetworkInterface function to accept input, rather than parameters --- internal/service/ec2/vpc_network_interface.go | 44 +++++++++---------- .../ec2/vpc_network_interface_attachment.go | 19 +++++--- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 90eb0ae3e1a9..bddd1f957b1c 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -493,14 +493,17 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, if v, ok := d.GetOk("attachment"); ok && v.(*schema.Set).Len() > 0 { attachment := v.(*schema.Set).List()[0].(map[string]any) - var networkCardIndex int - if attachment["network_card_index"] != nil { - networkCardIndex = attachment["network_card_index"].(int) - } else { - networkCardIndex = 0 + + input := ec2.AttachNetworkInterfaceInput{ + NetworkInterfaceId: aws.String(d.Id()), + InstanceId: aws.String(attachment["instance"].(string)), + DeviceIndex: aws.Int32(int32(attachment["device_index"].(int))), + } + if v, ok := attachment["network_card_index"].(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) } - _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkCardIndex, networkInterfaceAttachedTimeout) + _, err := attachNetworkInterface(ctx, conn, &input) if err != nil { return sdkdiag.AppendFromErr(diags, err) @@ -601,14 +604,16 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if na != nil && na.(*schema.Set).Len() > 0 { attachment := na.(*schema.Set).List()[0].(map[string]any) - var networkCardIndex int - if attachment["network_card_index"] != nil { - networkCardIndex = attachment["network_card_index"].(int) - } else { - networkCardIndex = 0 + input := ec2.AttachNetworkInterfaceInput{ + NetworkInterfaceId: aws.String(d.Id()), + InstanceId: aws.String(attachment["instance"].(string)), + DeviceIndex: aws.Int32(int32(attachment["device_index"].(int))), + } + if v, ok := attachment["network_card_index"].(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) } - if _, err := attachNetworkInterface(ctx, conn, d.Id(), attachment["instance"].(string), attachment["device_index"].(int), networkCardIndex, networkInterfaceAttachedTimeout); err != nil { + if _, err := attachNetworkInterface(ctx, conn, &input); err != nil { return sdkdiag.AppendFromErr(diags, err) } } @@ -1090,24 +1095,17 @@ func resourceNetworkInterfaceDelete(ctx context.Context, d *schema.ResourceData, return diags } -func attachNetworkInterface(ctx context.Context, conn *ec2.Client, networkInterfaceID, instanceID string, deviceIndex int, networkCardIndex int, timeout time.Duration) (string, error) { - input := &ec2.AttachNetworkInterfaceInput{ - DeviceIndex: aws.Int32(int32(deviceIndex)), - InstanceId: aws.String(instanceID), - NetworkCardIndex: aws.Int32(int32(networkCardIndex)), - NetworkInterfaceId: aws.String(networkInterfaceID), - } - +func attachNetworkInterface(ctx context.Context, conn *ec2.Client, input *ec2.AttachNetworkInterfaceInput) (string, error) { output, err := conn.AttachNetworkInterface(ctx, input) if err != nil { - return "", fmt.Errorf("attaching EC2 Network Interface (%s/%s): %w", networkInterfaceID, instanceID, err) + return "", fmt.Errorf("attaching EC2 Network Interface (%s/%s): %w", input.NetworkInterfaceId, input.InstanceId, err) } attachmentID := aws.ToString(output.AttachmentId) - if _, err := waitNetworkInterfaceAttached(ctx, conn, attachmentID, timeout); err != nil { - return "", fmt.Errorf("waiting for EC2 Network Interface (%s/%s) attach: %w", networkInterfaceID, instanceID, err) + if _, err := waitNetworkInterfaceAttached(ctx, conn, attachmentID, networkInterfaceAttachedTimeout); err != nil { + return "", fmt.Errorf("waiting for EC2 Network Interface (%s/%s) attach: %w", input.NetworkInterfaceId, input.InstanceId, err) } return attachmentID, nil diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index 4b7b425a9e16..190fe89db673 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -7,6 +7,8 @@ import ( "context" "log" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/ec2" "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" @@ -62,13 +64,16 @@ func resourceNetworkInterfaceAttachmentCreate(ctx context.Context, d *schema.Res var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) - attachmentID, err := attachNetworkInterface(ctx, conn, - d.Get(names.AttrNetworkInterfaceID).(string), - d.Get(names.AttrInstanceID).(string), - d.Get("device_index").(int), - d.Get("network_card_index").(int), - networkInterfaceAttachedTimeout, - ) + input := ec2.AttachNetworkInterfaceInput{ + NetworkInterfaceId: aws.String(d.Get(names.AttrNetworkInterfaceID).(string)), + InstanceId: aws.String(d.Get(names.AttrInstanceID).(string)), + DeviceIndex: aws.Int32(int32(d.Get("device_index").(int))), + } + if v, ok := d.Get("network_card_index").(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) + } + + attachmentID, err := attachNetworkInterface(ctx, conn, &input) if err != nil { return sdkdiag.AppendFromErr(diags, err) From cfe498da3a741f2b7892b278a03ccbbddbc77a67 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:27:59 +0900 Subject: [PATCH 0215/2115] Remove unnecessary pointer allocations for input structs --- internal/service/ec2/vpc_network_interface.go | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index bddd1f957b1c..7fdeb6c1aa0f 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -353,7 +353,7 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, ipv4PrefixesSpecified := false ipv6PrefixesSpecified := false - input := &ec2.CreateNetworkInterfaceInput{ + input := ec2.CreateNetworkInterfaceInput{ ClientToken: aws.String(id.UniqueId()), SubnetId: aws.String(d.Get(names.AttrSubnetID).(string)), } @@ -438,7 +438,7 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, input.TagSpecifications = getTagSpecificationsIn(ctx, awstypes.ResourceTypeNetworkInterface) } - output, err := conn.CreateNetworkInterface(ctx, input) + output, err := conn.CreateNetworkInterface(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating EC2 Network Interface: %s", err) @@ -456,12 +456,12 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, totalPrivateIPs := v.(*schema.Set).Len() if privateIPsCount, ok := d.GetOk("private_ips_count"); ok { if privateIPsCount.(int)+1 > totalPrivateIPs { - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), SecondaryPrivateIpAddressCount: aws.Int32(int32(privateIPsCount.(int) + 1 - totalPrivateIPs)), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -479,12 +479,12 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, // Default value is enabled. if !d.Get("source_dest_check").(bool) { - input := &ec2.ModifyNetworkInterfaceAttributeInput{ + input := ec2.ModifyNetworkInterfaceAttributeInput{ NetworkInterfaceId: aws.String(d.Id()), SourceDestCheck: &awstypes.AttributeBooleanValue{Value: aws.Bool(false)}, } - _, err := conn.ModifyNetworkInterfaceAttribute(ctx, input) + _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) SourceDestCheck: %s", d.Id(), err) @@ -634,12 +634,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Unassign old IP addresses. unassignIPs := os.Difference(ns) if unassignIPs.Len() != 0 { - input := &ec2.UnassignPrivateIpAddressesInput{ + input := ec2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), PrivateIpAddresses: flex.ExpandStringValueSet(unassignIPs), } - _, err := conn.UnassignPrivateIpAddresses(ctx, input) + _, err := conn.UnassignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -651,12 +651,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Assign new IP addresses. assignIPs := ns.Difference(os) if assignIPs.Len() != 0 { - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), PrivateIpAddresses: flex.ExpandStringValueSet(assignIPs), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -686,12 +686,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } // Unassign the secondary IP addresses - input := &ec2.UnassignPrivateIpAddressesInput{ + input := ec2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), PrivateIpAddresses: flex.ExpandStringValueList(privateIPsToUnassign), } - _, err := conn.UnassignPrivateIpAddresses(ctx, input) + _, err := conn.UnassignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -706,12 +706,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } privateIPToAssign := []any{ip} - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), PrivateIpAddresses: flex.ExpandStringValueList(privateIPToAssign), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -733,23 +733,23 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if o != nil && n != nil && n != len(privateIPsFiltered) { if diff := n.(int) - o.(int) - privateIPsNetChange; diff > 0 { - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), SecondaryPrivateIpAddressCount: aws.Int32(int32(diff)), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) } } else if diff < 0 { - input := &ec2.UnassignPrivateIpAddressesInput{ + input := ec2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), PrivateIpAddresses: flex.ExpandStringValueList(privateIPsFiltered[0:-diff]), } - _, err := conn.UnassignPrivateIpAddresses(ctx, input) + _, err := conn.UnassignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -764,23 +764,23 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if o, n := o.(int), n.(int); n != len(ipv4Prefixes) { if diff := n - o; diff > 0 { - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv4PrefixCount: aws.Int32(int32(diff)), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) } } else if diff < 0 { - input := &ec2.UnassignPrivateIpAddressesInput{ + input := ec2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv4Prefixes: flex.ExpandStringValueList(ipv4Prefixes[0:-diff]), } - _, err := conn.UnassignPrivateIpAddresses(ctx, input) + _, err := conn.UnassignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -804,12 +804,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Unassign old IPV4 prefixes. unassignPrefixes := os.Difference(ns) if unassignPrefixes.Len() != 0 { - input := &ec2.UnassignPrivateIpAddressesInput{ + input := ec2.UnassignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv4Prefixes: flex.ExpandStringValueSet(unassignPrefixes), } - _, err := conn.UnassignPrivateIpAddresses(ctx, input) + _, err := conn.UnassignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -819,12 +819,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Assign new IPV4 prefixes, assignPrefixes := ns.Difference(os) if assignPrefixes.Len() != 0 { - input := &ec2.AssignPrivateIpAddressesInput{ + input := ec2.AssignPrivateIpAddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv4Prefixes: flex.ExpandStringValueSet(assignPrefixes), } - _, err := conn.AssignPrivateIpAddresses(ctx, input) + _, err := conn.AssignPrivateIpAddresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv4 addresses: %s", d.Id(), err) @@ -833,12 +833,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } if d.HasChange("enable_primary_ipv6") { - input := &ec2.ModifyNetworkInterfaceAttributeInput{ + input := ec2.ModifyNetworkInterfaceAttributeInput{ NetworkInterfaceId: aws.String(d.Id()), EnablePrimaryIpv6: aws.Bool(d.Get("enable_primary_ipv6").(bool)), } - _, err := conn.ModifyNetworkInterfaceAttribute(ctx, input) + _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) enable primary IPv6: %s", d.Id(), err) } @@ -859,12 +859,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Unassign old IPV6 addresses. unassignIPs := os.Difference(ns) if unassignIPs.Len() != 0 { - input := &ec2.UnassignIpv6AddressesInput{ + input := ec2.UnassignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Addresses: flex.ExpandStringValueSet(unassignIPs), } - _, err := conn.UnassignIpv6Addresses(ctx, input) + _, err := conn.UnassignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -874,12 +874,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Assign new IPV6 addresses, assignIPs := ns.Difference(os) if assignIPs.Len() != 0 { - input := &ec2.AssignIpv6AddressesInput{ + input := ec2.AssignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Addresses: flex.ExpandStringValueSet(assignIPs), } - _, err := conn.AssignIpv6Addresses(ctx, input) + _, err := conn.AssignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -893,23 +893,23 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if o != nil && n != nil && n != len(ipv6Addresses) { if diff := n.(int) - o.(int); diff > 0 { - input := &ec2.AssignIpv6AddressesInput{ + input := ec2.AssignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6AddressCount: aws.Int32(int32(diff)), } - _, err := conn.AssignIpv6Addresses(ctx, input) + _, err := conn.AssignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) } } else if diff < 0 { - input := &ec2.UnassignIpv6AddressesInput{ + input := ec2.UnassignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Addresses: flex.ExpandStringValueList(ipv6Addresses[0:-diff]), } - _, err := conn.UnassignIpv6Addresses(ctx, input) + _, err := conn.UnassignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -932,12 +932,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, unassignIPs := make([]any, len(o.([]any))) copy(unassignIPs, o.([]any)) - input := &ec2.UnassignIpv6AddressesInput{ + input := ec2.UnassignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Addresses: flex.ExpandStringValueList(unassignIPs), } - _, err := conn.UnassignIpv6Addresses(ctx, input) + _, err := conn.UnassignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) private IPv6 addresses: %s", d.Id(), err) @@ -948,12 +948,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, for _, ip := range n.([]any) { privateIPToAssign := []any{ip} - input := &ec2.AssignIpv6AddressesInput{ + input := ec2.AssignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Addresses: flex.ExpandStringValueList(privateIPToAssign), } - _, err := conn.AssignIpv6Addresses(ctx, input) + _, err := conn.AssignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) private IPv6 addresses: %s", d.Id(), err) @@ -976,12 +976,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Unassign old IPV6 prefixes. unassignPrefixes := os.Difference(ns) if unassignPrefixes.Len() != 0 { - input := &ec2.UnassignIpv6AddressesInput{ + input := ec2.UnassignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Prefixes: flex.ExpandStringValueSet(unassignPrefixes), } - _, err := conn.UnassignIpv6Addresses(ctx, input) + _, err := conn.UnassignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -991,12 +991,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, // Assign new IPV6 prefixes, assignPrefixes := ns.Difference(os) if assignPrefixes.Len() != 0 { - input := &ec2.AssignIpv6AddressesInput{ + input := ec2.AssignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Prefixes: flex.ExpandStringValueSet(assignPrefixes), } - _, err := conn.AssignIpv6Addresses(ctx, input) + _, err := conn.AssignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -1010,23 +1010,23 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if o, n := o.(int), n.(int); n != len(ipv6Prefixes) { if diff := n - o; diff > 0 { - input := &ec2.AssignIpv6AddressesInput{ + input := ec2.AssignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6PrefixCount: aws.Int32(int32(diff)), } - _, err := conn.AssignIpv6Addresses(ctx, input) + _, err := conn.AssignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "assigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) } } else if diff < 0 { - input := &ec2.UnassignIpv6AddressesInput{ + input := ec2.UnassignIpv6AddressesInput{ NetworkInterfaceId: aws.String(d.Id()), Ipv6Prefixes: flex.ExpandStringValueList(ipv6Prefixes[0:-diff]), } - _, err := conn.UnassignIpv6Addresses(ctx, input) + _, err := conn.UnassignIpv6Addresses(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "unassigning EC2 Network Interface (%s) IPv6 addresses: %s", d.Id(), err) @@ -1036,12 +1036,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } if d.HasChange("source_dest_check") { - input := &ec2.ModifyNetworkInterfaceAttributeInput{ + input := ec2.ModifyNetworkInterfaceAttributeInput{ NetworkInterfaceId: aws.String(d.Id()), SourceDestCheck: &awstypes.AttributeBooleanValue{Value: aws.Bool(d.Get("source_dest_check").(bool))}, } - _, err := conn.ModifyNetworkInterfaceAttribute(ctx, input) + _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) SourceDestCheck: %s", d.Id(), err) @@ -1049,12 +1049,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } if d.HasChange(names.AttrSecurityGroups) { - input := &ec2.ModifyNetworkInterfaceAttributeInput{ + input := ec2.ModifyNetworkInterfaceAttributeInput{ NetworkInterfaceId: aws.String(d.Id()), Groups: flex.ExpandStringValueSet(d.Get(names.AttrSecurityGroups).(*schema.Set)), } - _, err := conn.ModifyNetworkInterfaceAttribute(ctx, input) + _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) Groups: %s", d.Id(), err) @@ -1062,12 +1062,12 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } if d.HasChange(names.AttrDescription) { - input := &ec2.ModifyNetworkInterfaceAttributeInput{ + input := ec2.ModifyNetworkInterfaceAttributeInput{ NetworkInterfaceId: aws.String(d.Id()), Description: &awstypes.AttributeValue{Value: aws.String(d.Get(names.AttrDescription).(string))}, } - _, err := conn.ModifyNetworkInterfaceAttribute(ctx, input) + _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) Description: %s", d.Id(), err) From 971eb8fd64d7dbabbab07aea35eecc09c59d6cc3 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:28:31 +0900 Subject: [PATCH 0216/2115] Update acctest to run with expensive instances when envvar is set --- docs/acc-test-environment-variables.md | 1 + .../vpc_network_interface_attachment_test.go | 34 +++++++++++++------ .../service/ec2/vpc_network_interface_test.go | 24 +++++++------ 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/docs/acc-test-environment-variables.md b/docs/acc-test-environment-variables.md index 4cac651bcf83..aff2df381b73 100644 --- a/docs/acc-test-environment-variables.md +++ b/docs/acc-test-environment-variables.md @@ -104,3 +104,4 @@ Environment variables (beyond standard AWS Go SDK ones) used by acceptance testi | `TF_TEST_CLOUDFRONT_RETAIN` | Flag to disable but dangle CloudFront Distributions during testing to reduce feedback time (must be manually destroyed afterwards) | | `TF_TEST_ELASTICACHE_RESERVED_CACHE_NODE` | Flag to enable resource tests for ElastiCache reserved nodes. Set to `1` to run tests | | `TRUST_ANCHOR_CERTIFICATE` | Trust anchor certificate for KMS custom key store acceptance tests. | +| `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_CARDS` | Flag to execute tests that enable to attach multiple network interfaces.| diff --git a/internal/service/ec2/vpc_network_interface_attachment_test.go b/internal/service/ec2/vpc_network_interface_attachment_test.go index ae4fbb37c48a..a592e63a6e1c 100644 --- a/internal/service/ec2/vpc_network_interface_attachment_test.go +++ b/internal/service/ec2/vpc_network_interface_attachment_test.go @@ -7,7 +7,6 @@ import ( "fmt" "testing" - "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -49,11 +48,13 @@ func TestAccVPCNetworkInterfaceAttachment_basic(t *testing.T) { } // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards. -// Only specialized (and expensive) instance types support multiple network cards (and hence network_card_index > 0). -// This test verifies that the resource is not created when a non-zero network_card_index is specified on an instance that does not support multiple network cards. -// This ensures that network_card_index is passed when calling the AttachNetworkInterface API. +// This test requires an expensive instance type that supports multiple network cards, such as "c6in.32xlarge" or "c6in.metal". +// Set the environment variable `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_NETWORK_CARDS` to run this test. func TestAccVPCNetworkInterfaceAttachment_networkCardIndex(t *testing.T) { + acctest.SkipIfEnvVarNotSet(t, "VPC_NETWORK_INTERFACE_TEST_MULTIPLE_NETWORK_CARDS") ctx := acctest.Context(t) + var conf awstypes.NetworkInterface + resourceName := "aws_network_interface_attachment.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -63,8 +64,21 @@ func TestAccVPCNetworkInterfaceAttachment_networkCardIndex(t *testing.T) { CheckDestroy: testAccCheckENIDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName), - ExpectError: regexache.MustCompile("NetworkCard index 1 exceeds the limit for"), + Config: testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName, 1), + Check: resource.ComposeTestCheckFunc( + testAccCheckENIExists(ctx, "aws_network_interface.test", &conf), + resource.TestCheckResourceAttrSet(resourceName, "attachment_id"), + resource.TestCheckResourceAttr(resourceName, "device_index", "1"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrInstanceID), + resource.TestCheckResourceAttr(resourceName, "network_card_index", "1"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrNetworkInterfaceID), + resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -134,10 +148,10 @@ resource "aws_network_interface_attachment" "test" { `, rName)) } -func testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName string) string { +func testAccVPCNetworkInterfaceAttachmentConfig_networkCardIndex(rName string, networkCardIndex int) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), - acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + acctest.AvailableEC2InstanceTypeForRegion("c6in.32xlarge", "c6in.metal"), acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` resource "aws_vpc" "test" { @@ -192,9 +206,9 @@ resource "aws_instance" "test" { resource "aws_network_interface_attachment" "test" { device_index = 1 - network_card_index = 1 + network_card_index = %[2]d instance_id = aws_instance.test.id network_interface_id = aws_network_interface.test.id } -`, rName)) +`, rName, networkCardIndex)) } diff --git a/internal/service/ec2/vpc_network_interface_test.go b/internal/service/ec2/vpc_network_interface_test.go index f48f9f8b25ab..48b48e53e553 100644 --- a/internal/service/ec2/vpc_network_interface_test.go +++ b/internal/service/ec2/vpc_network_interface_test.go @@ -437,16 +437,16 @@ func TestAccVPCNetworkInterface_attachment(t *testing.T) { } // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards. -// Only specialized (and expensive) instance types support multiple network cards (and hence network_card_index > 0). -// This test verifies that the resource is not created when a non-zero network_card_index is specified on an instance that does not support multiple network cards. -// This ensures that network_card_index is passed when calling the API. +// This test requires an expensive instance type that supports multiple network cards, such as "c6in.32xlarge" or "c6in.metal". +// Set the environment variable `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_NETWORK_CARDS` to run this test. func TestAccVPCNetworkInterface_attachmentNetworkCardIndex(t *testing.T) { + acctest.SkipIfEnvVarNotSet(t, "VPC_NETWORK_INTERFACE_TEST_MULTIPLE_NETWORK_CARDS") if testing.Short() { t.Skip("skipping long-running test in short mode") } ctx := acctest.Context(t) - var conf types.NetworkInterface + var conf awstypes.NetworkInterface resourceName := "aws_network_interface.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -457,23 +457,25 @@ func TestAccVPCNetworkInterface_attachmentNetworkCardIndex(t *testing.T) { CheckDestroy: testAccCheckENIDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName, 1), - ExpectError: regexache.MustCompile("NetworkCard index 1 exceeds the limit for"), - }, - { - Config: testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName, 0), + Config: testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckENIExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "attachment.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "attachment.*", map[string]string{ "device_index": "1", - "network_card_index": "0", + "network_card_index": "1", }), resource.TestCheckResourceAttr(resourceName, "private_ip", "172.16.10.100"), resource.TestCheckResourceAttr(resourceName, "private_ips.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "private_ips.*", "172.16.10.100"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"private_ip_list_enabled", "ipv6_address_list_enabled"}, + }, }, }) } @@ -1492,7 +1494,7 @@ resource "aws_network_interface" "test" { func testAccVPCNetworkInterfaceConfig_attachmentNetworkCardIndex(rName string, networkCardIndex int) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), - acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), + acctest.AvailableEC2InstanceTypeForRegion("c6in.32xlarge", "c6in.metal"), testAccVPCNetworkInterfaceConfig_baseIPV4(rName), fmt.Sprintf(` resource "aws_subnet" "test2" { From 5810d5c5091ece8825f3b1d3a3855bfd1822b76d Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:31:31 +0900 Subject: [PATCH 0217/2115] update changelog --- .changelog/42188.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changelog/42188.txt b/.changelog/42188.txt index 944ad4642d28..5aeb12ccccad 100644 --- a/.changelog/42188.txt +++ b/.changelog/42188.txt @@ -1,5 +1,5 @@ ```release-note:enhancement -resource/aws_network_interface: Add `network_card_index` argument in the `attachment` block to support multiple network interfaces, which is supported by some instance types. +resource/aws_network_interface: Add `attachment.network_card_index` argument to support multiple network interfaces, which is supported by some instance types. ``` ```release-note:enhancement @@ -7,5 +7,5 @@ resource/aws_network_interface_attachment: Add `network_card_index` argument to ``` ```release-note:enhancement -data-source/aws_network_interfaces: Add `network_card_index` attribute in the `attachment` block. +data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute. ``` From c35e47f7f34c31817aaa9c3e892bfe31ccc529b4 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 12:45:38 +0900 Subject: [PATCH 0218/2115] fix types --- internal/service/ec2/vpc_network_interface.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 7fdeb6c1aa0f..2ad829dacb2c 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -1099,13 +1099,13 @@ func attachNetworkInterface(ctx context.Context, conn *ec2.Client, input *ec2.At output, err := conn.AttachNetworkInterface(ctx, input) if err != nil { - return "", fmt.Errorf("attaching EC2 Network Interface (%s/%s): %w", input.NetworkInterfaceId, input.InstanceId, err) + return "", fmt.Errorf("attaching EC2 Network Interface (%s/%s): %w", aws.ToString(input.NetworkInterfaceId), aws.ToString(input.InstanceId), err) } attachmentID := aws.ToString(output.AttachmentId) if _, err := waitNetworkInterfaceAttached(ctx, conn, attachmentID, networkInterfaceAttachedTimeout); err != nil { - return "", fmt.Errorf("waiting for EC2 Network Interface (%s/%s) attach: %w", input.NetworkInterfaceId, input.InstanceId, err) + return "", fmt.Errorf("waiting for EC2 Network Interface (%s/%s) attach: %w", aws.ToString(input.NetworkInterfaceId), aws.ToString(input.InstanceId), err) } return attachmentID, nil From fe9a4a6464745bbf9ca81361fa2a2bf188659081 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 13:17:56 +0900 Subject: [PATCH 0219/2115] Fixed documents --- website/docs/d/network_interface.html.markdown | 14 +++++++------- website/docs/r/network_interface.html.markdown | 2 +- .../r/network_interface_attachment.html.markdown | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/docs/d/network_interface.html.markdown b/website/docs/d/network_interface.html.markdown index 6fa1a56ff931..8307d52f6741 100644 --- a/website/docs/d/network_interface.html.markdown +++ b/website/docs/d/network_interface.html.markdown @@ -31,8 +31,8 @@ This data source supports the following arguments: This data source exports the following attributes in addition to the arguments above: * `arn` - ARN of the network interface. -* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See supported fields below. -* `attachment` - Attachment of the ENI. See supported fields below. +* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See [association](#association) below. +* `attachment` - Attachment of the ENI. See [attachment](#attachment) below. * `availability_zone` - Availability Zone. * `description` - Description of the network interface. * `interface_type` - Type of interface. @@ -61,11 +61,11 @@ This data source exports the following attributes in addition to the arguments a ### `attachment` -* `attachment_id` - The ID of the network interface attachment. -* `device_index` - The device index of the network interface attachment on the instance. -* `instance_id` - The ID of the instance. -* `instance_owner_id` - The AWS account ID of the owner of the instance. -* `network_card_index` - The index of the network card. +* `attachment_id` - ID of the network interface attachment. +* `device_index` - Device index of the network interface attachment on the instance. +* `instance_id` - ID of the instance. +* `instance_owner_id` - AWS account ID of the owner of the instance. +* `network_card_index` - Index of the network card. ## Timeouts diff --git a/website/docs/r/network_interface.html.markdown b/website/docs/r/network_interface.html.markdown index ec7f9b3c55b2..a07837aaffc9 100644 --- a/website/docs/r/network_interface.html.markdown +++ b/website/docs/r/network_interface.html.markdown @@ -77,7 +77,7 @@ The `attachment` block supports the following: * `instance` - (Required) ID of the instance to attach to. * `device_index` - (Required) Integer to define the devices index. -* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. +* `network_card_index` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference diff --git a/website/docs/r/network_interface_attachment.html.markdown b/website/docs/r/network_interface_attachment.html.markdown index 04b6aad53d6f..649d43179ea0 100644 --- a/website/docs/r/network_interface_attachment.html.markdown +++ b/website/docs/r/network_interface_attachment.html.markdown @@ -28,7 +28,7 @@ This resource supports the following arguments: * `instance_id` - (Required) Instance ID to attach. * `network_interface_id` - (Required) ENI ID to attach. * `device_index` - (Required) Network interface index (int). -* `network_card_index` - (Optional) The index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by some instance types. The default is 0. +* `network_card_index` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference From 0b604737e919b91c434de079e758db7c8ec83062 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 15:46:32 +0900 Subject: [PATCH 0220/2115] fix usage_plan_test including tags automatically generated --- .../testdata/UsagePlan/tags/main_gen.tf | 14 ++++++++-- .../UsagePlan/tagsComputed1/main_gen.tf | 14 ++++++++-- .../UsagePlan/tagsComputed2/main_gen.tf | 14 ++++++++-- .../UsagePlan/tags_defaults/main_gen.tf | 14 ++++++++-- .../UsagePlan/tags_ignore/main_gen.tf | 14 ++++++++-- .../testdata/tmpl/usage_plan_tags.gtpl | 14 ++++++++-- .../service/apigateway/usage_plan_test.go | 28 +++++++++++++------ 7 files changed, 91 insertions(+), 21 deletions(-) diff --git a/internal/service/apigateway/testdata/UsagePlan/tags/main_gen.tf b/internal/service/apigateway/testdata/UsagePlan/tags/main_gen.tf index 06ac92018cb8..d9f06bed884d 100644 --- a/internal/service/apigateway/testdata/UsagePlan/tags/main_gen.tf +++ b/internal/service/apigateway/testdata/UsagePlan/tags/main_gen.tf @@ -52,7 +52,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -60,6 +59,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -67,10 +72,15 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} + variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/apigateway/testdata/UsagePlan/tagsComputed1/main_gen.tf b/internal/service/apigateway/testdata/UsagePlan/tagsComputed1/main_gen.tf index b1c526134ab8..ebde9920233f 100644 --- a/internal/service/apigateway/testdata/UsagePlan/tagsComputed1/main_gen.tf +++ b/internal/service/apigateway/testdata/UsagePlan/tagsComputed1/main_gen.tf @@ -56,7 +56,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -64,6 +63,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -71,10 +76,15 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} + resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/apigateway/testdata/UsagePlan/tagsComputed2/main_gen.tf b/internal/service/apigateway/testdata/UsagePlan/tagsComputed2/main_gen.tf index c60ffaf00f60..1d85a66682c4 100644 --- a/internal/service/apigateway/testdata/UsagePlan/tagsComputed2/main_gen.tf +++ b/internal/service/apigateway/testdata/UsagePlan/tagsComputed2/main_gen.tf @@ -57,7 +57,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -65,6 +64,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -72,10 +77,15 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} + resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/apigateway/testdata/UsagePlan/tags_defaults/main_gen.tf b/internal/service/apigateway/testdata/UsagePlan/tags_defaults/main_gen.tf index d0c18f53fc9a..a642eb9e99e6 100644 --- a/internal/service/apigateway/testdata/UsagePlan/tags_defaults/main_gen.tf +++ b/internal/service/apigateway/testdata/UsagePlan/tags_defaults/main_gen.tf @@ -58,7 +58,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -66,6 +65,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -73,10 +78,15 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} + variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/apigateway/testdata/UsagePlan/tags_ignore/main_gen.tf b/internal/service/apigateway/testdata/UsagePlan/tags_ignore/main_gen.tf index f1924361d66d..c225d56f2c51 100644 --- a/internal/service/apigateway/testdata/UsagePlan/tags_ignore/main_gen.tf +++ b/internal/service/apigateway/testdata/UsagePlan/tags_ignore/main_gen.tf @@ -61,7 +61,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -69,6 +68,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -76,10 +81,15 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} + variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/apigateway/testdata/tmpl/usage_plan_tags.gtpl b/internal/service/apigateway/testdata/tmpl/usage_plan_tags.gtpl index 831fceae5136..47cc030aa33c 100644 --- a/internal/service/apigateway/testdata/tmpl/usage_plan_tags.gtpl +++ b/internal/service/apigateway/testdata/tmpl/usage_plan_tags.gtpl @@ -49,7 +49,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -57,6 +56,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -64,6 +69,11 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } + +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} diff --git a/internal/service/apigateway/usage_plan_test.go b/internal/service/apigateway/usage_plan_test.go index 8e801db2a35c..e98486005c77 100644 --- a/internal/service/apigateway/usage_plan_test.go +++ b/internal/service/apigateway/usage_plan_test.go @@ -603,7 +603,6 @@ resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" description = "This is a test" variables = { @@ -611,6 +610,12 @@ resource "aws_api_gateway_deployment" "test" { } } +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id +} + resource "aws_api_gateway_deployment" "foo" { depends_on = [ aws_api_gateway_deployment.test, @@ -618,9 +623,14 @@ resource "aws_api_gateway_deployment" "foo" { ] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "foo" description = "This is a prod stage" } + +resource "aws_api_gateway_stage" "foo" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "foo" + deployment_id = aws_api_gateway_deployment.foo.id +} `, rName) } @@ -711,7 +721,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name } } `, rName)) @@ -729,7 +739,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name throttle { path = "${aws_api_gateway_resource.test.path}/${aws_api_gateway_method.test.http_method}" @@ -753,7 +763,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name throttle { path = "${aws_api_gateway_resource.test.path}/${aws_api_gateway_method.test.http_method}" @@ -764,7 +774,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.foo.stage_name + stage = aws_api_gateway_stage.foo.stage_name throttle { path = "${aws_api_gateway_resource.test.path}/${aws_api_gateway_method.test.http_method}" @@ -783,7 +793,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.foo.stage_name + stage = aws_api_gateway_stage.foo.stage_name } } `, rName)) @@ -796,12 +806,12 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.foo.stage_name + stage = aws_api_gateway_stage.foo.stage_name } api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name } } `, rName)) From f5540357696be710529d8b56e49a601d63e407b7 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 15:47:34 +0900 Subject: [PATCH 0221/2115] fix usage_plan_key_test --- internal/service/apigateway/usage_plan_key_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/internal/service/apigateway/usage_plan_key_test.go b/internal/service/apigateway/usage_plan_key_test.go index fd7d30ed396f..f8e700d3275a 100644 --- a/internal/service/apigateway/usage_plan_key_test.go +++ b/internal/service/apigateway/usage_plan_key_test.go @@ -214,7 +214,12 @@ resource "aws_api_gateway_deployment" "test" { description = "This is a test" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "test" +} + +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "test" + deployment_id = aws_api_gateway_deployment.test.id } `, rName) } @@ -232,7 +237,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name } } @@ -259,7 +264,7 @@ resource "aws_api_gateway_usage_plan" "test" { api_stages { api_id = aws_api_gateway_rest_api.test.id - stage = aws_api_gateway_deployment.test.stage_name + stage = aws_api_gateway_stage.test.stage_name } } From b921747c625e05fd8e0217adab0620873e4b6562 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 15:47:53 +0900 Subject: [PATCH 0222/2115] fix method_settins_test.go --- .../apigateway/method_settings_test.go | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/internal/service/apigateway/method_settings_test.go b/internal/service/apigateway/method_settings_test.go index cb18253b2764..4d6107b471fc 100644 --- a/internal/service/apigateway/method_settings_test.go +++ b/internal/service/apigateway/method_settings_test.go @@ -673,7 +673,12 @@ EOF resource "aws_api_gateway_deployment" "test" { depends_on = [aws_api_gateway_integration.test] rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = "dev" +} + +resource "aws_api_gateway_stage" "test" { + rest_api_id = aws_api_gateway_rest_api.test.id + stage_name = "dev" + deployment_id = aws_api_gateway_deployment.test.id } `, rName) } @@ -683,7 +688,7 @@ func testAccMethodSettingsConfig_basic(rName string) string { resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings {} } @@ -695,7 +700,7 @@ func testAccMethodSettingsConfig_cacheDataEncrypted(rName string, cacheDataEncry resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { cache_data_encrypted = %[1]t @@ -709,7 +714,7 @@ func testAccMethodSettingsConfig_cacheTTLInSeconds(rName string, cacheTtlInSecon resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { cache_ttl_in_seconds = %[1]d @@ -723,7 +728,7 @@ func testAccMethodSettingsConfig_cachingEnabled(rName string, cachingEnabled boo resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { caching_enabled = %[1]t @@ -737,7 +742,7 @@ func testAccMethodSettingsConfig_dataTraceEnabled(rName string, dataTraceEnabled resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { data_trace_enabled = %[1]t @@ -754,7 +759,7 @@ func testAccMethodSettingsConfig_loggingLevel(rName, loggingLevel string) string resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { logging_level = %[1]q @@ -770,7 +775,7 @@ func testAccMethodSettingsConfig_metricsEnabled(rName string, metricsEnabled boo resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { metrics_enabled = %[1]t @@ -786,7 +791,7 @@ func testAccMethodSettingsConfig_multiple(rName, loggingLevel string, metricsEna fmt.Sprintf(` resource "aws_api_gateway_method_settings" "test" { rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" settings { @@ -804,7 +809,7 @@ func testAccMethodSettingsConfig_requireAuthorizationForCacheControl(rName strin resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { require_authorization_for_cache_control = %[1]t @@ -818,7 +823,7 @@ func testAccMethodSettingsConfig_throttlingBurstLimit(rName string, throttlingBu resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { throttling_burst_limit = %[1]d @@ -832,7 +837,7 @@ func testAccMethodSettingsConfig_throttlingRateLimit(rName string, throttlingRat resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { throttling_rate_limit = %[1]f @@ -846,7 +851,7 @@ func testAccMethodSettingsConfig_unauthorizedCacheControlHeaderStrategy(rName, u resource "aws_api_gateway_method_settings" "test" { method_path = "${aws_api_gateway_resource.test.path_part}/${aws_api_gateway_method.test.http_method}" rest_api_id = aws_api_gateway_rest_api.test.id - stage_name = aws_api_gateway_deployment.test.stage_name + stage_name = aws_api_gateway_stage.test.stage_name settings { unauthorized_cache_control_header_strategy = %[1]q From d03a0b44c84a407ec5bd575a1e687bbc43733640 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 23:12:05 +0900 Subject: [PATCH 0223/2115] Mark network_card_index as Computed --- internal/service/ec2/vpc_network_interface.go | 1 + internal/service/ec2/vpc_network_interface_attachment.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 2ad829dacb2c..d1efac3dcd20 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -71,6 +71,7 @@ func resourceNetworkInterface() *schema.Resource { "network_card_index": { Type: schema.TypeInt, Optional: true, + Computed: true, }, }, }, diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index 190fe89db673..584e3318ddb6 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -45,6 +45,7 @@ func resourceNetworkInterfaceAttachment() *schema.Resource { "network_card_index": { Type: schema.TypeInt, Optional: true, + Computed: true, ForceNew: true, }, names.AttrNetworkInterfaceID: { From c1eb3fb6644defb1c263b353c4ab9e68a3d28c10 Mon Sep 17 00:00:00 2001 From: tabito Date: Sun, 17 Aug 2025 23:17:06 +0900 Subject: [PATCH 0224/2115] Ensure API input for network_card_index remains nil when not specified --- internal/service/ec2/vpc_network_interface.go | 12 ++++++++---- .../service/ec2/vpc_network_interface_attachment.go | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index d1efac3dcd20..ba6cb20ab9e8 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -500,8 +500,10 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, InstanceId: aws.String(attachment["instance"].(string)), DeviceIndex: aws.Int32(int32(attachment["device_index"].(int))), } - if v, ok := attachment["network_card_index"].(int); ok { - input.NetworkCardIndex = aws.Int32(int32(v)) + if v, ok := attachment["network_card_index"]; ok { + if v, ok := v.(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) + } } _, err := attachNetworkInterface(ctx, conn, &input) @@ -610,8 +612,10 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, InstanceId: aws.String(attachment["instance"].(string)), DeviceIndex: aws.Int32(int32(attachment["device_index"].(int))), } - if v, ok := attachment["network_card_index"].(int); ok { - input.NetworkCardIndex = aws.Int32(int32(v)) + if v, ok := attachment["network_card_index"]; ok { + if v, ok := v.(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) + } } if _, err := attachNetworkInterface(ctx, conn, &input); err != nil { diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index 584e3318ddb6..e6dc26de9f62 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -70,8 +70,10 @@ func resourceNetworkInterfaceAttachmentCreate(ctx context.Context, d *schema.Res InstanceId: aws.String(d.Get(names.AttrInstanceID).(string)), DeviceIndex: aws.Int32(int32(d.Get("device_index").(int))), } - if v, ok := d.Get("network_card_index").(int); ok { - input.NetworkCardIndex = aws.Int32(int32(v)) + if v, ok := d.GetOk("network_card_index"); ok { + if v, ok := v.(int); ok { + input.NetworkCardIndex = aws.Int32(int32(v)) + } } attachmentID, err := attachNetworkInterface(ctx, conn, &input) From 598cd0ad832b17bfc7b539dd49c02950e153ff7b Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Fri, 15 Aug 2025 21:56:05 +0200 Subject: [PATCH 0225/2115] fix: make is_public computed --- .../service/imagebuilder/lifecycle_policy.go | 4 + .../imagebuilder/lifecycle_policy_test.go | 85 +++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/internal/service/imagebuilder/lifecycle_policy.go b/internal/service/imagebuilder/lifecycle_policy.go index 91ae121021e3..e9ba7f1af59d 100644 --- a/internal/service/imagebuilder/lifecycle_policy.go +++ b/internal/service/imagebuilder/lifecycle_policy.go @@ -170,6 +170,10 @@ func (r *lifecyclePolicyResource) Schema(ctx context.Context, request resource.S Attributes: map[string]schema.Attribute{ "is_public": schema.BoolAttribute{ Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Bool{ + boolplanmodifier.UseStateForUnknown(), + }, }, "regions": schema.ListAttribute{ CustomType: fwtypes.ListOfStringType, diff --git a/internal/service/imagebuilder/lifecycle_policy_test.go b/internal/service/imagebuilder/lifecycle_policy_test.go index 5a352284bbe4..ba774d29fa1e 100644 --- a/internal/service/imagebuilder/lifecycle_policy_test.go +++ b/internal/service/imagebuilder/lifecycle_policy_test.go @@ -131,6 +131,46 @@ func TestAccImageBuilderLifecyclePolicy_policyDetails(t *testing.T) { }) } +func TestAccImageBuilderLifecyclePolicy_policyDetailsExclusionRulesAmisIsPublic(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_imagebuilder_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ImageBuilderServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAmisIsPublic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLifecyclePolicyExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "policy_detail.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.action.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.action.0.type", string(awstypes.LifecyclePolicyDetailActionTypeDelete)), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.action.0.include_resources.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.action.0.include_resources.0.amis", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.action.0.include_resources.0.snapshots", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.is_public", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.regions.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.last_launched.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.last_launched.0.unit", string(awstypes.LifecyclePolicyTimeUnitWeeks)), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.last_launched.0.value", "2"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.tag_map.%", "2"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.tag_map.key1", acctest.CtValue1), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.exclusion_rules.0.amis.0.tag_map.key2", acctest.CtValue2), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.filter.#", "1"), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.filter.0.type", string(awstypes.LifecyclePolicyDetailFilterTypeCount)), + resource.TestCheckResourceAttr(resourceName, "policy_detail.0.filter.0.value", "10"), + ), + }, + }, + }) +} + func TestAccImageBuilderLifecyclePolicy_resourceSelection(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_imagebuilder_lifecycle_policy.test" @@ -452,6 +492,51 @@ resource "aws_imagebuilder_lifecycle_policy" "test" { `, rName)) } +func testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAmisIsPublic(rName string) string { + return acctest.ConfigCompose(testAccLifecyclePolicyConfig_base(rName), fmt.Sprintf(` +resource "aws_imagebuilder_lifecycle_policy" "test" { + name = %[1]q + description = "Used for setting lifecycle policies" + execution_role = aws_iam_role.test.arn + resource_type = "AMI_IMAGE" + policy_detail { + action { + type = "DELETE" + include_resources { + amis = true + snapshots = true + } + } + exclusion_rules { + amis { + regions = [data.aws_region.current.region] + last_launched { + unit = "WEEKS" + value = 2 + } + tag_map = { + "key1" = "value1" + "key2" = "value2" + } + } + } + filter { + type = "COUNT" + value = "10" + } + } + resource_selection { + tag_map = { + "key1" = "value1" + "key2" = "value2" + } + } + + depends_on = [aws_iam_role_policy_attachment.test] +} +`, rName)) +} + func testAccLifecyclePolicyConfig_resourceSelection(rName string) string { return acctest.ConfigCompose( testAccLifecyclePolicyConfig_base(rName), From 21602aa58f9a384bdfc5587a9b12415df75f791e Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Sun, 17 Aug 2025 18:51:59 +0200 Subject: [PATCH 0226/2115] chore: add changelog --- .changelog/43925.txt | 3 +++ internal/service/imagebuilder/lifecycle_policy_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 .changelog/43925.txt diff --git a/.changelog/43925.txt b/.changelog/43925.txt new file mode 100644 index 000000000000..185ed94b84db --- /dev/null +++ b/.changelog/43925.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error +``` diff --git a/internal/service/imagebuilder/lifecycle_policy_test.go b/internal/service/imagebuilder/lifecycle_policy_test.go index ba774d29fa1e..f31c54b2c79f 100644 --- a/internal/service/imagebuilder/lifecycle_policy_test.go +++ b/internal/service/imagebuilder/lifecycle_policy_test.go @@ -131,7 +131,7 @@ func TestAccImageBuilderLifecyclePolicy_policyDetails(t *testing.T) { }) } -func TestAccImageBuilderLifecyclePolicy_policyDetailsExclusionRulesAmisIsPublic(t *testing.T) { +func TestAccImageBuilderLifecyclePolicy_policyDetailsExclusionRulesAMIsIsPublic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_imagebuilder_lifecycle_policy.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -143,7 +143,7 @@ func TestAccImageBuilderLifecyclePolicy_policyDetailsExclusionRulesAmisIsPublic( CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAmisIsPublic(rName), + Config: testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAMIsIsPublic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLifecyclePolicyExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "policy_detail.#", "1"), @@ -492,7 +492,7 @@ resource "aws_imagebuilder_lifecycle_policy" "test" { `, rName)) } -func testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAmisIsPublic(rName string) string { +func testAccLifecyclePolicyConfig_policyDetailsExclusionRulesAMIsIsPublic(rName string) string { return acctest.ConfigCompose(testAccLifecyclePolicyConfig_base(rName), fmt.Sprintf(` resource "aws_imagebuilder_lifecycle_policy" "test" { name = %[1]q @@ -509,7 +509,7 @@ resource "aws_imagebuilder_lifecycle_policy" "test" { } exclusion_rules { amis { - regions = [data.aws_region.current.region] + regions = [data.aws_region.current.region] last_launched { unit = "WEEKS" value = 2 From 06ab3143d2e0914559dee06457c51c16390edab5 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:00:11 +0900 Subject: [PATCH 0227/2115] fix to accept empty email_mfa_configuration block --- internal/service/cognitoidp/user_pool.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/service/cognitoidp/user_pool.go b/internal/service/cognitoidp/user_pool.go index 610459af5eef..ce23053178f8 100644 --- a/internal/service/cognitoidp/user_pool.go +++ b/internal/service/cognitoidp/user_pool.go @@ -879,7 +879,7 @@ func resourceUserPoolCreate(ctx context.Context, d *schema.ResourceData, meta an input.SoftwareTokenMfaConfiguration = expandSoftwareTokenMFAConfigType(d.Get("software_token_mfa_configuration").([]any)) } - if v := d.Get("email_mfa_configuration").([]any); len(v) > 0 && v[0] != nil { + if v, ok := d.Get("email_mfa_configuration").([]any); ok && len(v) > 0 { input.EmailMfaConfiguration = expandEmailMFAConfigType(v) } @@ -1356,10 +1356,14 @@ func findUserPoolMFAConfigByID(ctx context.Context, conn *cognitoidentityprovide } func expandEmailMFAConfigType(tfList []any) *awstypes.EmailMfaConfigType { - if len(tfList) == 0 || tfList[0] == nil { + if len(tfList) == 0 { return nil } + if tfList[0] == nil { + return &awstypes.EmailMfaConfigType{} + } + tfMap := tfList[0].(map[string]any) apiObject := &awstypes.EmailMfaConfigType{} From 5ca66ed7adcbe9810f9e92f066db3105b85867f2 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:01:00 +0900 Subject: [PATCH 0228/2115] Add a test case to ensure empty email_mfa_configuration can be accepted --- internal/service/cognitoidp/user_pool_test.go | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/internal/service/cognitoidp/user_pool_test.go b/internal/service/cognitoidp/user_pool_test.go index b4e4a885df1f..997e8d53363b 100644 --- a/internal/service/cognitoidp/user_pool_test.go +++ b/internal/service/cognitoidp/user_pool_test.go @@ -668,11 +668,25 @@ func TestAccCognitoIDPUserPool_MFA_emailConfigurationMFA(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckUserPoolDestroy(ctx), Steps: []resource.TestStep{ + { + Config: testAccUserPoolConfig_mfaEmailConfigurationEmptyConfiguration(rName, replyTo, sourceARN, emailTo, "DEVELOPER"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckUserPoolExists(ctx, resourceName, &pool), + resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "ON"), + resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "1"), + resource.TestCheckNoResourceAttr(resourceName, "email_mfa_configuration.0.message"), + resource.TestCheckNoResourceAttr(resourceName, "email_mfa_configuration.0.subject"), + ), + }, { Config: testAccUserPoolConfig_mfaEmailConfigurationConfigurationEnabled(rName, true, message, subject, replyTo, sourceARN, emailTo, "DEVELOPER"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolExists(ctx, resourceName, &pool), resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "ON"), + resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.0.message", message), resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.0.subject", subject), ), @@ -682,6 +696,8 @@ func TestAccCognitoIDPUserPool_MFA_emailConfigurationMFA(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolExists(ctx, resourceName, &pool), resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "ON"), + resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.0.message", updatedMessage), resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.0.subject", updatedSubject), ), @@ -2474,6 +2490,44 @@ resource "aws_cognito_user_pool" "test" { `, rName, enabled, message, subject, email, arn, from, account) } +func testAccUserPoolConfig_mfaEmailConfigurationEmptyConfiguration(rName string, email, arn, from, account string) string { + return fmt.Sprintf(` +resource "aws_ses_configuration_set" "test" { + name = %[1]q + + delivery_options { + tls_policy = "Optional" + } +} + +resource "aws_cognito_user_pool" "test" { + mfa_configuration = "ON" + name = %[1]q + + email_configuration { + reply_to_email_address = %[2]q + source_arn = %[3]q + from_email_address = %[4]q + email_sending_account = %[5]q + configuration_set = aws_ses_configuration_set.test.name + } + + account_recovery_setting { + recovery_mechanism { + name = "verified_email" + priority = 1 + } + recovery_mechanism { + name = "verified_phone_number" + priority = 2 + } + } + + email_mfa_configuration {} +} +`, rName, email, arn, from, account) +} + func testAccUserPoolConfig_passwordHistorySize(rName string, passwordHistorySize int) string { return fmt.Sprintf(` resource "aws_cognito_user_pool" "test" { From eaabeaefed52768f89a64dc0ec851f993c0f52e2 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:01:56 +0900 Subject: [PATCH 0229/2115] Add checks for email_mfa_configuration.# --- internal/service/cognitoidp/user_pool_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/service/cognitoidp/user_pool_test.go b/internal/service/cognitoidp/user_pool_test.go index 997e8d53363b..869878e394a1 100644 --- a/internal/service/cognitoidp/user_pool_test.go +++ b/internal/service/cognitoidp/user_pool_test.go @@ -477,6 +477,7 @@ func TestAccCognitoIDPUserPool_MFA_sms(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.0.external_id", "test"), resource.TestCheckResourceAttrPair(resourceName, "sms_configuration.0.sns_caller_arn", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -490,6 +491,7 @@ func TestAccCognitoIDPUserPool_MFA_sms(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "OFF"), resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -500,6 +502,7 @@ func TestAccCognitoIDPUserPool_MFA_sms(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.0.external_id", "test"), resource.TestCheckResourceAttrPair(resourceName, "sms_configuration.0.sns_caller_arn", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, }, @@ -529,6 +532,7 @@ func TestAccCognitoIDPUserPool_MFA_smsAndSoftwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "sms_configuration.0.sns_caller_arn", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.0.enabled", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -545,6 +549,7 @@ func TestAccCognitoIDPUserPool_MFA_smsAndSoftwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "sms_configuration.0.sns_caller_arn", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -553,6 +558,7 @@ func TestAccCognitoIDPUserPool_MFA_smsAndSoftwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "OFF"), resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, }, @@ -581,6 +587,7 @@ func TestAccCognitoIDPUserPool_MFA_smsToSoftwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.0.external_id", "test"), resource.TestCheckResourceAttrPair(resourceName, "sms_configuration.0.sns_caller_arn", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -595,6 +602,7 @@ func TestAccCognitoIDPUserPool_MFA_smsToSoftwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, }, @@ -621,6 +629,7 @@ func TestAccCognitoIDPUserPool_MFA_softwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -634,6 +643,7 @@ func TestAccCognitoIDPUserPool_MFA_softwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "mfa_configuration", "OFF"), resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, { @@ -643,6 +653,7 @@ func TestAccCognitoIDPUserPool_MFA_softwareTokenMFA(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "sms_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "software_token_mfa_configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "email_mfa_configuration.#", "0"), ), }, }, From 5c7b479f997b9323073dc050ce193d5fcc3963c9 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:02:28 +0900 Subject: [PATCH 0230/2115] Add email_mfa_configuration as one of the required arguments --- website/docs/r/cognito_user_pool.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cognito_user_pool.html.markdown b/website/docs/r/cognito_user_pool.html.markdown index 9a195017a094..d88314293852 100644 --- a/website/docs/r/cognito_user_pool.html.markdown +++ b/website/docs/r/cognito_user_pool.html.markdown @@ -78,7 +78,7 @@ This resource supports the following arguments: * `email_verification_message` - (Optional) String representing the email verification message. Conflicts with `verification_message_template` configuration block `email_message` argument. * `email_verification_subject` - (Optional) String representing the email verification subject. Conflicts with `verification_message_template` configuration block `email_subject` argument. * `lambda_config` - (Optional) Configuration block for the AWS Lambda triggers associated with the user pool. [Detailed below](#lambda_config). -* `mfa_configuration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `sms_configuration` or `software_token_mfa_configuration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `sms_configuration` or `software_token_mfa_configuration` to be configured). +* `mfa_configuration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `email_mfa_configuration`, `sms_configuration` or `software_token_mfa_configuration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `email_mfa_configuration`, `sms_configuration` or `software_token_mfa_configuration` to be configured). * `password_policy` - (Optional) Configuration block for information about the user pool password policy. [Detailed below](#password_policy). * `schema` - (Optional) Configuration block for the schema attributes of a user pool. [Detailed below](#schema). Schema attributes from the [standard attribute set](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-settings-attributes.html#cognito-user-pools-standard-attributes) only need to be specified if they are different from the default configuration. Attributes can be added, but not modified or removed. Maximum of 50 attributes. * `sign_in_policy` - (Optional) Configuration block for information about the user pool sign in policy. [Detailed below](#sign_in_policy). From f9835e4938bd03e46202aee4acdd98fc2dbc3e59 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:19:12 +0900 Subject: [PATCH 0231/2115] add changelog --- .changelog/43926.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43926.txt diff --git a/.changelog/43926.txt b/.changelog/43926.txt new file mode 100644 index 000000000000..d017e0830deb --- /dev/null +++ b/.changelog/43926.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_cognito_user_pool: Fixed to accept an empty `email_mfa_configuration` block +``` From 628b7bd7700d8d7a9f4e26c3e8dd9f209bb2ec7f Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 03:35:38 +0900 Subject: [PATCH 0232/2115] Add effectiveness conditions to the documentation --- website/docs/r/cognito_user_pool.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/cognito_user_pool.html.markdown b/website/docs/r/cognito_user_pool.html.markdown index d88314293852..d41a179d3923 100644 --- a/website/docs/r/cognito_user_pool.html.markdown +++ b/website/docs/r/cognito_user_pool.html.markdown @@ -74,7 +74,7 @@ This resource supports the following arguments: * `deletion_protection` - (Optional) When active, DeletionProtection prevents accidental deletion of your user pool. Before you can delete a user pool that you have protected against deletion, you must deactivate this feature. Valid values are `ACTIVE` and `INACTIVE`, Default value is `INACTIVE`. * `device_configuration` - (Optional) Configuration block for the user pool's device tracking. [Detailed below](#device_configuration). * `email_configuration` - (Optional) Configuration block for configuring email. [Detailed below](#email_configuration). -* `email_mfa_configuration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `account_recovery_setting` entries; requires an `email_configuration` configuration block. [Detailed below](#email_mfa_configuration). +* `email_mfa_configuration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `account_recovery_setting` entries; requires an `email_configuration` configuration block. Effective only when `mfa_configuration` is `ON` or `OPTIONAL`. [Detailed below](#email_mfa_configuration). * `email_verification_message` - (Optional) String representing the email verification message. Conflicts with `verification_message_template` configuration block `email_message` argument. * `email_verification_subject` - (Optional) String representing the email verification subject. Conflicts with `verification_message_template` configuration block `email_subject` argument. * `lambda_config` - (Optional) Configuration block for the AWS Lambda triggers associated with the user pool. [Detailed below](#lambda_config). @@ -83,9 +83,9 @@ This resource supports the following arguments: * `schema` - (Optional) Configuration block for the schema attributes of a user pool. [Detailed below](#schema). Schema attributes from the [standard attribute set](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-settings-attributes.html#cognito-user-pools-standard-attributes) only need to be specified if they are different from the default configuration. Attributes can be added, but not modified or removed. Maximum of 50 attributes. * `sign_in_policy` - (Optional) Configuration block for information about the user pool sign in policy. [Detailed below](#sign_in_policy). * `sms_authentication_message` - (Optional) String representing the SMS authentication message. The Message must contain the `{####}` placeholder, which will be replaced with the code. -* `sms_configuration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). +* `sms_configuration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). SMS MFA is activated only when `mfa_configuration` is set to `ON` or `OPTIONAL` along with this block. Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). * `sms_verification_message` - (Optional) String representing the SMS verification message. Conflicts with `verification_message_template` configuration block `sms_message` argument. -* `software_token_mfa_configuration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. [Detailed below](#software_token_mfa_configuration). +* `software_token_mfa_configuration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. Effective only when `mfa_configuration` is `ON` or `OPTIONAL`. [Detailed below](#software_token_mfa_configuration). * `tags` - (Optional) Map of tags to assign to the User Pool. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `user_attribute_update_settings` - (Optional) Configuration block for user attribute update settings. [Detailed below](#user_attribute_update_settings). * `user_pool_add_ons` - (Optional) Configuration block for user pool add-ons to enable user pool advanced security mode features. [Detailed below](#user_pool_add_ons). From 12fe54b83eeeea7441ab5cc23084cad643e82aac Mon Sep 17 00:00:00 2001 From: team-tf-cdk Date: Mon, 18 Aug 2025 00:25:55 +0000 Subject: [PATCH 0233/2115] cdktf: update index.html.markdown,r/xray_sampling_rule.html.markdown,r/xray_resource_policy.html.markdown,r/xray_group.html.markdown,r/xray_encryption_config.html.markdown,r/workspacesweb_user_settings.html.markdown,r/workspacesweb_user_access_logging_settings.html.markdown,r/workspacesweb_network_settings.html.markdown,r/workspacesweb_ip_access_settings.html.markdown,r/workspacesweb_data_protection_settings.html.markdown,r/workspacesweb_browser_settings.html.markdown,r/workspaces_workspace.html.markdown,r/workspaces_ip_group.html.markdown,r/workspaces_directory.html.markdown,r/workspaces_connection_alias.html.markdown,r/wafv2_web_acl_rule_group_association.html.markdown,r/wafv2_web_acl_logging_configuration.html.markdown,r/wafv2_web_acl_association.html.markdown,r/wafv2_web_acl.html.markdown,r/wafv2_rule_group.html.markdown,r/wafv2_regex_pattern_set.html.markdown,r/wafv2_ip_set.html.markdown,r/wafv2_api_key.html.markdown,r/wafregional_xss_match_set.html.markdown,r/wafregional_web_acl_association.html.markdown,r/wafregional_web_acl.html.markdown,r/wafregional_sql_injection_match_set.html.markdown,r/wafregional_size_constraint_set.html.markdown,r/wafregional_rule_group.html.markdown,r/wafregional_rule.html.markdown,r/wafregional_regex_pattern_set.html.markdown,r/wafregional_regex_match_set.html.markdown,r/wafregional_rate_based_rule.html.markdown,r/wafregional_ipset.html.markdown,r/wafregional_geo_match_set.html.markdown,r/wafregional_byte_match_set.html.markdown,r/waf_xss_match_set.html.markdown,r/waf_web_acl.html.markdown,r/waf_sql_injection_match_set.html.markdown,r/waf_size_constraint_set.html.markdown,r/waf_rule_group.html.markdown,r/waf_rule.html.markdown,r/waf_regex_pattern_set.html.markdown,r/waf_regex_match_set.html.markdown,r/waf_rate_based_rule.html.markdown,r/waf_ipset.html.markdown,r/waf_geo_match_set.html.markdown,r/waf_byte_match_set.html.markdown,r/vpn_gateway_route_propagation.html.markdown,r/vpn_gateway_attachment.html.markdown,r/vpn_gateway.html.markdown,r/vpn_connection_route.html.markdown,r/vpn_connection.html.markdown,r/vpclattice_target_group_attachment.html.markdown,r/vpclattice_target_group.html.markdown,r/vpclattice_service_network_vpc_association.html.markdown,r/vpclattice_service_network_service_association.html.markdown,r/vpclattice_service_network_resource_association.html.markdown,r/vpclattice_service_network.html.markdown,r/vpclattice_service.html.markdown,r/vpclattice_resource_policy.html.markdown,r/vpclattice_resource_gateway.html.markdown,r/vpclattice_resource_configuration.html.markdown,r/vpclattice_listener_rule.html.markdown,r/vpclattice_listener.html.markdown,r/vpclattice_auth_policy.html.markdown,r/vpclattice_access_log_subscription.html.markdown,r/vpc_security_group_vpc_association.html.markdown,r/vpc_security_group_ingress_rule.html.markdown,r/vpc_security_group_egress_rule.html.markdown,r/vpc_route_server_vpc_association.html.markdown,r/vpc_route_server_propagation.html.markdown,r/vpc_route_server_peer.html.markdown,r/vpc_route_server_endpoint.html.markdown,r/vpc_route_server.html.markdown,r/vpc_peering_connection_options.html.markdown,r/vpc_peering_connection_accepter.html.markdown,r/vpc_peering_connection.html.markdown,r/vpc_network_performance_metric_subscription.html.markdown,r/vpc_ipv6_cidr_block_association.html.markdown,r/vpc_ipv4_cidr_block_association.html.markdown,r/vpc_ipam_scope.html.markdown,r/vpc_ipam_resource_discovery_association.html.markdown,r/vpc_ipam_resource_discovery.html.markdown,r/vpc_ipam_preview_next_cidr.html.markdown,r/vpc_ipam_pool_cidr_allocation.html.markdown,r/vpc_ipam_pool_cidr.html.markdown,r/vpc_ipam_pool.html.markdown,r/vpc_ipam_organization_admin_account.html.markdown,r/vpc_ipam.html.markdown,r/vpc_endpoint_subnet_association.html.markdown,r/vpc_endpoint_service_private_dns_verification.html.markdown,r/vpc_endpoint_service_allowed_principal.html.markdown,r/vpc_endpoint_service.html.markdown,r/vpc_endpoint_security_group_association.html.markdown,r/vpc_endpoint_route_table_association.html.markdown,r/vpc_endpoint_private_dns.html.markdown,r/vpc_endpoint_policy.html.markdown,r/vpc_endpoint_connection_notification.html.markdown,r/vpc_endpoint_connection_accepter.html.markdown,r/vpc_endpoint.html.markdown,r/vpc_dhcp_options_association.html.markdown,r/vpc_dhcp_options.html.markdown,r/vpc_block_public_access_options.html.markdown,r/vpc_block_public_access_exclusion.html.markdown,r/vpc.html.markdown,r/volume_attachment.html.markdown,r/verifiedpermissions_schema.html.markdown,r/verifiedpermissions_policy_template.html.markdown,r/verifiedpermissions_policy_store.html.markdown,r/verifiedpermissions_policy.html.markdown,r/verifiedpermissions_identity_source.html.markdown,r/verifiedaccess_trust_provider.html.markdown,r/verifiedaccess_instance_trust_provider_attachment.html.markdown,r/verifiedaccess_instance_logging_configuration.html.markdown,r/verifiedaccess_instance.html.markdown,r/verifiedaccess_group.html.markdown,r/verifiedaccess_endpoint.html.markdown,r/transfer_workflow.html.markdown,r/transfer_user.html.markdown,r/transfer_tag.html.markdown,r/transfer_ssh_key.html.markdown,r/transfer_server.html.markdown,r/transfer_profile.html.markdown,r/transfer_connector.html.markdown,r/transfer_certificate.html.markdown,r/transfer_agreement.html.markdown,r/transfer_access.html.markdown,r/transcribe_vocabulary_filter.html.markdown,r/transcribe_vocabulary.html.markdown,r/transcribe_medical_vocabulary.html.markdown,r/transcribe_language_model.html.markdown,r/timestreamwrite_table.html.markdown,r/timestreamwrite_database.html.markdown,r/timestreamquery_scheduled_query.html.markdown,r/timestreaminfluxdb_db_instance.html.markdown,r/synthetics_group_association.html.markdown,r/synthetics_group.html.markdown,r/synthetics_canary.html.markdown,r/swf_domain.html.markdown,r/subnet.html.markdown,r/storagegateway_working_storage.html.markdown,r/storagegateway_upload_buffer.html.markdown,r/storagegateway_tape_pool.html.markdown,r/storagegateway_stored_iscsi_volume.html.markdown,r/storagegateway_smb_file_share.html.markdown,r/storagegateway_nfs_file_share.html.markdown,r/storagegateway_gateway.html.markdown,r/storagegateway_file_system_association.html.markdown,r/storagegateway_cached_iscsi_volume.html.markdown,r/storagegateway_cache.html.markdown,r/ssoadmin_trusted_token_issuer.html.markdown,r/ssoadmin_permissions_boundary_attachment.html.markdown,r/ssoadmin_permission_set_inline_policy.html.markdown,r/ssoadmin_permission_set.html.markdown,r/ssoadmin_managed_policy_attachment.html.markdown,r/ssoadmin_instance_access_control_attributes.html.markdown,r/ssoadmin_customer_managed_policy_attachment.html.markdown,r/ssoadmin_application_assignment_configuration.html.markdown,r/ssoadmin_application_assignment.html.markdown,r/ssoadmin_application_access_scope.html.markdown,r/ssoadmin_application.html.markdown,r/ssoadmin_account_assignment.html.markdown,r/ssmquicksetup_configuration_manager.html.markdown,r/ssmincidents_response_plan.html.markdown,r/ssmincidents_replication_set.html.markdown,r/ssmcontacts_rotation.html.markdown,r/ssmcontacts_plan.html.markdown,r/ssmcontacts_contact_channel.html.markdown,r/ssmcontacts_contact.html.markdown,r/ssm_service_setting.html.markdown,r/ssm_resource_data_sync.html.markdown,r/ssm_patch_group.html.markdown,r/ssm_patch_baseline.html.markdown,r/ssm_parameter.html.markdown,r/ssm_maintenance_window_task.html.markdown,r/ssm_maintenance_window_target.html.markdown,r/ssm_maintenance_window.html.markdown,r/ssm_document.html.markdown,r/ssm_default_patch_baseline.html.markdown,r/ssm_association.html.markdown,r/ssm_activation.html.markdown,r/sqs_queue_redrive_policy.html.markdown,r/sqs_queue_redrive_allow_policy.html.markdown,r/sqs_queue_policy.html.markdown,r/sqs_queue.html.markdown,r/spot_instance_request.html.markdown,r/spot_fleet_request.html.markdown,r/spot_datafeed_subscription.html.markdown,r/sns_topic_subscription.html.markdown,r/sns_topic_policy.html.markdown,r/sns_topic_data_protection_policy.html.markdown,r/sns_topic.html.markdown,r/sns_sms_preferences.html.markdown,r/sns_platform_application.html.markdown,r/snapshot_create_volume_permission.html.markdown,r/signer_signing_profile_permission.html.markdown,r/signer_signing_profile.html.markdown,r/signer_signing_job.html.markdown,r/shield_subscription.html.markdown,r/shield_protection_health_check_association.html.markdown,r/shield_protection_group.html.markdown,r/shield_protection.html.markdown,r/shield_proactive_engagement.html.markdown,r/shield_drt_access_role_arn_association.html.markdown,r/shield_drt_access_log_bucket_association.html.markdown,r/shield_application_layer_automatic_response.html.markdown,r/sfn_state_machine.html.markdown,r/sfn_alias.html.markdown,r/sfn_activity.html.markdown,r/sesv2_email_identity_policy.html.markdown,r/sesv2_email_identity_mail_from_attributes.html.markdown,r/sesv2_email_identity_feedback_attributes.html.markdown,r/sesv2_email_identity.html.markdown,r/sesv2_dedicated_ip_pool.html.markdown,r/sesv2_dedicated_ip_assignment.html.markdown,r/sesv2_contact_list.html.markdown,r/sesv2_configuration_set_event_destination.html.markdown,r/sesv2_configuration_set.html.markdown,r/sesv2_account_vdm_attributes.html.markdown,r/sesv2_account_suppression_attributes.html.markdown,r/ses_template.html.markdown,r/ses_receipt_rule_set.html.markdown,r/ses_receipt_rule.html.markdown,r/ses_receipt_filter.html.markdown,r/ses_identity_policy.html.markdown,r/ses_identity_notification_topic.html.markdown,r/ses_event_destination.html.markdown,r/ses_email_identity.html.markdown,r/ses_domain_mail_from.html.markdown,r/ses_domain_identity_verification.html.markdown,r/ses_domain_identity.html.markdown,r/ses_domain_dkim.html.markdown,r/ses_configuration_set.html.markdown,r/ses_active_receipt_rule_set.html.markdown,r/servicequotas_template_association.html.markdown,r/servicequotas_template.html.markdown,r/servicequotas_service_quota.html.markdown,r/servicecatalogappregistry_attribute_group_association.html.markdown,r/servicecatalogappregistry_attribute_group.html.markdown,r/servicecatalogappregistry_application.html.markdown,r/servicecatalog_tag_option_resource_association.html.markdown,r/servicecatalog_tag_option.html.markdown,r/servicecatalog_service_action.html.markdown,r/servicecatalog_provisioning_artifact.html.markdown,r/servicecatalog_provisioned_product.html.markdown,r/servicecatalog_product_portfolio_association.html.markdown,r/servicecatalog_product.html.markdown,r/servicecatalog_principal_portfolio_association.html.markdown,r/servicecatalog_portfolio_share.html.markdown,r/servicecatalog_portfolio.html.markdown,r/servicecatalog_organizations_access.html.markdown,r/servicecatalog_constraint.html.markdown,r/servicecatalog_budget_resource_association.html.markdown,r/service_discovery_service.html.markdown,r/service_discovery_public_dns_namespace.html.markdown,r/service_discovery_private_dns_namespace.html.markdown,r/service_discovery_instance.html.markdown,r/service_discovery_http_namespace.html.markdown,r/serverlessapplicationrepository_cloudformation_stack.html.markdown,r/securitylake_subscriber_notification.html.markdown,r/securitylake_subscriber.html.markdown,r/securitylake_data_lake.html.markdown,r/securitylake_custom_log_source.html.markdown,r/securitylake_aws_log_source.html.markdown,r/securityhub_standards_subscription.html.markdown,r/securityhub_standards_control_association.html.markdown,r/securityhub_standards_control.html.markdown,r/securityhub_product_subscription.html.markdown,r/securityhub_organization_configuration.html.markdown,r/securityhub_organization_admin_account.html.markdown,r/securityhub_member.html.markdown,r/securityhub_invite_accepter.html.markdown,r/securityhub_insight.html.markdown,r/securityhub_finding_aggregator.html.markdown,r/securityhub_configuration_policy_association.markdown,r/securityhub_configuration_policy.html.markdown,r/securityhub_automation_rule.html.markdown,r/securityhub_action_target.html.markdown,r/securityhub_account.html.markdown,r/security_group_rule.html.markdown,r/security_group.html.markdown,r/secretsmanager_secret_version.html.markdown,r/secretsmanager_secret_rotation.html.markdown,r/secretsmanager_secret_policy.html.markdown,r/secretsmanager_secret.html.markdown,r/schemas_schema.html.markdown,r/schemas_registry_policy.html.markdown,r/schemas_registry.html.markdown,r/schemas_discoverer.html.markdown,r/scheduler_schedule_group.html.markdown,r/scheduler_schedule.html.markdown,r/sagemaker_workteam.html.markdown,r/sagemaker_workforce.html.markdown,r/sagemaker_user_profile.html.markdown,r/sagemaker_studio_lifecycle_config.html.markdown,r/sagemaker_space.html.markdown,r/sagemaker_servicecatalog_portfolio_status.html.markdown,r/sagemaker_project.html.markdown,r/sagemaker_pipeline.html.markdown,r/sagemaker_notebook_instance_lifecycle_configuration.html.markdown,r/sagemaker_notebook_instance.html.markdown,r/sagemaker_monitoring_schedule.html.markdown,r/sagemaker_model_package_group_policy.html.markdown,r/sagemaker_model_package_group.html.markdown,r/sagemaker_model.html.markdown,r/sagemaker_mlflow_tracking_server.html.markdown,r/sagemaker_image_version.html.markdown,r/sagemaker_image.html.markdown,r/sagemaker_human_task_ui.html.markdown,r/sagemaker_hub.html.markdown,r/sagemaker_flow_definition.html.markdown,r/sagemaker_feature_group.html.markdown,r/sagemaker_endpoint_configuration.html.markdown,r/sagemaker_endpoint.html.markdown,r/sagemaker_domain.html.markdown,r/sagemaker_device_fleet.html.markdown,r/sagemaker_device.html.markdown,r/sagemaker_data_quality_job_definition.html.markdown,r/sagemaker_code_repository.html.markdown,r/sagemaker_app_image_config.html.markdown,r/sagemaker_app.html.markdown,r/s3tables_table_policy.html.markdown,r/s3tables_table_bucket_policy.html.markdown,r/s3tables_table_bucket.html.markdown,r/s3tables_table.html.markdown,r/s3tables_namespace.html.markdown,r/s3outposts_endpoint.html.markdown,r/s3control_storage_lens_configuration.html.markdown,r/s3control_object_lambda_access_point_policy.html.markdown,r/s3control_object_lambda_access_point.html.markdown,r/s3control_multi_region_access_point_policy.html.markdown,r/s3control_multi_region_access_point.html.markdown,r/s3control_directory_bucket_access_point_scope.html.markdown,r/s3control_bucket_policy.html.markdown,r/s3control_bucket_lifecycle_configuration.html.markdown,r/s3control_bucket.html.markdown,r/s3control_access_point_policy.html.markdown,r/s3control_access_grants_location.html.markdown,r/s3control_access_grants_instance_resource_policy.html.markdown,r/s3control_access_grants_instance.html.markdown,r/s3control_access_grant.html.markdown,r/s3_object_copy.html.markdown,r/s3_object.html.markdown,r/s3_directory_bucket.html.markdown,r/s3_bucket_website_configuration.html.markdown,r/s3_bucket_versioning.html.markdown,r/s3_bucket_server_side_encryption_configuration.html.markdown,r/s3_bucket_request_payment_configuration.html.markdown,r/s3_bucket_replication_configuration.html.markdown,r/s3_bucket_public_access_block.html.markdown,r/s3_bucket_policy.html.markdown,r/s3_bucket_ownership_controls.html.markdown,r/s3_bucket_object_lock_configuration.html.markdown,r/s3_bucket_object.html.markdown,r/s3_bucket_notification.html.markdown,r/s3_bucket_metric.html.markdown,r/s3_bucket_metadata_configuration.html.markdown,r/s3_bucket_logging.html.markdown,r/s3_bucket_lifecycle_configuration.html.markdown,r/s3_bucket_inventory.html.markdown,r/s3_bucket_intelligent_tiering_configuration.html.markdown,r/s3_bucket_cors_configuration.html.markdown,r/s3_bucket_analytics_configuration.html.markdown,r/s3_bucket_acl.html.markdown,r/s3_bucket_accelerate_configuration.html.markdown,r/s3_bucket.html.markdown,r/s3_account_public_access_block.html.markdown,r/s3_access_point.html.markdown,r/rum_metrics_destination.html.markdown,r/rum_app_monitor.html.markdown,r/route_table_association.html.markdown,r/route_table.html.markdown,r/route53recoveryreadiness_resource_set.html.markdown,r/route53recoveryreadiness_recovery_group.html.markdown,r/route53recoveryreadiness_readiness_check.html.markdown,r/route53recoveryreadiness_cell.html.markdown,r/route53recoverycontrolconfig_safety_rule.html.markdown,r/route53recoverycontrolconfig_routing_control.html.markdown,r/route53recoverycontrolconfig_control_panel.html.markdown,r/route53recoverycontrolconfig_cluster.html.markdown,r/route53profiles_resource_association.html.markdown,r/route53profiles_profile.html.markdown,r/route53profiles_association.html.markdown,r/route53domains_registered_domain.html.markdown,r/route53domains_domain.html.markdown,r/route53domains_delegation_signer_record.html.markdown,r/route53_zone_association.html.markdown,r/route53_zone.html.markdown,r/route53_vpc_association_authorization.html.markdown,r/route53_traffic_policy_instance.html.markdown,r/route53_traffic_policy.html.markdown,r/route53_resolver_rule_association.html.markdown,r/route53_resolver_rule.html.markdown,r/route53_resolver_query_log_config_association.html.markdown,r/route53_resolver_query_log_config.html.markdown,r/route53_resolver_firewall_rule_group_association.html.markdown,r/route53_resolver_firewall_rule_group.html.markdown,r/route53_resolver_firewall_rule.html.markdown,r/route53_resolver_firewall_domain_list.html.markdown,r/route53_resolver_firewall_config.html.markdown,r/route53_resolver_endpoint.html.markdown,r/route53_resolver_dnssec_config.html.markdown,r/route53_resolver_config.html.markdown,r/route53_records_exclusive.html.markdown,r/route53_record.html.markdown,r/route53_query_log.html.markdown,r/route53_key_signing_key.html.markdown,r/route53_hosted_zone_dnssec.html.markdown,r/route53_health_check.html.markdown,r/route53_delegation_set.html.markdown,r/route53_cidr_location.html.markdown,r/route53_cidr_collection.html.markdown,r/route.html.markdown,r/rolesanywhere_trust_anchor.html.markdown,r/rolesanywhere_profile.html.markdown,r/resourcegroups_resource.html.markdown,r/resourcegroups_group.html.markdown,r/resourceexplorer2_view.html.markdown,r/resourceexplorer2_index.html.markdown,r/resiliencehub_resiliency_policy.html.markdown,r/rekognition_stream_processor.html.markdown,r/rekognition_project.html.markdown,r/rekognition_collection.html.markdown,r/redshiftserverless_workgroup.html.markdown,r/redshiftserverless_usage_limit.html.markdown,r/redshiftserverless_snapshot.html.markdown,r/redshiftserverless_resource_policy.html.markdown,r/redshiftserverless_namespace.html.markdown,r/redshiftserverless_endpoint_access.html.markdown,r/redshiftserverless_custom_domain_association.html.markdown,r/redshiftdata_statement.html.markdown,r/redshift_usage_limit.html.markdown,r/redshift_subnet_group.html.markdown,r/redshift_snapshot_schedule_association.html.markdown,r/redshift_snapshot_schedule.html.markdown,r/redshift_snapshot_copy_grant.html.markdown,r/redshift_snapshot_copy.html.markdown,r/redshift_scheduled_action.html.markdown,r/redshift_resource_policy.html.markdown,r/redshift_partner.html.markdown,r/redshift_parameter_group.html.markdown,r/redshift_logging.html.markdown,r/redshift_integration.html.markdown,r/redshift_hsm_configuration.html.markdown,r/redshift_hsm_client_certificate.html.markdown,r/redshift_event_subscription.html.markdown,r/redshift_endpoint_authorization.html.markdown,r/redshift_endpoint_access.html.markdown,r/redshift_data_share_consumer_association.html.markdown,r/redshift_data_share_authorization.html.markdown,r/redshift_cluster_snapshot.html.markdown,r/redshift_cluster_iam_roles.html.markdown,r/redshift_cluster.html.markdown,r/redshift_authentication_profile.html.markdown,r/rds_shard_group.html.markdown,r/rds_reserved_instance.html.markdown,r/rds_integration.html.markdown,r/rds_instance_state.html.markdown,r/rds_global_cluster.html.markdown,r/rds_export_task.html.markdown,r/rds_custom_db_engine_version.markdown,r/rds_cluster_snapshot_copy.html.markdown,r/rds_cluster_role_association.html.markdown,r/rds_cluster_parameter_group.html.markdown,r/rds_cluster_instance.html.markdown,r/rds_cluster_endpoint.html.markdown,r/rds_cluster_activity_stream.html.markdown,r/rds_cluster.html.markdown,r/rds_certificate.html.markdown,r/rbin_rule.html.markdown,r/ram_sharing_with_organization.html.markdown,r/ram_resource_share_accepter.html.markdown,r/ram_resource_share.html.markdown,r/ram_resource_association.html.markdown,r/ram_principal_association.html.markdown,r/quicksight_vpc_connection.html.markdown,r/quicksight_user_custom_permission.html.markdown,r/quicksight_user.html.markdown,r/quicksight_theme.html.markdown,r/quicksight_template_alias.html.markdown,r/quicksight_template.html.markdown,r/quicksight_role_membership.html.markdown,r/quicksight_role_custom_permission.html.markdown,r/quicksight_refresh_schedule.html.markdown,r/quicksight_namespace.html.markdown,r/quicksight_key_registration.html.markdown,r/quicksight_ip_restriction.html.markdown,r/quicksight_ingestion.html.markdown,r/quicksight_iam_policy_assignment.html.markdown,r/quicksight_group_membership.html.markdown,r/quicksight_group.html.markdown,r/quicksight_folder_membership.html.markdown,r/quicksight_folder.html.markdown,r/quicksight_data_source.html.markdown,r/quicksight_data_set.html.markdown,r/quicksight_dashboard.html.markdown,r/quicksight_custom_permissions.html.markdown,r/quicksight_analysis.html.markdown,r/quicksight_account_subscription.html.markdown,r/quicksight_account_settings.html.markdown,r/qldb_stream.html.markdown,r/qldb_ledger.html.markdown,r/qbusiness_application.html.markdown,r/proxy_protocol_policy.html.markdown,r/prometheus_workspace_configuration.html.markdown,r/prometheus_workspace.html.markdown,r/prometheus_scraper.html.markdown,r/prometheus_rule_group_namespace.html.markdown,r/prometheus_query_logging_configuration.html.markdown,r/prometheus_alert_manager_definition.html.markdown,r/placement_group.html.markdown,r/pipes_pipe.html.markdown,r/pinpointsmsvoicev2_phone_number.html.markdown,r/pinpointsmsvoicev2_opt_out_list.html.markdown,r/pinpointsmsvoicev2_configuration_set.html.markdown,r/pinpoint_sms_channel.html.markdown,r/pinpoint_gcm_channel.html.markdown,r/pinpoint_event_stream.html.markdown,r/pinpoint_email_template.markdown,r/pinpoint_email_channel.html.markdown,r/pinpoint_baidu_channel.html.markdown,r/pinpoint_app.html.markdown,r/pinpoint_apns_voip_sandbox_channel.html.markdown,r/pinpoint_apns_voip_channel.html.markdown,r/pinpoint_apns_sandbox_channel.html.markdown,r/pinpoint_apns_channel.html.markdown,r/pinpoint_adm_channel.html.markdown,r/paymentcryptography_key_alias.html.markdown,r/paymentcryptography_key.html.markdown,r/osis_pipeline.html.markdown,r/organizations_resource_policy.html.markdown,r/organizations_policy_attachment.html.markdown,r/organizations_policy.html.markdown,r/organizations_organizational_unit.html.markdown,r/organizations_organization.html.markdown,r/organizations_delegated_administrator.html.markdown,r/organizations_account.html.markdown,r/opensearchserverless_vpc_endpoint.html.markdown,r/opensearchserverless_security_policy.html.markdown,r/opensearchserverless_security_config.html.markdown,r/opensearchserverless_lifecycle_policy.html.markdown,r/opensearchserverless_collection.html.markdown,r/opensearchserverless_access_policy.html.markdown,r/opensearch_vpc_endpoint.html.markdown,r/opensearch_package_association.html.markdown,r/opensearch_package.html.markdown,r/opensearch_outbound_connection.html.markdown,r/opensearch_inbound_connection_accepter.html.markdown,r/opensearch_domain_saml_options.html.markdown,r/opensearch_domain_policy.html.markdown,r/opensearch_domain.html.markdown,r/opensearch_authorize_vpc_endpoint_access.html.markdown,r/oam_sink_policy.html.markdown,r/oam_sink.html.markdown,r/oam_link.html.markdown,r/notificationscontacts_email_contact.html.markdown,r/notifications_notification_hub.html.markdown,r/notifications_notification_configuration.html.markdown,r/notifications_event_rule.html.markdown,r/notifications_channel_association.html.markdown,r/networkmonitor_probe.html.markdown,r/networkmonitor_monitor.html.markdown,r/networkmanager_vpc_attachment.html.markdown,r/networkmanager_transit_gateway_route_table_attachment.html.markdown,r/networkmanager_transit_gateway_registration.html.markdown,r/networkmanager_transit_gateway_peering.html.markdown,r/networkmanager_transit_gateway_connect_peer_association.html.markdown,r/networkmanager_site_to_site_vpn_attachment.html.markdown,r/networkmanager_site.html.markdown,r/networkmanager_link_association.html.markdown,r/networkmanager_link.html.markdown,r/networkmanager_global_network.html.markdown,r/networkmanager_dx_gateway_attachment.html.markdown,r/networkmanager_device.html.markdown,r/networkmanager_customer_gateway_association.html.markdown,r/networkmanager_core_network_policy_attachment.html.markdown,r/networkmanager_core_network.html.markdown,r/networkmanager_connection.html.markdown,r/networkmanager_connect_peer.html.markdown,r/networkmanager_connect_attachment.html.markdown,r/networkmanager_attachment_accepter.html.markdown,r/networkfirewall_vpc_endpoint_association.html.markdown,r/networkfirewall_tls_inspection_configuration.html.markdown,r/networkfirewall_rule_group.html.markdown,r/networkfirewall_resource_policy.html.markdown,r/networkfirewall_logging_configuration.html.markdown,r/networkfirewall_firewall_transit_gateway_attachment_accepter.html.markdown,r/networkfirewall_firewall_policy.html.markdown,r/networkfirewall_firewall.html.markdown,r/network_interface_sg_attachment.html.markdown,r/network_interface_permission.html.markdown,r/network_interface_attachment.html.markdown,r/network_interface.html.markdown,r/network_acl_rule.html.markdown,r/network_acl_association.html.markdown,r/network_acl.html.markdown,r/neptunegraph_graph.html.markdown,r/neptune_subnet_group.html.markdown,r/neptune_parameter_group.html.markdown,r/neptune_global_cluster.html.markdown,r/neptune_event_subscription.html.markdown,r/neptune_cluster_snapshot.html.markdown,r/neptune_cluster_parameter_group.html.markdown,r/neptune_cluster_instance.html.markdown,r/neptune_cluster_endpoint.html.markdown,r/neptune_cluster.html.markdown,r/nat_gateway_eip_association.html.markdown,r/nat_gateway.html.markdown,r/mwaa_environment.html.markdown,r/mskconnect_worker_configuration.html.markdown,r/mskconnect_custom_plugin.html.markdown,r/mskconnect_connector.html.markdown,r/msk_vpc_connection.html.markdown,r/msk_single_scram_secret_association.html.markdown,r/msk_serverless_cluster.html.markdown,r/msk_scram_secret_association.html.markdown,r/msk_replicator.html.markdown,r/msk_configuration.html.markdown,r/msk_cluster_policy.html.markdown,r/msk_cluster.html.markdown,r/mq_configuration.html.markdown,r/mq_broker.html.markdown,r/memorydb_user.html.markdown,r/memorydb_subnet_group.html.markdown,r/memorydb_snapshot.html.markdown,r/memorydb_parameter_group.html.markdown,r/memorydb_multi_region_cluster.html.markdown,r/memorydb_cluster.html.markdown,r/memorydb_acl.html.markdown,r/medialive_multiplex_program.html.markdown,r/medialive_multiplex.html.markdown,r/medialive_input_security_group.html.markdown,r/medialive_input.html.markdown,r/medialive_channel.html.markdown,r/media_store_container_policy.html.markdown,r/media_store_container.html.markdown,r/media_packagev2_channel_group.html.markdown,r/media_package_channel.html.markdown,r/media_convert_queue.html.markdown,r/main_route_table_association.html.markdown,r/macie2_organization_configuration.html.markdown,r/macie2_organization_admin_account.html.markdown,r/macie2_member.html.markdown,r/macie2_invitation_accepter.html.markdown,r/macie2_findings_filter.html.markdown,r/macie2_custom_data_identifier.html.markdown,r/macie2_classification_job.html.markdown,r/macie2_classification_export_configuration.html.markdown,r/macie2_account.html.markdown,r/m2_environment.html.markdown,r/m2_deployment.html.markdown,r/m2_application.html.markdown,r/location_tracker_association.html.markdown,r/location_tracker.html.markdown,r/location_route_calculator.html.markdown,r/location_place_index.html.markdown,r/location_map.html.markdown,r/location_geofence_collection.html.markdown,r/load_balancer_policy.html.markdown,r/load_balancer_listener_policy.html.markdown,r/load_balancer_backend_server_policy.html.markdown,r/lightsail_static_ip_attachment.html.markdown,r/lightsail_static_ip.html.markdown,r/lightsail_lb_stickiness_policy.html.markdown,r/lightsail_lb_https_redirection_policy.html.markdown,r/lightsail_lb_certificate_attachment.html.markdown,r/lightsail_lb_certificate.html.markdown,r/lightsail_lb_attachment.html.markdown,r/lightsail_lb.html.markdown,r/lightsail_key_pair.html.markdown,r/lightsail_instance_public_ports.html.markdown,r/lightsail_instance.html.markdown,r/lightsail_domain_entry.html.markdown,r/lightsail_domain.html.markdown,r/lightsail_distribution.html.markdown,r/lightsail_disk_attachment.html.markdown,r/lightsail_disk.html.markdown,r/lightsail_database.html.markdown,r/lightsail_container_service_deployment_version.html.markdown,r/lightsail_container_service.html.markdown,r/lightsail_certificate.html.markdown,r/lightsail_bucket_resource_access.html.markdown,r/lightsail_bucket_access_key.html.markdown,r/lightsail_bucket.html.markdown,r/licensemanager_license_configuration.html.markdown,r/licensemanager_grant_accepter.html.markdown,r/licensemanager_grant.html.markdown,r/licensemanager_association.html.markdown,r/lexv2models_slot_type.html.markdown,r/lexv2models_slot.html.markdown,r/lexv2models_intent.html.markdown,r/lexv2models_bot_version.html.markdown,r/lexv2models_bot_locale.html.markdown,r/lexv2models_bot.html.markdown,r/lex_slot_type.html.markdown,r/lex_intent.html.markdown,r/lex_bot_alias.html.markdown,r/lex_bot.html.markdown,r/lb_trust_store_revocation.html.markdown,r/lb_trust_store.html.markdown,r/lb_target_group_attachment.html.markdown,r/lb_target_group.html.markdown,r/lb_ssl_negotiation_policy.html.markdown,r/lb_listener_rule.html.markdown,r/lb_listener_certificate.html.markdown,r/lb_listener.html.markdown,r/lb_cookie_stickiness_policy.html.markdown,r/lb.html.markdown,r/launch_template.html.markdown,r/launch_configuration.html.markdown,r/lambda_runtime_management_config.html.markdown,r/lambda_provisioned_concurrency_config.html.markdown,r/lambda_permission.html.markdown,r/lambda_layer_version_permission.html.markdown,r/lambda_layer_version.html.markdown,r/lambda_invocation.html.markdown,r/lambda_function_url.html.markdown,r/lambda_function_recursion_config.html.markdown,r/lambda_function_event_invoke_config.html.markdown,r/lambda_function.html.markdown,r/lambda_event_source_mapping.html.markdown,r/lambda_code_signing_config.html.markdown,r/lambda_alias.html.markdown,r/lakeformation_resource_lf_tags.html.markdown,r/lakeformation_resource_lf_tag.html.markdown,r/lakeformation_resource.html.markdown,r/lakeformation_permissions.html.markdown,r/lakeformation_opt_in.html.markdown,r/lakeformation_lf_tag.html.markdown,r/lakeformation_data_lake_settings.html.markdown,r/lakeformation_data_cells_filter.html.markdown,r/kms_replica_key.html.markdown,r/kms_replica_external_key.html.markdown,r/kms_key_policy.html.markdown,r/kms_key.html.markdown,r/kms_grant.html.markdown,r/kms_external_key.html.markdown,r/kms_custom_key_store.html.markdown,r/kms_ciphertext.html.markdown,r/kms_alias.html.markdown,r/kinesisanalyticsv2_application_snapshot.html.markdown,r/kinesisanalyticsv2_application.html.markdown,r/kinesis_video_stream.html.markdown,r/kinesis_stream_consumer.html.markdown,r/kinesis_stream.html.markdown,r/kinesis_resource_policy.html.markdown,r/kinesis_firehose_delivery_stream.html.markdown,r/kinesis_analytics_application.html.markdown,r/keyspaces_table.html.markdown,r/keyspaces_keyspace.html.markdown,r/key_pair.html.markdown,r/kendra_thesaurus.html.markdown,r/kendra_query_suggestions_block_list.html.markdown,r/kendra_index.html.markdown,r/kendra_faq.html.markdown,r/kendra_experience.html.markdown,r/kendra_data_source.html.markdown,r/ivschat_room.html.markdown,r/ivschat_logging_configuration.html.markdown,r/ivs_recording_configuration.html.markdown,r/ivs_playback_key_pair.html.markdown,r/ivs_channel.html.markdown,r/iot_topic_rule_destination.html.markdown,r/iot_topic_rule.html.markdown,r/iot_thing_type.html.markdown,r/iot_thing_principal_attachment.html.markdown,r/iot_thing_group_membership.html.markdown,r/iot_thing_group.html.markdown,r/iot_thing.html.markdown,r/iot_role_alias.html.markdown,r/iot_provisioning_template.html.markdown,r/iot_policy_attachment.html.markdown,r/iot_policy.html.markdown,r/iot_logging_options.html.markdown,r/iot_indexing_configuration.html.markdown,r/iot_event_configurations.html.markdown,r/iot_domain_configuration.html.markdown,r/iot_certificate.html.markdown,r/iot_ca_certificate.html.markdown,r/iot_billing_group.html.markdown,r/iot_authorizer.html.markdown,r/internetmonitor_monitor.html.markdown,r/internet_gateway_attachment.html.markdown,r/internet_gateway.html.markdown,r/instance.html.markdown,r/inspector_resource_group.html.markdown,r/inspector_assessment_template.html.markdown,r/inspector_assessment_target.html.markdown,r/inspector2_organization_configuration.html.markdown,r/inspector2_member_association.html.markdown,r/inspector2_filter.html.markdown,r/inspector2_enabler.html.markdown,r/inspector2_delegated_admin_account.html.markdown,r/imagebuilder_workflow.html.markdown,r/imagebuilder_lifecycle_policy.html.markdown,r/imagebuilder_infrastructure_configuration.html.markdown,r/imagebuilder_image_recipe.html.markdown,r/imagebuilder_image_pipeline.html.markdown,r/imagebuilder_image.html.markdown,r/imagebuilder_distribution_configuration.html.markdown,r/imagebuilder_container_recipe.html.markdown,r/imagebuilder_component.html.markdown,r/identitystore_user.html.markdown,r/identitystore_group_membership.html.markdown,r/identitystore_group.html.markdown,r/iam_virtual_mfa_device.html.markdown,r/iam_user_ssh_key.html.markdown,r/iam_user_policy_attachments_exclusive.html.markdown,r/iam_user_policy_attachment.html.markdown,r/iam_user_policy.html.markdown,r/iam_user_policies_exclusive.html.markdown,r/iam_user_login_profile.html.markdown,r/iam_user_group_membership.html.markdown,r/iam_user.html.markdown,r/iam_signing_certificate.html.markdown,r/iam_service_specific_credential.html.markdown,r/iam_service_linked_role.html.markdown,r/iam_server_certificate.html.markdown,r/iam_security_token_service_preferences.html.markdown,r/iam_saml_provider.html.markdown,r/iam_role_policy_attachments_exclusive.html.markdown,r/iam_role_policy_attachment.html.markdown,r/iam_role_policy.html.markdown,r/iam_role_policies_exclusive.html.markdown,r/iam_role.html.markdown,r/iam_policy_attachment.html.markdown,r/iam_policy.html.markdown,r/iam_organizations_features.html.markdown,r/iam_openid_connect_provider.html.markdown,r/iam_instance_profile.html.markdown,r/iam_group_policy_attachments_exclusive.html.markdown,r/iam_group_policy_attachment.html.markdown,r/iam_group_policy.html.markdown,r/iam_group_policies_exclusive.html.markdown,r/iam_group_membership.html.markdown,r/iam_group.html.markdown,r/iam_account_password_policy.html.markdown,r/iam_account_alias.html.markdown,r/iam_access_key.html.markdown,r/guardduty_threatintelset.html.markdown,r/guardduty_publishing_destination.html.markdown,r/guardduty_organization_configuration_feature.html.markdown,r/guardduty_organization_configuration.html.markdown,r/guardduty_organization_admin_account.html.markdown,r/guardduty_member_detector_feature.html.markdown,r/guardduty_member.html.markdown,r/guardduty_malware_protection_plan.html.markdown,r/guardduty_ipset.html.markdown,r/guardduty_invite_accepter.html.markdown,r/guardduty_filter.html.markdown,r/guardduty_detector_feature.html.markdown,r/guardduty_detector.html.markdown,r/grafana_workspace_service_account_token.html.markdown,r/grafana_workspace_service_account.html.markdown,r/grafana_workspace_saml_configuration.html.markdown,r/grafana_workspace_api_key.html.markdown,r/grafana_workspace.html.markdown,r/grafana_role_association.html.markdown,r/grafana_license_association.html.markdown,r/glue_workflow.html.markdown,r/glue_user_defined_function.html.markdown,r/glue_trigger.html.markdown,r/glue_security_configuration.html.markdown,r/glue_schema.html.markdown,r/glue_resource_policy.html.markdown,r/glue_registry.html.markdown,r/glue_partition_index.html.markdown,r/glue_partition.html.markdown,r/glue_ml_transform.html.markdown,r/glue_job.html.markdown,r/glue_dev_endpoint.html.markdown,r/glue_data_quality_ruleset.html.markdown,r/glue_data_catalog_encryption_settings.html.markdown,r/glue_crawler.html.markdown,r/glue_connection.html.markdown,r/glue_classifier.html.markdown,r/glue_catalog_table_optimizer.html.markdown,r/glue_catalog_table.html.markdown,r/glue_catalog_database.html.markdown,r/globalaccelerator_listener.html.markdown,r/globalaccelerator_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_listener.html.markdown,r/globalaccelerator_custom_routing_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_accelerator.html.markdown,r/globalaccelerator_cross_account_attachment.html.markdown,r/globalaccelerator_accelerator.html.markdown,r/glacier_vault_lock.html.markdown,r/glacier_vault.html.markdown,r/gamelift_script.html.markdown,r/gamelift_game_session_queue.html.markdown,r/gamelift_game_server_group.html.markdown,r/gamelift_fleet.html.markdown,r/gamelift_build.html.markdown,r/gamelift_alias.html.markdown,r/fsx_windows_file_system.html.markdown,r/fsx_s3_access_point_attachment.html.markdown,r/fsx_openzfs_volume.html.markdown,r/fsx_openzfs_snapshot.html.markdown,r/fsx_openzfs_file_system.html.markdown,r/fsx_ontap_volume.html.markdown,r/fsx_ontap_storage_virtual_machine.html.markdown,r/fsx_ontap_file_system.html.markdown,r/fsx_lustre_file_system.html.markdown,r/fsx_file_cache.html.markdown,r/fsx_data_repository_association.html.markdown,r/fsx_backup.html.markdown,r/fms_resource_set.html.markdown,r/fms_policy.html.markdown,r/fms_admin_account.html.markdown,r/flow_log.html.markdown,r/fis_experiment_template.html.markdown,r/finspace_kx_volume.html.markdown,r/finspace_kx_user.html.markdown,r/finspace_kx_scaling_group.html.markdown,r/finspace_kx_environment.html.markdown,r/finspace_kx_dataview.html.markdown,r/finspace_kx_database.html.markdown,r/finspace_kx_cluster.html.markdown,r/evidently_segment.html.markdown,r/evidently_project.html.markdown,r/evidently_launch.html.markdown,r/evidently_feature.html.markdown,r/emrserverless_application.html.markdown,r/emrcontainers_virtual_cluster.html.markdown,r/emrcontainers_job_template.html.markdown,r/emr_studio_session_mapping.html.markdown,r/emr_studio.html.markdown,r/emr_security_configuration.html.markdown,r/emr_managed_scaling_policy.html.markdown,r/emr_instance_group.html.markdown,r/emr_instance_fleet.html.markdown,r/emr_cluster.html.markdown,r/emr_block_public_access_configuration.html.markdown,r/elb_attachment.html.markdown,r/elb.html.markdown,r/elastictranscoder_preset.html.markdown,r/elastictranscoder_pipeline.html.markdown,r/elasticsearch_vpc_endpoint.html.markdown,r/elasticsearch_domain_saml_options.html.markdown,r/elasticsearch_domain_policy.html.markdown,r/elasticsearch_domain.html.markdown,r/elasticache_user_group_association.html.markdown,r/elasticache_user_group.html.markdown,r/elasticache_user.html.markdown,r/elasticache_subnet_group.html.markdown,r/elasticache_serverless_cache.html.markdown,r/elasticache_reserved_cache_node.html.markdown,r/elasticache_replication_group.html.markdown,r/elasticache_parameter_group.html.markdown,r/elasticache_global_replication_group.html.markdown,r/elasticache_cluster.html.markdown,r/elastic_beanstalk_environment.html.markdown,r/elastic_beanstalk_configuration_template.html.markdown,r/elastic_beanstalk_application_version.html.markdown,r/elastic_beanstalk_application.html.markdown,r/eks_pod_identity_association.html.markdown,r/eks_node_group.html.markdown,r/eks_identity_provider_config.html.markdown,r/eks_fargate_profile.html.markdown,r/eks_cluster.html.markdown,r/eks_addon.html.markdown,r/eks_access_policy_association.html.markdown,r/eks_access_entry.html.markdown,r/eip_domain_name.html.markdown,r/eip_association.html.markdown,r/eip.html.markdown,r/egress_only_internet_gateway.html.markdown,r/efs_replication_configuration.html.markdown,r/efs_mount_target.html.markdown,r/efs_file_system_policy.html.markdown,r/efs_file_system.html.markdown,r/efs_backup_policy.html.markdown,r/efs_access_point.html.markdown,r/ecs_task_set.html.markdown,r/ecs_task_definition.html.markdown,r/ecs_tag.html.markdown,r/ecs_service.html.markdown,r/ecs_cluster_capacity_providers.html.markdown,r/ecs_cluster.html.markdown,r/ecs_capacity_provider.html.markdown,r/ecs_account_setting_default.html.markdown,r/ecrpublic_repository_policy.html.markdown,r/ecrpublic_repository.html.markdown,r/ecr_repository_policy.html.markdown,r/ecr_repository_creation_template.html.markdown,r/ecr_repository.html.markdown,r/ecr_replication_configuration.html.markdown,r/ecr_registry_scanning_configuration.html.markdown,r/ecr_registry_policy.html.markdown,r/ecr_pull_through_cache_rule.html.markdown,r/ecr_lifecycle_policy.html.markdown,r/ecr_account_setting.html.markdown,r/ec2_transit_gateway_vpc_attachment_accepter.html.markdown,r/ec2_transit_gateway_vpc_attachment.html.markdown,r/ec2_transit_gateway_route_table_propagation.html.markdown,r/ec2_transit_gateway_route_table_association.html.markdown,r/ec2_transit_gateway_route_table.html.markdown,r/ec2_transit_gateway_route.html.markdown,r/ec2_transit_gateway_prefix_list_reference.html.markdown,r/ec2_transit_gateway_policy_table_association.html.markdown,r/ec2_transit_gateway_policy_table.html.markdown,r/ec2_transit_gateway_peering_attachment_accepter.html.markdown,r/ec2_transit_gateway_peering_attachment.html.markdown,r/ec2_transit_gateway_multicast_group_source.html.markdown,r/ec2_transit_gateway_multicast_group_member.html.markdown,r/ec2_transit_gateway_multicast_domain_association.html.markdown,r/ec2_transit_gateway_multicast_domain.html.markdown,r/ec2_transit_gateway_default_route_table_propagation.html.markdown,r/ec2_transit_gateway_default_route_table_association.html.markdown,r/ec2_transit_gateway_connect_peer.html.markdown,r/ec2_transit_gateway_connect.html.markdown,r/ec2_transit_gateway.html.markdown,r/ec2_traffic_mirror_target.html.markdown,r/ec2_traffic_mirror_session.html.markdown,r/ec2_traffic_mirror_filter_rule.html.markdown,r/ec2_traffic_mirror_filter.html.markdown,r/ec2_tag.html.markdown,r/ec2_subnet_cidr_reservation.html.markdown,r/ec2_serial_console_access.html.markdown,r/ec2_network_insights_path.html.markdown,r/ec2_network_insights_analysis.html.markdown,r/ec2_managed_prefix_list_entry.html.markdown,r/ec2_managed_prefix_list.html.markdown,r/ec2_local_gateway_route_table_vpc_association.html.markdown,r/ec2_local_gateway_route.html.markdown,r/ec2_instance_state.html.markdown,r/ec2_instance_metadata_defaults.html.markdown,r/ec2_instance_connect_endpoint.html.markdown,r/ec2_image_block_public_access.markdown,r/ec2_host.html.markdown,r/ec2_fleet.html.markdown,r/ec2_default_credit_specification.html.markdown,r/ec2_client_vpn_route.html.markdown,r/ec2_client_vpn_network_association.html.markdown,r/ec2_client_vpn_endpoint.html.markdown,r/ec2_client_vpn_authorization_rule.html.markdown,r/ec2_carrier_gateway.html.markdown,r/ec2_capacity_reservation.html.markdown,r/ec2_capacity_block_reservation.html.markdown,r/ec2_availability_zone_group.html.markdown,r/ebs_volume.html.markdown,r/ebs_snapshot_import.html.markdown,r/ebs_snapshot_copy.html.markdown,r/ebs_snapshot_block_public_access.html.markdown,r/ebs_snapshot.html.markdown,r/ebs_fast_snapshot_restore.html.markdown,r/ebs_encryption_by_default.html.markdown,r/ebs_default_kms_key.html.markdown,r/dynamodb_tag.html.markdown,r/dynamodb_table_replica.html.markdown,r/dynamodb_table_item.html.markdown,r/dynamodb_table_export.html.markdown,r/dynamodb_table.html.markdown,r/dynamodb_resource_policy.html.markdown,r/dynamodb_kinesis_streaming_destination.html.markdown,r/dynamodb_global_table.html.markdown,r/dynamodb_contributor_insights.html.markdown,r/dx_transit_virtual_interface.html.markdown,r/dx_public_virtual_interface.html.markdown,r/dx_private_virtual_interface.html.markdown,r/dx_macsec_key_association.html.markdown,r/dx_lag.html.markdown,r/dx_hosted_transit_virtual_interface_accepter.html.markdown,r/dx_hosted_transit_virtual_interface.html.markdown,r/dx_hosted_public_virtual_interface_accepter.html.markdown,r/dx_hosted_public_virtual_interface.html.markdown,r/dx_hosted_private_virtual_interface_accepter.html.markdown,r/dx_hosted_private_virtual_interface.html.markdown,r/dx_hosted_connection.html.markdown,r/dx_gateway_association_proposal.html.markdown,r/dx_gateway_association.html.markdown,r/dx_gateway.html.markdown,r/dx_connection_confirmation.html.markdown,r/dx_connection_association.html.markdown,r/dx_connection.html.markdown,r/dx_bgp_peer.html.markdown,r/dsql_cluster_peering.html.markdown,r/dsql_cluster.html.markdown,r/drs_replication_configuration_template.html.markdown,r/docdbelastic_cluster.html.markdown,r/docdb_subnet_group.html.markdown,r/docdb_global_cluster.html.markdown,r/docdb_event_subscription.html.markdown,r/docdb_cluster_snapshot.html.markdown,r/docdb_cluster_parameter_group.html.markdown,r/docdb_cluster_instance.html.markdown,r/docdb_cluster.html.markdown,r/dms_s3_endpoint.html.markdown,r/dms_replication_task.html.markdown,r/dms_replication_subnet_group.html.markdown,r/dms_replication_instance.html.markdown,r/dms_replication_config.html.markdown,r/dms_event_subscription.html.markdown,r/dms_endpoint.html.markdown,r/dms_certificate.html.markdown,r/dlm_lifecycle_policy.html.markdown,r/directory_service_trust.html.markdown,r/directory_service_shared_directory_accepter.html.markdown,r/directory_service_shared_directory.html.markdown,r/directory_service_region.html.markdown,r/directory_service_radius_settings.html.markdown,r/directory_service_log_subscription.html.markdown,r/directory_service_directory.html.markdown,r/directory_service_conditional_forwarder.html.markdown,r/devopsguru_service_integration.html.markdown,r/devopsguru_resource_collection.html.markdown,r/devopsguru_notification_channel.html.markdown,r/devopsguru_event_sources_config.html.markdown,r/devicefarm_upload.html.markdown,r/devicefarm_test_grid_project.html.markdown,r/devicefarm_project.html.markdown,r/devicefarm_network_profile.html.markdown,r/devicefarm_instance_profile.html.markdown,r/devicefarm_device_pool.html.markdown,r/detective_organization_configuration.html.markdown,r/detective_organization_admin_account.html.markdown,r/detective_member.html.markdown,r/detective_invitation_accepter.html.markdown,r/detective_graph.html.markdown,r/default_vpc_dhcp_options.html.markdown,r/default_vpc.html.markdown,r/default_subnet.html.markdown,r/default_security_group.html.markdown,r/default_route_table.html.markdown,r/default_network_acl.html.markdown,r/db_subnet_group.html.markdown,r/db_snapshot_copy.html.markdown,r/db_snapshot.html.markdown,r/db_proxy_target.html.markdown,r/db_proxy_endpoint.html.markdown,r/db_proxy_default_target_group.html.markdown,r/db_proxy.html.markdown,r/db_parameter_group.html.markdown,r/db_option_group.html.markdown,r/db_instance_role_association.html.markdown,r/db_instance_automated_backups_replication.html.markdown,r/db_instance.html.markdown,r/db_event_subscription.html.markdown,r/db_cluster_snapshot.html.markdown,r/dax_subnet_group.html.markdown,r/dax_parameter_group.html.markdown,r/dax_cluster.html.markdown,r/datazone_user_profile.html.markdown,r/datazone_project.html.markdown,r/datazone_glossary_term.html.markdown,r/datazone_glossary.html.markdown,r/datazone_form_type.html.markdown,r/datazone_environment_profile.html.markdown,r/datazone_environment_blueprint_configuration.html.markdown,r/datazone_environment.html.markdown,r/datazone_domain.html.markdown,r/datazone_asset_type.html.markdown,r/datasync_task.html.markdown,r/datasync_location_smb.html.markdown,r/datasync_location_s3.html.markdown,r/datasync_location_object_storage.html.markdown,r/datasync_location_nfs.html.markdown,r/datasync_location_hdfs.html.markdown,r/datasync_location_fsx_windows_file_system.html.markdown,r/datasync_location_fsx_openzfs_file_system.html.markdown,r/datasync_location_fsx_ontap_file_system.html.markdown,r/datasync_location_fsx_lustre_file_system.html.markdown,r/datasync_location_efs.html.markdown,r/datasync_location_azure_blob.html.markdown,r/datasync_agent.html.markdown,r/datapipeline_pipeline_definition.html.markdown,r/datapipeline_pipeline.html.markdown,r/dataexchange_revision_assets.html.markdown,r/dataexchange_revision.html.markdown,r/dataexchange_event_action.html.markdown,r/dataexchange_data_set.html.markdown,r/customerprofiles_profile.html.markdown,r/customerprofiles_domain.html.markdown,r/customer_gateway.html.markdown,r/cur_report_definition.html.markdown,r/costoptimizationhub_preferences.html.markdown,r/costoptimizationhub_enrollment_status.html.markdown,r/controltower_landing_zone.html.markdown,r/controltower_control.html.markdown,r/connect_vocabulary.html.markdown,r/connect_user_hierarchy_structure.html.markdown,r/connect_user_hierarchy_group.html.markdown,r/connect_user.html.markdown,r/connect_security_profile.html.markdown,r/connect_routing_profile.html.markdown,r/connect_quick_connect.html.markdown,r/connect_queue.html.markdown,r/connect_phone_number_contact_flow_association.html.markdown,r/connect_phone_number.html.markdown,r/connect_lambda_function_association.html.markdown,r/connect_instance_storage_config.html.markdown,r/connect_instance.html.markdown,r/connect_hours_of_operation.html.markdown,r/connect_contact_flow_module.html.markdown,r/connect_contact_flow.html.markdown,r/connect_bot_association.html.markdown,r/config_retention_configuration.html.markdown,r/config_remediation_configuration.html.markdown,r/config_organization_managed_rule.html.markdown,r/config_organization_custom_rule.html.markdown,r/config_organization_custom_policy_rule.html.markdown,r/config_organization_conformance_pack.html.markdown,r/config_delivery_channel.html.markdown,r/config_conformance_pack.html.markdown,r/config_configuration_recorder_status.html.markdown,r/config_configuration_recorder.html.markdown,r/config_configuration_aggregator.html.markdown,r/config_config_rule.html.markdown,r/config_aggregate_authorization.html.markdown,r/computeoptimizer_recommendation_preferences.html.markdown,r/computeoptimizer_enrollment_status.html.markdown,r/comprehend_entity_recognizer.html.markdown,r/comprehend_document_classifier.html.markdown,r/cognito_user_pool_ui_customization.html.markdown,r/cognito_user_pool_domain.html.markdown,r/cognito_user_pool_client.html.markdown,r/cognito_user_pool.html.markdown,r/cognito_user_in_group.html.markdown,r/cognito_user_group.html.markdown,r/cognito_user.html.markdown,r/cognito_risk_configuration.html.markdown,r/cognito_resource_server.html.markdown,r/cognito_managed_user_pool_client.html.markdown,r/cognito_log_delivery_configuration.html.markdown,r/cognito_identity_provider.html.markdown,r/cognito_identity_pool_roles_attachment.html.markdown,r/cognito_identity_pool_provider_principal_tag.html.markdown,r/cognito_identity_pool.html.markdown,r/codestarnotifications_notification_rule.html.markdown,r/codestarconnections_host.html.markdown,r/codestarconnections_connection.html.markdown,r/codepipeline_webhook.html.markdown,r/codepipeline_custom_action_type.html.markdown,r/codepipeline.html.markdown,r/codegurureviewer_repository_association.html.markdown,r/codeguruprofiler_profiling_group.html.markdown,r/codedeploy_deployment_group.html.markdown,r/codedeploy_deployment_config.html.markdown,r/codedeploy_app.html.markdown,r/codeconnections_host.html.markdown,r/codeconnections_connection.html.markdown,r/codecommit_trigger.html.markdown,r/codecommit_repository.html.markdown,r/codecommit_approval_rule_template_association.html.markdown,r/codecommit_approval_rule_template.html.markdown,r/codecatalyst_source_repository.html.markdown,r/codecatalyst_project.html.markdown,r/codecatalyst_dev_environment.html.markdown,r/codebuild_webhook.html.markdown,r/codebuild_source_credential.html.markdown,r/codebuild_resource_policy.html.markdown,r/codebuild_report_group.html.markdown,r/codebuild_project.html.markdown,r/codebuild_fleet.html.markdown,r/codeartifact_repository_permissions_policy.html.markdown,r/codeartifact_repository.html.markdown,r/codeartifact_domain_permissions_policy.html.markdown,r/codeartifact_domain.html.markdown,r/cloudwatch_query_definition.html.markdown,r/cloudwatch_metric_stream.html.markdown,r/cloudwatch_metric_alarm.html.markdown,r/cloudwatch_log_subscription_filter.html.markdown,r/cloudwatch_log_stream.html.markdown,r/cloudwatch_log_resource_policy.html.markdown,r/cloudwatch_log_metric_filter.html.markdown,r/cloudwatch_log_index_policy.html.markdown,r/cloudwatch_log_group.html.markdown,r/cloudwatch_log_destination_policy.html.markdown,r/cloudwatch_log_destination.html.markdown,r/cloudwatch_log_delivery_source.html.markdown,r/cloudwatch_log_delivery_destination_policy.html.markdown,r/cloudwatch_log_delivery_destination.html.markdown,r/cloudwatch_log_delivery.html.markdown,r/cloudwatch_log_data_protection_policy.html.markdown,r/cloudwatch_log_anomaly_detector.html.markdown,r/cloudwatch_log_account_policy.html.markdown,r/cloudwatch_event_target.html.markdown,r/cloudwatch_event_rule.html.markdown,r/cloudwatch_event_permission.html.markdown,r/cloudwatch_event_endpoint.html.markdown,r/cloudwatch_event_connection.html.markdown,r/cloudwatch_event_bus_policy.html.markdown,r/cloudwatch_event_bus.html.markdown,r/cloudwatch_event_archive.html.markdown,r/cloudwatch_event_api_destination.html.markdown,r/cloudwatch_dashboard.html.markdown,r/cloudwatch_contributor_managed_insight_rule.html.markdown,r/cloudwatch_contributor_insight_rule.html.markdown,r/cloudwatch_composite_alarm.html.markdown,r/cloudtrail_organization_delegated_admin_account.html.markdown,r/cloudtrail_event_data_store.html.markdown,r/cloudtrail.html.markdown,r/cloudsearch_domain_service_access_policy.html.markdown,r/cloudsearch_domain.html.markdown,r/cloudhsm_v2_hsm.html.markdown,r/cloudhsm_v2_cluster.html.markdown,r/cloudfrontkeyvaluestore_keys_exclusive.html.markdown,r/cloudfrontkeyvaluestore_key.html.markdown,r/cloudfront_vpc_origin.html.markdown,r/cloudfront_response_headers_policy.html.markdown,r/cloudfront_realtime_log_config.html.markdown,r/cloudfront_public_key.html.markdown,r/cloudfront_origin_request_policy.html.markdown,r/cloudfront_origin_access_identity.html.markdown,r/cloudfront_origin_access_control.html.markdown,r/cloudfront_monitoring_subscription.html.markdown,r/cloudfront_key_value_store.html.markdown,r/cloudfront_key_group.html.markdown,r/cloudfront_function.html.markdown,r/cloudfront_field_level_encryption_profile.html.markdown,r/cloudfront_field_level_encryption_config.html.markdown,r/cloudfront_distribution.html.markdown,r/cloudfront_continuous_deployment_policy.html.markdown,r/cloudfront_cache_policy.html.markdown,r/cloudformation_type.html.markdown,r/cloudformation_stack_set_instance.html.markdown,r/cloudformation_stack_set.html.markdown,r/cloudformation_stack_instances.html.markdown,r/cloudformation_stack.html.markdown,r/cloudcontrolapi_resource.html.markdown,r/cloud9_environment_membership.html.markdown,r/cloud9_environment_ec2.html.markdown,r/cleanrooms_membership.html.markdown,r/cleanrooms_configured_table.html.markdown,r/cleanrooms_collaboration.html.markdown,r/chimesdkvoice_voice_profile_domain.html.markdown,r/chimesdkvoice_sip_rule.html.markdown,r/chimesdkvoice_sip_media_application.html.markdown,r/chimesdkvoice_global_settings.html.markdown,r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown,r/chime_voice_connector_termination_credentials.html.markdown,r/chime_voice_connector_termination.html.markdown,r/chime_voice_connector_streaming.html.markdown,r/chime_voice_connector_origination.html.markdown,r/chime_voice_connector_logging.html.markdown,r/chime_voice_connector_group.html.markdown,r/chime_voice_connector.html.markdown,r/chatbot_teams_channel_configuration.html.markdown,r/chatbot_slack_channel_configuration.html.markdown,r/ce_cost_category.html.markdown,r/ce_cost_allocation_tag.html.markdown,r/ce_anomaly_subscription.html.markdown,r/ce_anomaly_monitor.html.markdown,r/budgets_budget_action.html.markdown,r/budgets_budget.html.markdown,r/bedrockagent_prompt.html.markdown,r/bedrockagent_knowledge_base.html.markdown,r/bedrockagent_flow.html.markdown,r/bedrockagent_data_source.html.markdown,r/bedrockagent_agent_knowledge_base_association.html.markdown,r/bedrockagent_agent_collaborator.html.markdown,r/bedrockagent_agent_alias.html.markdown,r/bedrockagent_agent_action_group.html.markdown,r/bedrockagent_agent.html.markdown,r/bedrock_provisioned_model_throughput.html.markdown,r/bedrock_model_invocation_logging_configuration.html.markdown,r/bedrock_inference_profile.html.markdown,r/bedrock_guardrail_version.html.markdown,r/bedrock_guardrail.html.markdown,r/bedrock_custom_model.html.markdown,r/bcmdataexports_export.html.markdown,r/batch_scheduling_policy.html.markdown,r/batch_job_queue.html.markdown,r/batch_job_definition.html.markdown,r/batch_compute_environment.html.markdown,r/backup_vault_policy.html.markdown,r/backup_vault_notifications.html.markdown,r/backup_vault_lock_configuration.html.markdown,r/backup_vault.html.markdown,r/backup_selection.html.markdown,r/backup_restore_testing_selection.html.markdown,r/backup_restore_testing_plan.html.markdown,r/backup_report_plan.html.markdown,r/backup_region_settings.html.markdown,r/backup_plan.html.markdown,r/backup_logically_air_gapped_vault.html.markdown,r/backup_global_settings.html.markdown,r/backup_framework.html.markdown,r/autoscalingplans_scaling_plan.html.markdown,r/autoscaling_traffic_source_attachment.html.markdown,r/autoscaling_schedule.html.markdown,r/autoscaling_policy.html.markdown,r/autoscaling_notification.html.markdown,r/autoscaling_lifecycle_hook.html.markdown,r/autoscaling_group_tag.html.markdown,r/autoscaling_group.html.markdown,r/autoscaling_attachment.html.markdown,r/auditmanager_organization_admin_account_registration.html.markdown,r/auditmanager_framework_share.html.markdown,r/auditmanager_framework.html.markdown,r/auditmanager_control.html.markdown,r/auditmanager_assessment_report.html.markdown,r/auditmanager_assessment_delegation.html.markdown,r/auditmanager_assessment.html.markdown,r/auditmanager_account_registration.html.markdown,r/athena_workgroup.html.markdown,r/athena_prepared_statement.html.markdown,r/athena_named_query.html.markdown,r/athena_database.html.markdown,r/athena_data_catalog.html.markdown,r/athena_capacity_reservation.html.markdown,r/appsync_type.html.markdown,r/appsync_source_api_association.html.markdown,r/appsync_resolver.html.markdown,r/appsync_graphql_api.html.markdown,r/appsync_function.html.markdown,r/appsync_domain_name_api_association.html.markdown,r/appsync_domain_name.html.markdown,r/appsync_datasource.html.markdown,r/appsync_channel_namespace.html.markdown,r/appsync_api_key.html.markdown,r/appsync_api_cache.html.markdown,r/appsync_api.html.markdown,r/appstream_user_stack_association.html.markdown,r/appstream_user.html.markdown,r/appstream_stack.html.markdown,r/appstream_image_builder.html.markdown,r/appstream_fleet_stack_association.html.markdown,r/appstream_fleet.html.markdown,r/appstream_directory_config.html.markdown,r/apprunner_vpc_ingress_connection.html.markdown,r/apprunner_vpc_connector.html.markdown,r/apprunner_service.html.markdown,r/apprunner_observability_configuration.html.markdown,r/apprunner_deployment.html.markdown,r/apprunner_default_auto_scaling_configuration_version.html.markdown,r/apprunner_custom_domain_association.html.markdown,r/apprunner_connection.html.markdown,r/apprunner_auto_scaling_configuration_version.html.markdown,r/appmesh_virtual_service.html.markdown,r/appmesh_virtual_router.html.markdown,r/appmesh_virtual_node.html.markdown,r/appmesh_virtual_gateway.html.markdown,r/appmesh_route.html.markdown,r/appmesh_mesh.html.markdown,r/appmesh_gateway_route.html.markdown,r/applicationinsights_application.html.markdown,r/appintegrations_event_integration.html.markdown,r/appintegrations_data_integration.html.markdown,r/appflow_flow.html.markdown,r/appflow_connector_profile.html.markdown,r/appfabric_ingestion_destination.html.markdown,r/appfabric_ingestion.html.markdown,r/appfabric_app_bundle.html.markdown,r/appfabric_app_authorization_connection.html.markdown,r/appfabric_app_authorization.html.markdown,r/appconfig_hosted_configuration_version.html.markdown,r/appconfig_extension_association.html.markdown,r/appconfig_extension.html.markdown,r/appconfig_environment.html.markdown,r/appconfig_deployment_strategy.html.markdown,r/appconfig_deployment.html.markdown,r/appconfig_configuration_profile.html.markdown,r/appconfig_application.html.markdown,r/appautoscaling_target.html.markdown,r/appautoscaling_scheduled_action.html.markdown,r/appautoscaling_policy.html.markdown,r/app_cookie_stickiness_policy.html.markdown,r/apigatewayv2_vpc_link.html.markdown,r/apigatewayv2_stage.html.markdown,r/apigatewayv2_route_response.html.markdown,r/apigatewayv2_route.html.markdown,r/apigatewayv2_model.html.markdown,r/apigatewayv2_integration_response.html.markdown,r/apigatewayv2_integration.html.markdown,r/apigatewayv2_domain_name.html.markdown,r/apigatewayv2_deployment.html.markdown,r/apigatewayv2_authorizer.html.markdown,r/apigatewayv2_api_mapping.html.markdown,r/apigatewayv2_api.html.markdown,r/api_gateway_vpc_link.html.markdown,r/api_gateway_usage_plan_key.html.markdown,r/api_gateway_usage_plan.html.markdown,r/api_gateway_stage.html.markdown,r/api_gateway_rest_api_put.markdown,r/api_gateway_rest_api_policy.html.markdown,r/api_gateway_rest_api.html.markdown,r/api_gateway_resource.html.markdown,r/api_gateway_request_validator.html.markdown,r/api_gateway_model.html.markdown,r/api_gateway_method_settings.html.markdown,r/api_gateway_method_response.html.markdown,r/api_gateway_method.html.markdown,r/api_gateway_integration_response.html.markdown,r/api_gateway_integration.html.markdown,r/api_gateway_gateway_response.html.markdown,r/api_gateway_domain_name_access_association.html.markdown,r/api_gateway_domain_name.html.markdown,r/api_gateway_documentation_version.html.markdown,r/api_gateway_documentation_part.html.markdown,r/api_gateway_deployment.html.markdown,r/api_gateway_client_certificate.html.markdown,r/api_gateway_base_path_mapping.html.markdown,r/api_gateway_authorizer.html.markdown,r/api_gateway_api_key.html.markdown,r/api_gateway_account.html.markdown,r/amplify_webhook.html.markdown,r/amplify_domain_association.html.markdown,r/amplify_branch.html.markdown,r/amplify_backend_environment.html.markdown,r/amplify_app.html.markdown,r/ami_launch_permission.html.markdown,r/ami_from_instance.html.markdown,r/ami_copy.html.markdown,r/ami.html.markdown,r/acmpca_policy.html.markdown,r/acmpca_permission.html.markdown,r/acmpca_certificate_authority_certificate.html.markdown,r/acmpca_certificate_authority.html.markdown,r/acmpca_certificate.html.markdown,r/acm_certificate_validation.html.markdown,r/acm_certificate.html.markdown,r/account_region.markdown,r/account_primary_contact.html.markdown,r/account_alternate_contact.html.markdown,r/accessanalyzer_archive_rule.html.markdown,r/accessanalyzer_analyzer.html.markdown,guides/version-6-upgrade.html.markdown,guides/version-5-upgrade.html.markdown,guides/version-4-upgrade.html.markdown,guides/version-3-upgrade.html.markdown,guides/version-2-upgrade.html.markdown,guides/using-aws-with-awscc-provider.html.markdown,guides/resource-tagging.html.markdown,guides/enhanced-region-support.html.markdown,guides/custom-service-endpoints.html.markdown,guides/continuous-validation-examples.html.markdown,functions/trim_iam_role_path.html.markdown,functions/arn_parse.html.markdown,functions/arn_build.html.markdown,ephemeral-resources/ssm_parameter.html.markdown,ephemeral-resources/secretsmanager_secret_version.html.markdown,ephemeral-resources/secretsmanager_random_password.html.markdown,ephemeral-resources/lambda_invocation.html.markdown,ephemeral-resources/kms_secrets.html.markdown,ephemeral-resources/eks_cluster_auth.html.markdown,ephemeral-resources/cognito_identity_openid_token_for_developer_identity.markdown,d/workspaces_workspace.html.markdown,d/workspaces_image.html.markdown,d/workspaces_directory.html.markdown,d/workspaces_bundle.html.markdown,d/wafv2_web_acl.html.markdown,d/wafv2_rule_group.html.markdown,d/wafv2_regex_pattern_set.html.markdown,d/wafv2_ip_set.html.markdown,d/wafregional_web_acl.html.markdown,d/wafregional_subscribed_rule_group.html.markdown,d/wafregional_rule.html.markdown,d/wafregional_rate_based_rule.html.markdown,d/wafregional_ipset.html.markdown,d/waf_web_acl.html.markdown,d/waf_subscribed_rule_group.html.markdown,d/waf_rule.html.markdown,d/waf_rate_based_rule.html.markdown,d/waf_ipset.html.markdown,d/vpn_gateway.html.markdown,d/vpcs.html.markdown,d/vpclattice_service_network.html.markdown,d/vpclattice_service.html.markdown,d/vpclattice_resource_policy.html.markdown,d/vpclattice_listener.html.markdown,d/vpclattice_auth_policy.html.markdown,d/vpc_security_group_rules.html.markdown,d/vpc_security_group_rule.html.markdown,d/vpc_peering_connections.html.markdown,d/vpc_peering_connection.html.markdown,d/vpc_ipams.html.markdown,d/vpc_ipam_preview_next_cidr.html.markdown,d/vpc_ipam_pools.html.markdown,d/vpc_ipam_pool_cidrs.html.markdown,d/vpc_ipam_pool.html.markdown,d/vpc_ipam.html.markdown,d/vpc_endpoint_service.html.markdown,d/vpc_endpoint_associations.html.markdown,d/vpc_endpoint.html.markdown,d/vpc_dhcp_options.html.markdown,d/vpc.html.markdown,d/verifiedpermissions_policy_store.html.markdown,d/transfer_server.html.markdown,d/transfer_connector.html.markdown,d/timestreamwrite_table.html.markdown,d/timestreamwrite_database.html.markdown,d/synthetics_runtime_versions.html.markdown,d/synthetics_runtime_version.html.markdown,d/subnets.html.markdown,d/subnet.html.markdown,d/storagegateway_local_disk.html.markdown,d/ssoadmin_principal_application_assignments.html.markdown,d/ssoadmin_permission_sets.html.markdown,d/ssoadmin_permission_set.html.markdown,d/ssoadmin_instances.html.markdown,d/ssoadmin_application_providers.html.markdown,d/ssoadmin_application_assignments.html.markdown,d/ssoadmin_application.html.markdown,d/ssmincidents_response_plan.html.markdown,d/ssmincidents_replication_set.html.markdown,d/ssmcontacts_rotation.html.markdown,d/ssmcontacts_plan.html.markdown,d/ssmcontacts_contact_channel.html.markdown,d/ssmcontacts_contact.html.markdown,d/ssm_patch_baselines.html.markdown,d/ssm_patch_baseline.html.markdown,d/ssm_parameters_by_path.html.markdown,d/ssm_parameter.html.markdown,d/ssm_maintenance_windows.html.markdown,d/ssm_instances.html.markdown,d/ssm_document.html.markdown,d/sqs_queues.html.markdown,d/sqs_queue.html.markdown,d/spot_datafeed_subscription.html.markdown,d/sns_topic.html.markdown,d/signer_signing_profile.html.markdown,d/signer_signing_job.html.markdown,d/shield_protection.html.markdown,d/sfn_state_machine_versions.html.markdown,d/sfn_state_machine.html.markdown,d/sfn_alias.html.markdown,d/sfn_activity.html.markdown,d/sesv2_email_identity_mail_from_attributes.html.markdown,d/sesv2_email_identity.html.markdown,d/sesv2_dedicated_ip_pool.html.markdown,d/sesv2_configuration_set.html.markdown,d/ses_email_identity.html.markdown,d/ses_domain_identity.html.markdown,d/ses_active_receipt_rule_set.html.markdown,d/servicequotas_templates.html.markdown,d/servicequotas_service_quota.html.markdown,d/servicequotas_service.html.markdown,d/servicecatalogappregistry_attribute_group_associations.html.markdown,d/servicecatalogappregistry_attribute_group.html.markdown,d/servicecatalogappregistry_application.html.markdown,d/servicecatalog_provisioning_artifacts.html.markdown,d/servicecatalog_product.html.markdown,d/servicecatalog_portfolio_constraints.html.markdown,d/servicecatalog_portfolio.html.markdown,d/servicecatalog_launch_paths.html.markdown,d/servicecatalog_constraint.html.markdown,d/service_principal.html.markdown,d/service_discovery_service.html.markdown,d/service_discovery_http_namespace.html.markdown,d/service_discovery_dns_namespace.html.markdown,d/service.html.markdown,d/serverlessapplicationrepository_application.html.markdown,d/securityhub_standards_control_associations.html.markdown,d/security_groups.html.markdown,d/security_group.html.markdown,d/secretsmanager_secrets.html.markdown,d/secretsmanager_secret_versions.html.markdown,d/secretsmanager_secret_version.html.markdown,d/secretsmanager_secret_rotation.html.markdown,d/secretsmanager_secret.html.markdown,d/secretsmanager_random_password.html.markdown,d/sagemaker_prebuilt_ecr_image.html.markdown,d/s3control_multi_region_access_point.html.markdown,d/s3_objects.html.markdown,d/s3_object.html.markdown,d/s3_directory_buckets.html.markdown,d/s3_bucket_policy.html.markdown,d/s3_bucket_objects.html.markdown,d/s3_bucket_object.html.markdown,d/s3_bucket.html.markdown,d/s3_account_public_access_block.html.markdown,d/s3_access_point.html.markdown,d/route_tables.html.markdown,d/route_table.html.markdown,d/route53profiles_profiles.html.markdown,d/route53_zones.html.markdown,d/route53_zone.html.markdown,d/route53_traffic_policy_document.html.markdown,d/route53_resolver_rules.html.markdown,d/route53_resolver_rule.html.markdown,d/route53_resolver_query_log_config.html.markdown,d/route53_resolver_firewall_rules.html.markdown,d/route53_resolver_firewall_rule_group_association.html.markdown,d/route53_resolver_firewall_rule_group.html.markdown,d/route53_resolver_firewall_domain_list.html.markdown,d/route53_resolver_firewall_config.html.markdown,d/route53_resolver_endpoint.html.markdown,d/route53_records.html.markdown,d/route53_delegation_set.html.markdown,d/route.html.markdown,d/resourcegroupstaggingapi_resources.html.markdown,d/resourceexplorer2_search.html.markdown,d/regions.html.markdown,d/region.html.markdown,d/redshiftserverless_workgroup.html.markdown,d/redshiftserverless_namespace.html.markdown,d/redshiftserverless_credentials.html.markdown,d/redshift_subnet_group.html.markdown,d/redshift_producer_data_shares.html.markdown,d/redshift_orderable_cluster.html.markdown,d/redshift_data_shares.html.markdown,d/redshift_cluster_credentials.html.markdown,d/redshift_cluster.html.markdown,d/rds_reserved_instance_offering.html.markdown,d/rds_orderable_db_instance.html.markdown,d/rds_engine_version.html.markdown,d/rds_clusters.html.markdown,d/rds_cluster_parameter_group.html.markdown,d/rds_cluster.html.markdown,d/rds_certificate.html.markdown,d/ram_resource_share.html.markdown,d/quicksight_user.html.markdown,d/quicksight_theme.html.markdown,d/quicksight_group.html.markdown,d/quicksight_data_set.html.markdown,d/quicksight_analysis.html.markdown,d/qldb_ledger.html.markdown,d/prometheus_workspaces.html.markdown,d/prometheus_workspace.html.markdown,d/prometheus_default_scraper_configuration.html.markdown,d/pricing_product.html.markdown,d/prefix_list.html.markdown,d/polly_voices.html.markdown,d/partition.html.markdown,d/outposts_sites.html.markdown,d/outposts_site.html.markdown,d/outposts_outposts.html.markdown,d/outposts_outpost_instance_types.html.markdown,d/outposts_outpost_instance_type.html.markdown,d/outposts_outpost.html.markdown,d/outposts_assets.html.markdown,d/outposts_asset.html.markdown,d/organizations_resource_tags.html.markdown,d/organizations_policy.html.markdown,d/organizations_policies_for_target.html.markdown,d/organizations_policies.html.markdown,d/organizations_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_accounts.html.markdown,d/organizations_organizational_unit_child_accounts.html.markdown,d/organizations_organizational_unit.html.markdown,d/organizations_organization.html.markdown,d/organizations_delegated_services.html.markdown,d/organizations_delegated_administrators.html.markdown,d/opensearchserverless_vpc_endpoint.html.markdown,d/opensearchserverless_security_policy.html.markdown,d/opensearchserverless_security_config.html.markdown,d/opensearchserverless_lifecycle_policy.html.markdown,d/opensearchserverless_collection.html.markdown,d/opensearchserverless_access_policy.html.markdown,d/opensearch_domain.html.markdown,d/oam_sinks.html.markdown,d/oam_sink.html.markdown,d/oam_links.html.markdown,d/oam_link.html.markdown,d/networkmanager_sites.html.markdown,d/networkmanager_site.html.markdown,d/networkmanager_links.html.markdown,d/networkmanager_link.html.markdown,d/networkmanager_global_networks.html.markdown,d/networkmanager_global_network.html.markdown,d/networkmanager_devices.html.markdown,d/networkmanager_device.html.markdown,d/networkmanager_core_network_policy_document.html.markdown,d/networkmanager_connections.html.markdown,d/networkmanager_connection.html.markdown,d/networkfirewall_resource_policy.html.markdown,d/networkfirewall_firewall_policy.html.markdown,d/networkfirewall_firewall.html.markdown,d/network_interfaces.html.markdown,d/network_interface.html.markdown,d/network_acls.html.markdown,d/neptune_orderable_db_instance.html.markdown,d/neptune_engine_version.html.markdown,d/nat_gateways.html.markdown,d/nat_gateway.html.markdown,d/mskconnect_worker_configuration.html.markdown,d/mskconnect_custom_plugin.html.markdown,d/mskconnect_connector.html.markdown,d/msk_vpc_connection.html.markdown,d/msk_kafka_version.html.markdown,d/msk_configuration.html.markdown,d/msk_cluster.html.markdown,d/msk_broker_nodes.html.markdown,d/msk_bootstrap_brokers.html.markdown,d/mq_broker_instance_type_offerings.html.markdown,d/mq_broker_engine_types.html.markdown,d/mq_broker.html.markdown,d/memorydb_user.html.markdown,d/memorydb_subnet_group.html.markdown,d/memorydb_snapshot.html.markdown,d/memorydb_parameter_group.html.markdown,d/memorydb_cluster.html.markdown,d/memorydb_acl.html.markdown,d/medialive_input.html.markdown,d/media_convert_queue.html.markdown,d/location_tracker_associations.html.markdown,d/location_tracker_association.html.markdown,d/location_tracker.html.markdown,d/location_route_calculator.html.markdown,d/location_place_index.html.markdown,d/location_map.html.markdown,d/location_geofence_collection.html.markdown,d/licensemanager_received_licenses.html.markdown,d/licensemanager_received_license.html.markdown,d/licensemanager_grants.html.markdown,d/lex_slot_type.html.markdown,d/lex_intent.html.markdown,d/lex_bot_alias.html.markdown,d/lex_bot.html.markdown,d/lbs.html.markdown,d/lb_trust_store.html.markdown,d/lb_target_group.html.markdown,d/lb_listener_rule.html.markdown,d/lb_listener.html.markdown,d/lb_hosted_zone_id.html.markdown,d/lb.html.markdown,d/launch_template.html.markdown,d/launch_configuration.html.markdown,d/lambda_layer_version.html.markdown,d/lambda_invocation.html.markdown,d/lambda_functions.html.markdown,d/lambda_function_url.html.markdown,d/lambda_function.html.markdown,d/lambda_code_signing_config.html.markdown,d/lambda_alias.html.markdown,d/lakeformation_resource.html.markdown,d/lakeformation_permissions.html.markdown,d/lakeformation_data_lake_settings.html.markdown,d/kms_secrets.html.markdown,d/kms_secret.html.markdown,d/kms_public_key.html.markdown,d/kms_key.html.markdown,d/kms_custom_key_store.html.markdown,d/kms_ciphertext.html.markdown,d/kms_alias.html.markdown,d/kinesis_stream_consumer.html.markdown,d/kinesis_stream.html.markdown,d/kinesis_firehose_delivery_stream.html.markdown,d/key_pair.html.markdown,d/kendra_thesaurus.html.markdown,d/kendra_query_suggestions_block_list.html.markdown,d/kendra_index.html.markdown,d/kendra_faq.html.markdown,d/kendra_experience.html.markdown,d/ivs_stream_key.html.markdown,d/ip_ranges.html.markdown,d/iot_registration_code.html.markdown,d/iot_endpoint.html.markdown,d/internet_gateway.html.markdown,d/instances.html.markdown,d/instance.html.markdown,d/inspector_rules_packages.html.markdown,d/imagebuilder_infrastructure_configurations.html.markdown,d/imagebuilder_infrastructure_configuration.html.markdown,d/imagebuilder_image_recipes.html.markdown,d/imagebuilder_image_recipe.html.markdown,d/imagebuilder_image_pipelines.html.markdown,d/imagebuilder_image_pipeline.html.markdown,d/imagebuilder_image.html.markdown,d/imagebuilder_distribution_configurations.html.markdown,d/imagebuilder_distribution_configuration.html.markdown,d/imagebuilder_container_recipes.html.markdown,d/imagebuilder_container_recipe.html.markdown,d/imagebuilder_components.html.markdown,d/imagebuilder_component.html.markdown,d/identitystore_users.html.markdown,d/identitystore_user.html.markdown,d/identitystore_groups.html.markdown,d/identitystore_group_memberships.html.markdown,d/identitystore_group.html.markdown,d/iam_users.html.markdown,d/iam_user_ssh_key.html.markdown,d/iam_user.html.markdown,d/iam_session_context.html.markdown,d/iam_server_certificate.html.markdown,d/iam_saml_provider.html.markdown,d/iam_roles.html.markdown,d/iam_role.html.markdown,d/iam_principal_policy_simulation.html.markdown,d/iam_policy_document.html.markdown,d/iam_policy.html.markdown,d/iam_openid_connect_provider.html.markdown,d/iam_instance_profiles.html.markdown,d/iam_instance_profile.html.markdown,d/iam_group.html.markdown,d/iam_account_alias.html.markdown,d/iam_access_keys.html.markdown,d/guardduty_finding_ids.html.markdown,d/guardduty_detector.html.markdown,d/grafana_workspace.html.markdown,d/glue_script.html.markdown,d/glue_registry.html.markdown,d/glue_data_catalog_encryption_settings.html.markdown,d/glue_connection.html.markdown,d/glue_catalog_table.html.markdown,d/globalaccelerator_custom_routing_accelerator.html.markdown,d/globalaccelerator_accelerator.html.markdown,d/fsx_windows_file_system.html.markdown,d/fsx_openzfs_snapshot.html.markdown,d/fsx_ontap_storage_virtual_machines.html.markdown,d/fsx_ontap_storage_virtual_machine.html.markdown,d/fsx_ontap_file_system.html.markdown,d/fis_experiment_templates.html.markdown,d/emrcontainers_virtual_cluster.html.markdown,d/emr_supported_instance_types.html.markdown,d/emr_release_labels.html.markdown,d/elb_service_account.html.markdown,d/elb_hosted_zone_id.html.markdown,d/elb.html.markdown,d/elasticsearch_domain.html.markdown,d/elasticache_user.html.markdown,d/elasticache_subnet_group.html.markdown,d/elasticache_serverless_cache.html.markdown,d/elasticache_reserved_cache_node_offering.html.markdown,d/elasticache_replication_group.html.markdown,d/elasticache_cluster.html.markdown,d/elastic_beanstalk_solution_stack.html.markdown,d/elastic_beanstalk_hosted_zone.html.markdown,d/elastic_beanstalk_application.html.markdown,d/eks_node_groups.html.markdown,d/eks_node_group.html.markdown,d/eks_clusters.html.markdown,d/eks_cluster_versions.html.markdown,d/eks_cluster_auth.html.markdown,d/eks_cluster.html.markdown,d/eks_addon_version.html.markdown,d/eks_addon.html.markdown,d/eks_access_entry.html.markdown,d/eips.html.markdown,d/eip.html.markdown,d/efs_mount_target.html.markdown,d/efs_file_system.html.markdown,d/efs_access_points.html.markdown,d/efs_access_point.html.markdown,d/ecs_task_execution.html.markdown,d/ecs_task_definition.html.markdown,d/ecs_service.html.markdown,d/ecs_container_definition.html.markdown,d/ecs_clusters.html.markdown,d/ecs_cluster.html.markdown,d/ecrpublic_authorization_token.html.markdown,d/ecr_repository_creation_template.html.markdown,d/ecr_repository.html.markdown,d/ecr_repositories.html.markdown,d/ecr_pull_through_cache_rule.html.markdown,d/ecr_lifecycle_policy_document.html.markdown,d/ecr_images.html.markdown,d/ecr_image.html.markdown,d/ecr_authorization_token.html.markdown,d/ec2_transit_gateway_vpn_attachment.html.markdown,d/ec2_transit_gateway_vpc_attachments.html.markdown,d/ec2_transit_gateway_vpc_attachment.html.markdown,d/ec2_transit_gateway_route_tables.html.markdown,d/ec2_transit_gateway_route_table_routes.html.markdown,d/ec2_transit_gateway_route_table_propagations.html.markdown,d/ec2_transit_gateway_route_table_associations.html.markdown,d/ec2_transit_gateway_route_table.html.markdown,d/ec2_transit_gateway_peering_attachments.html.markdown,d/ec2_transit_gateway_peering_attachment.html.markdown,d/ec2_transit_gateway_multicast_domain.html.markdown,d/ec2_transit_gateway_dx_gateway_attachment.html.markdown,d/ec2_transit_gateway_connect_peer.html.markdown,d/ec2_transit_gateway_connect.html.markdown,d/ec2_transit_gateway_attachments.html.markdown,d/ec2_transit_gateway_attachment.html.markdown,d/ec2_transit_gateway.html.markdown,d/ec2_spot_price.html.markdown,d/ec2_serial_console_access.html.markdown,d/ec2_public_ipv4_pools.html.markdown,d/ec2_public_ipv4_pool.html.markdown,d/ec2_network_insights_path.html.markdown,d/ec2_network_insights_analysis.html.markdown,d/ec2_managed_prefix_lists.html.markdown,d/ec2_managed_prefix_list.html.markdown,d/ec2_local_gateways.html.markdown,d/ec2_local_gateway_virtual_interface_groups.html.markdown,d/ec2_local_gateway_virtual_interface_group.html.markdown,d/ec2_local_gateway_virtual_interface.html.markdown,d/ec2_local_gateway_route_tables.html.markdown,d/ec2_local_gateway_route_table.html.markdown,d/ec2_local_gateway.html.markdown,d/ec2_instance_types.html.markdown,d/ec2_instance_type_offerings.html.markdown,d/ec2_instance_type_offering.html.markdown,d/ec2_instance_type.html.markdown,d/ec2_host.html.markdown,d/ec2_coip_pools.html.markdown,d/ec2_coip_pool.html.markdown,d/ec2_client_vpn_endpoint.html.markdown,d/ec2_capacity_block_offering.html.markdown,d/ebs_volumes.html.markdown,d/ebs_volume.html.markdown,d/ebs_snapshot_ids.html.markdown,d/ebs_snapshot.html.markdown,d/ebs_encryption_by_default.html.markdown,d/ebs_default_kms_key.html.markdown,d/dynamodb_tables.html.markdown,d/dynamodb_table_item.html.markdown,d/dynamodb_table.html.markdown,d/dx_router_configuration.html.markdown,d/dx_locations.html.markdown,d/dx_location.html.markdown,d/dx_gateway.html.markdown,d/dx_connection.html.markdown,d/docdb_orderable_db_instance.html.markdown,d/docdb_engine_version.html.markdown,d/dms_replication_task.html.markdown,d/dms_replication_subnet_group.html.markdown,d/dms_replication_instance.html.markdown,d/dms_endpoint.html.markdown,d/dms_certificate.html.markdown,d/directory_service_directory.html.markdown,d/devopsguru_resource_collection.html.markdown,d/devopsguru_notification_channel.html.markdown,d/default_tags.html.markdown,d/db_subnet_group.html.markdown,d/db_snapshot.html.markdown,d/db_proxy.html.markdown,d/db_parameter_group.html.markdown,d/db_instances.html.markdown,d/db_instance.html.markdown,d/db_event_categories.html.markdown,d/db_cluster_snapshot.html.markdown,d/datazone_environment_blueprint.html.markdown,d/datazone_domain.html.markdown,d/datapipeline_pipeline_definition.html.markdown,d/datapipeline_pipeline.html.markdown,d/customer_gateway.html.markdown,d/cur_report_definition.html.markdown,d/controltower_controls.html.markdown,d/connect_vocabulary.html.markdown,d/connect_user_hierarchy_structure.html.markdown,d/connect_user_hierarchy_group.html.markdown,d/connect_user.html.markdown,d/connect_security_profile.html.markdown,d/connect_routing_profile.html.markdown,d/connect_quick_connect.html.markdown,d/connect_queue.html.markdown,d/connect_prompt.html.markdown,d/connect_lambda_function_association.html.markdown,d/connect_instance_storage_config.html.markdown,d/connect_instance.html.markdown,d/connect_hours_of_operation.html.markdown,d/connect_contact_flow_module.html.markdown,d/connect_contact_flow.html.markdown,d/connect_bot_association.html.markdown,d/cognito_user_pools.html.markdown,d/cognito_user_pool_signing_certificate.html.markdown,d/cognito_user_pool_clients.html.markdown,d/cognito_user_pool_client.html.markdown,d/cognito_user_pool.html.markdown,d/cognito_user_groups.html.markdown,d/cognito_user_group.html.markdown,d/cognito_identity_pool.html.markdown,d/codestarconnections_connection.html.markdown,d/codeguruprofiler_profiling_group.html.markdown,d/codecommit_repository.html.markdown,d/codecommit_approval_rule_template.html.markdown,d/codecatalyst_dev_environment.html.markdown,d/codebuild_fleet.html.markdown,d/codeartifact_repository_endpoint.html.markdown,d/codeartifact_authorization_token.html.markdown,d/cloudwatch_log_groups.html.markdown,d/cloudwatch_log_group.html.markdown,d/cloudwatch_log_data_protection_policy_document.html.markdown,d/cloudwatch_event_source.html.markdown,d/cloudwatch_event_connection.html.markdown,d/cloudwatch_event_buses.html.markdown,d/cloudwatch_event_bus.html.markdown,d/cloudwatch_contributor_managed_insight_rules.html.markdown,d/cloudtrail_service_account.html.markdown,d/cloudhsm_v2_cluster.html.markdown,d/cloudfront_response_headers_policy.html.markdown,d/cloudfront_realtime_log_config.html.markdown,d/cloudfront_origin_request_policy.html.markdown,d/cloudfront_origin_access_identity.html.markdown,d/cloudfront_origin_access_identities.html.markdown,d/cloudfront_origin_access_control.html.markdown,d/cloudfront_log_delivery_canonical_user_id.html.markdown,d/cloudfront_function.html.markdown,d/cloudfront_distribution.html.markdown,d/cloudfront_cache_policy.html.markdown,d/cloudformation_type.html.markdown,d/cloudformation_stack.html.markdown,d/cloudformation_export.html.markdown,d/cloudcontrolapi_resource.html.markdown,d/chatbot_slack_workspace.html.markdown,d/ce_tags.html.markdown,d/ce_cost_category.html.markdown,d/canonical_user_id.html.markdown,d/caller_identity.html.markdown,d/budgets_budget.html.markdown,d/billing_service_account.html.markdown,d/bedrockagent_agent_versions.html.markdown,d/bedrock_inference_profiles.html.markdown,d/bedrock_inference_profile.html.markdown,d/bedrock_foundation_models.html.markdown,d/bedrock_foundation_model.html.markdown,d/bedrock_custom_models.html.markdown,d/bedrock_custom_model.html.markdown,d/batch_scheduling_policy.html.markdown,d/batch_job_queue.html.markdown,d/batch_job_definition.html.markdown,d/batch_compute_environment.html.markdown,d/backup_vault.html.markdown,d/backup_selection.html.markdown,d/backup_report_plan.html.markdown,d/backup_plan.html.markdown,d/backup_framework.html.markdown,d/availability_zones.html.markdown,d/availability_zone.html.markdown,d/autoscaling_groups.html.markdown,d/autoscaling_group.html.markdown,d/auditmanager_framework.html.markdown,d/auditmanager_control.html.markdown,d/athena_named_query.html.markdown,d/arn.html.markdown,d/appstream_image.html.markdown,d/apprunner_hosted_zone_id.html.markdown,d/appmesh_virtual_service.html.markdown,d/appmesh_virtual_router.html.markdown,d/appmesh_virtual_node.html.markdown,d/appmesh_virtual_gateway.html.markdown,d/appmesh_route.html.markdown,d/appmesh_mesh.html.markdown,d/appmesh_gateway_route.html.markdown,d/appintegrations_event_integration.html.markdown,d/appconfig_environments.html.markdown,d/appconfig_environment.html.markdown,d/appconfig_configuration_profiles.html.markdown,d/appconfig_configuration_profile.html.markdown,d/apigatewayv2_vpc_link.html.markdown,d/apigatewayv2_export.html.markdown,d/apigatewayv2_apis.html.markdown,d/apigatewayv2_api.html.markdown,d/api_gateway_vpc_link.html.markdown,d/api_gateway_sdk.html.markdown,d/api_gateway_rest_api.html.markdown,d/api_gateway_resource.html.markdown,d/api_gateway_export.html.markdown,d/api_gateway_domain_name.html.markdown,d/api_gateway_authorizers.html.markdown,d/api_gateway_authorizer.html.markdown,d/api_gateway_api_keys.html.markdown,d/api_gateway_api_key.html.markdown,d/ami_ids.html.markdown,d/ami.html.markdown,d/acmpca_certificate_authority.html.markdown,d/acmpca_certificate.html.markdown,d/acm_certificate.html.markdown,d/account_primary_contact.html.markdown --- .../python/d/ecr_repository.html.markdown | 8 +- ...repository_creation_template.html.markdown | 8 +- .../cdktf/python/d/eks_cluster.html.markdown | 3 +- .../python/d/ram_resource_share.html.markdown | 4 +- website/docs/cdktf/python/index.html.markdown | 15 +- .../cdktf/python/r/appsync_api.html.markdown | 254 ++++++++++++++++ .../r/appsync_channel_namespace.html.markdown | 118 ++++++++ .../autoscaling_lifecycle_hook.html.markdown | 4 +- .../python/r/codebuild_project.html.markdown | 9 +- .../python/r/codebuild_webhook.html.markdown | 33 +- ...repository_creation_template.html.markdown | 8 +- .../cdktf/python/r/eks_cluster.html.markdown | 5 +- .../python/r/finspace_kx_volume.html.markdown | 4 +- .../cdktf/python/r/flow_log.html.markdown | 147 ++++++++- .../python/r/gamelift_fleet.html.markdown | 6 +- .../python/r/launch_template.html.markdown | 4 +- .../cdktf/python/r/msk_cluster.html.markdown | 52 ++-- .../r/route53_resolver_endpoint.html.markdown | 5 +- .../typescript/d/ecr_repository.html.markdown | 8 +- ...repository_creation_template.html.markdown | 8 +- .../typescript/d/eks_cluster.html.markdown | 3 +- .../d/ram_resource_share.html.markdown | 4 +- .../docs/cdktf/typescript/index.html.markdown | 15 +- .../typescript/r/appsync_api.html.markdown | 285 ++++++++++++++++++ .../r/appsync_channel_namespace.html.markdown | 128 ++++++++ .../autoscaling_lifecycle_hook.html.markdown | 4 +- .../r/codebuild_project.html.markdown | 9 +- .../r/codebuild_webhook.html.markdown | 38 ++- ...repository_creation_template.html.markdown | 8 +- .../typescript/r/eks_cluster.html.markdown | 5 +- .../r/finspace_kx_volume.html.markdown | 4 +- .../cdktf/typescript/r/flow_log.html.markdown | 186 +++++++++++- .../typescript/r/gamelift_fleet.html.markdown | 6 +- .../r/launch_template.html.markdown | 4 +- .../typescript/r/msk_cluster.html.markdown | 52 ++-- .../r/route53_resolver_endpoint.html.markdown | 5 +- 36 files changed, 1339 insertions(+), 120 deletions(-) create mode 100644 website/docs/cdktf/python/r/appsync_api.html.markdown create mode 100644 website/docs/cdktf/python/r/appsync_channel_namespace.html.markdown create mode 100644 website/docs/cdktf/typescript/r/appsync_api.html.markdown create mode 100644 website/docs/cdktf/typescript/r/appsync_channel_namespace.html.markdown diff --git a/website/docs/cdktf/python/d/ecr_repository.html.markdown b/website/docs/cdktf/python/d/ecr_repository.html.markdown index ee67ab56baf5..48718261bc63 100644 --- a/website/docs/cdktf/python/d/ecr_repository.html.markdown +++ b/website/docs/cdktf/python/d/ecr_repository.html.markdown @@ -47,6 +47,7 @@ This data source exports the following attributes in addition to the arguments a * `encryption_configuration` - Encryption configuration for the repository. See [Encryption Configuration](#encryption-configuration) below. * `image_scanning_configuration` - Configuration block that defines image scanning configuration for the repository. See [Image Scanning Configuration](#image-scanning-configuration) below. * `image_tag_mutability` - The tag mutability setting for the repository. +* `image_tag_mutability_exclusion_filter` - Block that defines filters to specify which image tags can override the default tag mutability setting. * `most_recent_image_tags` - List of image tags associated with the most recently pushed image in the repository. * `repository_url` - URL of the repository (in the form `aws_account_id.dkr.ecr.region.amazonaws.com/repositoryName`). * `tags` - Map of tags assigned to the resource. @@ -56,8 +57,13 @@ This data source exports the following attributes in addition to the arguments a * `encryption_type` - Encryption type to use for the repository, either `AES256` or `KMS`. * `kms_key` - If `encryption_type` is `KMS`, the ARN of the KMS key used. +### Image Tag Mutability Exclusion Filter + +* `filter` - The filter pattern to use for excluding image tags from the mutability setting. +* `filter_type` - The type of filter to use. + ### Image Scanning Configuration * `scan_on_push` - Whether images are scanned after being pushed to the repository. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/ecr_repository_creation_template.html.markdown b/website/docs/cdktf/python/d/ecr_repository_creation_template.html.markdown index 20f96165db18..de2126b4f1b8 100644 --- a/website/docs/cdktf/python/d/ecr_repository_creation_template.html.markdown +++ b/website/docs/cdktf/python/d/ecr_repository_creation_template.html.markdown @@ -47,6 +47,7 @@ This data source exports the following attributes in addition to the arguments a * `description` - The description for this template. * `encryption_configuration` - Encryption configuration for any created repositories. See [Encryption Configuration](#encryption-configuration) below. * `image_tag_mutability` - The tag mutability setting for any created repositories. +* `image_tag_mutability_exclusion_filter` - Block that defines filters to specify which image tags can override the default tag mutability setting. * `lifecycle_policy` - The lifecycle policy document to apply to any created repositories. * `registry_id` - The registry ID the repository creation template applies to. * `repository_policy` - The registry policy document to apply to any created repositories. @@ -57,4 +58,9 @@ This data source exports the following attributes in addition to the arguments a * `encryption_type` - Encryption type to use for any created repositories, either `AES256` or `KMS`. * `kms_key` - If `encryption_type` is `KMS`, the ARN of the KMS key used. - \ No newline at end of file +### Image Tag Mutability Exclusion Filter + +* `filter` - The filter pattern to use for excluding image tags from the mutability setting. +* `filter_type` - The type of filter to use. + + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/eks_cluster.html.markdown b/website/docs/cdktf/python/d/eks_cluster.html.markdown index 004df62f262e..5f70869a9040 100644 --- a/website/docs/cdktf/python/d/eks_cluster.html.markdown +++ b/website/docs/cdktf/python/d/eks_cluster.html.markdown @@ -61,6 +61,7 @@ This data source exports the following attributes in addition to the arguments a * `data` - The base64 encoded certificate data required to communicate with your cluster. Add this to the `certificate-authority-data` section of the `kubeconfig` file for your cluster. * `cluster_id` - The ID of your local Amazon EKS cluster on the AWS Outpost. This attribute isn't available for an AWS EKS cluster on AWS cloud. * `created_at` - Unix epoch time stamp in seconds for when the cluster was created. +* `deletion_protection` - Whether deletion protection for the cluster is enabled. * `enabled_cluster_log_types` - The enabled control plane logs. * `endpoint` - Endpoint for your Kubernetes API server. * `identity` - Nested attribute containing identity provider information for your cluster. Only available on Kubernetes version 1.13 and 1.14 clusters created or upgraded on or after September 3, 2019. For an example using this information to enable IAM Roles for Service Accounts, see the [`aws_eks_cluster` resource documentation](/docs/providers/aws/r/eks_cluster.html). @@ -103,4 +104,4 @@ This data source exports the following attributes in addition to the arguments a * `zonal_shift_config` - Contains Zonal Shift Configuration. * `enabled` - Whether zonal shift is enabled. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/ram_resource_share.html.markdown b/website/docs/cdktf/python/d/ram_resource_share.html.markdown index 4691aea69085..623a66ad6b27 100644 --- a/website/docs/cdktf/python/d/ram_resource_share.html.markdown +++ b/website/docs/cdktf/python/d/ram_resource_share.html.markdown @@ -64,7 +64,7 @@ This data source supports the following arguments: * `name` - (Optional) Name of the resource share to retrieve. * `resource_owner` (Required) Owner of the resource share. Valid values are `SELF` or `OTHER-ACCOUNTS`. * `resource_share_status` (Optional) Specifies that you want to retrieve details of only those resource shares that have this status. Valid values are `PENDING`, `ACTIVE`, `FAILED`, `DELETING`, and `DELETED`. -* `filter` - (Optional) Filter used to scope the list e.g., by tags. See [related docs] (https://docs.aws.amazon.com/ram/latest/APIReference/API_TagFilter.html). +* `filter` - (Optional) Filter used to scope the list of owned shares e.g., by tags. See [related docs] (https://docs.aws.amazon.com/ram/latest/APIReference/API_TagFilter.html). * `name` - (Required) Name of the tag key to filter on. * `values` - (Required) Value of the tag key. @@ -79,4 +79,4 @@ This data source exports the following attributes in addition to the arguments a * `status` - Status of the resource share. * `tags` - Tags attached to the resource share. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/index.html.markdown b/website/docs/cdktf/python/index.html.markdown index 1ec4ed0f1fd8..1c3f10786f63 100644 --- a/website/docs/cdktf/python/index.html.markdown +++ b/website/docs/cdktf/python/index.html.markdown @@ -9,18 +9,13 @@ description: |- # AWS Provider -Use the Amazon Web Services (AWS) provider to interact with the -many resources supported by AWS. You must configure the provider -with the proper credentials before you can use it. +The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -Use the navigation to the left to read about the available resources. There are currently 1516 resources and 609 data sources available in the provider. +With 1,514 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. -To learn the basics of Terraform using this provider, follow the -hands-on [get started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). Interact with AWS services, -including Lambda, RDS, and IAM by following the [AWS services -tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). +Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). -Some AWS services do not support IPv6. As a result, the provider may not be able to interact with AWS APIs using IPv6 addresses. +Note: Some AWS services do not yet support IPv6. In those cases, the provider may not be able to connect to AWS APIs over IPv6 addresses. ## Example Usage @@ -902,4 +897,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appsync_api.html.markdown b/website/docs/cdktf/python/r/appsync_api.html.markdown new file mode 100644 index 000000000000..7c24f105ceb5 --- /dev/null +++ b/website/docs/cdktf/python/r/appsync_api.html.markdown @@ -0,0 +1,254 @@ +--- +subcategory: "AppSync" +layout: "aws" +page_title: "AWS: aws_appsync_api" +description: |- + Manages an AWS AppSync Event API. +--- + + + +# Resource: aws_appsync_api + +Manages an [AWS AppSync Event API](https://docs.aws.amazon.com/appsync/latest/eventapi/event-api-concepts.html#API). Event APIs enable real-time subscriptions and event-driven communication in AppSync applications. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_api import AppsyncApi +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppsyncApi(self, "example", + event_config=[AppsyncApiEventConfig( + auth_provider=[AppsyncApiEventConfigAuthProvider( + auth_type="API_KEY" + ) + ], + connection_auth_mode=[AppsyncApiEventConfigConnectionAuthMode( + auth_type="API_KEY" + ) + ], + default_publish_auth_mode=[AppsyncApiEventConfigDefaultPublishAuthMode( + auth_type="API_KEY" + ) + ], + default_subscribe_auth_mode=[AppsyncApiEventConfigDefaultSubscribeAuthMode( + auth_type="API_KEY" + ) + ] + ) + ], + name="example-event-api" + ) +``` + +### With Cognito Authentication + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_api import AppsyncApi +from imports.aws.cognito_user_pool import CognitoUserPool +from imports.aws.data_aws_region import DataAwsRegion +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = CognitoUserPool(self, "example", + name="example-user-pool" + ) + current = DataAwsRegion(self, "current") + aws_appsync_api_example = AppsyncApi(self, "example_2", + event_config=[AppsyncApiEventConfig( + auth_provider=[AppsyncApiEventConfigAuthProvider( + auth_type="AMAZON_COGNITO_USER_POOLS", + cognito_config=[AppsyncApiEventConfigAuthProviderCognitoConfig( + aws_region=Token.as_string(current.name), + user_pool_id=example.id + ) + ] + ) + ], + connection_auth_mode=[AppsyncApiEventConfigConnectionAuthMode( + auth_type="AMAZON_COGNITO_USER_POOLS" + ) + ], + default_publish_auth_mode=[AppsyncApiEventConfigDefaultPublishAuthMode( + auth_type="AMAZON_COGNITO_USER_POOLS" + ) + ], + default_subscribe_auth_mode=[AppsyncApiEventConfigDefaultSubscribeAuthMode( + auth_type="AMAZON_COGNITO_USER_POOLS" + ) + ] + ) + ], + name="example-event-api" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_appsync_api_example.override_logical_id("example") +``` + +### With Lambda Authorizer + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_api import AppsyncApi +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppsyncApi(self, "example", + event_config=[AppsyncApiEventConfig( + auth_provider=[AppsyncApiEventConfigAuthProvider( + auth_type="AWS_LAMBDA", + lambda_authorizer_config=[AppsyncApiEventConfigAuthProviderLambdaAuthorizerConfig( + authorizer_result_ttl_in_seconds=300, + authorizer_uri=Token.as_string(aws_lambda_function_example.invoke_arn) + ) + ] + ) + ], + connection_auth_mode=[AppsyncApiEventConfigConnectionAuthMode( + auth_type="AWS_LAMBDA" + ) + ], + default_publish_auth_mode=[AppsyncApiEventConfigDefaultPublishAuthMode( + auth_type="AWS_LAMBDA" + ) + ], + default_subscribe_auth_mode=[AppsyncApiEventConfigDefaultSubscribeAuthMode( + auth_type="AWS_LAMBDA" + ) + ] + ) + ], + name="example-event-api" + ) +``` + +## Argument Reference + +The following arguments are required: + +* `event_config` - (Required) Configuration for the Event API. See [Event Config](#event-config) below. +* `name` - (Required) Name of the Event API. + +The following arguments are optional: + +* `owner_contact` - (Optional) Contact information for the owner of the Event API. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Event Config + +The `event_config` block supports the following: + +* `auth_provider` - (Required) List of authentication providers. See [Auth Providers](#auth-providers) below. +* `connection_auth_mode` - (Required) List of authentication modes for connections. See [Auth Modes](#auth-modes) below. +* `default_publish_auth_mode` - (Required) List of default authentication modes for publishing. See [Auth Modes](#auth-modes) below. +* `default_subscribe_auth_mode` - (Required) List of default authentication modes for subscribing. See [Auth Modes](#auth-modes) below. +* `log_config` - (Optional) Logging configuration. See [Log Config](#log-config) below. + +### Auth Providers + +The `auth_provider` block supports the following: + +* `auth_type` - (Required) Type of authentication provider. Valid values: `AMAZON_COGNITO_USER_POOLS`, `AWS_LAMBDA`, `OPENID_CONNECT`, `API_KEY`. +* `cognito_config` - (Optional) Configuration for Cognito user pool authentication. Required when `auth_type` is `AMAZON_COGNITO_USER_POOLS`. See [Cognito Config](#cognito-config) below. +* `lambda_authorizer_config` - (Optional) Configuration for Lambda authorization. Required when `auth_type` is `AWS_LAMBDA`. See [Lambda Authorizer Config](#lambda-authorizer-config) below. +* `openid_connect_config` - (Optional) Configuration for OpenID Connect. Required when `auth_type` is `OPENID_CONNECT`. See [OpenID Connect Config](#openid-connect-config) below. + +### Cognito Config + +The `cognito_config` block supports the following: + +* `app_id_client_regex` - (Optional) Regular expression for matching the client ID. +* `aws_region` - (Required) AWS region where the user pool is located. +* `user_pool_id` - (Required) ID of the Cognito user pool. + +### Lambda Authorizer Config + +The `lambda_authorizer_config` block supports the following: + +* `authorizer_result_ttl_in_seconds` - (Optional) TTL in seconds for the authorization result cache. +* `authorizer_uri` - (Required) URI of the Lambda function for authorization. +* `identity_validation_expression` - (Optional) Regular expression for identity validation. + +### OpenID Connect Config + +The `openid_connect_config` block supports the following: + +* `auth_ttl` - (Optional) TTL in seconds for the authentication token. +* `client_id` - (Optional) Client ID for the OpenID Connect provider. +* `iat_ttl` - (Optional) TTL in seconds for the issued at time. +* `issuer` - (Required) Issuer URL for the OpenID Connect provider. + +### Auth Modes + +The `connection_auth_mode`, `default_publish_auth_mode`, and `default_subscribe_auth_mode` blocks support the following: + +* `auth_type` - (Required) Type of authentication. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. + +### Log Config + +The `log_config` block supports the following: + +* `cloudwatch_logs_role_arn` - (Required) ARN of the IAM role for CloudWatch logs. +* `log_level` - (Required) Log level. Valid values: `NONE`, `ERROR`, `ALL`, `INFO`, `DEBUG`. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `api_id` - ID of the Event API. +* `api_arn` - ARN of the Event API. +* `dns` - DNS configuration for the Event API. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +* `waf_web_acl_arn` - ARN of the associated WAF web ACL. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppSync Event API using the `api_id`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_api import AppsyncApi +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppsyncApi.generate_config_for_import(self, "example", "example-api-id") +``` + +Using `terraform import`, import AppSync Event API using the `api_id`. For example: + +```console +% terraform import aws_appsync_api.example example-api-id +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appsync_channel_namespace.html.markdown b/website/docs/cdktf/python/r/appsync_channel_namespace.html.markdown new file mode 100644 index 000000000000..22d186ce7d64 --- /dev/null +++ b/website/docs/cdktf/python/r/appsync_channel_namespace.html.markdown @@ -0,0 +1,118 @@ +--- +subcategory: "AppSync" +layout: "aws" +page_title: "AWS: aws_appsync_channel_namespace" +description: |- + Manages an AWS AppSync Channel Namespace. +--- + + + +# Resource: aws_appsync_channel_namespace + +Manages an [AWS AppSync Channel Namespace](https://docs.aws.amazon.com/appsync/latest/eventapi/event-api-concepts.html#namespace). + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_channel_namespace import AppsyncChannelNamespace +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppsyncChannelNamespace(self, "example", + api_id=Token.as_string(aws_appsync_api_example.api_id), + name="example-channel-namespace" + ) +``` + +## Argument Reference + +The following arguments are required: + +* `api_id` - (Required) Event API ID. +* `name` - (Required) Name of the channel namespace. + +The following arguments are optional: + +* `code_handlers` - (Optional) Event handler functions that run custom business logic to process published events and subscribe requests. +* `handler_configs` - (Optional) Configuration for the `on_publish` and `on_subscribe` handlers. See [Handler Configs](#handler-configs) below. +* `publish_auth_mode` - (Optional) Authorization modes to use for publishing messages on the channel namespace. This configuration overrides the default API authorization configuration. See [Auth Modes](#auth-modes) below. +* `subscribe_auth_mode` - (Optional) Authorization modes to use for subscribing to messages on the channel namespace. This configuration overrides the default API authorization configuration. See [Auth Modes](#auth-modes) below. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Auth Modes + +The `publish_auth_mode`, and `subscribe_auth_mode` blocks support the following: + +* `auth_type` - (Required) Type of authentication. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. + +### Handler Configs + +The `handler_configs` block support the following: + +* `on_publish` - (Optional) Handler configuration. See [Handler Config](#handler-config) below. +* `on_subscribe` - (Optional) Handler configuration. See [Handler Config](#handler-config) below. + +### Handler Config + +The `on_publish` and `on_subscribe` blocks support the following: + +* `behavior` - (Required) Behavior for the handler. Valid values: `CODE`, `DIRECT`. +* `integration` - (Required) Integration data source configuration for the handler. See [Integration](#integration) below. + +### Integration + +The `integration` block support the following: + +* `data_source_name` - (Required) Unique name of the data source that has been configured on the API. +* `lambda_config` - (Optional) Configuration for a Lambda data source. See [Lambda Config](#lambda-config) below. + +### Lambad Config + +The `lambda_config` block support the following: + +* `invoke_type` - (Optional) Invocation type for a Lambda data source. Valid values: `REQUEST_RESPONSE`, `EVENT`. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `channel_namespace_arn` - ARN of the channel namespace. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppSync Channel Namespace using the `api_id` and `name` separated by a comma (`,`). For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appsync_channel_namespace import AppsyncChannelNamespace +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppsyncChannelNamespace.generate_config_for_import(self, "example", "example-api-id,example-channel-namespace") +``` + +Using `terraform import`, import AppSync Channel Namespace using the `api_id` and `name` separated by a comma (`,`). For example: + +```console +% terraform import aws_appsync_channel_namespace.example example-api-id,example-channel-namespace +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/autoscaling_lifecycle_hook.html.markdown b/website/docs/cdktf/python/r/autoscaling_lifecycle_hook.html.markdown index 4b58cfe8778c..70b237c40060 100644 --- a/website/docs/cdktf/python/r/autoscaling_lifecycle_hook.html.markdown +++ b/website/docs/cdktf/python/r/autoscaling_lifecycle_hook.html.markdown @@ -81,7 +81,7 @@ This resource supports the following arguments: * `heartbeat_timeout` - (Optional) Defines the amount of time, in seconds, that can elapse before the lifecycle hook times out. When the lifecycle hook times out, Auto Scaling performs the action defined in the DefaultResult parameter * `lifecycle_transition` - (Required) Instance state to which you want to attach the lifecycle hook. For a list of lifecycle hook types, see [describe-lifecycle-hook-types](https://docs.aws.amazon.com/cli/latest/reference/autoscaling/describe-lifecycle-hook-types.html#examples) * `notification_metadata` - (Optional) Contains additional information that you want to include any time Auto Scaling sends a message to the notification target. -* `notification_target_arn` - (Optional) ARN of the notification target that Auto Scaling will use to notify you when an instance is in the transition state for the lifecycle hook. This ARN target can be either an SQS queue or an SNS topic. +* `notification_target_arn` - (Optional) ARN of the notification target that Auto Scaling will use to notify you when an instance is in the transition state for the lifecycle hook. This ARN target can be either an SQS queue, an SNS topic, or a Lambda function. * `role_arn` - (Optional) ARN of the IAM role that allows the Auto Scaling group to publish to the specified notification target. ## Attribute Reference @@ -113,4 +113,4 @@ Using `terraform import`, import AutoScaling Lifecycle Hooks using the role auto % terraform import aws_autoscaling_lifecycle_hook.test-lifecycle-hook asg-name/lifecycle-hook-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_project.html.markdown b/website/docs/cdktf/python/r/codebuild_project.html.markdown index ea6b60652514..0311810fe434 100644 --- a/website/docs/cdktf/python/r/codebuild_project.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_project.html.markdown @@ -16,6 +16,8 @@ source (e.g., the "rebuild every time a code change is pushed" option in the Cod ## Example Usage +### Basic Usage + ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct @@ -224,6 +226,11 @@ class MyConvertedCode(TerraformStack): ) ``` +### Runner Project + +While no special configuration is required for `aws_codebuild_project` to create a project as a Runner Project, an `aws_codebuild_webhook` resource with an appropriate `filter_group` is required. +See the [`aws_codebuild_webhook` resource documentation example](/docs/providers/aws/r/codebuild_webhook.html#for-codebuild-runner-project) for more details. + ## Argument Reference The following arguments are required: @@ -572,4 +579,4 @@ Using `terraform import`, import CodeBuild Project using the `name`. For example % terraform import aws_codebuild_project.name project-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_webhook.html.markdown b/website/docs/cdktf/python/r/codebuild_webhook.html.markdown index 5ccd5ee2fe5b..9efed3d9fad6 100644 --- a/website/docs/cdktf/python/r/codebuild_webhook.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_webhook.html.markdown @@ -92,6 +92,37 @@ class MyConvertedCode(TerraformStack): github_repository_webhook_example.override_logical_id("example") ``` +### For CodeBuild Runner Project + +To create a CodeBuild project as a Runner Project, the following `aws_codebuild_webhook` resource is required for the project. +See thr [AWS Documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/action-runner.html) for more information about CodeBuild Runner Projects. + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.codebuild_webhook import CodebuildWebhook +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + CodebuildWebhook(self, "example", + build_type="BUILD", + filter_group=[CodebuildWebhookFilterGroup( + filter=[CodebuildWebhookFilterGroupFilter( + pattern="WORKFLOW_JOB_QUEUED", + type="EVENT" + ) + ] + ) + ], + project_name=Token.as_string(aws_codebuild_project_example.name) + ) +``` + ## Argument Reference This resource supports the following arguments: @@ -156,4 +187,4 @@ Using `terraform import`, import CodeBuild Webhooks using the CodeBuild Project % terraform import aws_codebuild_webhook.example MyProjectName ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecr_repository_creation_template.html.markdown b/website/docs/cdktf/python/r/ecr_repository_creation_template.html.markdown index 00fff5ec23d7..802747a5209d 100644 --- a/website/docs/cdktf/python/r/ecr_repository_creation_template.html.markdown +++ b/website/docs/cdktf/python/r/ecr_repository_creation_template.html.markdown @@ -73,6 +73,7 @@ This resource supports the following arguments: * `description` - (Optional) The description for this template. * `encryption_configuration` - (Optional) Encryption configuration for any created repositories. See [below for schema](#encryption_configuration). * `image_tag_mutability` - (Optional) The tag mutability setting for any created repositories. Must be one of: `MUTABLE` or `IMMUTABLE`. Defaults to `MUTABLE`. +* `image_tag_mutability_exclusion_filter` - (Optional) Configuration block that defines filters to specify which image tags can override the default tag mutability setting. Only applicable when `image_tag_mutability` is set to `IMMUTABLE_WITH_EXCLUSION` or `MUTABLE_WITH_EXCLUSION`. See [below for schema](#image_tag_mutability_exclusion_filter). * `lifecycle_policy` - (Optional) The lifecycle policy document to apply to any created repositories. See more details about [Policy Parameters](http://docs.aws.amazon.com/AmazonECR/latest/userguide/LifecyclePolicies.html#lifecycle_policy_parameters) in the official AWS docs. Consider using the [`aws_ecr_lifecycle_policy_document` data_source](/docs/providers/aws/d/ecr_lifecycle_policy_document.html) to generate/manage the JSON document used for the `lifecycle_policy` argument. * `repository_policy` - (Optional) The registry policy document to apply to any created repositories. This is a JSON formatted string. For more information about building IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy). * `resource_tags` - (Optional) A map of tags to assign to any created repositories. @@ -82,6 +83,11 @@ This resource supports the following arguments: * `encryption_type` - (Optional) The encryption type to use for any created repositories. Valid values are `AES256` or `KMS`. Defaults to `AES256`. * `kms_key` - (Optional) The ARN of the KMS key to use when `encryption_type` is `KMS`. If not specified, uses the default AWS managed key for ECR. +### image_tag_mutability_exclusion_filter + +* `filter` - (Required) The filter pattern to use for excluding image tags from the mutability setting. Must contain only letters, numbers, and special characters (._*-). Each filter can be up to 128 characters long and can contain a maximum of 2 wildcards (*). +* `filter_type` - (Required) The type of filter to use. Must be `WILDCARD`. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -113,4 +119,4 @@ Using `terraform import`, import the ECR Repository Creating Templates using the % terraform import aws_ecr_repository_creation_template.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/eks_cluster.html.markdown b/website/docs/cdktf/python/r/eks_cluster.html.markdown index ce5ec1361dbb..1a2abe6bb275 100644 --- a/website/docs/cdktf/python/r/eks_cluster.html.markdown +++ b/website/docs/cdktf/python/r/eks_cluster.html.markdown @@ -307,15 +307,16 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `access_config` - (Optional) Configuration block for the access config associated with your cluster, see [Amazon EKS Access Entries](https://docs.aws.amazon.com/eks/latest/userguide/access-entries.html). [Detailed](#access_config) below. * `bootstrap_self_managed_addons` - (Optional) Install default unmanaged add-ons, such as `aws-cni`, `kube-proxy`, and CoreDNS during cluster creation. If `false`, you must manually install desired add-ons. Changing this value will force a new cluster to be created. Defaults to `true`. * `compute_config` - (Optional) Configuration block with compute configuration for EKS Auto Mode. [Detailed](#compute_config) below. +* `deletion_protection` - (Optional) Whether to enable deletion protection for the cluster. When enabled, the cluster cannot be deleted unless deletion protection is first disabled. Default: `false`. * `enabled_cluster_log_types` - (Optional) List of the desired control plane logging to enable. For more information, see [Amazon EKS Control Plane Logging](https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html). * `encryption_config` - (Optional) Configuration block with encryption configuration for the cluster. [Detailed](#encryption_config) below. * `force_update_version` - (Optional) Force version update by overriding upgrade-blocking readiness checks when updating a cluster. * `kubernetes_network_config` - (Optional) Configuration block with kubernetes network configuration for the cluster. [Detailed](#kubernetes_network_config) below. If removed, Terraform will only perform drift detection if a configuration value is provided. * `outpost_config` - (Optional) Configuration block representing the configuration of your local Amazon EKS cluster on an AWS Outpost. This block isn't available for creating Amazon EKS clusters on the AWS cloud. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `remote_network_config` - (Optional) Configuration block with remote network configuration for EKS Hybrid Nodes. [Detailed](#remote_network_config) below. * `storage_config` - (Optional) Configuration block with storage configuration for EKS Auto Mode. [Detailed](#storage_config) below. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -508,4 +509,4 @@ Using `terraform import`, import EKS Clusters using the `name`. For example: % terraform import aws_eks_cluster.my_cluster my_cluster ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/finspace_kx_volume.html.markdown b/website/docs/cdktf/python/r/finspace_kx_volume.html.markdown index 9e7d38fe07bc..35c10fb8a992 100644 --- a/website/docs/cdktf/python/r/finspace_kx_volume.html.markdown +++ b/website/docs/cdktf/python/r/finspace_kx_volume.html.markdown @@ -29,7 +29,7 @@ class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) FinspaceKxVolume(self, "example", - availability_zones=Token.as_list("use1-az2"), + availability_zones=["use1-az2"], az_mode="SINGLE", environment_id=Token.as_string(aws_finspace_kx_environment_example.id), name="my-tf-kx-volume", @@ -119,4 +119,4 @@ Using `terraform import`, import an AWS FinSpace Kx Volume using the `id` (envir % terraform import aws_finspace_kx_volume.example n3ceo7wqxoxcti5tujqwzs,my-tf-kx-volume ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/flow_log.html.markdown b/website/docs/cdktf/python/r/flow_log.html.markdown index 8cfb72dcef2c..804cb270ae64 100644 --- a/website/docs/cdktf/python/r/flow_log.html.markdown +++ b/website/docs/cdktf/python/r/flow_log.html.markdown @@ -11,7 +11,7 @@ description: |- # Resource: aws_flow_log Provides a VPC/Subnet/ENI/Transit Gateway/Transit Gateway Attachment Flow Log to capture IP traffic for a specific network -interface, subnet, or VPC. Logs are sent to a CloudWatch Log Group, a S3 Bucket, or Amazon Kinesis Data Firehose +interface, subnet, or VPC. Logs are sent to a CloudWatch Log Group, a S3 Bucket, or Amazon Data Firehose ## Example Usage @@ -82,7 +82,7 @@ class MyConvertedCode(TerraformStack): aws_flow_log_example.override_logical_id("example") ``` -### Amazon Kinesis Data Firehose logging +### Amazon Data Firehose logging ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug @@ -228,15 +228,152 @@ class MyConvertedCode(TerraformStack): aws_flow_log_example.override_logical_id("example") ``` +### Cross-Account Amazon Data Firehose Logging + +The following example shows how to set up a flow log in one AWS account (source) that sends logs to an Amazon Data Firehose delivery stream in another AWS account (destination). +See the [AWS Documentation](https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs-firehose.html). + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.flow_log import FlowLog +from imports.aws.iam_role import IamRole +from imports.aws.iam_role_policy import IamRolePolicy +from imports.aws.kinesis_firehose_delivery_stream import KinesisFirehoseDeliveryStream +from imports.aws.provider import AwsProvider +from imports.aws.vpc import Vpc +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name, *, destination, name): + super().__init__(scope, name) + AwsProvider(self, "aws", + profile="admin-src" + ) + destination_account = AwsProvider(self, "aws_1", + alias="destination_account", + profile="admin-dst" + ) + dst = KinesisFirehoseDeliveryStream(self, "dst", + provider=destination_account, + tags={ + "LogDeliveryEnabled": "true" + }, + destination=destination, + name=name + ) + src = Vpc(self, "src") + dst_role_policy = DataAwsIamPolicyDocument(self, "dst_role_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["iam:CreateServiceLinkedRole", "firehose:TagDeliveryStream" + ], + effect="Allow", + resources=["*"] + ) + ] + ) + src_assume_role_policy = DataAwsIamPolicyDocument(self, "src_assume_role_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["sts:AssumeRole"], + effect="Allow", + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["delivery.logs.amazonaws.com"], + type="Service" + ) + ] + ) + ] + ) + aws_iam_role_src = IamRole(self, "src_6", + assume_role_policy=Token.as_string(src_assume_role_policy.json), + name="tf-example-mySourceRole" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_src.override_logical_id("src") + dst_assume_role_policy = DataAwsIamPolicyDocument(self, "dst_assume_role_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["sts:AssumeRole"], + effect="Allow", + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=[Token.as_string(aws_iam_role_src.arn)], + type="AWS" + ) + ] + ) + ] + ) + aws_iam_role_dst = IamRole(self, "dst_8", + assume_role_policy=Token.as_string(dst_assume_role_policy.json), + name="AWSLogDeliveryFirehoseCrossAccountRole", + provider=destination_account + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_dst.override_logical_id("dst") + aws_iam_role_policy_dst = IamRolePolicy(self, "dst_9", + name="AWSLogDeliveryFirehoseCrossAccountRolePolicy", + policy=Token.as_string(dst_role_policy.json), + provider=destination_account, + role=Token.as_string(aws_iam_role_dst.name) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_policy_dst.override_logical_id("dst") + src_role_policy = DataAwsIamPolicyDocument(self, "src_role_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["iam:PassRole"], + condition=[DataAwsIamPolicyDocumentStatementCondition( + test="StringEquals", + values=["delivery.logs.amazonaws.com"], + variable="iam:PassedToService" + ), DataAwsIamPolicyDocumentStatementCondition( + test="StringLike", + values=[src.arn], + variable="iam:AssociatedResourceARN" + ) + ], + effect="Allow", + resources=[Token.as_string(aws_iam_role_src.arn)] + ), DataAwsIamPolicyDocumentStatement( + actions=["logs:CreateLogDelivery", "logs:DeleteLogDelivery", "logs:ListLogDeliveries", "logs:GetLogDelivery" + ], + effect="Allow", + resources=["*"] + ), DataAwsIamPolicyDocumentStatement( + actions=["sts:AssumeRole"], + effect="Allow", + resources=[Token.as_string(aws_iam_role_dst.arn)] + ) + ] + ) + aws_flow_log_src = FlowLog(self, "src_11", + deliver_cross_account_role=Token.as_string(aws_iam_role_dst.arn), + iam_role_arn=Token.as_string(aws_iam_role_src.arn), + log_destination=dst.arn, + log_destination_type="kinesis-data-firehose", + traffic_type="ALL", + vpc_id=src.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_flow_log_src.override_logical_id("src") + IamRolePolicy(self, "src_policy", + name="tf-example-mySourceRolePolicy", + policy=Token.as_string(src_role_policy.json), + role=Token.as_string(aws_iam_role_src.name) + ) +``` + ## Argument Reference This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `traffic_type` - (Required) The type of traffic to capture. Valid values: `ACCEPT`,`REJECT`, `ALL`. -* `deliver_cross_account_role` - (Optional) ARN of the IAM role that allows Amazon EC2 to publish flow logs across accounts. +* `deliver_cross_account_role` - (Optional) ARN of the IAM role in the destination account used for cross-account delivery of flow logs. * `eni_id` - (Optional) Elastic Network Interface ID to attach to. -* `iam_role_arn` - (Optional) ARN of the IAM role that's used to post flow logs to a CloudWatch Logs log group. +* `iam_role_arn` - (Optional) ARN of the IAM role used to post flow logs. Corresponds to `DeliverLogsPermissionArn` in the [AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFlowLogs.html). * `log_destination_type` - (Optional) Logging destination type. Valid values: `cloud-watch-logs`, `s3`, `kinesis-data-firehose`. Default: `cloud-watch-logs`. * `log_destination` - (Optional) ARN of the logging destination. * `subnet_id` - (Optional) Subnet ID to attach to. @@ -293,4 +430,4 @@ Using `terraform import`, import Flow Logs using the `id`. For example: % terraform import aws_flow_log.test_flow_log fl-1a2b3c4d ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/gamelift_fleet.html.markdown b/website/docs/cdktf/python/r/gamelift_fleet.html.markdown index 36cc8f1790c1..98493fad6f88 100644 --- a/website/docs/cdktf/python/r/gamelift_fleet.html.markdown +++ b/website/docs/cdktf/python/r/gamelift_fleet.html.markdown @@ -35,7 +35,7 @@ resource "aws_gamelift_fleet" "example" { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `build_id` - (Optional) ID of the GameLift Build to be deployed on the fleet. +* `build_id` - (Optional) ID of the GameLift Build to be deployed on the fleet. Conflicts with `script_id`. * `certificate_configuration` - (Optional) Prompts GameLift to generate a TLS/SSL certificate for the fleet. See [certificate_configuration](#certificate_configuration). * `description` - (Optional) Human-readable description of the fleet. * `ec2_inbound_permission` - (Optional) Range of IP addresses and port settings that permit inbound traffic to access server processes running on the fleet. See below. @@ -47,7 +47,7 @@ This resource supports the following arguments: * `new_game_session_protection_policy` - (Optional) Game session protection policy to apply to all instances in this fleetE.g., `FullProtection`. Defaults to `NoProtection`. * `resource_creation_limit_policy` - (Optional) Policy that limits the number of game sessions an individual player can create over a span of time for this fleet. See below. * `runtime_configuration` - (Optional) Instructions for launching server processes on each instance in the fleet. See below. -* `script_id` - (Optional) ID of the GameLift Script to be deployed on the fleet. +* `script_id` - (Optional) ID of the GameLift Script to be deployed on the fleet. Conflicts with `build_id`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### Nested Fields @@ -123,4 +123,4 @@ Using `terraform import`, import GameLift Fleets using the ID. For example: % terraform import aws_gamelift_fleet.example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/launch_template.html.markdown b/website/docs/cdktf/python/r/launch_template.html.markdown index 5e0183da9282..25aaf3ad98ea 100644 --- a/website/docs/cdktf/python/r/launch_template.html.markdown +++ b/website/docs/cdktf/python/r/launch_template.html.markdown @@ -179,7 +179,7 @@ The `ebs` block supports the following: The `capacity_reservation_specification` block supports the following: -* `capacity_reservation_preference` - Indicates the instance's Capacity Reservation preferences. Can be `open` or `none`. (Default `none`). +* `capacity_reservation_preference` - Indicates the instance's Capacity Reservation preferences. Can be `capacity-reservations-only`, `open` or `none`. If `capacity_reservation_id` or `capacity_reservation_resource_group_arn` is specified in `capacity_reservation_target` block, either omit `capacity_reservation_preference` or set it to `capacity-reservations-only`. * `capacity_reservation_target` - Used to target a specific Capacity Reservation: The `capacity_reservation_target` block supports the following: @@ -512,4 +512,4 @@ Using `terraform import`, import Launch Templates using the `id`. For example: % terraform import aws_launch_template.web lt-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/msk_cluster.html.markdown b/website/docs/cdktf/python/r/msk_cluster.html.markdown index fc04829d8588..ff4ac13840c6 100644 --- a/website/docs/cdktf/python/r/msk_cluster.html.markdown +++ b/website/docs/cdktf/python/r/msk_cluster.html.markdown @@ -206,16 +206,16 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `broker_node_group_info` - (Required) Configuration block for the broker nodes of the Kafka cluster. +* `broker_node_group_info` - (Required) Configuration block for the broker nodes of the Kafka cluster. See [broker_node_group_info Argument Reference](#broker_node_group_info-argument-reference) below. * `cluster_name` - (Required) Name of the MSK cluster. * `kafka_version` - (Required) Specify the desired Kafka software version. * `number_of_broker_nodes` - (Required) The desired total number of broker nodes in the kafka cluster. It must be a multiple of the number of specified client subnets. -* `client_authentication` - (Optional) Configuration block for specifying a client authentication. See below. -* `configuration_info` - (Optional) Configuration block for specifying a MSK Configuration to attach to Kafka brokers. See below. -* `encryption_info` - (Optional) Configuration block for specifying encryption. See below. +* `client_authentication` - (Optional) Configuration block for specifying a client authentication. See [client_authentication Argument Reference](#client_authentication-argument-reference) below. +* `configuration_info` - (Optional) Configuration block for specifying an MSK Configuration to attach to Kafka brokers. See [configuration_info Argument Reference](#configuration_info-argument-reference) below. +* `encryption_info` - (Optional) Configuration block for specifying encryption. See [encryption_info Argument Reference](#encryption_info-argument-reference) below. * `enhanced_monitoring` - (Optional) Specify the desired enhanced MSK CloudWatch monitoring level. See [Monitoring Amazon MSK with Amazon CloudWatch](https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html) -* `open_monitoring` - (Optional) Configuration block for JMX and Node monitoring for the MSK cluster. See below. -* `logging_info` - (Optional) Configuration block for streaming broker logs to Cloudwatch/S3/Kinesis Firehose. See below. +* `open_monitoring` - (Optional) Configuration block for JMX and Node monitoring for the MSK cluster. See [open_monitoring Argument Reference](#open_monitoring-argument-reference) below. +* `logging_info` - (Optional) Configuration block for streaming broker logs to Cloudwatch/S3/Kinesis Firehose. See [logging_info Argument Reference](#logging_info-argument-reference) below. * `storage_mode` - (Optional) Controls storage mode for supported storage tiers. Valid values are: `LOCAL` or `TIERED`. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -224,14 +224,14 @@ This resource supports the following arguments: * `client_subnets` - (Required) A list of subnets to connect to in client VPC ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-prop-brokernodegroupinfo-clientsubnets)). * `instance_type` - (Required) Specify the instance type to use for the kafka brokersE.g., kafka.m5.large. ([Pricing info](https://aws.amazon.com/msk/pricing/)) * `security_groups` - (Required) A list of the security groups to associate with the elastic network interfaces to control who can communicate with the cluster. -* `az_distribution` - (Optional) The distribution of broker nodes across availability zones ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-model-brokerazdistribution)). Currently the only valid value is `DEFAULT`. -* `connectivity_info` - (Optional) Information about the cluster access configuration. See below. For security reasons, you can't turn on public access while creating an MSK cluster. However, you can update an existing cluster to make it publicly accessible. You can also create a new cluster and then update it to make it publicly accessible ([documentation](https://docs.aws.amazon.com/msk/latest/developerguide/public-access.html)). -* `storage_info` - (Optional) A block that contains information about storage volumes attached to MSK broker nodes. See below. +* `az_distribution` - (Optional) The distribution of broker nodes across availability zones ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-model-brokerazdistribution)). Currently, the only valid value is `DEFAULT`. +* `connectivity_info` - (Optional) Information about the cluster access configuration. See [broker_node_group_info connectivity_info Argument Reference](#broker_node_group_info-connectivity_info-argument-reference) below. For security reasons, you can't turn on public access while creating an MSK cluster. However, you can update an existing cluster to make it publicly accessible. You can also create a new cluster and then update it to make it publicly accessible ([documentation](https://docs.aws.amazon.com/msk/latest/developerguide/public-access.html)). +* `storage_info` - (Optional) A block that contains information about storage volumes attached to MSK broker nodes. See [broker_node_group_info storage_info Argument Reference](#broker_node_group_info-storage_info-argument-reference) below. ### broker_node_group_info connectivity_info Argument Reference -* `public_access` - (Optional) Access control settings for brokers. See below. -* `vpc_connectivity` - (Optional) VPC connectivity access control for brokers. See below. +* `public_access` - (Optional) Access control settings for brokers. See [connectivity_info public_access Argument Reference](#connectivity_info-public_access-argument-reference) below. +* `vpc_connectivity` - (Optional) VPC connectivity access control for brokers. See [connectivity_info vpc_connectivity Argument Reference](#connectivity_info-vpc_connectivity-argument-reference) below. ### connectivity_info public_access Argument Reference @@ -239,11 +239,11 @@ This resource supports the following arguments: ### connectivity_info vpc_connectivity Argument Reference -* `client_authentication` - (Optional) Includes all client authentication information for VPC connectivity. See below. +* `client_authentication` - (Optional) Includes all client authentication information for VPC connectivity. See [vpc_connectivity client_authentication Argument Reference](#vpc_connectivity-client_authentication-argument-reference) below. ### vpc_connectivity client_authentication Argument Reference -* `sasl` - (Optional) SASL authentication type details for VPC connectivity. See below. +* `sasl` - (Optional) SASL authentication type details for VPC connectivity. See [vpc_connectivity client_authentication sasl Argument Reference](#vpc_connectivity-client_authentication-sasl-argument-reference) below. * `tls` - (Optional) Enables TLS authentication for VPC connectivity. ### vpc_connectivity client_authentication sasl Argument Reference @@ -253,11 +253,11 @@ This resource supports the following arguments: ### broker_node_group_info storage_info Argument Reference -* `ebs_storage_info` - (Optional) A block that contains EBS volume information. See below. +* `ebs_storage_info` - (Optional) A block that contains EBS volume information. See [storage_info ebs_storage_info Argument Reference](#storage_info-ebs_storage_info-argument-reference) below. ### storage_info ebs_storage_info Argument Reference -* `provisioned_throughput` - (Optional) A block that contains EBS volume provisioned throughput information. To provision storage throughput, you must choose broker type kafka.m5.4xlarge or larger. See below. +* `provisioned_throughput` - (Optional) A block that contains EBS volume provisioned throughput information. To provision storage throughput, you must choose broker type kafka.m5.4xlarge or larger. See [ebs_storage_info provisioned_throughput Argument Reference](#ebs_storage_info-provisioned_throughput-argument-reference) below. * `volume_size` - (Optional) The size in GiB of the EBS volume for the data drive on each broker node. Minimum value of `1` and maximum value of `16384`. ### ebs_storage_info provisioned_throughput Argument Reference @@ -267,8 +267,8 @@ This resource supports the following arguments: ### client_authentication Argument Reference -* `sasl` - (Optional) Configuration block for specifying SASL client authentication. See below. -* `tls` - (Optional) Configuration block for specifying TLS client authentication. See below. +* `sasl` - (Optional) Configuration block for specifying SASL client authentication. See [client_authentication sasl Argument Reference](#client_authentication-sasl-argument-reference) below. +* `tls` - (Optional) Configuration block for specifying TLS client authentication. See [client_authentication tls Argument Reference](#client_authentication-tls-argument-reference) below. * `unauthenticated` - (Optional) Enables unauthenticated access. #### client_authentication sasl Argument Reference @@ -287,7 +287,7 @@ This resource supports the following arguments: ### encryption_info Argument Reference -* `encryption_in_transit` - (Optional) Configuration block to specify encryption in transit. See below. +* `encryption_in_transit` - (Optional) Configuration block to specify encryption in transit. See [encryption_info encryption_in_transit Argument Reference](#encryption_info-encryption_in_transit-argument-reference) below. * `encryption_at_rest_kms_key_arn` - (Optional) You may specify a KMS key short ID or ARN (it will always output an ARN) to use for encrypting your data at rest. If no key is specified, an AWS managed KMS ('aws/msk' managed service) key will be used for encrypting the data at rest. #### encryption_info encryption_in_transit Argument Reference @@ -297,12 +297,12 @@ This resource supports the following arguments: #### open_monitoring Argument Reference -* `prometheus` - (Required) Configuration block for Prometheus settings for open monitoring. See below. +* `prometheus` - (Required) Configuration block for Prometheus settings for open monitoring. See [open_monitoring prometheus Argument Reference](#open_monitoring-prometheus-argument-reference) below. #### open_monitoring prometheus Argument Reference -* `jmx_exporter` - (Optional) Configuration block for JMX Exporter. See below. -* `node_exporter` - (Optional) Configuration block for Node Exporter. See below. +* `jmx_exporter` - (Optional) Configuration block for JMX Exporter. See [open_monitoring prometheus jmx_exporter Argument Reference](#open_monitoring-prometheus-jmx_exporter-argument-reference) below. +* `node_exporter` - (Optional) Configuration block for Node Exporter. See [open_monitoring prometheus node_exporter Argument Reference](#open_monitoring-prometheus-node_exporter-argument-reference) below. #### open_monitoring prometheus jmx_exporter Argument Reference @@ -314,7 +314,13 @@ This resource supports the following arguments: #### logging_info Argument Reference -* `broker_logs` - (Required) Configuration block for Broker Logs settings for logging info. See below. +* `broker_logs` - (Required) Configuration block for Broker Logs settings for logging info. See [logging_info broker_logs Argument Reference](#logging_info-broker_logs-argument-reference) below. + +#### logging_info broker_logs Argument Reference + +* `cloudwatch_logs` - (Optional) Configuration block for Cloudwatch Logs settings. See [logging_info broker_logs cloudwatch_logs Argument Reference](#logging_info-broker_logs-cloudwatch_logs-argument-reference) below. +* `firehose` - (Optional) Configuration block for Kinesis Data Firehose settings. See [logging_info broker_logs firehose Argument Reference](#logging_info-broker_logs-firehose-argument-reference) below. +* `s3` - (Optional) Configuration block for S3 settings. See [logging_info broker_logs s3 Argument Reference](#logging_info-broker_logs-s3-argument-reference) below. #### logging_info broker_logs cloudwatch_logs Argument Reference @@ -388,4 +394,4 @@ Using `terraform import`, import MSK clusters using the cluster `arn`. For examp % terraform import aws_msk_cluster.example arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/route53_resolver_endpoint.html.markdown b/website/docs/cdktf/python/r/route53_resolver_endpoint.html.markdown index a238ae6fa02c..0d63497a34c6 100644 --- a/website/docs/cdktf/python/r/route53_resolver_endpoint.html.markdown +++ b/website/docs/cdktf/python/r/route53_resolver_endpoint.html.markdown @@ -51,8 +51,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `direction` - (Required) Direction of DNS queries to or from the Route 53 Resolver endpoint. -Valid values are `INBOUND` (resolver forwards DNS queries to the DNS service for a VPC from your network or another VPC) -or `OUTBOUND` (resolver forwards DNS queries from the DNS service for a VPC to your network or another VPC). +Valid values are `INBOUND` (resolver forwards DNS queries to the DNS service for a VPC from your network or another VPC), `OUTBOUND` (resolver forwards DNS queries from the DNS service for a VPC to your network or another VPC) or `INBOUND_DELEGATION` (resolver delegates queries to Route 53 private hosted zones from your network). * `ip_address` - (Required) Subnets and IP addresses in your VPC that you want DNS queries to pass through on the way from your VPCs to your network (for outbound endpoints) or on the way from your network to your VPCs (for inbound endpoints). Described below. * `name` - (Optional) Friendly name of the Route 53 Resolver endpoint. @@ -111,4 +110,4 @@ Using `terraform import`, import Route 53 Resolver endpoints using the Route 53 % terraform import aws_route53_resolver_endpoint.foo rslvr-in-abcdef01234567890 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/ecr_repository.html.markdown b/website/docs/cdktf/typescript/d/ecr_repository.html.markdown index d36d7dfe5f04..0142aaf4fb45 100644 --- a/website/docs/cdktf/typescript/d/ecr_repository.html.markdown +++ b/website/docs/cdktf/typescript/d/ecr_repository.html.markdown @@ -50,6 +50,7 @@ This data source exports the following attributes in addition to the arguments a * `encryptionConfiguration` - Encryption configuration for the repository. See [Encryption Configuration](#encryption-configuration) below. * `imageScanningConfiguration` - Configuration block that defines image scanning configuration for the repository. See [Image Scanning Configuration](#image-scanning-configuration) below. * `imageTagMutability` - The tag mutability setting for the repository. +* `imageTagMutabilityExclusionFilter` - Block that defines filters to specify which image tags can override the default tag mutability setting. * `mostRecentImageTags` - List of image tags associated with the most recently pushed image in the repository. * `repositoryUrl` - URL of the repository (in the form `aws_account_id.dkr.ecr.region.amazonaws.com/repositoryName`). * `tags` - Map of tags assigned to the resource. @@ -59,8 +60,13 @@ This data source exports the following attributes in addition to the arguments a * `encryptionType` - Encryption type to use for the repository, either `AES256` or `KMS`. * `kmsKey` - If `encryptionType` is `KMS`, the ARN of the KMS key used. +### Image Tag Mutability Exclusion Filter + +* `filter` - The filter pattern to use for excluding image tags from the mutability setting. +* `filterType` - The type of filter to use. + ### Image Scanning Configuration * `scanOnPush` - Whether images are scanned after being pushed to the repository. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/ecr_repository_creation_template.html.markdown b/website/docs/cdktf/typescript/d/ecr_repository_creation_template.html.markdown index 56ecfcfa8922..85c04bdf4e8f 100644 --- a/website/docs/cdktf/typescript/d/ecr_repository_creation_template.html.markdown +++ b/website/docs/cdktf/typescript/d/ecr_repository_creation_template.html.markdown @@ -50,6 +50,7 @@ This data source exports the following attributes in addition to the arguments a * `description` - The description for this template. * `encryptionConfiguration` - Encryption configuration for any created repositories. See [Encryption Configuration](#encryption-configuration) below. * `imageTagMutability` - The tag mutability setting for any created repositories. +* `imageTagMutabilityExclusionFilter` - Block that defines filters to specify which image tags can override the default tag mutability setting. * `lifecyclePolicy` - The lifecycle policy document to apply to any created repositories. * `registryId` - The registry ID the repository creation template applies to. * `repositoryPolicy` - The registry policy document to apply to any created repositories. @@ -60,4 +61,9 @@ This data source exports the following attributes in addition to the arguments a * `encryptionType` - Encryption type to use for any created repositories, either `AES256` or `KMS`. * `kmsKey` - If `encryptionType` is `KMS`, the ARN of the KMS key used. - \ No newline at end of file +### Image Tag Mutability Exclusion Filter + +* `filter` - The filter pattern to use for excluding image tags from the mutability setting. +* `filterType` - The type of filter to use. + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/eks_cluster.html.markdown b/website/docs/cdktf/typescript/d/eks_cluster.html.markdown index d601d875f3f7..b5c0f2b680a1 100644 --- a/website/docs/cdktf/typescript/d/eks_cluster.html.markdown +++ b/website/docs/cdktf/typescript/d/eks_cluster.html.markdown @@ -64,6 +64,7 @@ This data source exports the following attributes in addition to the arguments a * `data` - The base64 encoded certificate data required to communicate with your cluster. Add this to the `certificate-authority-data` section of the `kubeconfig` file for your cluster. * `clusterId` - The ID of your local Amazon EKS cluster on the AWS Outpost. This attribute isn't available for an AWS EKS cluster on AWS cloud. * `createdAt` - Unix epoch time stamp in seconds for when the cluster was created. +* `deletionProtection` - Whether deletion protection for the cluster is enabled. * `enabledClusterLogTypes` - The enabled control plane logs. * `endpoint` - Endpoint for your Kubernetes API server. * `identity` - Nested attribute containing identity provider information for your cluster. Only available on Kubernetes version 1.13 and 1.14 clusters created or upgraded on or after September 3, 2019. For an example using this information to enable IAM Roles for Service Accounts, see the [`aws_eks_cluster` resource documentation](/docs/providers/aws/r/eks_cluster.html). @@ -106,4 +107,4 @@ This data source exports the following attributes in addition to the arguments a * `zonalShiftConfig` - Contains Zonal Shift Configuration. * `enabled` - Whether zonal shift is enabled. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/ram_resource_share.html.markdown b/website/docs/cdktf/typescript/d/ram_resource_share.html.markdown index 4e87703dd4f0..654c92df3adc 100644 --- a/website/docs/cdktf/typescript/d/ram_resource_share.html.markdown +++ b/website/docs/cdktf/typescript/d/ram_resource_share.html.markdown @@ -71,7 +71,7 @@ This data source supports the following arguments: * `name` - (Optional) Name of the resource share to retrieve. * `resourceOwner` (Required) Owner of the resource share. Valid values are `SELF` or `OTHER-ACCOUNTS`. * `resourceShareStatus` (Optional) Specifies that you want to retrieve details of only those resource shares that have this status. Valid values are `PENDING`, `ACTIVE`, `FAILED`, `DELETING`, and `DELETED`. -* `filter` - (Optional) Filter used to scope the list e.g., by tags. See [related docs] (https://docs.aws.amazon.com/ram/latest/APIReference/API_TagFilter.html). +* `filter` - (Optional) Filter used to scope the list of owned shares e.g., by tags. See [related docs] (https://docs.aws.amazon.com/ram/latest/APIReference/API_TagFilter.html). * `name` - (Required) Name of the tag key to filter on. * `values` - (Required) Value of the tag key. @@ -86,4 +86,4 @@ This data source exports the following attributes in addition to the arguments a * `status` - Status of the resource share. * `tags` - Tags attached to the resource share. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/index.html.markdown b/website/docs/cdktf/typescript/index.html.markdown index 14a08ac429cc..42333c8ee233 100644 --- a/website/docs/cdktf/typescript/index.html.markdown +++ b/website/docs/cdktf/typescript/index.html.markdown @@ -9,18 +9,13 @@ description: |- # AWS Provider -Use the Amazon Web Services (AWS) provider to interact with the -many resources supported by AWS. You must configure the provider -with the proper credentials before you can use it. +The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -Use the navigation to the left to read about the available resources. There are currently 1516 resources and 609 data sources available in the provider. +With 1,514 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. -To learn the basics of Terraform using this provider, follow the -hands-on [get started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). Interact with AWS services, -including Lambda, RDS, and IAM by following the [AWS services -tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). +Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). -Some AWS services do not support IPv6. As a result, the provider may not be able to interact with AWS APIs using IPv6 addresses. +Note: Some AWS services do not yet support IPv6. In those cases, the provider may not be able to connect to AWS APIs over IPv6 addresses. ## Example Usage @@ -953,4 +948,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appsync_api.html.markdown b/website/docs/cdktf/typescript/r/appsync_api.html.markdown new file mode 100644 index 000000000000..d440ec192177 --- /dev/null +++ b/website/docs/cdktf/typescript/r/appsync_api.html.markdown @@ -0,0 +1,285 @@ +--- +subcategory: "AppSync" +layout: "aws" +page_title: "AWS: aws_appsync_api" +description: |- + Manages an AWS AppSync Event API. +--- + + + +# Resource: aws_appsync_api + +Manages an [AWS AppSync Event API](https://docs.aws.amazon.com/appsync/latest/eventapi/event-api-concepts.html#API). Event APIs enable real-time subscriptions and event-driven communication in AppSync applications. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncApi } from "./.gen/providers/aws/appsync-api"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new AppsyncApi(this, "example", { + eventConfig: [ + { + authProvider: [ + { + authType: "API_KEY", + }, + ], + connectionAuthMode: [ + { + authType: "API_KEY", + }, + ], + defaultPublishAuthMode: [ + { + authType: "API_KEY", + }, + ], + defaultSubscribeAuthMode: [ + { + authType: "API_KEY", + }, + ], + }, + ], + name: "example-event-api", + }); + } +} + +``` + +### With Cognito Authentication + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncApi } from "./.gen/providers/aws/appsync-api"; +import { CognitoUserPool } from "./.gen/providers/aws/cognito-user-pool"; +import { DataAwsRegion } from "./.gen/providers/aws/data-aws-region"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new CognitoUserPool(this, "example", { + name: "example-user-pool", + }); + const current = new DataAwsRegion(this, "current", {}); + const awsAppsyncApiExample = new AppsyncApi(this, "example_2", { + eventConfig: [ + { + authProvider: [ + { + authType: "AMAZON_COGNITO_USER_POOLS", + cognitoConfig: [ + { + awsRegion: Token.asString(current.name), + userPoolId: example.id, + }, + ], + }, + ], + connectionAuthMode: [ + { + authType: "AMAZON_COGNITO_USER_POOLS", + }, + ], + defaultPublishAuthMode: [ + { + authType: "AMAZON_COGNITO_USER_POOLS", + }, + ], + defaultSubscribeAuthMode: [ + { + authType: "AMAZON_COGNITO_USER_POOLS", + }, + ], + }, + ], + name: "example-event-api", + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsAppsyncApiExample.overrideLogicalId("example"); + } +} + +``` + +### With Lambda Authorizer + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncApi } from "./.gen/providers/aws/appsync-api"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new AppsyncApi(this, "example", { + eventConfig: [ + { + authProvider: [ + { + authType: "AWS_LAMBDA", + lambdaAuthorizerConfig: [ + { + authorizerResultTtlInSeconds: 300, + authorizerUri: Token.asString( + awsLambdaFunctionExample.invokeArn + ), + }, + ], + }, + ], + connectionAuthMode: [ + { + authType: "AWS_LAMBDA", + }, + ], + defaultPublishAuthMode: [ + { + authType: "AWS_LAMBDA", + }, + ], + defaultSubscribeAuthMode: [ + { + authType: "AWS_LAMBDA", + }, + ], + }, + ], + name: "example-event-api", + }); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `eventConfig` - (Required) Configuration for the Event API. See [Event Config](#event-config) below. +* `name` - (Required) Name of the Event API. + +The following arguments are optional: + +* `ownerContact` - (Optional) Contact information for the owner of the Event API. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Event Config + +The `eventConfig` block supports the following: + +* `authProvider` - (Required) List of authentication providers. See [Auth Providers](#auth-providers) below. +* `connectionAuthMode` - (Required) List of authentication modes for connections. See [Auth Modes](#auth-modes) below. +* `defaultPublishAuthMode` - (Required) List of default authentication modes for publishing. See [Auth Modes](#auth-modes) below. +* `defaultSubscribeAuthMode` - (Required) List of default authentication modes for subscribing. See [Auth Modes](#auth-modes) below. +* `logConfig` - (Optional) Logging configuration. See [Log Config](#log-config) below. + +### Auth Providers + +The `authProvider` block supports the following: + +* `authType` - (Required) Type of authentication provider. Valid values: `AMAZON_COGNITO_USER_POOLS`, `AWS_LAMBDA`, `OPENID_CONNECT`, `API_KEY`. +* `cognitoConfig` - (Optional) Configuration for Cognito user pool authentication. Required when `authType` is `AMAZON_COGNITO_USER_POOLS`. See [Cognito Config](#cognito-config) below. +* `lambdaAuthorizerConfig` - (Optional) Configuration for Lambda authorization. Required when `authType` is `AWS_LAMBDA`. See [Lambda Authorizer Config](#lambda-authorizer-config) below. +* `openidConnectConfig` - (Optional) Configuration for OpenID Connect. Required when `authType` is `OPENID_CONNECT`. See [OpenID Connect Config](#openid-connect-config) below. + +### Cognito Config + +The `cognitoConfig` block supports the following: + +* `appIdClientRegex` - (Optional) Regular expression for matching the client ID. +* `awsRegion` - (Required) AWS region where the user pool is located. +* `userPoolId` - (Required) ID of the Cognito user pool. + +### Lambda Authorizer Config + +The `lambdaAuthorizerConfig` block supports the following: + +* `authorizerResultTtlInSeconds` - (Optional) TTL in seconds for the authorization result cache. +* `authorizerUri` - (Required) URI of the Lambda function for authorization. +* `identityValidationExpression` - (Optional) Regular expression for identity validation. + +### OpenID Connect Config + +The `openidConnectConfig` block supports the following: + +* `authTtl` - (Optional) TTL in seconds for the authentication token. +* `clientId` - (Optional) Client ID for the OpenID Connect provider. +* `iatTtl` - (Optional) TTL in seconds for the issued at time. +* `issuer` - (Required) Issuer URL for the OpenID Connect provider. + +### Auth Modes + +The `connectionAuthMode`, `defaultPublishAuthMode`, and `defaultSubscribeAuthMode` blocks support the following: + +* `authType` - (Required) Type of authentication. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. + +### Log Config + +The `logConfig` block supports the following: + +* `cloudwatchLogsRoleArn` - (Required) ARN of the IAM role for CloudWatch logs. +* `logLevel` - (Required) Log level. Valid values: `NONE`, `ERROR`, `ALL`, `INFO`, `DEBUG`. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `apiId` - ID of the Event API. +* `apiArn` - ARN of the Event API. +* `dns` - DNS configuration for the Event API. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +* `wafWebAclArn` - ARN of the associated WAF web ACL. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppSync Event API using the `apiId`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncApi } from "./.gen/providers/aws/appsync-api"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + AppsyncApi.generateConfigForImport(this, "example", "example-api-id"); + } +} + +``` + +Using `terraform import`, import AppSync Event API using the `apiId`. For example: + +```console +% terraform import aws_appsync_api.example example-api-id +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appsync_channel_namespace.html.markdown b/website/docs/cdktf/typescript/r/appsync_channel_namespace.html.markdown new file mode 100644 index 000000000000..d316b02aaa99 --- /dev/null +++ b/website/docs/cdktf/typescript/r/appsync_channel_namespace.html.markdown @@ -0,0 +1,128 @@ +--- +subcategory: "AppSync" +layout: "aws" +page_title: "AWS: aws_appsync_channel_namespace" +description: |- + Manages an AWS AppSync Channel Namespace. +--- + + + +# Resource: aws_appsync_channel_namespace + +Manages an [AWS AppSync Channel Namespace](https://docs.aws.amazon.com/appsync/latest/eventapi/event-api-concepts.html#namespace). + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncChannelNamespace } from "./.gen/providers/aws/appsync-channel-namespace"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new AppsyncChannelNamespace(this, "example", { + apiId: Token.asString(awsAppsyncApiExample.apiId), + name: "example-channel-namespace", + }); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `apiId` - (Required) Event API ID. +* `name` - (Required) Name of the channel namespace. + +The following arguments are optional: + +* `codeHandlers` - (Optional) Event handler functions that run custom business logic to process published events and subscribe requests. +* `handlerConfigs` - (Optional) Configuration for the `onPublish` and `onSubscribe` handlers. See [Handler Configs](#handler-configs) below. +* `publishAuthMode` - (Optional) Authorization modes to use for publishing messages on the channel namespace. This configuration overrides the default API authorization configuration. See [Auth Modes](#auth-modes) below. +* `subscribeAuthMode` - (Optional) Authorization modes to use for subscribing to messages on the channel namespace. This configuration overrides the default API authorization configuration. See [Auth Modes](#auth-modes) below. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Auth Modes + +The `publishAuthMode`, and `subscribeAuthMode` blocks support the following: + +* `authType` - (Required) Type of authentication. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. + +### Handler Configs + +The `handlerConfigs` block support the following: + +* `onPublish` - (Optional) Handler configuration. See [Handler Config](#handler-config) below. +* `onSubscribe` - (Optional) Handler configuration. See [Handler Config](#handler-config) below. + +### Handler Config + +The `onPublish` and `onSubscribe` blocks support the following: + +* `behavior` - (Required) Behavior for the handler. Valid values: `CODE`, `DIRECT`. +* `integration` - (Required) Integration data source configuration for the handler. See [Integration](#integration) below. + +### Integration + +The `integration` block support the following: + +* `dataSourceName` - (Required) Unique name of the data source that has been configured on the API. +* `lambdaConfig` - (Optional) Configuration for a Lambda data source. See [Lambda Config](#lambda-config) below. + +### Lambad Config + +The `lambdaConfig` block support the following: + +* `invokeType` - (Optional) Invocation type for a Lambda data source. Valid values: `REQUEST_RESPONSE`, `EVENT`. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `channelNamespaceArn` - ARN of the channel namespace. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppSync Channel Namespace using the `apiId` and `name` separated by a comma (`,`). For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppsyncChannelNamespace } from "./.gen/providers/aws/appsync-channel-namespace"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + AppsyncChannelNamespace.generateConfigForImport( + this, + "example", + "example-api-id,example-channel-namespace" + ); + } +} + +``` + +Using `terraform import`, import AppSync Channel Namespace using the `apiId` and `name` separated by a comma (`,`). For example: + +```console +% terraform import aws_appsync_channel_namespace.example example-api-id,example-channel-namespace +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/autoscaling_lifecycle_hook.html.markdown b/website/docs/cdktf/typescript/r/autoscaling_lifecycle_hook.html.markdown index 3ab08500e8f8..b94880d00c0b 100644 --- a/website/docs/cdktf/typescript/r/autoscaling_lifecycle_hook.html.markdown +++ b/website/docs/cdktf/typescript/r/autoscaling_lifecycle_hook.html.markdown @@ -94,7 +94,7 @@ This resource supports the following arguments: * `heartbeatTimeout` - (Optional) Defines the amount of time, in seconds, that can elapse before the lifecycle hook times out. When the lifecycle hook times out, Auto Scaling performs the action defined in the DefaultResult parameter * `lifecycleTransition` - (Required) Instance state to which you want to attach the lifecycle hook. For a list of lifecycle hook types, see [describe-lifecycle-hook-types](https://docs.aws.amazon.com/cli/latest/reference/autoscaling/describe-lifecycle-hook-types.html#examples) * `notificationMetadata` - (Optional) Contains additional information that you want to include any time Auto Scaling sends a message to the notification target. -* `notificationTargetArn` - (Optional) ARN of the notification target that Auto Scaling will use to notify you when an instance is in the transition state for the lifecycle hook. This ARN target can be either an SQS queue or an SNS topic. +* `notificationTargetArn` - (Optional) ARN of the notification target that Auto Scaling will use to notify you when an instance is in the transition state for the lifecycle hook. This ARN target can be either an SQS queue, an SNS topic, or a Lambda function. * `roleArn` - (Optional) ARN of the IAM role that allows the Auto Scaling group to publish to the specified notification target. ## Attribute Reference @@ -133,4 +133,4 @@ Using `terraform import`, import AutoScaling Lifecycle Hooks using the role auto % terraform import aws_autoscaling_lifecycle_hook.test-lifecycle-hook asg-name/lifecycle-hook-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_project.html.markdown b/website/docs/cdktf/typescript/r/codebuild_project.html.markdown index e20ddb27094b..155f0b6bf494 100644 --- a/website/docs/cdktf/typescript/r/codebuild_project.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_project.html.markdown @@ -16,6 +16,8 @@ source (e.g., the "rebuild every time a code change is pushed" option in the Cod ## Example Usage +### Basic Usage + ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; @@ -258,6 +260,11 @@ class MyConvertedCode extends TerraformStack { ``` +### Runner Project + +While no special configuration is required for `aws_codebuild_project` to create a project as a Runner Project, an `aws_codebuild_webhook` resource with an appropriate `filterGroup` is required. +See the [`aws_codebuild_webhook` resource documentation example](/docs/providers/aws/r/codebuild_webhook.html#for-codebuild-runner-project) for more details. + ## Argument Reference The following arguments are required: @@ -609,4 +616,4 @@ Using `terraform import`, import CodeBuild Project using the `name`. For example % terraform import aws_codebuild_project.name project-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown b/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown index 4b8b05f5adf0..a2ea4636441c 100644 --- a/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown @@ -106,6 +106,42 @@ class MyConvertedCode extends TerraformStack { ``` +### For CodeBuild Runner Project + +To create a CodeBuild project as a Runner Project, the following `aws_codebuild_webhook` resource is required for the project. +See thr [AWS Documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/action-runner.html) for more information about CodeBuild Runner Projects. + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { CodebuildWebhook } from "./.gen/providers/aws/codebuild-webhook"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new CodebuildWebhook(this, "example", { + buildType: "BUILD", + filterGroup: [ + { + filter: [ + { + pattern: "WORKFLOW_JOB_QUEUED", + type: "EVENT", + }, + ], + }, + ], + projectName: Token.asString(awsCodebuildProjectExample.name), + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: @@ -173,4 +209,4 @@ Using `terraform import`, import CodeBuild Webhooks using the CodeBuild Project % terraform import aws_codebuild_webhook.example MyProjectName ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecr_repository_creation_template.html.markdown b/website/docs/cdktf/typescript/r/ecr_repository_creation_template.html.markdown index 29e93a8343ab..80dea352b46d 100644 --- a/website/docs/cdktf/typescript/r/ecr_repository_creation_template.html.markdown +++ b/website/docs/cdktf/typescript/r/ecr_repository_creation_template.html.markdown @@ -94,6 +94,7 @@ This resource supports the following arguments: * `description` - (Optional) The description for this template. * `encryptionConfiguration` - (Optional) Encryption configuration for any created repositories. See [below for schema](#encryption_configuration). * `imageTagMutability` - (Optional) The tag mutability setting for any created repositories. Must be one of: `MUTABLE` or `IMMUTABLE`. Defaults to `MUTABLE`. +* `imageTagMutabilityExclusionFilter` - (Optional) Configuration block that defines filters to specify which image tags can override the default tag mutability setting. Only applicable when `imageTagMutability` is set to `IMMUTABLE_WITH_EXCLUSION` or `MUTABLE_WITH_EXCLUSION`. See [below for schema](#image_tag_mutability_exclusion_filter). * `lifecyclePolicy` - (Optional) The lifecycle policy document to apply to any created repositories. See more details about [Policy Parameters](http://docs.aws.amazon.com/AmazonECR/latest/userguide/LifecyclePolicies.html#lifecycle_policy_parameters) in the official AWS docs. Consider using the [`aws_ecr_lifecycle_policy_document` data_source](/docs/providers/aws/d/ecr_lifecycle_policy_document.html) to generate/manage the JSON document used for the `lifecyclePolicy` argument. * `repositoryPolicy` - (Optional) The registry policy document to apply to any created repositories. This is a JSON formatted string. For more information about building IAM policy documents with Terraform, see the [AWS IAM Policy Document Guide](https://learn.hashicorp.com/terraform/aws/iam-policy). * `resourceTags` - (Optional) A map of tags to assign to any created repositories. @@ -103,6 +104,11 @@ This resource supports the following arguments: * `encryptionType` - (Optional) The encryption type to use for any created repositories. Valid values are `AES256` or `KMS`. Defaults to `AES256`. * `kmsKey` - (Optional) The ARN of the KMS key to use when `encryptionType` is `KMS`. If not specified, uses the default AWS managed key for ECR. +### image_tag_mutability_exclusion_filter + +* `filter` - (Required) The filter pattern to use for excluding image tags from the mutability setting. Must contain only letters, numbers, and special characters (._*-). Each filter can be up to 128 characters long and can contain a maximum of 2 wildcards (*). +* `filterType` - (Required) The type of filter to use. Must be `WILDCARD`. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -141,4 +147,4 @@ Using `terraform import`, import the ECR Repository Creating Templates using the % terraform import aws_ecr_repository_creation_template.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/eks_cluster.html.markdown b/website/docs/cdktf/typescript/r/eks_cluster.html.markdown index 0fab1b49ecd7..e935649904e7 100644 --- a/website/docs/cdktf/typescript/r/eks_cluster.html.markdown +++ b/website/docs/cdktf/typescript/r/eks_cluster.html.markdown @@ -371,15 +371,16 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `accessConfig` - (Optional) Configuration block for the access config associated with your cluster, see [Amazon EKS Access Entries](https://docs.aws.amazon.com/eks/latest/userguide/access-entries.html). [Detailed](#access_config) below. * `bootstrapSelfManagedAddons` - (Optional) Install default unmanaged add-ons, such as `aws-cni`, `kube-proxy`, and CoreDNS during cluster creation. If `false`, you must manually install desired add-ons. Changing this value will force a new cluster to be created. Defaults to `true`. * `computeConfig` - (Optional) Configuration block with compute configuration for EKS Auto Mode. [Detailed](#compute_config) below. +* `deletionProtection` - (Optional) Whether to enable deletion protection for the cluster. When enabled, the cluster cannot be deleted unless deletion protection is first disabled. Default: `false`. * `enabledClusterLogTypes` - (Optional) List of the desired control plane logging to enable. For more information, see [Amazon EKS Control Plane Logging](https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html). * `encryptionConfig` - (Optional) Configuration block with encryption configuration for the cluster. [Detailed](#encryption_config) below. * `forceUpdateVersion` - (Optional) Force version update by overriding upgrade-blocking readiness checks when updating a cluster. * `kubernetesNetworkConfig` - (Optional) Configuration block with kubernetes network configuration for the cluster. [Detailed](#kubernetes_network_config) below. If removed, Terraform will only perform drift detection if a configuration value is provided. * `outpostConfig` - (Optional) Configuration block representing the configuration of your local Amazon EKS cluster on an AWS Outpost. This block isn't available for creating Amazon EKS clusters on the AWS cloud. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `remoteNetworkConfig` - (Optional) Configuration block with remote network configuration for EKS Hybrid Nodes. [Detailed](#remote_network_config) below. * `storageConfig` - (Optional) Configuration block with storage configuration for EKS Auto Mode. [Detailed](#storage_config) below. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -575,4 +576,4 @@ Using `terraform import`, import EKS Clusters using the `name`. For example: % terraform import aws_eks_cluster.my_cluster my_cluster ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/finspace_kx_volume.html.markdown b/website/docs/cdktf/typescript/r/finspace_kx_volume.html.markdown index 95517a092767..470be7e18ee0 100644 --- a/website/docs/cdktf/typescript/r/finspace_kx_volume.html.markdown +++ b/website/docs/cdktf/typescript/r/finspace_kx_volume.html.markdown @@ -29,7 +29,7 @@ class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); new FinspaceKxVolume(this, "example", { - availabilityZones: Token.asList("use1-az2"), + availabilityZones: ["use1-az2"], azMode: "SINGLE", environmentId: Token.asString(awsFinspaceKxEnvironmentExample.id), name: "my-tf-kx-volume", @@ -130,4 +130,4 @@ Using `terraform import`, import an AWS FinSpace Kx Volume using the `id` (envir % terraform import aws_finspace_kx_volume.example n3ceo7wqxoxcti5tujqwzs,my-tf-kx-volume ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/flow_log.html.markdown b/website/docs/cdktf/typescript/r/flow_log.html.markdown index 03484f90a166..2d411acac349 100644 --- a/website/docs/cdktf/typescript/r/flow_log.html.markdown +++ b/website/docs/cdktf/typescript/r/flow_log.html.markdown @@ -11,7 +11,7 @@ description: |- # Resource: aws_flow_log Provides a VPC/Subnet/ENI/Transit Gateway/Transit Gateway Attachment Flow Log to capture IP traffic for a specific network -interface, subnet, or VPC. Logs are sent to a CloudWatch Log Group, a S3 Bucket, or Amazon Kinesis Data Firehose +interface, subnet, or VPC. Logs are sent to a CloudWatch Log Group, a S3 Bucket, or Amazon Data Firehose ## Example Usage @@ -97,7 +97,7 @@ class MyConvertedCode extends TerraformStack { ``` -### Amazon Kinesis Data Firehose logging +### Amazon Data Firehose logging ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug @@ -265,15 +265,191 @@ class MyConvertedCode extends TerraformStack { ``` +### Cross-Account Amazon Data Firehose Logging + +The following example shows how to set up a flow log in one AWS account (source) that sends logs to an Amazon Data Firehose delivery stream in another AWS account (destination). +See the [AWS Documentation](https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs-firehose.html). + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { FlowLog } from "./.gen/providers/aws/flow-log"; +import { IamRole } from "./.gen/providers/aws/iam-role"; +import { IamRolePolicy } from "./.gen/providers/aws/iam-role-policy"; +import { KinesisFirehoseDeliveryStream } from "./.gen/providers/aws/kinesis-firehose-delivery-stream"; +import { AwsProvider } from "./.gen/providers/aws/provider"; +import { Vpc } from "./.gen/providers/aws/vpc"; +interface MyConfig { + destination: any; + name: any; +} +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string, config: MyConfig) { + super(scope, name); + new AwsProvider(this, "aws", { + profile: "admin-src", + }); + const destinationAccount = new AwsProvider(this, "aws_1", { + alias: "destination_account", + profile: "admin-dst", + }); + const dst = new KinesisFirehoseDeliveryStream(this, "dst", { + provider: destinationAccount, + tags: { + LogDeliveryEnabled: "true", + }, + destination: config.destination, + name: config.name, + }); + const src = new Vpc(this, "src", {}); + const dstRolePolicy = new DataAwsIamPolicyDocument( + this, + "dst_role_policy", + { + statement: [ + { + actions: [ + "iam:CreateServiceLinkedRole", + "firehose:TagDeliveryStream", + ], + effect: "Allow", + resources: ["*"], + }, + ], + } + ); + const srcAssumeRolePolicy = new DataAwsIamPolicyDocument( + this, + "src_assume_role_policy", + { + statement: [ + { + actions: ["sts:AssumeRole"], + effect: "Allow", + principals: [ + { + identifiers: ["delivery.logs.amazonaws.com"], + type: "Service", + }, + ], + }, + ], + } + ); + const awsIamRoleSrc = new IamRole(this, "src_6", { + assumeRolePolicy: Token.asString(srcAssumeRolePolicy.json), + name: "tf-example-mySourceRole", + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRoleSrc.overrideLogicalId("src"); + const dstAssumeRolePolicy = new DataAwsIamPolicyDocument( + this, + "dst_assume_role_policy", + { + statement: [ + { + actions: ["sts:AssumeRole"], + effect: "Allow", + principals: [ + { + identifiers: [Token.asString(awsIamRoleSrc.arn)], + type: "AWS", + }, + ], + }, + ], + } + ); + const awsIamRoleDst = new IamRole(this, "dst_8", { + assumeRolePolicy: Token.asString(dstAssumeRolePolicy.json), + name: "AWSLogDeliveryFirehoseCrossAccountRole", + provider: destinationAccount, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRoleDst.overrideLogicalId("dst"); + const awsIamRolePolicyDst = new IamRolePolicy(this, "dst_9", { + name: "AWSLogDeliveryFirehoseCrossAccountRolePolicy", + policy: Token.asString(dstRolePolicy.json), + provider: destinationAccount, + role: Token.asString(awsIamRoleDst.name), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRolePolicyDst.overrideLogicalId("dst"); + const srcRolePolicy = new DataAwsIamPolicyDocument( + this, + "src_role_policy", + { + statement: [ + { + actions: ["iam:PassRole"], + condition: [ + { + test: "StringEquals", + values: ["delivery.logs.amazonaws.com"], + variable: "iam:PassedToService", + }, + { + test: "StringLike", + values: [src.arn], + variable: "iam:AssociatedResourceARN", + }, + ], + effect: "Allow", + resources: [Token.asString(awsIamRoleSrc.arn)], + }, + { + actions: [ + "logs:CreateLogDelivery", + "logs:DeleteLogDelivery", + "logs:ListLogDeliveries", + "logs:GetLogDelivery", + ], + effect: "Allow", + resources: ["*"], + }, + { + actions: ["sts:AssumeRole"], + effect: "Allow", + resources: [Token.asString(awsIamRoleDst.arn)], + }, + ], + } + ); + const awsFlowLogSrc = new FlowLog(this, "src_11", { + deliverCrossAccountRole: Token.asString(awsIamRoleDst.arn), + iamRoleArn: Token.asString(awsIamRoleSrc.arn), + logDestination: dst.arn, + logDestinationType: "kinesis-data-firehose", + trafficType: "ALL", + vpcId: src.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsFlowLogSrc.overrideLogicalId("src"); + new IamRolePolicy(this, "src_policy", { + name: "tf-example-mySourceRolePolicy", + policy: Token.asString(srcRolePolicy.json), + role: Token.asString(awsIamRoleSrc.name), + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `trafficType` - (Required) The type of traffic to capture. Valid values: `ACCEPT`,`REJECT`, `ALL`. -* `deliverCrossAccountRole` - (Optional) ARN of the IAM role that allows Amazon EC2 to publish flow logs across accounts. +* `deliverCrossAccountRole` - (Optional) ARN of the IAM role in the destination account used for cross-account delivery of flow logs. * `eniId` - (Optional) Elastic Network Interface ID to attach to. -* `iamRoleArn` - (Optional) ARN of the IAM role that's used to post flow logs to a CloudWatch Logs log group. +* `iamRoleArn` - (Optional) ARN of the IAM role used to post flow logs. Corresponds to `DeliverLogsPermissionArn` in the [AWS API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFlowLogs.html). * `logDestinationType` - (Optional) Logging destination type. Valid values: `cloud-watch-logs`, `s3`, `kinesis-data-firehose`. Default: `cloud-watch-logs`. * `logDestination` - (Optional) ARN of the logging destination. * `subnetId` - (Optional) Subnet ID to attach to. @@ -333,4 +509,4 @@ Using `terraform import`, import Flow Logs using the `id`. For example: % terraform import aws_flow_log.test_flow_log fl-1a2b3c4d ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/gamelift_fleet.html.markdown b/website/docs/cdktf/typescript/r/gamelift_fleet.html.markdown index d08e8e9d3da0..2c28319de85a 100644 --- a/website/docs/cdktf/typescript/r/gamelift_fleet.html.markdown +++ b/website/docs/cdktf/typescript/r/gamelift_fleet.html.markdown @@ -35,7 +35,7 @@ resource "aws_gamelift_fleet" "example" { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `buildId` - (Optional) ID of the GameLift Build to be deployed on the fleet. +* `buildId` - (Optional) ID of the GameLift Build to be deployed on the fleet. Conflicts with `scriptId`. * `certificateConfiguration` - (Optional) Prompts GameLift to generate a TLS/SSL certificate for the fleet. See [certificate_configuration](#certificate_configuration). * `description` - (Optional) Human-readable description of the fleet. * `ec2InboundPermission` - (Optional) Range of IP addresses and port settings that permit inbound traffic to access server processes running on the fleet. See below. @@ -47,7 +47,7 @@ This resource supports the following arguments: * `newGameSessionProtectionPolicy` - (Optional) Game session protection policy to apply to all instances in this fleetE.g., `FullProtection`. Defaults to `NoProtection`. * `resourceCreationLimitPolicy` - (Optional) Policy that limits the number of game sessions an individual player can create over a span of time for this fleet. See below. * `runtimeConfiguration` - (Optional) Instructions for launching server processes on each instance in the fleet. See below. -* `scriptId` - (Optional) ID of the GameLift Script to be deployed on the fleet. +* `scriptId` - (Optional) ID of the GameLift Script to be deployed on the fleet. Conflicts with `buildId`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### Nested Fields @@ -126,4 +126,4 @@ Using `terraform import`, import GameLift Fleets using the ID. For example: % terraform import aws_gamelift_fleet.example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/launch_template.html.markdown b/website/docs/cdktf/typescript/r/launch_template.html.markdown index 5666135e17f4..1ed84262009f 100644 --- a/website/docs/cdktf/typescript/r/launch_template.html.markdown +++ b/website/docs/cdktf/typescript/r/launch_template.html.markdown @@ -187,7 +187,7 @@ The `ebs` block supports the following: The `capacityReservationSpecification` block supports the following: -* `capacityReservationPreference` - Indicates the instance's Capacity Reservation preferences. Can be `open` or `none`. (Default `none`). +* `capacityReservationPreference` - Indicates the instance's Capacity Reservation preferences. Can be `capacity-reservations-only`, `open` or `none`. If `capacityReservationId` or `capacityReservationResourceGroupArn` is specified in `capacityReservationTarget` block, either omit `capacityReservationPreference` or set it to `capacity-reservations-only`. * `capacityReservationTarget` - Used to target a specific Capacity Reservation: The `capacityReservationTarget` block supports the following: @@ -523,4 +523,4 @@ Using `terraform import`, import Launch Templates using the `id`. For example: % terraform import aws_launch_template.web lt-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/msk_cluster.html.markdown b/website/docs/cdktf/typescript/r/msk_cluster.html.markdown index 5fc297b4465c..c6ce36d58e7e 100644 --- a/website/docs/cdktf/typescript/r/msk_cluster.html.markdown +++ b/website/docs/cdktf/typescript/r/msk_cluster.html.markdown @@ -213,16 +213,16 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `brokerNodeGroupInfo` - (Required) Configuration block for the broker nodes of the Kafka cluster. +* `brokerNodeGroupInfo` - (Required) Configuration block for the broker nodes of the Kafka cluster. See [broker_node_group_info Argument Reference](#broker_node_group_info-argument-reference) below. * `clusterName` - (Required) Name of the MSK cluster. * `kafkaVersion` - (Required) Specify the desired Kafka software version. * `numberOfBrokerNodes` - (Required) The desired total number of broker nodes in the kafka cluster. It must be a multiple of the number of specified client subnets. -* `clientAuthentication` - (Optional) Configuration block for specifying a client authentication. See below. -* `configurationInfo` - (Optional) Configuration block for specifying a MSK Configuration to attach to Kafka brokers. See below. -* `encryptionInfo` - (Optional) Configuration block for specifying encryption. See below. +* `clientAuthentication` - (Optional) Configuration block for specifying a client authentication. See [client_authentication Argument Reference](#client_authentication-argument-reference) below. +* `configurationInfo` - (Optional) Configuration block for specifying an MSK Configuration to attach to Kafka brokers. See [configuration_info Argument Reference](#configuration_info-argument-reference) below. +* `encryptionInfo` - (Optional) Configuration block for specifying encryption. See [encryption_info Argument Reference](#encryption_info-argument-reference) below. * `enhancedMonitoring` - (Optional) Specify the desired enhanced MSK CloudWatch monitoring level. See [Monitoring Amazon MSK with Amazon CloudWatch](https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html) -* `openMonitoring` - (Optional) Configuration block for JMX and Node monitoring for the MSK cluster. See below. -* `loggingInfo` - (Optional) Configuration block for streaming broker logs to Cloudwatch/S3/Kinesis Firehose. See below. +* `openMonitoring` - (Optional) Configuration block for JMX and Node monitoring for the MSK cluster. See [open_monitoring Argument Reference](#open_monitoring-argument-reference) below. +* `loggingInfo` - (Optional) Configuration block for streaming broker logs to Cloudwatch/S3/Kinesis Firehose. See [logging_info Argument Reference](#logging_info-argument-reference) below. * `storageMode` - (Optional) Controls storage mode for supported storage tiers. Valid values are: `LOCAL` or `TIERED`. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -231,14 +231,14 @@ This resource supports the following arguments: * `clientSubnets` - (Required) A list of subnets to connect to in client VPC ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-prop-brokernodegroupinfo-clientsubnets)). * `instanceType` - (Required) Specify the instance type to use for the kafka brokersE.g., kafka.m5.large. ([Pricing info](https://aws.amazon.com/msk/pricing/)) * `securityGroups` - (Required) A list of the security groups to associate with the elastic network interfaces to control who can communicate with the cluster. -* `azDistribution` - (Optional) The distribution of broker nodes across availability zones ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-model-brokerazdistribution)). Currently the only valid value is `DEFAULT`. -* `connectivityInfo` - (Optional) Information about the cluster access configuration. See below. For security reasons, you can't turn on public access while creating an MSK cluster. However, you can update an existing cluster to make it publicly accessible. You can also create a new cluster and then update it to make it publicly accessible ([documentation](https://docs.aws.amazon.com/msk/latest/developerguide/public-access.html)). -* `storageInfo` - (Optional) A block that contains information about storage volumes attached to MSK broker nodes. See below. +* `azDistribution` - (Optional) The distribution of broker nodes across availability zones ([documentation](https://docs.aws.amazon.com/msk/1.0/apireference/clusters.html#clusters-model-brokerazdistribution)). Currently, the only valid value is `DEFAULT`. +* `connectivityInfo` - (Optional) Information about the cluster access configuration. See [broker_node_group_info connectivity_info Argument Reference](#broker_node_group_info-connectivity_info-argument-reference) below. For security reasons, you can't turn on public access while creating an MSK cluster. However, you can update an existing cluster to make it publicly accessible. You can also create a new cluster and then update it to make it publicly accessible ([documentation](https://docs.aws.amazon.com/msk/latest/developerguide/public-access.html)). +* `storageInfo` - (Optional) A block that contains information about storage volumes attached to MSK broker nodes. See [broker_node_group_info storage_info Argument Reference](#broker_node_group_info-storage_info-argument-reference) below. ### broker_node_group_info connectivity_info Argument Reference -* `publicAccess` - (Optional) Access control settings for brokers. See below. -* `vpcConnectivity` - (Optional) VPC connectivity access control for brokers. See below. +* `publicAccess` - (Optional) Access control settings for brokers. See [connectivity_info public_access Argument Reference](#connectivity_info-public_access-argument-reference) below. +* `vpcConnectivity` - (Optional) VPC connectivity access control for brokers. See [connectivity_info vpc_connectivity Argument Reference](#connectivity_info-vpc_connectivity-argument-reference) below. ### connectivity_info public_access Argument Reference @@ -246,11 +246,11 @@ This resource supports the following arguments: ### connectivity_info vpc_connectivity Argument Reference -* `clientAuthentication` - (Optional) Includes all client authentication information for VPC connectivity. See below. +* `clientAuthentication` - (Optional) Includes all client authentication information for VPC connectivity. See [vpc_connectivity client_authentication Argument Reference](#vpc_connectivity-client_authentication-argument-reference) below. ### vpc_connectivity client_authentication Argument Reference -* `sasl` - (Optional) SASL authentication type details for VPC connectivity. See below. +* `sasl` - (Optional) SASL authentication type details for VPC connectivity. See [vpc_connectivity client_authentication sasl Argument Reference](#vpc_connectivity-client_authentication-sasl-argument-reference) below. * `tls` - (Optional) Enables TLS authentication for VPC connectivity. ### vpc_connectivity client_authentication sasl Argument Reference @@ -260,11 +260,11 @@ This resource supports the following arguments: ### broker_node_group_info storage_info Argument Reference -* `ebsStorageInfo` - (Optional) A block that contains EBS volume information. See below. +* `ebsStorageInfo` - (Optional) A block that contains EBS volume information. See [storage_info ebs_storage_info Argument Reference](#storage_info-ebs_storage_info-argument-reference) below. ### storage_info ebs_storage_info Argument Reference -* `provisionedThroughput` - (Optional) A block that contains EBS volume provisioned throughput information. To provision storage throughput, you must choose broker type kafka.m5.4xlarge or larger. See below. +* `provisionedThroughput` - (Optional) A block that contains EBS volume provisioned throughput information. To provision storage throughput, you must choose broker type kafka.m5.4xlarge or larger. See [ebs_storage_info provisioned_throughput Argument Reference](#ebs_storage_info-provisioned_throughput-argument-reference) below. * `volumeSize` - (Optional) The size in GiB of the EBS volume for the data drive on each broker node. Minimum value of `1` and maximum value of `16384`. ### ebs_storage_info provisioned_throughput Argument Reference @@ -274,8 +274,8 @@ This resource supports the following arguments: ### client_authentication Argument Reference -* `sasl` - (Optional) Configuration block for specifying SASL client authentication. See below. -* `tls` - (Optional) Configuration block for specifying TLS client authentication. See below. +* `sasl` - (Optional) Configuration block for specifying SASL client authentication. See [client_authentication sasl Argument Reference](#client_authentication-sasl-argument-reference) below. +* `tls` - (Optional) Configuration block for specifying TLS client authentication. See [client_authentication tls Argument Reference](#client_authentication-tls-argument-reference) below. * `unauthenticated` - (Optional) Enables unauthenticated access. #### client_authentication sasl Argument Reference @@ -294,7 +294,7 @@ This resource supports the following arguments: ### encryption_info Argument Reference -* `encryptionInTransit` - (Optional) Configuration block to specify encryption in transit. See below. +* `encryptionInTransit` - (Optional) Configuration block to specify encryption in transit. See [encryption_info encryption_in_transit Argument Reference](#encryption_info-encryption_in_transit-argument-reference) below. * `encryptionAtRestKmsKeyArn` - (Optional) You may specify a KMS key short ID or ARN (it will always output an ARN) to use for encrypting your data at rest. If no key is specified, an AWS managed KMS ('aws/msk' managed service) key will be used for encrypting the data at rest. #### encryption_info encryption_in_transit Argument Reference @@ -304,12 +304,12 @@ This resource supports the following arguments: #### open_monitoring Argument Reference -* `prometheus` - (Required) Configuration block for Prometheus settings for open monitoring. See below. +* `prometheus` - (Required) Configuration block for Prometheus settings for open monitoring. See [open_monitoring prometheus Argument Reference](#open_monitoring-prometheus-argument-reference) below. #### open_monitoring prometheus Argument Reference -* `jmxExporter` - (Optional) Configuration block for JMX Exporter. See below. -* `nodeExporter` - (Optional) Configuration block for Node Exporter. See below. +* `jmxExporter` - (Optional) Configuration block for JMX Exporter. See [open_monitoring prometheus jmx_exporter Argument Reference](#open_monitoring-prometheus-jmx_exporter-argument-reference) below. +* `nodeExporter` - (Optional) Configuration block for Node Exporter. See [open_monitoring prometheus node_exporter Argument Reference](#open_monitoring-prometheus-node_exporter-argument-reference) below. #### open_monitoring prometheus jmx_exporter Argument Reference @@ -321,7 +321,13 @@ This resource supports the following arguments: #### logging_info Argument Reference -* `brokerLogs` - (Required) Configuration block for Broker Logs settings for logging info. See below. +* `brokerLogs` - (Required) Configuration block for Broker Logs settings for logging info. See [logging_info broker_logs Argument Reference](#logging_info-broker_logs-argument-reference) below. + +#### logging_info broker_logs Argument Reference + +* `cloudwatchLogs` - (Optional) Configuration block for Cloudwatch Logs settings. See [logging_info broker_logs cloudwatch_logs Argument Reference](#logging_info-broker_logs-cloudwatch_logs-argument-reference) below. +* `firehose` - (Optional) Configuration block for Kinesis Data Firehose settings. See [logging_info broker_logs firehose Argument Reference](#logging_info-broker_logs-firehose-argument-reference) below. +* `s3` - (Optional) Configuration block for S3 settings. See [logging_info broker_logs s3 Argument Reference](#logging_info-broker_logs-s3-argument-reference) below. #### logging_info broker_logs cloudwatch_logs Argument Reference @@ -402,4 +408,4 @@ Using `terraform import`, import MSK clusters using the cluster `arn`. For examp % terraform import aws_msk_cluster.example arn:aws:kafka:us-west-2:123456789012:cluster/example/279c0212-d057-4dba-9aa9-1c4e5a25bfc7-3 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/route53_resolver_endpoint.html.markdown b/website/docs/cdktf/typescript/r/route53_resolver_endpoint.html.markdown index 4afe71a1d561..6d116454f9ad 100644 --- a/website/docs/cdktf/typescript/r/route53_resolver_endpoint.html.markdown +++ b/website/docs/cdktf/typescript/r/route53_resolver_endpoint.html.markdown @@ -56,8 +56,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `direction` - (Required) Direction of DNS queries to or from the Route 53 Resolver endpoint. -Valid values are `INBOUND` (resolver forwards DNS queries to the DNS service for a VPC from your network or another VPC) -or `OUTBOUND` (resolver forwards DNS queries from the DNS service for a VPC to your network or another VPC). +Valid values are `INBOUND` (resolver forwards DNS queries to the DNS service for a VPC from your network or another VPC), `OUTBOUND` (resolver forwards DNS queries from the DNS service for a VPC to your network or another VPC) or `INBOUND_DELEGATION` (resolver delegates queries to Route 53 private hosted zones from your network). * `ipAddress` - (Required) Subnets and IP addresses in your VPC that you want DNS queries to pass through on the way from your VPCs to your network (for outbound endpoints) or on the way from your network to your VPCs (for inbound endpoints). Described below. * `name` - (Optional) Friendly name of the Route 53 Resolver endpoint. @@ -123,4 +122,4 @@ Using `terraform import`, import Route 53 Resolver endpoints using the Route 53 % terraform import aws_route53_resolver_endpoint.foo rslvr-in-abcdef01234567890 ``` - \ No newline at end of file + \ No newline at end of file From 37211c6346ebde70e8dda316feb5095132f84a2d Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 10:48:45 +0100 Subject: [PATCH 0234/2115] fixed linting issues --- .../odb/cloud_exadata_infrastructure.go | 34 ++----------------- ...exadata_infrastructure_data_source_test.go | 1 - .../odb/cloud_exadata_infrastructure_test.go | 12 +++---- 3 files changed, 8 insertions(+), 39 deletions(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index b826bab858ba..32e1149a6294 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -5,7 +5,6 @@ package odb import ( "context" "errors" - "fmt" "time" "github.com/aws/aws-sdk-go-v2/aws" @@ -24,7 +23,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" @@ -32,8 +30,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - "github.com/hashicorp/terraform-provider-aws/internal/sweep" - sweepfw "github.com/hashicorp/terraform-provider-aws/internal/sweep/framework" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -240,13 +236,13 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res "compute_model": schema.StringAttribute{ CustomType: computeModelType, Computed: true, - Description: fmt.Sprint("The OCI model compute model used when you create or clone an\n " + + Description: "The OCI model compute model used when you create or clone an\n " + " instance: ECPU or OCPU. An ECPU is an abstracted measure of\n " + "compute resources. ECPUs are based on the number of cores\n " + "elastically allocated from a pool of compute and storage servers.\n " + " An OCPU is a legacy physical measure of compute resources. OCPUs\n " + "are based on the physical core of a processor with\n " + - " hyper-threading enabled."), + " hyper-threading enabled.", }, "customer_contacts_to_send_to_oci": schema.SetAttribute{ CustomType: fwtypes.NewSetNestedObjectTypeOf[customerContactExaInfraResourceModel](ctx), @@ -403,7 +399,6 @@ func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resou } func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - var plan, state cloudExadataInfrastructureResourceModel resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) resp.Diagnostics.Append(req.State.Get(ctx, &state)...) @@ -436,9 +431,7 @@ func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req res ) return } - } - updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) updatedExaInfra, err := waitCloudExadataInfrastructureUpdated(ctx, conn, state.CloudExadataInfrastructureId.ValueString(), updateTimeout) if err != nil { @@ -450,7 +443,6 @@ func (r *resourceCloudExadataInfrastructure) Update(ctx context.Context, req res } resp.Diagnostics.Append(flex.Flatten(ctx, updatedExaInfra, &plan)...) resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) - } func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { @@ -650,25 +642,3 @@ type monthExaInfraMaintenanceWindowResourceModel struct { type customerContactExaInfraResourceModel struct { Email types.String `tfsdk:"email"` } - -func sweepCloudExadataInfrastructures(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { - input := odb.ListCloudExadataInfrastructuresInput{} - conn := client.ODBClient(ctx) - var sweepResources []sweep.Sweepable - - pages := odb.NewListCloudExadataInfrastructuresPaginator(conn, &input) - for pages.HasMorePages() { - page, err := pages.NextPage(ctx) - if err != nil { - return nil, err - } - - for _, v := range page.CloudExadataInfrastructures { - sweepResources = append(sweepResources, sweepfw.NewSweepResource(newResourceCloudExadataInfrastructure, client, - sweepfw.NewAttribute(names.AttrID, aws.ToString(v.CloudExadataInfrastructureId))), - ) - } - } - - return sweepResources, nil -} diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index 262cb37c4def..18df5964d860 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -83,7 +83,6 @@ func (cloudExaDataInfraDataSourceTest) testAccCheckCloudExadataInfrastructureDes } func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix string) string { - testData := fmt.Sprintf(` diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index 558bf63bee76..8f2fa0b6e23d 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -32,7 +32,7 @@ var exaInfraTestResource = cloudExaDataInfraResourceTest{ displayNamePrefix: "Ofake-exa", } -func TestAccODBCloudExadataInfrastructureResourceCreateBasic(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_basic(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -65,7 +65,7 @@ func TestAccODBCloudExadataInfrastructureResourceCreateBasic(t *testing.T) { }, }) } -func TestAccODBCloudExadataInfrastructureResourceCreateWithAllParameters(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_withAllParameters(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -99,7 +99,7 @@ func TestAccODBCloudExadataInfrastructureResourceCreateWithAllParameters(t *test }) } -func TestAccODBCloudExadataInfrastructureResourceTagging(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_tagging(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -153,7 +153,7 @@ func TestAccODBCloudExadataInfrastructureResourceTagging(t *testing.T) { }) } -func TestAccODBCloudExadataInfrastructureResourceUpdateDisplayName(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_updateDisplayName(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -204,7 +204,7 @@ func TestAccODBCloudExadataInfrastructureResourceUpdateDisplayName(t *testing.T) }) } -func TestAccODBCloudExadataInfrastructureResourceUpdateMaintenanceWindow(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_updateMaintenanceWindow(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -255,7 +255,7 @@ func TestAccODBCloudExadataInfrastructureResourceUpdateMaintenanceWindow(t *test }) } -func TestAccODBCloudExadataInfrastructureResourceDisappears(t *testing.T) { +func TestAccODBCloudExadataInfrastructureResource_disappears(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") From 26847bdf1464afd568863b23f78da3a248eb5376 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 09:50:03 +0000 Subject: [PATCH 0235/2115] build(deps): bump gopkg.in/dnaeon/go-vcr.v4 from 4.0.4 to 4.0.5 Bumps gopkg.in/dnaeon/go-vcr.v4 from 4.0.4 to 4.0.5. --- updated-dependencies: - dependency-name: gopkg.in/dnaeon/go-vcr.v4 dependency-version: 4.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 3 ++- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1716d28e64b5..ba815880f649 100644 --- a/go.mod +++ b/go.mod @@ -310,7 +310,7 @@ require ( golang.org/x/crypto v0.41.0 golang.org/x/text v0.28.0 golang.org/x/tools v0.36.0 - gopkg.in/dnaeon/go-vcr.v4 v4.0.4 + gopkg.in/dnaeon/go-vcr.v4 v4.0.5 gopkg.in/yaml.v3 v3.0.1 ) @@ -339,6 +339,7 @@ require ( github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index 59c9e607fc31..7aeb38ebd92f 100644 --- a/go.sum +++ b/go.sum @@ -606,6 +606,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= +github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -870,8 +872,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/dnaeon/go-vcr.v4 v4.0.4 h1:UNc8d1Ya2otEOU3DoUgnSLp0tXvBNE0FuFe86Nnzcbw= -gopkg.in/dnaeon/go-vcr.v4 v4.0.4/go.mod h1:65yxh9goQVrudqofKtHA4JNFWd6XZRkWfKN4YpMx7KI= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5 h1:I0hpTIvD5rII+8LgYGrHMA2d4SQPoL6u7ZvJakWKsiA= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5/go.mod h1:dRos81TkW9C1WJt6tTaE+uV2Lo8qJT3AG2b35+CB/nQ= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From a468d3d495278cf0b75b0e2b07044d89e560ca2b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 10:01:45 +0000 Subject: [PATCH 0236/2115] build(deps): bump github.com/hashicorp/terraform-plugin-testing Bumps the terraform-devex group with 1 update in the / directory: [github.com/hashicorp/terraform-plugin-testing](https://github.com/hashicorp/terraform-plugin-testing). Updates `github.com/hashicorp/terraform-plugin-testing` from 1.13.2 to 1.13.3 - [Release notes](https://github.com/hashicorp/terraform-plugin-testing/releases) - [Changelog](https://github.com/hashicorp/terraform-plugin-testing/blob/v1.13.3/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-plugin-testing/compare/v1.13.2...v1.13.3) --- updated-dependencies: - dependency-name: github.com/hashicorp/terraform-plugin-testing dependency-version: 1.13.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: terraform-devex ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1716d28e64b5..6eca1cd78266 100644 --- a/go.mod +++ b/go.mod @@ -297,7 +297,7 @@ require ( github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-mux v0.20.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 - github.com/hashicorp/terraform-plugin-testing v1.13.2 + github.com/hashicorp/terraform-plugin-testing v1.13.3 github.com/jaswdr/faker/v2 v2.8.0 github.com/jmespath/go-jmespath v0.4.0 github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38 diff --git a/go.sum b/go.sum index 59c9e607fc31..63d0e1716e3d 100644 --- a/go.sum +++ b/go.sum @@ -678,8 +678,8 @@ github.com/hashicorp/terraform-plugin-mux v0.20.0 h1:3QpBnI9uCuL0Yy2Rq/kR9cOdmOF github.com/hashicorp/terraform-plugin-mux v0.20.0/go.mod h1:wSIZwJjSYk86NOTX3fKUlThMT4EAV1XpBHz9SAvjQr4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA= -github.com/hashicorp/terraform-plugin-testing v1.13.2 h1:mSotG4Odl020vRjIenA3rggwo6Kg6XCKIwtRhYgp+/M= -github.com/hashicorp/terraform-plugin-testing v1.13.2/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE= +github.com/hashicorp/terraform-plugin-testing v1.13.3 h1:QLi/khB8Z0a5L54AfPrHukFpnwsGL8cwwswj4RZduCo= +github.com/hashicorp/terraform-plugin-testing v1.13.3/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE= github.com/hashicorp/terraform-registry-address v0.2.5 h1:2GTftHqmUhVOeuu9CW3kwDkRe4pcBDq0uuK5VJngU1M= github.com/hashicorp/terraform-registry-address v0.2.5/go.mod h1:PpzXWINwB5kuVS5CA7m1+eO2f1jKb5ZDIxrOPfpnGkg= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= From bcff9c9fb6b9e8fb144eec4d5fe854ff8a16dded Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 11:10:38 +0100 Subject: [PATCH 0237/2115] fixed linting issues in example and acc test --- examples/odb/exadata_infra.tf | 5 - ...exadata_infrastructure_data_source_test.go | 26 ++-- .../odb/cloud_exadata_infrastructure_test.go | 111 +++++++++--------- 3 files changed, 70 insertions(+), 72 deletions(-) diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf index 30b8ff2f03cd..f009197958da 100644 --- a/examples/odb/exadata_infra.tf +++ b/examples/odb/exadata_infra.tf @@ -41,8 +41,3 @@ resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_basic" { preference = "NO_PREFERENCE" } } - -# data source for exa infra -data "aws_odb_cloud_exadata_infrastructure" "get-exa-infra" { - id = "" -} \ No newline at end of file diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index 18df5964d860..ec76118dea88 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -86,23 +86,25 @@ func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix testData := fmt.Sprintf(` + + resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] - maintenance_window { - custom_action_timeout_in_mins = 16 - is_custom_action_timeout_enabled = true - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + maintenance_window { + custom_action_timeout_in_mins = 16 + is_custom_action_timeout_enabled = true + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" } } data "aws_odb_cloud_exadata_infrastructure" "test" { - id = aws_odb_cloud_exadata_infrastructure.test.id + id = aws_odb_cloud_exadata_infrastructure.test.id } `, displayNameSuffix) return testData diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index 8f2fa0b6e23d..f3ad9cdb6af2 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -352,28 +352,29 @@ func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *tes func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId string) string { exaDataInfra := fmt.Sprintf(` + resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X11M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] - database_server_type = "X11M" - storage_server_type = "X11M-HC" - maintenance_window { - custom_action_timeout_in_mins = 16 - days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] - hours_of_day = [11,16] - is_custom_action_timeout_enabled = true - lead_time_in_weeks = 3 - months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] - patching_mode = "ROLLING" - preference = "CUSTOM_PREFERENCE" - weeks_of_month =[2,4] + display_name = %[1]q + shape = "Exadata.X11M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window { + custom_action_timeout_in_mins = 16 + days_of_week = [{ name = "MONDAY" }, { name = "TUESDAY" }] + hours_of_day = [11, 16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month = [2, 4] } tags = { - "env"= "dev" + "env" = "dev" } } @@ -383,16 +384,16 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfig(displayName string) string { exaInfra := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - maintenance_window { - custom_action_timeout_in_mins = 16 - is_custom_action_timeout_enabled = true - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window { + custom_action_timeout_in_mins = 16 + is_custom_action_timeout_enabled = true + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" } } `, displayName) @@ -401,19 +402,19 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfigWithTags(displayName string) string { exaInfra := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - maintenance_window { - custom_action_timeout_in_mins = 16 - is_custom_action_timeout_enabled = true - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window { + custom_action_timeout_in_mins = 16 + is_custom_action_timeout_enabled = true + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" } tags = { - "env"= "dev" + "env" = "dev" } } `, displayName) @@ -423,21 +424,21 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { func (cloudExaDataInfraResourceTest) basicWithCustomMaintenanceWindow(displayName string) string { exaInfra := fmt.Sprintf(` resource "aws_odb_cloud_exadata_infrastructure" "test" { - display_name = %[1]q - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - maintenance_window { - custom_action_timeout_in_mins = 16 - days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] - hours_of_day = [11,16] - is_custom_action_timeout_enabled = true - lead_time_in_weeks = 3 - months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] - patching_mode = "ROLLING" - preference = "CUSTOM_PREFERENCE" - weeks_of_month =[2,4] + display_name = %[1]q + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window { + custom_action_timeout_in_mins = 16 + days_of_week = [{ name = "MONDAY" }, { name = "TUESDAY" }] + hours_of_day = [11, 16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month = [2, 4] } } `, displayName) From 3fcfa23f7b7eaf8b865d7910060e17f3381653f7 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 20:16:59 +0900 Subject: [PATCH 0238/2115] Add an example using bucket policy to grant permission --- .../docs/r/s3_bucket_logging.html.markdown | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/website/docs/r/s3_bucket_logging.html.markdown b/website/docs/r/s3_bucket_logging.html.markdown index 241dd10166d2..a44a0ec8b4f0 100644 --- a/website/docs/r/s3_bucket_logging.html.markdown +++ b/website/docs/r/s3_bucket_logging.html.markdown @@ -18,6 +18,57 @@ to decide which method meets your requirements. ## Example Usage +### Grant permission by using bucket policy + +```terraform +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "logging" { + bucket = "access-logging-bucket" +} + +data "aws_iam_policy_document" "logging_bucket_policy" { + statement { + principals { + identifiers = ["logging.s3.amazonaws.com"] + type = "Service" + } + actions = ["s3:PutObject"] + resources = ["${aws_s3_bucket.logging.arn}/*"] + condition { + test = "StringEquals" + variable = "aws:SourceAccount" + values = [data.aws_caller_identity.current.account_id] + } + } +} + +resource "aws_s3_bucket_policy" "logging" { + bucket = aws_s3_bucket.logging.bucket + policy = data.aws_iam_policy_document.logging_bucket_policy.json +} + +resource "aws_s3_bucket" "example" { + bucket = "example-bucket" +} + +resource "aws_s3_bucket_logging" "example" { + bucket = aws_s3_bucket.example.bucket + + target_bucket = aws_s3_bucket.logging.bucket + target_prefix = "log/" + target_object_key_format { + partitioned_prefix { + partition_date_source = "EventTime" + } + } +} +``` + +### Grant permission by using bucket ACL + +The [AWS Documentation](https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html) does not recommend using the ACL. + ```terraform resource "aws_s3_bucket" "example" { bucket = "my-tf-example-bucket" From 518fe824e948d30f0c0731f8101ed2889236e7c6 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 18 Aug 2025 20:17:32 +0900 Subject: [PATCH 0239/2115] Clarify conflicts and S3 key format for logging target_object_key_format --- website/docs/r/s3_bucket_logging.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/s3_bucket_logging.html.markdown b/website/docs/r/s3_bucket_logging.html.markdown index a44a0ec8b4f0..bee87410c69b 100644 --- a/website/docs/r/s3_bucket_logging.html.markdown +++ b/website/docs/r/s3_bucket_logging.html.markdown @@ -128,8 +128,8 @@ The `grantee` configuration block supports the following arguments: The `target_object_key_format` configuration block supports the following arguments: -* `partitioned_prefix` - (Optional) Partitioned S3 key for log objects. [See below](#partitioned_prefix). -* `simple_prefix` - (Optional) Use the simple format for S3 keys for log objects. To use, set `simple_prefix {}`. +* `partitioned_prefix` - (Optional) Partitioned S3 key for log objects, in the form `[target_prefix][SourceAccountId]/[SourceRegion]/[SourceBucket]/[YYYY]/[MM]/[DD]/[YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. Conflicts with `simple_prefix`. [See below](#partitioned_prefix). +* `simple_prefix` - (Optional) Use the simple format for S3 keys for log objects, in the form `[target_prefix][YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. To use, set `simple_prefix {}`. Conflicts with `partitioned_prefix`. ### partitioned_prefix From 753b37131ab7584a3d3b8392970a93a7328ccf2c Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 16:13:39 +0100 Subject: [PATCH 0240/2115] renamed method as per review feedback. --- internal/service/odb/cloud_exadata_infrastructure.go | 6 +++--- .../service/odb/cloud_exadata_infrastructure_data_source.go | 4 ++-- .../odb/cloud_exadata_infrastructure_data_source_test.go | 2 +- internal/service/odb/cloud_exadata_infrastructure_test.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index 32e1149a6294..24f080ae63a3 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -376,7 +376,7 @@ func (r *resourceCloudExadataInfrastructure) Read(ctx context.Context, req resou return } - out, err := FindOdbExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString()) + out, err := FindExadataInfraResourceByID(ctx, conn, state.CloudExadataInfrastructureId.ValueString()) if tfresource.NotFound(err) { resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) resp.State.RemoveResource(ctx) @@ -537,7 +537,7 @@ func waitCloudExadataInfrastructureDeleted(ctx context.Context, conn *odb.Client func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id string) retry.StateRefreshFunc { return func() (any, string, error) { - out, err := FindOdbExadataInfraResourceByID(ctx, conn, id) + out, err := FindExadataInfraResourceByID(ctx, conn, id) if tfresource.NotFound(err) { return nil, "", nil } @@ -550,7 +550,7 @@ func statusCloudExadataInfrastructure(ctx context.Context, conn *odb.Client, id } } -func FindOdbExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { +func FindExadataInfraResourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { input := odb.GetCloudExadataInfrastructureInput{ CloudExadataInfrastructureId: aws.String(id), } diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index e2644a80c761..77a5ede348b2 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -219,7 +219,7 @@ func (d *dataSourceCloudExadataInfrastructure) Read(ctx context.Context, req dat return } - out, err := FindOdbExaDataInfraForDataSourceByID(ctx, conn, data.CloudExadataInfrastructureId.ValueString()) + out, err := FindExaDataInfraForDataSourceByID(ctx, conn, data.CloudExadataInfrastructureId.ValueString()) if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.ODB, create.ErrActionReading, DSNameCloudExadataInfrastructure, data.CloudExadataInfrastructureId.String(), err), @@ -235,7 +235,7 @@ func (d *dataSourceCloudExadataInfrastructure) Read(ctx context.Context, req dat resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) } -func FindOdbExaDataInfraForDataSourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { +func FindExaDataInfraForDataSourceByID(ctx context.Context, conn *odb.Client, id string) (*odbtypes.CloudExadataInfrastructure, error) { input := odb.GetCloudExadataInfrastructureInput{ CloudExadataInfrastructureId: aws.String(id), } diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index ec76118dea88..8365b220bbfe 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -67,7 +67,7 @@ func (cloudExaDataInfraDataSourceTest) testAccCheckCloudExadataInfrastructureDes if rs.Type != "aws_odb_cloud_exadata_infrastructure" { continue } - _, err := tfodb.FindOdbExaDataInfraForDataSourceByID(ctx, conn, rs.Primary.ID) + _, err := tfodb.FindExaDataInfraForDataSourceByID(ctx, conn, rs.Primary.ID) if tfresource.NotFound(err) { return nil } diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index f3ad9cdb6af2..14a19973a662 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -295,7 +295,7 @@ func (cloudExaDataInfraResourceTest) testAccCheckCloudExaDataInfraDestroyed(ctx if rs.Type != "aws_odb_cloud_exadata_infrastructure" { continue } - _, err := tfodb.FindOdbExadataInfraResourceByID(ctx, conn, rs.Primary.ID) + _, err := tfodb.FindExadataInfraResourceByID(ctx, conn, rs.Primary.ID) if tfresource.NotFound(err) { return nil } @@ -323,7 +323,7 @@ func (cloudExaDataInfraResourceTest) testAccCheckCloudExadataInfrastructureExist conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) - resp, err := tfodb.FindOdbExadataInfraResourceByID(ctx, conn, rs.Primary.ID) + resp, err := tfodb.FindExadataInfraResourceByID(ctx, conn, rs.Primary.ID) if err != nil { return create.Error(names.ODB, create.ErrActionCheckingExistence, tfodb.ResNameCloudExadataInfrastructure, rs.Primary.ID, err) } From da14928c365f3ed937ce4f8ac8172d108cb09c0c Mon Sep 17 00:00:00 2001 From: Tina Zhou Hui Date: Mon, 18 Aug 2025 17:44:50 +0200 Subject: [PATCH 0241/2115] fix: add example to product description --- website/docs/d/rds_reserved_instance_offering.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/rds_reserved_instance_offering.html.markdown b/website/docs/d/rds_reserved_instance_offering.html.markdown index aadde1b6727d..983d2ed94270 100644 --- a/website/docs/d/rds_reserved_instance_offering.html.markdown +++ b/website/docs/d/rds_reserved_instance_offering.html.markdown @@ -31,7 +31,7 @@ This data source supports the following arguments: * `duration` - (Required) Duration of the reservation in years or seconds. Valid values are `1`, `3`, `31536000`, `94608000` * `multi_az` - (Required) Whether the reservation applies to Multi-AZ deployments. * `offering_type` - (Required) Offering type of this reserved DB instance. Valid values are `No Upfront`, `Partial Upfront`, `All Upfront`. -* `product_description` - (Required) Description of the reserved DB instance. +* `product_description` - (Required) Description of the reserved DB instance. Example values are `postgresql`, `aurora-postgresql`, `mysql`, `aurora-mysql`, `mariadb`. ## Attribute Reference From 38d41e3fd5d5c5f3658e8c9338ef7693e3645b77 Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 18:52:52 +0100 Subject: [PATCH 0242/2115] removed duplicate entry from names_data.hcl and semgrep fix --- .../odb/cloud_exadata_infrastructure.go | 12 ++++----- ...loud_exadata_infrastructure_data_source.go | 10 +++---- ...exadata_infrastructure_data_source_test.go | 4 +-- .../odb/cloud_exadata_infrastructure_test.go | 4 +-- names/data/names_data.hcl | 27 ------------------- 5 files changed, 15 insertions(+), 42 deletions(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index 24f080ae63a3..f4834b8c79a1 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -93,7 +93,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res Computed: true, Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure", }, - "availability_zone": schema.StringAttribute{ + names.AttrAvailabilityZone: schema.StringAttribute{ Optional: true, Computed: true, PlanModifiers: []planmodifier.String{ @@ -135,7 +135,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res Computed: true, Description: "The software version of the database servers (dom0) in the Exadata infrastructure", }, - "display_name": schema.StringAttribute{ + names.AttrDisplayName: schema.StringAttribute{ Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), @@ -201,12 +201,12 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res }, Description: "The model name of the Exadata infrastructure. Changing this will force terraform to create new resource", }, - "status": schema.StringAttribute{ + names.AttrStatus: schema.StringAttribute{ CustomType: statusType, Computed: true, Description: "The current status of the Exadata infrastructure", }, - "status_reason": schema.StringAttribute{ + names.AttrStatusReason: schema.StringAttribute{ Computed: true, Description: "Additional information about the status of the Exadata infrastructure", }, @@ -228,7 +228,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res "total_storage_size_in_gbs": schema.Int32Attribute{ Computed: true, }, - "created_at": schema.StringAttribute{ + names.AttrCreatedAt: schema.StringAttribute{ Computed: true, CustomType: timetypes.RFC3339Type{}, Description: "The time when the Exadata infrastructure was created.", @@ -483,7 +483,7 @@ func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req res } func (r *resourceCloudExadataInfrastructure) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) + resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp) } func waitCloudExadataInfrastructureCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) { diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index 77a5ede348b2..c3d41b787704 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -55,7 +55,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d Computed: true, Description: "The amount of available storage, in gigabytes (GB), for the Exadata infrastructure.", }, - "availability_zone": schema.StringAttribute{ + names.AttrAvailabilityZone: schema.StringAttribute{ Computed: true, Description: "he name of the Availability Zone (AZ) where the Exadata infrastructure is located.", }, @@ -92,7 +92,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d Computed: true, Description: "The version of the Exadata infrastructure.", }, - "display_name": schema.StringAttribute{ + names.AttrDisplayName: schema.StringAttribute{ Computed: true, Description: "The display name of the Exadata infrastructure.", }, @@ -152,12 +152,12 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d Computed: true, Description: "The model name of the Exadata infrastructure.", }, - "status": schema.StringAttribute{ + names.AttrStatus: schema.StringAttribute{ CustomType: statusType, Computed: true, Description: "The status of the Exadata infrastructure.", }, - "status_reason": schema.StringAttribute{ + names.AttrStatusReason: schema.StringAttribute{ Computed: true, Description: "Additional information about the status of the Exadata infrastructure.", }, @@ -182,7 +182,7 @@ func (d *dataSourceCloudExadataInfrastructure) Schema(ctx context.Context, req d "servers. An OCPU is a legacy physical measure of compute resources. OCPUs are\n" + "based on the physical core of a processor with hyper-threading enabled.", }, - "created_at": schema.StringAttribute{ + names.AttrCreatedAt: schema.StringAttribute{ Computed: true, CustomType: timetypes.RFC3339Type{}, Description: "The time when the Exadata infrastructure was created.", diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index 8365b220bbfe..f041b85fa46f 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -48,9 +48,9 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { { Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix), Check: resource.ComposeAggregateTestCheckFunc( - resource.TestCheckResourceAttrPair(exaInfraResource, "id", exaInfraDataSource, "id"), + resource.TestCheckResourceAttrPair(exaInfraResource, names.AttrID, exaInfraDataSource, names.AttrID), resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"), - resource.TestCheckResourceAttr(exaInfraDataSource, "status", "AVAILABLE"), + resource.TestCheckResourceAttr(exaInfraDataSource, names.AttrStatus, "AVAILABLE"), resource.TestCheckResourceAttr(exaInfraDataSource, "storage_count", "3"), resource.TestCheckResourceAttr(exaInfraDataSource, "compute_count", "2"), ), diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index 14a19973a662..e245218dee0e 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -122,7 +122,7 @@ func TestAccODBCloudExadataInfrastructureResource_tagging(t *testing.T) { Config: exaInfraTestResource.exaDataInfraResourceBasicConfigWithTags(rName), Check: resource.ComposeAggregateTestCheckFunc( exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure1), - resource.TestCheckResourceAttr(resourceName, "tags.%", "1"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.env", "dev"), ), }, @@ -141,7 +141,7 @@ func TestAccODBCloudExadataInfrastructureResource_tagging(t *testing.T) { } return nil }), - resource.TestCheckResourceAttr(resourceName, "tags.%", "0"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, { diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 43d12782d406..da2600fbf852 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -9520,31 +9520,4 @@ service "evs" { provider_package_correct = "evs" doc_prefix = ["evs_"] brand = "Amazon" -} - -service "odb" { - sdk { - id = "ODB" - arn_namespace = "odb" - } - names { - provider_name_upper = "ODB" - human_friendly = "Oracle Database@AWS" - } - endpoint_info { - endpoint_api_call = " ListGiVersions" - endpoint_region_overrides = { - "aws" = "us-east-1" - } - } - go_packages { - v1_package = "" - v2_package = "odb" - } - resource_prefix{ - correct = "aws_odb_" - } - provider_package_correct = "odb" - doc_prefix = ["odb_"] - brand = "AWS" } \ No newline at end of file From ea58b0047883a3094f29f783bedc5fafd6ae3f0f Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 18:54:44 +0100 Subject: [PATCH 0243/2115] terraform example formatted. --- examples/odb/exadata_infra.tf | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf index f009197958da..956d39f91c4f 100644 --- a/examples/odb/exadata_infra.tf +++ b/examples/odb/exadata_infra.tf @@ -2,42 +2,42 @@ # Exadata Infrastructure with customer managed maintenance window resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_all_params" { - display_name = "Ofake-my-exa-infra" - shape = "Exadata.X11M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{email="abc@example.com"},{email="def@example.com"}] - database_server_type = "X11M" - storage_server_type = "X11M-HC" - maintenance_window { - custom_action_timeout_in_mins = 16 - days_of_week = [{ name ="MONDAY"}, {name="TUESDAY"}] - hours_of_day = [11,16] + display_name = "Ofake-my-exa-infra" + shape = "Exadata.X11M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window { + custom_action_timeout_in_mins = 16 + days_of_week = [{ name = "MONDAY" }, { name = "TUESDAY" }] + hours_of_day = [11, 16] is_custom_action_timeout_enabled = true - lead_time_in_weeks = 3 - months = [{name="FEBRUARY"},{name="MAY"},{name="AUGUST"},{name="NOVEMBER"}] - patching_mode = "ROLLING" - preference = "CUSTOM_PREFERENCE" - weeks_of_month =[2,4] + lead_time_in_weeks = 3 + months = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month = [2, 4] } tags = { - "env"= "dev" + "env" = "dev" } } # Exadata Infrastructure with default maintenance window with X9M system shape. with minimum parameters resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_basic" { - display_name = "Ofake_my_exa_X9M" - shape = "Exadata.X9M" - storage_count = 3 - compute_count = 2 - availability_zone_id = "use1-az6" - maintenance_window { - custom_action_timeout_in_mins = 16 + display_name = "Ofake_my_exa_X9M" + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window { + custom_action_timeout_in_mins = 16 is_custom_action_timeout_enabled = true - patching_mode = "ROLLING" - preference = "NO_PREFERENCE" + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" } } From cf7ecc98b503eb74875191ecf6d50a15c709c4d5 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 13:27:47 -0700 Subject: [PATCH 0244/2115] Allows Database Insights tests to run when default VPC does not have internet gateway --- internal/service/rds/cluster_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index c4e72c114c1c..787027d69532 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -6866,5 +6866,9 @@ resource "aws_rds_cluster" "test" { performance_insights_enabled = %[4]t performance_insights_retention_period = %[5]s } + +data "aws_kms_key" "rds" { + key_id = "alias/aws/rds" +} `, rName, tfrds.ClusterEngineMySQL, databaseInsightsMode, performanceInsightsEnabled, performanceInsightsRetentionPeriod)) } From 0e271131c22ebd5d76c494f90d84eca127f318db Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 14:41:05 -0700 Subject: [PATCH 0245/2115] Adds additional Database Insights tests with default KMS key --- internal/service/rds/cluster_test.go | 136 +++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 7 deletions(-) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 787027d69532..8ee8cb4edf92 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -19,6 +19,7 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/go-version" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/compare" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" @@ -3305,7 +3306,7 @@ func TestAccRDSCluster_GlobalClusterIdentifier_performanceInsightsEnabled(t *tes }) } -func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { +func TestAccRDSCluster_databaseInsightsMode_defaultKMSKey_create(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -3315,6 +3316,8 @@ func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_rds_cluster.test" + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), @@ -3322,7 +3325,7 @@ func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_databaseInsightsMode(rName, "advanced", true, "465"), + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "advanced", true, "465"), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), ), @@ -3334,11 +3337,13 @@ func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("data.aws_kms_key.rds", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), }, }, { - Config: testAccClusterConfig_databaseInsightsMode(rName, "standard", false, "null"), + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "standard", false, "null"), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), ), @@ -3350,6 +3355,7 @@ func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(false)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), }, }, @@ -3357,7 +3363,7 @@ func TestAccRDSCluster_databaseInsightsMode_create(t *testing.T) { }) } -func TestAccRDSCluster_databaseInsightsMode_update(t *testing.T) { +func TestAccRDSCluster_databaseInsightsMode_defaultKMSKey_Disable_PerformanceInsightsEnabled(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -3367,6 +3373,8 @@ func TestAccRDSCluster_databaseInsightsMode_update(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_rds_cluster.test" + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), @@ -3374,7 +3382,7 @@ func TestAccRDSCluster_databaseInsightsMode_update(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_databaseInsightsMode(rName, "null", true, "null"), + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "advanced", true, "465"), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), ), @@ -3383,14 +3391,127 @@ func TestAccRDSCluster_databaseInsightsMode_update(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), }, }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("data.aws_kms_key.rds", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "standard", true, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + }, + }) +} + +func TestAccRDSCluster_databaseInsightsMode_defaultKMSKey_Enable_OnUpdate_FromPerformanceInsightsEnabled(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "null", true, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("data.aws_kms_key.rds", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "advanced", true, "465"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + }, + }) +} + +func TestAccRDSCluster_databaseInsightsMode_defaultKMSKey_Enable_OnUpdate_FromPerformanceInsightsDisabled(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "null", false, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(false)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id"), knownvalue.StringExact("")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), }, }, { - Config: testAccClusterConfig_databaseInsightsMode(rName, "advanced", true, "465"), + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "advanced", true, "465"), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), ), @@ -3402,6 +3523,7 @@ func TestAccRDSCluster_databaseInsightsMode_update(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("performance_insights_kms_key_id"), "data.aws_kms_key.rds", tfjsonpath.New(names.AttrARN), compare.ValuesSame()), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), }, }, @@ -6841,7 +6963,7 @@ resource "aws_rds_cluster" "test" { `, rName) } -func testAccClusterConfig_databaseInsightsMode(rName, databaseInsightsMode string, performanceInsightsEnabled bool, performanceInsightsRetentionPeriod string) string { +func testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, databaseInsightsMode string, performanceInsightsEnabled bool, performanceInsightsRetentionPeriod string) string { if databaseInsightsMode != "null" { databaseInsightsMode = strconv.Quote(databaseInsightsMode) } From a439d5583562d4dff7253877394a74de246e5549 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 14:42:33 -0700 Subject: [PATCH 0246/2115] Adds test for enabling Database Insights on creation with custom KMS key --- internal/service/rds/cluster_test.go | 92 ++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 8ee8cb4edf92..d92e37265a4d 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -3531,6 +3531,63 @@ func TestAccRDSCluster_databaseInsightsMode_defaultKMSKey_Enable_OnUpdate_FromPe }) } +func TestAccRDSCluster_databaseInsightsMode_customKMSKey_create(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "advanced", true, "465"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("aws_kms_key.test", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "standard", false, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(false)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), + }, + }, + }, + }) +} + func TestAccRDSCluster_enhancedMonitoring_enabledToUpdatedMonitoringInterval(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -6994,3 +7051,38 @@ data "aws_kms_key" "rds" { } `, rName, tfrds.ClusterEngineMySQL, databaseInsightsMode, performanceInsightsEnabled, performanceInsightsRetentionPeriod)) } + +func testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, databaseInsightsMode string, performanceInsightsEnabled bool, performanceInsightsRetentionPeriod string) string { + if databaseInsightsMode != "null" { + databaseInsightsMode = strconv.Quote(databaseInsightsMode) + } + + return acctest.ConfigCompose( + testAccClusterConfig_clusterSubnetGroup(rName), + fmt.Sprintf(` +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = %[2]q + db_cluster_instance_class = "db.m6gd.large" + storage_type = "io1" + allocated_storage = 100 + iops = 1000 + master_username = "tfacctest" + master_password = "avoid-plaintext-passwords" + skip_final_snapshot = true + apply_immediately = true + db_subnet_group_name = aws_db_subnet_group.test.name + + database_insights_mode = %[3]s + performance_insights_enabled = %[4]t + performance_insights_kms_key_id = aws_kms_key.test.arn + performance_insights_retention_period = %[5]s +} + +resource "aws_kms_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + enable_key_rotation = true +} +`, rName, tfrds.ClusterEngineMySQL, databaseInsightsMode, performanceInsightsEnabled, performanceInsightsRetentionPeriod)) +} From e0185bcbec7a9b4f7707b8e9325f20a27fb823ce Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 15:13:32 -0700 Subject: [PATCH 0247/2115] Adds test for enabling Database Insights when Performance Insights was not enabled --- internal/service/rds/cluster_test.go | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index d92e37265a4d..c5922b3bfa59 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -3588,6 +3588,61 @@ func TestAccRDSCluster_databaseInsightsMode_customKMSKey_create(t *testing.T) { }) } +func TestAccRDSCluster_databaseInsightsMode_customKMSKey_Enable_OnUpdate_FromPerformanceInsightsDisabled(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + // KMS Key cannot be set if Performance Insights is not enabled + Config: testAccClusterConfig_databaseInsightsMode_defaultKMSKey(rName, "null", false, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(false)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id"), knownvalue.StringExact("")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "advanced", true, "465"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("performance_insights_kms_key_id"), "aws_kms_key.test", tfjsonpath.New(names.AttrARN), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + }, + }) +} + func TestAccRDSCluster_enhancedMonitoring_enabledToUpdatedMonitoringInterval(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { From 9b47cc6fed33242b54d2cb0bc8473e83515e7c10 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 15 Aug 2025 17:37:27 -0700 Subject: [PATCH 0248/2115] Adds tests for modifying Database Insights on existing clusters with custom KMS keys --- internal/service/rds/cluster.go | 3 + internal/service/rds/cluster_test.go | 114 +++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 161b370b6565..7063c0ceba26 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -1615,6 +1615,9 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any if d.HasChange("database_insights_mode") { input.DatabaseInsightsMode = types.DatabaseInsightsMode(d.Get("database_insights_mode").(string)) input.EnablePerformanceInsights = aws.Bool(d.Get("performance_insights_enabled").(bool)) + if v, ok := d.Get("performance_insights_kms_key_id").(string); ok && v != "" { + input.PerformanceInsightsKMSKeyId = aws.String(v) + } input.PerformanceInsightsRetentionPeriod = aws.Int32(int32(d.Get("performance_insights_retention_period").(int))) } diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index c5922b3bfa59..c41fda16bede 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -3588,6 +3588,120 @@ func TestAccRDSCluster_databaseInsightsMode_customKMSKey_create(t *testing.T) { }) } +func TestAccRDSCluster_databaseInsightsMode_customKMSKey_Disable_PerformanceInsightsEnabled(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "advanced", true, "465"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("aws_kms_key.test", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "standard", true, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + }, + }) +} + +func TestAccRDSCluster_databaseInsightsMode_customKMSKey_Enable_OnUpdate_FromPerformanceInsightsEnabled(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbCluster types.DBCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_cluster.test" + + kmsKeyIDExpectNoChange := statecheck.CompareValue(compare.ValuesSame()) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "null", true, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("standard")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue("aws_kms_key.test", tfjsonpath.New(names.AttrARN)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(0)), + }, + }, + { + Config: testAccClusterConfig_databaseInsightsMode_customKMSKey(rName, "advanced", true, "465"), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterExists(ctx, resourceName, &dbCluster), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("database_insights_mode"), knownvalue.StringExact("advanced")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_enabled"), knownvalue.Bool(true)), + kmsKeyIDExpectNoChange.AddStateValue(resourceName, tfjsonpath.New("performance_insights_kms_key_id")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("performance_insights_retention_period"), knownvalue.Int64Exact(465)), + }, + }, + }, + }) +} + func TestAccRDSCluster_databaseInsightsMode_customKMSKey_Enable_OnUpdate_FromPerformanceInsightsDisabled(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { From 674ad7c2b1cb27cef3a7843a1df865c60b769f0a Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 19:30:20 +0100 Subject: [PATCH 0249/2115] exadata infra resource registration --- internal/service/odb/service_package_gen.go | 25 +++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/internal/service/odb/service_package_gen.go b/internal/service/odb/service_package_gen.go index a44c1aa78cb0..de0b7360e531 100644 --- a/internal/service/odb/service_package_gen.go +++ b/internal/service/odb/service_package_gen.go @@ -4,6 +4,7 @@ package odb import ( "context" + "unique" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" @@ -18,11 +19,31 @@ import ( type servicePackage struct{} func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.ServicePackageFrameworkDataSource { - return []*inttypes.ServicePackageFrameworkDataSource{} + return []*inttypes.ServicePackageFrameworkDataSource{ + { + Factory: newDataSourceCloudExadataInfrastructure, + TypeName: "aws_odb_cloud_exadata_infrastructure", + Name: "Cloud Exadata Infrastructure", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, + } } func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.ServicePackageFrameworkResource { - return []*inttypes.ServicePackageFrameworkResource{} + return []*inttypes.ServicePackageFrameworkResource{ + { + Factory: newResourceCloudExadataInfrastructure, + TypeName: "aws_odb_cloud_exadata_infrastructure", + Name: "Cloud Exadata Infrastructure", + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), + }, + } } func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { From abf040d7fb71dddaee8cc56d1826cc058ec1de7d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 12:06:37 -0700 Subject: [PATCH 0250/2115] Adds CHANGELOG entry --- .changelog/43942.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43942.txt diff --git a/.changelog/43942.txt b/.changelog/43942.txt new file mode 100644 index 000000000000..60bfebd60dbb --- /dev/null +++ b/.changelog/43942.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_cluster: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key +``` From c3643f986b26d3a60f6185aae781bfdd469e2c31 Mon Sep 17 00:00:00 2001 From: Asim Date: Mon, 18 Aug 2025 20:14:51 +0100 Subject: [PATCH 0251/2115] semgrep-fix code suggestion addressed. --- .../service/odb/cloud_exadata_infrastructure.go | 5 +---- ...ud_exadata_infrastructure_data_source_test.go | 11 +++++++---- .../odb/cloud_exadata_infrastructure_test.go | 16 ++++++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index f4834b8c79a1..23b15529ab99 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -57,6 +57,7 @@ var ResourceCloudExadataInfrastructure = newResourceCloudExadataInfrastructure type resourceCloudExadataInfrastructure struct { framework.ResourceWithModel[cloudExadataInfrastructureResourceModel] framework.WithTimeouts + framework.WithImportByID } func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { @@ -482,10 +483,6 @@ func (r *resourceCloudExadataInfrastructure) Delete(ctx context.Context, req res } } -func (r *resourceCloudExadataInfrastructure) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root(names.AttrID), req, resp) -} - func waitCloudExadataInfrastructureCreated(ctx context.Context, conn *odb.Client, id string, timeout time.Duration) (*odbtypes.CloudExadataInfrastructure, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(odbtypes.ResourceStatusProvisioning), diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index f041b85fa46f..ed821b8fabee 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -36,6 +36,9 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { exaInfraResource := "aws_odb_cloud_exadata_infrastructure.test" exaInfraDataSource := "data.aws_odb_cloud_exadata_infrastructure.test" displayNameSuffix := sdkacctest.RandomWithPrefix(exaInfraDataSourceTestEntity.displayNamePrefix) + domain := acctest.RandomDomainName() + emailAddress1 := acctest.RandomEmailAddress(domain) + emailAddress2 := acctest.RandomEmailAddress(domain) resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -46,7 +49,7 @@ func TestAccODBCloudExadataInfrastructureDataSource_basic(t *testing.T) { CheckDestroy: exaInfraDataSourceTestEntity.testAccCheckCloudExadataInfrastructureDestroy(ctx), Steps: []resource.TestStep{ { - Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix), + Config: exaInfraDataSourceTestEntity.basicExaInfraDataSource(displayNameSuffix, emailAddress1, emailAddress2), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrPair(exaInfraResource, names.AttrID, exaInfraDataSource, names.AttrID), resource.TestCheckResourceAttr(exaInfraDataSource, "shape", "Exadata.X9M"), @@ -82,7 +85,7 @@ func (cloudExaDataInfraDataSourceTest) testAccCheckCloudExadataInfrastructureDes } } -func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix string) string { +func (cloudExaDataInfraDataSourceTest) basicExaInfraDataSource(displayNameSuffix, emailAddress1, emailAddress2 string) string { testData := fmt.Sprintf(` @@ -94,7 +97,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + customer_contacts_to_send_to_oci = [{ email = %[2]q }, { email = %[3]q }] maintenance_window { custom_action_timeout_in_mins = 16 is_custom_action_timeout_enabled = true @@ -106,6 +109,6 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { data "aws_odb_cloud_exadata_infrastructure" "test" { id = aws_odb_cloud_exadata_infrastructure.test.id } -`, displayNameSuffix) +`, displayNameSuffix, emailAddress1, emailAddress2) return testData } diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index e245218dee0e..fafc402874ce 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -75,6 +75,9 @@ func TestAccODBCloudExadataInfrastructureResource_withAllParameters(t *testing.T var cloudExaDataInfrastructure odbtypes.CloudExadataInfrastructure resourceName := "aws_odb_cloud_exadata_infrastructure.test" rName := sdkacctest.RandomWithPrefix(exaInfraTestResource.displayNamePrefix) + domain := acctest.RandomDomainName() + emailAddress1 := acctest.RandomEmailAddress(domain) + emailAddress2 := acctest.RandomEmailAddress(domain) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) @@ -85,7 +88,7 @@ func TestAccODBCloudExadataInfrastructureResource_withAllParameters(t *testing.T CheckDestroy: exaInfraTestResource.testAccCheckCloudExaDataInfraDestroyed(ctx), Steps: []resource.TestStep{ { - Config: exaInfraTestResource.exaDataInfraResourceWithAllConfig(rName), + Config: exaInfraTestResource.exaDataInfraResourceWithAllConfig(rName, emailAddress1, emailAddress2), Check: resource.ComposeAggregateTestCheckFunc( exaInfraTestResource.testAccCheckCloudExadataInfrastructureExists(ctx, resourceName, &cloudExaDataInfrastructure), ), @@ -337,9 +340,9 @@ func (cloudExaDataInfraResourceTest) testAccCheckCloudExadataInfrastructureExist func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *testing.T) { conn := acctest.Provider.Meta().(*conns.AWSClient).ODBClient(ctx) - input := &odb.ListCloudExadataInfrastructuresInput{} + input := odb.ListCloudExadataInfrastructuresInput{} - _, err := conn.ListCloudExadataInfrastructures(ctx, input) + _, err := conn.ListCloudExadataInfrastructures(ctx, &input) if acctest.PreCheckSkipError(err) { t.Skipf("skipping acceptance testing: %s", err) @@ -349,7 +352,8 @@ func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *tes } } -func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId string) string { +func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId, emailAddress1, emailAddress2 string) string { + exaDataInfra := fmt.Sprintf(` @@ -359,7 +363,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + customer_contacts_to_send_to_oci = [{ email =%[2]q }, { email = %[3]q }] database_server_type = "X11M" storage_server_type = "X11M-HC" maintenance_window { @@ -378,7 +382,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { } } -`, randomId) +`, randomId, emailAddress1, emailAddress2) return exaDataInfra } func (cloudExaDataInfraResourceTest) exaDataInfraResourceBasicConfig(displayName string) string { From 47ea19b991eb09c8142591d8ab845a1a54a2aaa0 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 13:28:25 -0700 Subject: [PATCH 0252/2115] Updates `go-getter` to v.1.7.9 --- .ci/tools/go.mod | 3 +-- .ci/tools/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod index 65c2cb34e105..7426da7dd1b0 100644 --- a/.ci/tools/go.mod +++ b/.ci/tools/go.mod @@ -176,7 +176,7 @@ require ( github.com/gostaticanalysis/nilerr v0.1.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.8 // indirect + github.com/hashicorp/go-getter v1.7.9 // indirect github.com/hashicorp/go-hclog v1.6.3 // indirect github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -250,7 +250,6 @@ require ( github.com/mitchellh/cli v1.1.5 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/.ci/tools/go.sum b/.ci/tools/go.sum index bb546c2e2f9f..2c7c57cb0a05 100644 --- a/.ci/tools/go.sum +++ b/.ci/tools/go.sum @@ -1305,8 +1305,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.8 h1:mshVHx1Fto0/MydBekWan5zUipGq7jO0novchgMmSiY= -github.com/hashicorp/go-getter v1.7.8/go.mod h1:2c6CboOEb9jG6YvmC9xdD+tyAFsrUaJPedwXDGr0TM4= +github.com/hashicorp/go-getter v1.7.9 h1:G9gcjrDixz7glqJ+ll5IWvggSBR+R0B54DSRt4qfdC4= +github.com/hashicorp/go-getter v1.7.9/go.mod h1:dyFCmT1AQkDfOIt9NH8pw9XBDqNrIKJT5ylbpi7zPNE= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= @@ -1595,8 +1595,6 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= -github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= From 448c20d12a148e68ea03b4814cee7ff6e650da4d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 14:40:40 -0700 Subject: [PATCH 0253/2115] Updates ENI regex --- internal/service/cloudhsmv2/hsm_test.go | 2 +- internal/service/ec2/vpc_traffic_mirror_target_test.go | 2 +- internal/service/sagemaker/notebook_instance_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/cloudhsmv2/hsm_test.go b/internal/service/cloudhsmv2/hsm_test.go index 19035bffe43c..1e1bbe612ae1 100644 --- a/internal/service/cloudhsmv2/hsm_test.go +++ b/internal/service/cloudhsmv2/hsm_test.go @@ -37,7 +37,7 @@ func testAccHSM_basic(t *testing.T) { testAccCheckHSMExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, names.AttrAvailabilityZone, "aws_subnet.test.0", names.AttrAvailabilityZone), resource.TestCheckResourceAttrPair(resourceName, "cluster_id", "aws_cloudhsm_v2_cluster.test", names.AttrID), - resource.TestMatchResourceAttr(resourceName, "hsm_eni_id", regexache.MustCompile(`^eni-.+`)), + resource.TestMatchResourceAttr(resourceName, "hsm_eni_id", regexache.MustCompile(`^eni-[0-9a-f]+$`)), resource.TestMatchResourceAttr(resourceName, "hsm_id", regexache.MustCompile(`^hsm-.+`)), resource.TestCheckResourceAttr(resourceName, "hsm_state", string(types.HsmStateActive)), resource.TestCheckResourceAttrSet(resourceName, names.AttrIPAddress), diff --git a/internal/service/ec2/vpc_traffic_mirror_target_test.go b/internal/service/ec2/vpc_traffic_mirror_target_test.go index f528c219b1d9..c478603d58b7 100644 --- a/internal/service/ec2/vpc_traffic_mirror_target_test.go +++ b/internal/service/ec2/vpc_traffic_mirror_target_test.go @@ -78,7 +78,7 @@ func TestAccVPCTrafficMirrorTarget_eni(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckTrafficMirrorTargetExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), - resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile("eni-.*")), + resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^eni-[0-9a-f]+$`)), ), }, { diff --git a/internal/service/sagemaker/notebook_instance_test.go b/internal/service/sagemaker/notebook_instance_test.go index 08371e955046..606efd497d47 100644 --- a/internal/service/sagemaker/notebook_instance_test.go +++ b/internal/service/sagemaker/notebook_instance_test.go @@ -461,7 +461,7 @@ func TestAccSageMakerNotebookInstance_DirectInternet_access(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "direct_internet_access", "Disabled"), resource.TestCheckResourceAttrPair(resourceName, names.AttrSubnetID, "aws_subnet.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), - resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile("eni-.*")), + resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^eni-[0-9a-f]+$`)), ), }, { @@ -476,7 +476,7 @@ func TestAccSageMakerNotebookInstance_DirectInternet_access(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "direct_internet_access", "Enabled"), resource.TestCheckResourceAttrPair(resourceName, names.AttrSubnetID, "aws_subnet.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), - resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile("eni-.*")), + resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^eni-[0-9a-f]+$`)), ), }, }, From 02777de12ce4ed95a1f2de69a15a76797da5103d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 14:42:01 -0700 Subject: [PATCH 0254/2115] Adds `network_interface` and `primary_network_interface_id` checks to basic test --- internal/service/ec2/ec2_instance_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index e5cae5e00f02..5f08b2705268 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -197,6 +197,10 @@ func TestAccEC2Instance_basic(t *testing.T) { acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance/i-[0-9a-z]+`)), resource.TestCheckResourceAttr(resourceName, "instance_initiated_shutdown_behavior", "stop"), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + }, }, { ResourceName: resourceName, From c21c53cfe134f91b6b4e90c142052a24052c0b80 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 15:15:14 -0700 Subject: [PATCH 0255/2115] Sets `force_destroy` to default on import --- internal/service/ec2/ec2_instance.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 4d97df236371..050e0b8e3dac 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -58,7 +58,11 @@ func resourceInstance() *schema.Resource { DeleteWithoutTimeout: resourceInstanceDelete, Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, + StateContext: func(ctx context.Context, rd *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { + rd.Set(names.AttrForceDestroy, false) + + return []*schema.ResourceData{rd}, nil + }, }, SchemaVersion: 2, From dfca3dbe77989bd57c9f379455d7b4dea60769d4 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 15:17:30 -0700 Subject: [PATCH 0256/2115] Renames Network Interface tests to allow grouping. Renames `addSecondaryNetworkInterface` test to `attach` --- internal/service/ec2/ec2_instance_test.go | 52 +++++++++++++++++++---- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 5f08b2705268..4357668dccda 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -21,6 +21,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-testing/compare" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" @@ -206,7 +207,7 @@ func TestAccEC2Instance_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{names.AttrForceDestroy, "user_data_replace_on_change"}, + ImportStateVerifyIgnore: []string{"user_data_replace_on_change"}, }, }, }) @@ -3225,7 +3226,7 @@ func TestAccEC2Instance_gp3RootBlockDevice(t *testing.T) { }) } -func TestAccEC2Instance_primaryNetworkInterface(t *testing.T) { +func TestAccEC2Instance_NetworkInterface_primaryNetworkInterface(t *testing.T) { ctx := acctest.Context(t) var instance awstypes.Instance var eni awstypes.NetworkInterface @@ -3250,6 +3251,19 @@ func TestAccEC2Instance_primaryNetworkInterface(t *testing.T) { "network_card_index": "0", }), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + }, }, { ResourceName: resourceName, @@ -3261,10 +3275,11 @@ func TestAccEC2Instance_primaryNetworkInterface(t *testing.T) { }) } -func TestAccEC2Instance_networkCardIndex(t *testing.T) { +func TestAccEC2Instance_NetworkInterface_networkCardIndex(t *testing.T) { ctx := acctest.Context(t) var instance awstypes.Instance resourceName := "aws_instance.test" + eniResourceName := "aws_network_interface.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards. @@ -3286,6 +3301,19 @@ func TestAccEC2Instance_networkCardIndex(t *testing.T) { "network_card_index": "0", }), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + }, }, { ResourceName: resourceName, @@ -3297,7 +3325,7 @@ func TestAccEC2Instance_networkCardIndex(t *testing.T) { }) } -func TestAccEC2Instance_primaryNetworkInterfaceSourceDestCheck(t *testing.T) { +func TestAccEC2Instance_NetworkInterface_primaryNetworkInterfaceSourceDestCheck(t *testing.T) { ctx := acctest.Context(t) var instance awstypes.Instance var eni awstypes.NetworkInterface @@ -3329,7 +3357,7 @@ func TestAccEC2Instance_primaryNetworkInterfaceSourceDestCheck(t *testing.T) { }) } -func TestAccEC2Instance_addSecondaryInterface(t *testing.T) { +func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) { ctx := acctest.Context(t) var before, after awstypes.Instance var eniPrimary awstypes.NetworkInterface @@ -3346,7 +3374,7 @@ func TestAccEC2Instance_addSecondaryInterface(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName), + Config: testAccInstanceConfig_attachSecondaryNetworkInterfaceBefore(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3360,13 +3388,19 @@ func TestAccEC2Instance_addSecondaryInterface(t *testing.T) { ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, }, { - Config: testAccInstanceConfig_addSecondaryNetworkInterfaceAfter(rName), + Config: testAccInstanceConfig_attachSecondaryNetworkInterface(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, + }, }, }) } @@ -8397,7 +8431,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName string) string { +func testAccInstanceConfig_attachSecondaryNetworkInterfaceBefore(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8436,7 +8470,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_addSecondaryNetworkInterfaceAfter(rName string) string { +func testAccInstanceConfig_attachSecondaryNetworkInterface(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), From b57a937b7da1e3ae5faa2b53c4aec7440e9ee9bf Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 16:06:24 -0700 Subject: [PATCH 0257/2115] Adds state checks for `TestAccEC2Instance_NetworkInterface_attachSecondaryInterface` --- internal/service/ec2/ec2_instance_test.go | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 4357668dccda..481c8d31ea63 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -3378,8 +3378,24 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), + testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + + statecheck.ExpectKnownValue(eniSecondaryResourceName, tfjsonpath.New("attachment"), knownvalue.SetExact([]knownvalue.Check{})), + }, }, { ResourceName: resourceName, @@ -3391,9 +3407,32 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) Config: testAccInstanceConfig_attachSecondaryNetworkInterface(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), + testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + + statecheck.ExpectKnownValue(eniSecondaryResourceName, tfjsonpath.New("attachment"), knownvalue.SetExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + "attachment_id": knownvalue.NotNull(), + "device_index": knownvalue.Int64Exact(1), + "instance": knownvalue.NotNull(), + }), + })), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), eniSecondaryResourceName, tfjsonpath.New("attachment").AtSliceIndex(0).AtMapKey("instance"), compare.ValuesSame()), + }, }, { ResourceName: resourceName, From 15a30e99b835026da6ef18d5d6d14182a593c586 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 16:26:49 -0700 Subject: [PATCH 0258/2115] Adds test for attaching Network Interface using `aws_network_interface_attachment` resource --- internal/service/ec2/ec2_instance_test.go | 176 +++++++++++++++++++++- 1 file changed, 171 insertions(+), 5 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 481c8d31ea63..c13818ed0b1b 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -3357,7 +3357,7 @@ func TestAccEC2Instance_NetworkInterface_primaryNetworkInterfaceSourceDestCheck( }) } -func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) { +func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachment(t *testing.T) { ctx := acctest.Context(t) var before, after awstypes.Instance var eniPrimary awstypes.NetworkInterface @@ -3374,7 +3374,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_attachSecondaryNetworkInterfaceBefore(rName), + Config: testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3404,7 +3404,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, }, { - Config: testAccInstanceConfig_attachSecondaryNetworkInterface(rName), + Config: testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3444,6 +3444,88 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface(t *testing.T) }) } +func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentResource(t *testing.T) { + ctx := acctest.Context(t) + var before, after awstypes.Instance + var eniPrimary awstypes.NetworkInterface + var eniSecondary awstypes.NetworkInterface + resourceName := "aws_instance.test" + eniPrimaryResourceName := "aws_network_interface.primary" + eniSecondaryResourceName := "aws_network_interface.secondary" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckInstanceDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource_Setup(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &before), + testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), + testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + + statecheck.ExpectKnownValue(eniSecondaryResourceName, tfjsonpath.New("attachment"), knownvalue.SetExact([]knownvalue.Check{})), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, + }, + { + Config: testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &after), + testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), + testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + + statecheck.ExpectKnownValue("aws_network_interface_attachment.secondary", tfjsonpath.New("device_index"), knownvalue.Int64Exact(1)), + statecheck.CompareValuePairs("aws_network_interface_attachment.secondary", tfjsonpath.New(names.AttrInstanceID), resourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + statecheck.CompareValuePairs("aws_network_interface_attachment.secondary", tfjsonpath.New(names.AttrNetworkInterfaceID), eniSecondaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, + }, + }, + }) +} + // https://github.com/hashicorp/terraform/issues/3205 func TestAccEC2Instance_addSecurityGroupNetworkInterface(t *testing.T) { ctx := acctest.Context(t) @@ -8470,7 +8552,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterfaceBefore(rName string) string { +func testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8509,7 +8591,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterface(rName string) string { +func testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8554,6 +8636,90 @@ resource "aws_instance" "test" { `, rName)) } +func testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource_Setup(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceConfig_vpcBase(rName, false, 0), + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "t2.micro" + + network_interface { + network_interface_id = aws_network_interface.primary.id + device_index = 0 + } + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "primary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.42"] + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "secondary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.43"] + + tags = { + Name = %[1]q + } +} +`, rName)) +} + +func testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceConfig_vpcBase(rName, false, 0), + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "t2.micro" + + network_interface { + network_interface_id = aws_network_interface.primary.id + device_index = 0 + } + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "primary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.42"] + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "secondary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.43"] + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface_attachment" "secondary" { + instance_id = aws_instance.test.id + network_interface_id = aws_network_interface.secondary.id + device_index = 1 +} +`, rName)) +} + func testAccInstanceConfig_addSecurityGroupBefore(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), From 0077eb649c0b9943e71cc5b29e59c1156ab89c19 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 16:50:26 -0700 Subject: [PATCH 0259/2115] Adds test for attaching Network Interface using `network_interface` collection inline to `aws_instance` resource --- internal/service/ec2/ec2_instance_test.go | 170 ++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index c13818ed0b1b..537f0689fa14 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -3526,6 +3526,93 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentReso }) } +func TestAccEC2Instance_NetworkInterface_addSecondaryInterface(t *testing.T) { + ctx := acctest.Context(t) + var before, after awstypes.Instance + var eniPrimary awstypes.NetworkInterface + var eniSecondary awstypes.NetworkInterface + resourceName := "aws_instance.test" + eniPrimaryResourceName := "aws_network_interface.primary" + eniSecondaryResourceName := "aws_network_interface.secondary" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckInstanceDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &before), + testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), + testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, + }, + { + Config: testAccInstanceConfig_addSecondaryNetworkInterface(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &after), + testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), + testAccCheckENIExists(ctx, eniSecondaryResourceName, &eniSecondary), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", "2"), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(0), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + "device_index": knownvalue.Int64Exact(1), + "network_card_index": knownvalue.Int64Exact(0), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface_id"), eniPrimaryResourceName, tfjsonpath.New(names.AttrID), compare.ValuesSame()), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionReplace), + }, + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, + }, + }, + }) +} + // https://github.com/hashicorp/terraform/issues/3205 func TestAccEC2Instance_addSecurityGroupNetworkInterface(t *testing.T) { ctx := acctest.Context(t) @@ -8720,6 +8807,89 @@ resource "aws_network_interface_attachment" "secondary" { `, rName)) } +func testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceConfig_vpcBase(rName, false, 0), + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "t2.micro" + + network_interface { + network_interface_id = aws_network_interface.primary.id + device_index = 0 + } + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "primary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.42"] + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "secondary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.43"] + + tags = { + Name = %[1]q + } +} +`, rName)) +} + +func testAccInstanceConfig_addSecondaryNetworkInterface(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceConfig_vpcBase(rName, false, 0), + fmt.Sprintf(` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "t2.micro" + + network_interface { + network_interface_id = aws_network_interface.primary.id + device_index = 0 + } + + network_interface { + network_interface_id = aws_network_interface.secondary.id + device_index = 1 + } + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "primary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.42"] + + tags = { + Name = %[1]q + } +} + +resource "aws_network_interface" "secondary" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.43"] + + tags = { + Name = %[1]q + } +} +`, rName)) +} + func testAccInstanceConfig_addSecurityGroupBefore(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), From d89cbaaecc21899af77948eb8482509eb5a62df9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 16:50:54 -0700 Subject: [PATCH 0260/2115] Uses Set checks for `network_interface` --- internal/service/ec2/ec2_instance_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 537f0689fa14..6153705cb625 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -199,7 +199,7 @@ func TestAccEC2Instance_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_initiated_shutdown_behavior", "stop"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{})), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), }, }, @@ -3252,7 +3252,7 @@ func TestAccEC2Instance_NetworkInterface_primaryNetworkInterface(t *testing.T) { }), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3302,7 +3302,7 @@ func TestAccEC2Instance_NetworkInterface_networkCardIndex(t *testing.T) { }), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3382,7 +3382,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachme resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3412,7 +3412,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachme resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3469,7 +3469,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentReso resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3499,7 +3499,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentReso resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3551,7 +3551,7 @@ func TestAccEC2Instance_NetworkInterface_addSecondaryInterface(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), @@ -3579,7 +3579,7 @@ func TestAccEC2Instance_NetworkInterface_addSecondaryInterface(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "network_interface.#", "2"), ), ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.ListExact([]knownvalue.Check{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrDeleteOnTermination: knownvalue.Bool(false), "device_index": knownvalue.Int64Exact(0), From b45d8f64e06b4a64a9b6a79d5d615dc734624f85 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 16:51:35 -0700 Subject: [PATCH 0261/2115] Sets `force_destroy` to default on `aws_spot_instance_request` import --- internal/service/ec2/ec2_spot_instance_request.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index 984accdb13d1..13fc9e0ba745 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -36,7 +36,11 @@ func resourceSpotInstanceRequest() *schema.Resource { DeleteWithoutTimeout: resourceSpotInstanceRequestDelete, Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, + StateContext: func(ctx context.Context, rd *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { + rd.Set(names.AttrForceDestroy, false) + + return []*schema.ResourceData{rd}, nil + }, }, Timeouts: &schema.ResourceTimeout{ From 4e97c567481762ecc88bab5e392df0659b21aac3 Mon Sep 17 00:00:00 2001 From: Kyle Thatcher Date: Mon, 18 Aug 2025 23:58:16 +0000 Subject: [PATCH 0262/2115] Add worker replacement strategy input for mwaa environments --- .changelog/43946.txt | 3 +++ internal/service/mwaa/environment.go | 10 ++++++++++ internal/service/mwaa/environment_test.go | 9 ++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .changelog/43946.txt diff --git a/.changelog/43946.txt b/.changelog/43946.txt new file mode 100644 index 000000000000..ee08fd0684b9 --- /dev/null +++ b/.changelog/43946.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_mwaa_environment: Add worker replacement strategy input +``` diff --git a/internal/service/mwaa/environment.go b/internal/service/mwaa/environment.go index 1c98cc1989e3..dd3f48173bcf 100644 --- a/internal/service/mwaa/environment.go +++ b/internal/service/mwaa/environment.go @@ -297,6 +297,12 @@ func resourceEnvironment() *schema.Resource { Optional: true, Computed: true, }, + "worker_replacement_strategy": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.WorkerReplacementStrategy](), + }, }, CustomizeDiff: customdiff.Sequence( @@ -595,6 +601,10 @@ func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta input.WeeklyMaintenanceWindowStart = aws.String(d.Get("weekly_maintenance_window_start").(string)) } + if v, ok := d.GetOk("worker_replacement_strategy"); ok { + input.WorkerReplacementStrategy = awstypes.WorkerReplacementStrategy(v.(string)) + } + _, err := conn.UpdateEnvironment(ctx, input) if err != nil { diff --git a/internal/service/mwaa/environment_test.go b/internal/service/mwaa/environment_test.go index 2814e0d88d65..649d2dd548d7 100644 --- a/internal/service/mwaa/environment_test.go +++ b/internal/service/mwaa/environment_test.go @@ -309,14 +309,16 @@ func TestAccMWAAEnvironment_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "webserver_access_mode", string(awstypes.WebserverAccessModePublicOnly)), resource.TestCheckResourceAttrSet(resourceName, "webserver_url"), resource.TestCheckResourceAttr(resourceName, "weekly_maintenance_window_start", "SAT:03:00"), + resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", string(awstypes.WorkerReplacementStrategyGraceful)), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), resource.TestCheckResourceAttr(resourceName, "tags.Environment", "production"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"worker_replacement_strategy"}, }, }, }) @@ -904,6 +906,7 @@ resource "aws_mwaa_environment" "test" { startup_script_s3_path = aws_s3_object.startup_script.key webserver_access_mode = "PUBLIC_ONLY" weekly_maintenance_window_start = "SAT:03:00" + worker_replacement_strategy = "GRACEFUL" tags = { Name = %[1]q From 8373acf943edf4dc338915a68a064131349b27e6 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 18 Aug 2025 20:54:55 -0700 Subject: [PATCH 0263/2115] Renames test configs --- internal/service/ec2/ec2_instance_test.go | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 6153705cb625..73d297857550 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -3241,7 +3241,7 @@ func TestAccEC2Instance_NetworkInterface_primaryNetworkInterface(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_primaryNetworkInterface(rName), + Config: testAccInstanceConfig_networkInterface_primaryNetworkInterface(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &instance), testAccCheckENIExists(ctx, eniResourceName, &eni), @@ -3292,7 +3292,7 @@ func TestAccEC2Instance_NetworkInterface_networkCardIndex(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_networkCardIndex(rName), + Config: testAccInstanceConfig_networkInterface_networkCardIndex(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &instance), resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), @@ -3340,7 +3340,7 @@ func TestAccEC2Instance_NetworkInterface_primaryNetworkInterfaceSourceDestCheck( CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_primaryNetworkInterfaceSourceDestCheck(rName), + Config: testAccInstanceConfig_networkInterface_primaryNetworkInterfaceSourceDestCheck(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &instance), testAccCheckENIExists(ctx, eniResourceName, &eni), @@ -3374,7 +3374,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachme CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName), + Config: testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3404,7 +3404,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachme ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, }, { - Config: testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment(rName), + Config: testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_inlineAttachment(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3461,7 +3461,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentReso CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource_Setup(rName), + Config: testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_attachmentResource_Setup(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3491,7 +3491,7 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentReso ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, }, { - Config: testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource(rName), + Config: testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_attachmentResource(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3543,7 +3543,7 @@ func TestAccEC2Instance_NetworkInterface_addSecondaryInterface(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName), + Config: testAccInstanceConfig_networkInterface_addSecondaryNetworkInterfaceBefore(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &before), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -3571,7 +3571,7 @@ func TestAccEC2Instance_NetworkInterface_addSecondaryInterface(t *testing.T) { ImportStateVerifyIgnore: []string{"network_interface", "user_data_replace_on_change"}, }, { - Config: testAccInstanceConfig_addSecondaryNetworkInterface(rName), + Config: testAccInstanceConfig_networkInterface_addSecondaryNetworkInterface(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &after), testAccCheckENIExists(ctx, eniPrimaryResourceName, &eniPrimary), @@ -8547,7 +8547,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_primaryNetworkInterface(rName string) string { +func testAccInstanceConfig_networkInterface_primaryNetworkInterface(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8577,7 +8577,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_networkCardIndex(rName string) string { +func testAccInstanceConfig_networkInterface_networkCardIndex(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8608,7 +8608,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_primaryNetworkInterfaceSourceDestCheck(rName string) string { +func testAccInstanceConfig_networkInterface_primaryNetworkInterfaceSourceDestCheck(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8639,7 +8639,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName string) string { +func testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_inlineAttachment_Setup(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8678,7 +8678,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterface_inlineAttachment(rName string) string { +func testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_inlineAttachment(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8723,7 +8723,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource_Setup(rName string) string { +func testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_attachmentResource_Setup(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8762,7 +8762,7 @@ resource "aws_network_interface" "secondary" { `, rName)) } -func testAccInstanceConfig_attachSecondaryNetworkInterface_attachmentResource(rName string) string { +func testAccInstanceConfig_networkInterface_attachSecondaryNetworkInterface_attachmentResource(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8807,7 +8807,7 @@ resource "aws_network_interface_attachment" "secondary" { `, rName)) } -func testAccInstanceConfig_addSecondaryNetworkInterfaceBefore(rName string) string { +func testAccInstanceConfig_networkInterface_addSecondaryNetworkInterfaceBefore(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), @@ -8846,7 +8846,7 @@ resource "aws_network_interface" "secondary" { `, rName)) } -func testAccInstanceConfig_addSecondaryNetworkInterface(rName string) string { +func testAccInstanceConfig_networkInterface_addSecondaryNetworkInterface(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), From ca9fdd824bfb91cec193a579a0304bc0a3c9f6db Mon Sep 17 00:00:00 2001 From: Asim Date: Tue, 19 Aug 2025 12:42:25 +0100 Subject: [PATCH 0264/2115] documentation added. --- .../odb/cloud_exadata_infrastructure.go | 3 +- ...cloud_exadata_infrastructure.html.markdown | 69 +++++++++ ...cloud_exadata_infrastructure.html.markdown | 144 ++++++++++++++++++ 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 website/docs/d/cloud_exadata_infrastructure.html.markdown create mode 100644 website/docs/r/cloud_exadata_infrastructure.html.markdown diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index 23b15529ab99..00f23d2854d5 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -227,7 +227,8 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res names.AttrTags: tftags.TagsAttribute(), names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), "total_storage_size_in_gbs": schema.Int32Attribute{ - Computed: true, + Computed: true, + Description: "The total amount of storage, in gigabytes (GB), on the Exadata infrastructure.", }, names.AttrCreatedAt: schema.StringAttribute{ Computed: true, diff --git a/website/docs/d/cloud_exadata_infrastructure.html.markdown b/website/docs/d/cloud_exadata_infrastructure.html.markdown new file mode 100644 index 000000000000..1d906761daf6 --- /dev/null +++ b/website/docs/d/cloud_exadata_infrastructure.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "Polly" +layout: "aws" +page_title: "AWS: aws_polly_voices" +description: |- + Terraform data source for managing an AWS Polly Voices. +--- + +# Data Source: aws_odb_cloud_exadata_infrastructure + +Terraform data source for Exadata Infrastructure resource in AWS for Oracle Database Service. + +## Example Usage + +### Basic Usage + +```terraform +data "aws_odb_cloud_exadata_infrastructure" "example" { + id = "example" +} +``` + +## Argument Reference + +The following arguments are optional: + +* `id` - (Required) The unique identifier of the Exadata infrastructure. + +## Attribute Reference + +This data source exports the following attributes in addition to the arguments above: + +* `arn` - The Amazon Resource Name (ARN) for the Exadata infrastructure. +* `activated_storage_count` - The number of storage servers requested for the Exadata infrastructure. +* `additional_storage_count` - The number of storage servers requested for the Exadata infrastructure. +* `availability_zone` - The name of the Availability Zone (AZ) where the Exadata infrastructure is located. +* `availability_zone_id` - The AZ ID of the AZ where the Exadata infrastructure is located. +* `arn` - The Amazon Resource Name (ARN) for the Exadata infrastructure. +* `id` - The unique identifier of the Exadata infrastructure. +* `compute_count` - The number of database servers for the Exadata infrastructure. +* `cpu_count` - The total number of CPU cores that are allocated to the Exadata infrastructure. +* `data_storage_size_in_tbs` - The size of the Exadata infrastructure's data disk group, in terabytes (TB). +* `db_node_storage_size_in_gbs` - The size of the storage available on each database node, in gigabytes (GB). +* `db_server_version` - The version of the Exadata infrastructure. +* `display_name` - The display name of the Exadata infrastructure. +* `last_maintenance_run_id` - The Oracle Cloud Identifier (OCID) of the last maintenance run for the Exadata infrastructure. +* `max_cpu_count` - The total number of CPU cores available on the Exadata infrastructure. +* `max_data_storage_in_tbs` - The total amount of data disk group storage, in terabytes (TB), that's available on the Exadata infrastructure. +* `max_db_node_storage_size_in_gbs` - The total amount of local node storage, in gigabytes (GB), that's available on the Exadata infrastructure. +* `max_memory_in_gbs` - The total amount of memory, in gigabytes (GB), that's available on the Exadata infrastructure. +* `memory_size_in_gbs` - The amount of memory, in gigabytes (GB), that's allocated on the Exadata infrastructure. +* `monthly_db_server_version` - The monthly software version of the database servers installed on the Exadata infrastructure. +* `monthly_storage_server_version` - The monthly software version of the storage servers installed on the Exadata infrastructure. +* `next_maintenance_run_id` - The OCID of the next maintenance run for the Exadata infrastructure. +* `oci_resource_anchor_name` - The name of the OCI resource anchor for the Exadata infrastructure. +* `oci_url` - The HTTPS link to the Exadata infrastructure in OCI. +* `ocid` - The OCID of the Exadata infrastructure in OCI. +* `percent_progress` - The amount of progress made on the current operation on the Exadata infrastructure expressed as a percentage. +* `shape` - The model name of the Exadata infrastructure. +* `status` - The status of the Exadata infrastructure. +* `status_reason` - Additional information about the status of the Exadata infrastructure. +* `storage_count` - The number of storage servers that are activated for the Exadata infrastructure. +* `storage_server_version` - The software version of the storage servers on the Exadata infrastructure. +* `total_storage_size_in_gbs` - The total amount of storage, in gigabytes (GB), on the Exadata infrastructure. +* `compute_model` - The OCI compute model used when you create or clone an instance: ECPU or OCPU. An ECPU is an abstracted measure of compute resources. ECPUs are based on the number of cores elastically allocated from a pool of compute and storage servers. An OCPU is a legacy physical measure of compute resources. OCPUs are based on the physical core of a processor with hyper-threading enabled. +* `created_at` - The time when the Exadata infrastructure was created. +* `database_server_type` - The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. +* `storage_server_type` - The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. +* `maintenance_window` - The scheduling details of the maintenance window. Patching and system updates take place during the maintenance window. diff --git a/website/docs/r/cloud_exadata_infrastructure.html.markdown b/website/docs/r/cloud_exadata_infrastructure.html.markdown new file mode 100644 index 000000000000..1c9a342852d1 --- /dev/null +++ b/website/docs/r/cloud_exadata_infrastructure.html.markdown @@ -0,0 +1,144 @@ +--- +subcategory: "OpenSearch Ingestion" +layout: "aws" +page_title: "AWS: aws_osis_pipeline" +description: |- + Terraform resource for managing an AWS OpenSearch Ingestion Pipeline. +--- + +# Resource: aws_odb_cloud_exadata_infrastructure + +Terraform resource for creating Exadata Infrastructure resource in AWS for Oracle Database Service. + +## Example Usage + +### Basic Usage + +```terraform + +resource "aws_odb_cloud_exadata_infrastructure" "example" { + display_name = "my-exa-infra" + shape = "Exadata.X11M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + customer_contacts_to_send_to_oci = [{ email = "abc@example.com" }, { email = "def@example.com" }] + database_server_type = "X11M" + storage_server_type = "X11M-HC" + maintenance_window { + custom_action_timeout_in_mins = 16 + days_of_week = [{ name = "MONDAY" }, { name = "TUESDAY" }] + hours_of_day = [11, 16] + is_custom_action_timeout_enabled = true + lead_time_in_weeks = 3 + months = [{ name = "FEBRUARY" }, { name = "MAY" }, { name = "AUGUST" }, { name = "NOVEMBER" }] + patching_mode = "ROLLING" + preference = "CUSTOM_PREFERENCE" + weeks_of_month = [2, 4] + } + tags = { + "env" = "dev" + } + +} + +resource "aws_odb_cloud_exadata_infrastructure" "example" { + display_name = "my_exa_X9M" + shape = "Exadata.X9M" + storage_count = 3 + compute_count = 2 + availability_zone_id = "use1-az6" + maintenance_window { + custom_action_timeout_in_mins = 16 + is_custom_action_timeout_enabled = true + patching_mode = "ROLLING" + preference = "NO_PREFERENCE" + } +} +``` + +## Argument Reference + +The following arguments are required: + +* `display_name` - (Required) The user-friendly name for the Exadata infrastructure. Changing this will force terraform to create a new resource. +* `shape` - (Required) The model name of the Exadata infrastructure. Changing this will force terraform to create new resource. +* `storage_count` - (Required) The number of storage servers that are activated for the Exadata infrastructure. Changing this will force terraform to create new resource. +* `compute_count` - (Required) The number of compute instances that the Exadata infrastructure is located. Changing this will force terraform to create new resource. +* `availability_zone_id` - (Required) The AZ ID of the AZ where the Exadata infrastructure is located. Changing this will force terraform to create new resource. + +The following arguments are optional: + +* `customer_contacts_to_send_to_oci` - (Optional) The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure. Changing this will force terraform to create new resource. +* `availability_zone`: The name of the Availability Zone (AZ) where the Exadata infrastructure is located. Changing this will force terraform to create new resource. +* `database_server_type` - (Optional) The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. +* `storage_server_type` - (Optional) The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. +* `tags` - (Optional) A map of tags to assign to the exadata infrastructure. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### maintenance_window + +* `custom_action_timeout_in_mins` - (Required) The custom action timeout in minutes for the maintenance window. +* `is_custom_action_timeout_enabled` - (Required) ndicates whether custom action timeout is enabled for the maintenance window. +* `patching_mode` - (Required) The patching mode for the maintenance window. +* `preference` - (Required) The preference for the maintenance window scheduling. +* `days_of_week` - (Optional) The days of the week when maintenance can be performed. +* `hours_of_day` - (Optional) The hours of the day when maintenance can be performed. +* `lead_time_in_weeks` - (Optional) The lead time in weeks before the maintenance window. +* `months` - (Optional) The months when maintenance can be performed. +* `weeks_of_month` - (Optional) The weeks of the month when maintenance can be performed. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `id` - Unique identifier for the pipeline. +* `arn` - Amazon Resource Name (ARN) of the pipeline. +* `activated_storage_count` - The number of storage servers requested for the Exadata infrastructure. +* `additional_storage_count` - The number of storage servers requested for the Exadata infrastructure. +* `available_storage_size_in_gbs` - The amount of available storage, in gigabytes (GB), for the Exadata infrastructure. +* `cpu_count` - The total number of CPU cores that are allocated to the Exadata infrastructure. +* `data_storage_size_in_tbs` - The size of the Exadata infrastructure's data disk group, in terabytes (TB). +* `db_node_storage_size_in_gbs` - The size of the Exadata infrastructure's local node storage, in gigabytes (GB). +* `db_server_version` - The software version of the database servers (dom0) in the Exadata infrastructure. +* `last_maintenance_run_id` - The Oracle Cloud Identifier (OCID) of the last maintenance run for the Exadata infrastructure. +* `max_cpu_count` - The total number of CPU cores available on the Exadata infrastructure. +* `max_data_storage_in_tbs` - The total amount of data disk group storage, in terabytes (TB), that's available on the Exadata infrastructure. +* `max_db_node_storage_size_in_gbs` - The total amount of local node storage, in gigabytes (GB), that's available on the Exadata infrastructure. +* `max_memory_in_gbs` - The total amount of memory in gigabytes (GB) available on the Exadata infrastructure. +* `monthly_db_server_version` - The monthly software version of the database servers in the Exadata infrastructure. +* `monthly_storage_server_version` - The monthly software version of the storage servers installed on the Exadata infrastructure. +* `next_maintenance_run_id` - The OCID of the next maintenance run for the Exadata infrastructure. +* `ocid` - The OCID of the Exadata infrastructure. +* `oci_resource_anchor_name` - The name of the OCI resource anchor for the Exadata infrastructure. +* `percent_progress` - The amount of progress made on the current operation on the Exadata infrastructure, expressed as a percentage. +* `status` - The current status of the Exadata infrastructure. +* `status_reason` - Additional information about the status of the Exadata infrastructure. +* `storage_server_version` - The software version of the storage servers on the Exadata infrastructure. +* `total_storage_size_in_gbs` - The total amount of storage, in gigabytes (GB), on the Exadata infrastructure. +* `created_at` - The time when the Exadata infrastructure was created. +* `compute_model` - The OCI model compute model used when you create or clone an instance: ECPU or OCPU. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `24h`) +* `update` - (Default `24h`) +* `delete` - (Default `24h`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import OpenSearch Ingestion Pipeline using the `id`. For example: + +```terraform +import { + to = aws_odb_cloud_exadata_infrastructure.example + id = "example" +} +``` + +Using `terraform import`, import Exadata Infrastructure using the `id`. For example: + +```console +% terraform import aws_odb_cloud_exadata_infrastructure.example example +``` From 28d2f10cce02fba14386407039465800c6d61f10 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 22:21:20 +0900 Subject: [PATCH 0265/2115] add ecr_image_in_use_count and ecr_image_last_in_use_at to filter criteria --- internal/service/inspector2/filter.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/inspector2/filter.go b/internal/service/inspector2/filter.go index 11fac0de58e9..272b89833161 100644 --- a/internal/service/inspector2/filter.go +++ b/internal/service/inspector2/filter.go @@ -88,6 +88,8 @@ func (r *filterResource) Schema(ctx context.Context, request resource.SchemaRequ "ec2_instance_vpc_id": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "ecr_image_architecture": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "ecr_image_hash": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), + "ecr_image_in_use_count": numberFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), + "ecr_image_last_in_use_at": dateFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "ecr_image_pushed_at": dateFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "ecr_image_registry": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "ecr_image_repository_name": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), @@ -569,6 +571,8 @@ type filterCriteriaModel struct { EC2InstanceVpcId fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"ec2_instance_vpc_id"` ECRImageArchitecture fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"ecr_image_architecture"` ECRImageHash fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"ecr_image_hash"` + ECRImageInUseCount fwtypes.SetNestedObjectValueOf[numberFilterModel] `tfsdk:"ecr_image_in_use_count"` + ECRImageLastInUseAt fwtypes.SetNestedObjectValueOf[dateFilterModel] `tfsdk:"ecr_image_last_in_use_at"` ECRImagePushedAt fwtypes.SetNestedObjectValueOf[dateFilterModel] `tfsdk:"ecr_image_pushed_at"` ECRImageRegistry fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"ecr_image_registry"` ECRImageRepositoryName fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"ecr_image_repository_name"` From bf6f0dea0fe248c3bbda12ddd39b432a2a55c897 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 22:22:34 +0900 Subject: [PATCH 0266/2115] Add new filter criteria to the acceptance test --- internal/service/inspector2/filter_test.go | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/internal/service/inspector2/filter_test.go b/internal/service/inspector2/filter_test.go index 550ea556b395..29f6a5e36ae9 100644 --- a/internal/service/inspector2/filter_test.go +++ b/internal/service/inspector2/filter_test.go @@ -257,6 +257,11 @@ func testAccInspector2Filter_numberFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "reason", reason_1), resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_1), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_in_use_count.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_in_use_count.*", map[string]string{ + "lower_inclusive": lower_inclusive_value_1, + "upper_inclusive": upper_inclusive_value_1, + }), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.epss_score.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.epss_score.*", map[string]string{ "lower_inclusive": lower_inclusive_value_1, @@ -280,6 +285,11 @@ func testAccInspector2Filter_numberFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "reason", reason_2), resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_2), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_in_use_count.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_in_use_count.*", map[string]string{ + "lower_inclusive": lower_inclusive_value_2, + "upper_inclusive": upper_inclusive_value_2, + }), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.epss_score.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.epss_score.*", map[string]string{ "lower_inclusive": lower_inclusive_value_2, @@ -333,6 +343,11 @@ func testAccInspector2Filter_dateFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "reason", reason_1), resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_1), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_last_in_use_at.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_last_in_use_at.*", map[string]string{ + "start_inclusive": start_inclusive_value_1, + "end_inclusive": end_inclusive_value_1, + }), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_pushed_at.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_pushed_at.*", map[string]string{ "start_inclusive": start_inclusive_value_1, @@ -356,6 +371,11 @@ func testAccInspector2Filter_dateFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "reason", reason_2), resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_2), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_last_in_use_at.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_last_in_use_at.*", map[string]string{ + "start_inclusive": start_inclusive_value_2, + "end_inclusive": end_inclusive_value_2, + }), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.ecr_image_pushed_at.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.ecr_image_pushed_at.*", map[string]string{ "start_inclusive": start_inclusive_value_2, @@ -836,6 +856,10 @@ resource "aws_inspector2_filter" "test" { description = %[3]q reason = %[4]q filter_criteria { + ecr_image_in_use_count { + lower_inclusive = %[5]q + upper_inclusive = %[6]q + } epss_score { lower_inclusive = %[5]q upper_inclusive = %[6]q @@ -853,6 +877,10 @@ resource "aws_inspector2_filter" "test" { description = %[3]q reason = %[4]q filter_criteria { + ecr_image_last_in_use_at { + start_inclusive = %[5]q + end_inclusive = %[6]q + } ecr_image_pushed_at { start_inclusive = %[5]q end_inclusive = %[6]q From a0392a0a0270b9d9e350e53d80d9a384cc522694 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 22:36:22 +0900 Subject: [PATCH 0267/2115] add other unsupported filter criteria --- internal/service/inspector2/filter.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/inspector2/filter.go b/internal/service/inspector2/filter.go index 272b89833161..5b286b7a884c 100644 --- a/internal/service/inspector2/filter.go +++ b/internal/service/inspector2/filter.go @@ -78,6 +78,8 @@ func (r *filterResource) Schema(ctx context.Context, request resource.SchemaRequ NestedObject: schema.NestedBlockObject{ Blocks: map[string]schema.Block{ names.AttrAWSAccountID: stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), + "code_repository_project_name": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), + "code_repository_provider_type": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "code_vulnerability_detector_name": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "code_vulnerability_detector_tags": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), "code_vulnerability_file_path": stringFilterSchemaFramework(ctx, defaultFilterSchemaMaxSize), @@ -561,6 +563,8 @@ type filterResourceModel struct { type filterCriteriaModel struct { AWSAccountID fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"aws_account_id"` + CodeRepositoryProjectName fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"code_repository_project_name"` + CodeRepositoryProviderType fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"code_repository_provider_type"` CodeVulnerabilityDetectorName fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"code_vulnerability_detector_name"` CodeVulnerabilityDetectorTags fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"code_vulnerability_detector_tags"` CodeVulnerabilityFilePath fwtypes.SetNestedObjectValueOf[stringFilterModel] `tfsdk:"code_vulnerability_file_path"` From dfc4bda71297ae02830a5c53ae4a59e9937f6511 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 22:36:42 +0900 Subject: [PATCH 0268/2115] Add more new filter criteria to the acceptance test --- internal/service/inspector2/filter_test.go | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/internal/service/inspector2/filter_test.go b/internal/service/inspector2/filter_test.go index 29f6a5e36ae9..19779781037d 100644 --- a/internal/service/inspector2/filter_test.go +++ b/internal/service/inspector2/filter_test.go @@ -181,6 +181,16 @@ func testAccInspector2Filter_stringFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "reason", reason_1), resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_1), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_repository_project_name.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_repository_project_name.*", map[string]string{ + "comparison": comparison_1, + names.AttrValue: value_1, + }), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_repository_provider_type.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_repository_provider_type.*", map[string]string{ + "comparison": comparison_1, + names.AttrValue: value_1, + }), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_vulnerability_detector_name.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_vulnerability_detector_name.*", map[string]string{ "comparison": comparison_1, @@ -205,6 +215,16 @@ func testAccInspector2Filter_stringFilters(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrAction, action_2), resource.TestCheckResourceAttr(resourceName, "filter_criteria.#", "1"), resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_vulnerability_detector_name.#", "1"), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_repository_project_name.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_repository_project_name.*", map[string]string{ + "comparison": comparison_2, + names.AttrValue: value_2, + }), + resource.TestCheckResourceAttr(resourceName, "filter_criteria.0.code_repository_provider_type.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_repository_provider_type.*", map[string]string{ + "comparison": comparison_2, + names.AttrValue: value_2, + }), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "filter_criteria.0.code_vulnerability_detector_name.*", map[string]string{ "comparison": comparison_2, names.AttrValue: value_2, @@ -839,6 +859,14 @@ resource "aws_inspector2_filter" "test" { description = %[3]q reason = %[4]q filter_criteria { + code_repository_project_name { + comparison = %[5]q + value = %[6]q + } + code_repository_provider_type { + comparison = %[5]q + value = %[6]q + } code_vulnerability_detector_name { comparison = %[5]q value = %[6]q From ee985d5a16012780afbc763d3d8b2684a8311df1 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 19 Aug 2025 10:09:03 -0400 Subject: [PATCH 0269/2115] chore: adjust changelog --- .changelog/43925.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/43925.txt b/.changelog/43925.txt index 185ed94b84db..192e37d84e9a 100644 --- a/.changelog/43925.txt +++ b/.changelog/43925.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error +resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error when `policy_detail.exclusion_rules.amis.is_public` is omitted ``` From 93b481f03df7871461115ee5c4eeb2553cc876a4 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 15 Aug 2025 14:46:15 -0400 Subject: [PATCH 0270/2115] r/aws_sqs_queue: add resource identity Add parameterized resource identity to aws_sqs_queue resource. Output from acceptance testing: ```console % make testacc PKG=sqs TESTS=TestAccSQSQueue_ --- PASS: TestAccSQSQueue_FIFOQueue_expectNameError (4.54s) === CONT TestAccSQSQueue_tags_DefaultTags_nullOverlappingResourceTag --- PASS: TestAccSQSQueue_StandardQueue_expectContentBasedDeduplicationError (5.38s) === CONT TestAccSQSQueue_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccSQSQueue_NamePrefix_fifoQueue (64.42s) === CONT TestAccSQSQueue_tags_ComputedTag_OnUpdate_Add --- PASS: TestAccSQSQueue_FIFOQueue_contentBasedDeduplication (68.50s) === CONT TestAccSQSQueue_tags_ComputedTag_OnCreate === CONT TestAccSQSQueue_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccSQSQueue_fifoQueue (71.06s) --- PASS: TestAccSQSQueue_basic (71.18s) === CONT TestAccSQSQueue_NameGenerated_fifoQueue --- PASS: TestAccSQSQueue_tags_DefaultTags_nullOverlappingResourceTag (71.41s) === CONT TestAccSQSQueue_namePrefix --- PASS: TestAccSQSQueue_Identity_Basic (87.29s) === CONT TestAccSQSQueue_Identity_ExistingResource --- PASS: TestAccSQSQueue_tags_EmptyMap (88.01s) === CONT TestAccSQSQueue_Name_generated --- PASS: TestAccSQSQueue_redriveAllowPolicy (92.52s) === CONT TestAccSQSQueue_tags_DefaultTags_emptyResourceTag --- PASS: TestAccSQSQueue_redrivePolicy (92.53s) === CONT TestAccSQSQueue_tags_DefaultTags_emptyProviderOnlyTag --- PASS: TestAccSQSQueue_tags_AddOnUpdate (93.45s) === CONT TestAccSQSQueue_Identity_RegionOverride --- PASS: TestAccSQSQueue_tags_ComputedTag_OnUpdate_Replace (89.31s) === CONT TestAccSQSQueue_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccSQSQueue_tags_IgnoreTags_Overlap_DefaultTag (103.81s) === CONT TestAccSQSQueue_tags_null --- PASS: TestAccSQSQueue_update (109.38s) === CONT TestAccSQSQueue_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccSQSQueue_FIFOQueue_highThroughputMode (118.38s) === CONT TestAccSQSQueue_tags_DefaultTags_nonOverlapping --- PASS: TestAccSQSQueue_tags_IgnoreTags_Overlap_ResourceTag (119.06s) === CONT TestAccSQSQueue_tags_DefaultTags_providerOnly --- PASS: TestAccSQSQueue_tags_DefaultTags_overlapping (124.50s) === CONT TestAccSQSQueue_disappears --- PASS: TestAccSQSQueue_NameGenerated_fifoQueue (56.03s) === CONT TestAccSQSQueue_Policy_ignoreEquivalent --- PASS: TestAccSQSQueue_namePrefix (54.21s) === CONT TestAccSQSQueue_Policy_basic --- PASS: TestAccSQSQueue_tags_DefaultTags_nullNonOverlappingResourceTag (59.18s) === CONT TestAccSQSQueue_defaultKMSDataKeyReusePeriodSeconds --- PASS: TestAccSQSQueue_tags_ComputedTag_OnCreate (62.69s) === CONT TestAccSQSQueue_noEncryptionKMSDataKeyReusePeriodSeconds --- PASS: TestAccSQSQueue_Name_generated (49.38s) === CONT TestAccSQSQueue_zeroVisibilityTimeoutSeconds --- PASS: TestAccSQSQueue_tags (142.91s) === CONT TestAccSQSQueue_ManagedEncryption_kmsDataKeyReusePeriodSeconds --- PASS: TestAccSQSQueue_tags_ComputedTag_OnUpdate_Add (80.06s) === CONT TestAccSQSQueue_timeouts --- PASS: TestAccSQSQueue_tags_DefaultTags_emptyResourceTag (52.86s) === CONT TestAccSQSQueue_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccSQSQueue_tags_DefaultTags_emptyProviderOnlyTag (53.63s) === CONT TestAccSQSQueue_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccSQSQueue_Identity_RegionOverride (59.33s) === CONT TestAccSQSQueue_tags_EmptyTag_OnCreate --- PASS: TestAccSQSQueue_encryption (156.79s) --- PASS: TestAccSQSQueue_managedEncryption (157.41s) --- PASS: TestAccSQSQueue_tags_DefaultTags_updateToResourceOnly (67.97s) --- PASS: TestAccSQSQueue_recentlyDeleted (169.72s) --- PASS: TestAccSQSQueue_tags_null (65.92s) --- PASS: TestAccSQSQueue_Identity_ExistingResource (88.03s) --- PASS: TestAccSQSQueue_noEncryptionKMSDataKeyReusePeriodSeconds (45.18s) --- PASS: TestAccSQSQueue_tags_EmptyTag_OnUpdate_Replace (69.18s) --- PASS: TestAccSQSQueue_defaultKMSDataKeyReusePeriodSeconds (50.17s) --- PASS: TestAccSQSQueue_Policy_basic (52.16s) --- PASS: TestAccSQSQueue_zeroVisibilityTimeoutSeconds (47.00s) --- PASS: TestAccSQSQueue_ManagedEncryption_kmsDataKeyReusePeriodSeconds (43.83s) --- PASS: TestAccSQSQueue_Policy_ignoreEquivalent (61.08s) --- PASS: TestAccSQSQueue_tags_DefaultTags_nonOverlapping (85.44s) --- PASS: TestAccSQSQueue_disappears (80.82s) --- PASS: TestAccSQSQueue_tags_DefaultTags_updateToProviderOnly (61.56s) --- PASS: TestAccSQSQueue_tags_EmptyTag_OnCreate (63.25s) --- PASS: TestAccSQSQueue_tags_DefaultTags_providerOnly (100.01s) --- PASS: TestAccSQSQueue_tags_EmptyTag_OnUpdate_Add (75.09s) --- PASS: TestAccSQSQueue_timeouts (95.47s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/sqs 246.261s ``` --- .changelog/43918.txt | 3 + internal/service/sqs/generate.go | 1 + internal/service/sqs/queue.go | 7 +- .../service/sqs/queue_identity_gen_test.go | 256 ++++++++++++++++++ internal/service/sqs/service_package_gen.go | 6 +- .../sqs/testdata/Queue/basic/main_gen.tf | 12 + .../testdata/Queue/basic_v6.9.0/main_gen.tf | 22 ++ .../Queue/region_override/main_gen.tf | 20 ++ .../service/sqs/testdata/tmpl/queue_tags.gtpl | 1 + 9 files changed, 323 insertions(+), 5 deletions(-) create mode 100644 .changelog/43918.txt create mode 100644 internal/service/sqs/queue_identity_gen_test.go create mode 100644 internal/service/sqs/testdata/Queue/basic/main_gen.tf create mode 100644 internal/service/sqs/testdata/Queue/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/sqs/testdata/Queue/region_override/main_gen.tf diff --git a/.changelog/43918.txt b/.changelog/43918.txt new file mode 100644 index 000000000000..337fdb721f12 --- /dev/null +++ b/.changelog/43918.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_sqs_queue: Add resource identity support +``` diff --git a/internal/service/sqs/generate.go b/internal/service/sqs/generate.go index 0de929a54271..8c2428e6e1e1 100644 --- a/internal/service/sqs/generate.go +++ b/internal/service/sqs/generate.go @@ -4,6 +4,7 @@ //go:generate go run ../../generate/tags/main.go -ListTags -ListTagsOp=ListQueueTags -ListTagsInIDElem=QueueUrl -ServiceTagsMap -KVTValues -TagOp=TagQueue -TagInIDElem=QueueUrl -UntagOp=UntagQueue -UpdateTags -CreateTags //go:generate go run ../../generate/servicepackage/main.go //go:generate go run ../../generate/tagstests/main.go +//go:generate go run ../../generate/identitytests/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. package sqs diff --git a/internal/service/sqs/queue.go b/internal/service/sqs/queue.go index 73945b160c83..1491c8c5330b 100644 --- a/internal/service/sqs/queue.go +++ b/internal/service/sqs/queue.go @@ -195,6 +195,9 @@ var ( // @SDKResource("aws_sqs_queue", name="Queue") // @Tags(identifierAttribute="id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/sqs/types;awstypes;map[awstypes.QueueAttributeName]string") +// @IdentityAttribute("url") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(idAttrDuplicates="url") func resourceQueue() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceQueueCreate, @@ -202,10 +205,6 @@ func resourceQueue() *schema.Resource { UpdateWithoutTimeout: resourceQueueUpdate, DeleteWithoutTimeout: resourceQueueDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - CustomizeDiff: resourceQueueCustomizeDiff, Schema: queueSchema, diff --git a/internal/service/sqs/queue_identity_gen_test.go b/internal/service/sqs/queue_identity_gen_test.go new file mode 100644 index 000000000000..d323f619fdc8 --- /dev/null +++ b/internal/service/sqs/queue_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package sqs_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSQSQueue_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrURL), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrURL: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrURL)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrURL), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrURL), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSQSQueue_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_sqs_queue.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrURL), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrURL: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrURL)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrURL), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrURL), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccSQSQueue_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Queue/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrURL: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrURL)), + }, + }, + }, + }) +} diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 7581abddbfbf..622951abf90c 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -55,7 +55,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrURL), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceQueuePolicy, diff --git a/internal/service/sqs/testdata/Queue/basic/main_gen.tf b/internal/service/sqs/testdata/Queue/basic/main_gen.tf new file mode 100644 index 000000000000..e5ac13e70bf5 --- /dev/null +++ b/internal/service/sqs/testdata/Queue/basic/main_gen.tf @@ -0,0 +1,12 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/Queue/basic_v6.9.0/main_gen.tf b/internal/service/sqs/testdata/Queue/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..da55752b22e2 --- /dev/null +++ b/internal/service/sqs/testdata/Queue/basic_v6.9.0/main_gen.tf @@ -0,0 +1,22 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/sqs/testdata/Queue/region_override/main_gen.tf b/internal/service/sqs/testdata/Queue/region_override/main_gen.tf new file mode 100644 index 000000000000..a2a371e382ec --- /dev/null +++ b/internal/service/sqs/testdata/Queue/region_override/main_gen.tf @@ -0,0 +1,20 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue" "test" { + region = var.region + + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/tmpl/queue_tags.gtpl b/internal/service/sqs/testdata/tmpl/queue_tags.gtpl index e9068d0a8c0b..dc2fd612226a 100644 --- a/internal/service/sqs/testdata/tmpl/queue_tags.gtpl +++ b/internal/service/sqs/testdata/tmpl/queue_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_sqs_queue" "test" { +{{- template "region" }} name = var.rName {{- template "tags" . }} From f0dea74034f522299d21823e5701e49215ecf90f Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 23:35:17 +0900 Subject: [PATCH 0271/2115] Add newly added filter criteria to the documentation --- website/docs/r/inspector2_filter.html.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/docs/r/inspector2_filter.html.markdown b/website/docs/r/inspector2_filter.html.markdown index fb18ee6dc364..1bf2b3f53b90 100644 --- a/website/docs/r/inspector2_filter.html.markdown +++ b/website/docs/r/inspector2_filter.html.markdown @@ -54,6 +54,8 @@ This resource exports the following attributes in addition to the arguments abov The `filter_criteria` configuration block supports the following attributes: * `aws_account_id` - (Optional) The AWS account ID in which the finding was generated. [Documented below](#string-filter). +* `code_repository_project_name` - (Optional) The project name in a code repository. [Documented below](#string-filter). +* `code_repository_provider_type` - (Optional) The repository provider type (such as GitHub, GitLab, etc.) [Documented below](#string-filter). * `code_vulnerability_detector_name` - (Optional) The ID of the component. [Documented below](#string-filter). * `code_vulnerability_detector_tags` - (Optional) The ID of the component. [Documented below](#string-filter). * `code_vulnerability_file_path` - (Optional) The ID of the component. [Documented below](#string-filter). @@ -63,6 +65,8 @@ The `filter_criteria` configuration block supports the following attributes: * `ec2_instance_subnet_id` - (Optional) The ID of the subnet. [Documented below](#string-filter). * `ec2_instance_vpc_id` - (Optional) The ID of the VPC. [Documented below](#string-filter). * `ecr_image_architecture` - (Optional) The architecture of the ECR image. [Documented below](#string-filter). +* `ecr_image_in_use_count` - (Optional) The number of the ECR images in use. [Documented below](#number-filter). +* `ecr_image_last_in_use_at` - (Optional) The date range when an ECR image was last used in an ECS cluster task or EKS cluster pod. [Documented below](#date-filter). * `ecr_image_hash` - (Optional) The SHA256 hash of the ECR image. [Documented below](#string-filter). * `ecr_image_pushed_at` - (Optional) The date range when the image was pushed. [Documented below](#date-filter). * `ecr_image_registry` - (Optional) The registry of the ECR image. [Documented below](#string-filter). From 8a54b40aec0a37563e24cc3e63eef10dc1c61b9c Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 23:56:07 +0900 Subject: [PATCH 0272/2115] add changelog --- .changelog/43950.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43950.txt diff --git a/.changelog/43950.txt b/.changelog/43950.txt new file mode 100644 index 000000000000..7c0849a17095 --- /dev/null +++ b/.changelog/43950.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` +``` From f8a217be7cbc94a8cad6f8bd26e981dfd467f58d Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 19 Aug 2025 23:59:31 +0900 Subject: [PATCH 0273/2115] terraform fmt --- internal/service/inspector2/filter_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/inspector2/filter_test.go b/internal/service/inspector2/filter_test.go index 19779781037d..d90c1dc07f67 100644 --- a/internal/service/inspector2/filter_test.go +++ b/internal/service/inspector2/filter_test.go @@ -860,12 +860,12 @@ resource "aws_inspector2_filter" "test" { reason = %[4]q filter_criteria { code_repository_project_name { - comparison = %[5]q - value = %[6]q + comparison = %[5]q + value = %[6]q } code_repository_provider_type { - comparison = %[5]q - value = %[6]q + comparison = %[5]q + value = %[6]q } code_vulnerability_detector_name { comparison = %[5]q From 78a5669cf2fac3198b5e69523df7b3d75fc8fd85 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 19 Aug 2025 10:48:51 -0400 Subject: [PATCH 0274/2115] r/aws_sqs_queue_policy: add resource identity ```console % make testacc PKG=sqs TESTS=TestAccSQSQueuePolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/sqs/... -v -count 1 -parallel 20 -run='TestAccSQSQueuePolicy_' -timeout 360m -vet=off 2025/08/15 16:38:13 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/15 16:38:13 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSQSQueuePolicy_Identity_RegionOverride (100.95s) --- PASS: TestAccSQSQueuePolicy_basic (105.51s) --- PASS: TestAccSQSQueuePolicy_Identity_Basic (106.20s) --- PASS: TestAccSQSQueuePolicy_Identity_ExistingResource (121.65s) --- PASS: TestAccSQSQueuePolicy_update (131.67s) --- PASS: TestAccSQSQueuePolicy_Disappears_queue (141.17s) --- PASS: TestAccSQSQueuePolicy_disappears (155.92s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/sqs 162.226s ``` --- .changelog/43918.txt | 3 + internal/service/sqs/queue_policy.go | 8 +- .../sqs/queue_policy_identity_gen_test.go | 256 ++++++++++++++++++ internal/service/sqs/queue_policy_test.go | 11 + internal/service/sqs/service_package_gen.go | 4 + .../testdata/QueuePolicy/basic/main_gen.tf | 33 +++ .../QueuePolicy/basic_v6.9.0/main_gen.tf | 43 +++ .../QueuePolicy/region_override/main_gen.tf | 43 +++ 8 files changed, 397 insertions(+), 4 deletions(-) create mode 100644 internal/service/sqs/queue_policy_identity_gen_test.go create mode 100644 internal/service/sqs/testdata/QueuePolicy/basic/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueuePolicy/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueuePolicy/region_override/main_gen.tf diff --git a/.changelog/43918.txt b/.changelog/43918.txt index 337fdb721f12..d663a36dd60b 100644 --- a/.changelog/43918.txt +++ b/.changelog/43918.txt @@ -1,3 +1,6 @@ ```release-note:enhancement resource/aws_sqs_queue: Add resource identity support ``` +```release-note:enhancement +resource/aws_sqs_queue_policy: Add resource identity support +``` diff --git a/internal/service/sqs/queue_policy.go b/internal/service/sqs/queue_policy.go index 3031510863d1..1c5a4ca0be28 100644 --- a/internal/service/sqs/queue_policy.go +++ b/internal/service/sqs/queue_policy.go @@ -12,6 +12,10 @@ import ( ) // @SDKResource("aws_sqs_queue_policy", name="Queue Policy") +// @IdentityAttribute("queue_url") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(idAttrDuplicates="queue_url") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/sqs/types;awstypes;map[awstypes.QueueAttributeName]string") func resourceQueuePolicy() *schema.Resource { h := &queueAttributeHandler{ AttributeName: types.QueueAttributeNamePolicy, @@ -26,10 +30,6 @@ func resourceQueuePolicy() *schema.Resource { UpdateWithoutTimeout: h.Upsert, DeleteWithoutTimeout: h.Delete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - MigrateState: QueuePolicyMigrateState, SchemaVersion: 1, diff --git a/internal/service/sqs/queue_policy_identity_gen_test.go b/internal/service/sqs/queue_policy_identity_gen_test.go new file mode 100644 index 000000000000..b4fe91dbb261 --- /dev/null +++ b/internal/service/sqs/queue_policy_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package sqs_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSQSQueuePolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueuePolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueuePolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSQSQueuePolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_sqs_queue_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccSQSQueuePolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueuePolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueuePolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/QueuePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + }, + }) +} diff --git a/internal/service/sqs/queue_policy_test.go b/internal/service/sqs/queue_policy_test.go index dc685ec9e9f5..7a9c713df2a9 100644 --- a/internal/service/sqs/queue_policy_test.go +++ b/internal/service/sqs/queue_policy_test.go @@ -145,6 +145,17 @@ func TestAccSQSQueuePolicy_update(t *testing.T) { }) } +// Satisfy generated identity test function names by aliasing to queue checks +// +// This mimics the standard policy acceptance test behavior, but in the +// future we may consider replacing this approach with custom checks +// to validate the presence/content of the policy rather than just +// the parent queue. +var ( + testAccCheckQueuePolicyExists = testAccCheckQueueExists + testAccCheckQueuePolicyDestroy = testAccCheckQueueDestroy +) + func testAccQueuePolicyConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_sqs_queue" "test" { diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 622951abf90c..71c204d285b6 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -66,6 +66,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_sqs_queue_policy", Name: "Queue Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity("queue_url"), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceQueueRedriveAllowPolicy, diff --git a/internal/service/sqs/testdata/QueuePolicy/basic/main_gen.tf b/internal/service/sqs/testdata/QueuePolicy/basic/main_gen.tf new file mode 100644 index 000000000000..4d63ea93a972 --- /dev/null +++ b/internal/service/sqs/testdata/QueuePolicy/basic/main_gen.tf @@ -0,0 +1,33 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_policy" "test" { + queue_url = aws_sqs_queue.test.id + + policy = < Date: Tue, 19 Aug 2025 11:13:09 -0400 Subject: [PATCH 0275/2115] r/aws_sqs_redrive_policy: add resource identity ```console % make testacc PKG=sqs TESTS=TestAccSQSQueueRedrivePolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/sqs/... -v -count 1 -parallel 20 -run='TestAccSQSQueueRedrivePolicy_' -timeout 360m -vet=off 2025/08/19 11:29:26 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/19 11:29:26 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSQSQueueRedrivePolicy_Identity_RegionOverride (126.90s) --- PASS: TestAccSQSQueueRedrivePolicy_basic (134.04s) --- PASS: TestAccSQSQueueRedrivePolicy_Identity_Basic (134.43s) --- PASS: TestAccSQSQueueRedrivePolicy_Identity_ExistingResource (150.89s) --- PASS: TestAccSQSQueueRedrivePolicy_update (159.68s) --- PASS: TestAccSQSQueueRedrivePolicy_Disappears_queue (169.43s) --- PASS: TestAccSQSQueueRedrivePolicy_disappears (184.23s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/sqs 190.632s ``` --- internal/service/sqs/queue_redrive_policy.go | 8 +- .../queue_redrive_policy_identity_gen_test.go | 256 ++++++++++++++++++ .../service/sqs/queue_redrive_policy_test.go | 11 + internal/service/sqs/service_package_gen.go | 4 + .../QueueRedrivePolicy/basic/main_gen.tf | 28 ++ .../basic_v6.9.0/main_gen.tf | 38 +++ .../region_override/main_gen.tf | 40 +++ .../sqs/testdata/tmpl/queue_policy_basic.gtpl | 26 ++ .../tmpl/queue_redrive_policy_basic.gtpl | 22 ++ 9 files changed, 429 insertions(+), 4 deletions(-) create mode 100644 internal/service/sqs/queue_redrive_policy_identity_gen_test.go create mode 100644 internal/service/sqs/testdata/QueueRedrivePolicy/basic/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueueRedrivePolicy/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueueRedrivePolicy/region_override/main_gen.tf create mode 100644 internal/service/sqs/testdata/tmpl/queue_policy_basic.gtpl create mode 100644 internal/service/sqs/testdata/tmpl/queue_redrive_policy_basic.gtpl diff --git a/internal/service/sqs/queue_redrive_policy.go b/internal/service/sqs/queue_redrive_policy.go index 315564fd905d..29b2ba135604 100644 --- a/internal/service/sqs/queue_redrive_policy.go +++ b/internal/service/sqs/queue_redrive_policy.go @@ -11,6 +11,10 @@ import ( ) // @SDKResource("aws_sqs_queue_redrive_policy", name="Queue Redrive Policy") +// @IdentityAttribute("queue_url") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(idAttrDuplicates="queue_url") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/sqs/types;awstypes;map[awstypes.QueueAttributeName]string") func resourceQueueRedrivePolicy() *schema.Resource { h := &queueAttributeHandler{ AttributeName: types.QueueAttributeNameRedrivePolicy, @@ -33,10 +37,6 @@ func resourceQueueRedrivePolicy() *schema.Resource { "redrive_policy": sdkv2.JSONDocumentSchemaRequired(), }, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - CreateWithoutTimeout: h.Upsert, ReadWithoutTimeout: h.Read, UpdateWithoutTimeout: h.Upsert, diff --git a/internal/service/sqs/queue_redrive_policy_identity_gen_test.go b/internal/service/sqs/queue_redrive_policy_identity_gen_test.go new file mode 100644 index 000000000000..9deaa8152a3a --- /dev/null +++ b/internal/service/sqs/queue_redrive_policy_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package sqs_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSQSQueueRedrivePolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_redrive_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueRedrivePolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueRedrivePolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSQSQueueRedrivePolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_sqs_queue_redrive_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccSQSQueueRedrivePolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_redrive_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueRedrivePolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueRedrivePolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/QueueRedrivePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + }, + }) +} diff --git a/internal/service/sqs/queue_redrive_policy_test.go b/internal/service/sqs/queue_redrive_policy_test.go index 7b737f293330..e29cf9fae6fb 100644 --- a/internal/service/sqs/queue_redrive_policy_test.go +++ b/internal/service/sqs/queue_redrive_policy_test.go @@ -147,6 +147,17 @@ func TestAccSQSQueueRedrivePolicy_update(t *testing.T) { }) } +// Satisfy generated identity test function names by aliasing to queue checks +// +// This mimics the standard policy acceptance test behavior, but in the +// future we may consider replacing this approach with custom checks +// to validate the presence/content of the redrive policy rather than just +// the parent queue. +var ( + testAccCheckQueueRedrivePolicyExists = testAccCheckQueueExists + testAccCheckQueueRedrivePolicyDestroy = testAccCheckQueueDestroy +) + func testAccQueueRedrivePolicyConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_sqs_queue" "test" { diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 71c204d285b6..614a98b6338d 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -82,6 +82,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_sqs_queue_redrive_policy", Name: "Queue Redrive Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity("queue_url"), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, } } diff --git a/internal/service/sqs/testdata/QueueRedrivePolicy/basic/main_gen.tf b/internal/service/sqs/testdata/QueueRedrivePolicy/basic/main_gen.tf new file mode 100644 index 000000000000..4efe50517fd3 --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedrivePolicy/basic/main_gen.tf @@ -0,0 +1,28 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_policy" "test" { + queue_url = aws_sqs_queue.test.id + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test_ddl.arn + maxReceiveCount = 4 + }) +} + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +resource "aws_sqs_queue" "test_ddl" { + name = "${var.rName}_ddl" + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test.arn] + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/QueueRedrivePolicy/basic_v6.9.0/main_gen.tf b/internal/service/sqs/testdata/QueueRedrivePolicy/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..6ff53e6f3e1a --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedrivePolicy/basic_v6.9.0/main_gen.tf @@ -0,0 +1,38 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_policy" "test" { + queue_url = aws_sqs_queue.test.id + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test_ddl.arn + maxReceiveCount = 4 + }) +} + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +resource "aws_sqs_queue" "test_ddl" { + name = "${var.rName}_ddl" + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test.arn] + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/sqs/testdata/QueueRedrivePolicy/region_override/main_gen.tf b/internal/service/sqs/testdata/QueueRedrivePolicy/region_override/main_gen.tf new file mode 100644 index 000000000000..584ff3c340a8 --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedrivePolicy/region_override/main_gen.tf @@ -0,0 +1,40 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_policy" "test" { + region = var.region + + queue_url = aws_sqs_queue.test.id + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test_ddl.arn + maxReceiveCount = 4 + }) +} + +resource "aws_sqs_queue" "test" { + region = var.region + + name = var.rName +} + +resource "aws_sqs_queue" "test_ddl" { + region = var.region + + name = "${var.rName}_ddl" + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test.arn] + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/tmpl/queue_policy_basic.gtpl b/internal/service/sqs/testdata/tmpl/queue_policy_basic.gtpl new file mode 100644 index 000000000000..4f7794c84a55 --- /dev/null +++ b/internal/service/sqs/testdata/tmpl/queue_policy_basic.gtpl @@ -0,0 +1,26 @@ +resource "aws_sqs_queue_policy" "test" { +{{- template "region" }} + queue_url = aws_sqs_queue.test.id + + policy = < Date: Tue, 19 Aug 2025 11:51:21 -0400 Subject: [PATCH 0276/2115] r/aws_sqs_redrive_allow_policy: add resource identity ```console % make testacc PKG=sqs TESTS=TestAccSQSQueueRedriveAllowPolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/sqs/... -v -count 1 -parallel 20 -run='TestAccSQSQueueRedriveAllowPolicy_' -timeout 360m -vet=off 2025/08/19 11:48:26 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/19 11:48:26 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSQSQueueRedriveAllowPolicy_byQueue (121.80s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_Identity_RegionOverride (128.11s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_basic (134.58s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_Identity_Basic (135.26s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_Identity_ExistingResource (151.09s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_update (158.10s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_Disappears_queue (170.04s) --- PASS: TestAccSQSQueueRedriveAllowPolicy_disappears (184.75s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/sqs 191.037s ``` --- .changelog/43918.txt | 6 + .../service/sqs/queue_redrive_allow_policy.go | 8 +- ..._redrive_allow_policy_identity_gen_test.go | 256 ++++++++++++++++++ .../sqs/queue_redrive_allow_policy_test.go | 11 + internal/service/sqs/service_package_gen.go | 4 + .../QueueRedriveAllowPolicy/basic/main_gen.tf | 28 ++ .../basic_v6.9.0/main_gen.tf | 38 +++ .../region_override/main_gen.tf | 40 +++ .../queue_redrive_allow_policy_basic.gtpl | 22 ++ 9 files changed, 409 insertions(+), 4 deletions(-) create mode 100644 internal/service/sqs/queue_redrive_allow_policy_identity_gen_test.go create mode 100644 internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/sqs/testdata/QueueRedriveAllowPolicy/region_override/main_gen.tf create mode 100644 internal/service/sqs/testdata/tmpl/queue_redrive_allow_policy_basic.gtpl diff --git a/.changelog/43918.txt b/.changelog/43918.txt index d663a36dd60b..33e769b8dbec 100644 --- a/.changelog/43918.txt +++ b/.changelog/43918.txt @@ -4,3 +4,9 @@ resource/aws_sqs_queue: Add resource identity support ```release-note:enhancement resource/aws_sqs_queue_policy: Add resource identity support ``` +```release-note:enhancement +resource/aws_sqs_queue_redrive_policy: Add resource identity support +``` +```release-note:enhancement +resource/aws_sqs_queue_redrive_allow_policy: Add resource identity support +``` diff --git a/internal/service/sqs/queue_redrive_allow_policy.go b/internal/service/sqs/queue_redrive_allow_policy.go index 6ae5ae30cbd0..8b1f0d69f923 100644 --- a/internal/service/sqs/queue_redrive_allow_policy.go +++ b/internal/service/sqs/queue_redrive_allow_policy.go @@ -11,6 +11,10 @@ import ( ) // @SDKResource("aws_sqs_queue_redrive_allow_policy", name="Queue Redrive Allow Policy") +// @IdentityAttribute("queue_url") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(idAttrDuplicates="queue_url") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/sqs/types;awstypes;map[awstypes.QueueAttributeName]string") func resourceQueueRedriveAllowPolicy() *schema.Resource { h := &queueAttributeHandler{ AttributeName: types.QueueAttributeNameRedriveAllowPolicy, @@ -33,10 +37,6 @@ func resourceQueueRedriveAllowPolicy() *schema.Resource { "redrive_allow_policy": sdkv2.JSONDocumentSchemaRequired(), }, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - CreateWithoutTimeout: h.Upsert, ReadWithoutTimeout: h.Read, UpdateWithoutTimeout: h.Upsert, diff --git a/internal/service/sqs/queue_redrive_allow_policy_identity_gen_test.go b/internal/service/sqs/queue_redrive_allow_policy_identity_gen_test.go new file mode 100644 index 000000000000..9b527b621507 --- /dev/null +++ b/internal/service/sqs/queue_redrive_allow_policy_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package sqs_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSQSQueueRedriveAllowPolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_redrive_allow_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueRedriveAllowPolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueRedriveAllowPolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSQSQueueRedriveAllowPolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_sqs_queue_redrive_allow_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("queue_url"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("queue_url"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccSQSQueueRedriveAllowPolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v map[awstypes.QueueAttributeName]string + resourceName := "aws_sqs_queue_redrive_allow_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SQSServiceID), + CheckDestroy: testAccCheckQueueRedriveAllowPolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckQueueRedriveAllowPolicyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/QueueRedriveAllowPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "queue_url": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("queue_url")), + }, + }, + }, + }) +} diff --git a/internal/service/sqs/queue_redrive_allow_policy_test.go b/internal/service/sqs/queue_redrive_allow_policy_test.go index 22fab997a567..5c94623be0b6 100644 --- a/internal/service/sqs/queue_redrive_allow_policy_test.go +++ b/internal/service/sqs/queue_redrive_allow_policy_test.go @@ -162,6 +162,17 @@ func TestAccSQSQueueRedriveAllowPolicy_byQueue(t *testing.T) { }) } +// Satisfy generated identity test function names by aliasing to queue checks +// +// This mimics the standard policy acceptance test behavior, but in the +// future we may consider replacing this approach with custom checks +// to validate the presence/content of the redrive allow policy rather than just +// the parent queue. +var ( + testAccCheckQueueRedriveAllowPolicyExists = testAccCheckQueueExists + testAccCheckQueueRedriveAllowPolicyDestroy = testAccCheckQueueDestroy +) + func testAccQueueRedriveAllowPolicyConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_sqs_queue" "test" { diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 614a98b6338d..9f9862063bc7 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -76,6 +76,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_sqs_queue_redrive_allow_policy", Name: "Queue Redrive Allow Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity("queue_url"), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceQueueRedrivePolicy, diff --git a/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic/main_gen.tf b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic/main_gen.tf new file mode 100644 index 000000000000..e0fb715155e4 --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic/main_gen.tf @@ -0,0 +1,28 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_allow_policy" "test" { + queue_url = aws_sqs_queue.test.id + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test_src.arn] + }) +} + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +resource "aws_sqs_queue" "test_src" { + name = "${var.rName}_src" + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test.arn + maxReceiveCount = 4 + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic_v6.9.0/main_gen.tf b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..833a11e68fa0 --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/basic_v6.9.0/main_gen.tf @@ -0,0 +1,38 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_allow_policy" "test" { + queue_url = aws_sqs_queue.test.id + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test_src.arn] + }) +} + +resource "aws_sqs_queue" "test" { + name = var.rName +} + +resource "aws_sqs_queue" "test_src" { + name = "${var.rName}_src" + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test.arn + maxReceiveCount = 4 + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/sqs/testdata/QueueRedriveAllowPolicy/region_override/main_gen.tf b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/region_override/main_gen.tf new file mode 100644 index 000000000000..4229a29ed682 --- /dev/null +++ b/internal/service/sqs/testdata/QueueRedriveAllowPolicy/region_override/main_gen.tf @@ -0,0 +1,40 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_sqs_queue_redrive_allow_policy" "test" { + region = var.region + + queue_url = aws_sqs_queue.test.id + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test_src.arn] + }) +} + +resource "aws_sqs_queue" "test" { + region = var.region + + name = var.rName +} + +resource "aws_sqs_queue" "test_src" { + region = var.region + + name = "${var.rName}_src" + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test.arn + maxReceiveCount = 4 + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/sqs/testdata/tmpl/queue_redrive_allow_policy_basic.gtpl b/internal/service/sqs/testdata/tmpl/queue_redrive_allow_policy_basic.gtpl new file mode 100644 index 000000000000..50c02791379d --- /dev/null +++ b/internal/service/sqs/testdata/tmpl/queue_redrive_allow_policy_basic.gtpl @@ -0,0 +1,22 @@ +resource "aws_sqs_queue_redrive_allow_policy" "test" { +{{- template "region" }} + queue_url = aws_sqs_queue.test.id + redrive_allow_policy = jsonencode({ + redrivePermission = "byQueue", + sourceQueueArns = [aws_sqs_queue.test_src.arn] + }) +} + +resource "aws_sqs_queue" "test" { +{{- template "region" }} + name = var.rName +} + +resource "aws_sqs_queue" "test_src" { +{{- template "region" }} + name = "${var.rName}_src" + redrive_policy = jsonencode({ + deadLetterTargetArn = aws_sqs_queue.test.arn + maxReceiveCount = 4 + }) +} From f01a7e823f9ce8ac5d299c2c13c53e55867e30bb Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 08:55:25 -0700 Subject: [PATCH 0277/2115] Adds `primary_network_interface` to EC2 Instance --- internal/service/ec2/ec2_instance.go | 54 ++++++++++++++--- internal/service/ec2/ec2_instance_test.go | 70 +++++++++++++++++++++++ 2 files changed, 116 insertions(+), 8 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 050e0b8e3dac..4920b8a46f75 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -648,6 +648,27 @@ func resourceInstance() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "primary_network_interface": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrDeleteOnTermination: { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Default: false, + }, + names.AttrNetworkInterfaceID: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + }, + }, "private_dns": { Type: schema.TypeString, Computed: true, @@ -1331,12 +1352,18 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta any) // If an instance is shutting down, network interfaces are detached, and attributes may be nil, // need to protect against nil pointer dereferences if primaryNetworkInterface.NetworkInterfaceId != nil { + pni := map[string]any{ + names.AttrNetworkInterfaceID: aws.ToString(primaryNetworkInterface.NetworkInterfaceId), + names.AttrDeleteOnTermination: aws.ToBool(primaryNetworkInterface.Attachment.DeleteOnTermination), + } + if err := d.Set("primary_network_interface", []any{pni}); err != nil { + return sdkdiag.AppendErrorf(diags, "setting primary_network_interface for AWS Instance (%s): %s", d.Id(), err) + } + + d.Set("primary_network_interface_id", primaryNetworkInterface.NetworkInterfaceId) if primaryNetworkInterface.SubnetId != nil { // nosemgrep: ci.helper-schema-ResourceData-Set-extraneous-nil-check d.Set(names.AttrSubnetID, primaryNetworkInterface.SubnetId) } - if primaryNetworkInterface.NetworkInterfaceId != nil { // nosemgrep: ci.helper-schema-ResourceData-Set-extraneous-nil-check - d.Set("primary_network_interface_id", primaryNetworkInterface.NetworkInterfaceId) - } d.Set("ipv6_address_count", len(primaryNetworkInterface.Ipv6Addresses)) if primaryNetworkInterface.SourceDestCheck != nil { // nosemgrep: ci.helper-schema-ResourceData-Set-extraneous-nil-check d.Set("source_dest_check", primaryNetworkInterface.SourceDestCheck) @@ -2596,8 +2623,9 @@ func findRootDeviceName(ctx context.Context, conn *ec2.Client, amiID string) (*s return rootDeviceName, nil } -func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfaces any) []awstypes.InstanceNetworkInterfaceSpecification { - networkInterfaces := []awstypes.InstanceNetworkInterfaceSpecification{} +func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfaces any, primaryNetworkInterface any) []awstypes.InstanceNetworkInterfaceSpecification { + var networkInterfaces []awstypes.InstanceNetworkInterfaceSpecification + // Get necessary items subnet, hasSubnet := d.GetOk(names.AttrSubnetID) @@ -2649,7 +2677,7 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfa } networkInterfaces = append(networkInterfaces, ni) - } else { + } else if nInterfaces != nil && nInterfaces.(*schema.Set).Len() > 0 { // If we have manually specified network interfaces, build and attach those here. vL := nInterfaces.(*schema.Set).List() for _, v := range vL { @@ -2662,6 +2690,15 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfa } networkInterfaces = append(networkInterfaces, ni) } + } else { + v := primaryNetworkInterface.([]any) + ini := v[0].(map[string]any) + ni := awstypes.InstanceNetworkInterfaceSpecification{ + DeviceIndex: aws.Int32(0), + NetworkInterfaceId: aws.String(ini[names.AttrNetworkInterfaceID].(string)), + DeleteOnTermination: aws.Bool(ini[names.AttrDeleteOnTermination].(bool)), + } + networkInterfaces = append(networkInterfaces, ni) } return networkInterfaces @@ -3157,11 +3194,12 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta any) (* _, privIP := d.GetOk("private_ip") _, secPrivIP := d.GetOk("secondary_private_ips") networkInterfaces, interfacesOk := d.GetOk("network_interface") + primaryNetworkInterface, primaryNetworkInterfaceOk := d.GetOk("primary_network_interface") // If setting subnet and public address, OR manual network interfaces, populate those now. - if (hasSubnet && (assocPubIPA || privIP || secPrivIP)) || interfacesOk { + if (hasSubnet && (assocPubIPA || privIP || secPrivIP)) || interfacesOk || primaryNetworkInterfaceOk { // Otherwise we're attaching (a) network interface(s) - opts.NetworkInterfaces = buildNetworkInterfaceOpts(d, groups, networkInterfaces) + opts.NetworkInterfaces = buildNetworkInterfaceOpts(d, groups, networkInterfaces, primaryNetworkInterface) } else { // If simply specifying a subnetID, privateIP, Security Groups, or VPC Security Groups, build these now if subnetID != "" { diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 73d297857550..ac670dca7a7a 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -201,6 +201,13 @@ func TestAccEC2Instance_basic(t *testing.T) { ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{})), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(true), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), }, }, { @@ -3226,6 +3233,48 @@ func TestAccEC2Instance_gp3RootBlockDevice(t *testing.T) { }) } +func TestAccEC2Instance_PrimaryNetworkInterface_basic(t *testing.T) { + ctx := acctest.Context(t) + var instance awstypes.Instance + var eni awstypes.NetworkInterface + resourceName := "aws_instance.test" + eniResourceName := "aws_network_interface.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckInstanceDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_primaryNetworkInterface_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &instance), + testAccCheckENIExists(ctx, eniResourceName, &eni), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(false), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"user_data_replace_on_change"}, + }, + }, + }) +} + func TestAccEC2Instance_NetworkInterface_primaryNetworkInterface(t *testing.T) { ctx := acctest.Context(t) var instance awstypes.Instance @@ -8547,6 +8596,27 @@ resource "aws_instance" "test" { `, rName)) } +func testAccInstanceConfig_primaryNetworkInterface_basic(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), + testAccInstanceConfig_vpcBase(rName, false, 0), ` +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = "t2.micro" + + primary_network_interface { + network_interface_id = aws_network_interface.test.id + } +} + +resource "aws_network_interface" "test" { + subnet_id = aws_subnet.test.id + private_ips = ["10.1.1.42"] +} + +`) +} + func testAccInstanceConfig_networkInterface_primaryNetworkInterface(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), From df9abc6f04621c8746c0a95a11090714523bda41 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 08:55:57 -0700 Subject: [PATCH 0278/2115] Adds `primary_network_interface` to EC2 Spot Instance --- internal/service/ec2/ec2_instance.go | 1 + .../service/ec2/ec2_spot_instance_request.go | 24 +++++++++++++++++++ .../ec2/ec2_spot_instance_request_test.go | 16 +++++++++++++ 3 files changed, 41 insertions(+) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 4920b8a46f75..26ec7bc36116 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -649,6 +649,7 @@ func resourceInstance() *schema.Resource { Computed: true, }, "primary_network_interface": { + // Note: Changes to `primary_network_interface` should be mirrored in `aws_spot_instance_request` Type: schema.TypeList, MaxItems: 1, Optional: true, diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index 13fc9e0ba745..a5c46825b3ac 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -85,6 +85,22 @@ func resourceSpotInstanceRequest() *schema.Resource { Optional: true, ForceNew: true, } + s["primary_network_interface"] = &schema.Schema{ + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrDeleteOnTermination: { + Type: schema.TypeBool, + Computed: true, + }, + names.AttrNetworkInterfaceID: { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + } s["spot_bid_status"] = &schema.Schema{ Type: schema.TypeString, Computed: true, @@ -351,6 +367,14 @@ func readInstance(ctx context.Context, d *schema.ResourceData, meta any) diag.Di d.Set("associate_public_ip_address", ni.Association != nil) d.Set("ipv6_address_count", len(ni.Ipv6Addresses)) + pni := map[string]any{ + names.AttrNetworkInterfaceID: aws.ToString(ni.NetworkInterfaceId), + names.AttrDeleteOnTermination: aws.ToBool(ni.Attachment.DeleteOnTermination), + } + if err := d.Set("primary_network_interface", []any{pni}); err != nil { + return sdkdiag.AppendErrorf(diags, "setting primary_network_interface for AWS Spot Instance (%s): %s", d.Id(), err) + } + for _, address := range ni.Ipv6Addresses { ipv6Addresses = append(ipv6Addresses, *address.Ipv6Address) } diff --git a/internal/service/ec2/ec2_spot_instance_request_test.go b/internal/service/ec2/ec2_spot_instance_request_test.go index c0cf51fc427f..fb819d7308ec 100644 --- a/internal/service/ec2/ec2_spot_instance_request_test.go +++ b/internal/service/ec2/ec2_spot_instance_request_test.go @@ -9,11 +9,16 @@ import ( "testing" "time" + "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/compare" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2" @@ -43,6 +48,17 @@ func TestAccEC2SpotInstanceRequest_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_interruption_behavior", "terminate"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("network_interface"), knownvalue.SetExact([]knownvalue.Check{})), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface_id"), knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`))), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("primary_network_interface"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrDeleteOnTermination: knownvalue.Bool(true), + names.AttrNetworkInterfaceID: knownvalue.StringRegexp(regexache.MustCompile(`^eni-[0-9a-f]+$`)), + }), + })), + statecheck.CompareValuePairs(resourceName, tfjsonpath.New("primary_network_interface").AtSliceIndex(0).AtMapKey(names.AttrNetworkInterfaceID), resourceName, tfjsonpath.New("primary_network_interface_id"), compare.ValuesSame()), + }, }, { ResourceName: resourceName, From 49538788b472fe8eff324aba0a8784f4b99f24e9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:13:11 -0700 Subject: [PATCH 0279/2115] `primary_network_interface.delete_on_terminiation` is `Computed` --- internal/service/ec2/ec2_instance.go | 9 +++------ internal/service/ec2/ec2_instance_test.go | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 26ec7bc36116..0c6603169f40 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -658,9 +658,7 @@ func resourceInstance() *schema.Resource { Schema: map[string]*schema.Schema{ names.AttrDeleteOnTermination: { Type: schema.TypeBool, - Optional: true, - ForceNew: true, - Default: false, + Computed: true, }, names.AttrNetworkInterfaceID: { Type: schema.TypeString, @@ -2695,9 +2693,8 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfa v := primaryNetworkInterface.([]any) ini := v[0].(map[string]any) ni := awstypes.InstanceNetworkInterfaceSpecification{ - DeviceIndex: aws.Int32(0), - NetworkInterfaceId: aws.String(ini[names.AttrNetworkInterfaceID].(string)), - DeleteOnTermination: aws.Bool(ini[names.AttrDeleteOnTermination].(bool)), + DeviceIndex: aws.Int32(0), + NetworkInterfaceId: aws.String(ini[names.AttrNetworkInterfaceID].(string)), } networkInterfaces = append(networkInterfaces, ni) } diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index ac670dca7a7a..32f9738ee46d 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -8613,7 +8613,6 @@ resource "aws_network_interface" "test" { subnet_id = aws_subnet.test.id private_ips = ["10.1.1.42"] } - `) } From b25ec4cb0b6039f6db78ef9799e447b057a8e7e9 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:13:32 -0700 Subject: [PATCH 0280/2115] Adds `ConflictsWith` --- internal/service/ec2/ec2_instance.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 0c6603169f40..b8334cf48f84 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -592,7 +592,7 @@ func resourceInstance() *schema.Resource { Computed: true, }, "network_interface": { - ConflictsWith: []string{"associate_public_ip_address", "enable_primary_ipv6", names.AttrSubnetID, "private_ip", "secondary_private_ips", names.AttrVPCSecurityGroupIDs, names.AttrSecurityGroups, "ipv6_addresses", "ipv6_address_count", "source_dest_check"}, + ConflictsWith: []string{"associate_public_ip_address", "enable_primary_ipv6", "ipv6_addresses", "ipv6_address_count", "primary_network_interface", "private_ip", "secondary_private_ips", names.AttrSecurityGroups, "source_dest_check", names.AttrSubnetID, names.AttrVPCSecurityGroupIDs}, Type: schema.TypeSet, Optional: true, Computed: true, @@ -650,10 +650,11 @@ func resourceInstance() *schema.Resource { }, "primary_network_interface": { // Note: Changes to `primary_network_interface` should be mirrored in `aws_spot_instance_request` - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Computed: true, + ConflictsWith: []string{"associate_public_ip_address", "enable_primary_ipv6", "ipv6_addresses", "ipv6_address_count", "network_interface", "private_ip", "secondary_private_ips", names.AttrSecurityGroups, "source_dest_check", names.AttrSubnetID, names.AttrVPCSecurityGroupIDs}, + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Computed: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrDeleteOnTermination: { From a6df5a5f9be9b31723dd6bc464a655fbc174762e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:26:01 -0700 Subject: [PATCH 0281/2115] Renames example resources --- website/docs/r/instance.html.markdown | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index d545bd57a645..c0a361770d11 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -33,7 +33,7 @@ data "aws_ami" "ubuntu" { owners = ["099720109477"] # Canonical } -resource "aws_instance" "web" { +resource "aws_instance" "example" { ami = data.aws_ami.ubuntu.id instance_type = "t3.micro" @@ -46,7 +46,7 @@ resource "aws_instance" "web" { Using AWS Systems Manager Parameter Store ```terraform -resource "aws_instance" "web" { +resource "aws_instance" "example" { ami = "resolve:ssm:/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64" instance_type = "t3.micro" @@ -59,7 +59,7 @@ resource "aws_instance" "web" { ### Spot instance example ```terraform -data "aws_ami" "this" { +data "aws_ami" "example" { most_recent = true owners = ["amazon"] filter { @@ -72,8 +72,8 @@ data "aws_ami" "this" { } } -resource "aws_instance" "this" { - ami = data.aws_ami.this.id +resource "aws_instance" "example" { + ami = data.aws_ami.example.id instance_market_options { market_type = "spot" spot_options { @@ -108,7 +108,7 @@ resource "aws_subnet" "my_subnet" { } } -resource "aws_network_interface" "foo" { +resource "aws_network_interface" "example" { subnet_id = aws_subnet.my_subnet.id private_ips = ["172.16.10.100"] @@ -117,12 +117,12 @@ resource "aws_network_interface" "foo" { } } -resource "aws_instance" "foo" { +resource "aws_instance" "example" { ami = "ami-005e54dee72cc1d00" # us-west-2 instance_type = "t2.micro" network_interface { - network_interface_id = aws_network_interface.foo.id + network_interface_id = aws_network_interface.example.id device_index = 0 } From 4ff51f462f2a9ec10b6dc1289350ff7edca9048b Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:38:51 -0700 Subject: [PATCH 0282/2115] Adds documentation for `primary_network_interface` --- website/docs/r/instance.html.markdown | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index c0a361770d11..687f6d534e8e 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -243,6 +243,7 @@ This resource supports the following arguments: * `network_interface` - (Optional) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. * `placement_group` - (Optional) Placement Group to start the instance in. * `placement_partition_number` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. +* `primary_network_interface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `private_dns_name_options` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. * `private_ip` - (Optional) Private IP address to associate with the instance in a VPC. * `root_block_device` - (Optional) Configuration block to customize details about the root block device of the instance. See [Block Devices](#ebs-ephemeral-and-root-block-devices) below for details. When accessing this as an attribute reference, it is a list containing one object. @@ -400,6 +401,16 @@ Each `network_interface` block supports the following: * `network_card_index` - (Optional) Integer index of the network card. Limited by instance type. The default index is `0`. * `network_interface_id` - (Required) ID of the network interface to attach. +### Primary Network Interface + +Represents the primary network interface on the EC2 Instance. +To manage additional network interfaces, use `aws_network_interface_attachment` resources. + +Each `primary_network_interface` block supports the following: + +* `delete_on_termination` - (Read-Only) Whether the network interface will be deleted when the instance terminates. +* `network_interface_id` - (Required) ID of the network interface to attach. + ### Private DNS Name Options The `private_dns_name_options` block supports the following: From a9fa7158714ce88a54866945643e630670b71c9c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:51:38 -0700 Subject: [PATCH 0283/2115] Deprecates `network_interface` --- internal/service/ec2/ec2_instance.go | 1 + website/docs/r/instance.html.markdown | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index b8334cf48f84..fb61022dde7a 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -622,6 +622,7 @@ func resourceInstance() *schema.Resource { }, }, }, + Deprecated: "network_interface is deprecated. To specify the primary network interface, use primary_network_interface instead. To attach additional network interfaces, use the aws_network_interface_attachment resource.", }, "outpost_arn": { Type: schema.TypeString, diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 687f6d534e8e..fdc0a43fbf90 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -240,7 +240,7 @@ This resource supports the following arguments: * `maintenance_options` - (Optional) Maintenance and recovery options for the instance. See [Maintenance Options](#maintenance-options) below for more details. * `metadata_options` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) -* `network_interface` - (Optional) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. +* `network_interface` - (Optional, **Deprecated** to specify the primary network interface, use `primary_network_interface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. * `placement_group` - (Optional) Placement Group to start the instance in. * `placement_partition_number` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. * `primary_network_interface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. @@ -390,7 +390,11 @@ For more information, see the documentation on the [Instance Metadata Service](h ### Network Interfaces -Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use the `aws_network_interface` or `aws_network_interface_attachment` resources instead. +`network_interface` is **deprecated**. +Use `primary_network_interface` to specify the primary network interface. +To attach additional network interfaces, use `aws_network_interface_attachment` resources. + +Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use `aws_network_interface_attachment` resources instead. The `network_interface` configuration block _does_, however, allow users to supply their own network interface to be used as the default network interface on an EC2 Instance, attached at `eth0`. From 97218eee4ce5a992f51e228fea1c54746f1caa4e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 09:52:27 -0700 Subject: [PATCH 0284/2115] Updates example --- website/docs/r/instance.html.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index fdc0a43fbf90..a71a1bed5317 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -121,9 +121,8 @@ resource "aws_instance" "example" { ami = "ami-005e54dee72cc1d00" # us-west-2 instance_type = "t2.micro" - network_interface { + primary_network_interface { network_interface_id = aws_network_interface.example.id - device_index = 0 } credit_specification { From a7453f2226a5b4bd761d9d575b6cb1ec4b421938 Mon Sep 17 00:00:00 2001 From: Asim Date: Tue, 19 Aug 2025 17:55:19 +0100 Subject: [PATCH 0285/2115] fixed linting. --- .../odb/cloud_exadata_infrastructure_data_source_test.go | 2 +- internal/service/odb/cloud_exadata_infrastructure_test.go | 2 +- ...kdown => aws_odb_cloud_exadata_infrastructure.html.markdown} | 0 ...kdown => aws_odb_cloud_exadata_infrastructure.html.markdown} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename website/docs/d/{cloud_exadata_infrastructure.html.markdown => aws_odb_cloud_exadata_infrastructure.html.markdown} (100%) rename website/docs/r/{cloud_exadata_infrastructure.html.markdown => aws_odb_cloud_exadata_infrastructure.html.markdown} (100%) diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index ed821b8fabee..cac1e6ba55cd 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -97,7 +97,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{ email = %[2]q }, { email = %[3]q }] + customer_contacts_to_send_to_oci = [{ email = "%[2]s" }, { email = "%[3]s" }] maintenance_window { custom_action_timeout_in_mins = 16 is_custom_action_timeout_enabled = true diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index fafc402874ce..b3a62f2d2f15 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -363,7 +363,7 @@ resource "aws_odb_cloud_exadata_infrastructure" "test" { storage_count = 3 compute_count = 2 availability_zone_id = "use1-az6" - customer_contacts_to_send_to_oci = [{ email =%[2]q }, { email = %[3]q }] + customer_contacts_to_send_to_oci = [{ email = "%[2]s" }, { email = "%[3]s" }] database_server_type = "X11M" storage_server_type = "X11M-HC" maintenance_window { diff --git a/website/docs/d/cloud_exadata_infrastructure.html.markdown b/website/docs/d/aws_odb_cloud_exadata_infrastructure.html.markdown similarity index 100% rename from website/docs/d/cloud_exadata_infrastructure.html.markdown rename to website/docs/d/aws_odb_cloud_exadata_infrastructure.html.markdown diff --git a/website/docs/r/cloud_exadata_infrastructure.html.markdown b/website/docs/r/aws_odb_cloud_exadata_infrastructure.html.markdown similarity index 100% rename from website/docs/r/cloud_exadata_infrastructure.html.markdown rename to website/docs/r/aws_odb_cloud_exadata_infrastructure.html.markdown From 7f307a9858bfe75c12c229cc0773637ba1f1f720 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 13:40:54 -0400 Subject: [PATCH 0286/2115] build(deps): bump the aws-sdk-go-v2 group across 1 directory with 7 updates (#43952) * build(deps): bump the aws-sdk-go-v2 group across 1 directory with 7 updates Bumps the aws-sdk-go-v2 group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/amp](https://github.com/aws/aws-sdk-go-v2) | `1.37.0` | `1.38.0` | | [github.com/aws/aws-sdk-go-v2/service/batch](https://github.com/aws/aws-sdk-go-v2) | `1.57.0` | `1.57.1` | | [github.com/aws/aws-sdk-go-v2/service/bedrockagent](https://github.com/aws/aws-sdk-go-v2) | `1.48.0` | `1.49.0` | | [github.com/aws/aws-sdk-go-v2/service/connect](https://github.com/aws/aws-sdk-go-v2) | `1.135.0` | `1.136.0` | | [github.com/aws/aws-sdk-go-v2/service/glue](https://github.com/aws/aws-sdk-go-v2) | `1.125.0` | `1.126.0` | | [github.com/aws/aws-sdk-go-v2/service/s3control](https://github.com/aws/aws-sdk-go-v2) | `1.64.0` | `1.65.0` | | [github.com/aws/aws-sdk-go-v2/service/sagemaker](https://github.com/aws/aws-sdk-go-v2) | `1.209.0` | `1.210.0` | Updates `github.com/aws/aws-sdk-go-v2/service/amp` from 1.37.0 to 1.38.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.37.0...v1.38.0) Updates `github.com/aws/aws-sdk-go-v2/service/batch` from 1.57.0 to 1.57.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.57.0...service/s3/v1.57.1) Updates `github.com/aws/aws-sdk-go-v2/service/bedrockagent` from 1.48.0 to 1.49.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.48.0...service/s3/v1.49.0) Updates `github.com/aws/aws-sdk-go-v2/service/connect` from 1.135.0 to 1.136.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.135.0...service/ec2/v1.136.0) Updates `github.com/aws/aws-sdk-go-v2/service/glue` from 1.125.0 to 1.126.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.125.0...service/ec2/v1.126.0) Updates `github.com/aws/aws-sdk-go-v2/service/s3control` from 1.64.0 to 1.65.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.64.0...service/s3/v1.65.0) Updates `github.com/aws/aws-sdk-go-v2/service/sagemaker` from 1.209.0 to 1.210.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.209.0...service/ec2/v1.210.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/amp dependency-version: 1.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/batch dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagent dependency-version: 1.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connect dependency-version: 1.136.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glue dependency-version: 1.126.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3control dependency-version: 1.65.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.210.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- tools/tfsdk2fw/go.mod | 19 ++++++++++--------- tools/tfsdk2fw/go.sum | 38 ++++++++++++++++++++------------------ 4 files changed, 51 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index 4aed0bcf4e10..e6dbf1ff7979 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.27.0 github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 - github.com/aws/aws-sdk-go-v2/service/amp v1.37.0 + github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 @@ -40,10 +40,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.0 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 - github.com/aws/aws-sdk-go-v2/service/connect v1.135.0 + github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 @@ -129,7 +129,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 - github.com/aws/aws-sdk-go-v2/service/glue v1.125.0 + github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 @@ -221,11 +221,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 diff --git a/go.sum b/go.sum index d529cd5fe2c2..81eac95a88ae 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYh github.com/aws/aws-sdk-go-v2/service/acm v1.36.0/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.37.0 h1:ENqKS9m7AL5HiNNTV4dwUQ5E2xARxbMPr2OeK97FHCc= -github.com/aws/aws-sdk-go-v2/service/amp v1.37.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= @@ -91,14 +91,14 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.0 h1:saon+alGICDcv5yIHE/O7eHNUCT6LgUMIAMHoY4kpg4= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.0/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.1/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0 h1:p7AHuhT9Xo23oS0B4Dlo3QTuR75wNxLdfXXvoXRRAMM= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= @@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.135.0 h1:pbB8nhUG+FyR29DSfnodqTTD8iiihSP4+PffWceQTQI= -github.com/aws/aws-sdk-go-v2/service/connect v1.135.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= @@ -269,8 +269,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.125.0 h1:yhqWto0e2E7V+XtYOsHryl2/GH/ugQRecoap3Ddeom0= -github.com/aws/aws-sdk-go-v2/service/glue v1.125.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= @@ -463,16 +463,16 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/ github.com/aws/aws-sdk-go-v2/service/rum v1.27.0/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0 h1:vq66S6Ulu9VLBGCuOtENpbxBEdpUdn6sBopaoP9/SKY= -github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 h1:y8H04kZLZu8Zcy/+E3yYPd1e5V+pPJklbLdkKlLGeO4= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 h1:mT0D16ojwEPM0/XW1yVAeJYvX1F5B2yMhwf7CDpvIqw= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0 h1:d4f7/eKImxS52878zZOgRsi3mg7LAQNl9uyIN6hfuQ8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 7ac0c0862dc7..d178e060267f 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 // indirect @@ -52,10 +52,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 // indirect github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.0 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 // indirect github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 // indirect github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 // indirect github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 // indirect github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 // indirect @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.135.0 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 // indirect github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 // indirect @@ -141,7 +141,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 // indirect github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.125.0 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 // indirect github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 // indirect @@ -238,11 +238,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 // indirect github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 // indirect @@ -297,6 +297,7 @@ require ( github.com/gertd/go-pluralize v0.2.1 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect @@ -326,7 +327,7 @@ require ( github.com/hashicorp/terraform-plugin-framework-validators v0.18.0 // indirect github.com/hashicorp/terraform-plugin-go v0.28.0 // indirect github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect - github.com/hashicorp/terraform-plugin-testing v1.13.2 // indirect + github.com/hashicorp/terraform-plugin-testing v1.13.3 // indirect github.com/hashicorp/terraform-registry-address v0.2.5 // indirect github.com/hashicorp/terraform-svchost v0.1.1 // indirect github.com/hashicorp/yamux v0.1.1 // indirect @@ -371,7 +372,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect google.golang.org/grpc v1.72.1 // indirect google.golang.org/protobuf v1.36.6 // indirect - gopkg.in/dnaeon/go-vcr.v4 v4.0.4 // indirect + gopkg.in/dnaeon/go-vcr.v4 v4.0.5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 7841f0f595a3..cd90023f4b6e 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYh github.com/aws/aws-sdk-go-v2/service/acm v1.36.0/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.37.0 h1:ENqKS9m7AL5HiNNTV4dwUQ5E2xARxbMPr2OeK97FHCc= -github.com/aws/aws-sdk-go-v2/service/amp v1.37.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= @@ -91,14 +91,14 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.0 h1:saon+alGICDcv5yIHE/O7eHNUCT6LgUMIAMHoY4kpg4= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.0/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.1/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0 h1:p7AHuhT9Xo23oS0B4Dlo3QTuR75wNxLdfXXvoXRRAMM= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.48.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= @@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.135.0 h1:pbB8nhUG+FyR29DSfnodqTTD8iiihSP4+PffWceQTQI= -github.com/aws/aws-sdk-go-v2/service/connect v1.135.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= @@ -269,8 +269,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.125.0 h1:yhqWto0e2E7V+XtYOsHryl2/GH/ugQRecoap3Ddeom0= -github.com/aws/aws-sdk-go-v2/service/glue v1.125.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= @@ -463,16 +463,16 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/ github.com/aws/aws-sdk-go-v2/service/rum v1.27.0/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0 h1:vq66S6Ulu9VLBGCuOtENpbxBEdpUdn6sBopaoP9/SKY= -github.com/aws/aws-sdk-go-v2/service/s3control v1.64.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 h1:y8H04kZLZu8Zcy/+E3yYPd1e5V+pPJklbLdkKlLGeO4= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 h1:mT0D16ojwEPM0/XW1yVAeJYvX1F5B2yMhwf7CDpvIqw= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0 h1:d4f7/eKImxS52878zZOgRsi3mg7LAQNl9uyIN6hfuQ8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.209.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= @@ -604,6 +604,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= +github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -676,8 +678,8 @@ github.com/hashicorp/terraform-plugin-mux v0.20.0 h1:3QpBnI9uCuL0Yy2Rq/kR9cOdmOF github.com/hashicorp/terraform-plugin-mux v0.20.0/go.mod h1:wSIZwJjSYk86NOTX3fKUlThMT4EAV1XpBHz9SAvjQr4= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 h1:NFPMacTrY/IdcIcnUB+7hsore1ZaRWU9cnB6jFoBnIM= github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0/go.mod h1:QYmYnLfsosrxjCnGY1p9c7Zj6n9thnEE+7RObeYs3fA= -github.com/hashicorp/terraform-plugin-testing v1.13.2 h1:mSotG4Odl020vRjIenA3rggwo6Kg6XCKIwtRhYgp+/M= -github.com/hashicorp/terraform-plugin-testing v1.13.2/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE= +github.com/hashicorp/terraform-plugin-testing v1.13.3 h1:QLi/khB8Z0a5L54AfPrHukFpnwsGL8cwwswj4RZduCo= +github.com/hashicorp/terraform-plugin-testing v1.13.3/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE= github.com/hashicorp/terraform-registry-address v0.2.5 h1:2GTftHqmUhVOeuu9CW3kwDkRe4pcBDq0uuK5VJngU1M= github.com/hashicorp/terraform-registry-address v0.2.5/go.mod h1:PpzXWINwB5kuVS5CA7m1+eO2f1jKb5ZDIxrOPfpnGkg= github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ= @@ -865,8 +867,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/dnaeon/go-vcr.v4 v4.0.4 h1:UNc8d1Ya2otEOU3DoUgnSLp0tXvBNE0FuFe86Nnzcbw= -gopkg.in/dnaeon/go-vcr.v4 v4.0.4/go.mod h1:65yxh9goQVrudqofKtHA4JNFWd6XZRkWfKN4YpMx7KI= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5 h1:I0hpTIvD5rII+8LgYGrHMA2d4SQPoL6u7ZvJakWKsiA= +gopkg.in/dnaeon/go-vcr.v4 v4.0.5/go.mod h1:dRos81TkW9C1WJt6tTaE+uV2Lo8qJT3AG2b35+CB/nQ= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 461bb6fe47a1914716b00ec29e1a723b124f8415 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 10:41:54 -0700 Subject: [PATCH 0287/2115] `terrafmt` --- internal/service/ec2/ec2_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 32f9738ee46d..c30324af9a8a 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -8928,7 +8928,7 @@ resource "aws_instance" "test" { network_interface_id = aws_network_interface.primary.id device_index = 0 } - + network_interface { network_interface_id = aws_network_interface.secondary.id device_index = 1 From 183b9566e2693027986459b0e1ae5c12f389a5b1 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 19 Aug 2025 17:50:06 +0000 Subject: [PATCH 0288/2115] Update CHANGELOG.md for #43918 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42b2fdc0cc44..66bb9519d5eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ ENHANCEMENTS: * resource/aws_secretsmanager_secret: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_policy: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_rotation: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) +* resource/aws_sqs_queue: Add resource identity support ([#43918](https://github.com/hashicorp/terraform-provider-aws/issues/43918)) +* resource/aws_sqs_queue_policy: Add resource identity support ([#43918](https://github.com/hashicorp/terraform-provider-aws/issues/43918)) +* resource/aws_sqs_queue_redrive_allow_policy: Add resource identity support ([#43918](https://github.com/hashicorp/terraform-provider-aws/issues/43918)) +* resource/aws_sqs_queue_redrive_policy: Add resource identity support ([#43918](https://github.com/hashicorp/terraform-provider-aws/issues/43918)) + +BUG FIXES: + +* resource/aws_rds_cluster: Fixes the behavior when enabling database_insights_mode="advanced" without changing performance insights retention window ([#43919](https://github.com/hashicorp/terraform-provider-aws/issues/43919)) +* resource/aws_rds_cluster: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key ([#43942](https://github.com/hashicorp/terraform-provider-aws/issues/43942)) ## 6.9.0 (August 14, 2025) From fb2072b7664ce00020157c8d0dc0476eb552f5bd Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 19 Aug 2025 17:06:45 -0400 Subject: [PATCH 0289/2115] service cat debuggery --- .../servicecatalog/provisioned_product.go | 37 ++- .../provisioned_product_test.go | 229 ++++++++++++++++++ internal/service/servicecatalog/wait.go | 25 +- 3 files changed, 286 insertions(+), 5 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 0694b1512b82..d78f97d8edee 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -438,24 +438,35 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // but this can interfere complete reads of this resource when an error occurs after initial creation // or after an invalid update that returns a 'FAILED' record state. Thus, waiters are now present in the CREATE and UPDATE methods of this resource instead. // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/24574#issuecomment-1126339193 + + // For TAINTED resources, we need to get parameters from the last successful record + // not the last provisioning record which may have failed + var recordIdToUse *string + if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { + recordIdToUse = detail.LastSuccessfulProvisioningRecordId + log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), aws.ToString(recordIdToUse)) + } else { + recordIdToUse = detail.LastProvisioningRecordId + } + recordInput := &servicecatalog.DescribeRecordInput{ - Id: detail.LastProvisioningRecordId, + Id: recordIdToUse, AcceptLanguage: aws.String(acceptLanguage), } recordOutput, err := conn.DescribeRecord(ctx, recordInput) if !d.IsNewResource() && errs.IsA[*awstypes.ResourceNotFoundException](err) { - log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) + log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(recordIdToUse)) return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(detail.LastProvisioningRecordId), err) + return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(recordIdToUse), err) } if recordOutput == nil || recordOutput.RecordDetail == nil { - return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) + return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(recordIdToUse)) } // To enable debugging of potential v, log as a warning @@ -554,6 +565,24 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat } if _, err := waitProvisionedProductReady(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutUpdate)); err != nil { + // Check if this is a state inconsistency error + var failureErr *ProvisionedProductFailureError + if errors.As(err, &failureErr) && failureErr.IsStateInconsistent() { + // Force a state refresh to get actual AWS values before returning error + log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) + + // Perform state refresh to get actual current values from AWS + refreshDiags := resourceProvisionedProductRead(ctx, d, meta) + if refreshDiags.HasError() { + // If refresh fails, return both errors + return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) + } + + // Return the original failure error after state is corrected + return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) + } + + // For other errors, proceed as before return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 048b9294b70b..642c86198312 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -15,6 +15,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -988,3 +989,231 @@ resource "aws_s3_bucket" "conflict" { } `, rName, conflictingBucketName, tagValue)) } + +// TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate reproduces the exact bug scenario: +// +// When a Service Catalog provisioned product update fails, the resource becomes TAINTED. +// The bug is that subsequent `terraform apply` shows "no changes" instead of retrying +// the failed update automatically. +// +// Expected behavior: TAINTED resources should always trigger an update attempt. +// Current (buggy) behavior: TAINTED resources show "no changes" in plan. +// +// This test should FAIL at Step 4 with the current implementation, proving the bug exists. +// Step 4 uses ConfigPlanChecks to verify that an update action should be planned. +func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_servicecatalog_provisioned_product.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + var pprod awstypes.ProvisionedProductDetail + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ServiceCatalogServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckProvisionedProductDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create with working configuration using simple template + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_working(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), + ), + }, + // Step 2: Update to failing configuration - this should fail and leave resource TAINTED + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName), + ExpectError: regexache.MustCompile(`Properties validation failed`), + }, + // Step 3: Verify resource is now TAINTED after the failed update + // Use RefreshOnly to avoid triggering any plan changes due to config differences + { + RefreshState: true, + Check: resource.ComposeTestCheckFunc( + testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), + testAccCheckProvisionedProductStatus(ctx, resourceName, "TAINTED"), + ), + }, + // Step 4: CRITICAL TEST - Apply the same failing config again + // BUG: Currently this shows "no changes" but should retry the update + // ConfigPlanChecks should FAIL with current implementation, demonstrating the bug + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ExpectError: regexache.MustCompile(`Properties validation failed`), + }, + // Step 5: Clean up by applying a working config + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_working(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), + ), + }, + }, + }) +} + +// Helper function to check provisioned product status +func testAccCheckProvisionedProductStatus(ctx context.Context, resourceName, expectedStatus string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return fmt.Errorf("resource not found: %s", resourceName) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).ServiceCatalogClient(ctx) + + input := &servicecatalog.DescribeProvisionedProductInput{ + Id: aws.String(rs.Primary.ID), + AcceptLanguage: aws.String(tfservicecatalog.AcceptLanguageEnglish), + } + + output, err := conn.DescribeProvisionedProduct(ctx, input) + if err != nil { + return fmt.Errorf("describing Service Catalog Provisioned Product (%s): %w", rs.Primary.ID, err) + } + + if output.ProvisionedProductDetail == nil { + return fmt.Errorf("Service Catalog Provisioned Product (%s) not found", rs.Primary.ID) + } + + actualStatus := string(output.ProvisionedProductDetail.Status) + if actualStatus != expectedStatus { + return fmt.Errorf("Service Catalog Provisioned Product (%s) status: expected %s, got %s", + rs.Primary.ID, expectedStatus, actualStatus) + } + + return nil + } +} + +// testAccProvisionedProductConfig_retryTaintedUpdate_working creates a simple working CloudFormation template +// This avoids the complex conditional logic that was causing issues in the basic config +func testAccProvisionedProductConfig_retryTaintedUpdate_working(rName string) string { + return acctest.ConfigCompose( + testAccProvisionedProductPortfolioBaseConfig(rName), + fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +resource "aws_s3_object" "test" { + bucket = aws_s3_bucket.test.id + key = "%[1]s.json" + + content = jsonencode({ + AWSTemplateFormatVersion = "2010-09-09" + + Resources = { + TestBucket = { + Type = "AWS::S3::Bucket" + } + } + + Outputs = { + BucketName = { + Description = "Bucket Name" + Value = { + Ref = "TestBucket" + } + } + } + }) +} + +resource "aws_servicecatalog_product" "test" { + description = %[1]q + distributor = "distributör" + name = %[1]q + owner = "ägare" + type = "CLOUD_FORMATION_TEMPLATE" + support_description = %[1]q + + provisioning_artifact_parameters { + description = "artefaktbeskrivning" + disable_template_validation = true + name = %[1]q + template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" + type = "CLOUD_FORMATION_TEMPLATE" + } +} + +resource "aws_servicecatalog_provisioned_product" "test" { + name = %[1]q + product_id = aws_servicecatalog_product.test.id + provisioning_artifact_name = %[1]q + path_id = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id +} +`, rName)) +} + +// testAccProvisionedProductConfig_retryTaintedUpdate_failing creates a CloudFormation template that will fail +// This uses an invalid S3 bucket name to trigger a CloudFormation validation error +func testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName string) string { + return acctest.ConfigCompose( + testAccProvisionedProductPortfolioBaseConfig(rName), + fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q + force_destroy = true +} + +resource "aws_s3_object" "test" { + bucket = aws_s3_bucket.test.id + key = "%[1]s.json" + + content = jsonencode({ + AWSTemplateFormatVersion = "2010-09-09" + + Resources = { + TestBucket = { + Type = "AWS::S3::Bucket" + Properties = { + BucketName = "INVALID_BUCKET_NAME_WITH_UPPERCASE_AND_UNDERSCORES" + } + } + } + + Outputs = { + BucketName = { + Description = "Bucket Name" + Value = { + Ref = "TestBucket" + } + } + } + }) +} + +resource "aws_servicecatalog_product" "test" { + description = %[1]q + distributor = "distributör" + name = %[1]q + owner = "ägare" + type = "CLOUD_FORMATION_TEMPLATE" + support_description = %[1]q + + provisioning_artifact_parameters { + description = "artefaktbeskrivning" + disable_template_validation = true + name = %[1]q + template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" + type = "CLOUD_FORMATION_TEMPLATE" + } +} + +resource "aws_servicecatalog_provisioned_product" "test" { + name = %[1]q + product_id = aws_servicecatalog_product.test.id + provisioning_artifact_name = %[1]q + path_id = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id +} +`, rName)) +} diff --git a/internal/service/servicecatalog/wait.go b/internal/service/servicecatalog/wait.go index d3600429438a..4fa01d21bdfb 100644 --- a/internal/service/servicecatalog/wait.go +++ b/internal/service/servicecatalog/wait.go @@ -75,6 +75,24 @@ const ( organizationAccessStatusError = "ERROR" ) +// ProvisionedProductFailureError represents a provisioned product operation failure +// that requires state refresh to recover from inconsistent state. +type ProvisionedProductFailureError struct { + StatusMessage string + Status string + NeedsRefresh bool +} + +func (e *ProvisionedProductFailureError) Error() string { + return e.StatusMessage +} + +// IsStateInconsistent returns true if this error indicates state inconsistency +// that requires a refresh to recover. +func (e *ProvisionedProductFailureError) IsStateInconsistent() bool { + return e.NeedsRefresh +} + func waitProductReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, productID string, timeout time.Duration) (*servicecatalog.DescribeProductAsAdminOutput, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.StatusCreating, statusNotFound, statusUnavailable), @@ -485,7 +503,12 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien // The difference is that, in the case of `TAINTED`, there is a previous version to roll back to. status := string(detail.Status) if status == string(awstypes.ProvisionedProductStatusError) || status == string(awstypes.ProvisionedProductStatusTainted) { - return output, errors.New(aws.ToString(detail.StatusMessage)) + // Create a custom error type that signals state refresh is needed + return output, &ProvisionedProductFailureError{ + StatusMessage: aws.ToString(detail.StatusMessage), + Status: status, + NeedsRefresh: true, + } } } } From 04b3d17eed7022f8dd5f8ca0195036dd6c1329df Mon Sep 17 00:00:00 2001 From: Monish Date: Tue, 19 Aug 2025 23:22:16 +0200 Subject: [PATCH 0290/2115] Update documentation from event_bridge_configuration to event_bridge_destination --- .../sesv2_configuration_set_event_destination.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/sesv2_configuration_set_event_destination.html.markdown b/website/docs/r/sesv2_configuration_set_event_destination.html.markdown index 3b84931b8570..310ec564cd00 100644 --- a/website/docs/r/sesv2_configuration_set_event_destination.html.markdown +++ b/website/docs/r/sesv2_configuration_set_event_destination.html.markdown @@ -143,7 +143,7 @@ The `event_destination` configuration block supports the following arguments: * `matching_event_types` - (Required) - An array that specifies which events the Amazon SES API v2 should send to the destinations. Valid values: `SEND`, `REJECT`, `BOUNCE`, `COMPLAINT`, `DELIVERY`, `OPEN`, `CLICK`, `RENDERING_FAILURE`, `DELIVERY_DELAY`, `SUBSCRIPTION`. * `cloud_watch_destination` - (Optional) An object that defines an Amazon CloudWatch destination for email events. See [`cloud_watch_destination` Block](#cloud_watch_destination-block) for details. * `enabled` - (Optional) When the event destination is enabled, the specified event types are sent to the destinations. Default: `false`. -* `event_bridge_configuration` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`event_bridge_configuration` Block](#event_bridge_configuration-block) for details. +* `event_bridge_destination` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`event_bridge_destination` Block](#event_bridge_destination-block) for details. * `kinesis_firehose_destination` - (Optional) An object that defines an Amazon Kinesis Data Firehose destination for email events. See [`kinesis_firehose_destination` Block](#kinesis_firehose_destination-block) for details. * `pinpoint_destination` - (Optional) An object that defines an Amazon Pinpoint project destination for email events. See [`pinpoint_destination` Block](#pinpoint_destination-block) for details. * `sns_destination` - (Optional) An object that defines an Amazon SNS destination for email events. See [`sns_destination` Block](#sns_destination-block) for details. @@ -162,9 +162,9 @@ The `dimension_configuration` configuration block supports the following argumen * `dimension_name` - (Required) The name of an Amazon CloudWatch dimension associated with an email sending metric. * `dimension_value_source` - (Required) The location where the Amazon SES API v2 finds the value of a dimension to publish to Amazon CloudWatch. Valid values: `MESSAGE_TAG`, `EMAIL_HEADER`, `LINK_TAG`. -### `event_bridge_configuration` Block +### `event_bridge_destination` Block -The `event_bridge_configuration` configuration block supports the following arguments: +The `event_bridge_destination` configuration block supports the following arguments: * `event_bus_arn` - (Required) The Amazon Resource Name (ARN) of the Amazon EventBridge bus to publish email events to. Only the default bus is supported. From ba38c027a0eb9feacecbf9e38963a223e1b37e1d Mon Sep 17 00:00:00 2001 From: Simon Davis Date: Tue, 19 Aug 2025 15:00:15 -0700 Subject: [PATCH 0291/2115] fix changelog # for EKS deletion protection (#43958) --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66bb9519d5eb..9b21cede9f9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,11 +28,11 @@ FEATURES: ENHANCEMENTS: -* data-source/aws_eks_cluster: Add `deletion_protection` attribute ([#43752](https://github.com/hashicorp/terraform-provider-aws/issues/43752)) +* data-source/aws_eks_cluster: Add `deletion_protection` attribute ([#43779](https://github.com/hashicorp/terraform-provider-aws/issues/43779)) * resource/aws_cloudwatch_event_rule: Add resource identity support ([#43758](https://github.com/hashicorp/terraform-provider-aws/issues/43758)) * resource/aws_cloudwatch_metric_alarm: Add resource identity support ([#43759](https://github.com/hashicorp/terraform-provider-aws/issues/43759)) * resource/aws_dynamodb_table: Add `replica.deletion_protection_enabled` argument ([#43240](https://github.com/hashicorp/terraform-provider-aws/issues/43240)) -* resource/aws_eks_cluster: Add `deletion_protection` argument ([#43752](https://github.com/hashicorp/terraform-provider-aws/issues/43752)) +* resource/aws_eks_cluster: Add `deletion_protection` argument ([#43779](https://github.com/hashicorp/terraform-provider-aws/issues/43779)) * resource/aws_lambda_function: Add resource identity support ([#43821](https://github.com/hashicorp/terraform-provider-aws/issues/43821)) * resource/aws_sns_topic_data_protection_policy: Add resource identity support ([#43830](https://github.com/hashicorp/terraform-provider-aws/issues/43830)) * resource/aws_sns_topic_policy: Add resource identity support ([#43830](https://github.com/hashicorp/terraform-provider-aws/issues/43830)) From 680356f059ed8c7763b6225cc0e9aca264fd81f2 Mon Sep 17 00:00:00 2001 From: Asim Date: Tue, 19 Aug 2025 23:21:06 +0100 Subject: [PATCH 0292/2115] fixed documentation. --- ...> odb_cloud_exadata_infrastructure.html.markdown} | 12 +++++++----- ...> odb_cloud_exadata_infrastructure.html.markdown} | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) rename website/docs/d/{aws_odb_cloud_exadata_infrastructure.html.markdown => odb_cloud_exadata_infrastructure.html.markdown} (91%) rename website/docs/r/{aws_odb_cloud_exadata_infrastructure.html.markdown => odb_cloud_exadata_infrastructure.html.markdown} (97%) diff --git a/website/docs/d/aws_odb_cloud_exadata_infrastructure.html.markdown b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown similarity index 91% rename from website/docs/d/aws_odb_cloud_exadata_infrastructure.html.markdown rename to website/docs/d/odb_cloud_exadata_infrastructure.html.markdown index 1d906761daf6..c02e5f86c7bf 100644 --- a/website/docs/d/aws_odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown @@ -1,14 +1,16 @@ --- -subcategory: "Polly" -layout: "aws" -page_title: "AWS: aws_polly_voices" +subcategory: "Oracle Database@AWS" +layout: "AWS: aws_odb_cloud_exadata_infrastructure" +page_title: "AWS: aws_odb_cloud_exadata_infrastructure" description: |- - Terraform data source for managing an AWS Polly Voices. + Terraform data source for managing Exadata Infrastructure resource in AWS for Oracle Database@AWS. --- # Data Source: aws_odb_cloud_exadata_infrastructure -Terraform data source for Exadata Infrastructure resource in AWS for Oracle Database Service. +Terraform data source for Exadata Infrastructure resource in AWS for Oracle Database@AWS. + +You can find out more about Oracle Database@AWS from [User Guide](https://docs.aws.amazon.com/odb/latest/UserGuide/what-is-odb.html). ## Example Usage diff --git a/website/docs/r/aws_odb_cloud_exadata_infrastructure.html.markdown b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown similarity index 97% rename from website/docs/r/aws_odb_cloud_exadata_infrastructure.html.markdown rename to website/docs/r/odb_cloud_exadata_infrastructure.html.markdown index 1c9a342852d1..f212ea71dc95 100644 --- a/website/docs/r/aws_odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown @@ -1,14 +1,14 @@ --- -subcategory: "OpenSearch Ingestion" +subcategory: "Oracle Database@AWS" layout: "aws" -page_title: "AWS: aws_osis_pipeline" +page_title: "AWS: aws_odb_cloud_exadata_infrastructure" description: |- - Terraform resource for managing an AWS OpenSearch Ingestion Pipeline. + Terraform resource for managing an Oracle Database@AWS. --- # Resource: aws_odb_cloud_exadata_infrastructure -Terraform resource for creating Exadata Infrastructure resource in AWS for Oracle Database Service. +Terraform resource for creating Exadata Infrastructure resource in AWS for Oracle Database@AWS. ## Example Usage From ad80bdba221b6f336ff74ba9d044aa6f530c80e7 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 19 Aug 2025 18:23:46 -0400 Subject: [PATCH 0293/2115] aws_batch_compute_environment: make update_policy optional/computed because aws sets defaults --- internal/service/batch/compute_environment.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go index bc3a77693a48..d31ad7546ba0 100644 --- a/internal/service/batch/compute_environment.go +++ b/internal/service/batch/compute_environment.go @@ -277,13 +277,13 @@ func resourceComputeEnvironment() *schema.Resource { "job_execution_timeout_minutes": { Type: schema.TypeInt, Optional: true, - Default: 30, + Computed: true, ValidateFunc: validation.IntBetween(1, 360), }, "terminate_jobs_on_update": { Type: schema.TypeBool, Optional: true, - Default: false, + Computed: true, }, }, }, From 62fee8490a6c6234762241171a7c6ea7b68cedf4 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 15:25:37 -0700 Subject: [PATCH 0294/2115] Adds links to `aws_network_interface_attachment` resource documentation --- website/docs/r/instance.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index a71a1bed5317..ef204c5c5a90 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -391,9 +391,9 @@ For more information, see the documentation on the [Instance Metadata Service](h `network_interface` is **deprecated**. Use `primary_network_interface` to specify the primary network interface. -To attach additional network interfaces, use `aws_network_interface_attachment` resources. +To attach additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. -Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use `aws_network_interface_attachment` resources instead. +Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources instead. The `network_interface` configuration block _does_, however, allow users to supply their own network interface to be used as the default network interface on an EC2 Instance, attached at `eth0`. @@ -407,7 +407,7 @@ Each `network_interface` block supports the following: ### Primary Network Interface Represents the primary network interface on the EC2 Instance. -To manage additional network interfaces, use `aws_network_interface_attachment` resources. +To manage additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. Each `primary_network_interface` block supports the following: From 07449b4ca1c540055b633bb6c47345b0f0a18502 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 19 Aug 2025 15:31:21 -0700 Subject: [PATCH 0295/2115] Adds CHANGELOG entry --- .changelog/43953.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/43953.txt diff --git a/.changelog/43953.txt b/.changelog/43953.txt new file mode 100644 index 000000000000..62276d483bab --- /dev/null +++ b/.changelog/43953.txt @@ -0,0 +1,7 @@ +```release-note:bug +resource/aws_instance: Adds `primary_network_interface` to allow importing resources with custom primary network interface. +``` + +```release-note:note +resource/aws_instance: The `network_interface` block has been deprecated. Use `primary_network_interface` for the primary network interface and `aws_network_interface_attachment` resources for other network interfaces. +``` From 21d45e90e96957d65ae2d6326fc0ad5ba6fcba57 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 19 Aug 2025 18:34:21 -0400 Subject: [PATCH 0296/2115] correct CHANGELOG name --- .changelog/{40148.md => 40148.txt} | 0 internal/service/batch/compute_environment_test.go | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename .changelog/{40148.md => 40148.txt} (100%) diff --git a/.changelog/40148.md b/.changelog/40148.txt similarity index 100% rename from .changelog/40148.md rename to .changelog/40148.txt diff --git a/internal/service/batch/compute_environment_test.go b/internal/service/batch/compute_environment_test.go index 68bab8750fb8..82ddff674630 100644 --- a/internal/service/batch/compute_environment_test.go +++ b/internal/service/batch/compute_environment_test.go @@ -319,8 +319,8 @@ func TestAccBatchComputeEnvironment_upgradeV0ToV1(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), - resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), - resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), + resource.TestCheckResourceAttr(resourceName, "name", rName), + resource.TestCheckResourceAttr(resourceName, "name_prefix", ""), ), }, { @@ -2257,7 +2257,7 @@ resource "aws_batch_compute_environment" "test" { func testAccComputeEnvironmentConfig_upgradeV0ToV1Legacy(rName string) string { return acctest.ConfigCompose(testAccComputeEnvironmentConfig_base(rName), fmt.Sprintf(` resource "aws_batch_compute_environment" "test" { - compute_environment_name = %[1]q + name = %[1]q service_role = aws_iam_role.batch_service.arn type = "UNMANAGED" @@ -3365,7 +3365,7 @@ func testAccComputeEnvironmentConfig_spotCapacityOptimizedAllocationInstanceType acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), fmt.Sprintf(` resource "aws_batch_compute_environment" "test" { - compute_environment_name = %[1]q + name = %[1]q compute_resources { allocation_strategy = "SPOT_PRICE_CAPACITY_OPTIMIZED" From acdae3650c998c635837ccf5e0ac033fac2d48eb Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 19 Aug 2025 18:40:49 -0400 Subject: [PATCH 0297/2115] lint fix --- internal/service/batch/compute_environment_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/batch/compute_environment_test.go b/internal/service/batch/compute_environment_test.go index 82ddff674630..cc426e6f1f82 100644 --- a/internal/service/batch/compute_environment_test.go +++ b/internal/service/batch/compute_environment_test.go @@ -319,8 +319,8 @@ func TestAccBatchComputeEnvironment_upgradeV0ToV1(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), - resource.TestCheckResourceAttr(resourceName, "name", rName), - resource.TestCheckResourceAttr(resourceName, "name_prefix", ""), + resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), + resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), ), }, { @@ -2257,7 +2257,7 @@ resource "aws_batch_compute_environment" "test" { func testAccComputeEnvironmentConfig_upgradeV0ToV1Legacy(rName string) string { return acctest.ConfigCompose(testAccComputeEnvironmentConfig_base(rName), fmt.Sprintf(` resource "aws_batch_compute_environment" "test" { - name = %[1]q + compute_environment_name = %[1]q service_role = aws_iam_role.batch_service.arn type = "UNMANAGED" From 4419a3a806b59aa67be68faa609c7ea90a70365c Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 19 Aug 2025 20:55:45 -0400 Subject: [PATCH 0298/2115] Update .changelog/40148.txt Co-authored-by: Kit Ewbank --- .changelog/40148.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/40148.txt b/.changelog/40148.txt index 8e4a71eb276b..a0cfb4235c7d 100644 --- a/.changelog/40148.txt +++ b/.changelog/40148.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_batch_compute_environment: allow in-place updates of compute environments that have the SPOT_PRICE_CAPACITY_OPTIMIZED strategy +resource/aws_batch_compute_environment: Allow in-place updates of compute environments that have the `SPOT_PRICE_CAPACITY_OPTIMIZED` strategy ``` From b99c10db85d713e1e8f2278dfc45f955e36dc4e3 Mon Sep 17 00:00:00 2001 From: breathingdust <282361+breathingdust@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:06:02 +0000 Subject: [PATCH 0299/2115] docs: update resource counts --- website/docs/index.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 10371e006f17..e5058b3f0782 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -9,7 +9,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,514 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). From 7cb6fff0746a955e8d769010b4fb1f009f2b0056 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 19:32:58 +0900 Subject: [PATCH 0300/2115] Add description of target_tags requirement conditions --- website/docs/r/dlm_lifecycle_policy.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/dlm_lifecycle_policy.html.markdown b/website/docs/r/dlm_lifecycle_policy.html.markdown index 564e16f5c04d..305cfaa24082 100644 --- a/website/docs/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/r/dlm_lifecycle_policy.html.markdown @@ -236,7 +236,7 @@ This resource supports the following arguments: * `policy_type` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. -* `target_tags` (Optional) A map of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. +* `target_tags` (Optional) A map of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. Required when `policy_type` is `EBS_SNAPSHOT_MANAGEMENT` or `IMAGE_MANAGEMENT`. Must not be specified when `policy_type` is `EVENT_BASED_POLICY`. ~> Note: You cannot have overlapping lifecycle policies that share the same `target_tags`. Terraform is unable to detect this at plan time but it will fail during apply. From ef5efc14f655e58905922acd8c007c8270c7581a Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Tue, 5 Aug 2025 11:40:46 +0100 Subject: [PATCH 0301/2115] test(eks): refactored tests to use spn data resource Signed-off-by: Fred Myerscough --- internal/service/eks/access_entry_test.go | 10 +++++++--- .../eks/access_policy_association_test.go | 6 +++++- internal/service/eks/addon_test.go | 6 +++++- internal/service/eks/cluster_test.go | 20 +++++++++++++++---- internal/service/eks/fargate_profile_test.go | 12 +++++++++-- .../eks/identity_provider_config_test.go | 6 +++++- internal/service/eks/node_group_test.go | 18 ++++++++++++++--- 7 files changed, 63 insertions(+), 15 deletions(-) diff --git a/internal/service/eks/access_entry_test.go b/internal/service/eks/access_entry_test.go index d5f013dd368d..db192c6cb463 100644 --- a/internal/service/eks/access_entry_test.go +++ b/internal/service/eks/access_entry_test.go @@ -349,6 +349,10 @@ func testAccAccessEntryConfig_base(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "test" { name = %[1]q @@ -359,7 +363,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -472,7 +476,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -502,7 +506,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/access_policy_association_test.go b/internal/service/eks/access_policy_association_test.go index 265328b9d666..732986a8e261 100644 --- a/internal/service/eks/access_policy_association_test.go +++ b/internal/service/eks/access_policy_association_test.go @@ -172,6 +172,10 @@ func testAccAccessPolicyAssociationConfig_base(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "test" { name = %[1]q @@ -182,7 +186,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/addon_test.go b/internal/service/eks/addon_test.go index 3f9a34873afc..a32f838936b9 100644 --- a/internal/service/eks/addon_test.go +++ b/internal/service/eks/addon_test.go @@ -480,6 +480,10 @@ func testAccAddonConfig_base(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "test" { name = %[1]q @@ -490,7 +494,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index 8729b702cc7a..317084d67bed 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -1558,6 +1558,10 @@ func testAccClusterConfig_base(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "cluster" { name = %[1]q @@ -1568,7 +1572,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -1666,6 +1670,10 @@ func testAccClusterConfig_computeConfigBase(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "cluster" { name = %[1]q @@ -1676,7 +1684,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": "eks.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.eks.name}" }, "Action": [ "sts:AssumeRole", @@ -1713,6 +1721,10 @@ resource "aws_iam_role_policy_attachment" "cluster_AmazonEKSNetworkingPolicy" { role = aws_iam_role.cluster.name } +data "aws_service_principal" "ec2" { + service_name = "ec2" +} + resource "aws_iam_role" "node" { name = "%[1]s-node" @@ -1723,7 +1735,7 @@ resource "aws_iam_role" "node" { { "Effect": "Allow", "Principal": { - "Service": "ec2.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.ec2.name}" }, "Action": ["sts:AssumeRole"] } @@ -1752,7 +1764,7 @@ resource "aws_iam_role" "node2" { { "Effect": "Allow", "Principal": { - "Service": "ec2.${data.aws_partition.current.dns_suffix}" + "Service": "${data.aws_service_principal.ec2.name}" }, "Action": ["sts:AssumeRole"] } diff --git a/internal/service/eks/fargate_profile_test.go b/internal/service/eks/fargate_profile_test.go index 3f9eb41aead9..046b93b1e62b 100644 --- a/internal/service/eks/fargate_profile_test.go +++ b/internal/service/eks/fargate_profile_test.go @@ -273,6 +273,10 @@ data "aws_availability_zones" "available" { data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "cluster" { name = "%[1]s-cluster" @@ -281,7 +285,7 @@ resource "aws_iam_role" "cluster" { Action = "sts:AssumeRole" Effect = "Allow" Principal = { - Service = "eks.${data.aws_partition.current.dns_suffix}" + Service = data.aws_service_principal.eks.name } }] Version = "2012-10-17" @@ -293,6 +297,10 @@ resource "aws_iam_role_policy_attachment" "cluster-AmazonEKSClusterPolicy" { role = aws_iam_role.cluster.name } +data "aws_service_principal" "eks_fargate_pods" { + service_name = "eks-fargate-pods" +} + resource "aws_iam_role" "pod" { name = "%[1]s-pod" @@ -301,7 +309,7 @@ resource "aws_iam_role" "pod" { Action = "sts:AssumeRole" Effect = "Allow" Principal = { - Service = "eks-fargate-pods.${data.aws_partition.current.dns_suffix}" + Service = data.aws_service_principal.eks_fargate_pods.name } }] Version = "2012-10-17" diff --git a/internal/service/eks/identity_provider_config_test.go b/internal/service/eks/identity_provider_config_test.go index 2571c7368fb2..58fefa62a910 100644 --- a/internal/service/eks/identity_provider_config_test.go +++ b/internal/service/eks/identity_provider_config_test.go @@ -233,6 +233,10 @@ func testAccIdentityProviderBaseConfig(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + resource "aws_iam_role" "test" { name = %[1]q @@ -241,7 +245,7 @@ resource "aws_iam_role" "test" { Action = "sts:AssumeRole" Effect = "Allow" Principal = { - Service = "eks.${data.aws_partition.current.dns_suffix}" + Service = data.aws_service_principal.eks.name } }] Version = "2012-10-17" diff --git a/internal/service/eks/node_group_test.go b/internal/service/eks/node_group_test.go index 74cb82e2580d..e56ae5c2ed8c 100644 --- a/internal/service/eks/node_group_test.go +++ b/internal/service/eks/node_group_test.go @@ -1092,6 +1092,14 @@ func testAccNodeGroupConfig_iamAndVPCBase(rName string) string { return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(` data "aws_partition" "current" {} +data "aws_service_principal" "eks" { + service_name = "eks" +} + +data "aws_service_principal" "eks_nodegroup" { + service_name = "eks-nodegroup" +} + resource "aws_iam_role" "cluster" { name = "%[1]s-cluster" @@ -1101,8 +1109,8 @@ resource "aws_iam_role" "cluster" { Effect = "Allow" Principal = { Service = [ - "eks.${data.aws_partition.current.dns_suffix}", - "eks-nodegroup.${data.aws_partition.current.dns_suffix}", + data.aws_service_principal.eks.name, + data.aws_service_principal.eks_nodegroup.name, ] } }] @@ -1115,6 +1123,10 @@ resource "aws_iam_role_policy_attachment" "cluster-AmazonEKSClusterPolicy" { role = aws_iam_role.cluster.name } +data "aws_service_principal" "ec2" { + service_name = "ec2" +} + resource "aws_iam_role" "node" { name = "%[1]s-node" @@ -1123,7 +1135,7 @@ resource "aws_iam_role" "node" { Action = "sts:AssumeRole" Effect = "Allow" Principal = { - Service = "ec2.${data.aws_partition.current.dns_suffix}" + Service = data.aws_service_principal.ec2.name } }] Version = "2012-10-17" From ae0bb5074e15e56d8c03023f9d0eaa3d33adfc98 Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Tue, 5 Aug 2025 11:59:36 +0100 Subject: [PATCH 0302/2115] test(eks): removed unneeded string interpolation Signed-off-by: Fred Myerscough --- internal/service/eks/access_entry_test.go | 6 +++--- internal/service/eks/access_policy_association_test.go | 2 +- internal/service/eks/addon_test.go | 2 +- internal/service/eks/cluster_test.go | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/eks/access_entry_test.go b/internal/service/eks/access_entry_test.go index db192c6cb463..db521b5aa51d 100644 --- a/internal/service/eks/access_entry_test.go +++ b/internal/service/eks/access_entry_test.go @@ -363,7 +363,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } @@ -476,7 +476,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } @@ -506,7 +506,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/access_policy_association_test.go b/internal/service/eks/access_policy_association_test.go index 732986a8e261..37bbea400af7 100644 --- a/internal/service/eks/access_policy_association_test.go +++ b/internal/service/eks/access_policy_association_test.go @@ -186,7 +186,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/addon_test.go b/internal/service/eks/addon_test.go index a32f838936b9..2fad87d15903 100644 --- a/internal/service/eks/addon_test.go +++ b/internal/service/eks/addon_test.go @@ -494,7 +494,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index 317084d67bed..dc87216c4d5f 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -1572,7 +1572,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": "sts:AssumeRole" } @@ -1684,7 +1684,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.eks.name}" + "Service": data.aws_service_principal.eks.name }, "Action": [ "sts:AssumeRole", @@ -1735,7 +1735,7 @@ resource "aws_iam_role" "node" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.ec2.name}" + "Service": data.aws_service_principal.ec2.name }, "Action": ["sts:AssumeRole"] } @@ -1764,7 +1764,7 @@ resource "aws_iam_role" "node2" { { "Effect": "Allow", "Principal": { - "Service": "${data.aws_service_principal.ec2.name}" + "Service": data.aws_service_principal.ec2.name }, "Action": ["sts:AssumeRole"] } From a00cf968264ea4619f8b8331ae72b24fb76a08fe Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Thu, 7 Aug 2025 08:12:31 +0100 Subject: [PATCH 0303/2115] test(eks): fixed test latest version of eks 1.33 does not support the al2 run time. pin tests to use 1.32. added missing SGs that prevented the node group being created and the test passing Signed-off-by: Fred Myerscough --- internal/service/eks/node_group_test.go | 54 ++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/internal/service/eks/node_group_test.go b/internal/service/eks/node_group_test.go index e56ae5c2ed8c..16d5b5184cd0 100644 --- a/internal/service/eks/node_group_test.go +++ b/internal/service/eks/node_group_test.go @@ -1157,6 +1157,11 @@ resource "aws_iam_role_policy_attachment" "node-AmazonEC2ContainerRegistryReadOn role = aws_iam_role.node.name } +resource "aws_iam_role_policy_attachment" "node-AmazonEKSWorkerNodeMinimalPolicy" { + policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AmazonEKSWorkerNodeMinimalPolicy" + role = aws_iam_role.node.name +} + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" enable_dns_hostnames = true @@ -1240,9 +1245,11 @@ func testAccNodeGroupConfig_base(rName string) string { resource "aws_eks_cluster" "test" { name = %[1]q role_arn = aws_iam_role.cluster.arn + version = "1.32" vpc_config { - subnet_ids = aws_subnet.test[*].id + subnet_ids = aws_subnet.test[*].id + security_group_ids = [aws_security_group.test.id] } depends_on = [ @@ -1292,6 +1299,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1314,6 +1322,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `) @@ -1337,6 +1346,7 @@ resource "aws_eks_node_group" "test" { "aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy", "aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy", "aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly", + "aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy", ] } `, namePrefix)) @@ -1361,6 +1371,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, amiType)) @@ -1385,6 +1396,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, capacityType)) @@ -1409,6 +1421,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, diskSize)) @@ -1434,6 +1447,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1462,6 +1476,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, instanceTypes, rName)) @@ -1497,6 +1512,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1524,6 +1540,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, labelKey1, labelValue1)) @@ -1552,6 +1569,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, labelKey1, labelValue1, labelKey2, labelValue2)) @@ -1570,6 +1588,8 @@ resource "aws_launch_template" "test1" { instance_type = "t3.medium" name = "%[1]s-1" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_launch_template" "test2" { @@ -1577,6 +1597,8 @@ resource "aws_launch_template" "test2" { instance_type = "t3.medium" name = "%[1]s-2" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_eks_node_group" "test" { @@ -1600,6 +1622,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1618,6 +1641,8 @@ resource "aws_launch_template" "test1" { instance_type = "t3.medium" name = "%[1]s-1" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_launch_template" "test2" { @@ -1625,6 +1650,8 @@ resource "aws_launch_template" "test2" { instance_type = "t3.medium" name = "%[1]s-2" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_eks_node_group" "test" { @@ -1648,6 +1675,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1666,6 +1694,8 @@ resource "aws_launch_template" "test1" { instance_type = "t3.medium" name = "%[1]s-1" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_launch_template" "test2" { @@ -1673,6 +1703,8 @@ resource "aws_launch_template" "test2" { instance_type = "t3.medium" name = "%[1]s-2" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_eks_node_group" "test" { @@ -1696,6 +1728,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1714,6 +1747,8 @@ resource "aws_launch_template" "test1" { instance_type = "t3.medium" name = "%[1]s-1" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_launch_template" "test2" { @@ -1721,6 +1756,8 @@ resource "aws_launch_template" "test2" { instance_type = "t3.medium" name = "%[1]s-2" user_data = base64encode(templatefile("testdata/node-group-launch-template-user-data.sh.tmpl", { cluster_name = aws_eks_cluster.test.name })) + + vpc_security_group_ids = [aws_security_group.test.id] } resource "aws_eks_node_group" "test" { @@ -1744,6 +1781,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1786,6 +1824,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1828,6 +1867,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1857,6 +1897,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1889,6 +1930,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, publicKey)) @@ -1922,6 +1964,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, publicKey)) @@ -1945,6 +1988,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, desiredSize, maxSize, minSize)) @@ -1972,6 +2016,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, tagKey1, tagValue1)) @@ -2000,6 +2045,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, tagKey1, tagValue1, tagKey2, tagValue2)) @@ -2029,6 +2075,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, taintKey1, taintValue1, taintEffect1)) @@ -2064,6 +2111,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, taintKey1, taintValue1, taintEffect1, taintKey2, taintValue2, taintEffect2)) @@ -2091,6 +2139,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2118,6 +2167,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2145,6 +2195,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2169,6 +2220,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) From 13e21a925fd2e560f918bf65f1b9137c9e748f5b Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Thu, 7 Aug 2025 09:47:38 +0100 Subject: [PATCH 0304/2115] test(eks): these need the interpolation Signed-off-by: Fred Myerscough --- internal/service/eks/access_entry_test.go | 6 +++--- internal/service/eks/access_policy_association_test.go | 2 +- internal/service/eks/addon_test.go | 2 +- internal/service/eks/cluster_test.go | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/eks/access_entry_test.go b/internal/service/eks/access_entry_test.go index db521b5aa51d..db192c6cb463 100644 --- a/internal/service/eks/access_entry_test.go +++ b/internal/service/eks/access_entry_test.go @@ -363,7 +363,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -476,7 +476,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -506,7 +506,7 @@ resource "aws_iam_role" "test2" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/access_policy_association_test.go b/internal/service/eks/access_policy_association_test.go index 37bbea400af7..732986a8e261 100644 --- a/internal/service/eks/access_policy_association_test.go +++ b/internal/service/eks/access_policy_association_test.go @@ -186,7 +186,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/addon_test.go b/internal/service/eks/addon_test.go index 2fad87d15903..a32f838936b9 100644 --- a/internal/service/eks/addon_test.go +++ b/internal/service/eks/addon_test.go @@ -494,7 +494,7 @@ resource "aws_iam_role" "test" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index dc87216c4d5f..317084d67bed 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -1572,7 +1572,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": "sts:AssumeRole" } @@ -1684,7 +1684,7 @@ resource "aws_iam_role" "cluster" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.eks.name + "Service": "${data.aws_service_principal.eks.name}" }, "Action": [ "sts:AssumeRole", @@ -1735,7 +1735,7 @@ resource "aws_iam_role" "node" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.ec2.name + "Service": "${data.aws_service_principal.ec2.name}" }, "Action": ["sts:AssumeRole"] } @@ -1764,7 +1764,7 @@ resource "aws_iam_role" "node2" { { "Effect": "Allow", "Principal": { - "Service": data.aws_service_principal.ec2.name + "Service": "${data.aws_service_principal.ec2.name}" }, "Action": ["sts:AssumeRole"] } From 7e6734d04a64622a73454f2498136119011002b7 Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Wed, 20 Aug 2025 12:18:57 +0100 Subject: [PATCH 0305/2115] wip on test fixes --- internal/service/eks/cluster_test.go | 18 ++++++++++++------ internal/service/eks/node_group_test.go | 8 ++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index 317084d67bed..342ad3c8d262 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -29,11 +29,17 @@ import ( ) const ( - clusterVersionUpgradeInitial = "1.27" - clusterVersionUpgradeUpdated = "1.28" + clusterVersion130 = "1.30" + clusterVersion131 = "1.31" + clusterVersion132 = "1.32" - clusterVersionUpgradeForceInitial = "1.30" - clusterVersionUpgradeForceUpdated = "1.31" + clusterDefaultVersion = clusterVersion132 + + clusterVersionUpgradeInitial = clusterVersion130 + clusterVersionUpgradeUpdated = clusterVersion131 + + clusterVersionUpgradeForceInitial = clusterVersion130 + clusterVersionUpgradeForceUpdated = clusterVersion132 ) func TestAccEKSCluster_basic(t *testing.T) { @@ -275,13 +281,13 @@ func TestAccEKSCluster_BootstrapSelfManagedAddons_migrate(t *testing.T) { ExternalProviders: map[string]resource.ExternalProvider{ "aws": { Source: "hashicorp/aws", - VersionConstraint: "5.56.1", + VersionConstraint: "6.9.0", }, }, Config: testAccClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster1), - resource.TestCheckNoResourceAttr(resourceName, "bootstrap_self_managed_addons"), + resource.TestCheckResourceAttr(resourceName, "bootstrap_self_managed_addons", acctest.CtTrue), ), }, { diff --git a/internal/service/eks/node_group_test.go b/internal/service/eks/node_group_test.go index 16d5b5184cd0..9a3dcf5fcc05 100644 --- a/internal/service/eks/node_group_test.go +++ b/internal/service/eks/node_group_test.go @@ -549,7 +549,7 @@ func TestAccEKSNodeGroup_releaseVersion(t *testing.T) { CheckDestroy: testAccCheckNodeGroupDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccNodeGroupConfig_releaseVersion(rName, "1.27"), + Config: testAccNodeGroupConfig_releaseVersion(rName, clusterVersion130), Check: resource.ComposeTestCheckFunc( testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup1), resource.TestCheckResourceAttrPair(resourceName, "release_version", ssmParameterDataSourceName, names.AttrValue), @@ -561,7 +561,7 @@ func TestAccEKSNodeGroup_releaseVersion(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccNodeGroupConfig_releaseVersion(rName, "1.28"), + Config: testAccNodeGroupConfig_releaseVersion(rName, clusterVersion131), Check: resource.ComposeTestCheckFunc( testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup2), testAccCheckNodeGroupNotRecreated(&nodeGroup1, &nodeGroup2), @@ -1245,7 +1245,7 @@ func testAccNodeGroupConfig_base(rName string) string { resource "aws_eks_cluster" "test" { name = %[1]q role_arn = aws_iam_role.cluster.arn - version = "1.32" + version = %[2]q vpc_config { subnet_ids = aws_subnet.test[*].id @@ -1257,7 +1257,7 @@ resource "aws_eks_cluster" "test" { aws_main_route_table_association.test, ] } -`, rName)) +`, rName, clusterDefaultVersion)) } func testAccNodeGroupConfig_versionBase(rName string, version string) string { From bfd1a84caa0e317a4abfea5831127a76f08adaa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 09:12:28 -0400 Subject: [PATCH 0306/2115] build(deps): bump the aws-sdk-go-v2 group across 1 directory with 3 updates (#43961) * build(deps): bump the aws-sdk-go-v2 group across 1 directory with 3 updates Bumps the aws-sdk-go-v2 group with 3 updates in the / directory: [github.com/aws/aws-sdk-go-v2/service/cleanrooms](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/polly](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/cleanrooms` from 1.29.0 to 1.30.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.29.0...v1.30.0) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.244.0 to 1.245.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.244.0...service/ec2/v1.245.0) Updates `github.com/aws/aws-sdk-go-v2/service/polly` from 1.51.0 to 1.52.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.51.0...service/s3/v1.52.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.245.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/polly dependency-version: 1.52.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * Run 'make clean-tidy'. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kit Ewbank --- go.mod | 6 +++--- go.sum | 12 ++++++------ tools/tfsdk2fw/go.mod | 6 +++--- tools/tfsdk2fw/go.sum | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index e6dbf1ff7979..096615eaee66 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 @@ -196,7 +196,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 - github.com/aws/aws-sdk-go-v2/service/polly v1.51.0 + github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 diff --git a/go.sum b/go.sum index 81eac95a88ae..e06c72223c91 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0 h1:wpkgV+tKLNoHsRlaIWv5gswz4hZY1TbwIIuQX/atPmw= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= @@ -217,8 +217,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0 h1:KfETrpt7yv2nkSrjOltgmKyAl8scbzYc4TFtZeoV6uc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= @@ -413,8 +413,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NY github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.51.0 h1:/ArRJKD83NVXj+9OAfZEahwvHkSSqPfTYx0ThC/XsAI= -github.com/aws/aws-sdk-go-v2/service/polly v1.51.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index d178e060267f..8ce235f305ed 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 // indirect @@ -115,7 +115,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 // indirect @@ -213,7 +213,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.51.0 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index cd90023f4b6e..5636c32a5a90 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0 h1:wpkgV+tKLNoHsRlaIWv5gswz4hZY1TbwIIuQX/atPmw= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.29.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= @@ -217,8 +217,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0 h1:KfETrpt7yv2nkSrjOltgmKyAl8scbzYc4TFtZeoV6uc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= @@ -413,8 +413,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NY github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.51.0 h1:/ArRJKD83NVXj+9OAfZEahwvHkSSqPfTYx0ThC/XsAI= -github.com/aws/aws-sdk-go-v2/service/polly v1.51.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= From 8512766fca9f8560adac83b581626fa371ded800 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:03:58 +0900 Subject: [PATCH 0307/2115] Implement metered_account argument for the resource --- internal/service/ec2/vpc_ipam.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/internal/service/ec2/vpc_ipam.go b/internal/service/ec2/vpc_ipam.go index ed4aeeffb045..5bed7b3e516e 100644 --- a/internal/service/ec2/vpc_ipam.go +++ b/internal/service/ec2/vpc_ipam.go @@ -72,6 +72,12 @@ func resourceIPAM() *schema.Resource { Optional: true, Default: false, }, + "metered_account": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.IpamMeteredAccount](), + }, "operating_regions": { Type: schema.TypeSet, Required: true, @@ -145,6 +151,10 @@ func resourceIPAMCreate(ctx context.Context, d *schema.ResourceData, meta any) d input.EnablePrivateGua = aws.Bool(v.(bool)) } + if v, ok := d.GetOk("metered_account"); ok { + input.MeteredAccount = awstypes.IpamMeteredAccount(v.(string)) + } + if v, ok := d.GetOk("tier"); ok { input.Tier = awstypes.IpamTier(v.(string)) } @@ -185,6 +195,7 @@ func resourceIPAMRead(ctx context.Context, d *schema.ResourceData, meta any) dia d.Set("default_resource_discovery_id", ipam.DefaultResourceDiscoveryId) d.Set(names.AttrDescription, ipam.Description) d.Set("enable_private_gua", ipam.EnablePrivateGua) + d.Set("metered_account", ipam.MeteredAccount) if err := d.Set("operating_regions", flattenIPAMOperatingRegions(ipam.OperatingRegions)); err != nil { return sdkdiag.AppendErrorf(diags, "setting operating_regions: %s", err) } @@ -215,6 +226,10 @@ func resourceIPAMUpdate(ctx context.Context, d *schema.ResourceData, meta any) d input.EnablePrivateGua = aws.Bool(d.Get("enable_private_gua").(bool)) } + if d.HasChange("metered_account") { + input.MeteredAccount = awstypes.IpamMeteredAccount(d.Get("metered_account").(string)) + } + if d.HasChange("operating_regions") { o, n := d.GetChange("operating_regions") if o == nil { From d62bfa406875c9b7e9452faa338f77772ba94a46 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:04:31 +0900 Subject: [PATCH 0308/2115] Add metered_account attribute for the data source --- internal/service/ec2/vpc_ipam_data_source.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/ec2/vpc_ipam_data_source.go b/internal/service/ec2/vpc_ipam_data_source.go index 0258379609df..c1f55147a41f 100644 --- a/internal/service/ec2/vpc_ipam_data_source.go +++ b/internal/service/ec2/vpc_ipam_data_source.go @@ -45,6 +45,9 @@ func (d *ipamDataSource) Schema(ctx context.Context, request datasource.SchemaRe "enable_private_gua": schema.BoolAttribute{ Computed: true, }, + "metered_account": schema.StringAttribute{ + Computed: true, + }, names.AttrID: schema.StringAttribute{ Required: true, }, @@ -124,6 +127,7 @@ type ipamModel struct { IpamARN types.String `tfsdk:"arn"` IpamID types.String `tfsdk:"id"` IpamRegion types.String `tfsdk:"ipam_region"` + MeteredAccount types.String `tfsdk:"metered_account"` OperatingRegions fwtypes.ListNestedObjectValueOf[ipamOperatingRegionModel] `tfsdk:"operating_regions"` OwnerID types.String `tfsdk:"owner_id"` PrivateDefaultScopeID types.String `tfsdk:"private_default_scope_id"` From ef165d5df57180f3eccda6170314290bb01744ee Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:05:55 +0900 Subject: [PATCH 0309/2115] Add an acctest for the resource --- internal/service/ec2/vpc_ipam_test.go | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/internal/service/ec2/vpc_ipam_test.go b/internal/service/ec2/vpc_ipam_test.go index e78c454693c1..6c639fd5464b 100644 --- a/internal/service/ec2/vpc_ipam_test.go +++ b/internal/service/ec2/vpc_ipam_test.go @@ -14,6 +14,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -40,6 +41,7 @@ func TestAccIPAM_basic(t *testing.T) { // nosemgrep:ci.vpc-in-test-name acctest.CheckResourceAttrGlobalARNFormat(ctx, resourceName, names.AttrARN, "ec2", "ipam/{id}"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "enable_private_gua", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "metered_account", string(awstypes.IpamMeteredAccountIpamOwner)), resource.TestCheckResourceAttr(resourceName, "operating_regions.#", "1"), resource.TestCheckResourceAttr(resourceName, "scope_count", "2"), resource.TestMatchResourceAttr(resourceName, "private_default_scope_id", regexache.MustCompile(`^ipam-scope-[0-9a-f]+`)), @@ -297,6 +299,45 @@ func TestAccIPAM_enablePrivateGUA(t *testing.T) { // nosemgrep:ci.vpc-in-test-na }) } +func TestAccIPAM_meteredAccount(t *testing.T) { // nosemgrep:ci.vpc-in-test-name + ctx := acctest.Context(t) + var ipam awstypes.Ipam + resourceName := "aws_vpc_ipam.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckIPAMDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccIPAMConfig_meteredAccount(string(awstypes.IpamMeteredAccountIpamOwner)), + Check: resource.ComposeTestCheckFunc( + testAccCheckIPAMExists(ctx, resourceName, &ipam), + resource.TestCheckResourceAttr(resourceName, "metered_account", string(awstypes.IpamMeteredAccountIpamOwner)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccIPAMConfig_meteredAccount(string(awstypes.IpamMeteredAccountResourceOwner)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + Check: resource.ComposeTestCheckFunc( + testAccCheckIPAMExists(ctx, resourceName, &ipam), + resource.TestCheckResourceAttr(resourceName, "metered_account", string(awstypes.IpamMeteredAccountResourceOwner)), + ), + }, + }, + }) +} + func testAccCheckIPAMExists(ctx context.Context, n string, v *awstypes.Ipam) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -472,3 +513,16 @@ resource "aws_vpc_ipam" "test" { } `, enablePrivateGUA) } + +func testAccIPAMConfig_meteredAccount(meteredAccount string) string { + return fmt.Sprintf(` +data "aws_region" "current" {} + +resource "aws_vpc_ipam" "test" { + operating_regions { + region_name = data.aws_region.current.region + } + metered_account = %[1]q +} +`, meteredAccount) +} From 2abfa564ca4c05983e9c69ae8ad8ba7849ac6ca9 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:06:32 +0900 Subject: [PATCH 0310/2115] Add an acctest for the data source --- internal/service/ec2/vpc_ipam_data_source_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/ec2/vpc_ipam_data_source_test.go b/internal/service/ec2/vpc_ipam_data_source_test.go index 107a231a24ed..c57e432af636 100644 --- a/internal/service/ec2/vpc_ipam_data_source_test.go +++ b/internal/service/ec2/vpc_ipam_data_source_test.go @@ -33,6 +33,7 @@ func TestAccIPAMDataSource_basic(t *testing.T) { // nosemgrep:ci.vpc-in-test-nam resource.TestCheckResourceAttrPair(dataSourceName, "default_resource_discovery_id", resourceName, "default_resource_discovery_id"), resource.TestCheckResourceAttrPair(dataSourceName, "default_resource_discovery_association_id", resourceName, "default_resource_discovery_association_id"), resource.TestCheckResourceAttrPair(dataSourceName, "enable_private_gua", resourceName, "enable_private_gua"), + resource.TestCheckResourceAttrPair(dataSourceName, "metered_account", resourceName, "metered_account"), resource.TestCheckResourceAttrPair(dataSourceName, "operating_regions.0.region_name", resourceName, "operating_regions.0.region_name"), resource.TestCheckResourceAttrPair(dataSourceName, "private_default_scope_id", resourceName, "private_default_scope_id"), resource.TestCheckResourceAttrPair(dataSourceName, "public_default_scope_id", resourceName, "public_default_scope_id"), From f43e82ff26e2594f3d59fa1465ef47a62da8136e Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:06:55 +0900 Subject: [PATCH 0311/2115] Update the documentation to add description of metered_account --- website/docs/d/vpc_ipam.html.markdown | 1 + website/docs/r/vpc_ipam.html.markdown | 1 + 2 files changed, 2 insertions(+) diff --git a/website/docs/d/vpc_ipam.html.markdown b/website/docs/d/vpc_ipam.html.markdown index 028d4f3e91c7..157e1bbf37a5 100644 --- a/website/docs/d/vpc_ipam.html.markdown +++ b/website/docs/d/vpc_ipam.html.markdown @@ -38,6 +38,7 @@ This data source exports the following attributes in addition to the arguments a * `enable_private_gua` - If private GUA is enabled. * `id` - ID of the IPAM resource. * `ipam_region` - Region that the IPAM exists in. +* `metered_account` - AWS account that is charged for active IP addresses managed in IPAM. * `operating_regions` - Regions that the IPAM is configured to operate in. * `owner_id` - ID of the account that owns this IPAM. * `private_default_scope_id` - ID of the default private scope. diff --git a/website/docs/r/vpc_ipam.html.markdown b/website/docs/r/vpc_ipam.html.markdown index 72f754d6ff10..b0cd4ea9a675 100644 --- a/website/docs/r/vpc_ipam.html.markdown +++ b/website/docs/r/vpc_ipam.html.markdown @@ -63,6 +63,7 @@ This resource supports the following arguments: * `cascade` - (Optional) Enables you to quickly delete an IPAM, private scopes, pools in private scopes, and any allocations in the pools in private scopes. * `description` - (Optional) A description for the IPAM. * `enable_private_gua` - (Optional) Enable this option to use your own GUA ranges as private IPv6 addresses. Default: `false`. +* `metered_account` - (Optional) AWS account that is charged for active IP addresses managed in IPAM. Valid values are `ipam-owner` (default) and `resource-owner`. * `operating_regions` - (Required) Determines which locales can be chosen when you create pools. Locale is the Region where you want to make an IPAM pool available for allocations. You can only create pools with locales that match the operating Regions of the IPAM. You can only create VPCs from a pool whose locale matches the VPC's Region. You specify a region using the [region_name](#operating_regions) parameter. You **must** set your provider block region as an operating_region. * `tier` - (Optional) specifies the IPAM tier. Valid options include `free` and `advanced`. Default is `advanced`. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From f02d26bbdb4368147b3714602f015c627adb0bd1 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 20 Aug 2025 23:16:25 +0900 Subject: [PATCH 0312/2115] add changelog --- .changelog/43967.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/43967.txt diff --git a/.changelog/43967.txt b/.changelog/43967.txt new file mode 100644 index 000000000000..478490d20dd5 --- /dev/null +++ b/.changelog/43967.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_vpc_ipam: Add `metered_account` argument +``` + +```release-note:enhancement +data-source/aws_vpc_ipam: Add `metered_account` attribute +``` From 133aa50a6a8e4a08b06c506874d583e993288f33 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 10:51:51 -0400 Subject: [PATCH 0313/2115] Add parameterized resource identity to `aws_lambda_permission` (#43954) ```console % make testacc PKG=lambda TESTS=TestAccLambdaPermission_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/lambda/... -v -count 1 -parallel 20 -run='TestAccLambdaPermission_' -timeout 360m -vet=off 2025/08/19 14:35:55 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/19 14:35:55 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccLambdaPermission_principalOrgID (34.09s) --- PASS: TestAccLambdaPermission_basic (39.42s) --- PASS: TestAccLambdaPermission_statementIDPrefix (46.05s) --- PASS: TestAccLambdaPermission_qualifier (52.68s) --- PASS: TestAccLambdaPermission_iamRole (58.52s) --- PASS: TestAccLambdaPermission_Identity_ExistingResource (59.39s) --- PASS: TestAccLambdaPermission_disappears (62.45s) --- PASS: TestAccLambdaPermission_sns (71.38s) --- PASS: TestAccLambdaPermission_Identity_RegionOverride (82.67s) --- PASS: TestAccLambdaPermission_FunctionURLs_none (89.73s) --- PASS: TestAccLambdaPermission_s3 (96.02s) --- PASS: TestAccLambdaPermission_FunctionURLs_iam (114.20s) --- PASS: TestAccLambdaPermission_multiplePerms (115.36s) --- PASS: TestAccLambdaPermission_Identity_Basic (116.70s) --- PASS: TestAccLambdaPermission_rawFunctionName (120.12s) --- PASS: TestAccLambdaPermission_statementIDDuplicate (394.24s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/lambda 400.591s ``` --- .changelog/43954.txt | 3 + internal/service/lambda/permission.go | 78 +++-- .../lambda/permission_identity_gen_test.go | 270 ++++++++++++++++++ .../service/lambda/service_package_gen.go | 9 + .../testdata/Permission/basic/main_gen.tf | 44 +++ .../Permission/basic_v6.9.0/main_gen.tf | 54 ++++ .../Permission/region_override/main_gen.tf | 54 ++++ .../testdata/tmpl/permission_basic.gtpl | 37 +++ 8 files changed, 509 insertions(+), 40 deletions(-) create mode 100644 .changelog/43954.txt create mode 100644 internal/service/lambda/permission_identity_gen_test.go create mode 100644 internal/service/lambda/testdata/Permission/basic/main_gen.tf create mode 100644 internal/service/lambda/testdata/Permission/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/lambda/testdata/Permission/region_override/main_gen.tf create mode 100644 internal/service/lambda/testdata/tmpl/permission_basic.gtpl diff --git a/.changelog/43954.txt b/.changelog/43954.txt new file mode 100644 index 000000000000..92cc8cb60a04 --- /dev/null +++ b/.changelog/43954.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_lambda_permission: Add resource identity support +``` diff --git a/internal/service/lambda/permission.go b/internal/service/lambda/permission.go index 1c84eb157147..40729cfdd651 100644 --- a/internal/service/lambda/permission.go +++ b/internal/service/lambda/permission.go @@ -23,6 +23,7 @@ import ( "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" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -30,16 +31,19 @@ import ( var functionRegexp = `^(arn:[\w-]+:lambda:)?([a-z]{2}-(?:[a-z]+-){1,2}\d{1}:)?(\d{12}:)?(function:)?([0-9A-Za-z_-]+)(:(\$LATEST|[0-9A-Za-z_-]+))?$` // @SDKResource("aws_lambda_permission", name="Permission") +// @IdentityAttribute("function_name") +// @IdentityAttribute("statement_id") +// @IdentityAttribute("qualifier", optional="true") +// @ImportIDHandler("permissionImportID") +// @Testing(preIdentityVersion="6.9.0") +// @Testing(existsType="github.com/hashicorp/terraform-provider-aws/internal/service/lambda;tflambda;tflambda.PolicyStatement") +// @Testing(importStateIdFunc="testAccPermissionImportStateIDFunc") func resourcePermission() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourcePermissionCreate, ReadWithoutTimeout: resourcePermissionRead, DeleteWithoutTimeout: resourcePermissionDelete, - Importer: &schema.ResourceImporter{ - StateContext: resourcePermissionImport, - }, - Schema: map[string]*schema.Schema{ names.AttrAction: { Type: schema.TypeString, @@ -279,42 +283,6 @@ func resourcePermissionDelete(ctx context.Context, d *schema.ResourceData, meta return diags } -func resourcePermissionImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - idParts := strings.Split(d.Id(), "/") - if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("Unexpected format of ID (%q), expected FUNCTION_NAME/STATEMENT_ID or FUNCTION_NAME:QUALIFIER/STATEMENT_ID", d.Id()) - } - - functionName := idParts[0] - statementID := idParts[1] - input := lambda.GetFunctionInput{ - FunctionName: aws.String(functionName), - } - - var qualifier string - if fnParts := strings.Split(functionName, ":"); len(fnParts) == 2 { - qualifier = fnParts[1] - input.Qualifier = aws.String(qualifier) - } - - conn := meta.(*conns.AWSClient).LambdaClient(ctx) - - output, err := findFunction(ctx, conn, &input) - - if err != nil { - return nil, err - } - - d.SetId(statementID) - d.Set("function_name", output.Configuration.FunctionName) - if qualifier != "" { - d.Set("qualifier", qualifier) - } - d.Set("statement_id", statementID) - - return []*schema.ResourceData{d}, nil -} - func findPolicy(ctx context.Context, conn *lambda.Client, input *lambda.GetPolicyInput) (*lambda.GetPolicyOutput, error) { output, err := conn.GetPolicy(ctx, input) @@ -401,3 +369,33 @@ type policyStatement struct { Principal any Sid string } + +var _ inttypes.SDKv2ImportID = permissionImportID{} + +type permissionImportID struct{} + +func (permissionImportID) Create(d *schema.ResourceData) string { + // For backward compatibility, the id attribute is set to the statement ID + return d.Get("statement_id").(string) +} + +func (permissionImportID) Parse(id string) (string, map[string]string, error) { + parts := strings.Split(id, "/") + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return id, nil, fmt.Errorf("Unexpected format of ID (%q), expected FUNCTION_NAME/STATEMENT_ID or FUNCTION_NAME:QUALIFIER/STATEMENT_ID", id) + } + + functionName := parts[0] + statementID := parts[1] + results := map[string]string{ + "function_name": functionName, + "statement_id": statementID, + } + + if fnParts := strings.Split(functionName, ":"); len(fnParts) == 2 { + results["qualifier"] = fnParts[1] + } + + // For backward compatibility, the id attribute is set to the statement ID + return statementID, results, nil +} diff --git a/internal/service/lambda/permission_identity_gen_test.go b/internal/service/lambda/permission_identity_gen_test.go new file mode 100644 index 000000000000..5c1db5d98c70 --- /dev/null +++ b/internal/service/lambda/permission_identity_gen_test.go @@ -0,0 +1,270 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package lambda_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + tflambda "github.com/hashicorp/terraform-provider-aws/internal/service/lambda" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccLambdaPermission_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v tflambda.PolicyStatement + resourceName := "aws_lambda_permission.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.LambdaServiceID), + CheckDestroy: testAccCheckPermissionDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPermissionExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "function_name": knownvalue.NotNull(), + "statement_id": knownvalue.NotNull(), + "qualifier": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("function_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("statement_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccPermissionImportStateIDFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccPermissionImportStateIDFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("function_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("statement_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("qualifier"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("function_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("statement_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("qualifier"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccLambdaPermission_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_lambda_permission.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.LambdaServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "function_name": knownvalue.NotNull(), + "statement_id": knownvalue.NotNull(), + "qualifier": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("function_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("statement_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccPermissionImportStateIDFunc), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccPermissionImportStateIDFunc), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("function_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("statement_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("qualifier"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("function_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("statement_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("qualifier"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccLambdaPermission_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v tflambda.PolicyStatement + resourceName := "aws_lambda_permission.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.LambdaServiceID), + CheckDestroy: testAccCheckPermissionDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPermissionExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Permission/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "function_name": knownvalue.NotNull(), + "statement_id": knownvalue.NotNull(), + "qualifier": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("function_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("statement_id")), + }, + }, + }, + }) +} diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index 3cdbabc99170..2b58c7182ad7 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -172,6 +172,15 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_lambda_permission", Name: "Permission", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("function_name", true), + inttypes.StringIdentityAttribute("statement_id", true), + inttypes.StringIdentityAttribute("qualifier", false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: permissionImportID{}, + }, }, { Factory: resourceProvisionedConcurrencyConfig, diff --git a/internal/service/lambda/testdata/Permission/basic/main_gen.tf b/internal/service/lambda/testdata/Permission/basic/main_gen.tf new file mode 100644 index 000000000000..fb20aecf8e36 --- /dev/null +++ b/internal/service/lambda/testdata/Permission/basic/main_gen.tf @@ -0,0 +1,44 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_lambda_permission" "test" { + statement_id = "AllowExecutionFromCloudWatch" + action = "lambda:InvokeFunction" + function_name = aws_lambda_function.test.function_name + principal = "events.amazonaws.com" + event_source_token = "test-event-source-token" +} + +resource "aws_lambda_function" "test" { + filename = "test-fixtures/lambdatest.zip" + function_name = var.rName + role = aws_iam_role.test.arn + handler = "exports.example" + runtime = "nodejs20.x" +} + +resource "aws_iam_role" "test" { + name = var.rName + + assume_role_policy = < Date: Wed, 20 Aug 2025 15:56:24 +0100 Subject: [PATCH 0314/2115] fix few more linting issues. --- internal/service/odb/cloud_exadata_infrastructure_test.go | 1 - website/docs/d/odb_cloud_exadata_infrastructure.html.markdown | 1 + website/docs/r/odb_cloud_exadata_infrastructure.html.markdown | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index b3a62f2d2f15..6805ab9bb3c8 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -353,7 +353,6 @@ func (cloudExaDataInfraResourceTest) testAccPreCheck(ctx context.Context, t *tes } func (cloudExaDataInfraResourceTest) exaDataInfraResourceWithAllConfig(randomId, emailAddress1, emailAddress2 string) string { - exaDataInfra := fmt.Sprintf(` diff --git a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown index c02e5f86c7bf..37d9c94d7e22 100644 --- a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown @@ -69,3 +69,4 @@ This data source exports the following attributes in addition to the arguments a * `database_server_type` - The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `storage_server_type` - The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `maintenance_window` - The scheduling details of the maintenance window. Patching and system updates take place during the maintenance window. +* `region` - Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). diff --git a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown index f212ea71dc95..7907294dbc54 100644 --- a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown @@ -74,6 +74,7 @@ The following arguments are optional: * `database_server_type` - (Optional) The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `storage_server_type` - (Optional) The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `tags` - (Optional) A map of tags to assign to the exadata infrastructure. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `region` -(Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### maintenance_window From a1db03faa478419a83981e3fdb3e2588d8c9eecc Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 20 Aug 2025 14:56:41 +0000 Subject: [PATCH 0315/2115] Update CHANGELOG.md for #43954 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b21cede9f9f..8788e4b849ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ENHANCEMENTS: * data-source/aws_ecr_repository: Add `image_tag_mutability_exclusion_filter` attribute ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) * data-source/aws_ecr_repository_creation_template: Add `image_tag_mutability_exclusion_filter` attribute ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) * resource/aws_ecr_repository_creation_template: Add `image_tag_mutability_exclusion_filter` configuration block ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) +* resource/aws_lambda_permission: Add resource identity support ([#43954](https://github.com/hashicorp/terraform-provider-aws/issues/43954)) * resource/aws_lightsail_static_ip_attachment: Support resource import ([#43874](https://github.com/hashicorp/terraform-provider-aws/issues/43874)) * resource/aws_secretsmanager_secret: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_policy: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) @@ -16,8 +17,10 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_batch_compute_environment: Allow in-place updates of compute environments that have the `SPOT_PRICE_CAPACITY_OPTIMIZED` strategy ([#40148](https://github.com/hashicorp/terraform-provider-aws/issues/40148)) * resource/aws_rds_cluster: Fixes the behavior when enabling database_insights_mode="advanced" without changing performance insights retention window ([#43919](https://github.com/hashicorp/terraform-provider-aws/issues/43919)) * resource/aws_rds_cluster: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key ([#43942](https://github.com/hashicorp/terraform-provider-aws/issues/43942)) +* resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error when `policy_detail.exclusion_rules.amis.is_public` is omitted ([#43925](https://github.com/hashicorp/terraform-provider-aws/issues/43925)) ## 6.9.0 (August 14, 2025) From aa0314db0c53f17558784eafbe4e75beadf1c2f5 Mon Sep 17 00:00:00 2001 From: Justin Spencer Date: Wed, 20 Aug 2025 11:14:10 -0400 Subject: [PATCH 0316/2115] Typo correction Fixing minor typo: "subnet" should be "subnet_id" within "subnet_configuration" --- website/docs/r/vpc_endpoint.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/vpc_endpoint.html.markdown b/website/docs/r/vpc_endpoint.html.markdown index 6fc7df75c681..e1170df389fa 100644 --- a/website/docs/r/vpc_endpoint.html.markdown +++ b/website/docs/r/vpc_endpoint.html.markdown @@ -186,7 +186,7 @@ If no security groups are specified, the VPC's [default security group](https:// * `ipv4` - (Optional) The IPv4 address to assign to the endpoint network interface in the subnet. You must provide an IPv4 address if the VPC endpoint supports IPv4. * `ipv6` - (Optional) The IPv6 address to assign to the endpoint network interface in the subnet. You must provide an IPv6 address if the VPC endpoint supports IPv6. -* `subnet` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnet_ids` argument. +* `subnet_id` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnet_ids` argument. ## Timeouts From 895a2e8d0433b3d186599a5c49f8af0baeb62934 Mon Sep 17 00:00:00 2001 From: Asim Kumar Biswal Date: Wed, 20 Aug 2025 17:38:06 +0100 Subject: [PATCH 0317/2115] Update website/docs/r/odb_cloud_exadata_infrastructure.html.markdown fix linting issue in doc. Co-authored-by: Adrian Johnson --- website/docs/r/odb_cloud_exadata_infrastructure.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown index 7907294dbc54..4d1364eebe77 100644 --- a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown @@ -74,7 +74,7 @@ The following arguments are optional: * `database_server_type` - (Optional) The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `storage_server_type` - (Optional) The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `tags` - (Optional) A map of tags to assign to the exadata infrastructure. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -* `region` -(Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### maintenance_window From 1f1019fe753dc5c4c8da4b2a5b189a7804682531 Mon Sep 17 00:00:00 2001 From: Asim Kumar Biswal Date: Wed, 20 Aug 2025 17:38:42 +0100 Subject: [PATCH 0318/2115] Update website/docs/d/odb_cloud_exadata_infrastructure.html.markdown fix linting issue in the doc. Co-authored-by: Adrian Johnson --- website/docs/d/odb_cloud_exadata_infrastructure.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown index 37d9c94d7e22..7eebf63f1ebb 100644 --- a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown @@ -69,4 +69,4 @@ This data source exports the following attributes in addition to the arguments a * `database_server_type` - The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `storage_server_type` - The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `maintenance_window` - The scheduling details of the maintenance window. Patching and system updates take place during the maintenance window. -* `region` - Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). From c658ca18d2d111bfb8629652efb093a50d1ad49b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 13:04:53 -0400 Subject: [PATCH 0319/2115] build(deps): bump github.com/hashicorp/go-getter in /.ci/tools (#43968) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.8 to 1.7.9. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](https://github.com/hashicorp/go-getter/compare/v1.7.8...v1.7.9) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-version: 1.7.9 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From 79b40d3f1e2820e9a3d59ecd8064e640f6fa2673 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 20 Aug 2025 11:18:24 -0700 Subject: [PATCH 0320/2115] Updates CHANGELOG to include `aws_spot_instance_request` --- .changelog/43953.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.changelog/43953.txt b/.changelog/43953.txt index 62276d483bab..b96a67595c45 100644 --- a/.changelog/43953.txt +++ b/.changelog/43953.txt @@ -2,6 +2,14 @@ resource/aws_instance: Adds `primary_network_interface` to allow importing resources with custom primary network interface. ``` +```release-note:bug +resource/aws_spot_instance_request: Adds `primary_network_interface` to allow importing resources with custom primary network interface. +``` + ```release-note:note resource/aws_instance: The `network_interface` block has been deprecated. Use `primary_network_interface` for the primary network interface and `aws_network_interface_attachment` resources for other network interfaces. ``` + +```release-note:note +resource/aws_spot_instance_request: The `network_interface` block has been deprecated. Use `primary_network_interface` for the primary network interface and `aws_network_interface_attachment` resources for other network interfaces. +``` From e7f90c57e157f93e370b0a5ff438dc364e58dddd Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 20 Aug 2025 11:19:01 -0700 Subject: [PATCH 0321/2115] Documentation tweaks --- website/docs/r/spot_instance_request.html.markdown | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/website/docs/r/spot_instance_request.html.markdown b/website/docs/r/spot_instance_request.html.markdown index 7a806200654b..5d1ba5c41118 100644 --- a/website/docs/r/spot_instance_request.html.markdown +++ b/website/docs/r/spot_instance_request.html.markdown @@ -25,8 +25,8 @@ price availability or by a user. ~> **NOTE:** Because their behavior depends on the live status of the spot market, Spot Instance Requests have a unique lifecycle that makes them behave -differently than other Terraform resources. Most importantly: there is __no -guarantee__ that a Spot Instance exists to fulfill the request at any given +differently than other Terraform resources. Most importantly: there is **no +guarantee** that a Spot Instance exists to fulfill the request at any given point in time. See the [AWS Spot Instance documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-instances.html) for more information. @@ -54,7 +54,9 @@ resource "aws_spot_instance_request" "cheap_worker" { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + Spot Instance Requests support all the same arguments as [`aws_instance`](instance.html), with the addition of: + * `spot_price` - (Optional; Default: On-demand price) The maximum price to request on the spot market. * `wait_for_fulfillment` - (Optional; Default: false) If set, Terraform will wait for the Spot Request to be fulfilled, and will throw an error if the @@ -73,9 +75,9 @@ Spot Instance Requests support all the same arguments as [`aws_instance`](instan This resource exports the following attributes in addition to the arguments above: * `id` - The Spot Instance Request ID. +* `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). -These attributes are exported, but they are expected to change over time and so -should only be used for informational purposes, not for resource dependencies: +The following attributes are exported, but they are expected to change over time and so should only be used for informational purposes, not for resource dependencies: * `spot_bid_status` - The current [bid status](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html) @@ -92,7 +94,6 @@ should only be used for informational purposes, not for resource dependencies: used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC * `private_ip` - The private IP address assigned to the instance -* `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Timeouts From 00aad6760d937187e45e9d2ee8bcca2e5b229331 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 20 Aug 2025 19:30:22 +0000 Subject: [PATCH 0322/2115] Update CHANGELOG.md for #43953 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8788e4b849ee..9a4d1ec3c243 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 6.10.0 (Unreleased) +NOTES: + +* resource/aws_instance: The `network_interface` block has been deprecated. Use `primary_network_interface` for the primary network interface and `aws_network_interface_attachment` resources for other network interfaces. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) +* resource/aws_spot_instance_request: The `network_interface` block has been deprecated. Use `primary_network_interface` for the primary network interface and `aws_network_interface_attachment` resources for other network interfaces. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) + ENHANCEMENTS: * data-source/aws_ecr_repository: Add `image_tag_mutability_exclusion_filter` attribute ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) @@ -18,8 +23,10 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_batch_compute_environment: Allow in-place updates of compute environments that have the `SPOT_PRICE_CAPACITY_OPTIMIZED` strategy ([#40148](https://github.com/hashicorp/terraform-provider-aws/issues/40148)) +* resource/aws_instance: Adds `primary_network_interface` to allow importing resources with custom primary network interface. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) * resource/aws_rds_cluster: Fixes the behavior when enabling database_insights_mode="advanced" without changing performance insights retention window ([#43919](https://github.com/hashicorp/terraform-provider-aws/issues/43919)) * resource/aws_rds_cluster: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key ([#43942](https://github.com/hashicorp/terraform-provider-aws/issues/43942)) +* resource/aws_spot_instance_request: Adds `primary_network_interface` to allow importing resources with custom primary network interface. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) * resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error when `policy_detail.exclusion_rules.amis.is_public` is omitted ([#43925](https://github.com/hashicorp/terraform-provider-aws/issues/43925)) ## 6.9.0 (August 14, 2025) From 3d179325aedcfe883b524171ac554bf8e9bb2624 Mon Sep 17 00:00:00 2001 From: Asim Date: Wed, 20 Aug 2025 20:44:15 +0100 Subject: [PATCH 0323/2115] fix linting issue in datasource doc. --- website/docs/d/odb_cloud_exadata_infrastructure.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown index 7eebf63f1ebb..3fda21d5af21 100644 --- a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown @@ -27,6 +27,7 @@ data "aws_odb_cloud_exadata_infrastructure" "example" { The following arguments are optional: * `id` - (Required) The unique identifier of the Exadata infrastructure. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ## Attribute Reference @@ -69,4 +70,3 @@ This data source exports the following attributes in addition to the arguments a * `database_server_type` - The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `storage_server_type` - The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `maintenance_window` - The scheduling details of the maintenance window. Patching and system updates take place during the maintenance window. -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). From 212c63d930753cd07633a09282df69c492bfe6f8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 19 Aug 2025 16:17:07 -0400 Subject: [PATCH 0324/2115] Add parameterized resource identity to `aws_s3_bucket_public_access_block` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketPublicAccessBlock_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketPublicAccessBlock_' -timeout 360m -vet=off 2025/08/19 16:06:13 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/19 16:06:13 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketPublicAccessBlock_directoryBucket (14.66s) --- PASS: TestAccS3BucketPublicAccessBlock_Disappears_bucket (24.90s) --- PASS: TestAccS3BucketPublicAccessBlock_disappears (27.69s) --- PASS: TestAccS3BucketPublicAccessBlock_basic (30.34s) --- PASS: TestAccS3BucketPublicAccessBlock_Identity_RegionOverride (35.10s) --- PASS: TestAccS3BucketPublicAccessBlock_Identity_Basic (45.39s) --- PASS: TestAccS3BucketPublicAccessBlock_skipDestroy (50.92s) --- PASS: TestAccS3BucketPublicAccessBlock_restrictPublicBuckets (52.71s) --- PASS: TestAccS3BucketPublicAccessBlock_ignorePublicACLs (54.47s) --- PASS: TestAccS3BucketPublicAccessBlock_blockPublicACLs (55.10s) --- PASS: TestAccS3BucketPublicAccessBlock_blockPublicPolicy (55.63s) --- PASS: TestAccS3BucketPublicAccessBlock_Identity_ExistingResource (55.82s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 62.203s ``` --- .../service/s3/bucket_public_access_block.go | 7 +- ...t_public_access_block_identity_gen_test.go | 251 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 4 + .../BucketPublicAccessBlock/basic/main_gen.tf | 21 ++ .../basic_v6.9.0/main_gen.tf | 31 +++ .../region_override/main_gen.tf | 31 +++ .../bucket_public_access_block_basic.gtpl | 14 + 7 files changed, 355 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_public_access_block_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketPublicAccessBlock/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketPublicAccessBlock/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketPublicAccessBlock/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_public_access_block_basic.gtpl diff --git a/internal/service/s3/bucket_public_access_block.go b/internal/service/s3/bucket_public_access_block.go index 72963ae0252e..3089034f69e9 100644 --- a/internal/service/s3/bucket_public_access_block.go +++ b/internal/service/s3/bucket_public_access_block.go @@ -21,6 +21,9 @@ import ( ) // @SDKResource("aws_s3_bucket_public_access_block", name="Bucket Public Access Block") +// @IdentityAttribute("bucket") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/s3/types;types.PublicAccessBlockConfiguration") func resourceBucketPublicAccessBlock() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketPublicAccessBlockCreate, @@ -28,10 +31,6 @@ func resourceBucketPublicAccessBlock() *schema.Resource { UpdateWithoutTimeout: resourceBucketPublicAccessBlockUpdate, DeleteWithoutTimeout: resourceBucketPublicAccessBlockDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ "block_public_acls": { Type: schema.TypeBool, diff --git a/internal/service/s3/bucket_public_access_block_identity_gen_test.go b/internal/service/s3/bucket_public_access_block_identity_gen_test.go new file mode 100644 index 000000000000..740ea905141f --- /dev/null +++ b/internal/service/s3/bucket_public_access_block_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketPublicAccessBlock_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.PublicAccessBlockConfiguration + resourceName := "aws_s3_bucket_public_access_block.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketPublicAccessBlockDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketPublicAccessBlockExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketPublicAccessBlock_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_public_access_block.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketPublicAccessBlock_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.PublicAccessBlockConfiguration + resourceName := "aws_s3_bucket_public_access_block.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketPublicAccessBlockDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketPublicAccessBlockExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketPublicAccessBlock/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 5d2a883d4f22..3f950bbaa368 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -224,6 +224,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_public_access_block", Name: "Bucket Public Access Block", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrBucket), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceBucketReplicationConfiguration, diff --git a/internal/service/s3/testdata/BucketPublicAccessBlock/basic/main_gen.tf b/internal/service/s3/testdata/BucketPublicAccessBlock/basic/main_gen.tf new file mode 100644 index 000000000000..40eccaeb9700 --- /dev/null +++ b/internal/service/s3/testdata/BucketPublicAccessBlock/basic/main_gen.tf @@ -0,0 +1,21 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_public_access_block" "test" { + bucket = aws_s3_bucket.test.bucket + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketPublicAccessBlock/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketPublicAccessBlock/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..f97aa4fb500a --- /dev/null +++ b/internal/service/s3/testdata/BucketPublicAccessBlock/basic_v6.9.0/main_gen.tf @@ -0,0 +1,31 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_public_access_block" "test" { + bucket = aws_s3_bucket.test.bucket + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketPublicAccessBlock/region_override/main_gen.tf b/internal/service/s3/testdata/BucketPublicAccessBlock/region_override/main_gen.tf new file mode 100644 index 000000000000..e66c9e826362 --- /dev/null +++ b/internal/service/s3/testdata/BucketPublicAccessBlock/region_override/main_gen.tf @@ -0,0 +1,31 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_public_access_block" "test" { + region = var.region + + bucket = aws_s3_bucket.test.bucket + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_public_access_block_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_public_access_block_basic.gtpl new file mode 100644 index 000000000000..acfec5bf3d80 --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_public_access_block_basic.gtpl @@ -0,0 +1,14 @@ +resource "aws_s3_bucket_public_access_block" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.bucket + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} From b7a0ab9f53064c24383690172af5d2461f828c8d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 09:53:32 -0400 Subject: [PATCH 0325/2115] Add parameterized resource identity to `aws_s3_bucket_policy` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketPolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketPolicy_' -timeout 360m -vet=off 2025/08/19 16:55:14 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/19 16:55:14 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketPolicy_directoryBucket (23.61s) --- PASS: TestAccS3BucketPolicy_disappears_bucket (25.15s) --- PASS: TestAccS3BucketPolicy_disappears (26.85s) --- PASS: TestAccS3BucketPolicy_basic (30.35s) --- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDoc (30.80s) --- PASS: TestAccS3BucketPolicy_IAMRoleOrder_policyDocNotPrincipal (31.39s) --- PASS: TestAccS3BucketPolicy_Identity_RegionOverride (34.17s) --- PASS: TestAccS3BucketPolicy_migrate_noChange (37.99s) --- PASS: TestAccS3BucketPolicy_migrate_withChange (38.37s) --- PASS: TestAccS3BucketPolicy_policyUpdate (42.23s) --- PASS: TestAccS3BucketPolicy_Identity_Basic (43.14s) --- PASS: TestAccS3BucketPolicy_Identity_ExistingResource (54.83s) --- PASS: TestAccS3BucketPolicy_IAMRoleOrder_jsonEncode (108.79s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 115.188s ``` --- internal/service/s3/bucket_policy.go | 6 +- .../s3/bucket_policy_identity_gen_test.go | 248 ++++++++++++++++++ internal/service/s3/bucket_policy_test.go | 17 ++ internal/service/s3/service_package_gen.go | 4 + .../testdata/BucketPolicy/basic/main_gen.tf | 41 +++ .../BucketPolicy/basic_v6.9.0/main_gen.tf | 51 ++++ .../BucketPolicy/region_override/main_gen.tf | 51 ++++ .../s3/testdata/tmpl/bucket_policy_basic.gtpl | 34 +++ 8 files changed, 448 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_policy_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketPolicy/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketPolicy/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketPolicy/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_policy_basic.gtpl diff --git a/internal/service/s3/bucket_policy.go b/internal/service/s3/bucket_policy.go index 712aecff1d27..6f045b8bf8ee 100644 --- a/internal/service/s3/bucket_policy.go +++ b/internal/service/s3/bucket_policy.go @@ -23,6 +23,8 @@ import ( ) // @SDKResource("aws_s3_bucket_policy", name="Bucket Policy") +// @IdentityAttribute("bucket") +// @Testing(preIdentityVersion="v6.9.0") func resourceBucketPolicy() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketPolicyPut, @@ -30,10 +32,6 @@ func resourceBucketPolicy() *schema.Resource { UpdateWithoutTimeout: resourceBucketPolicyPut, DeleteWithoutTimeout: resourceBucketPolicyDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_policy_identity_gen_test.go b/internal/service/s3/bucket_policy_identity_gen_test.go new file mode 100644 index 000000000000..98accbe83ecd --- /dev/null +++ b/internal/service/s3/bucket_policy_identity_gen_test.go @@ -0,0 +1,248 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketPolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketPolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketPolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketPolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketPolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketPolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketPolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/bucket_policy_test.go b/internal/service/s3/bucket_policy_test.go index 73fd1a976704..edd2b0ddd251 100644 --- a/internal/service/s3/bucket_policy_test.go +++ b/internal/service/s3/bucket_policy_test.go @@ -530,6 +530,23 @@ func testAccCheckBucketHasPolicy(ctx context.Context, n string, expectedPolicyTe } } +func testAccCheckBucketPolicyExists(ctx context.Context, n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).S3Client(ctx) + if tfs3.IsDirectoryBucket(rs.Primary.ID) { + conn = acctest.Provider.Meta().(*conns.AWSClient).S3ExpressClient(ctx) + } + + _, err := tfs3.FindBucketPolicy(ctx, conn, rs.Primary.ID) + return err + } +} + func testAccBucketPolicyConfig_basic(bucketName string) string { return fmt.Sprintf(` data "aws_partition" "current" {} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 3f950bbaa368..5866e2cb6a59 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -218,6 +218,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_policy", Name: "Bucket Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrBucket), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceBucketPublicAccessBlock, diff --git a/internal/service/s3/testdata/BucketPolicy/basic/main_gen.tf b/internal/service/s3/testdata/BucketPolicy/basic/main_gen.tf new file mode 100644 index 000000000000..363784afe51d --- /dev/null +++ b/internal/service/s3/testdata/BucketPolicy/basic/main_gen.tf @@ -0,0 +1,41 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_policy" "test" { + bucket = aws_s3_bucket.test.bucket + policy = data.aws_iam_policy_document.test.json +} + +data "aws_iam_policy_document" "test" { + statement { + effect = "Allow" + + actions = [ + "s3:*", + ] + + resources = [ + aws_s3_bucket.test.arn, + "${aws_s3_bucket.test.arn}/*", + ] + + principals { + type = "AWS" + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] + } + } +} + +data "aws_partition" "current" {} +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketPolicy/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketPolicy/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..b0df7d52635b --- /dev/null +++ b/internal/service/s3/testdata/BucketPolicy/basic_v6.9.0/main_gen.tf @@ -0,0 +1,51 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_policy" "test" { + bucket = aws_s3_bucket.test.bucket + policy = data.aws_iam_policy_document.test.json +} + +data "aws_iam_policy_document" "test" { + statement { + effect = "Allow" + + actions = [ + "s3:*", + ] + + resources = [ + aws_s3_bucket.test.arn, + "${aws_s3_bucket.test.arn}/*", + ] + + principals { + type = "AWS" + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] + } + } +} + +data "aws_partition" "current" {} +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketPolicy/region_override/main_gen.tf b/internal/service/s3/testdata/BucketPolicy/region_override/main_gen.tf new file mode 100644 index 000000000000..c7a0b75d8799 --- /dev/null +++ b/internal/service/s3/testdata/BucketPolicy/region_override/main_gen.tf @@ -0,0 +1,51 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_policy" "test" { + region = var.region + + bucket = aws_s3_bucket.test.bucket + policy = data.aws_iam_policy_document.test.json +} + +data "aws_iam_policy_document" "test" { + statement { + effect = "Allow" + + actions = [ + "s3:*", + ] + + resources = [ + aws_s3_bucket.test.arn, + "${aws_s3_bucket.test.arn}/*", + ] + + principals { + type = "AWS" + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] + } + } +} + +data "aws_partition" "current" {} +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_policy_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_policy_basic.gtpl new file mode 100644 index 000000000000..20108aee9f27 --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_policy_basic.gtpl @@ -0,0 +1,34 @@ +resource "aws_s3_bucket_policy" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.bucket + policy = data.aws_iam_policy_document.test.json +} + +data "aws_iam_policy_document" "test" { + statement { + effect = "Allow" + + actions = [ + "s3:*", + ] + + resources = [ + aws_s3_bucket.test.arn, + "${aws_s3_bucket.test.arn}/*", + ] + + principals { + type = "AWS" + identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] + } + } +} + +data "aws_partition" "current" {} +data "aws_caller_identity" "current" {} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} + From ca154a9dbd846ad06dab0ac880e36eb6562791a5 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 11:16:52 -0400 Subject: [PATCH 0326/2115] Add parameterized resource identity to `aws_s3_bucket_ownership_controls` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketOwnershipControls_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketOwnershipControls_' -timeout 360m -vet=off 2025/08/20 11:09:22 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 11:09:22 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketOwnershipControls_directoryBucket (11.41s) --- PASS: TestAccS3BucketOwnershipControls_Disappears_bucket (20.80s) --- PASS: TestAccS3BucketOwnershipControls_disappears (23.18s) --- PASS: TestAccS3BucketOwnershipControls_basic (25.12s) --- PASS: TestAccS3BucketOwnershipControls_Identity_RegionOverride (28.77s) --- PASS: TestAccS3BucketOwnershipControls_Identity_Basic (35.63s) --- PASS: TestAccS3BucketOwnershipControls_Rule_objectOwnership (37.09s) --- PASS: TestAccS3BucketOwnershipControls_Identity_ExistingResource (51.81s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 58.340s ``` --- .../service/s3/bucket_ownership_controls.go | 6 +- ...et_ownership_controls_identity_gen_test.go | 248 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 4 + .../BucketOwnershipControls/basic/main_gen.tf | 19 ++ .../basic_v6.9.0/main_gen.tf | 29 ++ .../region_override/main_gen.tf | 29 ++ .../tmpl/bucket_ownership_controls_basic.gtpl | 12 + 7 files changed, 343 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_ownership_controls_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketOwnershipControls/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketOwnershipControls/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketOwnershipControls/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_ownership_controls_basic.gtpl diff --git a/internal/service/s3/bucket_ownership_controls.go b/internal/service/s3/bucket_ownership_controls.go index ff974a9d9b18..54b83e3d932a 100644 --- a/internal/service/s3/bucket_ownership_controls.go +++ b/internal/service/s3/bucket_ownership_controls.go @@ -24,6 +24,8 @@ import ( ) // @SDKResource("aws_s3_bucket_ownership_controls", name="Bucket Ownership Controls") +// @IdentityAttribute("bucket") +// @Testing(preIdentityVersion="v6.9.0") func resourceBucketOwnershipControls() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketOwnershipControlsCreate, @@ -31,10 +33,6 @@ func resourceBucketOwnershipControls() *schema.Resource { UpdateWithoutTimeout: resourceBucketOwnershipControlsUpdate, DeleteWithoutTimeout: resourceBucketOwnershipControlsDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_ownership_controls_identity_gen_test.go b/internal/service/s3/bucket_ownership_controls_identity_gen_test.go new file mode 100644 index 000000000000..ecc97f2585b0 --- /dev/null +++ b/internal/service/s3/bucket_ownership_controls_identity_gen_test.go @@ -0,0 +1,248 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketOwnershipControls_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_ownership_controls.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketOwnershipControlsDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketOwnershipControlsExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketOwnershipControls_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_ownership_controls.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketOwnershipControls_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_ownership_controls.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketOwnershipControlsDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketOwnershipControlsExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketOwnershipControls/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 5866e2cb6a59..9497b5665082 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -212,6 +212,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_ownership_controls", Name: "Bucket Ownership Controls", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrBucket), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceBucketPolicy, diff --git a/internal/service/s3/testdata/BucketOwnershipControls/basic/main_gen.tf b/internal/service/s3/testdata/BucketOwnershipControls/basic/main_gen.tf new file mode 100644 index 000000000000..bc8f119f0660 --- /dev/null +++ b/internal/service/s3/testdata/BucketOwnershipControls/basic/main_gen.tf @@ -0,0 +1,19 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketOwnershipControls/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketOwnershipControls/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..3f15dca1d240 --- /dev/null +++ b/internal/service/s3/testdata/BucketOwnershipControls/basic_v6.9.0/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketOwnershipControls/region_override/main_gen.tf b/internal/service/s3/testdata/BucketOwnershipControls/region_override/main_gen.tf new file mode 100644 index 000000000000..8ba9fd4cd37e --- /dev/null +++ b/internal/service/s3/testdata/BucketOwnershipControls/region_override/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_ownership_controls" "test" { + region = var.region + + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_ownership_controls_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_ownership_controls_basic.gtpl new file mode 100644 index 000000000000..220e178916bc --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_ownership_controls_basic.gtpl @@ -0,0 +1,12 @@ +resource "aws_s3_bucket_ownership_controls" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} From 64327b208ffac4151bbfa589e0bf1d6d6168088d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 13:42:33 -0400 Subject: [PATCH 0327/2115] r/aws_s3_bucket_logging(test): fix flaky test check The `target_grant.grantee.display_name` attribute is not always consistently populated when a grant is created via a canonical user ID. This was manifesting in acceptance tests as either a failed check when assuming the expected value of the `display_name` attribute, or failed import verification when a previously known value returned as empty on a subsequent read operation. To avoid these inconsistent failure modes, direct checks on this computed attribute have been removed, and the attribute has been ignored during import verification. --- internal/service/s3/bucket_logging_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/service/s3/bucket_logging_test.go b/internal/service/s3/bucket_logging_test.go index 10c38958ed0b..749ef29e12a5 100644 --- a/internal/service/s3/bucket_logging_test.go +++ b/internal/service/s3/bucket_logging_test.go @@ -135,13 +135,15 @@ func TestAccS3BucketLogging_TargetGrantByID(t *testing.T) { "permission": string(types.BucketLogsPermissionFullControl), }), resource.TestCheckTypeSetElemAttrPair(resourceName, "target_grant.*.grantee.0.id", "data.aws_canonical_user_id.current", names.AttrID), - resource.TestCheckTypeSetElemAttrPair(resourceName, "target_grant.*.grantee.0.display_name", "data.aws_canonical_user_id.current", names.AttrDisplayName), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent when the grant is assigned by ID. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{"target_grant.0.grantee.0.display_name"}, }, { Config: testAccBucketLoggingConfig_targetGrantByID(rName, string(types.BucketLogsPermissionRead)), @@ -153,13 +155,16 @@ func TestAccS3BucketLogging_TargetGrantByID(t *testing.T) { "grantee.0.type": string(types.TypeCanonicalUser), "permission": string(types.BucketLogsPermissionRead), }), - resource.TestCheckTypeSetElemAttrPair(resourceName, "target_grant.*.grantee.0.display_name", "data.aws_canonical_user_id.current", names.AttrDisplayName), + resource.TestCheckTypeSetElemAttrPair(resourceName, "target_grant.*.grantee.0.id", "data.aws_canonical_user_id.current", names.AttrID), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent when the grant is assigned by ID. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{"target_grant.0.grantee.0.display_name"}, }, { Config: testAccBucketLoggingConfig_basic(rName), From 26c8bc711ef3d09a5c3a47d3680e7a40e7e1c48c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 06:07:54 +0000 Subject: [PATCH 0328/2115] build(deps): bump actions/setup-java from 4.7.1 to 5.0.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.7.1 to 5.0.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/c5195efecf7bdfc987ee8bae7a71cb8b11521c00...dded0888837ed1f317902acf8a20df0ad188d165) --- updated-dependencies: - dependency-name: actions/setup-java dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gen-teamcity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-teamcity.yml b/.github/workflows/gen-teamcity.yml index bf922e655e89..2405202efc7b 100644 --- a/.github/workflows/gen-teamcity.yml +++ b/.github/workflows/gen-teamcity.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: distribution: adopt java-version: 17 From 76b19cac666ecbb436dc0e02434f6dc508c8c5f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:29:59 -0400 Subject: [PATCH 0329/2115] go get github.com/aws/aws-sdk-go-v2/config. --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 096615eaee66..afea002055fb 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.38.0 - github.com/aws/aws-sdk-go-v2/config v1.31.0 - github.com/aws/aws-sdk-go-v2/credentials v1.18.4 + github.com/aws/aws-sdk-go-v2/config v1.31.1 + github.com/aws/aws-sdk-go-v2/credentials v1.18.5 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 @@ -248,10 +248,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 - github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 + github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 - github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 + github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 @@ -331,7 +331,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index e06c72223c91..76bbaf6a2620 100644 --- a/go.sum +++ b/go.sum @@ -27,10 +27,10 @@ github.com/aws/aws-sdk-go-v2 v1.38.0 h1:UCRQ5mlqcFk9HJDIqENSLR3wiG1VTWlyUfLDEvY7 github.com/aws/aws-sdk-go-v2 v1.38.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.0 h1:9yH0xiY5fUnVNLRWO0AtayqwU1ndriZdN78LlhruJR4= -github.com/aws/aws-sdk-go-v2/config v1.31.0/go.mod h1:VeV3K72nXnhbe4EuxxhzsDc/ByrCSlZwUnWH52Nde/I= -github.com/aws/aws-sdk-go-v2/credentials v1.18.4 h1:IPd0Algf1b+Qy9BcDp0sCUcIWdCQPSzDoMK3a8pcbUM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.4/go.mod h1:nwg78FjH2qvsRM1EVZlX9WuGUJOL5od+0qvm0adEzHk= +github.com/aws/aws-sdk-go-v2/config v1.31.1 h1:PSQn4ObaQLaHl6qjs+XYH2pkxyHzZlk1GgQDrKlRJ7I= +github.com/aws/aws-sdk-go-v2/config v1.31.1/go.mod h1:3UA8Gj+2nzpV8WBUF0b19onBfz0YMXDQyGEW0Ru1ntI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.5 h1:DATc1xnpHUV8VgvtnVQul+zuCwK6vz7gtkbKEUZcuNI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.5/go.mod h1:y7aigZzjm1jUZuCgOrlBng+VJrKkknY2Cl0JWxG7vHU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA= @@ -517,16 +517,16 @@ github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 h1:OHfg8SKR3X5AV6/Lpin github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 h1:21pRqoiIDamny/57BJYBrGumQKQEAcZ1+7X2xpMkOdc= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 h1:Mc/MKBf2m4VynyJkABoVEN+QzkfLqGj0aiJuEe7cMeM= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.0/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 h1:aiGJnlWqp3e81gDzbSX/+67LqbnW9ppW/Md2CqLVCrQ= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 h1:6csaS/aJmqZQbKhi1EyEMM7yBW653Wy/B9hnBofW+sw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 h1:IZmMc03E2ay2j+4It6+XKpWLwdH9RNfLYr31ZjTmlpk= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 h1:MG9VFW43M4A8BYeAfaJJZWrroinxeTi2r3+SnmLQfSA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.0/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= +github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= +github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 h1:rH21FB+YB32tQXRRqw5GOXLRlEY6sF0niNUnjIz2K4c= github.com/aws/aws-sdk-go-v2/service/swf v1.31.0/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 h1:M7W7qo3OsHzH+zrmoU8gR4Or+WB2aV32kJ6H5qSYgEs= From 1d958ddb3aec624f1cca63ef6033130b23dc2a0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:01 -0400 Subject: [PATCH 0330/2115] go get github.com/aws/aws-sdk-go-v2/feature/s3/manager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index afea002055fb..c2d88c0938fb 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.31.1 github.com/aws/aws-sdk-go-v2/credentials v1.18.5 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 github.com/aws/aws-sdk-go-v2/service/account v1.27.0 github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 diff --git a/go.sum b/go.sum index 76bbaf6a2620..a44964d0e709 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.5 h1:DATc1xnpHUV8VgvtnVQul+zuCwK6 github.com/aws/aws-sdk-go-v2/credentials v1.18.5/go.mod h1:y7aigZzjm1jUZuCgOrlBng+VJrKkknY2Cl0JWxG7vHU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 h1:WTNSeU/4f/vevwK7zwEEjlX27LPZB1IwyjVAh+Q74iQ= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5/go.mod h1:O84Dxp02jFDHRDbziaCRqMbe12+o+qih3ZD6Dio+1v0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 h1:o9RnO+YZ4X+kt5Z7Nvcishlz0nksIt2PIzDglLMP0vA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3/go.mod h1:+6aLJzOG1fvMOyzIySYjOFjcguGvVRL68R+uoRencN4= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 h1:joyyUFhiTQQmVK6ImzNU9TQSNRNeD9kOklqTzyk5v6s= From 95f08d35f1b767ddd17ede7683a5d873a3fb9cea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:02 -0400 Subject: [PATCH 0331/2115] 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 c2d88c0938fb..aa7ad92d7cc7 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.18.5 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 github.com/aws/aws-sdk-go-v2/service/account v1.27.0 github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 diff --git a/go.sum b/go.sum index a44964d0e709..28d6b8b4299e 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/rH0vddEAamsHUIs= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 h1:GJpQPHoqFQadXt9zgU5y+8Jz242QOkjIZIw+FVsHSUA= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq8CwNro0qm3Sru+7ZrP0p1c2HRs= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= github.com/aws/aws-sdk-go-v2/service/account v1.27.0 h1:AXdMJ3BikU0OcISX9Sn+d+G6Z5bWCMGBTi8CzRJc5/w= github.com/aws/aws-sdk-go-v2/service/account v1.27.0/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYhokCSpc+fYajYLy0= From b6b751edf4bdf04efa74b697ceabf15291801232 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:03 -0400 Subject: [PATCH 0332/2115] 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 aa7ad92d7cc7..e0ab86e1be96 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 - github.com/aws/aws-sdk-go-v2/service/account v1.27.0 + github.com/aws/aws-sdk-go-v2/service/account v1.27.1 github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 diff --git a/go.sum b/go.sum index 28d6b8b4299e..298a793604b3 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq8CwNro0qm3Sru+7ZrP0p1c2HRs= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.0 h1:AXdMJ3BikU0OcISX9Sn+d+G6Z5bWCMGBTi8CzRJc5/w= -github.com/aws/aws-sdk-go-v2/service/account v1.27.0/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= +github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5xfDgrO7+dh40xdXjmSwc= +github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYhokCSpc+fYajYLy0= github.com/aws/aws-sdk-go-v2/service/acm v1.36.0/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= From b69290ca206fda51ff801a55c576da132d9962da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:04 -0400 Subject: [PATCH 0333/2115] 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 e0ab86e1be96..86b9f37ba928 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 github.com/aws/aws-sdk-go-v2/service/account v1.27.1 - github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 + github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 diff --git a/go.sum b/go.sum index 298a793604b3..9f523ad543e3 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5xfDgrO7+dh40xdXjmSwc= github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYhokCSpc+fYajYLy0= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.0/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6nH5bMuDYVJABCLY= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= From 3e536d3300c453d72ff45e7fcd0e07a4c1bf8b4b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:05 -0400 Subject: [PATCH 0334/2115] 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 86b9f37ba928..11045c30a5f4 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 github.com/aws/aws-sdk-go-v2/service/account v1.27.1 github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 diff --git a/go.sum b/go.sum index 9f523ad543e3..c0b057f403cc 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5x github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6nH5bMuDYVJABCLY= github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5vO+np5mgJxxRMH6y/gQ= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= github.com/aws/aws-sdk-go-v2/service/amp v1.38.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= From ac78d33cc075dc4217b8097bd53beef7319c45d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:06 -0400 Subject: [PATCH 0335/2115] 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 11045c30a5f4..cee136582ae1 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.27.1 github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 - github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 + github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 diff --git a/go.sum b/go.sum index c0b057f403cc..db3593961746 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6 github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5vO+np5mgJxxRMH6y/gQ= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJomKVzCgo/u1k9it4= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= From 57c3682144f2ec0b28ce5307334c1d28eb241136 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:07 -0400 Subject: [PATCH 0336/2115] 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 cee136582ae1..a830f5815311 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 diff --git a/go.sum b/go.sum index db3593961746..5b7d2715409c 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5v github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJomKVzCgo/u1k9it4= github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+IPIaPVEXYycEMi0IP1l8= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 h1:bbHfZmF4H/PG5EEo0hXDyM/45XZDMbkscXolqardpB0= From 21ab6c1f438f1a5a69fad3a3e144c269d0a743ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:07 -0400 Subject: [PATCH 0337/2115] 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 a830f5815311..9ac0dcf185cc 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 diff --git a/go.sum b/go.sum index 5b7d2715409c..aaf353ef0395 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJo github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+IPIaPVEXYycEMi0IP1l8= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxVHiboQcDD5dcRPjvTaO7EgA= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 h1:bbHfZmF4H/PG5EEo0hXDyM/45XZDMbkscXolqardpB0= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 h1:1EQYqGI4Gwlk/dGj/F3IxdZEZPw5Nv26d1QGsSsVPUk= From 82e476fd6556692cb47fe0bfe5615e1ca3523262 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:08 -0400 Subject: [PATCH 0338/2115] 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 9ac0dcf185cc..04b70ad44603 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 diff --git a/go.sum b/go.sum index aaf353ef0395..dff7f0fd852d 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+I github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxVHiboQcDD5dcRPjvTaO7EgA= github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 h1:bbHfZmF4H/PG5EEo0hXDyM/45XZDMbkscXolqardpB0= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pBexCXCwvSNBS7syZQXe3hVIHE= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 h1:1EQYqGI4Gwlk/dGj/F3IxdZEZPw5Nv26d1QGsSsVPUk= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 h1:lymNTWawpNNwwiJY7BCqBIJzLQ8p8O0kHE9/iQ5UIXc= From 17e25f4626d99c1d571ab047ddc9acbd8832f013 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:09 -0400 Subject: [PATCH 0339/2115] 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 04b70ad44603..cb7460a8b27c 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 diff --git a/go.sum b/go.sum index dff7f0fd852d..a1d38432d6dd 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxV github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pBexCXCwvSNBS7syZQXe3hVIHE= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 h1:1EQYqGI4Gwlk/dGj/F3IxdZEZPw5Nv26d1QGsSsVPUk= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgyL2/k3BiEn5a1AeBR8Qk/M= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 h1:lymNTWawpNNwwiJY7BCqBIJzLQ8p8O0kHE9/iQ5UIXc= github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 h1:Na5N1Pb88dfNt9LbDj4VIWa9KGPAPqm6HjXWaan75p0= From 51ca81093970df81ac61341d20d97dc2f5d0e516 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:10 -0400 Subject: [PATCH 0340/2115] 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 cb7460a8b27c..5678fab4d4a9 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 diff --git a/go.sum b/go.sum index a1d38432d6dd..dbd83b2659b1 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pB github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgyL2/k3BiEn5a1AeBR8Qk/M= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 h1:lymNTWawpNNwwiJY7BCqBIJzLQ8p8O0kHE9/iQ5UIXc= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWLWpdUUHbxBmdHnKtvdENQs= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 h1:Na5N1Pb88dfNt9LbDj4VIWa9KGPAPqm6HjXWaan75p0= github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 h1:4mIoI/hf2GdN0gMQGRcle62J11D4gGJRMcAeYLJeEzk= From 4674a0ad6ba867d1d83f9f127b41020b3a945a7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:11 -0400 Subject: [PATCH 0341/2115] 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 5678fab4d4a9..2d428b340ad5 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 + github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 diff --git a/go.sum b/go.sum index dbd83b2659b1..79aec505f2cd 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgy github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWLWpdUUHbxBmdHnKtvdENQs= github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 h1:Na5N1Pb88dfNt9LbDj4VIWa9KGPAPqm6HjXWaan75p0= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9JPv7SRJX9YRlMNQ3EUA= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 h1:4mIoI/hf2GdN0gMQGRcle62J11D4gGJRMcAeYLJeEzk= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 h1:WknzwSXavLeI6hBZSDIpytKGGGXA+6rNQFf/jA9NtJI= From 9bcf5615e8bda60d2c6d8e4a887d0b9c32d01c27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:12 -0400 Subject: [PATCH 0342/2115] 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 2d428b340ad5..29fc41b8dc64 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 diff --git a/go.sum b/go.sum index 79aec505f2cd..cb2d469a42f9 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWL github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9JPv7SRJX9YRlMNQ3EUA= github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 h1:4mIoI/hf2GdN0gMQGRcle62J11D4gGJRMcAeYLJeEzk= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62UJJFRxvY7PKJGFUPYi6MM44jnpY= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 h1:WknzwSXavLeI6hBZSDIpytKGGGXA+6rNQFf/jA9NtJI= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 h1:B4rFraSi6NFtwWg/QYr6Mug4ucibKlaDESd07gHTj40= From 4552aaa0239c90856bef82c8bf496526ff91b5aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:13 -0400 Subject: [PATCH 0343/2115] 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 29fc41b8dc64..b7a2f1ba8447 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 diff --git a/go.sum b/go.sum index cb2d469a42f9..2e09daa20692 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,8 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62UJJFRxvY7PKJGFUPYi6MM44jnpY= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 h1:WknzwSXavLeI6hBZSDIpytKGGGXA+6rNQFf/jA9NtJI= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbvsq75VUtbS2waQc9QMS/EC1CDXc4utBfANQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 h1:B4rFraSi6NFtwWg/QYr6Mug4ucibKlaDESd07gHTj40= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 h1:SqxybdZ6g/5bl0YaZXwzwO8nBZZVWYQEMTmrtIin2A4= From f5fe1015f8acd4abc37262359c07c4a115d3b62d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:14 -0400 Subject: [PATCH 0344/2115] 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 b7a2f1ba8447..01056e15f510 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 diff --git a/go.sum b/go.sum index 2e09daa20692..8debc083b122 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbvsq75VUtbS2waQc9QMS/EC1CDXc4utBfANQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 h1:B4rFraSi6NFtwWg/QYr6Mug4ucibKlaDESd07gHTj40= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6h5Dn6caiKuY86UACNaxMh3UL5XhLHhc= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 h1:SqxybdZ6g/5bl0YaZXwzwO8nBZZVWYQEMTmrtIin2A4= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 h1:JBQbf6oX9kNpMj8ehtekQSd33S6BZWv577ddGUbFhQA= From 10638fe437cefadb3ae1b285b433ad9baf8312cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:15 -0400 Subject: [PATCH 0345/2115] 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 01056e15f510..9186e2baa27c 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 diff --git a/go.sum b/go.sum index 8debc083b122..f059e126abdb 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbv github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6h5Dn6caiKuY86UACNaxMh3UL5XhLHhc= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 h1:SqxybdZ6g/5bl0YaZXwzwO8nBZZVWYQEMTmrtIin2A4= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDYFzus27Rzee6aDgg9binbrJ7KAgCPW8= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 h1:JBQbf6oX9kNpMj8ehtekQSd33S6BZWv577ddGUbFhQA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 h1:FD6ANh+B4eaJ5hxxHqgUXvyRLiuFGF+xnJR9vqsBVyA= From c7ef806b40267a7a540cfaf70017fd5963ccccdc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:16 -0400 Subject: [PATCH 0346/2115] go get github.com/aws/aws-sdk-go-v2/service/appmesh. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9186e2baa27c..b94e56120996 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 diff --git a/go.sum b/go.sum index f059e126abdb..0adf0abf84ab 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDYFzus27Rzee6aDgg9binbrJ7KAgCPW8= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 h1:JBQbf6oX9kNpMj8ehtekQSd33S6BZWv577ddGUbFhQA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRwh+gX3kXcZp+VQ0qaLVE= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 h1:FD6ANh+B4eaJ5hxxHqgUXvyRLiuFGF+xnJR9vqsBVyA= github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 h1:vHXkPxz6DR28ISql1XUZX5yNee9IMyei3ybAUD4Hjqw= From b355842ed33945565edd9729b139b4189a6f4893 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:17 -0400 Subject: [PATCH 0347/2115] 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 b94e56120996..51bdc5036735 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 diff --git a/go.sum b/go.sum index 0adf0abf84ab..7c1997bbab13 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDY github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRwh+gX3kXcZp+VQ0qaLVE= github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 h1:FD6ANh+B4eaJ5hxxHqgUXvyRLiuFGF+xnJR9vqsBVyA= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5op3siDO3CQEa05bQ2ulEM= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 h1:vHXkPxz6DR28ISql1XUZX5yNee9IMyei3ybAUD4Hjqw= github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 h1:V/aQVXHEgacW8l2lOnX9qgQh6SCkcKT3GDoMBdXHG4w= From 68eca74dbf6425854b094d77009bb706bc34e555 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:18 -0400 Subject: [PATCH 0348/2115] 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 51bdc5036735..484699ac2663 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 - github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 + github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 diff --git a/go.sum b/go.sum index 7c1997bbab13..6f077f061ab4 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRw github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5op3siDO3CQEa05bQ2ulEM= github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 h1:vHXkPxz6DR28ISql1XUZX5yNee9IMyei3ybAUD4Hjqw= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= +github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxAS1bg3rntaMltGgvywp3JY= +github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 h1:V/aQVXHEgacW8l2lOnX9qgQh6SCkcKT3GDoMBdXHG4w= github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 h1:8QK47rrFawD8jtTmDKMKZr0lujNh23p1bJAZNyQJLYY= From 820cf76ca3ebf1030c48b15acf20b0bfc8b14225 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:19 -0400 Subject: [PATCH 0349/2115] 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 484699ac2663..5844f2086949 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 + github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 diff --git a/go.sum b/go.sum index 6f077f061ab4..ad6b6cebd8ce 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxAS1bg3rntaMltGgvywp3JY= github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 h1:V/aQVXHEgacW8l2lOnX9qgQh6SCkcKT3GDoMBdXHG4w= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOionUPy8JObJcvn21TvEpJU= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 h1:8QK47rrFawD8jtTmDKMKZr0lujNh23p1bJAZNyQJLYY= github.com/aws/aws-sdk-go-v2/service/athena v1.54.0/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 h1:Sem8rU6yn64VNGn7OFB6XnMKUXTBprarXFeIhXHoZQc= From 3ef895d63e36b2856008599aeda6d1e263cd565d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:20 -0400 Subject: [PATCH 0350/2115] 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 5844f2086949..c9ad11d05c83 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 - github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 + github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 diff --git a/go.sum b/go.sum index ad6b6cebd8ce..f1a01567cb86 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxA github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOionUPy8JObJcvn21TvEpJU= github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 h1:8QK47rrFawD8jtTmDKMKZr0lujNh23p1bJAZNyQJLYY= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.0/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5YQyq5LFBYOfngkta3YM= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 h1:Sem8rU6yn64VNGn7OFB6XnMKUXTBprarXFeIhXHoZQc= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 h1:PwAha4djh1MsmRgtKQ6exCqX7pTTC7awEN+1zD+Lv0A= From ad676b3f31388eab077b177b8f1e36c210aa5a6a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:21 -0400 Subject: [PATCH 0351/2115] 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 c9ad11d05c83..7baf3d6dbd8b 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 diff --git a/go.sum b/go.sum index f1a01567cb86..1207eb38d94e 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOion github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5YQyq5LFBYOfngkta3YM= github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 h1:Sem8rU6yn64VNGn7OFB6XnMKUXTBprarXFeIhXHoZQc= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC11hIuePfiZfVOYKgfm1rZDIds= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 h1:PwAha4djh1MsmRgtKQ6exCqX7pTTC7awEN+1zD+Lv0A= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3JN0o2JKzIBKoZbBwHgVEecRpTNqI= From 226dd9d3244d363b4349be2ff0ac9234fbb9ac90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:22 -0400 Subject: [PATCH 0352/2115] 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 7baf3d6dbd8b..f83bb50e8405 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 diff --git a/go.sum b/go.sum index 1207eb38d94e..932f47c2d1fc 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5Y github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC11hIuePfiZfVOYKgfm1rZDIds= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 h1:PwAha4djh1MsmRgtKQ6exCqX7pTTC7awEN+1zD+Lv0A= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprieF/Y1OVKg5zvPbAFyLuQGuoI= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3JN0o2JKzIBKoZbBwHgVEecRpTNqI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= From d5ad3ecfb116783a99f58003782f70960ea6300d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:22 -0400 Subject: [PATCH 0353/2115] 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 f83bb50e8405..d6ca4cf84e17 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 diff --git a/go.sum b/go.sum index 932f47c2d1fc..d885f939b9a9 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprieF/Y1OVKg5zvPbAFyLuQGuoI= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3JN0o2JKzIBKoZbBwHgVEecRpTNqI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/rBZIbwSOzeTNTs0zXdBrEl/Zo+rXk= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= github.com/aws/aws-sdk-go-v2/service/backup v1.46.0/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= From df50671513f6b2f27a24794fa205ca5736ac17fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:23 -0400 Subject: [PATCH 0354/2115] 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 d6ca4cf84e17..dd1435eb957b 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 - github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 + github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 diff --git a/go.sum b/go.sum index d885f939b9a9..6cd8de18fcbe 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprie github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/rBZIbwSOzeTNTs0zXdBrEl/Zo+rXk= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.0/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= +github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbdEdNX1+vOM2H5QTyD38= +github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= github.com/aws/aws-sdk-go-v2/service/batch v1.57.1/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= From 70ac30d5a979a03a519276c62be629479343e206 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:24 -0400 Subject: [PATCH 0355/2115] 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 dd1435eb957b..668bf05504b5 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 diff --git a/go.sum b/go.sum index 6cd8de18fcbe..472bc562627a 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/r github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbdEdNX1+vOM2H5QTyD38= github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.1/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZdxlwv8evg97dQufb+U= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= From b1bf38a48f50fa340109648d516b7156776a0d96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:25 -0400 Subject: [PATCH 0356/2115] 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 668bf05504b5..a106f3b60b22 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 diff --git a/go.sum b/go.sum index 472bc562627a..7e3840b597d4 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbd github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZdxlwv8evg97dQufb+U= github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrAPCXtRMEtLASleDA/oPiMNe2fVA= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= From 9103c1e38942ab6fa04abad447a6699974bcb7b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:26 -0400 Subject: [PATCH 0357/2115] 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 a106f3b60b22..48910ef69212 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 diff --git a/go.sum b/go.sum index 7e3840b597d4..2691fe08cd7c 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,8 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZd github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrAPCXtRMEtLASleDA/oPiMNe2fVA= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpHmSzP6W+JIGEQld3e4PQ= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= From 4deb92da76d6980034c41cc01456456f3c8dd9c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:27 -0400 Subject: [PATCH 0358/2115] 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 48910ef69212..53e3d81ea13d 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 diff --git a/go.sum b/go.sum index 2691fe08cd7c..b867c4c75a9d 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrA github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpHmSzP6W+JIGEQld3e4PQ= github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drULsC2fz3imdjba+pYnTqm/mkmY= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= From 6d792373b2749fb2c7f99fa9331084141cb1aed8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:28 -0400 Subject: [PATCH 0359/2115] go get github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 53e3d81ea13d..086fc62c1c37 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 diff --git a/go.sum b/go.sum index b867c4c75a9d..bebfe81ac2e8 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpH github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drULsC2fz3imdjba+pYnTqm/mkmY= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBPjzVe72EhDqVLAMKmgtQoXdohzdfB0DTxb0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= github.com/aws/aws-sdk-go-v2/service/billing v1.6.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 h1:l9NAh1G4Dx6ygvXtI+q1LjJhIOjFfuglgzCgK4oz4To= From fbce9ce1ec78aa51a502089092657c550c6608a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:29 -0400 Subject: [PATCH 0360/2115] go get github.com/aws/aws-sdk-go-v2/service/billing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 086fc62c1c37..589bf69457e7 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 - github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 diff --git a/go.sum b/go.sum index bebfe81ac2e8..9cfd3114ebcd 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drUL github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBPjzVe72EhDqVLAMKmgtQoXdohzdfB0DTxb0= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= -github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= -github.com/aws/aws-sdk-go-v2/service/billing v1.6.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZESLsNSz/s+LfXWs2Oo= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 h1:l9NAh1G4Dx6ygvXtI+q1LjJhIOjFfuglgzCgK4oz4To= github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 h1:YSr29la/2ZjvLzpPSTNZ+4UKUMVIB/By9RHbwsozZAU= From 6c45d7a2b55b5c38d006d2d6ca76ed058d631dd8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:30 -0400 Subject: [PATCH 0361/2115] 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 589bf69457e7..ee1f58882b6c 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 - github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 diff --git a/go.sum b/go.sum index 9cfd3114ebcd..c07ed05c0445 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBP github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZESLsNSz/s+LfXWs2Oo= github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= -github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 h1:l9NAh1G4Dx6ygvXtI+q1LjJhIOjFfuglgzCgK4oz4To= -github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47dNh/U51t9mtlVRYfn5A= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 h1:YSr29la/2ZjvLzpPSTNZ+4UKUMVIB/By9RHbwsozZAU= github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 h1:OrR18jIg9a5RBxgMPbWksJT9tmTa/KOf6LmJOTiL/nM= From 914162f7e396f28098bf3e58d2d72c4420fa0065 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:30 -0400 Subject: [PATCH 0362/2115] 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 ee1f58882b6c..0c6b7a096532 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 diff --git a/go.sum b/go.sum index c07ed05c0445..023a933cbb3c 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZ github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47dNh/U51t9mtlVRYfn5A= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 h1:YSr29la/2ZjvLzpPSTNZ+4UKUMVIB/By9RHbwsozZAU= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMVg7GRx8jqKZrkRoq673E= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 h1:OrR18jIg9a5RBxgMPbWksJT9tmTa/KOf6LmJOTiL/nM= github.com/aws/aws-sdk-go-v2/service/chime v1.39.0/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy/9T48CqAGlythaPj6Y5PWCRnMFCbqXp1iY= From cb3a246271fabadddd10dd145df15046b53874a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:31 -0400 Subject: [PATCH 0363/2115] go get github.com/aws/aws-sdk-go-v2/service/chime. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0c6b7a096532..d87f9a24d55b 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 - github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 + github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 diff --git a/go.sum b/go.sum index 023a933cbb3c..c8675210d1b9 100644 --- a/go.sum +++ b/go.sum @@ -107,8 +107,8 @@ github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMVg7GRx8jqKZrkRoq673E= github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 h1:OrR18jIg9a5RBxgMPbWksJT9tmTa/KOf6LmJOTiL/nM= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.0/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6sglQ187akFDPJu8fQ= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy/9T48CqAGlythaPj6Y5PWCRnMFCbqXp1iY= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= From b4a19184183457b51109ceab4796ebc3ba6f7cbc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:32 -0400 Subject: [PATCH 0364/2115] 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 d87f9a24d55b..e35e6f1f4873 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 diff --git a/go.sum b/go.sum index c8675210d1b9..2bb926140f16 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,8 @@ github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMV github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6sglQ187akFDPJu8fQ= github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy/9T48CqAGlythaPj6Y5PWCRnMFCbqXp1iY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuKw61TsDbviht2BC/gV0PXQ8g4OXxd0K5DoA= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= From 0944c00b65887f8f4ae82c76dea2bd9050e5bfe7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:33 -0400 Subject: [PATCH 0365/2115] 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 e35e6f1f4873..c95723875b27 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 diff --git a/go.sum b/go.sum index 2bb926140f16..e999fdeee569 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6 github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuKw61TsDbviht2BC/gV0PXQ8g4OXxd0K5DoA= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JPFSCB2igk8KK1uKRh5FpeSCBN8= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= From b8c3917693f04851f9d15f56b6de073a19674c1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:34 -0400 Subject: [PATCH 0366/2115] 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 c95723875b27..8b80f0cfa84b 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 diff --git a/go.sum b/go.sum index e999fdeee569..a2129ea3d6bb 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuK github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JPFSCB2igk8KK1uKRh5FpeSCBN8= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcgQlNkUzzDxko7AUOm445Tzs= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= From 4fe733142835309bcd7ef16072e2d190cb3a35cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:35 -0400 Subject: [PATCH 0367/2115] 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 8b80f0cfa84b..536b5a732885 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 diff --git a/go.sum b/go.sum index a2129ea3d6bb..1463f08764ac 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JP github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcgQlNkUzzDxko7AUOm445Tzs= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokKIux0SHqkkJzbBtDMkk= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 h1:zkywcvvuwJcdNUErYJ3JaujgTYy8iOqTZnMJtbt5GQo= From a31b1722ca5d37a2b57b1e117657df48946e0736 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:36 -0400 Subject: [PATCH 0368/2115] 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 536b5a732885..c50dadf5e719 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 diff --git a/go.sum b/go.sum index 1463f08764ac..83bf01f99ba6 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcg github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokKIux0SHqkkJzbBtDMkk= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA+TEOevVhA2u5RmcECE9lHLaI= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 h1:zkywcvvuwJcdNUErYJ3JaujgTYy8iOqTZnMJtbt5GQo= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 h1:rJcbtmScByQ6NBIXV97m6e8Rasd0zgvt1z84pdddU/4= From d44bf6219a8bc5719f7d0027297c227af715d527 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:37 -0400 Subject: [PATCH 0369/2115] 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 c50dadf5e719..06439e2c9031 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 diff --git a/go.sum b/go.sum index 83bf01f99ba6..7d2360a3ef2a 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokK github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA+TEOevVhA2u5RmcECE9lHLaI= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 h1:zkywcvvuwJcdNUErYJ3JaujgTYy8iOqTZnMJtbt5GQo= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3Y7sjOtH2NzTD6ngCO1PkdrrXDw= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 h1:rJcbtmScByQ6NBIXV97m6e8Rasd0zgvt1z84pdddU/4= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 h1:3H2613Pj9FkIkgPOd5Vi8oj7iLyV2qYMkhd8Qv6Q7qI= From c2b8fa2f33805eb424af24c0cef856a82e6be540 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:38 -0400 Subject: [PATCH 0370/2115] 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 06439e2c9031..954e1c94fcef 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 diff --git a/go.sum b/go.sum index 7d2360a3ef2a..855e1ae00b25 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3Y7sjOtH2NzTD6ngCO1PkdrrXDw= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 h1:rJcbtmScByQ6NBIXV97m6e8Rasd0zgvt1z84pdddU/4= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPcX+GPmGbz07Y/1llNdly6VQ= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 h1:3H2613Pj9FkIkgPOd5Vi8oj7iLyV2qYMkhd8Qv6Q7qI= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 h1:3JSAmJhQ2MgO8YFKv0CMab6NY3XUgK5SHemxqyCRdPY= From 5597ab765740692bfaadcca038c32eb2ed657263 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:38 -0400 Subject: [PATCH 0371/2115] 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 954e1c94fcef..7362ab14f86b 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 diff --git a/go.sum b/go.sum index 855e1ae00b25..e63e1625415e 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPcX+GPmGbz07Y/1llNdly6VQ= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 h1:3H2613Pj9FkIkgPOd5Vi8oj7iLyV2qYMkhd8Qv6Q7qI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX/DLifEnaw4z+UPOFkvy5tMkFzNzenTYPv1E= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 h1:3JSAmJhQ2MgO8YFKv0CMab6NY3XUgK5SHemxqyCRdPY= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 h1:32QN58w//10tYWkS+O+61EPBCKEM5FlLbM7n45wl0kM= From f2c3ae6ffae2aede6029c93030276a6b7351cc31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:39 -0400 Subject: [PATCH 0372/2115] 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 7362ab14f86b..bccf798ba506 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 diff --git a/go.sum b/go.sum index e63e1625415e..140be692d61c 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPc github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX/DLifEnaw4z+UPOFkvy5tMkFzNzenTYPv1E= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 h1:3JSAmJhQ2MgO8YFKv0CMab6NY3XUgK5SHemxqyCRdPY= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6IjsS8ytLoVZD3N0FEktpR30= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 h1:32QN58w//10tYWkS+O+61EPBCKEM5FlLbM7n45wl0kM= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 h1:Wgjh6Igu7HS57d8AjRIG0bHjybt015dBTc+zh2L/P3E= From 3edfb423ab5eb9af9b79ea0c3ecf08334b9b6ae1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:40 -0400 Subject: [PATCH 0373/2115] 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 bccf798ba506..ef72f577594c 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 diff --git a/go.sum b/go.sum index 140be692d61c..a0390197c443 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6IjsS8ytLoVZD3N0FEktpR30= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 h1:32QN58w//10tYWkS+O+61EPBCKEM5FlLbM7n45wl0kM= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMac+CB0Nik0k9iMNW+t4VW3SQ= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 h1:Wgjh6Igu7HS57d8AjRIG0bHjybt015dBTc+zh2L/P3E= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 h1:NmaelAJldom/+eWDlbYdurKrPL+TSvwKeHH/TnEYih8= From 6d8acdc39aff9e667d0806ba8758377715dfd267 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:41 -0400 Subject: [PATCH 0374/2115] 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 ef72f577594c..0f8277945ff2 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 diff --git a/go.sum b/go.sum index a0390197c443..9797a58a92ee 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6I github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMac+CB0Nik0k9iMNW+t4VW3SQ= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 h1:Wgjh6Igu7HS57d8AjRIG0bHjybt015dBTc+zh2L/P3E= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3JDDgbvhuLfzgnMB7zLksL4s= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 h1:NmaelAJldom/+eWDlbYdurKrPL+TSvwKeHH/TnEYih8= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 h1:GiSL2mJ/gSJR4p2HHRrydkM/LVtP82gssI3CKeGCFAk= From 8f358d2ed36d5af7073841049cf93a68519bcbc0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:42 -0400 Subject: [PATCH 0375/2115] 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 0f8277945ff2..7da016bd9423 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 diff --git a/go.sum b/go.sum index 9797a58a92ee..c4df2f5facd7 100644 --- a/go.sum +++ b/go.sum @@ -131,8 +131,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMa github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3JDDgbvhuLfzgnMB7zLksL4s= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 h1:NmaelAJldom/+eWDlbYdurKrPL+TSvwKeHH/TnEYih8= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdyDAvFU9CC0qA2Oxi+bLliXQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 h1:GiSL2mJ/gSJR4p2HHRrydkM/LVtP82gssI3CKeGCFAk= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 h1:LVhbfPyUufKIjKVengJswggsFAbdRJe3LGNf6xVjgDg= From c425bd5973c698cca87cde5608aa4f4cbdf94eed Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:42 -0400 Subject: [PATCH 0376/2115] 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 7da016bd9423..12b6269526e4 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 diff --git a/go.sum b/go.sum index c4df2f5facd7..80b6ce93f57b 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3J github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdyDAvFU9CC0qA2Oxi+bLliXQ= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 h1:GiSL2mJ/gSJR4p2HHRrydkM/LVtP82gssI3CKeGCFAk= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN41+Cko0INmM0YR5zXAqQEQnta40= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 h1:LVhbfPyUufKIjKVengJswggsFAbdRJe3LGNf6xVjgDg= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 h1:Tm4WvXnZ+tAlYB0W+hKi53reoQpUKr7/IiG/8zPYfOE= From 12d7eb768559a1c61d159617d5bf7a8e1da07e01 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:43 -0400 Subject: [PATCH 0377/2115] 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 12b6269526e4..bc98ab24a974 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 diff --git a/go.sum b/go.sum index 80b6ce93f57b..5095d8fea884 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdy github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN41+Cko0INmM0YR5zXAqQEQnta40= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 h1:LVhbfPyUufKIjKVengJswggsFAbdRJe3LGNf6xVjgDg= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuzn9ms74biIxu/YW7EgzQqlJWg= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 h1:Tm4WvXnZ+tAlYB0W+hKi53reoQpUKr7/IiG/8zPYfOE= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 h1:1yOLOPPI/SP+z1z7v50r4i0yJEBe667Tg513qv34Mok= From 525bc8dd54179e5282479688f6a6f489e8942fd7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:44 -0400 Subject: [PATCH 0378/2115] 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 bc98ab24a974..d4a9993450ff 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 diff --git a/go.sum b/go.sum index 5095d8fea884..8fa9f60bb005 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN4 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuzn9ms74biIxu/YW7EgzQqlJWg= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 h1:Tm4WvXnZ+tAlYB0W+hKi53reoQpUKr7/IiG/8zPYfOE= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/an1YyM1U/KXDRLIe8atCrs= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 h1:1yOLOPPI/SP+z1z7v50r4i0yJEBe667Tg513qv34Mok= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 h1:Zen0PfPRG8lStgXUeuNxvdAJ3TlFYJfkJStGmG0RPMg= From 48bb9f219eae10a2ea90f8d7ce19e06acea04f85 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:45 -0400 Subject: [PATCH 0379/2115] 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 d4a9993450ff..aa291450aa7c 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 diff --git a/go.sum b/go.sum index 8fa9f60bb005..40ee8d07a8fa 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuz github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/an1YyM1U/KXDRLIe8atCrs= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 h1:1yOLOPPI/SP+z1z7v50r4i0yJEBe667Tg513qv34Mok= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGBTm2f+tBs7h9iL35dhYGHZADY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 h1:Zen0PfPRG8lStgXUeuNxvdAJ3TlFYJfkJStGmG0RPMg= github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 h1:B0MOHup8sByXTFmHBa0Gtx31IUPypG1IIN/Fb/c3p7Y= From 5c9d5822dd0d453f0fbb8b35116293b5d8507e10 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:46 -0400 Subject: [PATCH 0380/2115] 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 aa291450aa7c..cfc69a0ee299 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 diff --git a/go.sum b/go.sum index 40ee8d07a8fa..624cdefdef52 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/a github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGBTm2f+tBs7h9iL35dhYGHZADY= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 h1:Zen0PfPRG8lStgXUeuNxvdAJ3TlFYJfkJStGmG0RPMg= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z6qGShPCgi2pYhMDOMpHtvo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 h1:B0MOHup8sByXTFmHBa0Gtx31IUPypG1IIN/Fb/c3p7Y= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 h1:3YI4ckLMF0x8IgZJaNz81aaUCnPSEvn9DqDZKkBBi2Q= From 6b8077f7e864046fab09637f07992b44481b1967 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:47 -0400 Subject: [PATCH 0381/2115] go get github.com/aws/aws-sdk-go-v2/service/codeconnections. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cfc69a0ee299..23ac2d6e6eb1 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 diff --git a/go.sum b/go.sum index 624cdefdef52..c96527e24d49 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGB github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z6qGShPCgi2pYhMDOMpHtvo= github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 h1:B0MOHup8sByXTFmHBa0Gtx31IUPypG1IIN/Fb/c3p7Y= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uKEakpDP/HCLroOLS7+7TykR56ck= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 h1:3YI4ckLMF0x8IgZJaNz81aaUCnPSEvn9DqDZKkBBi2Q= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 h1:ZY7lzj4WCPPMSU0PU3FV6Lnx0VzWe9mjlu60YBMkGGE= From b89a8283c0fbdc75948e50dbeb841bd5163734a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:47 -0400 Subject: [PATCH 0382/2115] 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 23ac2d6e6eb1..a3eca70d280c 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 diff --git a/go.sum b/go.sum index c96527e24d49..ecce73bc5d74 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uKEakpDP/HCLroOLS7+7TykR56ck= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 h1:3YI4ckLMF0x8IgZJaNz81aaUCnPSEvn9DqDZKkBBi2Q= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tTp07fBiSQpenGZD6fpDCwe0= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 h1:ZY7lzj4WCPPMSU0PU3FV6Lnx0VzWe9mjlu60YBMkGGE= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 h1:GN7I0M4vUQcc7BdwKqv2ly17OBeSPGfqm39BB1qFNkY= From 80b60a155cddffb436b1cae08b8335f055d31685 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:48 -0400 Subject: [PATCH 0383/2115] 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 a3eca70d280c..b21c72cbb1c8 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 diff --git a/go.sum b/go.sum index ecce73bc5d74..6e41270aa0bf 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uK github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tTp07fBiSQpenGZD6fpDCwe0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 h1:ZY7lzj4WCPPMSU0PU3FV6Lnx0VzWe9mjlu60YBMkGGE= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0t6Zd7Yng2o+XM6DtLd/+WnN6G1lA= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 h1:GN7I0M4vUQcc7BdwKqv2ly17OBeSPGfqm39BB1qFNkY= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 h1:UsHh9s5J3gW0WdAQ6bXekyEGZl2kCAMDPSsm7lzC6O4= From d97cafd2e50eb084cfd4ed291539e7b13a8981e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:49 -0400 Subject: [PATCH 0384/2115] 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 b21c72cbb1c8..511fe413fc8c 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 diff --git a/go.sum b/go.sum index 6e41270aa0bf..60de848a2078 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tT github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0t6Zd7Yng2o+XM6DtLd/+WnN6G1lA= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 h1:GN7I0M4vUQcc7BdwKqv2ly17OBeSPGfqm39BB1qFNkY= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr9svujyBtiL+P49lGkVTiWArXS7wY= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 h1:UsHh9s5J3gW0WdAQ6bXekyEGZl2kCAMDPSsm7lzC6O4= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 h1:yT67LHPTvlQ4pWq21DQSd8Fv8ERRDmsZCB2HQ1UjOvY= From 9c384423c1917a2b2a05e532e54016e786abef0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:50 -0400 Subject: [PATCH 0385/2115] 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 511fe413fc8c..a388bf351069 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 diff --git a/go.sum b/go.sum index 60de848a2078..9a87edda7431 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr9svujyBtiL+P49lGkVTiWArXS7wY= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 h1:UsHh9s5J3gW0WdAQ6bXekyEGZl2kCAMDPSsm7lzC6O4= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv0kfh9kS/IXuWT7KQ3KieJMO8= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 h1:yT67LHPTvlQ4pWq21DQSd8Fv8ERRDmsZCB2HQ1UjOvY= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 h1:L35FZUTiamMITQUbVY2Y593ZE/z5NXu0Qf7AEhBOQng= From 81be8c42409894c827f58faa58192b8a3810f717 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:51 -0400 Subject: [PATCH 0386/2115] 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 a388bf351069..76b8d6c5e8cd 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 diff --git a/go.sum b/go.sum index 9a87edda7431..7095d6ce9508 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv0kfh9kS/IXuWT7KQ3KieJMO8= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 h1:yT67LHPTvlQ4pWq21DQSd8Fv8ERRDmsZCB2HQ1UjOvY= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwcQQ0G9NPvhHASzG+DHEJE5acwFdvQqr4= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 h1:L35FZUTiamMITQUbVY2Y593ZE/z5NXu0Qf7AEhBOQng= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 h1:MybdZxWB1n6eljU2GuRXvrWXGW8YfFO3Iavml4qxnD4= From 77cf970c28ba8f4fad7062d0f0f17bd8fd0bcfcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:52 -0400 Subject: [PATCH 0387/2115] 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 76b8d6c5e8cd..a8b352fc0218 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 diff --git a/go.sum b/go.sum index 7095d6ce9508..add869901d73 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwcQQ0G9NPvhHASzG+DHEJE5acwFdvQqr4= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 h1:L35FZUTiamMITQUbVY2Y593ZE/z5NXu0Qf7AEhBOQng= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdEVgydpwe7J67mihtIdTWU6bl6KkrnrYExk= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 h1:MybdZxWB1n6eljU2GuRXvrWXGW8YfFO3Iavml4qxnD4= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 h1:0WVvuvoDZnwF/KAVGQc/utCamQUNa+vctMH9iZqfg/0= From 141ed89191b0cb16c67ee81475d7efc2b0a7b27e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:52 -0400 Subject: [PATCH 0388/2115] 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 a8b352fc0218..715467b110b3 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 diff --git a/go.sum b/go.sum index add869901d73..4622650afab7 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwc github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdEVgydpwe7J67mihtIdTWU6bl6KkrnrYExk= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 h1:MybdZxWB1n6eljU2GuRXvrWXGW8YfFO3Iavml4qxnD4= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGFdXWIeVPzEp73Q5Nr1QQs4klJvYU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 h1:0WVvuvoDZnwF/KAVGQc/utCamQUNa+vctMH9iZqfg/0= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 h1:1T63UDiImeXzq1itj5CAv0S2i89BnVqKyz9pVbQtC4c= From 86381a3ef3acf30d62411c05079b8d1c757d95d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:53 -0400 Subject: [PATCH 0389/2115] go get github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 715467b110b3..ce0c4ca5a4f8 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 diff --git a/go.sum b/go.sum index 4622650afab7..2eba51af262b 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdE github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGFdXWIeVPzEp73Q5Nr1QQs4klJvYU= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 h1:0WVvuvoDZnwF/KAVGQc/utCamQUNa+vctMH9iZqfg/0= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe9nJvQOgv0hbiBO5jSP9i71LkMIyao9/jArY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 h1:1T63UDiImeXzq1itj5CAv0S2i89BnVqKyz9pVbQtC4c= github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p0jKqVChgffqMXQkMe3vm4agmgvII= From 4dbf03181327952f5a76906888b0f6616e731162 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:54 -0400 Subject: [PATCH 0390/2115] 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 ce0c4ca5a4f8..7d22dc8454f7 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 diff --git a/go.sum b/go.sum index 2eba51af262b..970d929cd696 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGF github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe9nJvQOgv0hbiBO5jSP9i71LkMIyao9/jArY= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 h1:1T63UDiImeXzq1itj5CAv0S2i89BnVqKyz9pVbQtC4c= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOYFStHLHirAKn5MWQa9wWF3k= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p0jKqVChgffqMXQkMe3vm4agmgvII= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= From 035f5e8ca870b10e52a311fbf4853e29b2f6c037 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:55 -0400 Subject: [PATCH 0391/2115] 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 7d22dc8454f7..62c4181b82db 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 diff --git a/go.sum b/go.sum index 970d929cd696..7a3092915c34 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOYFStHLHirAKn5MWQa9wWF3k= github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p0jKqVChgffqMXQkMe3vm4agmgvII= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOrp7m+IbkK39VoclC71Nfl9g2Jnfko= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= From 15ea2286e2e85b83c10ad3f1d8f43015cadd24c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:56 -0400 Subject: [PATCH 0392/2115] 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 62c4181b82db..a917572578b0 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 - github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 + github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 diff --git a/go.sum b/go.sum index 7a3092915c34..941366980161 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOY github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOrp7m+IbkK39VoclC71Nfl9g2Jnfko= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= +github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5LC8M0vwhlGlvuHQrboIQbeor84= +github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= github.com/aws/aws-sdk-go-v2/service/connect v1.136.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= From 4e7358926167ba5ec4681f1db014347439c611a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:57 -0400 Subject: [PATCH 0393/2115] go get github.com/aws/aws-sdk-go-v2/service/connect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a917572578b0..ae523b3d7dc2 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 - github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 + github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 diff --git a/go.sum b/go.sum index 941366980161..d27999caebd9 100644 --- a/go.sum +++ b/go.sum @@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOr github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5LC8M0vwhlGlvuHQrboIQbeor84= github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT0sKDAbA4pCDXEMHxlzOc= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= From 5bf94724019c11ab48bec8693613ef1861fd85b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:58 -0400 Subject: [PATCH 0394/2115] 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 ae523b3d7dc2..d264f5a1d47b 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 diff --git a/go.sum b/go.sum index d27999caebd9..b262ff683fe0 100644 --- a/go.sum +++ b/go.sum @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5L github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT0sKDAbA4pCDXEMHxlzOc= github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EVIK1MruqQaWMplBXCivBsdJvQ= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 h1:LiLWwq5mYglYoksyMXV/L0ZLw+dtnIGXvpoAMri2zEs= From f078f0d0ea804f9101adfa7ef6cace9378c0f31c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:30:59 -0400 Subject: [PATCH 0395/2115] 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 d264f5a1d47b..6e2ad89753c1 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 + github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 diff --git a/go.sum b/go.sum index b262ff683fe0..7ce6b19f4dd3 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EVIK1MruqQaWMplBXCivBsdJvQ= github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dWr7l75Yq8WXO3OqpHmlAWDFE4= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 h1:LiLWwq5mYglYoksyMXV/L0ZLw+dtnIGXvpoAMri2zEs= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 h1:5e/C1PaQywGtklpMotdHKon/8MfsDyzJ9WFh0ge8G38= From d4290ae931550182f56fbe2e2c14e9c5b71580b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:00 -0400 Subject: [PATCH 0396/2115] 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 6e2ad89753c1..fe719afd33ab 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 diff --git a/go.sum b/go.sum index 7ce6b19f4dd3..f3c5a216f367 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EV github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dWr7l75Yq8WXO3OqpHmlAWDFE4= github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 h1:LiLWwq5mYglYoksyMXV/L0ZLw+dtnIGXvpoAMri2zEs= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorlvmboxxMjpfFFe18TkFOjBo6wHtSGGMAVhrs+w= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 h1:5e/C1PaQywGtklpMotdHKon/8MfsDyzJ9WFh0ge8G38= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 h1:nRXBomiIJKLbn8tYbYp2hOmP6mejmzksC8SaekKBVD0= From e8f0d697a706739b5c0dcbfa76f7ed3e3e8d198e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:01 -0400 Subject: [PATCH 0397/2115] 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 fe719afd33ab..b8b6f6deae72 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 diff --git a/go.sum b/go.sum index f3c5a216f367..cb20efd86ec7 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dW github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorlvmboxxMjpfFFe18TkFOjBo6wHtSGGMAVhrs+w= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 h1:5e/C1PaQywGtklpMotdHKon/8MfsDyzJ9WFh0ge8G38= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss5cLuCwOp2s7aZ53I0jRTb0aA= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 h1:nRXBomiIJKLbn8tYbYp2hOmP6mejmzksC8SaekKBVD0= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 h1:04V9n8NhsYlUFkn7IXKUeR6MpDq0XJ3eTXEJCJtYkdY= From 3aa0efef96eb30fac92f1dbf21db4045dd9640bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:02 -0400 Subject: [PATCH 0398/2115] 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 b8b6f6deae72..941c6d813d96 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 diff --git a/go.sum b/go.sum index cb20efd86ec7..60bf2e382f97 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorl github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss5cLuCwOp2s7aZ53I0jRTb0aA= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 h1:nRXBomiIJKLbn8tYbYp2hOmP6mejmzksC8SaekKBVD0= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf365Qj+kfv43xA3/C1MbA5rwn3TQBQCjns= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 h1:04V9n8NhsYlUFkn7IXKUeR6MpDq0XJ3eTXEJCJtYkdY= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 h1:Ne8EdY5+nD81tsUgYwijc5Lbc1Dnn1ijCG8npw/yGhA= From 52dc614fbf36e9669176d3a270dec7f9555aaf5a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:02 -0400 Subject: [PATCH 0399/2115] 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 941c6d813d96..7ca811559757 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 diff --git a/go.sum b/go.sum index 60bf2e382f97..4cdf741c6ac4 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf365Qj+kfv43xA3/C1MbA5rwn3TQBQCjns= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 h1:04V9n8NhsYlUFkn7IXKUeR6MpDq0XJ3eTXEJCJtYkdY= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr5G9/mz492E/NZ8BwmcpCqOwMGe0w= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 h1:Ne8EdY5+nD81tsUgYwijc5Lbc1Dnn1ijCG8npw/yGhA= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 h1:7vB0On4jaXFKzo71y89tWgv7LyrgXh4z5obihxV0IYg= From 914e1690d353afe9727dfc0632a4dd9160a8be99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:03 -0400 Subject: [PATCH 0400/2115] go get github.com/aws/aws-sdk-go-v2/service/databasemigrationservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7ca811559757..6267e79079ac 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 diff --git a/go.sum b/go.sum index 4cdf741c6ac4..1fc2b9c4679e 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf36 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr5G9/mz492E/NZ8BwmcpCqOwMGe0w= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 h1:Ne8EdY5+nD81tsUgYwijc5Lbc1Dnn1ijCG8npw/yGhA= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0kPb957Ik8WWK891n1TEIK82jorIAlr57Wpe0= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 h1:7vB0On4jaXFKzo71y89tWgv7LyrgXh4z5obihxV0IYg= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 h1:cSSIBQiQhVVjDOTCKPqp0jsJvfY/zHjKc7VJkIeAQas= From 6d664c3f4a7edf4e6c5c3203ff0dbbd3c08a9e00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:04 -0400 Subject: [PATCH 0401/2115] go get github.com/aws/aws-sdk-go-v2/service/databrew. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6267e79079ac..7b80c2f9bf61 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 diff --git a/go.sum b/go.sum index 1fc2b9c4679e..17386200a3ec 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0kPb957Ik8WWK891n1TEIK82jorIAlr57Wpe0= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 h1:7vB0On4jaXFKzo71y89tWgv7LyrgXh4z5obihxV0IYg= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiNuxit+Ust9V2Xh9vIVitU= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 h1:cSSIBQiQhVVjDOTCKPqp0jsJvfY/zHjKc7VJkIeAQas= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 h1:5a76AMaI1x9YHhL6qclsXWbV/vZEQN1r/cZK9T045pE= From 27c29ad8e4262f74c5567288e0ef2dd41e12ba87 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:05 -0400 Subject: [PATCH 0402/2115] go get github.com/aws/aws-sdk-go-v2/service/dataexchange. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7b80c2f9bf61..c9465e8b7a58 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 diff --git a/go.sum b/go.sum index 17386200a3ec..d0ac6f8c7ff6 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiNuxit+Ust9V2Xh9vIVitU= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 h1:cSSIBQiQhVVjDOTCKPqp0jsJvfY/zHjKc7VJkIeAQas= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zRXfGl+z+/G+OepNoVsDHRtPWM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 h1:5a76AMaI1x9YHhL6qclsXWbV/vZEQN1r/cZK9T045pE= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 h1:6e3BS+A00UPLzkgtWj5Sakvom0G5qAn/dEk8U7QG/n4= From 8bc5f6767232a65e231f483a6340baa790c8d41e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:06 -0400 Subject: [PATCH 0403/2115] go get github.com/aws/aws-sdk-go-v2/service/datapipeline. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c9465e8b7a58..b3b1a99bb8c8 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 diff --git a/go.sum b/go.sum index d0ac6f8c7ff6..0b5c2888a965 100644 --- a/go.sum +++ b/go.sum @@ -187,8 +187,8 @@ github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiN github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zRXfGl+z+/G+OepNoVsDHRtPWM= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 h1:5a76AMaI1x9YHhL6qclsXWbV/vZEQN1r/cZK9T045pE= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbCblFgOa6v1LKrjab7uzxiSvx0= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 h1:6e3BS+A00UPLzkgtWj5Sakvom0G5qAn/dEk8U7QG/n4= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 h1:2gorOSV7BNgRqmV6z9u+dhZ1kkPcaaAF8XMnK3ZUfKw= From 1d05929b4b04456127180a751af0b28e315c79a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:07 -0400 Subject: [PATCH 0404/2115] 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 b3b1a99bb8c8..d4417ad35844 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 + github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 diff --git a/go.sum b/go.sum index 0b5c2888a965..1b7f03339fad 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,8 @@ github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zR github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbCblFgOa6v1LKrjab7uzxiSvx0= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 h1:6e3BS+A00UPLzkgtWj5Sakvom0G5qAn/dEk8U7QG/n4= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7dRexP9npk0DKjBGHBRmk= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 h1:2gorOSV7BNgRqmV6z9u+dhZ1kkPcaaAF8XMnK3ZUfKw= github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 h1:wDyL0EZw99zVGuzf4E/AZMiHVp/V6j9+Z8VkP2Xr55M= From f41bb9fbfc0ec5b561023141028527b2dff27fcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:08 -0400 Subject: [PATCH 0405/2115] 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 d4417ad35844..afb05ffba3df 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 - github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 + github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 diff --git a/go.sum b/go.sum index 1b7f03339fad..ae32e2389f79 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbC github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7dRexP9npk0DKjBGHBRmk= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= -github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 h1:2gorOSV7BNgRqmV6z9u+dhZ1kkPcaaAF8XMnK3ZUfKw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBkNTeMfO1iXeazduNjZghw= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 h1:wDyL0EZw99zVGuzf4E/AZMiHVp/V6j9+Z8VkP2Xr55M= github.com/aws/aws-sdk-go-v2/service/dax v1.27.0/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 h1:0av6yvy0lYUtlgDnZoinqIsYbjM8D4JkEnXzh0WKWwM= From 2806260191d0dcc2287e0a542adfc10b3eddadcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:09 -0400 Subject: [PATCH 0406/2115] 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 afb05ffba3df..6c52725af434 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 - github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 + github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 diff --git a/go.sum b/go.sum index ae32e2389f79..40e5e269d11b 100644 --- a/go.sum +++ b/go.sum @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBkNTeMfO1iXeazduNjZghw= github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 h1:wDyL0EZw99zVGuzf4E/AZMiHVp/V6j9+Z8VkP2Xr55M= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.0/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZMcOeDawZAmA2JhY8= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 h1:0av6yvy0lYUtlgDnZoinqIsYbjM8D4JkEnXzh0WKWwM= github.com/aws/aws-sdk-go-v2/service/detective v1.36.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 h1:zvhsIkUZOol3DwpcvFl/y14uSSs1JNcGsbu7cMdSxqU= From e6d698bc7ffe3fb19ef6dd410896364994935900 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:09 -0400 Subject: [PATCH 0407/2115] go get github.com/aws/aws-sdk-go-v2/service/detective. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c52725af434..97acc38b46ea 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 - github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 diff --git a/go.sum b/go.sum index 40e5e269d11b..c567209877e3 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBk github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZMcOeDawZAmA2JhY8= github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= -github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 h1:0av6yvy0lYUtlgDnZoinqIsYbjM8D4JkEnXzh0WKWwM= -github.com/aws/aws-sdk-go-v2/service/detective v1.36.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcBOr1dxiVvgp/eeh69VX51g= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 h1:zvhsIkUZOol3DwpcvFl/y14uSSs1JNcGsbu7cMdSxqU= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 h1:+yQPtAOwzsA/4eIT1oGcZu30dljvlCNec2pGOPUsw4A= From 3eeb8cc9882452657456b861d2b2be3469c20242 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:10 -0400 Subject: [PATCH 0408/2115] 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 97acc38b46ea..bbf97f7186e1 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 diff --git a/go.sum b/go.sum index c567209877e3..8ff3a6ece49f 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZM github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcBOr1dxiVvgp/eeh69VX51g= github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 h1:zvhsIkUZOol3DwpcvFl/y14uSSs1JNcGsbu7cMdSxqU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hLC4Ef3fBUEBMymeJ6LA3oiM= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 h1:+yQPtAOwzsA/4eIT1oGcZu30dljvlCNec2pGOPUsw4A= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 h1:2ol44vp1EY9Y4IyhWCpwcjZ2KOEl84r29q0bpyvykfo= From 8ff7df231c0e635160c2f2b9cad6103484a23837 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:11 -0400 Subject: [PATCH 0409/2115] 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 bbf97f7186e1..8f1183887548 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 diff --git a/go.sum b/go.sum index 8ff3a6ece49f..238b6d9803c1 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,8 @@ github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcB github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hLC4Ef3fBUEBMymeJ6LA3oiM= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 h1:+yQPtAOwzsA/4eIT1oGcZu30dljvlCNec2pGOPUsw4A= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPomVLQGFHD9z2H0ygmWVglxTo= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 h1:2ol44vp1EY9Y4IyhWCpwcjZ2KOEl84r29q0bpyvykfo= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 h1:raC54NZ3nBlLL8AJgcH4jcI6tM0bPm2gxVk5svtN1hw= From bb0af98a6b0045b49fa5794b3540f7a1b3a3ea77 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:12 -0400 Subject: [PATCH 0410/2115] go get github.com/aws/aws-sdk-go-v2/service/directconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8f1183887548..46e2f837e0d8 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 diff --git a/go.sum b/go.sum index 238b6d9803c1..4e32da5dd90c 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,8 @@ github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hL github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPomVLQGFHD9z2H0ygmWVglxTo= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 h1:2ol44vp1EY9Y4IyhWCpwcjZ2KOEl84r29q0bpyvykfo= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5DsgS/GinFFru/K+zExATiuv36xw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 h1:raC54NZ3nBlLL8AJgcH4jcI6tM0bPm2gxVk5svtN1hw= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 h1:akYzmgxmrLRoKJ8USAoiCf8OANELsIkFAx66QFaq/gk= From e9e11b4b1a732f9d276d1cb2b4bc13c712aa303a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:13 -0400 Subject: [PATCH 0411/2115] 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 46e2f837e0d8..77906632318d 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 diff --git a/go.sum b/go.sum index 4e32da5dd90c..8bc15d6466ff 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPom github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5DsgS/GinFFru/K+zExATiuv36xw= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 h1:raC54NZ3nBlLL8AJgcH4jcI6tM0bPm2gxVk5svtN1hw= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq27Z9mw9XtpS0tmPjPk4jUGTgX7RM= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 h1:akYzmgxmrLRoKJ8USAoiCf8OANELsIkFAx66QFaq/gk= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 h1:sFzfpQ9wg2aHBKLP/pphRDFuV2QXFlcWMU+ZVwN1UF8= From f92cbf2b6112772c8bfa7a35864ac73eaa448a5e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:13 -0400 Subject: [PATCH 0412/2115] 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 77906632318d..879f4acf26ed 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 + github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 diff --git a/go.sum b/go.sum index 8bc15d6466ff..2c20aa7ccf27 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,8 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5Ds github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq27Z9mw9XtpS0tmPjPk4jUGTgX7RM= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 h1:akYzmgxmrLRoKJ8USAoiCf8OANELsIkFAx66QFaq/gk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3NhpsijsoikffXNQjpfW6ClgtIAw= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 h1:sFzfpQ9wg2aHBKLP/pphRDFuV2QXFlcWMU+ZVwN1UF8= github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 h1:afUxq/oBOeeCGxYBAq99U4lhHUL39BNUWnyA10VYtA0= From 247df9b99495c7b45840122a654bb7fb608fb043 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:14 -0400 Subject: [PATCH 0413/2115] 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 879f4acf26ed..bdae47d66f78 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 + github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 diff --git a/go.sum b/go.sum index 2c20aa7ccf27..4325a943f305 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3NhpsijsoikffXNQjpfW6ClgtIAw= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 h1:sFzfpQ9wg2aHBKLP/pphRDFuV2QXFlcWMU+ZVwN1UF8= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DXfyTMLBQjePEBxA13A= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 h1:afUxq/oBOeeCGxYBAq99U4lhHUL39BNUWnyA10VYtA0= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 h1:Vt2ZQQQEs+OS9bvrnHZiL9TnTXQr1bdZlagdltETc2s= From d3e80fe81d707b3cc419bfebab0f84270a84bb99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:15 -0400 Subject: [PATCH 0414/2115] 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 bdae47d66f78..b2e73cff89b6 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 diff --git a/go.sum b/go.sum index 4325a943f305..f161ee02dc78 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,8 @@ github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3Nhpsijsoikff github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DXfyTMLBQjePEBxA13A= github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 h1:afUxq/oBOeeCGxYBAq99U4lhHUL39BNUWnyA10VYtA0= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58VFfsO73Hr09/i3J3IPqf74HEs= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 h1:Vt2ZQQQEs+OS9bvrnHZiL9TnTXQr1bdZlagdltETc2s= github.com/aws/aws-sdk-go-v2/service/drs v1.34.0/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7S9oNqatToa+8XkI= From c342787f2e2ff758422b1cdf2ebc61969d27e13b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:16 -0400 Subject: [PATCH 0415/2115] 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 b2e73cff89b6..f5a5370985df 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 - github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 + github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 diff --git a/go.sum b/go.sum index f161ee02dc78..494d07cc5963 100644 --- a/go.sum +++ b/go.sum @@ -211,8 +211,8 @@ github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DX github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58VFfsO73Hr09/i3J3IPqf74HEs= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 h1:Vt2ZQQQEs+OS9bvrnHZiL9TnTXQr1bdZlagdltETc2s= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.0/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg9NTwRDQH9tne9Fk= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7S9oNqatToa+8XkI= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= From 20074c6abd6ab6c8ddf21ac0cd9599474e44fa61 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:17 -0400 Subject: [PATCH 0416/2115] go get github.com/aws/aws-sdk-go-v2/service/dsql. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f5a5370985df..443e4bf22471 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 diff --git a/go.sum b/go.sum index 494d07cc5963..0106c9059efe 100644 --- a/go.sum +++ b/go.sum @@ -213,8 +213,8 @@ github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58V github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg9NTwRDQH9tne9Fk= github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7S9oNqatToa+8XkI= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBaq2lNDYc7H6Gqjfo= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= From a9f95dfd42a55fa2603b61c1deb0ca9e62b1df65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:18 -0400 Subject: [PATCH 0417/2115] go get github.com/aws/aws-sdk-go-v2/service/dynamodb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 443e4bf22471..c536a4048468 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 diff --git a/go.sum b/go.sum index 0106c9059efe..ca06bf47441f 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,8 @@ github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBaq2lNDYc7H6Gqjfo= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnIKqm0IFCwJPtJrwPULODY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= From 24657d61cee32079d088e8315386e6e0737678b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:19 -0400 Subject: [PATCH 0418/2115] 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 c536a4048468..88f089b68207 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 diff --git a/go.sum b/go.sum index ca06bf47441f..c434302ddd61 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBa github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnIKqm0IFCwJPtJrwPULODY= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRodjXoSCG7WPwjeLgQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= From c7dce448bf7b0a45592d41afff40ef0c620607c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:20 -0400 Subject: [PATCH 0419/2115] 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 88f089b68207..19f4d4cf3f94 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 diff --git a/go.sum b/go.sum index c434302ddd61..c6515ceea1b1 100644 --- a/go.sum +++ b/go.sum @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnI github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRodjXoSCG7WPwjeLgQ= github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6SqbHvTH8F9MO/sw= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 h1:ZeUDPcF93I5pE614AD8Le5a1e+383jjJ8lopM/WVfB8= From deb1df4e2ec7bbe8f088ce0037c586f6bc244e62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:20 -0400 Subject: [PATCH 0420/2115] 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 19f4d4cf3f94..752c9ff3a9ce 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 diff --git a/go.sum b/go.sum index c6515ceea1b1..e5f293940f69 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRo github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6SqbHvTH8F9MO/sw= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54chTlqVyR7T7u1qUlSECFJf4= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 h1:ZeUDPcF93I5pE614AD8Le5a1e+383jjJ8lopM/WVfB8= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 h1:nxn7P1nAd7ThB1B0WASAKvjddJQcvLzaOo9iN4tp3ZU= From e41772fe7c7905b204a79611d96b366b4bbbcd7e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:21 -0400 Subject: [PATCH 0421/2115] 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 752c9ff3a9ce..b1178f790acc 100644 --- a/go.mod +++ b/go.mod @@ -106,7 +106,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 diff --git a/go.sum b/go.sum index e5f293940f69..a5b5c70f3644 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54chTlqVyR7T7u1qUlSECFJf4= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 h1:ZeUDPcF93I5pE614AD8Le5a1e+383jjJ8lopM/WVfB8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7tHumyNb7/JXpbvMw= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 h1:nxn7P1nAd7ThB1B0WASAKvjddJQcvLzaOo9iN4tp3ZU= github.com/aws/aws-sdk-go-v2/service/efs v1.39.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 h1:05FWDmYfXhHbsHxeFQIY73GagpjkcTgVe8VotlO62Fc= From 6745ad1b267b948cb68b8b755f3928f3938abc53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:22 -0400 Subject: [PATCH 0422/2115] go get github.com/aws/aws-sdk-go-v2/service/efs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b1178f790acc..2f44f637e480 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 - github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 diff --git a/go.sum b/go.sum index a5b5c70f3644..f85d24c3cf3b 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54ch github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7tHumyNb7/JXpbvMw= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= -github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 h1:nxn7P1nAd7ThB1B0WASAKvjddJQcvLzaOo9iN4tp3ZU= -github.com/aws/aws-sdk-go-v2/service/efs v1.39.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/KXpIuElu3RK3U+fE= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 h1:05FWDmYfXhHbsHxeFQIY73GagpjkcTgVe8VotlO62Fc= github.com/aws/aws-sdk-go-v2/service/eks v1.70.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 h1:zJY3lR0AdRuigAub2GQkIMz/TP50Ia6R6VruPgWBIxk= From 401a7ff2d613786b1f3ad97de4b662d9d9a79fea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:23 -0400 Subject: [PATCH 0423/2115] 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 2f44f637e480..a3b41b229fcd 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 diff --git a/go.sum b/go.sum index f85d24c3cf3b..7b75cb43daf9 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7t github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/KXpIuElu3RK3U+fE= github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= -github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 h1:05FWDmYfXhHbsHxeFQIY73GagpjkcTgVe8VotlO62Fc= -github.com/aws/aws-sdk-go-v2/service/eks v1.70.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2uUwOJ3Zv0evH3LE= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 h1:zJY3lR0AdRuigAub2GQkIMz/TP50Ia6R6VruPgWBIxk= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 h1:x5N6Wy/2mP1fhS+xWzm+netHTbwMJy8zMFO786yVrHY= From fd7f9d9e5759049b46ca28e6187be6761b21c2cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:23 -0400 Subject: [PATCH 0424/2115] 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 a3b41b229fcd..60210ded722d 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 diff --git a/go.sum b/go.sum index 7b75cb43daf9..38cbc62ce118 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,8 @@ github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/K github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2uUwOJ3Zv0evH3LE= github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 h1:zJY3lR0AdRuigAub2GQkIMz/TP50Ia6R6VruPgWBIxk= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQflXCciN0qmwCTtRS5pfMZMRg= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 h1:x5N6Wy/2mP1fhS+xWzm+netHTbwMJy8zMFO786yVrHY= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 h1:FO6LzHczDXByBf8+WJ5cswxaGy1EOjDVXA3NQa97Bh8= From 4467321531817bc51de30abc7c839a60efe28e3f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:24 -0400 Subject: [PATCH 0425/2115] 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 60210ded722d..8ccc54b8672e 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 diff --git a/go.sum b/go.sum index 38cbc62ce118..f037cc2f261f 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2 github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQflXCciN0qmwCTtRS5pfMZMRg= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 h1:x5N6Wy/2mP1fhS+xWzm+netHTbwMJy8zMFO786yVrHY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXnSVkDvVtGb5p4wp3hVB6nunJ7meYA= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 h1:FO6LzHczDXByBf8+WJ5cswxaGy1EOjDVXA3NQa97Bh8= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 h1:2VJj7fSoDawAjQ91u/DtrrUDOGsuMaWxcbe9Ok/O27w= From 5300f31acf748ed8ff5c44b072e68acb5dbf36b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:25 -0400 Subject: [PATCH 0426/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8ccc54b8672e..684743e97596 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 diff --git a/go.sum b/go.sum index f037cc2f261f..98bcd3ded743 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQf github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXnSVkDvVtGb5p4wp3hVB6nunJ7meYA= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 h1:FO6LzHczDXByBf8+WJ5cswxaGy1EOjDVXA3NQa97Bh8= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/d/KXH4I0D/g4VAmaYkD4SwzJjEYgWLbs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 h1:2VJj7fSoDawAjQ91u/DtrrUDOGsuMaWxcbe9Ok/O27w= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 h1:1F8KThHdWVMySPUAzlFbr4dHZCPxnUh0xWhzroseuIM= From 33c4380df23925d25dc0b9d17e4b7904c41a14b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:26 -0400 Subject: [PATCH 0427/2115] 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 684743e97596..d7ec320f51e1 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 diff --git a/go.sum b/go.sum index 98bcd3ded743..47f7e1a2c8df 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXn github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/d/KXH4I0D/g4VAmaYkD4SwzJjEYgWLbs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 h1:2VJj7fSoDawAjQ91u/DtrrUDOGsuMaWxcbe9Ok/O27w= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPqFh69RSzPvGIjKJAKjBIB86ZlfSg1lePJMU= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 h1:1F8KThHdWVMySPUAzlFbr4dHZCPxnUh0xWhzroseuIM= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 h1:WUWDUubAtepFBqD/wWvejfep4pkFJeAMWqWHtEzKqFs= From 0c3482ba9704df1f9ac09335bc122b88f37cf586 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:26 -0400 Subject: [PATCH 0428/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticsearchservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d7ec320f51e1..c03dcfdb43ee 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 diff --git a/go.sum b/go.sum index 47f7e1a2c8df..d1d722df8dfa 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPqFh69RSzPvGIjKJAKjBIB86ZlfSg1lePJMU= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 h1:1F8KThHdWVMySPUAzlFbr4dHZCPxnUh0xWhzroseuIM= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBYsZF60ovGQ+QP1zeTMRVduZN/f9pwR8fo= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 h1:WUWDUubAtepFBqD/wWvejfep4pkFJeAMWqWHtEzKqFs= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 h1:rgBAS4KMAN6wNHtAuW2bOTyx6FyyXUu56ZajFC5LG6c= From 2e4d3420c0d070fd6c45f5f3626969437933ea0f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:27 -0400 Subject: [PATCH 0429/2115] go get github.com/aws/aws-sdk-go-v2/service/elastictranscoder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c03dcfdb43ee..3567cad055b6 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 diff --git a/go.sum b/go.sum index d1d722df8dfa..3dc76549244b 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPq github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBYsZF60ovGQ+QP1zeTMRVduZN/f9pwR8fo= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 h1:WUWDUubAtepFBqD/wWvejfep4pkFJeAMWqWHtEzKqFs= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFwi8ulI5dQIyfxY7WRkPIqwxzmhfgog= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 h1:rgBAS4KMAN6wNHtAuW2bOTyx6FyyXUu56ZajFC5LG6c= github.com/aws/aws-sdk-go-v2/service/emr v1.53.0/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 h1:N1i7XCvJKHgzndeebYdlNqc9LbOZs0LZIVgsxGuh7GE= From 6277db9d0393f5f30c41daf5a9454e61890ddc97 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:28 -0400 Subject: [PATCH 0430/2115] 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 3567cad055b6..f247ad68ea4c 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 - github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 + github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 diff --git a/go.sum b/go.sum index 3dc76549244b..c2a9c19f9903 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBY github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFwi8ulI5dQIyfxY7WRkPIqwxzmhfgog= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 h1:rgBAS4KMAN6wNHtAuW2bOTyx6FyyXUu56ZajFC5LG6c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.0/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPClR4nacB2z2Z9GMY= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 h1:N1i7XCvJKHgzndeebYdlNqc9LbOZs0LZIVgsxGuh7GE= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 h1:q9n5fiDdkpwpxEO5BatJs3j5Z+6hhN1++34kGHXDXqg= From 05b455f1bda2c91247cbf0f061d6c28c75a6d404 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:29 -0400 Subject: [PATCH 0431/2115] go get github.com/aws/aws-sdk-go-v2/service/emrcontainers. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f247ad68ea4c..1d11203c08f6 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 diff --git a/go.sum b/go.sum index c2a9c19f9903..b53699b15a95 100644 --- a/go.sum +++ b/go.sum @@ -243,8 +243,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFw github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPClR4nacB2z2Z9GMY= github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 h1:N1i7XCvJKHgzndeebYdlNqc9LbOZs0LZIVgsxGuh7GE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1DdytzxaKpkSBuPJiCJHJAka0x1Kw= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 h1:q9n5fiDdkpwpxEO5BatJs3j5Z+6hhN1++34kGHXDXqg= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 h1:uV0/UBsNeT3NMmUwfQxxWZCglA1EDcAuXAuUti8u0Mk= From 0ac588e8c26855018a513e51961af7ce8709d3f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:30 -0400 Subject: [PATCH 0432/2115] 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 1d11203c08f6..361502718db8 100644 --- a/go.mod +++ b/go.mod @@ -117,7 +117,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 diff --git a/go.sum b/go.sum index b53699b15a95..b00c878de175 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPC github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1DdytzxaKpkSBuPJiCJHJAka0x1Kw= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 h1:q9n5fiDdkpwpxEO5BatJs3j5Z+6hhN1++34kGHXDXqg= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93SsPqw7zHtcLDc5sE1uxQWv3qo= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 h1:uV0/UBsNeT3NMmUwfQxxWZCglA1EDcAuXAuUti8u0Mk= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 h1:XWxvVnRKkG/a5r0A6P5oJyfxMsYBOsCAk2RJt3ebSR0= From abcbbcb496ea45df668d1f66d8e83bfafa5682d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:31 -0400 Subject: [PATCH 0433/2115] 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 361502718db8..96eadb4fdcdd 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 diff --git a/go.sum b/go.sum index b00c878de175..43d372cb8462 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1Ddy github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93SsPqw7zHtcLDc5sE1uxQWv3qo= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 h1:uV0/UBsNeT3NMmUwfQxxWZCglA1EDcAuXAuUti8u0Mk= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910QWdjQIxfi4syx3Jgu1bRCJ0= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 h1:XWxvVnRKkG/a5r0A6P5oJyfxMsYBOsCAk2RJt3ebSR0= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 h1:3ukR4hfyYEyuZkYQxXY9c7lTL/KEzRsbT6DHqryMTZc= From 246027ace3a9d4ada79f40e6eb556347da021b13 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:32 -0400 Subject: [PATCH 0434/2115] 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 96eadb4fdcdd..a7be78173250 100644 --- a/go.mod +++ b/go.mod @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 + github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 diff --git a/go.sum b/go.sum index 43d372cb8462..d40dd608212b 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910QWdjQIxfi4syx3Jgu1bRCJ0= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 h1:XWxvVnRKkG/a5r0A6P5oJyfxMsYBOsCAk2RJt3ebSR0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl9MJzdgYGWLr31S4Ot4MzM= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 h1:3ukR4hfyYEyuZkYQxXY9c7lTL/KEzRsbT6DHqryMTZc= github.com/aws/aws-sdk-go-v2/service/evs v1.3.0/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 h1:qt27hk3l7kDo0rUvRk5HfrYiyPiT4t8ne9NDD2U3V9s= From e97c1a6c5b8a937e7fef5946cd2047ca67f0a34d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:33 -0400 Subject: [PATCH 0435/2115] go get github.com/aws/aws-sdk-go-v2/service/evs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a7be78173250..f3865da0399d 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 - github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 + github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 diff --git a/go.sum b/go.sum index d40dd608212b..0c55210fc36c 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl9MJzdgYGWLr31S4Ot4MzM= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 h1:3ukR4hfyYEyuZkYQxXY9c7lTL/KEzRsbT6DHqryMTZc= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.0/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56N9yckM6ECJx6Pk= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 h1:qt27hk3l7kDo0rUvRk5HfrYiyPiT4t8ne9NDD2U3V9s= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 h1:ojhEbQATCj/vrI5046jdKMktHDhTtzYF0Wp1VZelB40= From a07aedf4be4243f74a28deba9bde322e572d192f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:34 -0400 Subject: [PATCH 0436/2115] 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 f3865da0399d..60df81e845b8 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 + github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 diff --git a/go.sum b/go.sum index 0c55210fc36c..ddbab944c069 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56N9yckM6ECJx6Pk= github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 h1:qt27hk3l7kDo0rUvRk5HfrYiyPiT4t8ne9NDD2U3V9s= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/NoD/1HKd9yf+XB6F50/VU= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 h1:ojhEbQATCj/vrI5046jdKMktHDhTtzYF0Wp1VZelB40= github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 h1:zsDCgJ6lWocX4wArsCQre2A92JzBPKKW+2Mg6SOQVVE= From cb5f409e637d8ee09ad7da9e2673639d2a786cf6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:34 -0400 Subject: [PATCH 0437/2115] 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 60df81e845b8..a7728eb49642 100644 --- a/go.mod +++ b/go.mod @@ -122,7 +122,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 + github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 diff --git a/go.sum b/go.sum index ddbab944c069..1fd12e4c1f20 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56 github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/NoD/1HKd9yf+XB6F50/VU= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 h1:ojhEbQATCj/vrI5046jdKMktHDhTtzYF0Wp1VZelB40= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/ybLKdSdcCttE8hw/+NK99E= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 h1:zsDCgJ6lWocX4wArsCQre2A92JzBPKKW+2Mg6SOQVVE= github.com/aws/aws-sdk-go-v2/service/fis v1.36.0/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 h1:tTeH6402fy5Z8JHuUO6aL2yn5WFzWSKF6epxYvIPAMs= From ac76a0a448a143dcd583858b3560dc547ebd434b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:35 -0400 Subject: [PATCH 0438/2115] 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 a7728eb49642..e1d8d0f0a601 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 - github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 + github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 diff --git a/go.sum b/go.sum index 1fd12e4c1f20..d649f1b86cd2 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/N github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/ybLKdSdcCttE8hw/+NK99E= github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 h1:zsDCgJ6lWocX4wArsCQre2A92JzBPKKW+2Mg6SOQVVE= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.0/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyXqr+tT5T7PckuuW4= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 h1:tTeH6402fy5Z8JHuUO6aL2yn5WFzWSKF6epxYvIPAMs= github.com/aws/aws-sdk-go-v2/service/fms v1.43.0/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 h1:whgqtOX1XdLhHidRX5EYA1VrY1qtb+/+eV7GrUSA1QY= From a1247e043c4bd2a45420448ab4df697bd6f7630a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:36 -0400 Subject: [PATCH 0439/2115] 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 e1d8d0f0a601..6db96fa0e418 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 - github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 + github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 diff --git a/go.sum b/go.sum index d649f1b86cd2..31743e2302e3 100644 --- a/go.sum +++ b/go.sum @@ -259,8 +259,8 @@ github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/yb github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyXqr+tT5T7PckuuW4= github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 h1:tTeH6402fy5Z8JHuUO6aL2yn5WFzWSKF6epxYvIPAMs= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.0/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2dQvZGlIXeD1YuPE= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 h1:whgqtOX1XdLhHidRX5EYA1VrY1qtb+/+eV7GrUSA1QY= github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 h1:JdlVzc51kIkdne4ilxnHAfKfXyhzkJ3eYrfZwk38j/k= From 1445d4a5ffc5cd9c7bab845046d3c8af49a65f5d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:37 -0400 Subject: [PATCH 0440/2115] go get github.com/aws/aws-sdk-go-v2/service/fsx. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6db96fa0e418..cbae730ca25f 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 + github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 diff --git a/go.sum b/go.sum index 31743e2302e3..0c7555127545 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyX github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2dQvZGlIXeD1YuPE= github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 h1:whgqtOX1XdLhHidRX5EYA1VrY1qtb+/+eV7GrUSA1QY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rFiG2+mQJK7Q3F7OU= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 h1:JdlVzc51kIkdne4ilxnHAfKfXyhzkJ3eYrfZwk38j/k= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4Xy4v745NtPCo5WIhLFk= From 5b24637ce11cde5004dcadf32abbd02989a7e50b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:38 -0400 Subject: [PATCH 0441/2115] go get github.com/aws/aws-sdk-go-v2/service/gamelift. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cbae730ca25f..b596d487d48f 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 diff --git a/go.sum b/go.sum index 0c7555127545..eb35ac12a9a6 100644 --- a/go.sum +++ b/go.sum @@ -263,8 +263,8 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2 github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rFiG2+mQJK7Q3F7OU= github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 h1:JdlVzc51kIkdne4ilxnHAfKfXyhzkJ3eYrfZwk38j/k= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OKooVwFZIOhKIxXX7OcReY= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4Xy4v745NtPCo5WIhLFk= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= From b4b52efdfffe9dbce0002c09324f0865a2d70863 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:39 -0400 Subject: [PATCH 0442/2115] 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 b596d487d48f..4b69222c4571 100644 --- a/go.mod +++ b/go.mod @@ -127,7 +127,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 + github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 diff --git a/go.sum b/go.sum index eb35ac12a9a6..b1e910d211d3 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rF github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OKooVwFZIOhKIxXX7OcReY= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4Xy4v745NtPCo5WIhLFk= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpbD+xLmYKpB+eH7ZHBvaU= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= From e7ee4f0e489cc94ff590dbf0b8384e41149f5a35 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:40 -0400 Subject: [PATCH 0443/2115] 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 4b69222c4571..cb04ea9594a1 100644 --- a/go.mod +++ b/go.mod @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 diff --git a/go.sum b/go.sum index b1e910d211d3..81ee35ab1f71 100644 --- a/go.sum +++ b/go.sum @@ -267,8 +267,8 @@ github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OK github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpbD+xLmYKpB+eH7ZHBvaU= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3BnF+SVU1h5VKTS+4Wy5bE1xRBuuCU= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= github.com/aws/aws-sdk-go-v2/service/glue v1.126.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= From 17e928f82e0aebdf84fe674ad2c32cd99d43996d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:41 -0400 Subject: [PATCH 0444/2115] go get github.com/aws/aws-sdk-go-v2/service/glue. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cb04ea9594a1..35981b28fc4d 100644 --- a/go.mod +++ b/go.mod @@ -129,7 +129,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 - github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 + github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 diff --git a/go.sum b/go.sum index 81ee35ab1f71..58028c5946c6 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpb github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3BnF+SVU1h5VKTS+4Wy5bE1xRBuuCU= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQzPRBBfmkZeeWh8eU4= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= From 6c181327fd8d730e6a882685a863320c6947be5e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:42 -0400 Subject: [PATCH 0445/2115] go get github.com/aws/aws-sdk-go-v2/service/grafana. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 35981b28fc4d..96739144cb1b 100644 --- a/go.mod +++ b/go.mod @@ -130,7 +130,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 - github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 + github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 diff --git a/go.sum b/go.sum index 58028c5946c6..24e5ae6ce137 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQzPRBBfmkZeeWh8eU4= github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= +github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9jtlVhL6ErvNd6FoL/Fw0= +github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 h1:aTtuwsQIMHjO9/FFeRvj5SQ7vbBlmFxHXhySY8TNavY= From f4d75c3f19e2ae8f5d10e8abe1f7bdd5a71c8f65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:43 -0400 Subject: [PATCH 0446/2115] go get github.com/aws/aws-sdk-go-v2/service/greengrass. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 96739144cb1b..c951510e824c 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 diff --git a/go.sum b/go.sum index 24e5ae6ce137..759c884ae785 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQ github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9jtlVhL6ErvNd6FoL/Fw0= github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2Jax46aZYwgEZzOdh/fIJDWg= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 h1:aTtuwsQIMHjO9/FFeRvj5SQ7vbBlmFxHXhySY8TNavY= github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 h1:y+d7el0K+Vy5/YcxYst6uIHHFurCw0jc0jN3eHEMWxI= From fc521cb673672be5a400976ee3a14166d091d9f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:43 -0400 Subject: [PATCH 0447/2115] 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 c951510e824c..b0ed3dd7eca5 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 diff --git a/go.sum b/go.sum index 759c884ae785..7d757d5c3cff 100644 --- a/go.sum +++ b/go.sum @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9j github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2Jax46aZYwgEZzOdh/fIJDWg= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 h1:aTtuwsQIMHjO9/FFeRvj5SQ7vbBlmFxHXhySY8TNavY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyxSp8lfMqlvgmxExw48mhM6tYvw= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 h1:y+d7el0K+Vy5/YcxYst6uIHHFurCw0jc0jN3eHEMWxI= github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 h1:oVJU7GYNUPjlJN8kv8E1BI0MrI0Zif57BZvXUAOIWMw= From 163373a520c434c4fe808f2fdf7dc3a51984776f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:44 -0400 Subject: [PATCH 0448/2115] 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 b0ed3dd7eca5..55f7f1a1e063 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 diff --git a/go.sum b/go.sum index 7d757d5c3cff..33c1b41259be 100644 --- a/go.sum +++ b/go.sum @@ -277,8 +277,8 @@ github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2J github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyxSp8lfMqlvgmxExw48mhM6tYvw= github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 h1:y+d7el0K+Vy5/YcxYst6uIHHFurCw0jc0jN3eHEMWxI= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRKlJxdsxxBLhv5w5eBBhk+8= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 h1:oVJU7GYNUPjlJN8kv8E1BI0MrI0Zif57BZvXUAOIWMw= github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 h1:bJgrqPT2vy+OrJpSeVfZ4e4zaD/EVdcq+5yxDtUOql0= From c10d386616f679eb82e0d1e15fcecb63969a8fcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:45 -0400 Subject: [PATCH 0449/2115] 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 55f7f1a1e063..30cdacf0b74a 100644 --- a/go.mod +++ b/go.mod @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 diff --git a/go.sum b/go.sum index 33c1b41259be..dbcea9d112ef 100644 --- a/go.sum +++ b/go.sum @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyx github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRKlJxdsxxBLhv5w5eBBhk+8= github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 h1:oVJU7GYNUPjlJN8kv8E1BI0MrI0Zif57BZvXUAOIWMw= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUglJGh7lH+jOpDkiotb0IB7A= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 h1:bJgrqPT2vy+OrJpSeVfZ4e4zaD/EVdcq+5yxDtUOql0= github.com/aws/aws-sdk-go-v2/service/iam v1.46.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 h1:Ho/jmeFRCaRZM0hoTzaOFYbV74nWBefREYVPn75AqRA= From 3fd9c5ba5be1211e13de343d2c6d6fa190ffdc36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:46 -0400 Subject: [PATCH 0450/2115] 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 30cdacf0b74a..6a4593832af2 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 - github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 diff --git a/go.sum b/go.sum index dbcea9d112ef..298a034d5855 100644 --- a/go.sum +++ b/go.sum @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRK github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUglJGh7lH+jOpDkiotb0IB7A= github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= -github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 h1:bJgrqPT2vy+OrJpSeVfZ4e4zaD/EVdcq+5yxDtUOql0= -github.com/aws/aws-sdk-go-v2/service/iam v1.46.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfijI55jb7wB6vFiJo= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 h1:Ho/jmeFRCaRZM0hoTzaOFYbV74nWBefREYVPn75AqRA= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 h1:h1DzFDVG7/vPWsQVf8oQdgmWMleJU5gWt4OPZVnxxIU= From 87447b2fc1f13af23b0820fc4d9f31dd85631112 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:47 -0400 Subject: [PATCH 0451/2115] 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 6a4593832af2..80490a93c311 100644 --- a/go.mod +++ b/go.mod @@ -136,7 +136,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 diff --git a/go.sum b/go.sum index 298a034d5855..51a7c82cde61 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,8 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUg github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfijI55jb7wB6vFiJo= github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 h1:Ho/jmeFRCaRZM0hoTzaOFYbV74nWBefREYVPn75AqRA= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsmAiYIKWZRqBinXrZXeg88ftz2E= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 h1:h1DzFDVG7/vPWsQVf8oQdgmWMleJU5gWt4OPZVnxxIU= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 h1:rqaDVBRPXDmWIVu6RClCQiF2eoBCEjqCjf9YgRiFYH4= From 9361d5f1f78529c52e337e216b07a32f8a108a03 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:48 -0400 Subject: [PATCH 0452/2115] go get github.com/aws/aws-sdk-go-v2/service/imagebuilder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 80490a93c311..34a605d1d5f7 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 diff --git a/go.sum b/go.sum index 51a7c82cde61..32c30f61598c 100644 --- a/go.sum +++ b/go.sum @@ -285,8 +285,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfi github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsmAiYIKWZRqBinXrZXeg88ftz2E= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 h1:h1DzFDVG7/vPWsQVf8oQdgmWMleJU5gWt4OPZVnxxIU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKudWP8MFS0fiwzKAe0VK2UfTQE0= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 h1:rqaDVBRPXDmWIVu6RClCQiF2eoBCEjqCjf9YgRiFYH4= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 h1:pwIs1giy/xJWUCT0dfAK7EHvAdOFohFHJDyOLvOiMfk= From 209ed22ff83acb3506566e15b2d2f77afc1f716d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 14:07:13 -0400 Subject: [PATCH 0453/2115] r/aws_s3: add generic `resourceImportID` type This custom import type will be leveraged by multiple resources in the `s3` package which share a common identifier structure. Specifically a required `bucket` argument and an optional `expected_bucket_owner` argument. Resources currently using this to set and parse the identifier (during create and read operations, respectively) will indicate this custom import function should be used when adding resource identity support via an annotation. --- internal/service/s3/id.go | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/internal/service/s3/id.go b/internal/service/s3/id.go index f22052ab4b76..ada738471bfb 100644 --- a/internal/service/s3/id.go +++ b/internal/service/s3/id.go @@ -6,6 +6,10 @@ package s3 import ( "fmt" "strings" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" + "github.com/hashicorp/terraform-provider-aws/names" ) const resourceIDSeparator = "," @@ -38,3 +42,33 @@ func parseResourceID(id string) (string, string, error) { return "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected BUCKET or BUCKET%[2]sEXPECTED_BUCKET_OWNER", id, resourceIDSeparator) } + +var _ inttypes.SDKv2ImportID = resourceImportID{} + +// resourceImportID is a generic custom import type supporting bucket-related resources. +// +// Resources which expect a bucket name and an optional accountID for the identifier +// can use this custom importer when adding resource identity support. +type resourceImportID struct{} + +func (resourceImportID) Create(d *schema.ResourceData) string { + bucket := d.Get(names.AttrBucket).(string) + expectedBucketOwner := d.Get(names.AttrExpectedBucketOwner).(string) + return createResourceID(bucket, expectedBucketOwner) +} + +func (resourceImportID) Parse(id string) (string, map[string]string, error) { + bucket, expectedBucketOwner, err := parseResourceID(id) + if err != nil { + return id, nil, err + } + + results := map[string]string{ + names.AttrBucket: bucket, + } + if expectedBucketOwner != "" { + results[names.AttrExpectedBucketOwner] = expectedBucketOwner + } + + return id, results, nil +} From 1f9f1fceea8259fec74e8a13f7206415622bdf2e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 13:42:42 -0400 Subject: [PATCH 0454/2115] Add parameterized resource identity to `aws_s3_bucket_logging` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketLogging make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketLogging' -timeout 360m -vet=off 2025/08/20 13:39:33 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 13:39:33 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccS3BucketLogging_TargetGrantByEmail bucket_logging_test.go:182: Environment variable AWS_S3_BUCKET_LOGGING_AMAZON_CUSTOMER_BY_EMAIL is not set, skipping test --- SKIP: TestAccS3BucketLogging_TargetGrantByEmail (0.00s) --- PASS: TestAccS3BucketLogging_directoryBucket (19.34s) --- PASS: TestAccS3BucketLogging_disappears (33.21s) --- PASS: TestAccS3BucketLogging_basic (36.27s) --- PASS: TestAccS3BucketLogging_Identity_RegionOverride (36.49s) --- PASS: TestAccS3BucketLogging_withExpectedBucketOwner (36.71s) --- PASS: TestAccS3BucketLogging_migrate_loggingWithChange (46.65s) --- PASS: TestAccS3BucketLogging_migrate_loggingNoChange (46.83s) --- PASS: TestAccS3BucketLogging_update (49.74s) --- PASS: TestAccS3BucketLogging_Identity_Basic (51.42s) --- PASS: TestAccS3BucketLogging_Identity_ExistingResource (63.42s) --- PASS: TestAccS3BucketLogging_TargetGrantByGroup (70.03s) --- PASS: TestAccS3BucketLogging_TargetGrantByID (70.97s) --- PASS: TestAccS3BucketLogging_withTargetObjectKeyFormat (82.98s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 89.546s ``` --- internal/service/s3/bucket_logging.go | 8 +- .../s3/bucket_logging_identity_gen_test.go | 255 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 8 + .../testdata/BucketLogging/basic/main_gen.tf | 39 +++ .../BucketLogging/basic_v6.9.0/main_gen.tf | 49 ++++ .../BucketLogging/region_override/main_gen.tf | 55 ++++ .../testdata/tmpl/bucket_logging_basic.gtpl | 35 +++ 7 files changed, 445 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_logging_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketLogging/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketLogging/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketLogging/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_logging_basic.gtpl diff --git a/internal/service/s3/bucket_logging.go b/internal/service/s3/bucket_logging.go index ce6ea789b611..59b5c71defac 100644 --- a/internal/service/s3/bucket_logging.go +++ b/internal/service/s3/bucket_logging.go @@ -24,6 +24,10 @@ import ( ) // @SDKResource("aws_s3_bucket_logging", name="Bucket Logging") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @ImportIDHandler("resourceImportID") +// @Testing(preIdentityVersion="v6.9.0") func resourceBucketLogging() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketLoggingCreate, @@ -31,10 +35,6 @@ func resourceBucketLogging() *schema.Resource { UpdateWithoutTimeout: resourceBucketLoggingUpdate, DeleteWithoutTimeout: resourceBucketLoggingDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_logging_identity_gen_test.go b/internal/service/s3/bucket_logging_identity_gen_test.go new file mode 100644 index 000000000000..683e7963a13c --- /dev/null +++ b/internal/service/s3/bucket_logging_identity_gen_test.go @@ -0,0 +1,255 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketLogging_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_logging.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketLoggingDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketLoggingExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketLogging_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_logging.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketLogging_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_logging.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketLoggingDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketLoggingExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketLogging/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 9497b5665082..82d9bb7691c0 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -170,6 +170,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_logging", Name: "Bucket Logging", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: resourceImportID{}, + }, }, { Factory: resourceBucketMetric, diff --git a/internal/service/s3/testdata/BucketLogging/basic/main_gen.tf b/internal/service/s3/testdata/BucketLogging/basic/main_gen.tf new file mode 100644 index 000000000000..5f2ddf4c570d --- /dev/null +++ b/internal/service/s3/testdata/BucketLogging/basic/main_gen.tf @@ -0,0 +1,39 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_logging" "test" { + bucket = aws_s3_bucket.test.id + + target_bucket = aws_s3_bucket.log_bucket.id + target_prefix = "log/" +} + +resource "aws_s3_bucket" "log_bucket" { + bucket = "${var.rName}-log" +} + +resource "aws_s3_bucket_ownership_controls" "log_bucket_ownership" { + bucket = aws_s3_bucket.log_bucket.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "log_bucket_acl" { + depends_on = [aws_s3_bucket_ownership_controls.log_bucket_ownership] + + bucket = aws_s3_bucket.log_bucket.id + acl = "log-delivery-write" +} + +resource "aws_s3_bucket" "test" { + depends_on = [aws_s3_bucket_acl.log_bucket_acl] + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketLogging/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketLogging/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..eb3695a032c1 --- /dev/null +++ b/internal/service/s3/testdata/BucketLogging/basic_v6.9.0/main_gen.tf @@ -0,0 +1,49 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_logging" "test" { + bucket = aws_s3_bucket.test.id + + target_bucket = aws_s3_bucket.log_bucket.id + target_prefix = "log/" +} + +resource "aws_s3_bucket" "log_bucket" { + bucket = "${var.rName}-log" +} + +resource "aws_s3_bucket_ownership_controls" "log_bucket_ownership" { + bucket = aws_s3_bucket.log_bucket.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "log_bucket_acl" { + depends_on = [aws_s3_bucket_ownership_controls.log_bucket_ownership] + + bucket = aws_s3_bucket.log_bucket.id + acl = "log-delivery-write" +} + +resource "aws_s3_bucket" "test" { + depends_on = [aws_s3_bucket_acl.log_bucket_acl] + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketLogging/region_override/main_gen.tf b/internal/service/s3/testdata/BucketLogging/region_override/main_gen.tf new file mode 100644 index 000000000000..565e56751817 --- /dev/null +++ b/internal/service/s3/testdata/BucketLogging/region_override/main_gen.tf @@ -0,0 +1,55 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_logging" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + + target_bucket = aws_s3_bucket.log_bucket.id + target_prefix = "log/" +} + +resource "aws_s3_bucket" "log_bucket" { + region = var.region + + bucket = "${var.rName}-log" +} + +resource "aws_s3_bucket_ownership_controls" "log_bucket_ownership" { + region = var.region + + bucket = aws_s3_bucket.log_bucket.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "log_bucket_acl" { + region = var.region + + depends_on = [aws_s3_bucket_ownership_controls.log_bucket_ownership] + + bucket = aws_s3_bucket.log_bucket.id + acl = "log-delivery-write" +} + +resource "aws_s3_bucket" "test" { + region = var.region + + depends_on = [aws_s3_bucket_acl.log_bucket_acl] + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_logging_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_logging_basic.gtpl new file mode 100644 index 000000000000..47bb7a7df51a --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_logging_basic.gtpl @@ -0,0 +1,35 @@ +resource "aws_s3_bucket_logging" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + + target_bucket = aws_s3_bucket.log_bucket.id + target_prefix = "log/" +} + +resource "aws_s3_bucket" "log_bucket" { +{{- template "region" }} + bucket = "${var.rName}-log" +} + +resource "aws_s3_bucket_ownership_controls" "log_bucket_ownership" { +{{- template "region" }} + bucket = aws_s3_bucket.log_bucket.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "log_bucket_acl" { +{{- template "region" }} + depends_on = [aws_s3_bucket_ownership_controls.log_bucket_ownership] + + bucket = aws_s3_bucket.log_bucket.id + acl = "log-delivery-write" +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + depends_on = [aws_s3_bucket_acl.log_bucket_acl] + + bucket = var.rName +} From 55121fe4f7850beb050bc127514d8796b9c1abdc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 10:29:53 -0400 Subject: [PATCH 0455/2115] Add parameterized resource identity to `aws_s3_bucket_server_side_encryption_configuration` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketServerSideEncryptionConfiguration_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketServerSideEncryptionConfiguration_' -timeout 360m -vet=off 2025/08/20 10:29:49 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 10:29:49 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySEEByDefault_AES256 (34.45s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSDSSE (34.63s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMS (34.96s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyID (37.14s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_KMSWithMasterKeyARN (37.91s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_directoryBucket (39.01s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_basic (40.89s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_Identity_RegionOverride (40.97s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_migrate_withChange (42.28s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_migrate_noChange (44.65s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_Identity_Basic (49.98s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_BucketKeyEnabled (51.53s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_UpdateSSEAlgorithm (51.58s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_ApplySSEByDefault_BucketKeyEnabled (53.45s) --- PASS: TestAccS3BucketServerSideEncryptionConfiguration_Identity_ExistingResource (61.07s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 67.567s ``` --- ...et_server_side_encryption_configuration.go | 13 +- ...ryption_configuration_identity_gen_test.go | 261 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 10 +- .../basic/main_gen.tf | 23 ++ .../basic_v6.9.0/main_gen.tf | 33 +++ .../region_override/main_gen.tf | 33 +++ ...r_side_encryption_configuration_basic.gtpl | 16 ++ 7 files changed, 383 insertions(+), 6 deletions(-) create mode 100644 internal/service/s3/bucket_server_side_encryption_configuration_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_server_side_encryption_configuration_basic.gtpl diff --git a/internal/service/s3/bucket_server_side_encryption_configuration.go b/internal/service/s3/bucket_server_side_encryption_configuration.go index 5ed5b471f0c2..8c3eccbf72b3 100644 --- a/internal/service/s3/bucket_server_side_encryption_configuration.go +++ b/internal/service/s3/bucket_server_side_encryption_configuration.go @@ -23,7 +23,14 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_s3_bucket_server_side_encryption_configuration", name="Bucket Server-side Encryption Configuration") +// @SDKResource("aws_s3_bucket_server_side_encryption_configuration", name="Bucket Server Side Encryption Configuration") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @ImportIDHandler("resourceImportID") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(checkDestroyNoop=true) +// @Testing(importIgnore="rule.0.bucket_key_enabled") +// @Testing(plannableImportAction="NoOp") func resourceBucketServerSideEncryptionConfiguration() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketServerSideEncryptionConfigurationCreate, @@ -31,10 +38,6 @@ func resourceBucketServerSideEncryptionConfiguration() *schema.Resource { UpdateWithoutTimeout: resourceBucketServerSideEncryptionConfigurationUpdate, DeleteWithoutTimeout: resourceBucketServerSideEncryptionConfigurationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_server_side_encryption_configuration_identity_gen_test.go b/internal/service/s3/bucket_server_side_encryption_configuration_identity_gen_test.go new file mode 100644 index 000000000000..4b7bc32f01ec --- /dev/null +++ b/internal/service/s3/bucket_server_side_encryption_configuration_identity_gen_test.go @@ -0,0 +1,261 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketServerSideEncryptionConfiguration_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_server_side_encryption_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketServerSideEncryptionConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "rule.0.bucket_key_enabled", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketServerSideEncryptionConfiguration_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_server_side_encryption_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "rule.0.bucket_key_enabled", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketServerSideEncryptionConfiguration_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_server_side_encryption_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketServerSideEncryptionConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketServerSideEncryptionConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 82d9bb7691c0..230c1fcf9d42 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -260,8 +260,16 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa { Factory: resourceBucketServerSideEncryptionConfiguration, TypeName: "aws_s3_bucket_server_side_encryption_configuration", - Name: "Bucket Server-side Encryption Configuration", + Name: "Bucket Server Side Encryption Configuration", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: resourceImportID{}, + }, }, { Factory: resourceBucketVersioning, diff --git a/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic/main_gen.tf b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic/main_gen.tf new file mode 100644 index 000000000000..0f3ad24cded5 --- /dev/null +++ b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic/main_gen.tf @@ -0,0 +1,23 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_server_side_encryption_configuration" "test" { + bucket = aws_s3_bucket.test.bucket + + rule { + # This is Amazon S3 bucket default encryption. + apply_server_side_encryption_by_default { + sse_algorithm = "AES256" + } + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..178b41e13e1b --- /dev/null +++ b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/basic_v6.9.0/main_gen.tf @@ -0,0 +1,33 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_server_side_encryption_configuration" "test" { + bucket = aws_s3_bucket.test.bucket + + rule { + # This is Amazon S3 bucket default encryption. + apply_server_side_encryption_by_default { + sse_algorithm = "AES256" + } + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/region_override/main_gen.tf b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/region_override/main_gen.tf new file mode 100644 index 000000000000..91dcc705657c --- /dev/null +++ b/internal/service/s3/testdata/BucketServerSideEncryptionConfiguration/region_override/main_gen.tf @@ -0,0 +1,33 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_server_side_encryption_configuration" "test" { + region = var.region + + bucket = aws_s3_bucket.test.bucket + + rule { + # This is Amazon S3 bucket default encryption. + apply_server_side_encryption_by_default { + sse_algorithm = "AES256" + } + } +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_server_side_encryption_configuration_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_server_side_encryption_configuration_basic.gtpl new file mode 100644 index 000000000000..72e6ab458f73 --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_server_side_encryption_configuration_basic.gtpl @@ -0,0 +1,16 @@ +resource "aws_s3_bucket_server_side_encryption_configuration" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.bucket + + rule { + # This is Amazon S3 bucket default encryption. + apply_server_side_encryption_by_default { + sse_algorithm = "AES256" + } + } +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} From b386728e8f0a2eedb1fd078d29639be6a1160d7b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 10:53:14 -0400 Subject: [PATCH 0456/2115] Add parameterized resource identity to `aws_s3_bucket_versioning` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketVersioning_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketVersioning_' -timeout 360m -vet=off 2025/08/20 10:53:21 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 10:53:21 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketVersioning_directoryBucket (18.23s) --- PASS: TestAccS3BucketVersioning_Status_suspendedToDisabled (37.96s) --- PASS: TestAccS3BucketVersioning_disappears_bucket (38.53s) --- PASS: TestAccS3BucketVersioning_disappears (38.70s) --- PASS: TestAccS3BucketVersioning_basic (39.81s) --- PASS: TestAccS3BucketVersioning_Status_enabledToDisabled (42.39s) --- PASS: TestAccS3BucketVersioning_Status_disabled (44.35s) --- PASS: TestAccS3BucketVersioning_MFADelete (44.82s) --- PASS: TestAccS3BucketVersioning_migrate_mfaDeleteNoChange (46.84s) --- PASS: TestAccS3BucketVersioning_migrate_versioningDisabledWithChange (50.03s) --- PASS: TestAccS3BucketVersioning_migrate_versioningDisabledNoChange (50.92s) --- PASS: TestAccS3BucketVersioning_Identity_RegionOverride (51.42s) --- PASS: TestAccS3BucketVersioning_migrate_versioningEnabledWithChange (51.93s) --- PASS: TestAccS3BucketVersioning_migrate_versioningEnabledNoChange (52.40s) --- PASS: TestAccS3BucketVersioning_Status_disabledToSuspended (57.15s) --- PASS: TestAccS3BucketVersioning_Status_disabledToEnabled (57.39s) --- PASS: TestAccS3BucketVersioning_Identity_Basic (57.94s) --- PASS: TestAccS3BucketVersioning_Identity_ExistingResource (66.81s) --- PASS: TestAccS3BucketVersioning_update (73.63s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 80.177s ``` --- internal/service/s3/bucket_versioning.go | 8 +- .../s3/bucket_versioning_identity_gen_test.go | 255 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 8 + .../BucketVersioning/basic/main_gen.tf | 19 ++ .../BucketVersioning/basic_v6.9.0/main_gen.tf | 29 ++ .../region_override/main_gen.tf | 29 ++ .../tmpl/bucket_versioning_basic.gtpl | 12 + 7 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_versioning_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketVersioning/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketVersioning/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketVersioning/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_versioning_basic.gtpl diff --git a/internal/service/s3/bucket_versioning.go b/internal/service/s3/bucket_versioning.go index 132fc6002a8d..43887f069e5f 100644 --- a/internal/service/s3/bucket_versioning.go +++ b/internal/service/s3/bucket_versioning.go @@ -28,6 +28,10 @@ import ( ) // @SDKResource("aws_s3_bucket_versioning", name="Bucket Versioning") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @ImportIDHandler("resourceImportID") +// @Testing(preIdentityVersion="v6.9.0") func resourceBucketVersioning() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketVersioningCreate, @@ -35,10 +39,6 @@ func resourceBucketVersioning() *schema.Resource { UpdateWithoutTimeout: resourceBucketVersioningUpdate, DeleteWithoutTimeout: resourceBucketVersioningDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_versioning_identity_gen_test.go b/internal/service/s3/bucket_versioning_identity_gen_test.go new file mode 100644 index 000000000000..fb272bf42440 --- /dev/null +++ b/internal/service/s3/bucket_versioning_identity_gen_test.go @@ -0,0 +1,255 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketVersioning_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_versioning.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketVersioningDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketVersioningExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketVersioning_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_versioning.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketVersioning_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_versioning.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketVersioningDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketVersioningExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketVersioning/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 230c1fcf9d42..77aee3ee3b35 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -276,6 +276,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_versioning", Name: "Bucket Versioning", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: resourceImportID{}, + }, }, { Factory: resourceBucketWebsiteConfiguration, diff --git a/internal/service/s3/testdata/BucketVersioning/basic/main_gen.tf b/internal/service/s3/testdata/BucketVersioning/basic/main_gen.tf new file mode 100644 index 000000000000..a3bcd988f41b --- /dev/null +++ b/internal/service/s3/testdata/BucketVersioning/basic/main_gen.tf @@ -0,0 +1,19 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_versioning" "test" { + bucket = aws_s3_bucket.test.id + versioning_configuration { + status = "Enabled" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketVersioning/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketVersioning/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..c1967e09416a --- /dev/null +++ b/internal/service/s3/testdata/BucketVersioning/basic_v6.9.0/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_versioning" "test" { + bucket = aws_s3_bucket.test.id + versioning_configuration { + status = "Enabled" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketVersioning/region_override/main_gen.tf b/internal/service/s3/testdata/BucketVersioning/region_override/main_gen.tf new file mode 100644 index 000000000000..e4214ed8f370 --- /dev/null +++ b/internal/service/s3/testdata/BucketVersioning/region_override/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_versioning" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + versioning_configuration { + status = "Enabled" + } +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_versioning_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_versioning_basic.gtpl new file mode 100644 index 000000000000..389d1211e1da --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_versioning_basic.gtpl @@ -0,0 +1,12 @@ +resource "aws_s3_bucket_versioning" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + versioning_configuration { + status = "Enabled" + } +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} From ac7f0da95ddb135c865ac7bab13fcca37d0652b0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 14:49:58 -0400 Subject: [PATCH 0457/2115] Add parameterized resource identity to `aws_s3_bucket_notification` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketNotification_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketNotification_' -timeout 360m -vet=off 2025/08/20 14:48:24 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 14:48:24 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketNotification_directoryBucket (11.95s) --- PASS: TestAccS3BucketNotification_eventbridge (26.07s) --- PASS: TestAccS3BucketNotification_topic (26.53s) --- PASS: TestAccS3BucketNotification_Topic_multiple (26.74s) --- PASS: TestAccS3BucketNotification_Identity_RegionOverride (29.40s) --- PASS: TestAccS3BucketNotification_Identity_Basic (38.30s) --- PASS: TestAccS3BucketNotification_lambdaFunction (44.53s) --- PASS: TestAccS3BucketNotification_LambdaFunctionLambdaFunctionARN_alias (50.04s) --- PASS: TestAccS3BucketNotification_queue (52.31s) --- PASS: TestAccS3BucketNotification_Identity_ExistingResource (53.00s) --- PASS: TestAccS3BucketNotification_update (64.34s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 70.890s ``` --- internal/service/s3/bucket_notification.go | 7 +- .../bucket_notification_identity_gen_test.go | 251 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 4 + .../BucketNotification/basic/main_gen.tf | 44 +++ .../basic_v6.9.0/main_gen.tf | 54 ++++ .../region_override/main_gen.tf | 60 +++++ .../tmpl/bucket_notification_basic.gtpl | 40 +++ 7 files changed, 456 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_notification_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketNotification/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketNotification/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketNotification/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_notification_basic.gtpl diff --git a/internal/service/s3/bucket_notification.go b/internal/service/s3/bucket_notification.go index 83cf5d373865..48441d4dd1e4 100644 --- a/internal/service/s3/bucket_notification.go +++ b/internal/service/s3/bucket_notification.go @@ -26,6 +26,9 @@ import ( ) // @SDKResource("aws_s3_bucket_notification", name="Bucket Notification") +// @IdentityAttribute("bucket") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/s3;s3.GetBucketNotificationConfigurationOutput") func resourceBucketNotification() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketNotificationPut, @@ -33,10 +36,6 @@ func resourceBucketNotification() *schema.Resource { UpdateWithoutTimeout: resourceBucketNotificationPut, DeleteWithoutTimeout: resourceBucketNotificationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_notification_identity_gen_test.go b/internal/service/s3/bucket_notification_identity_gen_test.go new file mode 100644 index 000000000000..302b049e5d1f --- /dev/null +++ b/internal/service/s3/bucket_notification_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketNotification_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v s3.GetBucketNotificationConfigurationOutput + resourceName := "aws_s3_bucket_notification.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketNotificationDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketNotificationExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketNotification_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_notification.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketNotification_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v s3.GetBucketNotificationConfigurationOutput + resourceName := "aws_s3_bucket_notification.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketNotificationDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketNotificationExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketNotification/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 77aee3ee3b35..076a9505b5c6 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -190,6 +190,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_notification", Name: "Bucket Notification", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrBucket), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceBucketObject, diff --git a/internal/service/s3/testdata/BucketNotification/basic/main_gen.tf b/internal/service/s3/testdata/BucketNotification/basic/main_gen.tf new file mode 100644 index 000000000000..01e41135dcda --- /dev/null +++ b/internal/service/s3/testdata/BucketNotification/basic/main_gen.tf @@ -0,0 +1,44 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_notification" "test" { + bucket = aws_s3_bucket.test.id + + eventbridge = true +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +resource "aws_s3_bucket_public_access_block" "test" { + bucket = aws_s3_bucket.test.id + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "test" { + depends_on = [ + aws_s3_bucket_public_access_block.test, + aws_s3_bucket_ownership_controls.test, + ] + + bucket = aws_s3_bucket.test.id + acl = "public-read" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketNotification/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketNotification/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..36e5b8bfae9b --- /dev/null +++ b/internal/service/s3/testdata/BucketNotification/basic_v6.9.0/main_gen.tf @@ -0,0 +1,54 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_notification" "test" { + bucket = aws_s3_bucket.test.id + + eventbridge = true +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +resource "aws_s3_bucket_public_access_block" "test" { + bucket = aws_s3_bucket.test.id + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "test" { + depends_on = [ + aws_s3_bucket_public_access_block.test, + aws_s3_bucket_ownership_controls.test, + ] + + bucket = aws_s3_bucket.test.id + acl = "public-read" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketNotification/region_override/main_gen.tf b/internal/service/s3/testdata/BucketNotification/region_override/main_gen.tf new file mode 100644 index 000000000000..76efcd023de8 --- /dev/null +++ b/internal/service/s3/testdata/BucketNotification/region_override/main_gen.tf @@ -0,0 +1,60 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_notification" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + + eventbridge = true +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +resource "aws_s3_bucket_public_access_block" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket_ownership_controls" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "test" { + region = var.region + + depends_on = [ + aws_s3_bucket_public_access_block.test, + aws_s3_bucket_ownership_controls.test, + ] + + bucket = aws_s3_bucket.test.id + acl = "public-read" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_notification_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_notification_basic.gtpl new file mode 100644 index 000000000000..c1ea042b9dac --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_notification_basic.gtpl @@ -0,0 +1,40 @@ +resource "aws_s3_bucket_notification" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + + eventbridge = true +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} + +resource "aws_s3_bucket_public_access_block" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + + block_public_acls = false + block_public_policy = false + ignore_public_acls = false + restrict_public_buckets = false +} + +resource "aws_s3_bucket_ownership_controls" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +resource "aws_s3_bucket_acl" "test" { +{{- template "region" }} + depends_on = [ + aws_s3_bucket_public_access_block.test, + aws_s3_bucket_ownership_controls.test, + ] + + bucket = aws_s3_bucket.test.id + acl = "public-read" +} From 70a5638238c8b769fed9077cfe6f4c5a54c37f6e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 15:32:03 -0400 Subject: [PATCH 0458/2115] Add parameterized resource identity to `aws_s3_bucket_cors_configuration` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketCORSConfiguration_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketCORSConfiguration_' -timeout 360m -vet=off 2025/08/20 15:30:01 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 15:30:01 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketCORSConfiguration_directoryBucket (14.19s) --- PASS: TestAccS3BucketCORSConfiguration_disappears (27.98s) --- PASS: TestAccS3BucketCORSConfiguration_basic (28.08s) --- PASS: TestAccS3BucketCORSConfiguration_MultipleRules (30.65s) --- PASS: TestAccS3BucketCORSConfiguration_SingleRule (31.10s) --- PASS: TestAccS3BucketCORSConfiguration_Identity_RegionOverride (34.00s) --- PASS: TestAccS3BucketCORSConfiguration_migrate_corsRuleWithChange (36.95s) --- PASS: TestAccS3BucketCORSConfiguration_migrate_corsRuleNoChange (37.04s) --- PASS: TestAccS3BucketCORSConfiguration_Identity_Basic (41.50s) --- PASS: TestAccS3BucketCORSConfiguration_Identity_ExistingResource (53.38s) --- PASS: TestAccS3BucketCORSConfiguration_update (55.30s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 64.851s ``` --- .../service/s3/bucket_cors_configuration.go | 10 +- ...et_cors_configuration_identity_gen_test.go | 261 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 8 + .../BucketCORSConfiguration/basic/main_gen.tf | 22 ++ .../basic_v6.9.0/main_gen.tf | 32 +++ .../region_override/main_gen.tf | 32 +++ .../tmpl/bucket_cors_configuration_basic.gtpl | 15 + 7 files changed, 376 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_cors_configuration_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketCORSConfiguration/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketCORSConfiguration/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketCORSConfiguration/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_cors_configuration_basic.gtpl diff --git a/internal/service/s3/bucket_cors_configuration.go b/internal/service/s3/bucket_cors_configuration.go index 3dad9dfce247..f44ebdbf968c 100644 --- a/internal/service/s3/bucket_cors_configuration.go +++ b/internal/service/s3/bucket_cors_configuration.go @@ -24,6 +24,12 @@ import ( ) // @SDKResource("aws_s3_bucket_cors_configuration", name="Bucket CORS Configuration") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @ImportIDHandler("resourceImportID") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(importIgnore="cors_rule.0.max_age_seconds") +// @Testing(plannableImportAction="NoOp") func resourceBucketCorsConfiguration() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketCorsConfigurationCreate, @@ -31,10 +37,6 @@ func resourceBucketCorsConfiguration() *schema.Resource { UpdateWithoutTimeout: resourceBucketCorsConfigurationUpdate, DeleteWithoutTimeout: resourceBucketCorsConfigurationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_cors_configuration_identity_gen_test.go b/internal/service/s3/bucket_cors_configuration_identity_gen_test.go new file mode 100644 index 000000000000..a039b1c2223c --- /dev/null +++ b/internal/service/s3/bucket_cors_configuration_identity_gen_test.go @@ -0,0 +1,261 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketCORSConfiguration_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_cors_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketCORSConfigurationDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketCORSConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "cors_rule.0.max_age_seconds", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketCORSConfiguration_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_cors_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "cors_rule.0.max_age_seconds", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketCORSConfiguration_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_cors_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketCORSConfigurationDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketCORSConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketCORSConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index 076a9505b5c6..f4fe76e5b22c 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -152,6 +152,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_cors_configuration", Name: "Bucket CORS Configuration", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: resourceImportID{}, + }, }, { Factory: resourceBucketIntelligentTieringConfiguration, diff --git a/internal/service/s3/testdata/BucketCORSConfiguration/basic/main_gen.tf b/internal/service/s3/testdata/BucketCORSConfiguration/basic/main_gen.tf new file mode 100644 index 000000000000..962d4e7a7ca6 --- /dev/null +++ b/internal/service/s3/testdata/BucketCORSConfiguration/basic/main_gen.tf @@ -0,0 +1,22 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_cors_configuration" "test" { + bucket = aws_s3_bucket.test.id + + cors_rule { + allowed_methods = ["PUT"] + allowed_origins = ["https://www.example.com"] + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketCORSConfiguration/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketCORSConfiguration/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..eb2fe8cdd46f --- /dev/null +++ b/internal/service/s3/testdata/BucketCORSConfiguration/basic_v6.9.0/main_gen.tf @@ -0,0 +1,32 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_cors_configuration" "test" { + bucket = aws_s3_bucket.test.id + + cors_rule { + allowed_methods = ["PUT"] + allowed_origins = ["https://www.example.com"] + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketCORSConfiguration/region_override/main_gen.tf b/internal/service/s3/testdata/BucketCORSConfiguration/region_override/main_gen.tf new file mode 100644 index 000000000000..d3975f69b7e2 --- /dev/null +++ b/internal/service/s3/testdata/BucketCORSConfiguration/region_override/main_gen.tf @@ -0,0 +1,32 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_cors_configuration" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + + cors_rule { + allowed_methods = ["PUT"] + allowed_origins = ["https://www.example.com"] + } +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_cors_configuration_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_cors_configuration_basic.gtpl new file mode 100644 index 000000000000..172e5a69deac --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_cors_configuration_basic.gtpl @@ -0,0 +1,15 @@ +resource "aws_s3_bucket_cors_configuration" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + + cors_rule { + allowed_methods = ["PUT"] + allowed_origins = ["https://www.example.com"] + } +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} + From 12e428bbfb1460a1e3ca98340f5a06ef4017f5d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:49 -0400 Subject: [PATCH 0459/2115] go get github.com/aws/aws-sdk-go-v2/service/inspector. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34a605d1d5f7..7bbb19d38910 100644 --- a/go.mod +++ b/go.mod @@ -138,7 +138,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 + github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 diff --git a/go.sum b/go.sum index 32c30f61598c..fec9ca25a804 100644 --- a/go.sum +++ b/go.sum @@ -287,8 +287,8 @@ github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsm github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKudWP8MFS0fiwzKAe0VK2UfTQE0= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 h1:rqaDVBRPXDmWIVu6RClCQiF2eoBCEjqCjf9YgRiFYH4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 h1:BpZCG4dzq0TD9A/aEZiF/uCU12AtHYnmjSvo+TkaVIQ= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 h1:pwIs1giy/xJWUCT0dfAK7EHvAdOFohFHJDyOLvOiMfk= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= From cd3b8d223222f79caa5da9688f9dfcc2ad933b21 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 20:07:44 -0400 Subject: [PATCH 0460/2115] Add parameterized resource identity to `aws_s3_bucket_website_configuration` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketWebsiteConfiguration_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketWebsiteConfiguration_' -timeout 360m -vet=off 2025/08/20 15:59:51 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 15:59:52 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketWebsiteConfiguration_directoryBucket (18.64s) --- PASS: TestAccS3BucketWebsiteConfiguration_disappears (39.72s) --- PASS: TestAccS3BucketWebsiteConfiguration_basic (43.88s) --- PASS: TestAccS3BucketWebsiteConfiguration_Redirect (45.37s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRule_RedirectOnly (45.66s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRules_ConditionAndRedirect (45.86s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRules_ConditionAndRedirectWithEmptyString (46.82s) --- PASS: TestAccS3BucketWebsiteConfiguration_Identity_RegionOverride (53.41s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRuleToRoutingRules (55.49s) --- PASS: TestAccS3BucketWebsiteConfiguration_migrate_websiteWithRoutingRuleNoChange (56.95s) --- PASS: TestAccS3BucketWebsiteConfiguration_migrate_websiteWithIndexDocumentWithChange (57.90s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRules_updateConditionAndRedirect (58.50s) --- PASS: TestAccS3BucketWebsiteConfiguration_migrate_websiteWithRoutingRuleWithChange (58.68s) --- PASS: TestAccS3BucketWebsiteConfiguration_migrate_websiteWithIndexDocumentNoChange (58.75s) --- PASS: TestAccS3BucketWebsiteConfiguration_update (62.39s) --- PASS: TestAccS3BucketWebsiteConfiguration_Identity_Basic (62.45s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRule_MultipleRules (62.45s) --- PASS: TestAccS3BucketWebsiteConfiguration_Identity_ExistingResource (69.72s) --- PASS: TestAccS3BucketWebsiteConfiguration_RoutingRule_ConditionAndRedirect (79.91s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 86.500s ``` --- .../s3/bucket_website_configuration.go | 8 +- ...website_configuration_identity_gen_test.go | 255 ++++++++++++++++++ internal/service/s3/service_package_gen.go | 8 + .../basic/main_gen.tf | 19 ++ .../basic_v6.9.0/main_gen.tf | 29 ++ .../region_override/main_gen.tf | 29 ++ .../bucket_website_configuration_basic.gtpl | 12 + 7 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 internal/service/s3/bucket_website_configuration_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketWebsiteConfiguration/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketWebsiteConfiguration/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketWebsiteConfiguration/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_website_configuration_basic.gtpl diff --git a/internal/service/s3/bucket_website_configuration.go b/internal/service/s3/bucket_website_configuration.go index 52b9a81a3168..1311fa5aae37 100644 --- a/internal/service/s3/bucket_website_configuration.go +++ b/internal/service/s3/bucket_website_configuration.go @@ -26,6 +26,10 @@ import ( ) // @SDKResource("aws_s3_bucket_website_configuration", name="Bucket Website Configuration") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @ImportIDHandler("resourceImportID") +// @Testing(preIdentityVersion="v6.9.0") func resourceBucketWebsiteConfiguration() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketWebsiteConfigurationCreate, @@ -33,10 +37,6 @@ func resourceBucketWebsiteConfiguration() *schema.Resource { UpdateWithoutTimeout: resourceBucketWebsiteConfigurationUpdate, DeleteWithoutTimeout: resourceBucketWebsiteConfigurationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrBucket: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_website_configuration_identity_gen_test.go b/internal/service/s3/bucket_website_configuration_identity_gen_test.go new file mode 100644 index 000000000000..766651ad6390 --- /dev/null +++ b/internal/service/s3/bucket_website_configuration_identity_gen_test.go @@ -0,0 +1,255 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketWebsiteConfiguration_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_website_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketWebsiteConfigurationDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketWebsiteConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketWebsiteConfiguration_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_website_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccS3BucketWebsiteConfiguration_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_website_configuration.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: testAccCheckBucketWebsiteConfigurationDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketWebsiteConfigurationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketWebsiteConfiguration/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index f4fe76e5b22c..a49ade6914a5 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -302,6 +302,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_website_configuration", Name: "Bucket Website Configuration", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: resourceImportID{}, + }, }, { Factory: resourceObject, diff --git a/internal/service/s3/testdata/BucketWebsiteConfiguration/basic/main_gen.tf b/internal/service/s3/testdata/BucketWebsiteConfiguration/basic/main_gen.tf new file mode 100644 index 000000000000..01b1b1170238 --- /dev/null +++ b/internal/service/s3/testdata/BucketWebsiteConfiguration/basic/main_gen.tf @@ -0,0 +1,19 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_website_configuration" "test" { + bucket = aws_s3_bucket.test.id + index_document { + suffix = "index.html" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketWebsiteConfiguration/basic_v6.9.0/main_gen.tf b/internal/service/s3/testdata/BucketWebsiteConfiguration/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..32e719fd39ba --- /dev/null +++ b/internal/service/s3/testdata/BucketWebsiteConfiguration/basic_v6.9.0/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_website_configuration" "test" { + bucket = aws_s3_bucket.test.id + index_document { + suffix = "index.html" + } +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketWebsiteConfiguration/region_override/main_gen.tf b/internal/service/s3/testdata/BucketWebsiteConfiguration/region_override/main_gen.tf new file mode 100644 index 000000000000..416f8f3fa139 --- /dev/null +++ b/internal/service/s3/testdata/BucketWebsiteConfiguration/region_override/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_website_configuration" "test" { + region = var.region + + bucket = aws_s3_bucket.test.id + index_document { + suffix = "index.html" + } +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_website_configuration_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_website_configuration_basic.gtpl new file mode 100644 index 000000000000..42b858cf3b52 --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_website_configuration_basic.gtpl @@ -0,0 +1,12 @@ +resource "aws_s3_bucket_website_configuration" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.id + index_document { + suffix = "index.html" + } +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} From f0a330cd5858456b87eedcf8859db66c4b404f19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:50 -0400 Subject: [PATCH 0461/2115] 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 7bbb19d38910..6ea3856ea6d0 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 diff --git a/go.sum b/go.sum index fec9ca25a804..9a8f08874728 100644 --- a/go.sum +++ b/go.sum @@ -289,8 +289,8 @@ github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKud github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 h1:BpZCG4dzq0TD9A/aEZiF/uCU12AtHYnmjSvo+TkaVIQ= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 h1:pwIs1giy/xJWUCT0dfAK7EHvAdOFohFHJDyOLvOiMfk= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 h1:vSoGG3q9KhtWQ2UQz0HOrO2OYxFnmcpDTfiuV7jwgtA= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 h1:3ZKmesYBaFX33czDl6mbrcHb6jeheg6LqjJhQdefhsY= From 0dbd87b645f33dd33ead334b6a15e3a439acf19c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 20 Aug 2025 20:15:00 -0400 Subject: [PATCH 0462/2115] chore: changelog --- .changelog/43876.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .changelog/43876.txt diff --git a/.changelog/43876.txt b/.changelog/43876.txt new file mode 100644 index 000000000000..99c74c0ece09 --- /dev/null +++ b/.changelog/43876.txt @@ -0,0 +1,27 @@ +```release-note:enhancement +resource/aws_s3_bucket_public_access_block: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_policy: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_ownership_controls: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_logging: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_versioning: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_notification: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_cors_configuration: Add resource identity support +``` +```release-note:enhancement +resource/aws_s3_bucket_website_configuration: Add resource identity support +``` From de7745681d05874529f65375792ca052e9e841db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:51 -0400 Subject: [PATCH 0463/2115] 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 6ea3856ea6d0..f686ab7adfea 100644 --- a/go.mod +++ b/go.mod @@ -140,7 +140,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 diff --git a/go.sum b/go.sum index 9a8f08874728..cee5992aacb1 100644 --- a/go.sum +++ b/go.sum @@ -301,8 +301,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 h1:ieRzyHXyp github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3/go.mod h1:O5ROz8jHiOAKAwx179v+7sHMhfobFVi6nZt8DEyiYoM= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05RuxzLcjT+S5ZpQobj3ie3UTaSf2NnZc= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 h1:Pw+Ibvg2vG1gulfBO2FPjr5Y+SDyxzVA1EXw5nTCZiM= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw36rErepMlJyARnfAfYHHqD/kBR8= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 h1:DWBnflfGGvIj45VsuhUyg3K/0xYodsjHS7FQ73TZOGo= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 h1:eA05nWoMN0EF0rttyORxmB4mMLMhdS6PLpL/0GyTEm4= From 8eade8c0883dfb1e27e4d9902e3d24d0e7274947 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:52 -0400 Subject: [PATCH 0464/2115] go get github.com/aws/aws-sdk-go-v2/service/invoicing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f686ab7adfea..ece42a26abd6 100644 --- a/go.mod +++ b/go.mod @@ -141,7 +141,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 diff --git a/go.sum b/go.sum index cee5992aacb1..d38c21410b45 100644 --- a/go.sum +++ b/go.sum @@ -303,8 +303,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05Ru github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw36rErepMlJyARnfAfYHHqD/kBR8= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 h1:DWBnflfGGvIj45VsuhUyg3K/0xYodsjHS7FQ73TZOGo= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/pBO1QfEd79+0XsB1pbjY= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 h1:eA05nWoMN0EF0rttyORxmB4mMLMhdS6PLpL/0GyTEm4= github.com/aws/aws-sdk-go-v2/service/iot v1.68.0/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 h1:7e91TZxrdMEe3HvHmFf+VS+VlLf/O9/HtQc6lMEP4Vs= From 0eded8884f366491fd10aad77ce56d274db4bdaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:53 -0400 Subject: [PATCH 0465/2115] go get github.com/aws/aws-sdk-go-v2/service/iot. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ece42a26abd6..f654e40a9fd6 100644 --- a/go.mod +++ b/go.mod @@ -142,7 +142,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 - github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 + github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 diff --git a/go.sum b/go.sum index d38c21410b45..7d3d2ffe0f4b 100644 --- a/go.sum +++ b/go.sum @@ -305,8 +305,8 @@ github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/pBO1QfEd79+0XsB1pbjY= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 h1:eA05nWoMN0EF0rttyORxmB4mMLMhdS6PLpL/0GyTEm4= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.0/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYeWgTLgbW1KiAJ8Yk= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 h1:7e91TZxrdMEe3HvHmFf+VS+VlLf/O9/HtQc6lMEP4Vs= github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 h1:FNFXj1Ydfrf12zcGNgqVuTNV/UfPMVWZ/iH7hkups/A= From 4a2070e1ba6c11c3ce9dc8356fc7595180012283 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:54 -0400 Subject: [PATCH 0466/2115] go get github.com/aws/aws-sdk-go-v2/service/ivs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f654e40a9fd6..4bb31aef452e 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 - github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 + github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 diff --git a/go.sum b/go.sum index 7d3d2ffe0f4b..f7e10565dcd8 100644 --- a/go.sum +++ b/go.sum @@ -307,8 +307,8 @@ github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/ github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYeWgTLgbW1KiAJ8Yk= github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 h1:7e91TZxrdMEe3HvHmFf+VS+VlLf/O9/HtQc6lMEP4Vs= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= +github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9Ox0LhKSvU0812W0= +github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 h1:FNFXj1Ydfrf12zcGNgqVuTNV/UfPMVWZ/iH7hkups/A= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 h1:/EB9p30Te0eClIIptu3g3meO38O87YVVdE/UVbyTvWA= From 48e907798cf4b3c2abf29061e9ad95d9a874cccc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:54 -0400 Subject: [PATCH 0467/2115] 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 4bb31aef452e..931261ecd6f2 100644 --- a/go.mod +++ b/go.mod @@ -144,7 +144,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 diff --git a/go.sum b/go.sum index f7e10565dcd8..a0e2fc5a3b35 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYe github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9Ox0LhKSvU0812W0= github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 h1:FNFXj1Ydfrf12zcGNgqVuTNV/UfPMVWZ/iH7hkups/A= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk+CWDAQ/WWHCTvk/DKlQ= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 h1:/EB9p30Te0eClIIptu3g3meO38O87YVVdE/UVbyTvWA= github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 h1:PG2c7HZCVIBFhdIwqO5jg8xo1fHgalDdUwNsn8T1Esw= From f0c7bb5e1d6593820988c9922a7ba9eb33bdbf77 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:55 -0400 Subject: [PATCH 0468/2115] 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 931261ecd6f2..fb9ccc5a25df 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 + github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 diff --git a/go.sum b/go.sum index a0e2fc5a3b35..86edf0a10f62 100644 --- a/go.sum +++ b/go.sum @@ -311,8 +311,8 @@ github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9 github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk+CWDAQ/WWHCTvk/DKlQ= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 h1:/EB9p30Te0eClIIptu3g3meO38O87YVVdE/UVbyTvWA= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvWYrQxrJmyT54aohWSs= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 h1:PG2c7HZCVIBFhdIwqO5jg8xo1fHgalDdUwNsn8T1Esw= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 h1:Np3pECOLZw4JZgx7d588fTuU2RtxkRRYlTqlCrLh/nk= From e763b26fbf7a250d5d7d43488f6dfe31ce0bee64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:56 -0400 Subject: [PATCH 0469/2115] go get github.com/aws/aws-sdk-go-v2/service/kafkaconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fb9ccc5a25df..3770cb19b08a 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 diff --git a/go.sum b/go.sum index 86edf0a10f62..0e1ee442ecde 100644 --- a/go.sum +++ b/go.sum @@ -313,8 +313,8 @@ github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvWYrQxrJmyT54aohWSs= github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 h1:PG2c7HZCVIBFhdIwqO5jg8xo1fHgalDdUwNsn8T1Esw= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ6KIJ4V+9LrZm41BCH7h/xOmI= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 h1:Np3pECOLZw4JZgx7d588fTuU2RtxkRRYlTqlCrLh/nk= github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 h1:gFAqI4i3uvMo3Bk3ePdPwDEYgssnVCFF+p3p3KkRyQ4= From 0af5bc277b893c8ef67e2090d7222ff0017ea0c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:57 -0400 Subject: [PATCH 0470/2115] 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 3770cb19b08a..7256329844f4 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 + github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 diff --git a/go.sum b/go.sum index 0e1ee442ecde..baaf76258a18 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvW github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ6KIJ4V+9LrZm41BCH7h/xOmI= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 h1:Np3pECOLZw4JZgx7d588fTuU2RtxkRRYlTqlCrLh/nk= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfyPMWDpNoJH/pIAMIlLI= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 h1:gFAqI4i3uvMo3Bk3ePdPwDEYgssnVCFF+p3p3KkRyQ4= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 h1:8acX21qNMUs/QTHB3iNpixJViYsu7sSWSmZVzdriRcw= From 0f45d508c97345d739bcc42d3e5bf51f93ccc4e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:58 -0400 Subject: [PATCH 0471/2115] 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 7256329844f4..cfa693aa2771 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 diff --git a/go.sum b/go.sum index baaf76258a18..2880a8c34629 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,8 @@ github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfyPMWDpNoJH/pIAMIlLI= github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 h1:gFAqI4i3uvMo3Bk3ePdPwDEYgssnVCFF+p3p3KkRyQ4= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFeo0WnBJ69vIVuiyS4Q3tCU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 h1:8acX21qNMUs/QTHB3iNpixJViYsu7sSWSmZVzdriRcw= github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 h1:IJkGKIgX2ZCga4Ao4A8RcL1rty+s1Cc+N/JCtnmtm+c= From d0f8fc09e583b2396ab820e81ff68e27dbeb3a0a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:59 -0400 Subject: [PATCH 0472/2115] 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 cfa693aa2771..092196d05f91 100644 --- a/go.mod +++ b/go.mod @@ -149,7 +149,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 diff --git a/go.sum b/go.sum index 2880a8c34629..6e5875b29563 100644 --- a/go.sum +++ b/go.sum @@ -319,8 +319,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfy github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFeo0WnBJ69vIVuiyS4Q3tCU= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 h1:8acX21qNMUs/QTHB3iNpixJViYsu7sSWSmZVzdriRcw= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/TXYDjbZXvshpg3pl5ks= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 h1:IJkGKIgX2ZCga4Ao4A8RcL1rty+s1Cc+N/JCtnmtm+c= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 h1:eoa+/AK+SVR5cTa/yPiDeupC0EZ8jA496jwjNMhrL+U= From 12e72fbc95a6032aa94b1c05c598d0cd6acb495f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:31:59 -0400 Subject: [PATCH 0473/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalytics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 092196d05f91..f3bd68dc193c 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 diff --git a/go.sum b/go.sum index 6e5875b29563..b06808fc34fa 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFe github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/TXYDjbZXvshpg3pl5ks= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 h1:IJkGKIgX2ZCga4Ao4A8RcL1rty+s1Cc+N/JCtnmtm+c= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/K5BYbEXfwztRG5M5EOtqXAd6uHqE= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 h1:eoa+/AK+SVR5cTa/yPiDeupC0EZ8jA496jwjNMhrL+U= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 h1:wOcpGR9keDoaWcFQOUEQqA9EhRcl2yv2yOWS24sQnpM= From a81fb8a4f43f60d3bf918ae4a2b383d77e1514fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:00 -0400 Subject: [PATCH 0474/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f3bd68dc193c..118b8a039067 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 diff --git a/go.sum b/go.sum index b06808fc34fa..8d24806bc8f8 100644 --- a/go.sum +++ b/go.sum @@ -323,8 +323,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/ github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/K5BYbEXfwztRG5M5EOtqXAd6uHqE= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 h1:eoa+/AK+SVR5cTa/yPiDeupC0EZ8jA496jwjNMhrL+U= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1kS4ItUgFhY3gSFAKbYD0mBYFUK6vvdk= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 h1:wOcpGR9keDoaWcFQOUEQqA9EhRcl2yv2yOWS24sQnpM= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 h1:Z95XCqqSnwXr0AY7PgsiOUBhUG2GoDM5getw6RfD1Lg= From 7e53f2f073ee96bc6674f2b1fbcce07f57bd30ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:01 -0400 Subject: [PATCH 0475/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisvideo. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 118b8a039067..e03c21a8a3c0 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 diff --git a/go.sum b/go.sum index 8d24806bc8f8..c5ae70a2632a 100644 --- a/go.sum +++ b/go.sum @@ -325,8 +325,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/ github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1kS4ItUgFhY3gSFAKbYD0mBYFUK6vvdk= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 h1:wOcpGR9keDoaWcFQOUEQqA9EhRcl2yv2yOWS24sQnpM= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqOMzl/bDbAsfl0nzLa2A2LGw4c= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 h1:Z95XCqqSnwXr0AY7PgsiOUBhUG2GoDM5getw6RfD1Lg= github.com/aws/aws-sdk-go-v2/service/kms v1.44.0/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 h1:L48j3iwTIZPNp1FEnZ3d1L1Fx+9ac3N0Oyca42yY3sQ= From fb4d0b70ce785aafdb762d4ae3b6be0110233405 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:02 -0400 Subject: [PATCH 0476/2115] 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 e03c21a8a3c0..e6845429a496 100644 --- a/go.mod +++ b/go.mod @@ -153,7 +153,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 - github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 + github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 diff --git a/go.sum b/go.sum index c5ae70a2632a..cea4a3dff826 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1k github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqOMzl/bDbAsfl0nzLa2A2LGw4c= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 h1:Z95XCqqSnwXr0AY7PgsiOUBhUG2GoDM5getw6RfD1Lg= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.0/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVBlMSfSo5aDlM7b+o= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 h1:L48j3iwTIZPNp1FEnZ3d1L1Fx+9ac3N0Oyca42yY3sQ= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 h1:BbZi6/1W69NHTyM8CeusL35y1L3YQDky7vW2wzUAtio= From 376c4fd2dc355d199865a8001a247301c475ba5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:03 -0400 Subject: [PATCH 0477/2115] 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 e6845429a496..e784b3b9e7d3 100644 --- a/go.mod +++ b/go.mod @@ -154,7 +154,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 diff --git a/go.sum b/go.sum index cea4a3dff826..b56ed00b69e9 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqO github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVBlMSfSo5aDlM7b+o= github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 h1:L48j3iwTIZPNp1FEnZ3d1L1Fx+9ac3N0Oyca42yY3sQ= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtucfgoU+866Xu45/6T/3Bmky/+LY= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 h1:BbZi6/1W69NHTyM8CeusL35y1L3YQDky7vW2wzUAtio= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 h1:Ep6t5xK/IYMotfsNJ0cDEh9g5GrxwIlBYXyGucmm/nM= From 3c5a9ee81cc18f523300dbbb0c1addf7a0f5369a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:04 -0400 Subject: [PATCH 0478/2115] 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 e784b3b9e7d3..a86d8cf8c42e 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 + github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 diff --git a/go.sum b/go.sum index b56ed00b69e9..00a5ca600211 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVB github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtucfgoU+866Xu45/6T/3Bmky/+LY= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 h1:BbZi6/1W69NHTyM8CeusL35y1L3YQDky7vW2wzUAtio= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZrGUJBnYv7FFo4j94zI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 h1:Ep6t5xK/IYMotfsNJ0cDEh9g5GrxwIlBYXyGucmm/nM= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 h1:vCV2K/9Wb5ubkqLF6bkaHG1yET2NXFf7TXgsWwv6Y3U= From 92c9696aebf11872776dc270e2bce11d6b3e1d61 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:05 -0400 Subject: [PATCH 0479/2115] 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 a86d8cf8c42e..739798ffdaf0 100644 --- a/go.mod +++ b/go.mod @@ -156,7 +156,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 diff --git a/go.sum b/go.sum index 00a5ca600211..5bc6089859bb 100644 --- a/go.sum +++ b/go.sum @@ -333,8 +333,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtuc github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZrGUJBnYv7FFo4j94zI= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 h1:Ep6t5xK/IYMotfsNJ0cDEh9g5GrxwIlBYXyGucmm/nM= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQshTcIhPST+L3FOvzNJuZNWVQ= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 h1:vCV2K/9Wb5ubkqLF6bkaHG1yET2NXFf7TXgsWwv6Y3U= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 h1:Pyf7XMt3ya+mV/0Zo5wRU0blp1kTZfvUBB/eP8SgvRM= From 468192c7d6173eb8ffd1e728c00c3e181723e4be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:06 -0400 Subject: [PATCH 0480/2115] go get github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 739798ffdaf0..3ab4663968a7 100644 --- a/go.mod +++ b/go.mod @@ -157,7 +157,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 diff --git a/go.sum b/go.sum index 5bc6089859bb..f00f6adc64e6 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZ github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQshTcIhPST+L3FOvzNJuZNWVQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 h1:vCV2K/9Wb5ubkqLF6bkaHG1yET2NXFf7TXgsWwv6Y3U= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEqc89raV43prmVry2b172lQwYAdbMh5ClvYgM= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 h1:Pyf7XMt3ya+mV/0Zo5wRU0blp1kTZfvUBB/eP8SgvRM= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 h1:gdfSY6AmWavRp8Vl8jaBMbD5M0rmbiJZ2GjgyoBQw2I= From 00ca37179a27317ecc2fdb1cd0f173a9010f8dd9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:07 -0400 Subject: [PATCH 0481/2115] 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 3ab4663968a7..a36f3c331849 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 github.com/aws/aws-sdk-go-v2/service/location v1.48.0 diff --git a/go.sum b/go.sum index f00f6adc64e6..6e6411c252df 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,8 @@ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEqc89raV43prmVry2b172lQwYAdbMh5ClvYgM= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 h1:Pyf7XMt3ya+mV/0Zo5wRU0blp1kTZfvUBB/eP8SgvRM= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hhcin4Vrdv+NAk39v9Bs65zkc= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 h1:gdfSY6AmWavRp8Vl8jaBMbD5M0rmbiJZ2GjgyoBQw2I= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 h1:PGWe+dWCl7Iu+d6nnVS9mmeEWYtoHDu2D4GqyIgg7vo= From 273e6407ead5ce7ade22dbe7998f9afb10961863 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:08 -0400 Subject: [PATCH 0482/2115] go get github.com/aws/aws-sdk-go-v2/service/licensemanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a36f3c331849..5b2d3eaead4e 100644 --- a/go.mod +++ b/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 github.com/aws/aws-sdk-go-v2/service/location v1.48.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 diff --git a/go.sum b/go.sum index 6e6411c252df..064360eaaec1 100644 --- a/go.sum +++ b/go.sum @@ -339,8 +339,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEq github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hhcin4Vrdv+NAk39v9Bs65zkc= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 h1:gdfSY6AmWavRp8Vl8jaBMbD5M0rmbiJZ2GjgyoBQw2I= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrvbGwvkLUQKullX+qH81vAExkm3I= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 h1:PGWe+dWCl7Iu+d6nnVS9mmeEWYtoHDu2D4GqyIgg7vo= github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= github.com/aws/aws-sdk-go-v2/service/location v1.48.0 h1:jOCYFO1GgCkG3bSeMsKzK/cqvBq65ocisfEkpduVGxo= From edaad1c18cd5f5a7f2523f07fcae082d1e633f5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:09 -0400 Subject: [PATCH 0483/2115] 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 5b2d3eaead4e..47167461a964 100644 --- a/go.mod +++ b/go.mod @@ -160,7 +160,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 github.com/aws/aws-sdk-go-v2/service/location v1.48.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 diff --git a/go.sum b/go.sum index 064360eaaec1..16e93746e16f 100644 --- a/go.sum +++ b/go.sum @@ -341,8 +341,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hh github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrvbGwvkLUQKullX+qH81vAExkm3I= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 h1:PGWe+dWCl7Iu+d6nnVS9mmeEWYtoHDu2D4GqyIgg7vo= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFGP3lxwa8CJfqzJLwXnp6xY= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= github.com/aws/aws-sdk-go-v2/service/location v1.48.0 h1:jOCYFO1GgCkG3bSeMsKzK/cqvBq65ocisfEkpduVGxo= github.com/aws/aws-sdk-go-v2/service/location v1.48.0/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 h1:33rj0RNRRxNHPGCCJ0lC9dOsrLWJXVsJteZQS6BHXdk= From 40373f5245fa1c56af4c1440f19a5ababf647ce1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:10 -0400 Subject: [PATCH 0484/2115] go get github.com/aws/aws-sdk-go-v2/service/location. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 47167461a964..a0697bd5b0c9 100644 --- a/go.mod +++ b/go.mod @@ -161,7 +161,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 - github.com/aws/aws-sdk-go-v2/service/location v1.48.0 + github.com/aws/aws-sdk-go-v2/service/location v1.48.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 diff --git a/go.sum b/go.sum index 16e93746e16f..938672886aff 100644 --- a/go.sum +++ b/go.sum @@ -343,8 +343,8 @@ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrv github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFGP3lxwa8CJfqzJLwXnp6xY= github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.0 h1:jOCYFO1GgCkG3bSeMsKzK/cqvBq65ocisfEkpduVGxo= -github.com/aws/aws-sdk-go-v2/service/location v1.48.0/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= +github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7UN8O+ePHOukC+qpj7eUjY= +github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 h1:33rj0RNRRxNHPGCCJ0lC9dOsrLWJXVsJteZQS6BHXdk= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 h1:9Lo/MEr45V5AJ8mf3gb0g8lxPlbXNXbQ8MlHWPgsWh0= From 647bf4fa6b97dc675a78f777d5fab31e2bdbb9bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:11 -0400 Subject: [PATCH 0485/2115] 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 a0697bd5b0c9..810c74b09ff7 100644 --- a/go.mod +++ b/go.mod @@ -162,7 +162,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 github.com/aws/aws-sdk-go-v2/service/location v1.48.1 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 diff --git a/go.sum b/go.sum index 938672886aff..e02000778297 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFG github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7UN8O+ePHOukC+qpj7eUjY= github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 h1:33rj0RNRRxNHPGCCJ0lC9dOsrLWJXVsJteZQS6BHXdk= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5ZplpbOnFXtq2TJSOgAm5XTMQd8= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 h1:9Lo/MEr45V5AJ8mf3gb0g8lxPlbXNXbQ8MlHWPgsWh0= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 h1:7Ic+DGhlNQb5UoUGB/1gV+ULY/sLCB6Oe6F9MvowUZc= From f491321c188c648368a1b8781b27c5ad7a450e8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:11 -0400 Subject: [PATCH 0486/2115] 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 810c74b09ff7..169ce2077532 100644 --- a/go.mod +++ b/go.mod @@ -163,7 +163,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 github.com/aws/aws-sdk-go-v2/service/location v1.48.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 + github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 diff --git a/go.sum b/go.sum index e02000778297..9e4d3e1222cd 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7U github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5ZplpbOnFXtq2TJSOgAm5XTMQd8= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 h1:9Lo/MEr45V5AJ8mf3gb0g8lxPlbXNXbQ8MlHWPgsWh0= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yzGvbL3msBcrMZmE= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 h1:7Ic+DGhlNQb5UoUGB/1gV+ULY/sLCB6Oe6F9MvowUZc= github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 h1:ek+HR+h5mzH8ZW9yBOarF4Xu4Asj9SceDyrUle8y1yw= From 35eaa3a7a6c3e84bdef7b27fbd27a5e8be484401 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:12 -0400 Subject: [PATCH 0487/2115] go get github.com/aws/aws-sdk-go-v2/service/macie2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 169ce2077532..e5ee9b48c7d8 100644 --- a/go.mod +++ b/go.mod @@ -164,7 +164,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/location v1.48.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 diff --git a/go.sum b/go.sum index 9e4d3e1222cd..6690b66ac719 100644 --- a/go.sum +++ b/go.sum @@ -349,8 +349,8 @@ github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yzGvbL3msBcrMZmE= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 h1:7Ic+DGhlNQb5UoUGB/1gV+ULY/sLCB6Oe6F9MvowUZc= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoqJ7NkoKxapHby/g2+VA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 h1:ek+HR+h5mzH8ZW9yBOarF4Xu4Asj9SceDyrUle8y1yw= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 h1:sZ1KON5k/tyf3xbZKDW/gl4nHEm/84zDpXGsA0/7LcI= From 83a510cec24b824a5d52ebecfa7011cd0035ce86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:13 -0400 Subject: [PATCH 0488/2115] 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 e5ee9b48c7d8..b254fc962210 100644 --- a/go.mod +++ b/go.mod @@ -165,7 +165,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 diff --git a/go.sum b/go.sum index 6690b66ac719..0acaa32856a3 100644 --- a/go.sum +++ b/go.sum @@ -351,8 +351,8 @@ github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yz github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoqJ7NkoKxapHby/g2+VA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 h1:ek+HR+h5mzH8ZW9yBOarF4Xu4Asj9SceDyrUle8y1yw= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq1GyeGv7Dd0tmEvbGTMzKX0iQ= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 h1:sZ1KON5k/tyf3xbZKDW/gl4nHEm/84zDpXGsA0/7LcI= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 h1:7zjskfsMrJGBs6y65V2TZG1xSUxWvZYnFiwBjiRN9F4= From b5cd7984f90b3b067989138635fc568e7e3d5264 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:14 -0400 Subject: [PATCH 0489/2115] 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 b254fc962210..82a9562541e0 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 diff --git a/go.sum b/go.sum index 0acaa32856a3..209b68e62a1d 100644 --- a/go.sum +++ b/go.sum @@ -353,8 +353,8 @@ github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoq github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq1GyeGv7Dd0tmEvbGTMzKX0iQ= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 h1:sZ1KON5k/tyf3xbZKDW/gl4nHEm/84zDpXGsA0/7LcI= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43oI+x6Bm3l4UMT63o3kQOheL7M= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 h1:7zjskfsMrJGBs6y65V2TZG1xSUxWvZYnFiwBjiRN9F4= github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 h1:te/oZcPDK1WkmGy8tE0zoxTE5aEaEqZ/79jdTDxjyb4= From d5d9d8b9c33f8c44fe612ae35db6782551fafa23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:15 -0400 Subject: [PATCH 0490/2115] 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 82a9562541e0..f84b0f05b5db 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 + github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 diff --git a/go.sum b/go.sum index 209b68e62a1d..fc52200ace0d 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43oI+x6Bm3l4UMT63o3kQOheL7M= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 h1:7zjskfsMrJGBs6y65V2TZG1xSUxWvZYnFiwBjiRN9F4= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+GJlgylsOBfHpQqfgpl0QVI= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 h1:te/oZcPDK1WkmGy8tE0zoxTE5aEaEqZ/79jdTDxjyb4= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 h1:wBaXl/5Gxvc3dgiPFNFWw1QEL4ktn3bD+Tb/lU5zGIw= From b8b2815c79ae4f2f02a573b5843cacf2b3bf78e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:16 -0400 Subject: [PATCH 0491/2115] 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 f84b0f05b5db..4f68b7ef4ef2 100644 --- a/go.mod +++ b/go.mod @@ -168,7 +168,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 diff --git a/go.sum b/go.sum index fc52200ace0d..6b8546ab26dd 100644 --- a/go.sum +++ b/go.sum @@ -357,8 +357,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43o github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+GJlgylsOBfHpQqfgpl0QVI= github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 h1:te/oZcPDK1WkmGy8tE0zoxTE5aEaEqZ/79jdTDxjyb4= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXIIvx/69lISetJyPn/O01Gltmw= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 h1:wBaXl/5Gxvc3dgiPFNFWw1QEL4ktn3bD+Tb/lU5zGIw= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 h1:zutK4lUa0WzbzA18TjqAcSCLFWYdtxh2adC9s9Jz2Lo= From 677420d2f17ba548887f488e4043befca52fd495 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:17 -0400 Subject: [PATCH 0492/2115] 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 4f68b7ef4ef2..75d8000ea62e 100644 --- a/go.mod +++ b/go.mod @@ -169,7 +169,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 diff --git a/go.sum b/go.sum index 6b8546ab26dd..fc83733ff451 100644 --- a/go.sum +++ b/go.sum @@ -359,8 +359,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+G github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXIIvx/69lISetJyPn/O01Gltmw= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 h1:wBaXl/5Gxvc3dgiPFNFWw1QEL4ktn3bD+Tb/lU5zGIw= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/AxeVbw9z0xrOjLhBUz1Ry5ERGp0s= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 h1:zutK4lUa0WzbzA18TjqAcSCLFWYdtxh2adC9s9Jz2Lo= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 h1:dr8QYzAgIt7JTEN65ujaa3qB1HDKL1Gg34rVvWBzxn0= From 7b44b6a99cd0c5aa111b4d06b639eedc34e62808 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:18 -0400 Subject: [PATCH 0493/2115] go get github.com/aws/aws-sdk-go-v2/service/mediapackagevod. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 75d8000ea62e..57f90274a98d 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 diff --git a/go.sum b/go.sum index fc83733ff451..51ed75cd90b2 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXI github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/AxeVbw9z0xrOjLhBUz1Ry5ERGp0s= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 h1:zutK4lUa0WzbzA18TjqAcSCLFWYdtxh2adC9s9Jz2Lo= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy3GZUjrR8Ixp8bxuo4dd9WJXXN1s= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 h1:dr8QYzAgIt7JTEN65ujaa3qB1HDKL1Gg34rVvWBzxn0= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 h1:jmAOPEdLWcLdZjkmiDWb3rcKqPNbXKI0l7VgukYWZDw= From 833cb59acfaf17881c3f707a014b14a8b3c6acab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:19 -0400 Subject: [PATCH 0494/2115] 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 57f90274a98d..df6d2327e93b 100644 --- a/go.mod +++ b/go.mod @@ -171,7 +171,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 diff --git a/go.sum b/go.sum index 51ed75cd90b2..24076e441eda 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/Ax github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy3GZUjrR8Ixp8bxuo4dd9WJXXN1s= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 h1:dr8QYzAgIt7JTEN65ujaa3qB1HDKL1Gg34rVvWBzxn0= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3bvZ0yM6LQwoqTmdsx/W/fEM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 h1:jmAOPEdLWcLdZjkmiDWb3rcKqPNbXKI0l7VgukYWZDw= github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 h1:hqeHoI8gefTz2qXgxG7B5PsVuJuyVnPfp7EveQtOeHg= From bfa4e3cea9cbafe9441c743f49b1f2fcfbed848c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:20 -0400 Subject: [PATCH 0495/2115] go get github.com/aws/aws-sdk-go-v2/service/memorydb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index df6d2327e93b..7718f5a0b20f 100644 --- a/go.mod +++ b/go.mod @@ -172,7 +172,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 diff --git a/go.sum b/go.sum index 24076e441eda..541b61ad8246 100644 --- a/go.sum +++ b/go.sum @@ -365,8 +365,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3bvZ0yM6LQwoqTmdsx/W/fEM= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 h1:jmAOPEdLWcLdZjkmiDWb3rcKqPNbXKI0l7VgukYWZDw= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFsGM9gyN/RoUgvQBQmIj6c= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 h1:hqeHoI8gefTz2qXgxG7B5PsVuJuyVnPfp7EveQtOeHg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 h1:h04Kq2u2B6bDeAmNoxlf9bqtKH3GUlkW3p/+e/mE7+o= From 3828907246f38b6acfcc774fff5c48b30cea368e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:21 -0400 Subject: [PATCH 0496/2115] go get github.com/aws/aws-sdk-go-v2/service/mgn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7718f5a0b20f..36787dbc6da6 100644 --- a/go.mod +++ b/go.mod @@ -173,7 +173,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 + github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 diff --git a/go.sum b/go.sum index 541b61ad8246..f5d2c50dbd59 100644 --- a/go.sum +++ b/go.sum @@ -367,8 +367,8 @@ github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3b github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFsGM9gyN/RoUgvQBQmIj6c= github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 h1:hqeHoI8gefTz2qXgxG7B5PsVuJuyVnPfp7EveQtOeHg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXali2QeL+WGXUBew4= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 h1:h04Kq2u2B6bDeAmNoxlf9bqtKH3GUlkW3p/+e/mE7+o= github.com/aws/aws-sdk-go-v2/service/mq v1.32.0/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 h1:8ScMT/bvwaGzWE+5zVDxVPgSWaBrSaFZhEIhX7kCOhg= From fd8980ea25c0c92d5715b94dd956aeb671dbf761 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:21 -0400 Subject: [PATCH 0497/2115] 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 36787dbc6da6..c1c5f5ee4e56 100644 --- a/go.mod +++ b/go.mod @@ -174,7 +174,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 - github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 + github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 diff --git a/go.sum b/go.sum index f5d2c50dbd59..0d47f0e1590c 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFs github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXali2QeL+WGXUBew4= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 h1:h04Kq2u2B6bDeAmNoxlf9bqtKH3GUlkW3p/+e/mE7+o= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.0/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnYOyrLz1xs1EY1hE= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 h1:8ScMT/bvwaGzWE+5zVDxVPgSWaBrSaFZhEIhX7kCOhg= github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 h1:G8EHt/6UbzCG4ZvQZP/HHDHApq+zArzKEXMhpYlPhug= From 03f75abfaa59c75b4a869555891e37d8d974940b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:22 -0400 Subject: [PATCH 0498/2115] 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 c1c5f5ee4e56..89e0ed9bc63f 100644 --- a/go.mod +++ b/go.mod @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 diff --git a/go.sum b/go.sum index 0d47f0e1590c..d3dd823e1b64 100644 --- a/go.sum +++ b/go.sum @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXa github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnYOyrLz1xs1EY1hE= github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 h1:8ScMT/bvwaGzWE+5zVDxVPgSWaBrSaFZhEIhX7kCOhg= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZMeF17Cve6tfKIzITE= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 h1:G8EHt/6UbzCG4ZvQZP/HHDHApq+zArzKEXMhpYlPhug= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 h1:+zQYbnkNrMslzC+4RKJjoENheRA0oyRZWrr1GoaD6hc= From 1f8d76ac27494d974324deaf7312bdfa5d9cf850 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:23 -0400 Subject: [PATCH 0499/2115] go get github.com/aws/aws-sdk-go-v2/service/neptune. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 89e0ed9bc63f..0e13529e680f 100644 --- a/go.mod +++ b/go.mod @@ -176,7 +176,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 + github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 diff --git a/go.sum b/go.sum index d3dd823e1b64..e1c5355052e7 100644 --- a/go.sum +++ b/go.sum @@ -373,8 +373,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnY github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZMeF17Cve6tfKIzITE= github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 h1:G8EHt/6UbzCG4ZvQZP/HHDHApq+zArzKEXMhpYlPhug= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/8bvBIoprUy1QYeEYaU0= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 h1:+zQYbnkNrMslzC+4RKJjoENheRA0oyRZWrr1GoaD6hc= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 h1:5v9hJYt08sME6Pzt7zEn3q7prnBKjjuv6dUzpStvm3I= From db6d79cec372a7356f400a4b8113218b1bea835a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:24 -0400 Subject: [PATCH 0500/2115] 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 0e13529e680f..b60d4323a39f 100644 --- a/go.mod +++ b/go.mod @@ -177,7 +177,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 diff --git a/go.sum b/go.sum index e1c5355052e7..28c4fb13a918 100644 --- a/go.sum +++ b/go.sum @@ -375,8 +375,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZM github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/8bvBIoprUy1QYeEYaU0= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 h1:+zQYbnkNrMslzC+4RKJjoENheRA0oyRZWrr1GoaD6hc= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNUlxPO5UHr3nXAqakzYV3gS+kg= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 h1:5v9hJYt08sME6Pzt7zEn3q7prnBKjjuv6dUzpStvm3I= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 h1:Rdh8HWrjiIn7lLugBf3uR9NQoUE0XvOyM8c3I7okBXk= From 4f7482a8a82f40a4b472bfaa54ccbfc6023880cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:25 -0400 Subject: [PATCH 0501/2115] go get github.com/aws/aws-sdk-go-v2/service/networkfirewall. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b60d4323a39f..245fc16f36dd 100644 --- a/go.mod +++ b/go.mod @@ -178,7 +178,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 diff --git a/go.sum b/go.sum index 28c4fb13a918..5864281a7ff3 100644 --- a/go.sum +++ b/go.sum @@ -377,8 +377,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/ github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNUlxPO5UHr3nXAqakzYV3gS+kg= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 h1:5v9hJYt08sME6Pzt7zEn3q7prnBKjjuv6dUzpStvm3I= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaqT25cmhakK3rd0d/8Wxn2VwbDIbA= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 h1:Rdh8HWrjiIn7lLugBf3uR9NQoUE0XvOyM8c3I7okBXk= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 h1:4RstlGjxjPNGswiVCIPcwck+IH/HulpbaNY+1PA2Sg4= From d6cd34daec93134a3cf5e538ff70608af8946331 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:26 -0400 Subject: [PATCH 0502/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 245fc16f36dd..9b3a07bfa7dd 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 diff --git a/go.sum b/go.sum index 5864281a7ff3..d274f001bf34 100644 --- a/go.sum +++ b/go.sum @@ -379,8 +379,8 @@ github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNU github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaqT25cmhakK3rd0d/8Wxn2VwbDIbA= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 h1:Rdh8HWrjiIn7lLugBf3uR9NQoUE0XvOyM8c3I7okBXk= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNTUDw+vzcm/DiYsIaz5Nbg1HQnHY= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 h1:4RstlGjxjPNGswiVCIPcwck+IH/HulpbaNY+1PA2Sg4= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 h1:oy/Wi6NFXYRg/1wtNNRn2gyEIJGmIon1osvj0E7s1tU= From 1eb5a8618632894df1d04d6518dae4d9ea8b905a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:27 -0400 Subject: [PATCH 0503/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmonitor. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9b3a07bfa7dd..7d13d367e9aa 100644 --- a/go.mod +++ b/go.mod @@ -180,7 +180,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 diff --git a/go.sum b/go.sum index d274f001bf34..204e2797a030 100644 --- a/go.sum +++ b/go.sum @@ -381,8 +381,8 @@ github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaq github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNTUDw+vzcm/DiYsIaz5Nbg1HQnHY= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 h1:4RstlGjxjPNGswiVCIPcwck+IH/HulpbaNY+1PA2Sg4= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi97aiWXNMkEBFQswuY3IZVeJdWJg= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 h1:oy/Wi6NFXYRg/1wtNNRn2gyEIJGmIon1osvj0E7s1tU= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 h1:cU81jdax5eqhZiEGRxRN5nfKj9Rp6jgHKnIDoRArU3A= From 48088a1eb8c3506f62bae6b7092bdb5e67428351 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:28 -0400 Subject: [PATCH 0504/2115] go get github.com/aws/aws-sdk-go-v2/service/notifications. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d13d367e9aa..8b51c5491e86 100644 --- a/go.mod +++ b/go.mod @@ -181,7 +181,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 diff --git a/go.sum b/go.sum index 204e2797a030..7b3d3057a457 100644 --- a/go.sum +++ b/go.sum @@ -383,8 +383,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNT github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi97aiWXNMkEBFQswuY3IZVeJdWJg= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 h1:oy/Wi6NFXYRg/1wtNNRn2gyEIJGmIon1osvj0E7s1tU= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/HpbeaUtqtalIGN+SW3s8G0tpgBk0= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 h1:cU81jdax5eqhZiEGRxRN5nfKj9Rp6jgHKnIDoRArU3A= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 h1:S0IoLaOU5NCanjuxRLmf+qjkz8cUnNvaAOOC/zb8c4Y= From ab2c86c52c2be7ae1f174595c33ab174b623f8dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:29 -0400 Subject: [PATCH 0505/2115] go get github.com/aws/aws-sdk-go-v2/service/notificationscontacts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8b51c5491e86..25c387295908 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 diff --git a/go.sum b/go.sum index 7b3d3057a457..852c6e8f1d23 100644 --- a/go.sum +++ b/go.sum @@ -385,8 +385,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi9 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/HpbeaUtqtalIGN+SW3s8G0tpgBk0= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 h1:cU81jdax5eqhZiEGRxRN5nfKj9Rp6jgHKnIDoRArU3A= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUFKjWKNQNb64yplb0Z9fU/YqpS8GZEzie8= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 h1:S0IoLaOU5NCanjuxRLmf+qjkz8cUnNvaAOOC/zb8c4Y= github.com/aws/aws-sdk-go-v2/service/oam v1.21.0/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 h1:EDHfy8QUacuK48e3rA99EfrD7z4zSVYz99es2YicD2k= From 4765f5ddbb4b878418e7158198446a5c896d5639 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:29 -0400 Subject: [PATCH 0506/2115] 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 25c387295908..d3876d525d02 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 - github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 + github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 diff --git a/go.sum b/go.sum index 852c6e8f1d23..304cb7d8cf82 100644 --- a/go.sum +++ b/go.sum @@ -387,8 +387,8 @@ github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/Hpbe github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUFKjWKNQNb64yplb0Z9fU/YqpS8GZEzie8= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 h1:S0IoLaOU5NCanjuxRLmf+qjkz8cUnNvaAOOC/zb8c4Y= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.0/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TXt5amOPinYayB1oA= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 h1:EDHfy8QUacuK48e3rA99EfrD7z4zSVYz99es2YicD2k= github.com/aws/aws-sdk-go-v2/service/odb v1.3.0/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 h1:dxYQ9hDRI/yXFzO3sYT+x3Ss2d8JDf2eX5hyUPHG6fA= From d5d02457dc611c98a4da88b9fd7a88be5ecc3ce1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:31 -0400 Subject: [PATCH 0507/2115] go get github.com/aws/aws-sdk-go-v2/service/odb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d3876d525d02..96570f10b9c5 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 - github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 + github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 diff --git a/go.sum b/go.sum index 304cb7d8cf82..96b132454fc1 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUF github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TXt5amOPinYayB1oA= github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 h1:EDHfy8QUacuK48e3rA99EfrD7z4zSVYz99es2YicD2k= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.0/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPCS2/GadcFuGg4kA= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 h1:dxYQ9hDRI/yXFzO3sYT+x3Ss2d8JDf2eX5hyUPHG6fA= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 h1:usR9TyfGyoGq2SK2ksEc3qwpYeBe03rccTj63hUFWKk= From 3d502f81f506dd7f75a5b68b664e055412aa6b6b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:31 -0400 Subject: [PATCH 0508/2115] go get github.com/aws/aws-sdk-go-v2/service/opensearch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 96570f10b9c5..dfc3b3003bdb 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 diff --git a/go.sum b/go.sum index 96b132454fc1..2991e4274d6c 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TX github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPCS2/GadcFuGg4kA= github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 h1:dxYQ9hDRI/yXFzO3sYT+x3Ss2d8JDf2eX5hyUPHG6fA= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C4dvFhP7ypQfJvDncmwimHQ= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 h1:usR9TyfGyoGq2SK2ksEc3qwpYeBe03rccTj63hUFWKk= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 h1:mkEqqGgdmOQ7DbfWVKL8TmAki9S3f+4YiMwgKN6TIyE= From 34d78e8ac9e6ab69620f97987a35052694da4270 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:32 -0400 Subject: [PATCH 0509/2115] 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 dfc3b3003bdb..ba1c87d002b6 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 diff --git a/go.sum b/go.sum index 2991e4274d6c..221ea487994b 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPC github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C4dvFhP7ypQfJvDncmwimHQ= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 h1:usR9TyfGyoGq2SK2ksEc3qwpYeBe03rccTj63hUFWKk= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCFgYBOJotsbXS3yaiW6vFI6iPfK6o3TiWI= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 h1:mkEqqGgdmOQ7DbfWVKL8TmAki9S3f+4YiMwgKN6TIyE= github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 h1:71GQ3yQ1sGjXsAOBso7nVLCLJrCoDQP1IhYbQciMpFk= From 8ac44d874d142541ca896a74926075597b5686f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:33 -0400 Subject: [PATCH 0510/2115] 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 ba1c87d002b6..73a8c59851bb 100644 --- a/go.mod +++ b/go.mod @@ -187,7 +187,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 + github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 diff --git a/go.sum b/go.sum index 221ea487994b..ab2138f1f0d0 100644 --- a/go.sum +++ b/go.sum @@ -395,8 +395,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCFgYBOJotsbXS3yaiW6vFI6iPfK6o3TiWI= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 h1:mkEqqGgdmOQ7DbfWVKL8TmAki9S3f+4YiMwgKN6TIyE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0PCuJ+12Cd+2NwRejcaC8UhLrJs= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 h1:71GQ3yQ1sGjXsAOBso7nVLCLJrCoDQP1IhYbQciMpFk= github.com/aws/aws-sdk-go-v2/service/osis v1.18.0/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 h1:PlpUSiYutFa6aEeRrQYUo8zomTuAx5oXxjwrZ/XZH+8= From cc39123bdc7590096c5959a7d466b38bfa024111 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:34 -0400 Subject: [PATCH 0511/2115] 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 73a8c59851bb..cc5815b86415 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 - github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 + github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 diff --git a/go.sum b/go.sum index ab2138f1f0d0..2524dd639f57 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCF github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0PCuJ+12Cd+2NwRejcaC8UhLrJs= github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 h1:71GQ3yQ1sGjXsAOBso7nVLCLJrCoDQP1IhYbQciMpFk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.0/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCpGHU5rpaLf3VhZlo8= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 h1:PlpUSiYutFa6aEeRrQYUo8zomTuAx5oXxjwrZ/XZH+8= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 h1:VOGIH/MtfO0aIDRuCllgzlakSqzA66W5Yc2FHatgfuE= From 54b0868979d96d972f2014e51e1f3be04164b2be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:35 -0400 Subject: [PATCH 0512/2115] go get github.com/aws/aws-sdk-go-v2/service/outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cc5815b86415..1a4a6e6801e0 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 + github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 diff --git a/go.sum b/go.sum index 2524dd639f57..f62e0ddc9391 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0P github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCpGHU5rpaLf3VhZlo8= github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 h1:PlpUSiYutFa6aEeRrQYUo8zomTuAx5oXxjwrZ/XZH+8= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075eykwvu1i1n2Mex9x4Lcs= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 h1:VOGIH/MtfO0aIDRuCllgzlakSqzA66W5Yc2FHatgfuE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 h1:IlYnE1ZfFKisSY2tOp6jgKBXZoNIfhHPYzBDPfwmY/0= From 913ae25dadaa765e64f2ad11e991ac6219dbe31d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:36 -0400 Subject: [PATCH 0513/2115] 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 1a4a6e6801e0..7625e4a44763 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 diff --git a/go.sum b/go.sum index f62e0ddc9391..598c1996313a 100644 --- a/go.sum +++ b/go.sum @@ -401,8 +401,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCp github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075eykwvu1i1n2Mex9x4Lcs= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 h1:VOGIH/MtfO0aIDRuCllgzlakSqzA66W5Yc2FHatgfuE= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+jIExhMUYU9uor2pVYfHEShFWjL5GGn8= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 h1:IlYnE1ZfFKisSY2tOp6jgKBXZoNIfhHPYzBDPfwmY/0= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 h1:KXl52JHAz09QVa9tymsKhofwoNRqmtdz8SkKLZa79HY= From 6c4554467bbbbd852f1861e5708975ffae7c854c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:37 -0400 Subject: [PATCH 0514/2115] 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 7625e4a44763..d23e55db9e77 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 diff --git a/go.sum b/go.sum index 598c1996313a..df582e578e62 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+jIExhMUYU9uor2pVYfHEShFWjL5GGn8= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 h1:IlYnE1ZfFKisSY2tOp6jgKBXZoNIfhHPYzBDPfwmY/0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmAaOikap1971w6SrCN/vvcrDR9SY= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 h1:KXl52JHAz09QVa9tymsKhofwoNRqmtdz8SkKLZa79HY= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 h1:2N2oZEWjjUWpqqOSNEgpd63ETgtp8UHFhMACk7ByM2I= From 0672edb3423782c7742191e28e064c71110f76d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:38 -0400 Subject: [PATCH 0515/2115] go get github.com/aws/aws-sdk-go-v2/service/pcs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d23e55db9e77..8de23b224229 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 diff --git a/go.sum b/go.sum index df582e578e62..c99cbd9db24b 100644 --- a/go.sum +++ b/go.sum @@ -405,8 +405,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmAaOikap1971w6SrCN/vvcrDR9SY= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 h1:KXl52JHAz09QVa9tymsKhofwoNRqmtdz8SkKLZa79HY= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0XNVyefAaogYGufA= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 h1:2N2oZEWjjUWpqqOSNEgpd63ETgtp8UHFhMACk7ByM2I= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NYowWLd9LYYKO+cwxMpb1XpSYX6a8dMg= From a70a1f86604604615bcf35515d05c149f7361fad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:38 -0400 Subject: [PATCH 0516/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpoint. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8de23b224229..55d5ee1a45ff 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 diff --git a/go.sum b/go.sum index c99cbd9db24b..47c8a4d5c2d5 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,8 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmA github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0XNVyefAaogYGufA= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 h1:2N2oZEWjjUWpqqOSNEgpd63ETgtp8UHFhMACk7ByM2I= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY2aFzOXp2ypplpsYa5mcU= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NYowWLd9LYYKO+cwxMpb1XpSYX6a8dMg= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= From 9b210089e5fb191fc874fd1eb7ab81cad7a201ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:39 -0400 Subject: [PATCH 0517/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 55d5ee1a45ff..b4f672e1bfd8 100644 --- a/go.mod +++ b/go.mod @@ -194,7 +194,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 diff --git a/go.sum b/go.sum index 47c8a4d5c2d5..3e94323d6d94 100644 --- a/go.sum +++ b/go.sum @@ -409,8 +409,8 @@ github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY2aFzOXp2ypplpsYa5mcU= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NYowWLd9LYYKO+cwxMpb1XpSYX6a8dMg= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhTaC+Au1n92O+vNVKuGxDpYDXZJP47/I= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= From 3ab9768694fb97889b359a921a9d2959a9048d19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:40 -0400 Subject: [PATCH 0518/2115] 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 b4f672e1bfd8..86915d15b45b 100644 --- a/go.mod +++ b/go.mod @@ -195,7 +195,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 diff --git a/go.sum b/go.sum index 3e94323d6d94..6c56b50285fe 100644 --- a/go.sum +++ b/go.sum @@ -411,8 +411,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhTaC+Au1n92O+vNVKuGxDpYDXZJP47/I= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1vCascKDbZ5C9MJNt7c= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= github.com/aws/aws-sdk-go-v2/service/polly v1.52.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= From e133d71aa50797f6fd49a952c2a9082697e2cf16 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:41 -0400 Subject: [PATCH 0519/2115] 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 86915d15b45b..2dba7b5c0a77 100644 --- a/go.mod +++ b/go.mod @@ -196,7 +196,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 - github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 + github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 diff --git a/go.sum b/go.sum index 6c56b50285fe..dc18eebd4040 100644 --- a/go.sum +++ b/go.sum @@ -413,8 +413,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhT github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1vCascKDbZ5C9MJNt7c= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK80PnPa4XqXoQKl7PFk= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= From f52fe54433130c25405740e291a174e0fe2e87be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:41 -0400 Subject: [PATCH 0520/2115] 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 2dba7b5c0a77..66f73034924a 100644 --- a/go.mod +++ b/go.mod @@ -197,7 +197,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 + github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 diff --git a/go.sum b/go.sum index dc18eebd4040..6a464b0fcebf 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1v github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK80PnPa4XqXoQKl7PFk= github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3WwwLeyehPOrG0/N/8fc= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 h1:z8hxRH/lXSN0oWjvYyuxeAHIEOX2mP4m3QqbJgNZw2g= From 00e7daaec43d7f41efefdc87b99ebdcc8ea3fb64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:43 -0400 Subject: [PATCH 0521/2115] 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 66f73034924a..84764e7ed059 100644 --- a/go.mod +++ b/go.mod @@ -198,7 +198,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 diff --git a/go.sum b/go.sum index 6a464b0fcebf..4c971024dcbd 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK8 github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3WwwLeyehPOrG0/N/8fc= github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF76wFQNNQLLu/RUFPx32ulM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 h1:z8hxRH/lXSN0oWjvYyuxeAHIEOX2mP4m3QqbJgNZw2g= github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 h1:GzBorIQ93nyNDbC59odoBTRRSAx0Im9Z7xwJ5UbI81w= From ce928c9c5190fdbf6de1b6715fd1ee99ab2844c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:43 -0400 Subject: [PATCH 0522/2115] 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 84764e7ed059..039b3ed7788a 100644 --- a/go.mod +++ b/go.mod @@ -199,7 +199,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 + github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 diff --git a/go.sum b/go.sum index 4c971024dcbd..910c2bde1fd3 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3 github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF76wFQNNQLLu/RUFPx32ulM= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 h1:z8hxRH/lXSN0oWjvYyuxeAHIEOX2mP4m3QqbJgNZw2g= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9hgk36ydnybnb6RwU= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 h1:GzBorIQ93nyNDbC59odoBTRRSAx0Im9Z7xwJ5UbI81w= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 h1:S1OWl3a+IRR/GSqzjea0jflabLsHyDJXknxJk7pkYI0= From 57f55162962d58bb513ff00339ea32dbb584ad21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:44 -0400 Subject: [PATCH 0523/2115] go get github.com/aws/aws-sdk-go-v2/service/quicksight. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 039b3ed7788a..ef71343ae20d 100644 --- a/go.mod +++ b/go.mod @@ -200,7 +200,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 diff --git a/go.sum b/go.sum index 910c2bde1fd3..c7b19d2985fd 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF7 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9hgk36ydnybnb6RwU= github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 h1:GzBorIQ93nyNDbC59odoBTRRSAx0Im9Z7xwJ5UbI81w= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUhwp7B8IcemxgUzk5os7KL+o= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 h1:S1OWl3a+IRR/GSqzjea0jflabLsHyDJXknxJk7pkYI0= github.com/aws/aws-sdk-go-v2/service/ram v1.33.0/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 h1:uxZwx9vobWg4IS1dyMoC/5Bqrkt9URYtUvj08SZPDRY= From af64d2214173d5a88b1ace76a6257eb12b924308 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:45 -0400 Subject: [PATCH 0524/2115] 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 ef71343ae20d..80fcd5c2744b 100644 --- a/go.mod +++ b/go.mod @@ -201,7 +201,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 - github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 + github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 diff --git a/go.sum b/go.sum index c7b19d2985fd..d4ad0e3f01a7 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,8 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9 github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUhwp7B8IcemxgUzk5os7KL+o= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 h1:S1OWl3a+IRR/GSqzjea0jflabLsHyDJXknxJk7pkYI0= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.0/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro4LD4IT+qYi2WUsQ= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 h1:uxZwx9vobWg4IS1dyMoC/5Bqrkt9URYtUvj08SZPDRY= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 h1:OWsmICx9jHtBVrgYwYb+2q0iVSPLIfDZOiKhoQA+gjc= From ae9d78ec62eb8124470853acf68cee850ae00af2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:46 -0400 Subject: [PATCH 0525/2115] 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 80fcd5c2744b..ff4ff5a0ac41 100644 --- a/go.mod +++ b/go.mod @@ -202,7 +202,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 + github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 diff --git a/go.sum b/go.sum index d4ad0e3f01a7..99add7dcc614 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,8 @@ github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUh github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro4LD4IT+qYi2WUsQ= github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 h1:uxZwx9vobWg4IS1dyMoC/5Bqrkt9URYtUvj08SZPDRY= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBiagko7v0EF6xwW0yo= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 h1:OWsmICx9jHtBVrgYwYb+2q0iVSPLIfDZOiKhoQA+gjc= github.com/aws/aws-sdk-go-v2/service/rds v1.103.0/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 h1:gFNE53MstNSex5n2AeuqDeO9y6YrAEq5r9ohIo0Q1S4= From 9e274b1ebded83f5e8caad2d7389f5055a4ae4d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:47 -0400 Subject: [PATCH 0526/2115] 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 ff4ff5a0ac41..c8953ccb335d 100644 --- a/go.mod +++ b/go.mod @@ -203,7 +203,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 - github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 diff --git a/go.sum b/go.sum index 99add7dcc614..4e611656ecc6 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBiagko7v0EF6xwW0yo= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 h1:OWsmICx9jHtBVrgYwYb+2q0iVSPLIfDZOiKhoQA+gjc= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.0/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ7c2sO4e4yMD6vLss= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 h1:gFNE53MstNSex5n2AeuqDeO9y6YrAEq5r9ohIo0Q1S4= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 h1:m900Kua81M38+2mViQR0WyXuVJHXfHhBMZE2KEOKCxg= From 33766b012da739acdd64cd170f18638996e55cb1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:48 -0400 Subject: [PATCH 0527/2115] 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 c8953ccb335d..970f952e915f 100644 --- a/go.mod +++ b/go.mod @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 + github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 diff --git a/go.sum b/go.sum index 4e611656ecc6..098848c6bbb8 100644 --- a/go.sum +++ b/go.sum @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBi github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ7c2sO4e4yMD6vLss= github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 h1:gFNE53MstNSex5n2AeuqDeO9y6YrAEq5r9ohIo0Q1S4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XMft2EV3FXR/2STXFoSfn4= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 h1:m900Kua81M38+2mViQR0WyXuVJHXfHhBMZE2KEOKCxg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 h1:jB/wGP9pe9pbXCFqZELx9MxLmkZetN0yK0kc7jFDlIY= From 9b2f9bc16556717c383b33421040fb531082106c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:49 -0400 Subject: [PATCH 0528/2115] 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 970f952e915f..464e3d07831f 100644 --- a/go.mod +++ b/go.mod @@ -205,7 +205,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 diff --git a/go.sum b/go.sum index 098848c6bbb8..117fbc00560f 100644 --- a/go.sum +++ b/go.sum @@ -431,8 +431,8 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XMft2EV3FXR/2STXFoSfn4= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 h1:m900Kua81M38+2mViQR0WyXuVJHXfHhBMZE2KEOKCxg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS9nLw7zsG8jnJHoBDW0HAIAtY= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 h1:jB/wGP9pe9pbXCFqZELx9MxLmkZetN0yK0kc7jFDlIY= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 h1:bn5Y52YaLv5p7sa6TIH3Fr/V+gLpoQkcctNAvYT1YP8= From 91dee33db41f4992471873902676fb45fd037678 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:50 -0400 Subject: [PATCH 0529/2115] 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 464e3d07831f..59f8c9088f00 100644 --- a/go.mod +++ b/go.mod @@ -206,7 +206,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 diff --git a/go.sum b/go.sum index 117fbc00560f..0782597d078b 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XM github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS9nLw7zsG8jnJHoBDW0HAIAtY= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 h1:jB/wGP9pe9pbXCFqZELx9MxLmkZetN0yK0kc7jFDlIY= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzIYhI9rmN5d+X2UF7MPGXKvjx3G/XGGM= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 h1:bn5Y52YaLv5p7sa6TIH3Fr/V+gLpoQkcctNAvYT1YP8= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h2DRDItRtrD3NdGWs0xztSZlFU= From 2a374eee3a223eef5cb96f2430aa88be4e93dbfd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:51 -0400 Subject: [PATCH 0530/2115] 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 59f8c9088f00..6b2c6f66d676 100644 --- a/go.mod +++ b/go.mod @@ -207,7 +207,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 diff --git a/go.sum b/go.sum index 0782597d078b..228c1e44120e 100644 --- a/go.sum +++ b/go.sum @@ -435,8 +435,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzIYhI9rmN5d+X2UF7MPGXKvjx3G/XGGM= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 h1:bn5Y52YaLv5p7sa6TIH3Fr/V+gLpoQkcctNAvYT1YP8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigilserDQum3vfQQVY38RzIuYk= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h2DRDItRtrD3NdGWs0xztSZlFU= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 h1:26bUDFcdGzHxBax1oY+HL/YRmUVfqyvcbgdKHr0FDfE= From 28c671e59fac11609ba83ab55cd62cf14019624e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:52 -0400 Subject: [PATCH 0531/2115] 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 6b2c6f66d676..d1ee3a774d3f 100644 --- a/go.mod +++ b/go.mod @@ -209,7 +209,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 diff --git a/go.sum b/go.sum index 228c1e44120e..f5b2501906db 100644 --- a/go.sum +++ b/go.sum @@ -439,8 +439,8 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigi github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h2DRDItRtrD3NdGWs0xztSZlFU= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 h1:26bUDFcdGzHxBax1oY+HL/YRmUVfqyvcbgdKHr0FDfE= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 h1:ZzEJclXVP4woTKwsQChUKOZuekxc/DBjlHKmfFWpYrg= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 h1:jevrLpVG9sOEPsuipO3eGcdDzJyo36Dmme9iSu/8GVE= From a78f89bf5d938517778024f3c208285bb142ac89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:53 -0400 Subject: [PATCH 0532/2115] 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 d1ee3a774d3f..341673843d8a 100644 --- a/go.mod +++ b/go.mod @@ -210,7 +210,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 diff --git a/go.sum b/go.sum index f5b2501906db..a0fcb3499b52 100644 --- a/go.sum +++ b/go.sum @@ -441,8 +441,8 @@ github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 h1:ZzEJclXVP4woTKwsQChUKOZuekxc/DBjlHKmfFWpYrg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 h1:jevrLpVG9sOEPsuipO3eGcdDzJyo36Dmme9iSu/8GVE= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 h1:KBw/bfF87jfAgm0ZcQOCgqJSY7tMLg9x+1f+EdUHQt0= From f394c674330f1c5f5e86980597f57f87b40f8410 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:53 -0400 Subject: [PATCH 0533/2115] 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 341673843d8a..b6f6ee4d1930 100644 --- a/go.mod +++ b/go.mod @@ -211,7 +211,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 diff --git a/go.sum b/go.sum index a0fcb3499b52..23c75699a03f 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,8 @@ github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 h1:jevrLpVG9sOEPsuipO3eGcdDzJyo36Dmme9iSu/8GVE= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEVCtNFZCMz2Y8S103j7uedO7bh9g2iXtHMcjuI= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 h1:KBw/bfF87jfAgm0ZcQOCgqJSY7tMLg9x+1f+EdUHQt0= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 h1:+8/JB7/ZIk86sDBtcy+md9qqHOjc6rR75NySpsrujDY= From 0c9b1837a0c17f6383efd5d0c32d5ec752a0e97d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:54 -0400 Subject: [PATCH 0534/2115] 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 b6f6ee4d1930..b73d7cdd94ae 100644 --- a/go.mod +++ b/go.mod @@ -212,7 +212,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 diff --git a/go.sum b/go.sum index 23c75699a03f..d52db211d9a7 100644 --- a/go.sum +++ b/go.sum @@ -445,8 +445,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZr github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEVCtNFZCMz2Y8S103j7uedO7bh9g2iXtHMcjuI= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 h1:KBw/bfF87jfAgm0ZcQOCgqJSY7tMLg9x+1f+EdUHQt0= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2idqDf2hIksDhPgRaFQO1hb4yCk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 h1:+8/JB7/ZIk86sDBtcy+md9qqHOjc6rR75NySpsrujDY= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 h1:ZjfNS/AmmzzGbM9Au1219mq3rh7L3HhzgCV04Z5k24M= From 9081198ebfc24e20767f258fabbc4f4daebd5862 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:55 -0400 Subject: [PATCH 0535/2115] 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 b73d7cdd94ae..87b36f5c797a 100644 --- a/go.mod +++ b/go.mod @@ -213,7 +213,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 + github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 diff --git a/go.sum b/go.sum index d52db211d9a7..6142e17cde7f 100644 --- a/go.sum +++ b/go.sum @@ -447,8 +447,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEV github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2idqDf2hIksDhPgRaFQO1hb4yCk= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 h1:+8/JB7/ZIk86sDBtcy+md9qqHOjc6rR75NySpsrujDY= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmifR/+T5TuXIHn2ivu8zKQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 h1:ZjfNS/AmmzzGbM9Au1219mq3rh7L3HhzgCV04Z5k24M= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 h1:MuXKThC0Lv83LdIiFc5aMjmjYuG7hC49Da3H+dvt6xo= From 1d2ad48b0d0f24afd2bc5dfd556d435658df075b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:56 -0400 Subject: [PATCH 0536/2115] 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 87b36f5c797a..3ab864213c26 100644 --- a/go.mod +++ b/go.mod @@ -214,7 +214,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 diff --git a/go.sum b/go.sum index 6142e17cde7f..00df644ddea9 100644 --- a/go.sum +++ b/go.sum @@ -449,8 +449,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2i github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmifR/+T5TuXIHn2ivu8zKQ= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 h1:ZjfNS/AmmzzGbM9Au1219mq3rh7L3HhzgCV04Z5k24M= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItEhVwfP/xfHmNHtENN8VoiB7NBFA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 h1:MuXKThC0Lv83LdIiFc5aMjmjYuG7hC49Da3H+dvt6xo= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 h1:mYSV8Ih3PRx9/uKuMMYRGWnUSDjOKDJAlPLqw/fhxB4= From 057bd0f7d9688a413c0fafa24309e223aafc8027 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:57 -0400 Subject: [PATCH 0537/2115] 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 3ab864213c26..36ab6e966c4e 100644 --- a/go.mod +++ b/go.mod @@ -215,7 +215,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 diff --git a/go.sum b/go.sum index 00df644ddea9..3e17f506f2d3 100644 --- a/go.sum +++ b/go.sum @@ -451,8 +451,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmif github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItEhVwfP/xfHmNHtENN8VoiB7NBFA= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 h1:MuXKThC0Lv83LdIiFc5aMjmjYuG7hC49Da3H+dvt6xo= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gSDqAJIoBDNmjpNihYjCQORAg/yc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 h1:mYSV8Ih3PRx9/uKuMMYRGWnUSDjOKDJAlPLqw/fhxB4= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 h1:M1lJ8nSB8pL5XPIq82UsizGi+t4ZXkmBkW2WpPWczpw= From 803a61be21811c47035fb912698958bacdc2ce69 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:57 -0400 Subject: [PATCH 0538/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 36ab6e966c4e..ef7a943d0664 100644 --- a/go.mod +++ b/go.mod @@ -216,7 +216,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 diff --git a/go.sum b/go.sum index 3e17f506f2d3..fe2dd7103e38 100644 --- a/go.sum +++ b/go.sum @@ -453,8 +453,8 @@ github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItE github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gSDqAJIoBDNmjpNihYjCQORAg/yc= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 h1:mYSV8Ih3PRx9/uKuMMYRGWnUSDjOKDJAlPLqw/fhxB4= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U1M4miaC/+iLFjllYtvr4N4JfxFfvHv+wWvGrbZ+E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 h1:M1lJ8nSB8pL5XPIq82UsizGi+t4ZXkmBkW2WpPWczpw= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 h1:JCUZSQ0pCqqihKLmicNKzvKt0JpXzwyWr4izSjyKxbg= From 21325620dc5048bd393ad08dc0b3fd447f5e6b13 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:58 -0400 Subject: [PATCH 0539/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ef7a943d0664..0fd94727ff73 100644 --- a/go.mod +++ b/go.mod @@ -217,7 +217,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 diff --git a/go.sum b/go.sum index fe2dd7103e38..13570d82856f 100644 --- a/go.sum +++ b/go.sum @@ -455,8 +455,8 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gS github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U1M4miaC/+iLFjllYtvr4N4JfxFfvHv+wWvGrbZ+E= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 h1:M1lJ8nSB8pL5XPIq82UsizGi+t4ZXkmBkW2WpPWczpw= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1YqSV8O9QpeuDTBoDncph5pJpTaIeK5FivKwfSI= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 h1:JCUZSQ0pCqqihKLmicNKzvKt0JpXzwyWr4izSjyKxbg= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/a3mz+bjg1uTSyys= From 3f73f5e7a442f54ede6c8e60ffe419aa8e247380 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:32:59 -0400 Subject: [PATCH 0540/2115] go get github.com/aws/aws-sdk-go-v2/service/route53resolver. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0fd94727ff73..2795c5c0e7e0 100644 --- a/go.mod +++ b/go.mod @@ -218,7 +218,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 diff --git a/go.sum b/go.sum index 13570d82856f..e9b0e2f97927 100644 --- a/go.sum +++ b/go.sum @@ -457,8 +457,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1YqSV8O9QpeuDTBoDncph5pJpTaIeK5FivKwfSI= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 h1:JCUZSQ0pCqqihKLmicNKzvKt0JpXzwyWr4izSjyKxbg= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 h1:Peg2o4ykhpoUrGu+teNnBVL5AnNoypKjVv3M8nbzGUM= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/a3mz+bjg1uTSyys= github.com/aws/aws-sdk-go-v2/service/rum v1.27.0/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= From 6910e45203da5eaddf824ba22f6cdd6d77ecd443 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:00 -0400 Subject: [PATCH 0541/2115] 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 2795c5c0e7e0..26e9051cf671 100644 --- a/go.mod +++ b/go.mod @@ -219,7 +219,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 - github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 + github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 diff --git a/go.sum b/go.sum index e9b0e2f97927..c9a711480d99 100644 --- a/go.sum +++ b/go.sum @@ -459,8 +459,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1Yq github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 h1:Peg2o4ykhpoUrGu+teNnBVL5AnNoypKjVv3M8nbzGUM= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/a3mz+bjg1uTSyys= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.0/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 h1:LubFJpiNFFpuuvz1d0wUtmSfyy/XO9zdw7QdlmQX91E= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.1/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 h1:y8H04kZLZu8Zcy/+E3yYPd1e5V+pPJklbLdkKlLGeO4= From 2120597b15147fa63153a21c124e614f602a6a73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:02 -0400 Subject: [PATCH 0542/2115] 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 26e9051cf671..278778dc0f96 100644 --- a/go.mod +++ b/go.mod @@ -221,7 +221,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 diff --git a/go.sum b/go.sum index c9a711480d99..699080f2de63 100644 --- a/go.sum +++ b/go.sum @@ -463,8 +463,8 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 h1:LubFJpiNFFpuuvz1d0wUtmSfyy/X github.com/aws/aws-sdk-go-v2/service/rum v1.27.1/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 h1:y8H04kZLZu8Zcy/+E3yYPd1e5V+pPJklbLdkKlLGeO4= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx53ImR4HUPCO5/qS7a48pek= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 h1:mT0D16ojwEPM0/XW1yVAeJYvX1F5B2yMhwf7CDpvIqw= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= From cd49c3340fded7fd2e3e98b0c7583d977a96bfa3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:03 -0400 Subject: [PATCH 0543/2115] go get github.com/aws/aws-sdk-go-v2/service/s3outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 278778dc0f96..8ee7ed93c0f2 100644 --- a/go.mod +++ b/go.mod @@ -222,7 +222,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 diff --git a/go.sum b/go.sum index 699080f2de63..a4ab1317f5f5 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCP github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx53ImR4HUPCO5/qS7a48pek= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 h1:mT0D16ojwEPM0/XW1yVAeJYvX1F5B2yMhwf7CDpvIqw= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF15sTosQczlMR5nAkT8rC0g= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= From 020f8c2fa0c02d1ddce1f2c6b57bc75e5c344259 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:04 -0400 Subject: [PATCH 0544/2115] go get github.com/aws/aws-sdk-go-v2/service/s3tables. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8ee7ed93c0f2..21e85bf7ccbe 100644 --- a/go.mod +++ b/go.mod @@ -223,7 +223,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 diff --git a/go.sum b/go.sum index a4ab1317f5f5..add40f27ac0b 100644 --- a/go.sum +++ b/go.sum @@ -467,8 +467,8 @@ github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx5 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF15sTosQczlMR5nAkT8rC0g= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNtsXPEo9KPtChTbzzNbvnE= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= From a3ff31fa7c093b5e39ed6a17b0195cdc99b7e904 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:04 -0400 Subject: [PATCH 0545/2115] go get github.com/aws/aws-sdk-go-v2/service/s3vectors. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 21e85bf7ccbe..c9a61256a79b 100644 --- a/go.mod +++ b/go.mod @@ -224,7 +224,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 diff --git a/go.sum b/go.sum index add40f27ac0b..06eae465a797 100644 --- a/go.sum +++ b/go.sum @@ -469,8 +469,8 @@ github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNtsXPEo9KPtChTbzzNbvnE= github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9gFDMT6fFMNCq3H1V/ZpZA= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= From 4b090be43653ec60d8affca1654bf8d853ebe907 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:06 -0400 Subject: [PATCH 0546/2115] go get github.com/aws/aws-sdk-go-v2/service/sagemaker. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c9a61256a79b..99acdf047faa 100644 --- a/go.mod +++ b/go.mod @@ -225,7 +225,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 diff --git a/go.sum b/go.sum index 06eae465a797..485467136977 100644 --- a/go.sum +++ b/go.sum @@ -471,8 +471,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNts github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9gFDMT6fFMNCq3H1V/ZpZA= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsPM85IGqw8ixfRCMMMT8Nz48= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= From b46aba32f86fccd6a1559cb0a7f9440504ec2374 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:06 -0400 Subject: [PATCH 0547/2115] 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 99acdf047faa..2327f652445a 100644 --- a/go.mod +++ b/go.mod @@ -226,7 +226,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 diff --git a/go.sum b/go.sum index 485467136977..d0700ca8ade2 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9g github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsPM85IGqw8ixfRCMMMT8Nz48= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWkJViT8nwdUd+1bMOnHpiYI= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 h1:r5HePq6z0BEXHOZ5/k6bLZVYMSAplzNbvBxHlb2R31A= From b5bd3617eca94e71e42a35a8a780c87122074e86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:07 -0400 Subject: [PATCH 0548/2115] 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 2327f652445a..e1acfc7bfd34 100644 --- a/go.mod +++ b/go.mod @@ -227,7 +227,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 + github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 diff --git a/go.sum b/go.sum index d0700ca8ade2..9fa2ca772755 100644 --- a/go.sum +++ b/go.sum @@ -475,8 +475,8 @@ github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsP github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWkJViT8nwdUd+1bMOnHpiYI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggMTiEpq+QvvmkVnnxDyJs= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 h1:r5HePq6z0BEXHOZ5/k6bLZVYMSAplzNbvBxHlb2R31A= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 h1:sKzvE3fkQNa4iXbS2zhPsWhoYZUuPGeyCx29zWaUAyg= From e183a6e7fda58d3e1ea7278738d7e62be5d03ed4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:08 -0400 Subject: [PATCH 0549/2115] 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 e1acfc7bfd34..78e4dc97f9c7 100644 --- a/go.mod +++ b/go.mod @@ -228,7 +228,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 diff --git a/go.sum b/go.sum index 9fa2ca772755..d6545831f708 100644 --- a/go.sum +++ b/go.sum @@ -477,8 +477,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWk github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggMTiEpq+QvvmkVnnxDyJs= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 h1:r5HePq6z0BEXHOZ5/k6bLZVYMSAplzNbvBxHlb2R31A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9cO45R0i8+fFJ74nyb7S+unUpQM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 h1:sKzvE3fkQNa4iXbS2zhPsWhoYZUuPGeyCx29zWaUAyg= github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 h1:bhfdvrLXqdIbe+XixpCiW5plHoozqTO7afs+26ovHAk= From fcaccfa9c40da1baffec055c6aa845fd66a5919e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:09 -0400 Subject: [PATCH 0550/2115] 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 78e4dc97f9c7..dffa39f00b30 100644 --- a/go.mod +++ b/go.mod @@ -229,7 +229,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 diff --git a/go.sum b/go.sum index d6545831f708..a4d90d2ab8a6 100644 --- a/go.sum +++ b/go.sum @@ -479,8 +479,8 @@ github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggM github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9cO45R0i8+fFJ74nyb7S+unUpQM= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 h1:sKzvE3fkQNa4iXbS2zhPsWhoYZUuPGeyCx29zWaUAyg= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLxm0shtfYujiIR7ERqQpJtsAM= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 h1:bhfdvrLXqdIbe+XixpCiW5plHoozqTO7afs+26ovHAk= github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 h1:zJ4sLmAK4W6tk1czlTcu0pPMyCEFsZvv/v0NC1CymuE= From 08f859e8ffc0599b8c103442c42adae51691f1f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:10 -0400 Subject: [PATCH 0551/2115] 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 dffa39f00b30..d126ce468728 100644 --- a/go.mod +++ b/go.mod @@ -230,7 +230,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 diff --git a/go.sum b/go.sum index a4d90d2ab8a6..02dcc57b3e3a 100644 --- a/go.sum +++ b/go.sum @@ -481,8 +481,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLxm0shtfYujiIR7ERqQpJtsAM= github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 h1:bhfdvrLXqdIbe+XixpCiW5plHoozqTO7afs+26ovHAk= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4YAL2mPdmgf2WkdRxQ5RtPP00= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 h1:zJ4sLmAK4W6tk1czlTcu0pPMyCEFsZvv/v0NC1CymuE= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 h1:c9obaYL+TZzWwZf59bU+F18J89YWxciIiGYf+Sr1NU4= From 15c824d6f7c02795a22fceb7f50f5b5f1c90472b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:11 -0400 Subject: [PATCH 0552/2115] go get github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d126ce468728..620b4b419f94 100644 --- a/go.mod +++ b/go.mod @@ -231,7 +231,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 diff --git a/go.sum b/go.sum index 02dcc57b3e3a..3301db465a0d 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLx github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4YAL2mPdmgf2WkdRxQ5RtPP00= github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 h1:zJ4sLmAK4W6tk1czlTcu0pPMyCEFsZvv/v0NC1CymuE= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1:RP9nJ5v3fPoUFZOKz/NRPqS9PsWTY4Bb0N8AEsaMxKs= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 h1:c9obaYL+TZzWwZf59bU+F18J89YWxciIiGYf+Sr1NU4= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 h1:kSiJ+KBflpGStdvVB8osVwzglb9QOcCGeaNeveHUAuo= From 2e2e494cfa89e67dad9263ea107c996d8ec0f44a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:11 -0400 Subject: [PATCH 0553/2115] go get github.com/aws/aws-sdk-go-v2/service/servicecatalog. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 620b4b419f94..8807b273211a 100644 --- a/go.mod +++ b/go.mod @@ -232,7 +232,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 diff --git a/go.sum b/go.sum index 3301db465a0d..5ac7daddbc79 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4 github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1:RP9nJ5v3fPoUFZOKz/NRPqS9PsWTY4Bb0N8AEsaMxKs= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 h1:c9obaYL+TZzWwZf59bU+F18J89YWxciIiGYf+Sr1NU4= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0LsJA01RzrpO/oyNmlEc2w/LLvcN4= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 h1:kSiJ+KBflpGStdvVB8osVwzglb9QOcCGeaNeveHUAuo= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 h1:UjC4316d1/eUrPGYZxs1nDdA2yD7VgsB6Ep7HQmX1xE= From bcf40f3ace14af606df3cf6d5418a6a647bd5e7f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:12 -0400 Subject: [PATCH 0554/2115] 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 8807b273211a..649cccf9630b 100644 --- a/go.mod +++ b/go.mod @@ -233,7 +233,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 diff --git a/go.sum b/go.sum index 5ac7daddbc79..206aa95847ae 100644 --- a/go.sum +++ b/go.sum @@ -487,8 +487,8 @@ github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0LsJA01RzrpO/oyNmlEc2w/LLvcN4= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 h1:kSiJ+KBflpGStdvVB8osVwzglb9QOcCGeaNeveHUAuo= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKuDgy63OVHrvVME8S8YaBVSofI6WwtGNH0XwrJ0= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 h1:UjC4316d1/eUrPGYZxs1nDdA2yD7VgsB6Ep7HQmX1xE= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 h1:IqZZ0dHv/NhExc+8HI6CdgTZLz7Yjn9OaExTmFX4UX8= From edebb56c9505aba4cea8d4bb4dcf15109a1317b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:13 -0400 Subject: [PATCH 0555/2115] 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 649cccf9630b..4ca1209518b4 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 diff --git a/go.sum b/go.sum index 206aa95847ae..b38725d583f5 100644 --- a/go.sum +++ b/go.sum @@ -489,8 +489,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0Ls github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKuDgy63OVHrvVME8S8YaBVSofI6WwtGNH0XwrJ0= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 h1:UjC4316d1/eUrPGYZxs1nDdA2yD7VgsB6Ep7HQmX1xE= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkAHHvMTkWq/IzoDNwRHnT9/uy7z8Ds= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 h1:IqZZ0dHv/NhExc+8HI6CdgTZLz7Yjn9OaExTmFX4UX8= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 h1:3BEXxnGZpqGWVFL8lntsAtWjT19EtQp2uUmXS0+wWpA= From f6d6095e0b49bcb67160f4b40cb3667b3a91124a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:14 -0400 Subject: [PATCH 0556/2115] 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 4ca1209518b4..e93df4a9e112 100644 --- a/go.mod +++ b/go.mod @@ -235,7 +235,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 diff --git a/go.sum b/go.sum index b38725d583f5..ffa2cb00ec90 100644 --- a/go.sum +++ b/go.sum @@ -491,8 +491,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKu github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkAHHvMTkWq/IzoDNwRHnT9/uy7z8Ds= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 h1:IqZZ0dHv/NhExc+8HI6CdgTZLz7Yjn9OaExTmFX4UX8= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwViwkbP9rcD4HuuyXsgUO0KZ04V0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 h1:3BEXxnGZpqGWVFL8lntsAtWjT19EtQp2uUmXS0+wWpA= github.com/aws/aws-sdk-go-v2/service/ses v1.33.0/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 h1:EGgXgQlHPLB4AQ2EitqhfkhRkyxHJ+Y1CTFbP6vfS60= From ec94f2344439d04260b8257b3d47a6ad746d9f12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:14 -0400 Subject: [PATCH 0557/2115] go get github.com/aws/aws-sdk-go-v2/service/ses. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e93df4a9e112..a419d3f17070 100644 --- a/go.mod +++ b/go.mod @@ -236,7 +236,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 - github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 + github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 diff --git a/go.sum b/go.sum index ffa2cb00ec90..8002b353fd34 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,8 @@ github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkA github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwViwkbP9rcD4HuuyXsgUO0KZ04V0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 h1:3BEXxnGZpqGWVFL8lntsAtWjT19EtQp2uUmXS0+wWpA= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.0/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzfeqnAS4K3oRDEVWY= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 h1:EGgXgQlHPLB4AQ2EitqhfkhRkyxHJ+Y1CTFbP6vfS60= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 h1:qDg+pW4hxuM1zlixvZy3EyRxGiy4FknvKwfYHsUGvYw= From 98b402e2b4fa66dee06769920b7127e1db86a811 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:15 -0400 Subject: [PATCH 0558/2115] 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 a419d3f17070..34d4f04eb70b 100644 --- a/go.mod +++ b/go.mod @@ -237,7 +237,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 diff --git a/go.sum b/go.sum index 8002b353fd34..424998fd7da1 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,8 @@ github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwVi github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzfeqnAS4K3oRDEVWY= github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 h1:EGgXgQlHPLB4AQ2EitqhfkhRkyxHJ+Y1CTFbP6vfS60= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY/S8ej2IBhGu3XTOv8= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 h1:qDg+pW4hxuM1zlixvZy3EyRxGiy4FknvKwfYHsUGvYw= github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 h1:vIp1dRkvVu4oKSl41ds/Y/rBRfw9tyUAOMS1E0FRdG8= From 03fc26cdb4f7a5bde4a653c544304215c3bcd9d5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:16 -0400 Subject: [PATCH 0559/2115] go get github.com/aws/aws-sdk-go-v2/service/sfn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34d4f04eb70b..e53f85244bbb 100644 --- a/go.mod +++ b/go.mod @@ -238,7 +238,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 + github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 diff --git a/go.sum b/go.sum index 424998fd7da1..8ad9757abeca 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzf github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY/S8ej2IBhGu3XTOv8= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 h1:qDg+pW4hxuM1zlixvZy3EyRxGiy4FknvKwfYHsUGvYw= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQF1iRGhHsjA9pSW0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 h1:vIp1dRkvVu4oKSl41ds/Y/rBRfw9tyUAOMS1E0FRdG8= github.com/aws/aws-sdk-go-v2/service/shield v1.33.0/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 h1:iuz8rTwAAVIKp4BL2yafOsZDvuW5tkkPsOmxRcytPhw= From 58a2ee057dfbbce1e4cffb80bb09e18d9e1a533a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:17 -0400 Subject: [PATCH 0560/2115] 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 e53f85244bbb..3dfe4d6de8bf 100644 --- a/go.mod +++ b/go.mod @@ -239,7 +239,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 - github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 + github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 diff --git a/go.sum b/go.sum index 8ad9757abeca..366b9f8d5214 100644 --- a/go.sum +++ b/go.sum @@ -499,8 +499,8 @@ github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQF1iRGhHsjA9pSW0= github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 h1:vIp1dRkvVu4oKSl41ds/Y/rBRfw9tyUAOMS1E0FRdG8= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.0/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIup8fr4HWmUSwVNAni6s= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 h1:iuz8rTwAAVIKp4BL2yafOsZDvuW5tkkPsOmxRcytPhw= github.com/aws/aws-sdk-go-v2/service/signer v1.30.0/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 h1:+GWmgZ6TeJ12tLw4l981+5nc9FDdzXtdZlnmp6KVHig= From 99208d8e9df52264420d8895642e65cb10cf9dee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:18 -0400 Subject: [PATCH 0561/2115] 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 3dfe4d6de8bf..30c82cf686dd 100644 --- a/go.mod +++ b/go.mod @@ -240,7 +240,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 - github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 + github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 diff --git a/go.sum b/go.sum index 366b9f8d5214..15eb0767cf4a 100644 --- a/go.sum +++ b/go.sum @@ -501,8 +501,8 @@ github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQ github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIup8fr4HWmUSwVNAni6s= github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 h1:iuz8rTwAAVIKp4BL2yafOsZDvuW5tkkPsOmxRcytPhw= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.0/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJEU0Ohp704KkfDdumIbM= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 h1:+GWmgZ6TeJ12tLw4l981+5nc9FDdzXtdZlnmp6KVHig= github.com/aws/aws-sdk-go-v2/service/sns v1.37.0/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 h1:xobvQ4NxlXFUNgVwE6cnMI/ww7K7jtQMWKor2Gi61Xg= From 9e747c7dbefb691009046558e499fe6408cdc5ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:19 -0400 Subject: [PATCH 0562/2115] 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 30c82cf686dd..69829812ef28 100644 --- a/go.mod +++ b/go.mod @@ -241,7 +241,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 - github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 + github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 diff --git a/go.sum b/go.sum index 15eb0767cf4a..254a060b6e17 100644 --- a/go.sum +++ b/go.sum @@ -503,8 +503,8 @@ github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIu github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJEU0Ohp704KkfDdumIbM= github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 h1:+GWmgZ6TeJ12tLw4l981+5nc9FDdzXtdZlnmp6KVHig= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.0/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+NmiSnwDSWpU7+wP60Q= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 h1:xobvQ4NxlXFUNgVwE6cnMI/ww7K7jtQMWKor2Gi61Xg= github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 h1:1T8wFNEtOP4lgLC7v8Fzgbb4kFrMmnscG7kOqkbA26c= From 6e75341912bbd583fce961f34863e2e4f6afff0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:19 -0400 Subject: [PATCH 0563/2115] 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 69829812ef28..513083afcb3a 100644 --- a/go.mod +++ b/go.mod @@ -242,7 +242,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 + github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 diff --git a/go.sum b/go.sum index 254a060b6e17..8e273cc78e6d 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJE github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+NmiSnwDSWpU7+wP60Q= github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 h1:xobvQ4NxlXFUNgVwE6cnMI/ww7K7jtQMWKor2Gi61Xg= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2ZvTopJJhjiar/8EEo= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 h1:1T8wFNEtOP4lgLC7v8Fzgbb4kFrMmnscG7kOqkbA26c= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 h1:kr0zUJ5+O+3XOO5k30ZFWw6BuW77y1wpYl8QbDxgyuo= From 415d0189c387a55c08b376b6d031bfb60eff0bca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:20 -0400 Subject: [PATCH 0564/2115] 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 513083afcb3a..93ae02b39601 100644 --- a/go.mod +++ b/go.mod @@ -243,7 +243,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 + github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 diff --git a/go.sum b/go.sum index 8e273cc78e6d..fe129955d558 100644 --- a/go.sum +++ b/go.sum @@ -507,8 +507,8 @@ github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+Nmi github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2ZvTopJJhjiar/8EEo= github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 h1:1T8wFNEtOP4lgLC7v8Fzgbb4kFrMmnscG7kOqkbA26c= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7PNPCQjsQBEIYqTLA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 h1:kr0zUJ5+O+3XOO5k30ZFWw6BuW77y1wpYl8QbDxgyuo= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 h1:6sjrNE9OXSuF3P2Y+++303mkGbQlmFweTLvZLUz4Ric= From 0f756a2ddfb4d2554a774ed33dcf3aa80cae016e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:21 -0400 Subject: [PATCH 0565/2115] 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 93ae02b39601..166ff5aa6405 100644 --- a/go.mod +++ b/go.mod @@ -244,7 +244,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 diff --git a/go.sum b/go.sum index fe129955d558..7dd9ffa73093 100644 --- a/go.sum +++ b/go.sum @@ -509,8 +509,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2Zv github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7PNPCQjsQBEIYqTLA= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 h1:kr0zUJ5+O+3XOO5k30ZFWw6BuW77y1wpYl8QbDxgyuo= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0FOL83Jc+7xTHBqtItk8rKMBM= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 h1:6sjrNE9OXSuF3P2Y+++303mkGbQlmFweTLvZLUz4Ric= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 h1:OHfg8SKR3X5AV6/LpinRDBPciw12F4qQjsvf6o0GiGE= From 3602981269abeab6df49c3f220bfc186c614a594 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:22 -0400 Subject: [PATCH 0566/2115] 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 166ff5aa6405..66a8ea6cec30 100644 --- a/go.mod +++ b/go.mod @@ -245,7 +245,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 diff --git a/go.sum b/go.sum index 7dd9ffa73093..d424455e4243 100644 --- a/go.sum +++ b/go.sum @@ -511,8 +511,8 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7P github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0FOL83Jc+7xTHBqtItk8rKMBM= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 h1:6sjrNE9OXSuF3P2Y+++303mkGbQlmFweTLvZLUz4Ric= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5MpWXOQnWKMsZkERDVcOZuNx8c= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 h1:OHfg8SKR3X5AV6/LpinRDBPciw12F4qQjsvf6o0GiGE= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 h1:21pRqoiIDamny/57BJYBrGumQKQEAcZ1+7X2xpMkOdc= From 7239ed79bda6d3e141d4b324cb4554d61bddabd6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:24 -0400 Subject: [PATCH 0567/2115] go get github.com/aws/aws-sdk-go-v2/service/ssmquicksetup. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 66a8ea6cec30..458eed5a9a90 100644 --- a/go.mod +++ b/go.mod @@ -246,7 +246,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 diff --git a/go.sum b/go.sum index d424455e4243..c55571b7cd0d 100644 --- a/go.sum +++ b/go.sum @@ -513,8 +513,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0F github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5MpWXOQnWKMsZkERDVcOZuNx8c= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 h1:OHfg8SKR3X5AV6/LpinRDBPciw12F4qQjsvf6o0GiGE= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 h1:Wdc/2+ZT0SOKPu11GNwU08KR6/jREOhmMUrF6TbqD+s= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 h1:21pRqoiIDamny/57BJYBrGumQKQEAcZ1+7X2xpMkOdc= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= From d144d452b7f3822f6e62f79ab9457f0ed716b389 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:25 -0400 Subject: [PATCH 0568/2115] 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 458eed5a9a90..50e8b5c79f2a 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 diff --git a/go.sum b/go.sum index c55571b7cd0d..be625ad96fe4 100644 --- a/go.sum +++ b/go.sum @@ -515,8 +515,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5M github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 h1:Wdc/2+ZT0SOKPu11GNwU08KR6/jREOhmMUrF6TbqD+s= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 h1:21pRqoiIDamny/57BJYBrGumQKQEAcZ1+7X2xpMkOdc= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 h1:AAo94xHcAQFBxzuS6jnIp+gEKfWDoQQAbqyhKmMGOYo= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 h1:aiGJnlWqp3e81gDzbSX/+67LqbnW9ppW/Md2CqLVCrQ= From fcad564631d737472adff23cec3f5aead262fa58 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:26 -0400 Subject: [PATCH 0569/2115] 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 50e8b5c79f2a..bd62a56fccc1 100644 --- a/go.mod +++ b/go.mod @@ -249,7 +249,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 diff --git a/go.sum b/go.sum index be625ad96fe4..dd9f15ae2d7d 100644 --- a/go.sum +++ b/go.sum @@ -519,8 +519,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 h1:AAo94xHcAQFBxzuS6jnIp+gEK github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 h1:aiGJnlWqp3e81gDzbSX/+67LqbnW9ppW/Md2CqLVCrQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 h1:HctWK6IduY4jkWT4t5IIatg0zYhG1uvLN04cVjwHCnQ= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 h1:IZmMc03E2ay2j+4It6+XKpWLwdH9RNfLYr31ZjTmlpk= From bb5df4b92557de916bb8a56bdba6eb062a364c95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:27 -0400 Subject: [PATCH 0570/2115] go get github.com/aws/aws-sdk-go-v2/service/storagegateway. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bd62a56fccc1..cd563b36f218 100644 --- a/go.mod +++ b/go.mod @@ -250,7 +250,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 diff --git a/go.sum b/go.sum index dd9f15ae2d7d..c7348459445f 100644 --- a/go.sum +++ b/go.sum @@ -523,8 +523,8 @@ github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 h1:HctWK6IduY4jkWT4t5IIatg github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 h1:IZmMc03E2ay2j+4It6+XKpWLwdH9RNfLYr31ZjTmlpk= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 h1:kCJG+jFRrD54jRPaat2ViEHVHd11vvTFd03rt20fHrE= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 h1:rH21FB+YB32tQXRRqw5GOXLRlEY6sF0niNUnjIz2K4c= From 8658f32180fb08a7290c20aa8f2160aaf24ca53e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:29 -0400 Subject: [PATCH 0571/2115] 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 cd563b36f218..013354d25c91 100644 --- a/go.mod +++ b/go.mod @@ -252,7 +252,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 - github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 + github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 diff --git a/go.sum b/go.sum index c7348459445f..a0f7b3f468f3 100644 --- a/go.sum +++ b/go.sum @@ -527,8 +527,8 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 h1:kCJG+jFRrD54jRPaa github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 h1:rH21FB+YB32tQXRRqw5GOXLRlEY6sF0niNUnjIz2K4c= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.0/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbrHuueSpLBnhVkgDo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 h1:M7W7qo3OsHzH+zrmoU8gR4Or+WB2aV32kJ6H5qSYgEs= github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 h1:+LdZx81sNrpT4v1+zr+5LJa8CBtKjWv9UFE+fLdzWRM= From e88242cd9f41d6be461574035157b288f8b2654b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:30 -0400 Subject: [PATCH 0572/2115] 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 013354d25c91..9c4fbf64a50c 100644 --- a/go.mod +++ b/go.mod @@ -253,7 +253,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 diff --git a/go.sum b/go.sum index a0f7b3f468f3..db7e4aa3a465 100644 --- a/go.sum +++ b/go.sum @@ -529,8 +529,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQY github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbrHuueSpLBnhVkgDo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 h1:M7W7qo3OsHzH+zrmoU8gR4Or+WB2aV32kJ6H5qSYgEs= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30VaLreZURieCr0sKiuRPXTHmQ= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 h1:+LdZx81sNrpT4v1+zr+5LJa8CBtKjWv9UFE+fLdzWRM= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 h1:x/RJ5w+RJ7F6DXSqUdRd5oo/L2qq2ziciIep+5G+U7A= From f96700f65d52efda584da799c8fb539ad70e6df0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:31 -0400 Subject: [PATCH 0573/2115] go get github.com/aws/aws-sdk-go-v2/service/taxsettings. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9c4fbf64a50c..fffe5aa1764f 100644 --- a/go.mod +++ b/go.mod @@ -254,7 +254,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 diff --git a/go.sum b/go.sum index db7e4aa3a465..3b39e07a3eef 100644 --- a/go.sum +++ b/go.sum @@ -531,8 +531,8 @@ github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbr github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30VaLreZURieCr0sKiuRPXTHmQ= github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 h1:+LdZx81sNrpT4v1+zr+5LJa8CBtKjWv9UFE+fLdzWRM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDpsYaGrl3FPcQn2zaUWmp91pXw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 h1:x/RJ5w+RJ7F6DXSqUdRd5oo/L2qq2ziciIep+5G+U7A= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 h1:e2NwGYwvTV2yNa76PRkQ/gtjEmnvCw9h6kRTNCg/PUI= From 16917830b8c018be5cd6cdebec8c00a54977d4aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:32 -0400 Subject: [PATCH 0574/2115] 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 fffe5aa1764f..c0dc36f9423f 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 diff --git a/go.sum b/go.sum index 3b39e07a3eef..660615771ad8 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30Va github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDpsYaGrl3FPcQn2zaUWmp91pXw= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 h1:x/RJ5w+RJ7F6DXSqUdRd5oo/L2qq2ziciIep+5G+U7A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0VnligLJs4O0DNTLYYPkQ29faFhmcho= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 h1:e2NwGYwvTV2yNa76PRkQ/gtjEmnvCw9h6kRTNCg/PUI= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 h1:/Ec93n7oXPhZvalYxFphWMSNjaAy/A2dWkKhqCAePEg= From 58b6a09f31b3ab59908221e2f9fcdb97f07a51c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:33 -0400 Subject: [PATCH 0575/2115] go get github.com/aws/aws-sdk-go-v2/service/timestreamquery. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c0dc36f9423f..6abc6bc6517d 100644 --- a/go.mod +++ b/go.mod @@ -256,7 +256,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 diff --git a/go.sum b/go.sum index 660615771ad8..05733f3422c9 100644 --- a/go.sum +++ b/go.sum @@ -535,8 +535,8 @@ github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDps github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0VnligLJs4O0DNTLYYPkQ29faFhmcho= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 h1:e2NwGYwvTV2yNa76PRkQ/gtjEmnvCw9h6kRTNCg/PUI= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXmWNe3o/0SnoI6xMaTdMb/AgN3WgQ= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 h1:/Ec93n7oXPhZvalYxFphWMSNjaAy/A2dWkKhqCAePEg= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 h1:UMgzltOpkvNdZK15iptmssjAEWqKIffMTZRroY76MnA= From 952ca2b1d39fbe9a490c10b59576c841ff844994 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:34 -0400 Subject: [PATCH 0576/2115] 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 6abc6bc6517d..67767a49306b 100644 --- a/go.mod +++ b/go.mod @@ -257,7 +257,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 diff --git a/go.sum b/go.sum index 05733f3422c9..c43c794fee7b 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXmWNe3o/0SnoI6xMaTdMb/AgN3WgQ= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 h1:/Ec93n7oXPhZvalYxFphWMSNjaAy/A2dWkKhqCAePEg= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zuG0cnmJPuR7reYm6maElCEjjx3Xw= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 h1:UMgzltOpkvNdZK15iptmssjAEWqKIffMTZRroY76MnA= github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 h1:QsCjJRBHeDHhOc0J+GIPxhHesz5yTSYXR1jyMWzXcNQ= From 427a4794d28bf370826a44411b381f73f1ffd074 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:35 -0400 Subject: [PATCH 0577/2115] 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 67767a49306b..f098913c74d6 100644 --- a/go.mod +++ b/go.mod @@ -258,7 +258,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 diff --git a/go.sum b/go.sum index c43c794fee7b..6081eedb57cb 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXm github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zuG0cnmJPuR7reYm6maElCEjjx3Xw= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 h1:UMgzltOpkvNdZK15iptmssjAEWqKIffMTZRroY76MnA= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3JxyzLPK6IBq489lptSrbj2ikcw= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 h1:QsCjJRBHeDHhOc0J+GIPxhHesz5yTSYXR1jyMWzXcNQ= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 h1:eGVvpr1n1sMvSnvYAQVUKK+JUPNFjUTy2iSR8nutPMc= From c0542270746f77e6efd0af3bcf5d41a0cbfd5a90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:35 -0400 Subject: [PATCH 0578/2115] 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 f098913c74d6..c3dd94c72f03 100644 --- a/go.mod +++ b/go.mod @@ -259,7 +259,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 + github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 diff --git a/go.sum b/go.sum index 6081eedb57cb..384a3288b657 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zu github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3JxyzLPK6IBq489lptSrbj2ikcw= github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 h1:QsCjJRBHeDHhOc0J+GIPxhHesz5yTSYXR1jyMWzXcNQ= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIWqxViY8BrdKxPMaQe0s5g= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 h1:eGVvpr1n1sMvSnvYAQVUKK+JUPNFjUTy2iSR8nutPMc= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 h1:l/hNjnFe+0P+0YjVaYghBZDooc5OFJOx4c+hG/YyX5Y= From 73791ab285d9277cfbc62ea3927397aaeaae28f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:36 -0400 Subject: [PATCH 0579/2115] 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 c3dd94c72f03..f3a9a1d40699 100644 --- a/go.mod +++ b/go.mod @@ -260,7 +260,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 diff --git a/go.sum b/go.sum index 384a3288b657..a20abf33d671 100644 --- a/go.sum +++ b/go.sum @@ -543,8 +543,8 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3Jxyz github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIWqxViY8BrdKxPMaQe0s5g= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 h1:eGVvpr1n1sMvSnvYAQVUKK+JUPNFjUTy2iSR8nutPMc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3YyvFKQ5lQKnv2EUpOprtM8TfVeqAk0rYc= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 h1:l/hNjnFe+0P+0YjVaYghBZDooc5OFJOx4c+hG/YyX5Y= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 h1:KiJHde7jxo8ppD7jcYopFKZ73of3SSyTbXRPifyCSjc= From 4c2b830e0deb5c9bd75f5d87110a6a2d347c11e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:37 -0400 Subject: [PATCH 0580/2115] 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 f3a9a1d40699..22102623063e 100644 --- a/go.mod +++ b/go.mod @@ -261,7 +261,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 diff --git a/go.sum b/go.sum index a20abf33d671..d53c85e0d668 100644 --- a/go.sum +++ b/go.sum @@ -545,8 +545,8 @@ github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIW github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3YyvFKQ5lQKnv2EUpOprtM8TfVeqAk0rYc= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 h1:l/hNjnFe+0P+0YjVaYghBZDooc5OFJOx4c+hG/YyX5Y= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznLiKrc72n4j2aDPAbXaj7YC8= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 h1:KiJHde7jxo8ppD7jcYopFKZ73of3SSyTbXRPifyCSjc= github.com/aws/aws-sdk-go-v2/service/waf v1.29.0/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 h1:gFCxExCqt4/HWMVKmzf+Mxt3i1gyovNNL8xlfVaN0a4= From 3f51d41df49992f99c24175128ec0f3dae36eb2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:38 -0400 Subject: [PATCH 0581/2115] 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 22102623063e..040db8cac466 100644 --- a/go.mod +++ b/go.mod @@ -262,7 +262,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 - github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 + github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 diff --git a/go.sum b/go.sum index d53c85e0d668..cd8090806b51 100644 --- a/go.sum +++ b/go.sum @@ -547,8 +547,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3Yy github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznLiKrc72n4j2aDPAbXaj7YC8= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 h1:KiJHde7jxo8ppD7jcYopFKZ73of3SSyTbXRPifyCSjc= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.0/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw5kMoliPPzI+WJGM= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 h1:gFCxExCqt4/HWMVKmzf+Mxt3i1gyovNNL8xlfVaN0a4= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 h1:zEbaP92GXITM2TrYiw4mNer/ViT4z/Zq8hmrIzSF3Y0= From 1a1cd5bb3fcaf2a7478c4abe2b629a0f0f730384 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:39 -0400 Subject: [PATCH 0582/2115] 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 040db8cac466..cb5a2d99dc35 100644 --- a/go.mod +++ b/go.mod @@ -263,7 +263,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 diff --git a/go.sum b/go.sum index cd8090806b51..a85a5fc20af3 100644 --- a/go.sum +++ b/go.sum @@ -549,8 +549,8 @@ github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznL github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw5kMoliPPzI+WJGM= github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 h1:gFCxExCqt4/HWMVKmzf+Mxt3i1gyovNNL8xlfVaN0a4= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLKu9W2gK8gIGTV4+z8fBsptPY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 h1:zEbaP92GXITM2TrYiw4mNer/ViT4z/Zq8hmrIzSF3Y0= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 h1:5+II3BO8cotBo0VNs3Ix2EakRC+PP//loHRaEKDQUNE= From 7b3bd0e88e1ee0482c002586efd2c00737653379 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:40 -0400 Subject: [PATCH 0583/2115] 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 cb5a2d99dc35..7c2209acd3bf 100644 --- a/go.mod +++ b/go.mod @@ -264,7 +264,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 diff --git a/go.sum b/go.sum index a85a5fc20af3..faf2ff429c8c 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLKu9W2gK8gIGTV4+z8fBsptPY= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 h1:zEbaP92GXITM2TrYiw4mNer/ViT4z/Zq8hmrIzSF3Y0= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7YbMbVA9k4LN6dR+boo= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 h1:5+II3BO8cotBo0VNs3Ix2EakRC+PP//loHRaEKDQUNE= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 h1:RLGywWWnKeGJkWlg1Su2jH7DCC7y7QD1zbgGU0IVmZY= From e4f97fa2c727f0daae80775d9e42c012bab14f8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:41 -0400 Subject: [PATCH 0584/2115] 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 7c2209acd3bf..387f8eca8452 100644 --- a/go.mod +++ b/go.mod @@ -265,7 +265,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 diff --git a/go.sum b/go.sum index faf2ff429c8c..9b51f1c26272 100644 --- a/go.sum +++ b/go.sum @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLK github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7YbMbVA9k4LN6dR+boo= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 h1:5+II3BO8cotBo0VNs3Ix2EakRC+PP//loHRaEKDQUNE= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn2pu7pW3nwXjFMfe6HE8yIyj3xKY= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 h1:RLGywWWnKeGJkWlg1Su2jH7DCC7y7QD1zbgGU0IVmZY= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 h1:n4HU/6mkGI9nTgt5Q80hvLMWv4HeXwfx51Ux5lVkRTY= From 84110287cceeae629bd100b03d6b208d9d738615 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:42 -0400 Subject: [PATCH 0585/2115] 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 387f8eca8452..f7eeb707a0ff 100644 --- a/go.mod +++ b/go.mod @@ -266,7 +266,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 github.com/aws/smithy-go v1.22.5 diff --git a/go.sum b/go.sum index 9b51f1c26272..ab7d9c2feab6 100644 --- a/go.sum +++ b/go.sum @@ -555,8 +555,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7Y github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn2pu7pW3nwXjFMfe6HE8yIyj3xKY= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 h1:RLGywWWnKeGJkWlg1Su2jH7DCC7y7QD1zbgGU0IVmZY= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+ZquOi+377Chmz01PhU6Pdt8= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 h1:n4HU/6mkGI9nTgt5Q80hvLMWv4HeXwfx51Ux5lVkRTY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 h1:gFPqTmIg8UI0CcW0pk4LXT2BQK2osloIE6xf46p2144= From 172a21a589d624b3a8f21b5a9776a56b39da7e81 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:43 -0400 Subject: [PATCH 0586/2115] 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 f7eeb707a0ff..b5e48e8643b6 100644 --- a/go.mod +++ b/go.mod @@ -267,7 +267,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 github.com/aws/smithy-go v1.22.5 github.com/beevik/etree v1.5.1 diff --git a/go.sum b/go.sum index ab7d9c2feab6..f4733759874e 100644 --- a/go.sum +++ b/go.sum @@ -557,8 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+ZquOi+377Chmz01PhU6Pdt8= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 h1:n4HU/6mkGI9nTgt5Q80hvLMWv4HeXwfx51Ux5lVkRTY= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 h1:p6NR+K5innSuOAO4PQlrXGbeSzRFQ2u3yFJpTUi1iFM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 h1:gFPqTmIg8UI0CcW0pk4LXT2BQK2osloIE6xf46p2144= github.com/aws/aws-sdk-go-v2/service/xray v1.34.0/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= From 23eadd28fb32b79879a25d709e5126a74e1e60fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:33:44 -0400 Subject: [PATCH 0587/2115] 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 b5e48e8643b6..18d2ddc75ddf 100644 --- a/go.mod +++ b/go.mod @@ -268,7 +268,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 - github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 + github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 github.com/aws/smithy-go v1.22.5 github.com/beevik/etree v1.5.1 github.com/cedar-policy/cedar-go v1.2.6 diff --git a/go.sum b/go.sum index f4733759874e..67a1652f3c8c 100644 --- a/go.sum +++ b/go.sum @@ -559,8 +559,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+Z github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 h1:p6NR+K5innSuOAO4PQlrXGbeSzRFQ2u3yFJpTUi1iFM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 h1:gFPqTmIg8UI0CcW0pk4LXT2BQK2osloIE6xf46p2144= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.0/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 h1:09b9HHUpdLKsCrWa5+juB/fBXhyNLRq9t3gevDRUf4w= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.1/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= From caa1929dfde6e69ec2234fcb9dbcc2b8ff495729 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:35:25 -0400 Subject: [PATCH 0588/2115] go get github.com/aws/aws-sdk-go-v2/service/resiliencehub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 18d2ddc75ddf..3db6a428a592 100644 --- a/go.mod +++ b/go.mod @@ -208,7 +208,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 diff --git a/go.sum b/go.sum index 67a1652f3c8c..42e9a67c78ff 100644 --- a/go.sum +++ b/go.sum @@ -437,8 +437,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzI github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigilserDQum3vfQQVY38RzIuYk= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h2DRDItRtrD3NdGWs0xztSZlFU= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 h1:KNy1faYRqcN1PYqtHtWENQnc2GlyknihYHcUw1kwvsE= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= From c2c9d550312b12c57ea58a06115ecdb27b225792 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 21 Aug 2025 22:39:10 +0900 Subject: [PATCH 0589/2115] Add `BILLING_VIEW_ARN` to the example usage --- website/docs/r/bcmdataexports_export.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/docs/r/bcmdataexports_export.html.markdown b/website/docs/r/bcmdataexports_export.html.markdown index 90a2e5cca33a..40176c837e36 100644 --- a/website/docs/r/bcmdataexports_export.html.markdown +++ b/website/docs/r/bcmdataexports_export.html.markdown @@ -15,6 +15,8 @@ Terraform resource for managing an AWS BCM Data Exports Export. ### Basic Usage ```terraform +data "aws_caller_identity" "current" {} + resource "aws_bcmdataexports_export" "test" { export { name = "testexample" @@ -22,6 +24,7 @@ resource "aws_bcmdataexports_export" "test" { query_statement = "SELECT identity_line_item_id, identity_time_interval, line_item_product_code,line_item_unblended_cost FROM COST_AND_USAGE_REPORT" table_configurations = { COST_AND_USAGE_REPORT = { + BILLING_VIEW_ARN = "arn:aws:billing::${data.aws_caller_identity.current.account_id}:billingview/primary" TIME_GRANULARITY = "HOURLY", INCLUDE_RESOURCES = "FALSE", INCLUDE_MANUAL_DISCOUNT_COMPATIBILITY = "FALSE", From 79417dffdffd260c942cf5d79fc36851018212dd Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 21 Aug 2025 22:39:44 +0900 Subject: [PATCH 0590/2115] Add references to query_statement and table_configurations --- website/docs/r/bcmdataexports_export.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/bcmdataexports_export.html.markdown b/website/docs/r/bcmdataexports_export.html.markdown index 40176c837e36..1e212c16dd5d 100644 --- a/website/docs/r/bcmdataexports_export.html.markdown +++ b/website/docs/r/bcmdataexports_export.html.markdown @@ -69,8 +69,8 @@ The following arguments are required: ### `data_query` Argument Reference -* `query_statement` - (Required) Query statement. -* `table_configurations` - (Optional) Table configuration. +* `query_statement` - (Required) Query statement. The SQL table name for CUR 2.0 is `COST_AND_USAGE_REPORT`. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html) for a list of available columns. +* `table_configurations` - (Optional) Table configuration. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html#cur2-table-configurations) for the available configurations. In addition to those listed in the documentation, `BILLING_VIEW_ARN` must also be included, as shown in the example above. ### `destination_configurations` Argument Reference From 9775eaa2e4f912dee6517f9506a027275633f8d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:46:36 -0400 Subject: [PATCH 0591/2115] Tweak CHANGELOG entry. --- .changelog/43946.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/43946.txt b/.changelog/43946.txt index ee08fd0684b9..f2d93d1515f0 100644 --- a/.changelog/43946.txt +++ b/.changelog/43946.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_mwaa_environment: Add worker replacement strategy input +resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ``` From 5dfc434e7e2bcf77fcb6304153861d84b54572c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:52:55 -0400 Subject: [PATCH 0592/2115] r/aws_mwaa_environment: Read 'worker_replacement_strategy'. --- internal/service/mwaa/environment.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/internal/service/mwaa/environment.go b/internal/service/mwaa/environment.go index dd3f48173bcf..ef01e5ab3e2c 100644 --- a/internal/service/mwaa/environment.go +++ b/internal/service/mwaa/environment.go @@ -328,11 +328,10 @@ func resourceEnvironment() *schema.Resource { func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).MWAAClient(ctx) name := d.Get(names.AttrName).(string) - input := &mwaa.CreateEnvironmentInput{ + input := mwaa.CreateEnvironmentInput{ DagS3Path: aws.String(d.Get("dag_s3_path").(string)), ExecutionRoleArn: aws.String(d.Get(names.AttrExecutionRoleARN).(string)), Name: aws.String(name), @@ -365,7 +364,6 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta input.LoggingConfiguration = expandEnvironmentLoggingConfiguration(v.([]any)) } - // input.MaxWorkers = aws.Int32(int32(90)) if v, ok := d.GetOk("max_workers"); ok { input.MaxWorkers = aws.Int32(int32(v.(int))) } @@ -425,7 +423,7 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta var validationException, internalServerException = &awstypes.ValidationException{}, &awstypes.InternalServerException{} _, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, propagationTimeout, func(ctx context.Context) (any, error) { - return conn.CreateEnvironment(ctx, input) + return conn.CreateEnvironment(ctx, &input) }, validationException.ErrorCode(), internalServerException.ErrorCode()) if err != nil { @@ -443,7 +441,6 @@ func resourceEnvironmentCreate(ctx context.Context, d *schema.ResourceData, meta func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).MWAAClient(ctx) environment, err := findEnvironmentByName(ctx, conn, d.Id()) @@ -496,6 +493,9 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta a d.Set("webserver_url", environment.WebserverUrl) d.Set("webserver_vpc_endpoint_service", environment.WebserverVpcEndpointService) d.Set("weekly_maintenance_window_start", environment.WeeklyMaintenanceWindowStart) + if environment.LastUpdate != nil { + d.Set("worker_replacement_strategy", environment.LastUpdate.WorkerReplacementStrategy) + } setTagsOut(ctx, environment.Tags) @@ -504,11 +504,10 @@ func resourceEnvironmentRead(ctx context.Context, d *schema.ResourceData, meta a func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).MWAAClient(ctx) if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { - input := &mwaa.UpdateEnvironmentInput{ + input := mwaa.UpdateEnvironmentInput{ Name: aws.String(d.Get(names.AttrName).(string)), } @@ -605,7 +604,7 @@ func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta input.WorkerReplacementStrategy = awstypes.WorkerReplacementStrategy(v.(string)) } - _, err := conn.UpdateEnvironment(ctx, input) + _, err := conn.UpdateEnvironment(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "updating MWAA Environment (%s): %s", d.Id(), err) @@ -621,13 +620,13 @@ func resourceEnvironmentUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceEnvironmentDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).MWAAClient(ctx) log.Printf("[INFO] Deleting MWAA Environment: %s", d.Id()) - _, err := conn.DeleteEnvironment(ctx, &mwaa.DeleteEnvironmentInput{ + input := mwaa.DeleteEnvironmentInput{ Name: aws.String(d.Id()), - }) + } + _, err := conn.DeleteEnvironment(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return diags @@ -671,10 +670,14 @@ func environmentModuleLoggingConfigurationSchema() *schema.Resource { } func findEnvironmentByName(ctx context.Context, conn *mwaa.Client, name string) (*awstypes.Environment, error) { - input := &mwaa.GetEnvironmentInput{ + input := mwaa.GetEnvironmentInput{ Name: aws.String(name), } + return findEnvironment(ctx, conn, &input) +} + +func findEnvironment(ctx context.Context, conn *mwaa.Client, input *mwaa.GetEnvironmentInput) (*awstypes.Environment, error) { output, err := conn.GetEnvironment(ctx, input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { From 0ad6b884cdae1f04c1540f188c106cdba489c444 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:54:54 -0400 Subject: [PATCH 0593/2115] r/aws_mwaa_environment: Document 'worker_replacement_strategy'. --- website/docs/r/mwaa_environment.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/r/mwaa_environment.html.markdown b/website/docs/r/mwaa_environment.html.markdown index fdbd254f9b6d..8c5e7ae1106d 100644 --- a/website/docs/r/mwaa_environment.html.markdown +++ b/website/docs/r/mwaa_environment.html.markdown @@ -126,7 +126,6 @@ resource "aws_mwaa_environment" "example" { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `airflow_configuration_options` - (Optional) The `airflow_configuration_options` parameter specifies airflow override options. Check the [Official documentation](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-env-variables.html#configuring-env-variables-reference) for all possible configuration options. * `airflow_version` - (Optional) Airflow version of your environment, will be set by default to the latest version that MWAA supports. * `dag_s3_path` - (Required) The relative path to the DAG folder on your Amazon S3 storage bucket. For example, dags. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). @@ -143,15 +142,17 @@ This resource supports the following arguments: * `network_configuration` - (Required) Specifies the network configuration for your Apache Airflow Environment. This includes two private subnets as well as security groups for the Airflow environment. Each subnet requires internet connection, otherwise the deployment will fail. See [`network_configuration` Block](#network_configuration-block) for details. * `plugins_s3_object_version` - (Optional) The plugins.zip file version you want to use. * `plugins_s3_path` - (Optional) The relative path to the plugins.zip file on your Amazon S3 storage bucket. For example, plugins.zip. If a relative path is provided in the request, then plugins_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `requirements_s3_object_version` - (Optional) The requirements.txt file version you want to use. * `requirements_s3_path` - (Optional) The relative path to the requirements.txt file on your Amazon S3 storage bucket. For example, requirements.txt. If a relative path is provided in the request, then requirements_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). * `schedulers` - (Optional) The number of schedulers that you want to run in your environment. v2.0.2 and above accepts `2` - `5`, default `2`. v1.10.12 accepts `1`. * `source_bucket_arn` - (Required) The Amazon Resource Name (ARN) of your Amazon S3 storage bucket. For example, arn:aws:s3:::airflow-mybucketname. * `startup_script_s3_object_version` - (Optional) The version of the startup shell script you want to use. You must specify the version ID that Amazon S3 assigns to the file every time you update the script. * `startup_script_s3_path` - (Optional) The relative path to the script hosted in your bucket. The script runs as your environment starts before starting the Apache Airflow process. Use this script to install dependencies, modify configuration options, and set environment variables. See [Using a startup script](https://docs.aws.amazon.com/mwaa/latest/userguide/using-startup-script.html). Supported for environment versions 2.x and later. +* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `webserver_access_mode` - (Optional) Specifies whether the webserver should be accessible over the internet or via your specified VPC. Possible options: `PRIVATE_ONLY` (default) and `PUBLIC_ONLY`. * `weekly_maintenance_window_start` - (Optional) Specifies the start date for the weekly maintenance window. -* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `worker_replacement_strategy` - (Optional) Worker replacement strategy. Valid values: `FORCED`, `GRACEFUL`. ### `logging_configuration` Block From e9a638eb24eea184316114ae0b03be48c7265459 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 21 Aug 2025 22:57:51 +0900 Subject: [PATCH 0594/2115] Use `aws_partition` data source --- website/docs/r/bcmdataexports_export.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/r/bcmdataexports_export.html.markdown b/website/docs/r/bcmdataexports_export.html.markdown index 1e212c16dd5d..4b0578ace7ca 100644 --- a/website/docs/r/bcmdataexports_export.html.markdown +++ b/website/docs/r/bcmdataexports_export.html.markdown @@ -16,6 +16,7 @@ Terraform resource for managing an AWS BCM Data Exports Export. ```terraform data "aws_caller_identity" "current" {} +data "aws_partition" "current" {} resource "aws_bcmdataexports_export" "test" { export { @@ -24,7 +25,7 @@ resource "aws_bcmdataexports_export" "test" { query_statement = "SELECT identity_line_item_id, identity_time_interval, line_item_product_code,line_item_unblended_cost FROM COST_AND_USAGE_REPORT" table_configurations = { COST_AND_USAGE_REPORT = { - BILLING_VIEW_ARN = "arn:aws:billing::${data.aws_caller_identity.current.account_id}:billingview/primary" + BILLING_VIEW_ARN = "arn:${data.aws_partition.current.partition}:billing::${data.aws_caller_identity.current.account_id}:billingview/primary" TIME_GRANULARITY = "HOURLY", INCLUDE_RESOURCES = "FALSE", INCLUDE_MANUAL_DISCOUNT_COMPATIBILITY = "FALSE", From dc87649ce74c8fecbdbec0d972d7e5809e91c55d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 09:59:29 -0400 Subject: [PATCH 0595/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 512 ++++++++++----------- tools/tfsdk2fw/go.sum | 1024 ++++++++++++++++++++--------------------- 2 files changed, 768 insertions(+), 768 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 8ce235f305ed..325724f7587c 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -20,273 +20,273 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.4 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.5 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.48.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 // indirect github.com/aws/smithy-go v1.22.5 // indirect github.com/beevik/etree v1.5.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 5636c32a5a90..e2eea26e2202 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.38.0 h1:UCRQ5mlqcFk9HJDIqENSLR3wiG1VTWlyUfLDEvY7 github.com/aws/aws-sdk-go-v2 v1.38.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.0 h1:9yH0xiY5fUnVNLRWO0AtayqwU1ndriZdN78LlhruJR4= -github.com/aws/aws-sdk-go-v2/config v1.31.0/go.mod h1:VeV3K72nXnhbe4EuxxhzsDc/ByrCSlZwUnWH52Nde/I= -github.com/aws/aws-sdk-go-v2/credentials v1.18.4 h1:IPd0Algf1b+Qy9BcDp0sCUcIWdCQPSzDoMK3a8pcbUM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.4/go.mod h1:nwg78FjH2qvsRM1EVZlX9WuGUJOL5od+0qvm0adEzHk= +github.com/aws/aws-sdk-go-v2/config v1.31.1 h1:PSQn4ObaQLaHl6qjs+XYH2pkxyHzZlk1GgQDrKlRJ7I= +github.com/aws/aws-sdk-go-v2/config v1.31.1/go.mod h1:3UA8Gj+2nzpV8WBUF0b19onBfz0YMXDQyGEW0Ru1ntI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.5 h1:DATc1xnpHUV8VgvtnVQul+zuCwK6vz7gtkbKEUZcuNI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.5/go.mod h1:y7aigZzjm1jUZuCgOrlBng+VJrKkknY2Cl0JWxG7vHU= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 h1:WTNSeU/4f/vevwK7zwEEjlX27LPZB1IwyjVAh+Q74iQ= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5/go.mod h1:O84Dxp02jFDHRDbziaCRqMbe12+o+qih3ZD6Dio+1v0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 h1:o9RnO+YZ4X+kt5Z7Nvcishlz0nksIt2PIzDglLMP0vA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3/go.mod h1:+6aLJzOG1fvMOyzIySYjOFjcguGvVRL68R+uoRencN4= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 h1:joyyUFhiTQQmVK6ImzNU9TQSNRNeD9kOklqTzyk5v6s= @@ -43,254 +43,254 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/rH0vddEAamsHUIs= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0 h1:GJpQPHoqFQadXt9zgU5y+8Jz242QOkjIZIw+FVsHSUA= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.0/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.0 h1:AXdMJ3BikU0OcISX9Sn+d+G6Z5bWCMGBTi8CzRJc5/w= -github.com/aws/aws-sdk-go-v2/service/account v1.27.0/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.0 h1:U16SZFwZpyQGXUyrrmOqWqU9jMYhokCSpc+fYajYLy0= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.0/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0 h1:WukXneuq4cMqMAif9O6k9DJ8MYGChF3ADJu9Jp8gcOU= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.0/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.0 h1:qLNkXrOts5xHb0oihU7SKKeaZWVIY7He0Q/LCL/8NNQ= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.0/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0 h1:hgh1hVUywvKGKE1SBOas15qK4tGf8tuOIdjMuMDZ5Yk= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.0/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0 h1:IZAET61abhm3dZEMPwU6VLiXKVL2Qwvg0q7Bukpz/kA= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.0/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0 h1:bbHfZmF4H/PG5EEo0hXDyM/45XZDMbkscXolqardpB0= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.0/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0 h1:1EQYqGI4Gwlk/dGj/F3IxdZEZPw5Nv26d1QGsSsVPUk= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.0/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0 h1:lymNTWawpNNwwiJY7BCqBIJzLQ8p8O0kHE9/iQ5UIXc= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.0/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0 h1:Na5N1Pb88dfNt9LbDj4VIWa9KGPAPqm6HjXWaan75p0= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.0/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0 h1:4mIoI/hf2GdN0gMQGRcle62J11D4gGJRMcAeYLJeEzk= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.0/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0 h1:WknzwSXavLeI6hBZSDIpytKGGGXA+6rNQFf/jA9NtJI= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.0/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0 h1:B4rFraSi6NFtwWg/QYr6Mug4ucibKlaDESd07gHTj40= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.0/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0 h1:SqxybdZ6g/5bl0YaZXwzwO8nBZZVWYQEMTmrtIin2A4= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.0/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0 h1:JBQbf6oX9kNpMj8ehtekQSd33S6BZWv577ddGUbFhQA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.0/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0 h1:FD6ANh+B4eaJ5hxxHqgUXvyRLiuFGF+xnJR9vqsBVyA= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.0/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0 h1:vHXkPxz6DR28ISql1XUZX5yNee9IMyei3ybAUD4Hjqw= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.0/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0 h1:V/aQVXHEgacW8l2lOnX9qgQh6SCkcKT3GDoMBdXHG4w= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.0/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.0 h1:8QK47rrFawD8jtTmDKMKZr0lujNh23p1bJAZNyQJLYY= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.0/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0 h1:Sem8rU6yn64VNGn7OFB6XnMKUXTBprarXFeIhXHoZQc= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.0/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0 h1:PwAha4djh1MsmRgtKQ6exCqX7pTTC7awEN+1zD+Lv0A= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.0/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0 h1:K5VhfJPPyrToRq3JN0o2JKzIBKoZbBwHgVEecRpTNqI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.0/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.0 h1:92R0oLf9R1kyC0LmH3rpH6R/TsmIXk5u8a7u0BqBC98= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.0/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.1 h1:B4s8PHQ2Kr9flW+flu27NRjW0Fm7Olhrj8JZpqFBals= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.1/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0 h1:rqBqfB/V7SG7LNiUD2y5XzrJDlFFvParoT9HRGyx/1s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.0/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0 h1:cDCNcaDxbB7B6ABhUsi/IxK8cOwucqfKD/s3d5B8lj8= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.0/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0 h1:uqQ4VoKj/Qs0mmFmTtLCYqKaBCFv6M5q7LNGCkKE5B0= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.0/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0 h1:8vdMsSGKMJ0KKm9xRG3lWupvlxAfoT1H2mNL48Fcmss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.0/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= -github.com/aws/aws-sdk-go-v2/service/billing v1.6.0 h1:Qjw1OzZ/xWlhAE/05KO8WPAt43g+KM34jyatIVSihy8= -github.com/aws/aws-sdk-go-v2/service/billing v1.6.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= -github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0 h1:l9NAh1G4Dx6ygvXtI+q1LjJhIOjFfuglgzCgK4oz4To= -github.com/aws/aws-sdk-go-v2/service/budgets v1.36.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0 h1:YSr29la/2ZjvLzpPSTNZ+4UKUMVIB/By9RHbwsozZAU= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.0/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.0 h1:OrR18jIg9a5RBxgMPbWksJT9tmTa/KOf6LmJOTiL/nM= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.0/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0 h1:/a4GRYzQy/9T48CqAGlythaPj6Y5PWCRnMFCbqXp1iY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.0/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0 h1:BtwQUwyufH3WhisHCct+10JB3tbqYgnlcZkWQ8TrKrc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.0/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0 h1:hCBn//RJXE2AY1sipbSGESCKwQnxxKJKwI2oB9zBBy8= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.0/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0 h1:GL80iUAU3t3NG8hqI1YM/VTehaHcYzBBu8lv0I0YrR0= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.0/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0 h1:iYhGDJl3qGz7ZwBxnO8KWP3HBXBEHQwQuCTLtnvl+/c= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.0/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0 h1:zkywcvvuwJcdNUErYJ3JaujgTYy8iOqTZnMJtbt5GQo= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.0/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0 h1:rJcbtmScByQ6NBIXV97m6e8Rasd0zgvt1z84pdddU/4= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.0/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0 h1:3H2613Pj9FkIkgPOd5Vi8oj7iLyV2qYMkhd8Qv6Q7qI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.0/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0 h1:3JSAmJhQ2MgO8YFKv0CMab6NY3XUgK5SHemxqyCRdPY= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.0/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0 h1:32QN58w//10tYWkS+O+61EPBCKEM5FlLbM7n45wl0kM= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.0/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0 h1:Wgjh6Igu7HS57d8AjRIG0bHjybt015dBTc+zh2L/P3E= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.0/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0 h1:NmaelAJldom/+eWDlbYdurKrPL+TSvwKeHH/TnEYih8= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.0/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0 h1:GiSL2mJ/gSJR4p2HHRrydkM/LVtP82gssI3CKeGCFAk= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.0/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0 h1:LVhbfPyUufKIjKVengJswggsFAbdRJe3LGNf6xVjgDg= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.0/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0 h1:Tm4WvXnZ+tAlYB0W+hKi53reoQpUKr7/IiG/8zPYfOE= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.0/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0 h1:1yOLOPPI/SP+z1z7v50r4i0yJEBe667Tg513qv34Mok= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.0/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0 h1:Zen0PfPRG8lStgXUeuNxvdAJ3TlFYJfkJStGmG0RPMg= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.0/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0 h1:B0MOHup8sByXTFmHBa0Gtx31IUPypG1IIN/Fb/c3p7Y= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.0/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0 h1:3YI4ckLMF0x8IgZJaNz81aaUCnPSEvn9DqDZKkBBi2Q= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.0/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0 h1:ZY7lzj4WCPPMSU0PU3FV6Lnx0VzWe9mjlu60YBMkGGE= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.0/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0 h1:GN7I0M4vUQcc7BdwKqv2ly17OBeSPGfqm39BB1qFNkY= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.0/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0 h1:UsHh9s5J3gW0WdAQ6bXekyEGZl2kCAMDPSsm7lzC6O4= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.0/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0 h1:yT67LHPTvlQ4pWq21DQSd8Fv8ERRDmsZCB2HQ1UjOvY= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.0/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0 h1:L35FZUTiamMITQUbVY2Y593ZE/z5NXu0Qf7AEhBOQng= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.0/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0 h1:MybdZxWB1n6eljU2GuRXvrWXGW8YfFO3Iavml4qxnD4= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.0/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0 h1:0WVvuvoDZnwF/KAVGQc/utCamQUNa+vctMH9iZqfg/0= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.56.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0 h1:1T63UDiImeXzq1itj5CAv0S2i89BnVqKyz9pVbQtC4c= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.0/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0 h1:Z5DPlFHw3vVGN8p0jKqVChgffqMXQkMe3vm4agmgvII= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.0/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0 h1:BFDPvTQk/+BM9T8I6uHhtmur8uaroCXoJ0AI2kpNO1U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.0/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.0 h1:gyz9ynQmlbfCbsKUFfNVtaS4nJCgmOhlP+JTmfh7jZ8= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.0/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0 h1:F0hhZPgGQ/JNbd1fgaoooW9Wpi/uMwipeKYjJpeeRfQ= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.0/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0 h1:oWlHOpu0G3VxhnBirGF/0Tn+euvARocShoTs2Wo2wgY= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.0/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0 h1:LiLWwq5mYglYoksyMXV/L0ZLw+dtnIGXvpoAMri2zEs= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.0/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0 h1:5e/C1PaQywGtklpMotdHKon/8MfsDyzJ9WFh0ge8G38= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.54.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0 h1:nRXBomiIJKLbn8tYbYp2hOmP6mejmzksC8SaekKBVD0= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.0/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0 h1:04V9n8NhsYlUFkn7IXKUeR6MpDq0XJ3eTXEJCJtYkdY= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.0/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0 h1:Ne8EdY5+nD81tsUgYwijc5Lbc1Dnn1ijCG8npw/yGhA= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.0/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0 h1:7vB0On4jaXFKzo71y89tWgv7LyrgXh4z5obihxV0IYg= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.0/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0 h1:cSSIBQiQhVVjDOTCKPqp0jsJvfY/zHjKc7VJkIeAQas= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.0/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0 h1:5a76AMaI1x9YHhL6qclsXWbV/vZEQN1r/cZK9T045pE= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.0/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0 h1:6e3BS+A00UPLzkgtWj5Sakvom0G5qAn/dEk8U7QG/n4= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.0/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= -github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0 h1:2gorOSV7BNgRqmV6z9u+dhZ1kkPcaaAF8XMnK3ZUfKw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.37.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.0 h1:wDyL0EZw99zVGuzf4E/AZMiHVp/V6j9+Z8VkP2Xr55M= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.0/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= -github.com/aws/aws-sdk-go-v2/service/detective v1.36.0 h1:0av6yvy0lYUtlgDnZoinqIsYbjM8D4JkEnXzh0WKWwM= -github.com/aws/aws-sdk-go-v2/service/detective v1.36.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0 h1:zvhsIkUZOol3DwpcvFl/y14uSSs1JNcGsbu7cMdSxqU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.0/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0 h1:+yQPtAOwzsA/4eIT1oGcZu30dljvlCNec2pGOPUsw4A= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.0/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0 h1:2ol44vp1EY9Y4IyhWCpwcjZ2KOEl84r29q0bpyvykfo= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.0/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0 h1:raC54NZ3nBlLL8AJgcH4jcI6tM0bPm2gxVk5svtN1hw= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.0/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0 h1:akYzmgxmrLRoKJ8USAoiCf8OANELsIkFAx66QFaq/gk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.0/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0 h1:sFzfpQ9wg2aHBKLP/pphRDFuV2QXFlcWMU+ZVwN1UF8= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.0/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0 h1:afUxq/oBOeeCGxYBAq99U4lhHUL39BNUWnyA10VYtA0= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.0/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.0 h1:Vt2ZQQQEs+OS9bvrnHZiL9TnTXQr1bdZlagdltETc2s= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.0/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0 h1:AWC9tLObLqxSeyolw7aug3PxEnU7S9oNqatToa+8XkI= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.0/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0 h1:6QbNrD5/LaVqsbvw+XZkUwRfJuPh11Y6cmUT/Umva2o= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.48.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0 h1:NSmUES4o6jcxmd8/SeYwo3/wtr4e+pL2I8z7ZaseGsU= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0 h1:NgkSYzgM3UhdSrXUKkl49FhbIPpNguZE4EXEGRhDcEU= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.0/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0 h1:8GcatvIKYx5WkwjwY4H+K7egBHOddC3wwS6fIbpOUlQ= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.0/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0 h1:ZeUDPcF93I5pE614AD8Le5a1e+383jjJ8lopM/WVfB8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.0/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= -github.com/aws/aws-sdk-go-v2/service/efs v1.39.0 h1:nxn7P1nAd7ThB1B0WASAKvjddJQcvLzaOo9iN4tp3ZU= -github.com/aws/aws-sdk-go-v2/service/efs v1.39.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= -github.com/aws/aws-sdk-go-v2/service/eks v1.70.0 h1:05FWDmYfXhHbsHxeFQIY73GagpjkcTgVe8VotlO62Fc= -github.com/aws/aws-sdk-go-v2/service/eks v1.70.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0 h1:zJY3lR0AdRuigAub2GQkIMz/TP50Ia6R6VruPgWBIxk= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.0/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0 h1:x5N6Wy/2mP1fhS+xWzm+netHTbwMJy8zMFO786yVrHY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.0/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0 h1:FO6LzHczDXByBf8+WJ5cswxaGy1EOjDVXA3NQa97Bh8= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.0/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0 h1:2VJj7fSoDawAjQ91u/DtrrUDOGsuMaWxcbe9Ok/O27w= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.0/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0 h1:1F8KThHdWVMySPUAzlFbr4dHZCPxnUh0xWhzroseuIM= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.0/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0 h1:WUWDUubAtepFBqD/wWvejfep4pkFJeAMWqWHtEzKqFs= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.0/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.0 h1:rgBAS4KMAN6wNHtAuW2bOTyx6FyyXUu56ZajFC5LG6c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.0/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0 h1:N1i7XCvJKHgzndeebYdlNqc9LbOZs0LZIVgsxGuh7GE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.0/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0 h1:q9n5fiDdkpwpxEO5BatJs3j5Z+6hhN1++34kGHXDXqg= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.0/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0 h1:uV0/UBsNeT3NMmUwfQxxWZCglA1EDcAuXAuUti8u0Mk= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.0/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0 h1:XWxvVnRKkG/a5r0A6P5oJyfxMsYBOsCAk2RJt3ebSR0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.0/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.0 h1:3ukR4hfyYEyuZkYQxXY9c7lTL/KEzRsbT6DHqryMTZc= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.0/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0 h1:qt27hk3l7kDo0rUvRk5HfrYiyPiT4t8ne9NDD2U3V9s= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.0/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0 h1:ojhEbQATCj/vrI5046jdKMktHDhTtzYF0Wp1VZelB40= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.0/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.0 h1:zsDCgJ6lWocX4wArsCQre2A92JzBPKKW+2Mg6SOQVVE= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.0/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.0 h1:tTeH6402fy5Z8JHuUO6aL2yn5WFzWSKF6epxYvIPAMs= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.0/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0 h1:whgqtOX1XdLhHidRX5EYA1VrY1qtb+/+eV7GrUSA1QY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.0/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0 h1:JdlVzc51kIkdne4ilxnHAfKfXyhzkJ3eYrfZwk38j/k= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.0/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0 h1:GILchKM1cgGoIjYEYh3oV2o4Xy4v745NtPCo5WIhLFk= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.0/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0 h1:iyNvCA8OSZDuSZktR0kPL2wZbuCM4X1g5R0TyMMmVLI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.0/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.0 h1:EjGSSo2ZmpuIl9Lvq5rUgn3zX392IpbWj4cHFS+I1aU= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.0/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0 h1:q8igUjHYqbjskJxA5CT4uxCMEYD9i4uV2MMSd4PMR7I= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.0/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0 h1:3cELzkqYTy1EEn5kbr5jXfzVaW3ha+5HTuNe7053VFE= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.0/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0 h1:aTtuwsQIMHjO9/FFeRvj5SQ7vbBlmFxHXhySY8TNavY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.0/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0 h1:y+d7el0K+Vy5/YcxYst6uIHHFurCw0jc0jN3eHEMWxI= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.0/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0 h1:oVJU7GYNUPjlJN8kv8E1BI0MrI0Zif57BZvXUAOIWMw= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.0/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= -github.com/aws/aws-sdk-go-v2/service/iam v1.46.0 h1:bJgrqPT2vy+OrJpSeVfZ4e4zaD/EVdcq+5yxDtUOql0= -github.com/aws/aws-sdk-go-v2/service/iam v1.46.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0 h1:Ho/jmeFRCaRZM0hoTzaOFYbV74nWBefREYVPn75AqRA= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.0/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0 h1:h1DzFDVG7/vPWsQVf8oQdgmWMleJU5gWt4OPZVnxxIU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.0/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0 h1:rqaDVBRPXDmWIVu6RClCQiF2eoBCEjqCjf9YgRiFYH4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.0/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0 h1:pwIs1giy/xJWUCT0dfAK7EHvAdOFohFHJDyOLvOiMfk= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.0/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq8CwNro0qm3Sru+7ZrP0p1c2HRs= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= +github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5xfDgrO7+dh40xdXjmSwc= +github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6nH5bMuDYVJABCLY= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5vO+np5mgJxxRMH6y/gQ= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJomKVzCgo/u1k9it4= +github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+IPIaPVEXYycEMi0IP1l8= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxVHiboQcDD5dcRPjvTaO7EgA= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pBexCXCwvSNBS7syZQXe3hVIHE= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgyL2/k3BiEn5a1AeBR8Qk/M= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWLWpdUUHbxBmdHnKtvdENQs= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9JPv7SRJX9YRlMNQ3EUA= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62UJJFRxvY7PKJGFUPYi6MM44jnpY= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbvsq75VUtbS2waQc9QMS/EC1CDXc4utBfANQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6h5Dn6caiKuY86UACNaxMh3UL5XhLHhc= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDYFzus27Rzee6aDgg9binbrJ7KAgCPW8= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRwh+gX3kXcZp+VQ0qaLVE= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5op3siDO3CQEa05bQ2ulEM= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= +github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxAS1bg3rntaMltGgvywp3JY= +github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOionUPy8JObJcvn21TvEpJU= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5YQyq5LFBYOfngkta3YM= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC11hIuePfiZfVOYKgfm1rZDIds= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprieF/Y1OVKg5zvPbAFyLuQGuoI= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/rBZIbwSOzeTNTs0zXdBrEl/Zo+rXk= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= +github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbdEdNX1+vOM2H5QTyD38= +github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZdxlwv8evg97dQufb+U= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrAPCXtRMEtLASleDA/oPiMNe2fVA= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpHmSzP6W+JIGEQld3e4PQ= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drULsC2fz3imdjba+pYnTqm/mkmY= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBPjzVe72EhDqVLAMKmgtQoXdohzdfB0DTxb0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZESLsNSz/s+LfXWs2Oo= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47dNh/U51t9mtlVRYfn5A= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMVg7GRx8jqKZrkRoq673E= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6sglQ187akFDPJu8fQ= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuKw61TsDbviht2BC/gV0PXQ8g4OXxd0K5DoA= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JPFSCB2igk8KK1uKRh5FpeSCBN8= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcgQlNkUzzDxko7AUOm445Tzs= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokKIux0SHqkkJzbBtDMkk= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA+TEOevVhA2u5RmcECE9lHLaI= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3Y7sjOtH2NzTD6ngCO1PkdrrXDw= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPcX+GPmGbz07Y/1llNdly6VQ= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX/DLifEnaw4z+UPOFkvy5tMkFzNzenTYPv1E= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6IjsS8ytLoVZD3N0FEktpR30= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMac+CB0Nik0k9iMNW+t4VW3SQ= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3JDDgbvhuLfzgnMB7zLksL4s= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdyDAvFU9CC0qA2Oxi+bLliXQ= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN41+Cko0INmM0YR5zXAqQEQnta40= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuzn9ms74biIxu/YW7EgzQqlJWg= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/an1YyM1U/KXDRLIe8atCrs= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGBTm2f+tBs7h9iL35dhYGHZADY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z6qGShPCgi2pYhMDOMpHtvo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uKEakpDP/HCLroOLS7+7TykR56ck= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tTp07fBiSQpenGZD6fpDCwe0= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0t6Zd7Yng2o+XM6DtLd/+WnN6G1lA= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr9svujyBtiL+P49lGkVTiWArXS7wY= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv0kfh9kS/IXuWT7KQ3KieJMO8= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwcQQ0G9NPvhHASzG+DHEJE5acwFdvQqr4= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdEVgydpwe7J67mihtIdTWU6bl6KkrnrYExk= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGFdXWIeVPzEp73Q5Nr1QQs4klJvYU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe9nJvQOgv0hbiBO5jSP9i71LkMIyao9/jArY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOYFStHLHirAKn5MWQa9wWF3k= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOrp7m+IbkK39VoclC71Nfl9g2Jnfko= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= +github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5LC8M0vwhlGlvuHQrboIQbeor84= +github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT0sKDAbA4pCDXEMHxlzOc= +github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EVIK1MruqQaWMplBXCivBsdJvQ= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dWr7l75Yq8WXO3OqpHmlAWDFE4= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorlvmboxxMjpfFFe18TkFOjBo6wHtSGGMAVhrs+w= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss5cLuCwOp2s7aZ53I0jRTb0aA= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf365Qj+kfv43xA3/C1MbA5rwn3TQBQCjns= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr5G9/mz492E/NZ8BwmcpCqOwMGe0w= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0kPb957Ik8WWK891n1TEIK82jorIAlr57Wpe0= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiNuxit+Ust9V2Xh9vIVitU= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zRXfGl+z+/G+OepNoVsDHRtPWM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbCblFgOa6v1LKrjab7uzxiSvx0= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7dRexP9npk0DKjBGHBRmk= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBkNTeMfO1iXeazduNjZghw= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZMcOeDawZAmA2JhY8= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcBOr1dxiVvgp/eeh69VX51g= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hLC4Ef3fBUEBMymeJ6LA3oiM= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPomVLQGFHD9z2H0ygmWVglxTo= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5DsgS/GinFFru/K+zExATiuv36xw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq27Z9mw9XtpS0tmPjPk4jUGTgX7RM= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3NhpsijsoikffXNQjpfW6ClgtIAw= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DXfyTMLBQjePEBxA13A= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58VFfsO73Hr09/i3J3IPqf74HEs= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg9NTwRDQH9tne9Fk= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBaq2lNDYc7H6Gqjfo= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnIKqm0IFCwJPtJrwPULODY= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRodjXoSCG7WPwjeLgQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6SqbHvTH8F9MO/sw= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54chTlqVyR7T7u1qUlSECFJf4= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7tHumyNb7/JXpbvMw= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/KXpIuElu3RK3U+fE= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2uUwOJ3Zv0evH3LE= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQflXCciN0qmwCTtRS5pfMZMRg= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXnSVkDvVtGb5p4wp3hVB6nunJ7meYA= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/d/KXH4I0D/g4VAmaYkD4SwzJjEYgWLbs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPqFh69RSzPvGIjKJAKjBIB86ZlfSg1lePJMU= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBYsZF60ovGQ+QP1zeTMRVduZN/f9pwR8fo= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFwi8ulI5dQIyfxY7WRkPIqwxzmhfgog= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPClR4nacB2z2Z9GMY= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1DdytzxaKpkSBuPJiCJHJAka0x1Kw= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93SsPqw7zHtcLDc5sE1uxQWv3qo= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910QWdjQIxfi4syx3Jgu1bRCJ0= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl9MJzdgYGWLr31S4Ot4MzM= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56N9yckM6ECJx6Pk= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/NoD/1HKd9yf+XB6F50/VU= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/ybLKdSdcCttE8hw/+NK99E= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyXqr+tT5T7PckuuW4= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2dQvZGlIXeD1YuPE= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rFiG2+mQJK7Q3F7OU= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OKooVwFZIOhKIxXX7OcReY= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpbD+xLmYKpB+eH7ZHBvaU= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3BnF+SVU1h5VKTS+4Wy5bE1xRBuuCU= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQzPRBBfmkZeeWh8eU4= +github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= +github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9jtlVhL6ErvNd6FoL/Fw0= +github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2Jax46aZYwgEZzOdh/fIJDWg= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyxSp8lfMqlvgmxExw48mhM6tYvw= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRKlJxdsxxBLhv5w5eBBhk+8= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUglJGh7lH+jOpDkiotb0IB7A= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfijI55jb7wB6vFiJo= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsmAiYIKWZRqBinXrZXeg88ftz2E= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKudWP8MFS0fiwzKAe0VK2UfTQE0= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 h1:BpZCG4dzq0TD9A/aEZiF/uCU12AtHYnmjSvo+TkaVIQ= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 h1:vSoGG3q9KhtWQ2UQz0HOrO2OYxFnmcpDTfiuV7jwgtA= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 h1:3ZKmesYBaFX33czDl6mbrcHb6jeheg6LqjJhQdefhsY= @@ -301,266 +301,266 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 h1:ieRzyHXyp github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3/go.mod h1:O5ROz8jHiOAKAwx179v+7sHMhfobFVi6nZt8DEyiYoM= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05RuxzLcjT+S5ZpQobj3ie3UTaSf2NnZc= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0 h1:Pw+Ibvg2vG1gulfBO2FPjr5Y+SDyxzVA1EXw5nTCZiM= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.0/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0 h1:DWBnflfGGvIj45VsuhUyg3K/0xYodsjHS7FQ73TZOGo= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.0/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.0 h1:eA05nWoMN0EF0rttyORxmB4mMLMhdS6PLpL/0GyTEm4= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.0/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0 h1:7e91TZxrdMEe3HvHmFf+VS+VlLf/O9/HtQc6lMEP4Vs= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.0/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0 h1:FNFXj1Ydfrf12zcGNgqVuTNV/UfPMVWZ/iH7hkups/A= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.0/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0 h1:/EB9p30Te0eClIIptu3g3meO38O87YVVdE/UVbyTvWA= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.0/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0 h1:PG2c7HZCVIBFhdIwqO5jg8xo1fHgalDdUwNsn8T1Esw= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.0/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0 h1:Np3pECOLZw4JZgx7d588fTuU2RtxkRRYlTqlCrLh/nk= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.0/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0 h1:gFAqI4i3uvMo3Bk3ePdPwDEYgssnVCFF+p3p3KkRyQ4= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.0/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0 h1:8acX21qNMUs/QTHB3iNpixJViYsu7sSWSmZVzdriRcw= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.38.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0 h1:IJkGKIgX2ZCga4Ao4A8RcL1rty+s1Cc+N/JCtnmtm+c= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.0/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0 h1:eoa+/AK+SVR5cTa/yPiDeupC0EZ8jA496jwjNMhrL+U= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.35.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0 h1:wOcpGR9keDoaWcFQOUEQqA9EhRcl2yv2yOWS24sQnpM= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.0/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.0 h1:Z95XCqqSnwXr0AY7PgsiOUBhUG2GoDM5getw6RfD1Lg= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.0/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0 h1:L48j3iwTIZPNp1FEnZ3d1L1Fx+9ac3N0Oyca42yY3sQ= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.0/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0 h1:BbZi6/1W69NHTyM8CeusL35y1L3YQDky7vW2wzUAtio= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.0/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0 h1:Ep6t5xK/IYMotfsNJ0cDEh9g5GrxwIlBYXyGucmm/nM= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.0/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0 h1:vCV2K/9Wb5ubkqLF6bkaHG1yET2NXFf7TXgsWwv6Y3U= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.0/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0 h1:Pyf7XMt3ya+mV/0Zo5wRU0blp1kTZfvUBB/eP8SgvRM= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.0/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0 h1:gdfSY6AmWavRp8Vl8jaBMbD5M0rmbiJZ2GjgyoBQw2I= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.0/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0 h1:PGWe+dWCl7Iu+d6nnVS9mmeEWYtoHDu2D4GqyIgg7vo= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.0/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.0 h1:jOCYFO1GgCkG3bSeMsKzK/cqvBq65ocisfEkpduVGxo= -github.com/aws/aws-sdk-go-v2/service/location v1.48.0/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0 h1:33rj0RNRRxNHPGCCJ0lC9dOsrLWJXVsJteZQS6BHXdk= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.0/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0 h1:9Lo/MEr45V5AJ8mf3gb0g8lxPlbXNXbQ8MlHWPgsWh0= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.0/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0 h1:7Ic+DGhlNQb5UoUGB/1gV+ULY/sLCB6Oe6F9MvowUZc= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.0/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0 h1:ek+HR+h5mzH8ZW9yBOarF4Xu4Asj9SceDyrUle8y1yw= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.0/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0 h1:sZ1KON5k/tyf3xbZKDW/gl4nHEm/84zDpXGsA0/7LcI= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.0/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0 h1:7zjskfsMrJGBs6y65V2TZG1xSUxWvZYnFiwBjiRN9F4= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.0/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0 h1:te/oZcPDK1WkmGy8tE0zoxTE5aEaEqZ/79jdTDxjyb4= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.0/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0 h1:wBaXl/5Gxvc3dgiPFNFWw1QEL4ktn3bD+Tb/lU5zGIw= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.0/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0 h1:zutK4lUa0WzbzA18TjqAcSCLFWYdtxh2adC9s9Jz2Lo= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.0/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0 h1:dr8QYzAgIt7JTEN65ujaa3qB1HDKL1Gg34rVvWBzxn0= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.0/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0 h1:jmAOPEdLWcLdZjkmiDWb3rcKqPNbXKI0l7VgukYWZDw= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.0/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0 h1:hqeHoI8gefTz2qXgxG7B5PsVuJuyVnPfp7EveQtOeHg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.0/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.0 h1:h04Kq2u2B6bDeAmNoxlf9bqtKH3GUlkW3p/+e/mE7+o= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.0/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0 h1:8ScMT/bvwaGzWE+5zVDxVPgSWaBrSaFZhEIhX7kCOhg= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.0/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0 h1:G8EHt/6UbzCG4ZvQZP/HHDHApq+zArzKEXMhpYlPhug= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.0/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0 h1:+zQYbnkNrMslzC+4RKJjoENheRA0oyRZWrr1GoaD6hc= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.0/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0 h1:5v9hJYt08sME6Pzt7zEn3q7prnBKjjuv6dUzpStvm3I= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.0/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0 h1:Rdh8HWrjiIn7lLugBf3uR9NQoUE0XvOyM8c3I7okBXk= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.38.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0 h1:4RstlGjxjPNGswiVCIPcwck+IH/HulpbaNY+1PA2Sg4= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.0/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0 h1:oy/Wi6NFXYRg/1wtNNRn2gyEIJGmIon1osvj0E7s1tU= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.0/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0 h1:cU81jdax5eqhZiEGRxRN5nfKj9Rp6jgHKnIDoRArU3A= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.0/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.0 h1:S0IoLaOU5NCanjuxRLmf+qjkz8cUnNvaAOOC/zb8c4Y= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.0/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.0 h1:EDHfy8QUacuK48e3rA99EfrD7z4zSVYz99es2YicD2k= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.0/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0 h1:dxYQ9hDRI/yXFzO3sYT+x3Ss2d8JDf2eX5hyUPHG6fA= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.0/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0 h1:usR9TyfGyoGq2SK2ksEc3qwpYeBe03rccTj63hUFWKk= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.0/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0 h1:mkEqqGgdmOQ7DbfWVKL8TmAki9S3f+4YiMwgKN6TIyE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.0/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.0 h1:71GQ3yQ1sGjXsAOBso7nVLCLJrCoDQP1IhYbQciMpFk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.0/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0 h1:PlpUSiYutFa6aEeRrQYUo8zomTuAx5oXxjwrZ/XZH+8= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.0/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0 h1:VOGIH/MtfO0aIDRuCllgzlakSqzA66W5Yc2FHatgfuE= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.0/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0 h1:IlYnE1ZfFKisSY2tOp6jgKBXZoNIfhHPYzBDPfwmY/0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.0/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0 h1:KXl52JHAz09QVa9tymsKhofwoNRqmtdz8SkKLZa79HY= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.0/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0 h1:2N2oZEWjjUWpqqOSNEgpd63ETgtp8UHFhMACk7ByM2I= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.0/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0 h1:BtpUqF+QdW6NYowWLd9LYYKO+cwxMpb1XpSYX6a8dMg= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.23.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0 h1:kjP4uojcr0zt3Xon5cuEWf95wDNZ2a3D9EWP1l2mYE4= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.0/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.0 h1:XHfm7tNvgZc9TL4bW3TA6v0OaewvzUxBRX/+rDHe/FA= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.0/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0 h1:WjynubA3yutEkbjZtzgNXAMhndGWraS2g5W9TXdtBhY= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.0/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0 h1:j2UihqELKZYVxUXtEJ/ANG+L4zyejh4B9K6Hc7ZzW/8= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.0/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0 h1:z8hxRH/lXSN0oWjvYyuxeAHIEOX2mP4m3QqbJgNZw2g= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.0/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0 h1:GzBorIQ93nyNDbC59odoBTRRSAx0Im9Z7xwJ5UbI81w= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.0/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.0 h1:S1OWl3a+IRR/GSqzjea0jflabLsHyDJXknxJk7pkYI0= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.0/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0 h1:uxZwx9vobWg4IS1dyMoC/5Bqrkt9URYtUvj08SZPDRY= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.0/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.0 h1:OWsmICx9jHtBVrgYwYb+2q0iVSPLIfDZOiKhoQA+gjc= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.0/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0 h1:gFNE53MstNSex5n2AeuqDeO9y6YrAEq5r9ohIo0Q1S4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.0/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0 h1:m900Kua81M38+2mViQR0WyXuVJHXfHhBMZE2KEOKCxg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.0/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0 h1:jB/wGP9pe9pbXCFqZELx9MxLmkZetN0yK0kc7jFDlIY= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.0/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0 h1:bn5Y52YaLv5p7sa6TIH3Fr/V+gLpoQkcctNAvYT1YP8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.0/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0 h1:DUJziWLjN4tzfLFz+h2DRDItRtrD3NdGWs0xztSZlFU= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.0/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0 h1:26bUDFcdGzHxBax1oY+HL/YRmUVfqyvcbgdKHr0FDfE= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.0/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0 h1:ZzEJclXVP4woTKwsQChUKOZuekxc/DBjlHKmfFWpYrg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.0/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0 h1:jevrLpVG9sOEPsuipO3eGcdDzJyo36Dmme9iSu/8GVE= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.0/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0 h1:KBw/bfF87jfAgm0ZcQOCgqJSY7tMLg9x+1f+EdUHQt0= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.0/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0 h1:+8/JB7/ZIk86sDBtcy+md9qqHOjc6rR75NySpsrujDY= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.0/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0 h1:ZjfNS/AmmzzGbM9Au1219mq3rh7L3HhzgCV04Z5k24M= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.0/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0 h1:MuXKThC0Lv83LdIiFc5aMjmjYuG7hC49Da3H+dvt6xo= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.0/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0 h1:mYSV8Ih3PRx9/uKuMMYRGWnUSDjOKDJAlPLqw/fhxB4= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.30.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0 h1:M1lJ8nSB8pL5XPIq82UsizGi+t4ZXkmBkW2WpPWczpw= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.0/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0 h1:JCUZSQ0pCqqihKLmicNKzvKt0JpXzwyWr4izSjyKxbg= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.0/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.0 h1:3r/u8MwfSuEu/PggD/JS+1/p2/g/a3mz+bjg1uTSyys= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.0/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw36rErepMlJyARnfAfYHHqD/kBR8= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/pBO1QfEd79+0XsB1pbjY= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYeWgTLgbW1KiAJ8Yk= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= +github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9Ox0LhKSvU0812W0= +github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk+CWDAQ/WWHCTvk/DKlQ= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvWYrQxrJmyT54aohWSs= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ6KIJ4V+9LrZm41BCH7h/xOmI= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfyPMWDpNoJH/pIAMIlLI= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFeo0WnBJ69vIVuiyS4Q3tCU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/TXYDjbZXvshpg3pl5ks= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/K5BYbEXfwztRG5M5EOtqXAd6uHqE= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1kS4ItUgFhY3gSFAKbYD0mBYFUK6vvdk= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqOMzl/bDbAsfl0nzLa2A2LGw4c= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVBlMSfSo5aDlM7b+o= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtucfgoU+866Xu45/6T/3Bmky/+LY= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZrGUJBnYv7FFo4j94zI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQshTcIhPST+L3FOvzNJuZNWVQ= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEqc89raV43prmVry2b172lQwYAdbMh5ClvYgM= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hhcin4Vrdv+NAk39v9Bs65zkc= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrvbGwvkLUQKullX+qH81vAExkm3I= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFGP3lxwa8CJfqzJLwXnp6xY= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= +github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7UN8O+ePHOukC+qpj7eUjY= +github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5ZplpbOnFXtq2TJSOgAm5XTMQd8= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yzGvbL3msBcrMZmE= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoqJ7NkoKxapHby/g2+VA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq1GyeGv7Dd0tmEvbGTMzKX0iQ= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43oI+x6Bm3l4UMT63o3kQOheL7M= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+GJlgylsOBfHpQqfgpl0QVI= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXIIvx/69lISetJyPn/O01Gltmw= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/AxeVbw9z0xrOjLhBUz1Ry5ERGp0s= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy3GZUjrR8Ixp8bxuo4dd9WJXXN1s= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3bvZ0yM6LQwoqTmdsx/W/fEM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFsGM9gyN/RoUgvQBQmIj6c= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXali2QeL+WGXUBew4= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnYOyrLz1xs1EY1hE= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZMeF17Cve6tfKIzITE= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/8bvBIoprUy1QYeEYaU0= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNUlxPO5UHr3nXAqakzYV3gS+kg= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaqT25cmhakK3rd0d/8Wxn2VwbDIbA= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNTUDw+vzcm/DiYsIaz5Nbg1HQnHY= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi97aiWXNMkEBFQswuY3IZVeJdWJg= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/HpbeaUtqtalIGN+SW3s8G0tpgBk0= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUFKjWKNQNb64yplb0Z9fU/YqpS8GZEzie8= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TXt5amOPinYayB1oA= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPCS2/GadcFuGg4kA= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C4dvFhP7ypQfJvDncmwimHQ= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCFgYBOJotsbXS3yaiW6vFI6iPfK6o3TiWI= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0PCuJ+12Cd+2NwRejcaC8UhLrJs= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCpGHU5rpaLf3VhZlo8= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075eykwvu1i1n2Mex9x4Lcs= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+jIExhMUYU9uor2pVYfHEShFWjL5GGn8= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmAaOikap1971w6SrCN/vvcrDR9SY= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0XNVyefAaogYGufA= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY2aFzOXp2ypplpsYa5mcU= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhTaC+Au1n92O+vNVKuGxDpYDXZJP47/I= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1vCascKDbZ5C9MJNt7c= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK80PnPa4XqXoQKl7PFk= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3WwwLeyehPOrG0/N/8fc= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF76wFQNNQLLu/RUFPx32ulM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9hgk36ydnybnb6RwU= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUhwp7B8IcemxgUzk5os7KL+o= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro4LD4IT+qYi2WUsQ= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBiagko7v0EF6xwW0yo= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ7c2sO4e4yMD6vLss= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XMft2EV3FXR/2STXFoSfn4= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS9nLw7zsG8jnJHoBDW0HAIAtY= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzIYhI9rmN5d+X2UF7MPGXKvjx3G/XGGM= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigilserDQum3vfQQVY38RzIuYk= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 h1:KNy1faYRqcN1PYqtHtWENQnc2GlyknihYHcUw1kwvsE= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEVCtNFZCMz2Y8S103j7uedO7bh9g2iXtHMcjuI= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2idqDf2hIksDhPgRaFQO1hb4yCk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmifR/+T5TuXIHn2ivu8zKQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItEhVwfP/xfHmNHtENN8VoiB7NBFA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gSDqAJIoBDNmjpNihYjCQORAg/yc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U1M4miaC/+iLFjllYtvr4N4JfxFfvHv+wWvGrbZ+E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1YqSV8O9QpeuDTBoDncph5pJpTaIeK5FivKwfSI= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 h1:Peg2o4ykhpoUrGu+teNnBVL5AnNoypKjVv3M8nbzGUM= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 h1:LubFJpiNFFpuuvz1d0wUtmSfyy/XO9zdw7QdlmQX91E= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.1/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0 h1:y8H04kZLZu8Zcy/+E3yYPd1e5V+pPJklbLdkKlLGeO4= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.0/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0 h1:mT0D16ojwEPM0/XW1yVAeJYvX1F5B2yMhwf7CDpvIqw= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.0/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0 h1:b+DS5OdH3yZCVMHLs/8aA9Nuw+g/WphnYqWj1lnrZbU= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.0/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0 h1:9xIfi7XPNyqbrZBCVsAnxlajEsNLP4qZ/T+rw6NYtZ0= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.0/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0 h1:tM+BaHKIc3894BcrzKeSjMHJnBLUQDNNcDk7h3dUHKQ= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.210.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0 h1:vlmeLcOZ1PtqEpgRIZOOw49DABG9EWYkHHmC96IBgBM= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.0/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0 h1:37TFUN36cFLnIj32FFanXqD+uuXwASxCEEckhdBjCnE= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.0/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0 h1:r5HePq6z0BEXHOZ5/k6bLZVYMSAplzNbvBxHlb2R31A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.0/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0 h1:sKzvE3fkQNa4iXbS2zhPsWhoYZUuPGeyCx29zWaUAyg= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.0/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0 h1:bhfdvrLXqdIbe+XixpCiW5plHoozqTO7afs+26ovHAk= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.0/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0 h1:zJ4sLmAK4W6tk1czlTcu0pPMyCEFsZvv/v0NC1CymuE= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.0/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0 h1:c9obaYL+TZzWwZf59bU+F18J89YWxciIiGYf+Sr1NU4= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.0/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0 h1:kSiJ+KBflpGStdvVB8osVwzglb9QOcCGeaNeveHUAuo= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.0/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0 h1:UjC4316d1/eUrPGYZxs1nDdA2yD7VgsB6Ep7HQmX1xE= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.0/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0 h1:IqZZ0dHv/NhExc+8HI6CdgTZLz7Yjn9OaExTmFX4UX8= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.0/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.0 h1:3BEXxnGZpqGWVFL8lntsAtWjT19EtQp2uUmXS0+wWpA= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.0/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0 h1:EGgXgQlHPLB4AQ2EitqhfkhRkyxHJ+Y1CTFbP6vfS60= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.51.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0 h1:qDg+pW4hxuM1zlixvZy3EyRxGiy4FknvKwfYHsUGvYw= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.0/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.0 h1:vIp1dRkvVu4oKSl41ds/Y/rBRfw9tyUAOMS1E0FRdG8= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.0/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.0 h1:iuz8rTwAAVIKp4BL2yafOsZDvuW5tkkPsOmxRcytPhw= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.0/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.0 h1:+GWmgZ6TeJ12tLw4l981+5nc9FDdzXtdZlnmp6KVHig= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.0/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0 h1:xobvQ4NxlXFUNgVwE6cnMI/ww7K7jtQMWKor2Gi61Xg= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.0/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0 h1:1T8wFNEtOP4lgLC7v8Fzgbb4kFrMmnscG7kOqkbA26c= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.0/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0 h1:kr0zUJ5+O+3XOO5k30ZFWw6BuW77y1wpYl8QbDxgyuo= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.0/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0 h1:6sjrNE9OXSuF3P2Y+++303mkGbQlmFweTLvZLUz4Ric= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.0/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0 h1:OHfg8SKR3X5AV6/LpinRDBPciw12F4qQjsvf6o0GiGE= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.0/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0 h1:21pRqoiIDamny/57BJYBrGumQKQEAcZ1+7X2xpMkOdc= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.0/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 h1:Mc/MKBf2m4VynyJkABoVEN+QzkfLqGj0aiJuEe7cMeM= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.0/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0 h1:aiGJnlWqp3e81gDzbSX/+67LqbnW9ppW/Md2CqLVCrQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.0/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 h1:6csaS/aJmqZQbKhi1EyEMM7yBW653Wy/B9hnBofW+sw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0 h1:IZmMc03E2ay2j+4It6+XKpWLwdH9RNfLYr31ZjTmlpk= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.0/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 h1:MG9VFW43M4A8BYeAfaJJZWrroinxeTi2r3+SnmLQfSA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.0/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.0 h1:rH21FB+YB32tQXRRqw5GOXLRlEY6sF0niNUnjIz2K4c= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.0/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0 h1:M7W7qo3OsHzH+zrmoU8gR4Or+WB2aV32kJ6H5qSYgEs= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.0/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0 h1:+LdZx81sNrpT4v1+zr+5LJa8CBtKjWv9UFE+fLdzWRM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.0/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0 h1:x/RJ5w+RJ7F6DXSqUdRd5oo/L2qq2ziciIep+5G+U7A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.0/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0 h1:e2NwGYwvTV2yNa76PRkQ/gtjEmnvCw9h6kRTNCg/PUI= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.0/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0 h1:/Ec93n7oXPhZvalYxFphWMSNjaAy/A2dWkKhqCAePEg= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.0/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0 h1:UMgzltOpkvNdZK15iptmssjAEWqKIffMTZRroY76MnA= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.0/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0 h1:QsCjJRBHeDHhOc0J+GIPxhHesz5yTSYXR1jyMWzXcNQ= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.0/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0 h1:eGVvpr1n1sMvSnvYAQVUKK+JUPNFjUTy2iSR8nutPMc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.0/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0 h1:l/hNjnFe+0P+0YjVaYghBZDooc5OFJOx4c+hG/YyX5Y= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.0/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.0 h1:KiJHde7jxo8ppD7jcYopFKZ73of3SSyTbXRPifyCSjc= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.0/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0 h1:gFCxExCqt4/HWMVKmzf+Mxt3i1gyovNNL8xlfVaN0a4= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.0/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0 h1:zEbaP92GXITM2TrYiw4mNer/ViT4z/Zq8hmrIzSF3Y0= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.0/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0 h1:5+II3BO8cotBo0VNs3Ix2EakRC+PP//loHRaEKDQUNE= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.0/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0 h1:RLGywWWnKeGJkWlg1Su2jH7DCC7y7QD1zbgGU0IVmZY= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.0/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0 h1:n4HU/6mkGI9nTgt5Q80hvLMWv4HeXwfx51Ux5lVkRTY= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.0/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.0 h1:gFPqTmIg8UI0CcW0pk4LXT2BQK2osloIE6xf46p2144= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.0/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx53ImR4HUPCO5/qS7a48pek= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF15sTosQczlMR5nAkT8rC0g= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNtsXPEo9KPtChTbzzNbvnE= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9gFDMT6fFMNCq3H1V/ZpZA= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsPM85IGqw8ixfRCMMMT8Nz48= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWkJViT8nwdUd+1bMOnHpiYI= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggMTiEpq+QvvmkVnnxDyJs= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9cO45R0i8+fFJ74nyb7S+unUpQM= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLxm0shtfYujiIR7ERqQpJtsAM= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4YAL2mPdmgf2WkdRxQ5RtPP00= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1:RP9nJ5v3fPoUFZOKz/NRPqS9PsWTY4Bb0N8AEsaMxKs= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0LsJA01RzrpO/oyNmlEc2w/LLvcN4= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKuDgy63OVHrvVME8S8YaBVSofI6WwtGNH0XwrJ0= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkAHHvMTkWq/IzoDNwRHnT9/uy7z8Ds= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwViwkbP9rcD4HuuyXsgUO0KZ04V0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzfeqnAS4K3oRDEVWY= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY/S8ej2IBhGu3XTOv8= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQF1iRGhHsjA9pSW0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIup8fr4HWmUSwVNAni6s= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJEU0Ohp704KkfDdumIbM= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+NmiSnwDSWpU7+wP60Q= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2ZvTopJJhjiar/8EEo= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7PNPCQjsQBEIYqTLA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0FOL83Jc+7xTHBqtItk8rKMBM= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5MpWXOQnWKMsZkERDVcOZuNx8c= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 h1:Wdc/2+ZT0SOKPu11GNwU08KR6/jREOhmMUrF6TbqD+s= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 h1:AAo94xHcAQFBxzuS6jnIp+gEKfWDoQQAbqyhKmMGOYo= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 h1:HctWK6IduY4jkWT4t5IIatg0zYhG1uvLN04cVjwHCnQ= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 h1:kCJG+jFRrD54jRPaat2ViEHVHd11vvTFd03rt20fHrE= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= +github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= +github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbrHuueSpLBnhVkgDo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30VaLreZURieCr0sKiuRPXTHmQ= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDpsYaGrl3FPcQn2zaUWmp91pXw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0VnligLJs4O0DNTLYYPkQ29faFhmcho= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXmWNe3o/0SnoI6xMaTdMb/AgN3WgQ= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zuG0cnmJPuR7reYm6maElCEjjx3Xw= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3JxyzLPK6IBq489lptSrbj2ikcw= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIWqxViY8BrdKxPMaQe0s5g= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3YyvFKQ5lQKnv2EUpOprtM8TfVeqAk0rYc= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznLiKrc72n4j2aDPAbXaj7YC8= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw5kMoliPPzI+WJGM= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLKu9W2gK8gIGTV4+z8fBsptPY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7YbMbVA9k4LN6dR+boo= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn2pu7pW3nwXjFMfe6HE8yIyj3xKY= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+ZquOi+377Chmz01PhU6Pdt8= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 h1:p6NR+K5innSuOAO4PQlrXGbeSzRFQ2u3yFJpTUi1iFM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 h1:09b9HHUpdLKsCrWa5+juB/fBXhyNLRq9t3gevDRUf4w= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.1/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= From d4c1b95d3e70ccafd115c1b9d91ae363ae739d54 Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Thu, 21 Aug 2025 15:17:31 +0100 Subject: [PATCH 0596/2115] fix(eks): updated properties for addon_version Signed-off-by: Fred Myerscough --- internal/service/eks/addon_data_source_test.go | 10 +++++----- internal/service/eks/addon_version_data_source_test.go | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/service/eks/addon_data_source_test.go b/internal/service/eks/addon_data_source_test.go index ade79863f9a6..d31528210f5e 100644 --- a/internal/service/eks/addon_data_source_test.go +++ b/internal/service/eks/addon_data_source_test.go @@ -97,11 +97,11 @@ data "aws_eks_addon" "test" { func testAccAddonDataSourceConfig_configurationValues(rName, addonName, addonVersion, configurationValues, resolveConflicts string) string { return acctest.ConfigCompose(testAccAddonConfig_base(rName), fmt.Sprintf(` resource "aws_eks_addon" "test" { - cluster_name = aws_eks_cluster.test.name - addon_name = %[2]q - addon_version = %[3]q - configuration_values = %[4]q - resolve_conflicts = %[5]q + cluster_name = aws_eks_cluster.test.name + addon_name = %[2]q + addon_version = %[3]q + configuration_values = %[4]q + resolve_conflicts_on_create = %[5]q } data "aws_eks_addon" "test" { diff --git a/internal/service/eks/addon_version_data_source_test.go b/internal/service/eks/addon_version_data_source_test.go index 37402e60fad2..38367abdde4a 100644 --- a/internal/service/eks/addon_version_data_source_test.go +++ b/internal/service/eks/addon_version_data_source_test.go @@ -54,11 +54,10 @@ data "aws_eks_addon_version" "test" { } resource "aws_eks_addon" "test" { - addon_name = %[2]q - cluster_name = aws_eks_cluster.test.name - addon_version = data.aws_eks_addon_version.test.version - - resolve_conflicts = "OVERWRITE" + addon_name = %[2]q + cluster_name = aws_eks_cluster.test.name + addon_version = data.aws_eks_addon_version.test.version + resolve_conflicts_on_create = "OVERWRITE" } data "aws_eks_addon" "test" { From 9fe81a9b486eabbc8dcd8c0c8891b4de6c540e17 Mon Sep 17 00:00:00 2001 From: David Glaser Date: Thu, 24 Jul 2025 12:22:15 -0400 Subject: [PATCH 0597/2115] Enable customer-initiated Blue/Green graceful termination using SIGINT --- internal/service/ecs/service.go | 200 +++++++++++++++++++++++++++++--- 1 file changed, 186 insertions(+), 14 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index a4812019b7c8..f42161cf6b72 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -9,8 +9,11 @@ import ( "fmt" "log" "math" + "os" + "slices" "strconv" "strings" + "sync" "time" "github.com/YakDriver/regexache" @@ -19,6 +22,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ecs" awstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" @@ -1099,6 +1103,11 @@ func resourceService() *schema.Resource { }, names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), + "sigint_cancellation": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, "task_definition": { Type: schema.TypeString, Optional: true, @@ -1430,7 +1439,7 @@ func resourceServiceCreate(ctx context.Context, d *schema.ResourceData, meta any d.Set(names.AttrARN, output.Service.ServiceArn) if d.Get("wait_for_steady_state").(bool) { - if _, err := waitServiceStable(ctx, conn, d.Id(), d.Get("cluster").(string), operationTime, d.Timeout(schema.TimeoutCreate)); err != nil { + if _, err := waitServiceStable(ctx, conn, d.Id(), d.Get("cluster").(string), operationTime, d.Get("sigint_cancellation").(bool), d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for ECS Service (%s) create: %s", d.Id(), err) } } else if _, err := waitServiceActive(ctx, conn, d.Id(), d.Get("cluster").(string), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -1501,6 +1510,13 @@ func resourceServiceRead(ctx context.Context, d *schema.ResourceData, meta any) } else { d.Set("deployment_circuit_breaker", nil) } +<<<<<<< HEAD +======= + + if err := d.Set("deployment_configuration", flattenDeploymentConfiguration(ctx, service.DeploymentConfiguration)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting deployment_configuration: %s", err) + } +>>>>>>> 3a4db3db6c (WIP: Enable B/G graceful termination with SIGINT) } if err := d.Set("deployment_controller", flattenDeploymentController(service.DeploymentController)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_controller: %s", err) @@ -1793,7 +1809,7 @@ func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any } if d.Get("wait_for_steady_state").(bool) { - if _, err := waitServiceStable(ctx, conn, d.Id(), cluster, operationTime, d.Timeout(schema.TimeoutUpdate)); err != nil { + if _, err := waitServiceStable(ctx, conn, d.Id(), cluster, operationTime, d.Get("sigint_cancellation").(bool), d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for ECS Service (%s) update: %s", d.Id(), err) } } else if _, err := waitServiceActive(ctx, conn, d.Id(), cluster, d.Timeout(schema.TimeoutUpdate)); err != nil { @@ -2083,6 +2099,13 @@ const ( serviceStatusStable = "tfSTABLE" ) +var deploymentTerminalStates = []string{ + string(awstypes.ServiceDeploymentStatusSuccessful), + string(awstypes.ServiceDeploymentStatusStopped), + string(awstypes.ServiceDeploymentStatusRollbackFailed), + string(awstypes.ServiceDeploymentStatusRollbackSuccessful), +} + func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string) retry.StateRefreshFunc { return func() (any, string, error) { output, err := findServiceNoTagsByTwoPartKey(ctx, conn, serviceName, clusterNameOrARN) @@ -2099,8 +2122,7 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa } } -func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time) retry.StateRefreshFunc { - var primaryTaskSet *awstypes.Deployment +func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryTaskSet **awstypes.Deployment, operationTime time.Time) retry.StateRefreshFunc { var primaryDeploymentArn *string var isNewPrimaryDeployment bool @@ -2116,11 +2138,19 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa output := outputRaw.(*awstypes.Service) - if primaryTaskSet == nil { - primaryTaskSet = findPrimaryTaskSet(output.Deployments) + if *primaryTaskSet == nil { + tflog.Info(ctx, "UPDATING_PTS", map[string]interface{}{ + "before": fmt.Sprintf("%p", *primaryTaskSet), + }) + *primaryTaskSet = findPrimaryTaskSet(output.Deployments) + tflog.Info(ctx, "UPDATED_PTS", map[string]interface{}{ + "after": fmt.Sprintf("%p", *primaryTaskSet), + "deployment_count": len(output.Deployments), + "deployments": output.Deployments, + }) - if primaryTaskSet != nil && primaryTaskSet.CreatedAt != nil { - createdAtUTC := primaryTaskSet.CreatedAt.UTC() + if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { + createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() isNewPrimaryDeployment = createdAtUTC.After(operationTime) } } @@ -2131,11 +2161,12 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa // For new deployments with ECS deployment controller, check the deployment status if isNewECSDeployment { + tflog.Info(ctx, "ISNEWECSDEPLOYMENT", map[string]interface{}{}) if primaryDeploymentArn == nil { serviceArn := aws.ToString(output.ServiceArn) var err error - primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) + primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, *primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) if err != nil { return nil, "", err @@ -2152,6 +2183,13 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa } // For other deployment controllers or in-place updates, check based on desired count + tflog.Info(ctx, "STABILITY_CHECK", map[string]interface{}{ + "deployment_count": len(output.Deployments), + "desired_count": output.DesiredCount, + "running_count": output.RunningCount, + "primary_task_set": *primaryTaskSet, + "is_new_ecs_deployment": isNewECSDeployment, + }) if n, dc, rc := len(output.Deployments), output.DesiredCount, output.RunningCount; n == 1 && dc == rc { serviceStatus = serviceStatusStable } else { @@ -2164,14 +2202,14 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa func findPrimaryTaskSet(deployments []awstypes.Deployment) *awstypes.Deployment { for _, deployment := range deployments { - if aws.ToString(deployment.Status) == "PRIMARY" { + if aws.ToString(deployment.Status) == taskSetStatusPrimary { return &deployment } } return nil } -func findPrimaryDeploymentARN(ctx context.Context, conn *ecs.Client, primaryTaskSet *awstypes.Deployment, serviceArn, clusterNameOrARN string, operationTime time.Time) (*string, error) { +func findPrimaryDeploymentARN(ctx context.Context, conn *ecs.Client, primaryTaskSet *awstypes.Deployment, serviceNameOrARN, clusterNameOrARN string, operationTime time.Time) (*string, error) { parts := strings.Split(aws.ToString(primaryTaskSet.Id), "/") if len(parts) < 2 { return nil, fmt.Errorf("invalid primary task set ID format: %s", aws.ToString(primaryTaskSet.Id)) @@ -2180,7 +2218,7 @@ func findPrimaryDeploymentARN(ctx context.Context, conn *ecs.Client, primaryTask input := &ecs.ListServiceDeploymentsInput{ Cluster: aws.String(clusterNameOrARN), - Service: aws.String(serviceNameFromARN(serviceArn)), + Service: aws.String(serviceNameFromARN(serviceNameOrARN)), CreatedAt: &awstypes.CreatedAt{ After: &operationTime, }, @@ -2216,6 +2254,10 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } deployment := output.ServiceDeployments[0] + tflog.Info(ctx, "DEPLOYMENT_STATUS_CHECK", map[string]interface{}{ + "status": deployment.Status, + "deployment": deployment, + }) switch deployment.Status { case awstypes.ServiceDeploymentStatusSuccessful: @@ -2235,18 +2277,148 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } } +func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet **awstypes.Deployment, wg *sync.WaitGroup, operationTime time.Time) { + tflog.Info(ctx, "ENTERED WAIT FOR CANCEL", map[string]interface{}{}) + defer wg.Done() + select { + case <-ctx.Done(): + tflog.Info(ctx, "CANCELLATION TRIGGERED", map[string]interface{}{"PTS: ": *primaryTaskSet}) + + if *primaryTaskSet != nil { + fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment in progress (RolloutState: %s). Initiating rollback...\n", + string((*primaryTaskSet).RolloutState)) + } else { + fmt.Fprintf(os.Stderr, "[INFO] Detected cancellation, initiating rollback for deployment\n") + } + + newContext := context.Background() + err := rollbackBlueGreenDeployment(newContext, conn, clusterName, serviceName, *primaryTaskSet, operationTime) + if err != nil { + // Check if this is actually a successful rollback + if strings.Contains(err.Error(), "rolled back by user") || strings.Contains(err.Error(), "ROLLBACK_SUCCESSFUL") { + fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment cancelled and rolled back successfully.\n") + } else { + fmt.Fprintf(os.Stderr, "[ERROR] Failed to rollback deployment: %s\n", err) + } + } else { + fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment cancelled and rolled back successfully.\n") + } + } +} + +func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet *awstypes.Deployment, operationTime time.Time) error { + if primaryTaskSet == nil { + tflog.Info(ctx, "DESCRIBESERVICES IN ROLLBACK", map[string]interface{}{}) + service, err := conn.DescribeServices(ctx, &ecs.DescribeServicesInput{ + Cluster: aws.String(clusterName), + Services: []string{serviceName}, + }) + if err != nil { + return err + } + if len(service.Services) > 0 { + primaryTaskSet = findPrimaryTaskSet(service.Services[0].Deployments) + } + if primaryTaskSet == nil { + return fmt.Errorf("no PRIMARY deployment found for service %s", serviceName) + } + } + + // Check if deployment is already in terminal state, meaning rollback is not needed + if slices.Contains(deploymentTerminalStates, aws.ToString(primaryTaskSet.Status)) { + return nil + } + + serviceDeploymentARN, err := findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceName, clusterName, operationTime) + if err != nil { + return err + } + if serviceDeploymentARN == nil { + return fmt.Errorf("no PRIMARY deployment found for service %s", serviceName) + } + + tflog.Info(ctx, "PRIMARY DEPLOYMENT FOR ROLLBACK", map[string]interface{}{"PDARN": serviceDeploymentARN}) + fmt.Fprintf(os.Stderr, "[INFO] Rolling back blue/green deployment. This may take a few minutes...\n") + + input := &ecs.StopServiceDeploymentInput{ + ServiceDeploymentArn: serviceDeploymentARN, + StopType: awstypes.StopServiceDeploymentStopTypeRollback, + } + + _, err = conn.StopServiceDeployment(ctx, input) + if err != nil { + return err + } + + tflog.Info(ctx, "STOP TRIGGERED", map[string]interface{}{}) + err = waitForDeploymentTerminalStatus(ctx, conn, *serviceDeploymentARN) + + // Handle successful rollback cases + if err != nil && (strings.Contains(err.Error(), "rolled back by user") || + strings.Contains(err.Error(), "ROLLBACK_SUCCESSFUL")) { + return nil // Treat successful rollback as success, not error + } + + return err +} + +func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serviceDeploymentARN string) error { + stateConf := &retry.StateChangeConf{ + // NOTE: SHOULD BELOW BE OF THE NON-STANDARD serviceStatusPending (i.e. "tfPENDING") values? + Pending: []string{string(awstypes.ServiceDeploymentStatusInProgress), string(awstypes.ServiceDeploymentStatusPending)}, + Target: deploymentTerminalStates, + Refresh: func() (interface{}, string, error) { + status, err := findDeploymentStatus(ctx, conn, serviceDeploymentARN) + + tflog.Info(ctx, "WAIT STATUS", map[string]interface{}{"status": status}) + + return nil, status, err + }, + Timeout: 1 * time.Hour, // Maximum time before SIGKILL + } + + _, err := stateConf.WaitForStateContext(ctx) + return err +} + // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. -func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, timeout time.Duration) (*awstypes.Service, error) { //nolint:unparam +func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { + tflog.Info(ctx, "SIGINT CANCELLATION VALUE", map[string]interface{}{ + "SIGINT_CANCELLATION_VALUE": sigintCancellation, + }) + wg := &sync.WaitGroup{} + + var primaryTaskSet **awstypes.Deployment = new(*awstypes.Deployment) + tflog.Info(ctx, "INIT_PTS", map[string]interface{}{ + "primaryTaskSet_ptr": fmt.Sprintf("%p", primaryTaskSet), + "primaryTaskSet_val": fmt.Sprintf("%p", *primaryTaskSet), + }) + + var cancelFunc context.CancelFunc + if sigintCancellation { + var cancelCtx context.Context + cancelCtx, cancelFunc = context.WithCancel(ctx) + wg.Add(1) + tflog.Info(ctx, "GO ROUTINE STARTING", map[string]interface{}{}) + go waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryTaskSet, wg, operationTime) + } + stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, - Refresh: statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, operationTime), + Refresh: statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryTaskSet, operationTime), Timeout: timeout, } outputRaw, err := stateConf.WaitForStateContext(ctx) + if sigintCancellation { + // Signal the goroutine to complete by canceling its context + cancelFunc() + wg.Wait() + } + if output, ok := outputRaw.(*awstypes.Service); ok { return output, err } From 3c60a0e99b089caaaea800d5d187a397c4ac34c1 Mon Sep 17 00:00:00 2001 From: David Glaser Date: Tue, 12 Aug 2025 16:57:27 +0000 Subject: [PATCH 0598/2115] Implement blue/green read handler changes --- internal/service/ecs/service.go | 137 ++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 61 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index f42161cf6b72..89011a7149c0 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -22,7 +22,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ecs" awstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" @@ -1511,13 +1510,21 @@ func resourceServiceRead(ctx context.Context, d *schema.ResourceData, meta any) d.Set("deployment_circuit_breaker", nil) } <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> ff5bf3555b (WIP: Read Handler B/G) if err := d.Set("deployment_configuration", flattenDeploymentConfiguration(ctx, service.DeploymentConfiguration)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_configuration: %s", err) } +<<<<<<< HEAD >>>>>>> 3a4db3db6c (WIP: Enable B/G graceful termination with SIGINT) +======= + +>>>>>>> ff5bf3555b (WIP: Read Handler B/G) } + if err := d.Set("deployment_controller", flattenDeploymentController(service.DeploymentController)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_controller: %s", err) } @@ -2139,15 +2146,7 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa output := outputRaw.(*awstypes.Service) if *primaryTaskSet == nil { - tflog.Info(ctx, "UPDATING_PTS", map[string]interface{}{ - "before": fmt.Sprintf("%p", *primaryTaskSet), - }) *primaryTaskSet = findPrimaryTaskSet(output.Deployments) - tflog.Info(ctx, "UPDATED_PTS", map[string]interface{}{ - "after": fmt.Sprintf("%p", *primaryTaskSet), - "deployment_count": len(output.Deployments), - "deployments": output.Deployments, - }) if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() @@ -2161,7 +2160,6 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa // For new deployments with ECS deployment controller, check the deployment status if isNewECSDeployment { - tflog.Info(ctx, "ISNEWECSDEPLOYMENT", map[string]interface{}{}) if primaryDeploymentArn == nil { serviceArn := aws.ToString(output.ServiceArn) @@ -2183,13 +2181,6 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa } // For other deployment controllers or in-place updates, check based on desired count - tflog.Info(ctx, "STABILITY_CHECK", map[string]interface{}{ - "deployment_count": len(output.Deployments), - "desired_count": output.DesiredCount, - "running_count": output.RunningCount, - "primary_task_set": *primaryTaskSet, - "is_new_ecs_deployment": isNewECSDeployment, - }) if n, dc, rc := len(output.Deployments), output.DesiredCount, output.RunningCount; n == 1 && dc == rc { serviceStatus = serviceStatusStable } else { @@ -2254,10 +2245,6 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } deployment := output.ServiceDeployments[0] - tflog.Info(ctx, "DEPLOYMENT_STATUS_CHECK", map[string]interface{}{ - "status": deployment.Status, - "deployment": deployment, - }) switch deployment.Status { case awstypes.ServiceDeploymentStatusSuccessful: @@ -2278,37 +2265,22 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet **awstypes.Deployment, wg *sync.WaitGroup, operationTime time.Time) { - tflog.Info(ctx, "ENTERED WAIT FOR CANCEL", map[string]interface{}{}) defer wg.Done() select { case <-ctx.Done(): - tflog.Info(ctx, "CANCELLATION TRIGGERED", map[string]interface{}{"PTS: ": *primaryTaskSet}) - - if *primaryTaskSet != nil { - fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment in progress (RolloutState: %s). Initiating rollback...\n", - string((*primaryTaskSet).RolloutState)) - } else { - fmt.Fprintf(os.Stderr, "[INFO] Detected cancellation, initiating rollback for deployment\n") - } - + log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") newContext := context.Background() err := rollbackBlueGreenDeployment(newContext, conn, clusterName, serviceName, *primaryTaskSet, operationTime) if err != nil { - // Check if this is actually a successful rollback - if strings.Contains(err.Error(), "rolled back by user") || strings.Contains(err.Error(), "ROLLBACK_SUCCESSFUL") { - fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment cancelled and rolled back successfully.\n") - } else { - fmt.Fprintf(os.Stderr, "[ERROR] Failed to rollback deployment: %s\n", err) - } + log.Printf("[ERROR] Failed to rollback deployment: %s", err) } else { - fmt.Fprintf(os.Stderr, "[INFO] Blue/green deployment cancelled and rolled back successfully.\n") + log.Printf("[INFO] Blue/green deployment cancelled and rolled back successfully.") } } } func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet *awstypes.Deployment, operationTime time.Time) error { if primaryTaskSet == nil { - tflog.Info(ctx, "DESCRIBESERVICES IN ROLLBACK", map[string]interface{}{}) service, err := conn.DescribeServices(ctx, &ecs.DescribeServicesInput{ Cluster: aws.String(clusterName), Services: []string{serviceName}, @@ -2337,8 +2309,7 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN return fmt.Errorf("no PRIMARY deployment found for service %s", serviceName) } - tflog.Info(ctx, "PRIMARY DEPLOYMENT FOR ROLLBACK", map[string]interface{}{"PDARN": serviceDeploymentARN}) - fmt.Fprintf(os.Stderr, "[INFO] Rolling back blue/green deployment. This may take a few minutes...\n") + log.Printf("[INFO] Rolling back blue/green deployment. This may take a few minutes...") input := &ecs.StopServiceDeploymentInput{ ServiceDeploymentArn: serviceDeploymentARN, @@ -2350,16 +2321,13 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN return err } - tflog.Info(ctx, "STOP TRIGGERED", map[string]interface{}{}) err = waitForDeploymentTerminalStatus(ctx, conn, *serviceDeploymentARN) - // Handle successful rollback cases - if err != nil && (strings.Contains(err.Error(), "rolled back by user") || - strings.Contains(err.Error(), "ROLLBACK_SUCCESSFUL")) { - return nil // Treat successful rollback as success, not error + if err != nil { + return err } - return err + return nil } func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serviceDeploymentARN string) error { @@ -2370,8 +2338,6 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serv Refresh: func() (interface{}, string, error) { status, err := findDeploymentStatus(ctx, conn, serviceDeploymentARN) - tflog.Info(ctx, "WAIT STATUS", map[string]interface{}{"status": status}) - return nil, status, err }, Timeout: 1 * time.Hour, // Maximum time before SIGKILL @@ -2384,23 +2350,15 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serv // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { - tflog.Info(ctx, "SIGINT CANCELLATION VALUE", map[string]interface{}{ - "SIGINT_CANCELLATION_VALUE": sigintCancellation, - }) - wg := &sync.WaitGroup{} - var primaryTaskSet **awstypes.Deployment = new(*awstypes.Deployment) - tflog.Info(ctx, "INIT_PTS", map[string]interface{}{ - "primaryTaskSet_ptr": fmt.Sprintf("%p", primaryTaskSet), - "primaryTaskSet_val": fmt.Sprintf("%p", *primaryTaskSet), - }) - + wg := &sync.WaitGroup{} + var cancelFunc context.CancelFunc if sigintCancellation { var cancelCtx context.Context cancelCtx, cancelFunc = context.WithCancel(ctx) wg.Add(1) - tflog.Info(ctx, "GO ROUTINE STARTING", map[string]interface{}{}) + go waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryTaskSet, wg, operationTime) } @@ -2414,7 +2372,6 @@ func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clust outputRaw, err := stateConf.WaitForStateContext(ctx) if sigintCancellation { - // Signal the goroutine to complete by canceling its context cancelFunc() wg.Wait() } @@ -2611,6 +2568,64 @@ func flattenDeploymentCircuitBreaker(apiObject *awstypes.DeploymentCircuitBreake return tfMap } +func flattenDeploymentConfiguration(ctx context.Context, apiObject *awstypes.DeploymentConfiguration) []any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.Strategy; v != "" && v != awstypes.DeploymentStrategy("") { + tfMap["strategy"] = string(v) + } + + if v := apiObject.BakeTimeInMinutes; v != nil { + tfMap["bake_time_in_minutes"] = strconv.Itoa(int(*v)) + } + + if v := apiObject.LifecycleHooks; len(v) > 0 { + tfMap["lifecycle_hook"] = flattenLifecycleHooks(v) + } + + if len(tfMap) == 0 { + return nil + } + + return []any{tfMap} +} + +func flattenLifecycleHooks(apiObjects []awstypes.DeploymentLifecycleHook) []any { + if len(apiObjects) == 0 { + return nil + } + + tfList := make([]any, 0, len(apiObjects)) + + for _, apiObject := range apiObjects { + tfMap := map[string]any{} + + if v := apiObject.HookTargetArn; v != nil { + tfMap["hook_target_arn"] = aws.ToString(v) + } + + if v := apiObject.RoleArn; v != nil { + tfMap[names.AttrRoleARN] = aws.ToString(v) + } + + if v := apiObject.LifecycleStages; len(v) > 0 { + stages := make([]string, 0, len(v)) + for _, stage := range v { + stages = append(stages, string(stage)) + } + tfMap["lifecycle_stages"] = stages + } + + tfList = append(tfList, tfMap) + } + + return tfList +} + func expandLifecycleHooks(tfList []any) []awstypes.DeploymentLifecycleHook { apiObject := make([]awstypes.DeploymentLifecycleHook, 0, len(tfList)) From 011c9a29ef746bfcefcdaf1bd8658af5ef69508f Mon Sep 17 00:00:00 2001 From: djglaser Date: Tue, 19 Aug 2025 10:59:07 -0400 Subject: [PATCH 0599/2115] Cleanup Git history --- internal/service/ecs/service.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 89011a7149c0..48b4994e0059 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1509,20 +1509,10 @@ func resourceServiceRead(ctx context.Context, d *schema.ResourceData, meta any) } else { d.Set("deployment_circuit_breaker", nil) } -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> ff5bf3555b (WIP: Read Handler B/G) if err := d.Set("deployment_configuration", flattenDeploymentConfiguration(ctx, service.DeploymentConfiguration)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_configuration: %s", err) } -<<<<<<< HEAD ->>>>>>> 3a4db3db6c (WIP: Enable B/G graceful termination with SIGINT) -======= - ->>>>>>> ff5bf3555b (WIP: Read Handler B/G) } if err := d.Set("deployment_controller", flattenDeploymentController(service.DeploymentController)); err != nil { @@ -1810,7 +1800,6 @@ func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "updating ECS Service (%s): %s", d.Id(), err) } @@ -1858,7 +1847,6 @@ func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta any } _, err := conn.UpdateService(ctx, input) - if err != nil { return sdkdiag.AppendErrorf(diags, "draining ECS Service (%s): %s", d.Id(), err) } @@ -1885,7 +1873,6 @@ func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta any return false, err }, ) - if err != nil { return sdkdiag.AppendErrorf(diags, "deleting ECS Service (%s): %s", d.Id(), err) } @@ -1959,7 +1946,6 @@ func retryServiceCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create return false, err }, ) - if err != nil { return nil, err } @@ -1969,7 +1955,6 @@ func retryServiceCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create func findService(ctx context.Context, conn *ecs.Client, input *ecs.DescribeServicesInput) (*awstypes.Service, error) { output, err := findServices(ctx, conn, input) - if err != nil { return nil, err } @@ -2165,7 +2150,6 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa var err error primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, *primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) - if err != nil { return nil, "", err } @@ -2322,7 +2306,6 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN } err = waitForDeploymentTerminalStatus(ctx, conn, *serviceDeploymentARN) - if err != nil { return err } @@ -2332,7 +2315,6 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serviceDeploymentARN string) error { stateConf := &retry.StateChangeConf{ - // NOTE: SHOULD BELOW BE OF THE NON-STANDARD serviceStatusPending (i.e. "tfPENDING") values? Pending: []string{string(awstypes.ServiceDeploymentStatusInProgress), string(awstypes.ServiceDeploymentStatusPending)}, Target: deploymentTerminalStates, Refresh: func() (interface{}, string, error) { From 5265a884bdd6cc1109476fe61930b708005272f4 Mon Sep 17 00:00:00 2001 From: djglaser Date: Tue, 19 Aug 2025 14:06:25 -0400 Subject: [PATCH 0600/2115] r/aws_ecs_service(doc): Add documentation for sigint_cancellation --- website/docs/r/ecs_service.html.markdown | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 4e2cc9a98994..e1431da7128a 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -102,6 +102,23 @@ resource "aws_ecs_service" "example" { } ``` +### Blue/Green Deployment with SIGINT Cancellation + +```terraform +resource "aws_ecs_service" "example" { + name = "example" + cluster = aws_ecs_cluster.example.id + # ... other configurations ... + + deployment_configuration { + strategy = "BLUE_GREEN" + } + + sigint_cancellation = true + wait_for_steady_state = true +} +``` + ### Redeploy Service On Every Apply The key used with `triggers` is arbitrary. @@ -153,6 +170,7 @@ The following arguments are optional: * `scheduling_strategy` - (Optional) Scheduling strategy to use for the service. The valid values are `REPLICA` and `DAEMON`. Defaults to `REPLICA`. Note that [*Tasks using the Fargate launch type or the `CODE_DEPLOY` or `EXTERNAL` deployment controller types don't support the `DAEMON` scheduling strategy*](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html). * `service_connect_configuration` - (Optional) ECS Service Connect configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace. [See below](#service_connect_configuration). * `service_registries` - (Optional) Service discovery registries for the service. The maximum number of `service_registries` blocks is `1`. [See below](#service_registries). +* `sigint_cancellation` - (Optional) Whether to enable graceful termination of Blue/Green deployments using SIGINT signals. When enabled, allows customers to safely cancel an in-progress Blue/Green deployment and automatically trigger a rollback to the previous stable state. Defaults to `false`. Only applicable when using `BLUE_GREEN` deployment strategy. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `task_definition` - (Optional) Family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. Required unless using the `EXTERNAL` deployment controller. If a revision is not specified, the latest `ACTIVE` revision is used. * `triggers` - (Optional) Map of arbitrary keys and values that, when changed, will trigger an in-place update (redeployment). Useful with `plantimestamp()`. See example above. From d1ff6c7af5ba67f0539d24663c247286d1ad8521 Mon Sep 17 00:00:00 2001 From: djglaser Date: Tue, 19 Aug 2025 16:20:31 -0400 Subject: [PATCH 0601/2115] Eliminate additional DescribeServices call in Blue/Green rollback --- internal/service/ecs/service.go | 100 ++++++++++++++------------------ 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 48b4994e0059..68e3bc731e3f 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -9,7 +9,6 @@ import ( "fmt" "log" "math" - "os" "slices" "strconv" "strings" @@ -2114,8 +2113,8 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa } } -func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryTaskSet **awstypes.Deployment, operationTime time.Time) retry.StateRefreshFunc { - var primaryDeploymentArn *string +func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time) retry.StateRefreshFunc { + var primaryTaskSet *awstypes.Deployment var isNewPrimaryDeployment bool return func() (any, string, error) { @@ -2130,11 +2129,11 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa output := outputRaw.(*awstypes.Service) - if *primaryTaskSet == nil { - *primaryTaskSet = findPrimaryTaskSet(output.Deployments) + if primaryTaskSet == nil { + primaryTaskSet = findPrimaryTaskSet(output.Deployments) - if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { - createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() + if primaryTaskSet != nil && primaryTaskSet.CreatedAt != nil { + createdAtUTC := primaryTaskSet.CreatedAt.UTC() isNewPrimaryDeployment = createdAtUTC.After(operationTime) } } @@ -2145,19 +2144,19 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa // For new deployments with ECS deployment controller, check the deployment status if isNewECSDeployment { - if primaryDeploymentArn == nil { + if *primaryDeploymentArn == nil { serviceArn := aws.ToString(output.ServiceArn) var err error - primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, *primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) + *primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) if err != nil { return nil, "", err } - if primaryDeploymentArn == nil { + if *primaryDeploymentArn == nil { return output, serviceStatusPending, nil } } - deploymentStatus, err := findDeploymentStatus(ctx, conn, *primaryDeploymentArn) + deploymentStatus, err := findDeploymentStatus(ctx, conn, **primaryDeploymentArn) if err != nil { return nil, "", err } @@ -2248,55 +2247,33 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } } -func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet **awstypes.Deployment, wg *sync.WaitGroup, operationTime time.Time) { +func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn **string, wg *sync.WaitGroup, operationTime time.Time) { defer wg.Done() - select { - case <-ctx.Done(): - log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") - newContext := context.Background() - err := rollbackBlueGreenDeployment(newContext, conn, clusterName, serviceName, *primaryTaskSet, operationTime) - if err != nil { - log.Printf("[ERROR] Failed to rollback deployment: %s", err) - } else { - log.Printf("[INFO] Blue/green deployment cancelled and rolled back successfully.") - } + <-ctx.Done() + log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") + newContext := context.Background() + err := rollbackBlueGreenDeployment(newContext, conn, clusterName, serviceName, *primaryDeploymentArn, operationTime) + if err != nil { + log.Printf("[ERROR] Failed to rollback deployment: %s", err) + } else { + log.Printf("[INFO] Blue/green deployment cancelled and rolled back successfully.") } } -func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryTaskSet *awstypes.Deployment, operationTime time.Time) error { - if primaryTaskSet == nil { - service, err := conn.DescribeServices(ctx, &ecs.DescribeServicesInput{ - Cluster: aws.String(clusterName), - Services: []string{serviceName}, - }) - if err != nil { - return err - } - if len(service.Services) > 0 { - primaryTaskSet = findPrimaryTaskSet(service.Services[0].Deployments) - } - if primaryTaskSet == nil { - return fmt.Errorf("no PRIMARY deployment found for service %s", serviceName) - } - } - +func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn *string, operationTime time.Time) error { // Check if deployment is already in terminal state, meaning rollback is not needed - if slices.Contains(deploymentTerminalStates, aws.ToString(primaryTaskSet.Status)) { - return nil - } - - serviceDeploymentARN, err := findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceName, clusterName, operationTime) + deploymentStatus, err := findDeploymentStatus(ctx, conn, *primaryDeploymentArn) if err != nil { return err } - if serviceDeploymentARN == nil { - return fmt.Errorf("no PRIMARY deployment found for service %s", serviceName) + if slices.Contains(deploymentTerminalStates, deploymentStatus) { + return nil } log.Printf("[INFO] Rolling back blue/green deployment. This may take a few minutes...") input := &ecs.StopServiceDeploymentInput{ - ServiceDeploymentArn: serviceDeploymentARN, + ServiceDeploymentArn: primaryDeploymentArn, StopType: awstypes.StopServiceDeploymentStopTypeRollback, } @@ -2305,7 +2282,7 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN return err } - err = waitForDeploymentTerminalStatus(ctx, conn, *serviceDeploymentARN) + err = waitForDeploymentTerminalStatus(ctx, conn, *primaryDeploymentArn) if err != nil { return err } @@ -2313,12 +2290,12 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN return nil } -func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serviceDeploymentARN string) error { +func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, primaryDeploymentArn string) error { stateConf := &retry.StateChangeConf{ Pending: []string{string(awstypes.ServiceDeploymentStatusInProgress), string(awstypes.ServiceDeploymentStatusPending)}, Target: deploymentTerminalStates, Refresh: func() (interface{}, string, error) { - status, err := findDeploymentStatus(ctx, conn, serviceDeploymentARN) + status, err := findDeploymentStatus(ctx, conn, primaryDeploymentArn) return nil, status, err }, @@ -2332,22 +2309,31 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, serv // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { - var primaryTaskSet **awstypes.Deployment = new(*awstypes.Deployment) + var primaryDeploymentArn **string = new(*string) wg := &sync.WaitGroup{} - var cancelFunc context.CancelFunc + var cancelCtx context.Context + var goroutineStarted bool + if sigintCancellation { - var cancelCtx context.Context cancelCtx, cancelFunc = context.WithCancel(ctx) - wg.Add(1) - - go waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryTaskSet, wg, operationTime) } stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, - Refresh: statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryTaskSet, operationTime), + Refresh: func() (any, string, error) { + result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryDeploymentArn, operationTime)() + + // Start goroutine once primaryDeploymentArn is available + if sigintCancellation && !goroutineStarted && *primaryDeploymentArn != nil { + wg.Add(1) + go waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryDeploymentArn, wg, operationTime) + goroutineStarted = true + } + + return result, status, err + }, Timeout: timeout, } From 9d27bf8ca9ab5cf8312e3a3796c40f18b619ca70 Mon Sep 17 00:00:00 2001 From: David Glaser Date: Mon, 18 Aug 2025 17:45:39 +0000 Subject: [PATCH 0602/2115] Add acceptance tests for Blue/Green read handler and graceful termination --- internal/service/ecs/service_test.go | 165 +++++++++++++++++- .../ecs/test-fixtures/sigint_helper.go | 56 ++++++ 2 files changed, 212 insertions(+), 9 deletions(-) create mode 100644 internal/service/ecs/test-fixtures/sigint_helper.go diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index ef4cb09011f8..39a2f0f2a803 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -7,6 +7,7 @@ import ( "context" "fmt" "math" + "os/exec" "testing" "time" @@ -42,17 +43,17 @@ func Test_GetRoleNameFromARN(t *testing.T) { {"empty", "", ""}, { names.AttrRole, - "arn:aws:iam::0123456789:role/EcsService", //lintignore:AWSAT005 + "arn:aws:iam::0123456789:role/EcsService", // lintignore:AWSAT005 "EcsService", }, { "role with path", - "arn:aws:iam::0123456789:role/group/EcsService", //lintignore:AWSAT005 + "arn:aws:iam::0123456789:role/group/EcsService", // lintignore:AWSAT005 "/group/EcsService", }, { "role with complex path", - "arn:aws:iam::0123456789:role/group/subgroup/my-role", //lintignore:AWSAT005 + "arn:aws:iam::0123456789:role/group/subgroup/my-role", // lintignore:AWSAT005 "/group/subgroup/my-role", }, } @@ -77,7 +78,7 @@ func TestClustereNameFromARN(t *testing.T) { {"empty", "", ""}, { "cluster", - "arn:aws:ecs:us-west-2:0123456789:cluster/my-cluster", //lintignore:AWSAT003,AWSAT005 + "arn:aws:ecs:us-west-2:0123456789:cluster/my-cluster", // lintignore:AWSAT003,AWSAT005 "my-cluster", }, } @@ -111,17 +112,17 @@ func TestServiceNameFromARN(t *testing.T) { }, { name: "short ARN format", - arn: "arn:aws:ecs:us-west-2:123456789:service/service_name", //lintignore:AWSAT003,AWSAT005 + arn: "arn:aws:ecs:us-west-2:123456789:service/service_name", // lintignore:AWSAT003,AWSAT005 expected: names.AttrServiceName, }, { name: "long ARN format", - arn: "arn:aws:ecs:us-west-2:123456789:service/cluster_name/service_name", //lintignore:AWSAT003,AWSAT005 + arn: "arn:aws:ecs:us-west-2:123456789:service/cluster_name/service_name", // lintignore:AWSAT003,AWSAT005 expected: names.AttrServiceName, }, { name: "ARN with special characters", - arn: "arn:aws:ecs:us-west-2:123456789:service/cluster-name/service-name-123", //lintignore:AWSAT003,AWSAT005 + arn: "arn:aws:ecs:us-west-2:123456789:service/cluster-name/service-name-123", // lintignore:AWSAT003,AWSAT005 expected: "service-name-123", }, } @@ -1044,6 +1045,81 @@ func TestAccECSService_BlueGreenDeployment_basic(t *testing.T) { }) } +func TestAccECSService_BlueGreenDeployment_outOfBandRemoval(t *testing.T) { + ctx := acctest.Context(t) + var service awstypes.Service + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues + resourceName := "aws_ecs_service.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + { + Config: testAccServiceConfig_blueGreenDeployment_basic(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.strategy", "BLUE_GREEN"), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.bake_time_in_minutes", "2"), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.lifecycle_hook.#", "2"), + testAccCheckServiceRemoveBlueGreenDeploymentConfigurations(ctx, &service), + ), + ExpectNonEmptyPlan: true, + }, + { + Config: testAccServiceConfig_blueGreenDeployment_basic(rName, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.strategy", "BLUE_GREEN"), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.bake_time_in_minutes", "2"), + resource.TestCheckResourceAttr(resourceName, "deployment_configuration.0.lifecycle_hook.#", "2"), + ), + }, + }, + }) +} + +func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { + ctx := acctest.Context(t) + var service awstypes.Service + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues + resourceName := "aws_ecs_service.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckServiceDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccServiceConfig_blueGreenDeployment_basic(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + resource.TestCheckResourceAttrPair(resourceName, "task_definition", "aws_ecs_task_definition.test", names.AttrARN), + ), + }, + { + Config: testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName, false), + PreConfig: func() { + go func() { + exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() + }() + }, + ExpectError: regexache.MustCompile("execution halted|context canceled"), + }, + { + RefreshState: true, + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + resource.TestCheckResourceAttrPair(resourceName, "task_definition", "aws_ecs_task_definition.test", names.AttrARN), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func TestAccECSService_BlueGreenDeployment_circuitBreakerRollback(t *testing.T) { ctx := acctest.Context(t) var service awstypes.Service @@ -2662,7 +2738,6 @@ func testAccCheckServiceExists(ctx context.Context, name string, service *awstyp return nil }) - if err != nil { return err } @@ -2690,6 +2765,40 @@ func testAccCheckServiceDisableServiceConnect(ctx context.Context, service *awst } } +func testAccCheckServiceRemoveDeploymentConfiguration(ctx context.Context, service *awstypes.Service) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) + + input := &ecs.UpdateServiceInput{ + Cluster: service.ClusterArn, + Service: service.ServiceName, + DeploymentConfiguration: &awstypes.DeploymentConfiguration{}, + } + + _, err := conn.UpdateService(ctx, input) + return err + } +} + +func testAccCheckServiceRemoveBlueGreenDeploymentConfigurations(ctx context.Context, service *awstypes.Service) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) + + input := &ecs.UpdateServiceInput{ + Cluster: service.ClusterArn, + Service: service.ServiceName, + DeploymentConfiguration: &awstypes.DeploymentConfiguration{ + Strategy: awstypes.DeploymentStrategyRolling, + BakeTimeInMinutes: aws.Int32(0), + LifecycleHooks: []awstypes.DeploymentLifecycleHook{}, + }, + } + + _, err := conn.UpdateService(ctx, input) + return err + } +} + func testAccServiceConfig_basic(rName, clusterName string) string { return fmt.Sprintf(` resource "aws_ecs_cluster" "test" { @@ -3532,10 +3641,47 @@ func testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName string, sho } return acctest.ConfigCompose(testAccServiceConfig_blueGreenDeploymentBase(rName), fmt.Sprintf(` + +resource "aws_ecs_task_definition" "test2" { + family = %[1]q + requires_compatibilities = ["FARGATE"] + network_mode = "awsvpc" + cpu = 256 + memory = 512 + lifecycle { + create_before_destroy = true + } + + container_definitions = jsonencode([ + { + name = "test" + image = "nginx:latest" + cpu = 256 + memory = 512 + essential = true + environment = [ + { + name = "TEST_SUFFIX_2" + value = "test_val_2" + } + ] + portMappings = [ + { + containerPort = 80 + hostPort = 80 + protocol = "tcp" + name = "http" + appProtocol = "http" + } + ] + } + ]) +} + resource "aws_ecs_service" "test" { name = %[1]q cluster = aws_ecs_cluster.main.id - task_definition = aws_ecs_task_definition.test.arn + task_definition = aws_ecs_task_definition.test2.arn desired_count = 1 launch_type = "FARGATE" @@ -3592,6 +3738,7 @@ resource "aws_ecs_service" "test" { } } + sigint_cancellation = true wait_for_steady_state = true depends_on = [ diff --git a/internal/service/ecs/test-fixtures/sigint_helper.go b/internal/service/ecs/test-fixtures/sigint_helper.go new file mode 100644 index 000000000000..e0d7279177f2 --- /dev/null +++ b/internal/service/ecs/test-fixtures/sigint_helper.go @@ -0,0 +1,56 @@ +package main + +import ( + "fmt" + "os" + "os/exec" + "regexp" + "strconv" + "strings" + "syscall" + "time" +) + +func main() { + if len(os.Args) < 2 { + fmt.Println("Usage: go run sigint_helper.go ") + os.Exit(1) + } + + delay, err := strconv.Atoi(os.Args[1]) + if err != nil { + fmt.Printf("Invalid delay: %v\n", err) + os.Exit(1) + } + + time.Sleep(time.Duration(delay) * time.Second) + + // Find terraform process doing apply + cmd := exec.Command("ps", "aux") + output, err := cmd.Output() + if err != nil { + fmt.Printf("Error running ps: %v\n", err) + os.Exit(1) + } + + lines := strings.Split(string(output), "\n") + re := regexp.MustCompile(`/opt/homebrew/bin/terraform apply.*-auto-approve`) + + for _, line := range lines { + if re.MatchString(line) && !strings.Contains(line, "sigint_helper") { + fields := strings.Fields(line) + if len(fields) > 1 { + pid, err := strconv.Atoi(fields[1]) + if err != nil { + continue + } + + fmt.Printf("Sending SIGINT to PID %d: %s\n", pid, line) + syscall.Kill(pid, syscall.SIGINT) + return + } + } + } + + fmt.Println("No matching terraform process found") +} From f8e3b10cf4f628f4b9706c5679bc42d941514f10 Mon Sep 17 00:00:00 2001 From: djglaser Date: Wed, 20 Aug 2025 07:34:29 -0400 Subject: [PATCH 0603/2115] Correct schema for blue/green read handler and sigint_cancellation --- internal/service/ecs/service.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 68e3bc731e3f..1b8e67f8d4c4 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -616,18 +616,20 @@ func resourceService() *schema.Resource { "deployment_configuration": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "strategy": { Type: schema.TypeString, Optional: true, - Default: string(awstypes.DeploymentStrategyRolling), + Computed: true, ValidateDiagFunc: enum.Validate[awstypes.DeploymentStrategy](), }, "bake_time_in_minutes": { Type: nullable.TypeNullableInt, Optional: true, + Computed: true, ValidateFunc: nullable.ValidateTypeStringNullableIntBetween(0, 1440), }, "lifecycle_hook": { @@ -1104,7 +1106,6 @@ func resourceService() *schema.Resource { "sigint_cancellation": { Type: schema.TypeBool, Optional: true, - Default: false, }, "task_definition": { Type: schema.TypeString, @@ -2543,7 +2544,7 @@ func flattenDeploymentConfiguration(ctx context.Context, apiObject *awstypes.Dep tfMap := map[string]any{} - if v := apiObject.Strategy; v != "" && v != awstypes.DeploymentStrategy("") { + if v := apiObject.Strategy; v != "" { tfMap["strategy"] = string(v) } From c3a7afa58ed6b2d102e20f38e307d62b53f2ef19 Mon Sep 17 00:00:00 2001 From: djglaser Date: Wed, 20 Aug 2025 13:30:58 -0400 Subject: [PATCH 0604/2115] Add logging and abstract isNewECSDeployment --- internal/service/ecs/service.go | 76 ++++++++++++++++++++++------ internal/service/ecs/service_test.go | 2 +- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 1b8e67f8d4c4..5a637574e063 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -12,9 +12,10 @@ import ( "slices" "strconv" "strings" - "sync" "time" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/arn" @@ -2117,6 +2118,13 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time) retry.StateRefreshFunc { var primaryTaskSet *awstypes.Deployment var isNewPrimaryDeployment bool + var isNewECSDeployment bool + tflog.Debug(ctx, "statusServiceWaitForStable", map[string]interface{}{ + "primarytaskset": primaryTaskSet, + "isNewECSDeployment": isNewECSDeployment, + "isNewPrimaryDeployment": isNewPrimaryDeployment, + "operationTime": operationTime, + }) return func() (any, string, error) { outputRaw, serviceStatus, err := statusService(ctx, conn, serviceName, clusterNameOrARN)() @@ -2139,17 +2147,41 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa } } - isNewECSDeployment := output.DeploymentController != nil && - output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && - isNewPrimaryDeployment + if !isNewECSDeployment { + isNewECSDeployment = output.DeploymentController != nil && + output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && + isNewPrimaryDeployment + } + + tflog.Debug(ctx, "STABILIZATION FLOW", map[string]interface{}{ + "primarytaskset": primaryTaskSet, + "primaryDeploymentArn": *primaryDeploymentArn, + "isNewECSDeployment": isNewECSDeployment, + "type": output.DeploymentController.Type, + "isNewPrimaryDeployment": isNewPrimaryDeployment, + "operationTime": operationTime, + "createdAt": primaryTaskSet.CreatedAt.UTC(), + }) // For new deployments with ECS deployment controller, check the deployment status if isNewECSDeployment { + tflog.Debug(ctx, "Blue/green deployment detected", map[string]interface{}{ + "primaryDeploymentArn": *primaryDeploymentArn, + "isNewECSDeployment": isNewECSDeployment, + }) + if *primaryDeploymentArn == nil { + tflog.Debug(ctx, "Finding primary deployment ARN") serviceArn := aws.ToString(output.ServiceArn) var err error *primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) + + tflog.Debug(ctx, "Primary deployment ARN result", map[string]interface{}{ + "primaryDeploymentArn": *primaryDeploymentArn, + "error": err, + }) + if err != nil { return nil, "", err } @@ -2157,7 +2189,13 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa return output, serviceStatusPending, nil } } + deploymentStatus, err := findDeploymentStatus(ctx, conn, **primaryDeploymentArn) + tflog.Debug(ctx, "Deployment status check", map[string]interface{}{ + "deploymentStatus": deploymentStatus, + "error": err, + }) + if err != nil { return nil, "", err } @@ -2166,8 +2204,14 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa // For other deployment controllers or in-place updates, check based on desired count if n, dc, rc := len(output.Deployments), output.DesiredCount, output.RunningCount; n == 1 && dc == rc { + tflog.Debug(ctx, "Desired count check stable", map[string]interface{}{ + "output": output, + }) serviceStatus = serviceStatusStable } else { + tflog.Debug(ctx, "Desired count check pending", map[string]interface{}{ + "output": output, + }) serviceStatus = serviceStatusPending } @@ -2248,8 +2292,7 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } } -func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn **string, wg *sync.WaitGroup, operationTime time.Time) { - defer wg.Done() +func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn **string, operationTime time.Time) { <-ctx.Done() log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") newContext := context.Background() @@ -2311,25 +2354,25 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, prim // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { var primaryDeploymentArn **string = new(*string) - wg := &sync.WaitGroup{} var cancelFunc context.CancelFunc var cancelCtx context.Context + var done chan struct{} var goroutineStarted bool - if sigintCancellation { - cancelCtx, cancelFunc = context.WithCancel(ctx) - } - stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, Refresh: func() (any, string, error) { result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryDeploymentArn, operationTime)() - // Start goroutine once primaryDeploymentArn is available + // Create context and start goroutine only when needed if sigintCancellation && !goroutineStarted && *primaryDeploymentArn != nil { - wg.Add(1) - go waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryDeploymentArn, wg, operationTime) + cancelCtx, cancelFunc = context.WithCancel(ctx) + done = make(chan struct{}) + go func() { + defer close(done) + waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryDeploymentArn, operationTime) + }() goroutineStarted = true } @@ -2340,9 +2383,10 @@ func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clust outputRaw, err := stateConf.WaitForStateContext(ctx) - if sigintCancellation { + // Cleanup only if goroutine was started + if goroutineStarted { cancelFunc() - wg.Wait() + <-done } if output, ok := outputRaw.(*awstypes.Service); ok { diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 39a2f0f2a803..4063d60899e8 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1086,7 +1086,7 @@ func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues resourceName := "aws_ecs_service.test" - resource.ParallelTest(t, resource.TestCase{ + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, From 33cd31408b8af20754aca21ca5b8b420ac738875 Mon Sep 17 00:00:00 2001 From: djglaser Date: Wed, 20 Aug 2025 17:14:03 -0400 Subject: [PATCH 0605/2115] Abstract statusServiceWaitForStable refresh member variables --- internal/service/ecs/service.go | 85 +++++++--------------------- internal/service/ecs/service_test.go | 2 +- 2 files changed, 23 insertions(+), 64 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 5a637574e063..48c15bc7e060 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -14,8 +14,6 @@ import ( "strings" "time" - "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/arn" @@ -2115,17 +2113,7 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa } } -func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time) retry.StateRefreshFunc { - var primaryTaskSet *awstypes.Deployment - var isNewPrimaryDeployment bool - var isNewECSDeployment bool - tflog.Debug(ctx, "statusServiceWaitForStable", map[string]interface{}{ - "primarytaskset": primaryTaskSet, - "isNewECSDeployment": isNewECSDeployment, - "isNewPrimaryDeployment": isNewPrimaryDeployment, - "operationTime": operationTime, - }) - +func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time, primaryTaskSet **awstypes.Deployment, isNewPrimaryDeployment *bool, isNewECSDeployment *bool) retry.StateRefreshFunc { return func() (any, string, error) { outputRaw, serviceStatus, err := statusService(ctx, conn, serviceName, clusterNameOrARN)() if err != nil { @@ -2138,50 +2126,28 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa output := outputRaw.(*awstypes.Service) - if primaryTaskSet == nil { - primaryTaskSet = findPrimaryTaskSet(output.Deployments) + if *primaryTaskSet == nil { + *primaryTaskSet = findPrimaryTaskSet(output.Deployments) - if primaryTaskSet != nil && primaryTaskSet.CreatedAt != nil { - createdAtUTC := primaryTaskSet.CreatedAt.UTC() - isNewPrimaryDeployment = createdAtUTC.After(operationTime) + if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { + createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() + *isNewPrimaryDeployment = createdAtUTC.After(operationTime) } } - if !isNewECSDeployment { - isNewECSDeployment = output.DeploymentController != nil && + if !*isNewECSDeployment { + *isNewECSDeployment = output.DeploymentController != nil && output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && - isNewPrimaryDeployment + *isNewPrimaryDeployment } - tflog.Debug(ctx, "STABILIZATION FLOW", map[string]interface{}{ - "primarytaskset": primaryTaskSet, - "primaryDeploymentArn": *primaryDeploymentArn, - "isNewECSDeployment": isNewECSDeployment, - "type": output.DeploymentController.Type, - "isNewPrimaryDeployment": isNewPrimaryDeployment, - "operationTime": operationTime, - "createdAt": primaryTaskSet.CreatedAt.UTC(), - }) - // For new deployments with ECS deployment controller, check the deployment status - if isNewECSDeployment { - tflog.Debug(ctx, "Blue/green deployment detected", map[string]interface{}{ - "primaryDeploymentArn": *primaryDeploymentArn, - "isNewECSDeployment": isNewECSDeployment, - }) - + if *isNewECSDeployment { if *primaryDeploymentArn == nil { - tflog.Debug(ctx, "Finding primary deployment ARN") serviceArn := aws.ToString(output.ServiceArn) var err error - *primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) - - tflog.Debug(ctx, "Primary deployment ARN result", map[string]interface{}{ - "primaryDeploymentArn": *primaryDeploymentArn, - "error": err, - }) - + *primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, *primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) if err != nil { return nil, "", err } @@ -2191,11 +2157,6 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa } deploymentStatus, err := findDeploymentStatus(ctx, conn, **primaryDeploymentArn) - tflog.Debug(ctx, "Deployment status check", map[string]interface{}{ - "deploymentStatus": deploymentStatus, - "error": err, - }) - if err != nil { return nil, "", err } @@ -2204,14 +2165,8 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa // For other deployment controllers or in-place updates, check based on desired count if n, dc, rc := len(output.Deployments), output.DesiredCount, output.RunningCount; n == 1 && dc == rc { - tflog.Debug(ctx, "Desired count check stable", map[string]interface{}{ - "output": output, - }) serviceStatus = serviceStatusStable } else { - tflog.Debug(ctx, "Desired count check pending", map[string]interface{}{ - "output": output, - }) serviceStatus = serviceStatusPending } @@ -2353,17 +2308,22 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, prim // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { - var primaryDeploymentArn **string = new(*string) - var cancelFunc context.CancelFunc - var cancelCtx context.Context - var done chan struct{} - var goroutineStarted bool + var ( + primaryDeploymentArn **string = new(*string) + primaryTaskSet *awstypes.Deployment + isNewPrimaryDeployment bool + isNewECSDeployment bool + cancelFunc context.CancelFunc + cancelCtx context.Context + done chan struct{} + goroutineStarted bool + ) stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, Refresh: func() (any, string, error) { - result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryDeploymentArn, operationTime)() + result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryDeploymentArn, operationTime, &primaryTaskSet, &isNewPrimaryDeployment, &isNewECSDeployment)() // Create context and start goroutine only when needed if sigintCancellation && !goroutineStarted && *primaryDeploymentArn != nil { @@ -2383,7 +2343,6 @@ func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clust outputRaw, err := stateConf.WaitForStateContext(ctx) - // Cleanup only if goroutine was started if goroutineStarted { cancelFunc() <-done diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 4063d60899e8..97353d13e659 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -3643,7 +3643,7 @@ func testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName string, sho return acctest.ConfigCompose(testAccServiceConfig_blueGreenDeploymentBase(rName), fmt.Sprintf(` resource "aws_ecs_task_definition" "test2" { - family = %[1]q + family = "%[1]s-test2" requires_compatibilities = ["FARGATE"] network_mode = "awsvpc" cpu = 256 From 9dfca5088d33483a517cffa47bb04e061632c70f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 07:56:23 -0700 Subject: [PATCH 0606/2115] Allows deletion when in `TAINTED` status --- internal/service/servicecatalog/provisioned_product.go | 4 +++- internal/service/servicecatalog/wait.go | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index d78f97d8edee..fd9943b16999 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -602,7 +602,9 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat input.AcceptLanguage = aws.String(v.(string)) } - if v, ok := d.GetOk("ignore_errors"); ok { + if v, ok := d.Get(names.AttrStatus).(string); ok && v == string(awstypes.ProvisionedProductStatusTainted) { + input.IgnoreErrors = true + } else if v, ok := d.GetOk("ignore_errors"); ok { input.IgnoreErrors = v.(bool) } diff --git a/internal/service/servicecatalog/wait.go b/internal/service/servicecatalog/wait.go index 4fa01d21bdfb..e62f42c5e299 100644 --- a/internal/service/servicecatalog/wait.go +++ b/internal/service/servicecatalog/wait.go @@ -520,7 +520,11 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) error { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.ProvisionedProductStatusAvailable, awstypes.ProvisionedProductStatusUnderChange), + Pending: enum.Slice( + awstypes.ProvisionedProductStatusAvailable, + awstypes.ProvisionedProductStatusTainted, + awstypes.ProvisionedProductStatusUnderChange, + ), Target: []string{}, Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), Timeout: timeout, From 37cac0ac34968f0abee2bd233303b2e291d9bb7a Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Thu, 21 Aug 2025 16:07:01 +0100 Subject: [PATCH 0607/2115] fix(eks): made upgrade policy test work Signed-off-by: Fred Myerscough --- internal/service/eks/cluster_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index 342ad3c8d262..66d37c62a75f 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -39,7 +39,7 @@ const ( clusterVersionUpgradeUpdated = clusterVersion131 clusterVersionUpgradeForceInitial = clusterVersion130 - clusterVersionUpgradeForceUpdated = clusterVersion132 + clusterVersionUpgradeForceUpdated = clusterVersion131 ) func TestAccEKSCluster_basic(t *testing.T) { @@ -1368,11 +1368,11 @@ func TestAccEKSCluster_upgradePolicy(t *testing.T) { CheckDestroy: testAccCheckClusterDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClusterConfig_upgradePolicy(rName, "STANDARD"), + Config: testAccClusterConfig_upgradePolicy(rName, "EXTENDED"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "upgrade_policy.#", "1"), - resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "STANDARD"), + resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "EXTENDED"), ), }, { @@ -1382,11 +1382,11 @@ func TestAccEKSCluster_upgradePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"}, }, { - Config: testAccClusterConfig_upgradePolicy(rName, "EXTENDED"), + Config: testAccClusterConfig_upgradePolicy(rName, "STANDARD"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "upgrade_policy.#", "1"), - resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "EXTENDED"), + resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "STANDARD"), ), }, { From 5e812fcab6314ddc4fc993c2c1e5e809aad34486 Mon Sep 17 00:00:00 2001 From: Fred Myerscough Date: Thu, 21 Aug 2025 17:19:46 +0100 Subject: [PATCH 0608/2115] chore: ran testacc-lint-fix Signed-off-by: Fred Myerscough --- internal/service/eks/node_group_test.go | 54 ++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/internal/service/eks/node_group_test.go b/internal/service/eks/node_group_test.go index 9a3dcf5fcc05..a16bd5d91040 100644 --- a/internal/service/eks/node_group_test.go +++ b/internal/service/eks/node_group_test.go @@ -1299,7 +1299,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1322,7 +1322,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `) @@ -1346,7 +1346,7 @@ resource "aws_eks_node_group" "test" { "aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy", "aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy", "aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly", - "aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy", + "aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy", ] } `, namePrefix)) @@ -1371,7 +1371,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, amiType)) @@ -1396,7 +1396,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, capacityType)) @@ -1421,7 +1421,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, diskSize)) @@ -1447,7 +1447,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1476,7 +1476,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, instanceTypes, rName)) @@ -1512,7 +1512,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1540,7 +1540,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, labelKey1, labelValue1)) @@ -1569,7 +1569,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, labelKey1, labelValue1, labelKey2, labelValue2)) @@ -1728,7 +1728,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1781,7 +1781,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1824,7 +1824,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1867,7 +1867,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1897,7 +1897,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -1930,7 +1930,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, publicKey)) @@ -1964,7 +1964,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, publicKey)) @@ -1988,7 +1988,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, desiredSize, maxSize, minSize)) @@ -2016,7 +2016,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, tagKey1, tagValue1)) @@ -2045,7 +2045,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, tagKey1, tagValue1, tagKey2, tagValue2)) @@ -2075,7 +2075,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, taintKey1, taintValue1, taintEffect1)) @@ -2111,7 +2111,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName, taintKey1, taintValue1, taintEffect1, taintKey2, taintValue2, taintEffect2)) @@ -2139,7 +2139,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2167,7 +2167,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2195,7 +2195,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) @@ -2220,7 +2220,7 @@ resource "aws_eks_node_group" "test" { aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodePolicy, aws_iam_role_policy_attachment.node-AmazonEKS_CNI_Policy, aws_iam_role_policy_attachment.node-AmazonEC2ContainerRegistryReadOnly, - aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, + aws_iam_role_policy_attachment.node-AmazonEKSWorkerNodeMinimalPolicy, ] } `, rName)) From 366d013699a1656d89f3160879779556d7e06582 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 12:31:43 -0400 Subject: [PATCH 0609/2115] r/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X` as valid values for `worker_type`. --- .changelog/#####.txt | 3 ++ internal/service/glue/job.go | 15 +++++--- internal/service/glue/job_test.go | 51 +++++++++++++++++++++++---- website/docs/r/glue_job.html.markdown | 17 +++------ 4 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..409250fed82c --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X` as valid values for `worker_type` +``` \ No newline at end of file diff --git a/internal/service/glue/job.go b/internal/service/glue/job.go index ed752e85373b..0ab40df19fe6 100644 --- a/internal/service/glue/job.go +++ b/internal/service/glue/job.go @@ -21,6 +21,7 @@ import ( "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" + tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -235,11 +236,11 @@ func resourceJob() *schema.Resource { Optional: true, }, "worker_type": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ConflictsWith: []string{names.AttrMaxCapacity}, - ValidateDiagFunc: enum.Validate[awstypes.WorkerType](), + Type: schema.TypeString, + Optional: true, + Computed: true, + ConflictsWith: []string{names.AttrMaxCapacity}, + ValidateFunc: validation.StringInSlice(workerType_Values(), false), }, }, } @@ -687,3 +688,7 @@ func flattenSourceControlDetails(sourceControlDetails *awstypes.SourceControlDet return []map[string]any{m} } + +func workerType_Values() []string { + return tfslices.AppendUnique(enum.Values[awstypes.WorkerType](), "G.12X", "G.16X", "R.1X", "R.2X", "R.4X", "R.8X") +} diff --git a/internal/service/glue/job_test.go b/internal/service/glue/job_test.go index 34f3a158f2ef..f7572158679b 100644 --- a/internal/service/glue/job_test.go +++ b/internal/service/glue/job_test.go @@ -12,7 +12,11 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/glue/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfglue "github.com/hashicorp/terraform-provider-aws/internal/service/glue" @@ -702,36 +706,71 @@ func TestAccGlueJob_workerType(t *testing.T) { Config: testAccJobConfig_workerType(rName, "Standard"), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - resource.TestCheckResourceAttr(resourceName, "worker_type", "Standard"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_type"), knownvalue.StringExact("Standard")), + }, }, { Config: testAccJobConfig_workerType(rName, "G.1X"), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - resource.TestCheckResourceAttr(resourceName, "worker_type", "G.1X"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_type"), knownvalue.StringExact("G.1X")), + }, }, { Config: testAccJobConfig_workerType(rName, "G.2X"), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - resource.TestCheckResourceAttr(resourceName, "worker_type", "G.2X"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_type"), knownvalue.StringExact("G.2X")), + }, }, { Config: testAccJobConfig_workerType(rName, "G.4X"), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - resource.TestCheckResourceAttr(resourceName, "worker_type", "G.4X"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_type"), knownvalue.StringExact("G.4X")), + }, }, { - Config: testAccJobConfig_workerType(rName, "G.8X"), + Config: testAccJobConfig_workerType(rName, "R.1X"), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - resource.TestCheckResourceAttr(resourceName, "worker_type", "G.8X"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_type"), knownvalue.StringExact("R.1X")), + }, }, { ResourceName: resourceName, diff --git a/website/docs/r/glue_job.html.markdown b/website/docs/r/glue_job.html.markdown index 8574bbd4065f..dd65cf9cf575 100644 --- a/website/docs/r/glue_job.html.markdown +++ b/website/docs/r/glue_job.html.markdown @@ -216,36 +216,29 @@ resource "aws_glue_job" "example" { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `command` - (Required) The command of the job. Defined below. * `connections` - (Optional) The list of connections used for this job. * `default_arguments` - (Optional) The map of default arguments for this job. You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes. For information about how to specify and consume your own Job arguments, see the [Calling AWS Glue APIs in Python](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html) topic in the developer guide. For information about the key-value pairs that AWS Glue consumes to set up your job, see the [Special Parameters Used by AWS Glue](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-glue-arguments.html) topic in the developer guide. -* `non_overridable_arguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `description` - (Optional) Description of the job. +* `execution_class` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `execution_property` - (Optional) Execution property of the job. Defined below. * `glue_version` - (Optional) The version of glue to use, for example "1.0". Ray jobs should set this to 4.0 or greater. For information about available versions, see the [AWS Glue Release Notes](https://docs.aws.amazon.com/glue/latest/dg/release-notes.html). * `job_mode` - (Optional) Describes how a job was created. Valid values are `SCRIPT`, `NOTEBOOK` and `VISUAL`. * `job_run_queuing_enabled` - (Optional) Specifies whether job run queuing is enabled for the job runs for this job. A value of true means job run queuing is enabled for the job runs. If false or not populated, the job runs will not be considered for queueing. -* `execution_class` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `maintenance_window` - (Optional) Specifies the day of the week and hour for the maintenance window for streaming jobs. * `max_capacity` - (Optional) The maximum number of AWS Glue data processing units (DPUs) that can be allocated when this job runs. `Required` when `pythonshell` is set, accept either `0.0625` or `1.0`. Use `number_of_workers` and `worker_type` arguments instead with `glue_version` `2.0` and above. * `max_retries` - (Optional) The maximum number of times to retry this job if it fails. * `name` - (Required) The name you assign to this job. It must be unique in your account. +* `non_overridable_arguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `notification_property` - (Optional) Notification property of the job. Defined below. +* `number_of_workers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `role_arn` - (Required) The ARN of the IAM role associated with this job. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) The job timeout in minutes. The default is 2880 minutes (48 hours) for `glueetl` and `pythonshell` jobs, and null (unlimited) for `gluestreaming` jobs. * `security_configuration` - (Optional) The name of the Security Configuration to be associated with the job. * `source_control_details` - (Optional) The details for a source control configuration for a job, allowing synchronization of job artifacts to or from a remote repository. Defined below. -* `worker_type` - (Optional) The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or G.025X for Spark jobs. Accepts the value Z.2X for Ray jobs. - * For the Standard worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker. - * For the G.1X worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.2X worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.4X worker type, each worker maps to 4 DPU (16 vCPUs, 64 GB of memory) with 256GB disk (approximately 235GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.8X worker type, each worker maps to 8 DPU (32 vCPUs, 128 GB of memory) with 512GB disk (approximately 487GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.025X worker type, each worker maps to 0.25 DPU (2 vCPU, 4GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for low volume streaming jobs. Only available for Glue version 3.0. - * For the Z.2X worker type, each worker maps to 2 M-DPU (8vCPU, 64 GB of m emory, 128 GB disk), and provides up to 8 Ray workers based on the autoscaler. -* `number_of_workers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `worker_type` - (Optional) The type of predefined worker that is allocated when a job runs. Valid values: `Standard`, `G.1X`, `G.2X`, `G.025X`, `G.4X`, `G.8X`, `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X`, `Z.2X` (Ray jobs). See the [AWS documentation](https://docs.aws.amazon.com/glue/latest/dg/worker-types.html) for details. ### command Argument Reference From cdcd24a7a07b8fb8a9e2a5d8d565db5e4f9055ef Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 21 Aug 2025 13:03:44 -0400 Subject: [PATCH 0610/2115] r/aws_lambda_permission(test): scope down invoke function url permissions (#43975) Previously the `_FunctionURLs` acceptance test configurations granted permissions to a wildcard (`*`) principal. The permissions have been scoped down to an individual IAM role for least privileged access instead. ```console % make testacc PKG=lambda TESTS=TestAccLambdaPermission_FunctionURLs make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/lambda/... -v -count 1 -parallel 20 -run='TestAccLambdaPermission_FunctionURLs' -timeout 360m -vet=off 2025/08/20 19:57:29 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/20 19:57:29 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccLambdaPermission_FunctionURLs_none (30.39s) --- PASS: TestAccLambdaPermission_FunctionURLs_iam (36.38s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/lambda 43.043s ``` --- internal/service/lambda/permission_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/service/lambda/permission_test.go b/internal/service/lambda/permission_test.go index 3d49807d6847..e94af32e00d1 100644 --- a/internal/service/lambda/permission_test.go +++ b/internal/service/lambda/permission_test.go @@ -644,6 +644,7 @@ func TestAccLambdaPermission_FunctionURLs_iam(t *testing.T) { resourceName := "aws_lambda_permission.test" functionResourceName := "aws_lambda_function.test" + roleResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -656,7 +657,7 @@ func TestAccLambdaPermission_FunctionURLs_iam(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckPermissionExists(ctx, resourceName, &statement), resource.TestCheckResourceAttr(resourceName, names.AttrAction, "lambda:InvokeFunctionUrl"), - resource.TestCheckResourceAttr(resourceName, names.AttrPrincipal, "*"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrPrincipal, roleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "statement_id", "AllowExecutionWithIAM"), resource.TestCheckResourceAttr(resourceName, "qualifier", ""), resource.TestCheckResourceAttrPair(resourceName, "function_name", functionResourceName, "function_name"), @@ -680,6 +681,7 @@ func TestAccLambdaPermission_FunctionURLs_none(t *testing.T) { resourceName := "aws_lambda_permission.test" functionResourceName := "aws_lambda_function.test" + roleResourceName := "aws_iam_role.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, @@ -692,7 +694,7 @@ func TestAccLambdaPermission_FunctionURLs_none(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckPermissionExists(ctx, resourceName, &statement), resource.TestCheckResourceAttr(resourceName, names.AttrAction, "lambda:InvokeFunctionUrl"), - resource.TestCheckResourceAttr(resourceName, names.AttrPrincipal, "*"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrPrincipal, roleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "statement_id", "AllowExecutionFromWithoutAuth"), resource.TestCheckResourceAttr(resourceName, "qualifier", ""), resource.TestCheckResourceAttrPair(resourceName, "function_name", functionResourceName, "function_name"), @@ -1060,7 +1062,7 @@ resource "aws_lambda_permission" "test" { statement_id = "AllowExecutionWithIAM" action = "lambda:InvokeFunctionUrl" function_name = aws_lambda_function.test.function_name - principal = "*" + principal = aws_iam_role.test.arn function_url_auth_type = "AWS_IAM" } `) @@ -1072,7 +1074,7 @@ resource "aws_lambda_permission" "test" { statement_id = "AllowExecutionFromWithoutAuth" action = "lambda:InvokeFunctionUrl" function_name = aws_lambda_function.test.function_name - principal = "*" + principal = aws_iam_role.test.arn function_url_auth_type = "NONE" } `) From 6e0ca78216ec7efd70146a6adf415e4f5dd9c430 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 13:04:20 -0400 Subject: [PATCH 0611/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 43988.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 43988.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/43988.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/43988.txt From 3b30f263ed71554560d2b13dc279a04c0967b4c8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 21 Aug 2025 13:04:35 -0400 Subject: [PATCH 0612/2115] Add parameterized resource identity to `aws_cloudwatch_event_target` (#43984) Adds resource identity support. ```console % make testacc PKG=events TESTS=TestAccEventsTarget_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/events/... -v -count 1 -parallel 20 -run='TestAccEventsTarget_' -timeout 360m -vet=off 2025/08/21 09:33:15 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/21 09:33:15 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccEventsTarget_disappears (26.34s) === CONT TestAccEventsTarget_Input_transformer --- PASS: TestAccEventsTarget_ssmDocument (31.95s) === CONT TestAccEventsTarget_sqs --- PASS: TestAccEventsTarget_http (32.32s) === CONT TestAccEventsTarget_Identity_ExistingResource --- PASS: TestAccEventsTarget_sageMakerPipeline (32.90s) === CONT TestAccEventsTarget_basic --- PASS: TestAccEventsTarget_appsync (33.63s) === CONT TestAccEventsTarget_full --- PASS: TestAccEventsTarget_Identity_Basic (57.14s) === CONT TestAccEventsTarget_Identity_RegionOverride --- PASS: TestAccEventsTarget_ecsFull (57.89s) === CONT TestAccEventsTarget_eventBusARN --- PASS: TestAccEventsTarget_http_params (62.84s) === CONT TestAccEventsTarget_generatedTargetID --- PASS: TestAccEventsTarget_inputTransformerJSONString (64.51s) === CONT TestAccEventsTarget_eventBusName --- PASS: TestAccEventsTarget_ecsCapacityProvider (76.12s) --- PASS: TestAccEventsTarget_kinesis (80.11s) --- PASS: TestAccEventsTarget_RetryPolicy_deadLetter (83.18s) --- PASS: TestAccEventsTarget_Input_transformer (60.93s) --- PASS: TestAccEventsTarget_eventBusARN (48.03s) --- PASS: TestAccEventsTarget_sqs (75.19s) --- PASS: TestAccEventsTarget_generatedTargetID (48.65s) --- PASS: TestAccEventsTarget_full (78.15s) --- PASS: TestAccEventsTarget_eventBusName (47.61s) --- PASS: TestAccEventsTarget_basic (82.47s) --- PASS: TestAccEventsTarget_Identity_RegionOverride (62.13s) --- PASS: TestAccEventsTarget_Identity_ExistingResource (88.45s) --- PASS: TestAccEventsTarget_ecsWithoutLaunchType (121.69s) --- PASS: TestAccEventsTarget_ecsWithBlankLaunchType (124.09s) --- PASS: TestAccEventsTarget_batch (178.80s) --- PASS: TestAccEventsTarget_redshift (284.89s) --- PASS: TestAccEventsTarget_ecsNoPropagateTags (339.74s) --- PASS: TestAccEventsTarget_ecs (350.33s) --- PASS: TestAccEventsTarget_ecsWithBlankTaskCount (371.21s) === NAME TestAccEventsTarget_ecsPlacementStrategy target_test.go:899: Error running post-test destroy, there may be dangling resources: exit status 1 Error: waiting for ECS Capacity Provider (arn:aws:ecs:us-west-2:727561393803:capacity-provider/tf-acc-test-6131568012180198971) delete: timeout while waiting for resource to be gone (last state: 'ACTIVE', timeout: 20m0s) --- FAIL: TestAccEventsTarget_ecsPlacementStrategy (1272.28s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/events 1279.061s ``` Test failure is during post-test cleanup and unrelated to these changes. --- .changelog/43984.txt | 3 + .../service/events/service_package_gen.go | 9 + internal/service/events/target.go | 143 +++++---- .../events/target_identity_gen_test.go | 273 ++++++++++++++++++ .../events/testdata/Target/basic/main_gen.tf | 23 ++ .../testdata/Target/basic_v6.9.0/main_gen.tf | 33 +++ .../Target/region_override/main_gen.tf | 35 +++ .../events/testdata/tmpl/target_basic.gtpl | 18 ++ 8 files changed, 474 insertions(+), 63 deletions(-) create mode 100644 .changelog/43984.txt create mode 100644 internal/service/events/target_identity_gen_test.go create mode 100644 internal/service/events/testdata/Target/basic/main_gen.tf create mode 100644 internal/service/events/testdata/Target/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/events/testdata/Target/region_override/main_gen.tf create mode 100644 internal/service/events/testdata/tmpl/target_basic.gtpl diff --git a/.changelog/43984.txt b/.changelog/43984.txt new file mode 100644 index 000000000000..42e51ab16364 --- /dev/null +++ b/.changelog/43984.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_cloudwatch_event_target: Add resource identity support +``` diff --git a/internal/service/events/service_package_gen.go b/internal/service/events/service_package_gen.go index ada7dc3fa050..2fb4903f9674 100644 --- a/internal/service/events/service_package_gen.go +++ b/internal/service/events/service_package_gen.go @@ -121,6 +121,15 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_cloudwatch_event_target", Name: "Target", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("event_bus_name", true), + inttypes.StringIdentityAttribute(names.AttrRule, true), + inttypes.StringIdentityAttribute("target_id", true), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: targetImportID{}, + }, }, } } diff --git a/internal/service/events/target.go b/internal/service/events/target.go index 8472c1185ce8..5fcb1977eaf3 100644 --- a/internal/service/events/target.go +++ b/internal/service/events/target.go @@ -29,11 +29,19 @@ import ( tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) // @SDKResource("aws_cloudwatch_event_target", name="Target") +// @IdentityAttribute("event_bus_name") +// @IdentityAttribute("rule") +// @IdentityAttribute("target_id") +// @ImportIDHandler("targetImportID") +// @Testing(preIdentityVersion="v6.9.0") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/eventbridge/types;types.Target") +// @Testing(importStateIdFunc="testAccTargetImportStateIdFunc") func resourceTarget() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceTargetCreate, @@ -41,23 +49,6 @@ func resourceTarget() *schema.Resource { UpdateWithoutTimeout: resourceTargetUpdate, DeleteWithoutTimeout: resourceTargetDelete, - Importer: &schema.ResourceImporter{ - StateContext: func(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - busName, ruleName, targetID, err := targetParseImportID(d.Id()) - if err != nil { - return []*schema.ResourceData{}, err - } - - id := targetCreateResourceID(busName, ruleName, targetID) - d.SetId(id) - d.Set("target_id", targetID) - d.Set(names.AttrRule, ruleName) - d.Set("event_bus_name", busName) - - return []*schema.ResourceData{d}, nil - }, - }, - SchemaVersion: 1, StateUpgraders: []schema.StateUpgrader{ { @@ -755,52 +746,6 @@ func findTargets(ctx context.Context, conn *eventbridge.Client, input *eventbrid return output, nil } -// Terraform resource IDs for Targets are not parseable as the separator used ("-") is also a valid character in both the rule name and the target ID. -const ( - targetResourceIDSeparator = "-" - targetImportIDSeparator = "/" -) - -func targetCreateResourceID(eventBusName, ruleName, targetID string) string { - var parts []string - - if eventBusName == "" || eventBusName == DefaultEventBusName { - parts = []string{ruleName, targetID} - } else { - parts = []string{eventBusName, ruleName, targetID} - } - - id := strings.Join(parts, targetResourceIDSeparator) - - return id -} - -func targetParseImportID(id string) (string, string, string, error) { - parts := strings.Split(id, targetImportIDSeparator) - - if len(parts) == 2 && parts[0] != "" && parts[1] != "" { - return DefaultEventBusName, parts[0], parts[1], nil - } - if len(parts) == 3 && parts[0] != "" && parts[1] != "" && parts[2] != "" { - return parts[0], parts[1], parts[2], nil - } - if len(parts) > 3 { - iTarget := strings.LastIndex(id, targetImportIDSeparator) - targetID := id[iTarget+1:] - iRule := strings.LastIndex(id[:iTarget], targetImportIDSeparator) - eventBusName := id[:iRule] - ruleName := id[iRule+1 : iTarget] - if eventBusARNPattern.MatchString(eventBusName) && ruleName != "" && targetID != "" { - return eventBusName, ruleName, targetID, nil - } - if partnerEventBusPattern.MatchString(eventBusName) && ruleName != "" && targetID != "" { - return eventBusName, ruleName, targetID, nil - } - } - - return "", "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected EVENTBUSNAME%[2]sRULENAME%[2]sTARGETID or RULENAME%[2]sTARGETID", id, targetImportIDSeparator) -} - func putTargetError(apiObject types.PutTargetsResultEntry) error { return errs.APIError(aws.ToString(apiObject.ErrorCode), aws.ToString(apiObject.ErrorMessage)) } @@ -1528,3 +1473,75 @@ func expandAppSyncParameters(tfList []any) *types.AppSyncParameters { return apiObject } + +// Terraform resource IDs for Targets are not parseable as the separator used ("-") is also a valid character in both the rule name and the target ID. +const ( + targetResourceIDSeparator = "-" + targetImportIDSeparator = "/" +) + +func targetCreateResourceID(eventBusName, ruleName, targetID string) string { + var parts []string + + if eventBusName == "" || eventBusName == DefaultEventBusName { + parts = []string{ruleName, targetID} + } else { + parts = []string{eventBusName, ruleName, targetID} + } + + id := strings.Join(parts, targetResourceIDSeparator) + + return id +} + +func targetParseImportID(id string) (string, string, string, error) { + parts := strings.Split(id, targetImportIDSeparator) + + if len(parts) == 2 && parts[0] != "" && parts[1] != "" { + return DefaultEventBusName, parts[0], parts[1], nil + } + if len(parts) == 3 && parts[0] != "" && parts[1] != "" && parts[2] != "" { + return parts[0], parts[1], parts[2], nil + } + if len(parts) > 3 { + iTarget := strings.LastIndex(id, targetImportIDSeparator) + targetID := id[iTarget+1:] + iRule := strings.LastIndex(id[:iTarget], targetImportIDSeparator) + eventBusName := id[:iRule] + ruleName := id[iRule+1 : iTarget] + if eventBusARNPattern.MatchString(eventBusName) && ruleName != "" && targetID != "" { + return eventBusName, ruleName, targetID, nil + } + if partnerEventBusPattern.MatchString(eventBusName) && ruleName != "" && targetID != "" { + return eventBusName, ruleName, targetID, nil + } + } + + return "", "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected EVENTBUSNAME%[2]sRULENAME%[2]sTARGETID or RULENAME%[2]sTARGETID", id, targetImportIDSeparator) +} + +var _ inttypes.SDKv2ImportID = targetImportID{} + +type targetImportID struct{} + +func (targetImportID) Create(d *schema.ResourceData) string { + eventBusName := d.Get("event_bus_name").(string) + rule := d.Get(names.AttrRule).(string) + targetID := d.Get("target_id").(string) + return targetCreateResourceID(eventBusName, rule, targetID) +} + +func (targetImportID) Parse(id string) (string, map[string]string, error) { + eventBusName, rule, targetID, err := targetParseImportID(id) + if err != nil { + return id, nil, err + } + + results := map[string]string{ + "event_bus_name": eventBusName, + names.AttrRule: rule, + "target_id": targetID, + } + + return targetCreateResourceID(eventBusName, rule, targetID), results, nil +} diff --git a/internal/service/events/target_identity_gen_test.go b/internal/service/events/target_identity_gen_test.go new file mode 100644 index 000000000000..271b4466e3d7 --- /dev/null +++ b/internal/service/events/target_identity_gen_test.go @@ -0,0 +1,273 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package events_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/eventbridge/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccEventsTarget_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Target + resourceName := "aws_cloudwatch_event_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EventsServiceID), + CheckDestroy: testAccCheckTargetDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Target/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTargetExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "event_bus_name": knownvalue.NotNull(), + names.AttrRule: knownvalue.NotNull(), + "target_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("event_bus_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrRule)), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("target_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Target/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccTargetImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Target/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccTargetImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("event_bus_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRule), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("target_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Target/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("event_bus_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRule), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("target_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccEventsTarget_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_cloudwatch_event_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EventsServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Target/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "event_bus_name": knownvalue.NotNull(), + names.AttrRule: knownvalue.NotNull(), + "target_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("event_bus_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrRule)), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("target_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Target/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccTargetImportStateIdFunc), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Target/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccTargetImportStateIdFunc), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("event_bus_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRule), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("target_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Target/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("event_bus_name"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRule), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("target_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccEventsTarget_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Target + resourceName := "aws_cloudwatch_event_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EventsServiceID), + CheckDestroy: testAccCheckTargetDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Target/basic_v6.9.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckTargetExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Target/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "event_bus_name": knownvalue.NotNull(), + names.AttrRule: knownvalue.NotNull(), + "target_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("event_bus_name")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrRule)), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("target_id")), + }, + }, + }, + }) +} diff --git a/internal/service/events/testdata/Target/basic/main_gen.tf b/internal/service/events/testdata/Target/basic/main_gen.tf new file mode 100644 index 000000000000..f328680d2328 --- /dev/null +++ b/internal/service/events/testdata/Target/basic/main_gen.tf @@ -0,0 +1,23 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_cloudwatch_event_target" "test" { + rule = aws_cloudwatch_event_rule.test.name + target_id = var.rName + arn = aws_sns_topic.test.arn +} + +resource "aws_cloudwatch_event_rule" "test" { + name = var.rName + schedule_expression = "rate(1 hour)" +} + +resource "aws_sns_topic" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/events/testdata/Target/basic_v6.9.0/main_gen.tf b/internal/service/events/testdata/Target/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..2cb4ddab148d --- /dev/null +++ b/internal/service/events/testdata/Target/basic_v6.9.0/main_gen.tf @@ -0,0 +1,33 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_cloudwatch_event_target" "test" { + rule = aws_cloudwatch_event_rule.test.name + target_id = var.rName + arn = aws_sns_topic.test.arn +} + +resource "aws_cloudwatch_event_rule" "test" { + name = var.rName + schedule_expression = "rate(1 hour)" +} + +resource "aws_sns_topic" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/events/testdata/Target/region_override/main_gen.tf b/internal/service/events/testdata/Target/region_override/main_gen.tf new file mode 100644 index 000000000000..16d81f9191f2 --- /dev/null +++ b/internal/service/events/testdata/Target/region_override/main_gen.tf @@ -0,0 +1,35 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_cloudwatch_event_target" "test" { + region = var.region + + rule = aws_cloudwatch_event_rule.test.name + target_id = var.rName + arn = aws_sns_topic.test.arn +} + +resource "aws_cloudwatch_event_rule" "test" { + region = var.region + + name = var.rName + schedule_expression = "rate(1 hour)" +} + +resource "aws_sns_topic" "test" { + region = var.region + + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/events/testdata/tmpl/target_basic.gtpl b/internal/service/events/testdata/tmpl/target_basic.gtpl new file mode 100644 index 000000000000..7db7378d26b3 --- /dev/null +++ b/internal/service/events/testdata/tmpl/target_basic.gtpl @@ -0,0 +1,18 @@ +resource "aws_cloudwatch_event_target" "test" { +{{- template "region" }} + rule = aws_cloudwatch_event_rule.test.name + target_id = var.rName + arn = aws_sns_topic.test.arn +} + +resource "aws_cloudwatch_event_rule" "test" { +{{- template "region" }} + name = var.rName + schedule_expression = "rate(1 hour)" +{{- template "tags" }} +} + +resource "aws_sns_topic" "test" { +{{- template "region" }} + name = var.rName +} From 43c6df51eab44e6a732730763ce29cc691b70d16 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 13:06:06 -0400 Subject: [PATCH 0613/2115] Update .changelog/43988.txt --- .changelog/43988.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/43988.txt b/.changelog/43988.txt index 409250fed82c..2ad4ab4b7171 100644 --- a/.changelog/43988.txt +++ b/.changelog/43988.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X` as valid values for `worker_type` +resource/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, and `R.8X` as valid values for `worker_type` ``` \ No newline at end of file From 241a48e599e607228e53aefbc0bfdfa10b3614f2 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 02:11:25 +0900 Subject: [PATCH 0614/2115] Implement ipv6_allowed_for_dual_stack argument --- internal/service/synthetics/canary.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 0dab5a4d20b6..b4b3913c4aa7 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -243,6 +243,10 @@ func ResourceCanary() *schema.Resource { Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ + "ipv6_allowed_for_dual_stack": { + Type: schema.TypeBool, + Optional: true, + }, names.AttrSecurityGroupIDs: { Type: schema.TypeSet, Elem: &schema.Schema{Type: schema.TypeString}, @@ -746,6 +750,10 @@ func flattenCanaryVPCConfig(canaryVpcOutput *awstypes.VpcConfigOutput) []any { names.AttrVPCID: aws.ToString(canaryVpcOutput.VpcId), } + if canaryVpcOutput.Ipv6AllowedForDualStack != nil { + m["ipv6_allowed_for_dual_stack"] = aws.ToBool(canaryVpcOutput.Ipv6AllowedForDualStack) + } + return []any{m} } @@ -761,6 +769,10 @@ func expandCanaryVPCConfig(l []any) *awstypes.VpcConfigInput { SecurityGroupIds: flex.ExpandStringValueSet(m[names.AttrSecurityGroupIDs].(*schema.Set)), } + if v, ok := m["ipv6_allowed_for_dual_stack"]; ok { + codeConfig.Ipv6AllowedForDualStack = aws.Bool(v.(bool)) + } + return codeConfig } From c4e952abbfcd1fede1c0ab73e1aad81e7f8b22f7 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 02:11:58 +0900 Subject: [PATCH 0615/2115] Add an acceptance test for ipv6_allowed_for_dual_stack --- internal/service/synthetics/canary_test.go | 129 +++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index f01972f94439..72e00c33c1ad 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -506,6 +506,7 @@ func TestAccSyntheticsCanary_vpc(t *testing.T) { testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), ), }, @@ -521,6 +522,7 @@ func TestAccSyntheticsCanary_vpc(t *testing.T) { testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), ), }, @@ -530,6 +532,7 @@ func TestAccSyntheticsCanary_vpc(t *testing.T) { testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "1"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), ), }, @@ -537,6 +540,72 @@ func TestAccSyntheticsCanary_vpc(t *testing.T) { }) } +func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var conf awstypes.Canary + rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(8)) + resourceName := "aws_synthetics_canary.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SyntheticsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCanaryDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, true), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "2"), + resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtTrue), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"zip_file", "start_canary", "delete_lambda"}, + }, + { + Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, false), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "2"), + resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtFalse), + ), + }, + { + Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, true), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "2"), + resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtTrue), + ), + }, + { + Config: testAccCanaryConfig_vpcIpv6AllowedForDualStackUpdated(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.security_group_ids.#", "2"), + resource.TestCheckResourceAttrPair(resourceName, "vpc_config.0.vpc_id", "aws_vpc.test", names.AttrID), + resource.TestCheckResourceAttr(resourceName, "vpc_config.0.ipv6_allowed_for_dual_stack", acctest.CtFalse), + ), + }, + }, + }) +} + func TestAccSyntheticsCanary_tags(t *testing.T) { ctx := acctest.Context(t) var conf awstypes.Canary @@ -1263,6 +1332,66 @@ resource "aws_synthetics_canary" "test" { `, rName)) } +func testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName string, ipv6 bool) string { + return acctest.ConfigCompose( + testAccCanaryConfig_base(rName), + acctest.ConfigVPCWithSubnetsIPv6(rName, 2), + testAccCanarySecurityGroupBaseConfig(rName, 2), + fmt.Sprintf(` +resource "aws_synthetics_canary" "test" { + name = %[1]q + artifact_s3_location = "s3://${aws_s3_bucket.test.bucket}/" + execution_role_arn = aws_iam_role.test.arn + handler = "exports.handler" + zip_file = "test-fixtures/lambdatest.zip" + runtime_version = data.aws_synthetics_runtime_version.test.version_name + delete_lambda = true + + schedule { + expression = "rate(0 minute)" + } + + vpc_config { + subnet_ids = aws_subnet.test[*].id + security_group_ids = aws_security_group.test[*].id + + ipv6_allowed_for_dual_stack = %[2]t + } + + depends_on = [aws_iam_role_policy_attachment.test] +} +`, rName, ipv6)) +} + +func testAccCanaryConfig_vpcIpv6AllowedForDualStackUpdated(rName string) string { + return acctest.ConfigCompose( + testAccCanaryConfig_base(rName), + acctest.ConfigVPCWithSubnetsIPv6(rName, 2), + testAccCanarySecurityGroupBaseConfig(rName, 2), + fmt.Sprintf(` +resource "aws_synthetics_canary" "test" { + name = %[1]q + artifact_s3_location = "s3://${aws_s3_bucket.test.bucket}/" + execution_role_arn = aws_iam_role.test.arn + handler = "exports.handler" + zip_file = "test-fixtures/lambdatest.zip" + runtime_version = data.aws_synthetics_runtime_version.test.version_name + delete_lambda = true + + schedule { + expression = "rate(0 minute)" + } + + vpc_config { + subnet_ids = aws_subnet.test[*].id + security_group_ids = aws_security_group.test[*].id + } + + depends_on = [aws_iam_role_policy_attachment.test] +} +`, rName)) +} + func testAccCanaryConfig_tags1(rName, tagKey1, tagValue1 string) string { return acctest.ConfigCompose( testAccCanaryConfig_base(rName), From 552cb00f41669dc6f11691e322d51b3f9f6c68d4 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 02:12:47 +0900 Subject: [PATCH 0616/2115] Update the documentation to include ipv6_allowed_for_dual_stack argument --- website/docs/r/synthetics_canary.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/synthetics_canary.html.markdown b/website/docs/r/synthetics_canary.html.markdown index de81abbd18cf..42c3da1d5f90 100644 --- a/website/docs/r/synthetics_canary.html.markdown +++ b/website/docs/r/synthetics_canary.html.markdown @@ -83,6 +83,7 @@ If this canary tests an endpoint in a VPC, this structure contains information a * `subnet_ids` - (Required) IDs of the subnets where this canary is to run. * `security_group_ids` - (Required) IDs of the security groups for this canary. +* `ipv6_allowed_for_dual_stack` - (Optional) If `true`, allow outbound IPv6 traffic on VPC canaries that are connected to dual-stack subnets. The default is `false`. ## Attribute Reference From 5a89601f7f4920a5e4640a919f59b3e3a5be9b81 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 02:22:00 +0900 Subject: [PATCH 0617/2115] add changelog --- .changelog/43989.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43989.txt diff --git a/.changelog/43989.txt b/.changelog/43989.txt new file mode 100644 index 000000000000..06ec6652bcc9 --- /dev/null +++ b/.changelog/43989.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_synthetics_canary: Add `vpc_config.ipv6_allowed_for_dual_stack` argument +``` From 75ba85081b5c177d57aa5fa9e29b7d68bb5baa21 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 10:27:53 -0700 Subject: [PATCH 0618/2115] Retries creating `aws_servicecatalog_constraint` while waiting for IAM permissions to propagate --- internal/service/servicecatalog/constraint.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/servicecatalog/constraint.go b/internal/service/servicecatalog/constraint.go index 41c08c672867..ece51a3d4549 100644 --- a/internal/service/servicecatalog/constraint.go +++ b/internal/service/servicecatalog/constraint.go @@ -117,6 +117,10 @@ func resourceConstraintCreate(ctx context.Context, d *schema.ResourceData, meta return retry.RetryableError(err) } + if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "Access denied while assuming the role") { + return retry.RetryableError(err) + } + if errs.IsA[*awstypes.ResourceNotFoundException](err) { return retry.RetryableError(err) } From 320ca5233731cacfe4bc5a090b0ccbfd9cd810d1 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 21 Aug 2025 17:41:57 +0000 Subject: [PATCH 0619/2115] Update CHANGELOG.md for #43988 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a4d1ec3c243..e5e536bd1dd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,20 @@ ENHANCEMENTS: * data-source/aws_ecr_repository: Add `image_tag_mutability_exclusion_filter` attribute ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) * data-source/aws_ecr_repository_creation_template: Add `image_tag_mutability_exclusion_filter` attribute ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) +* resource/aws_cloudwatch_event_target: Add resource identity support ([#43984](https://github.com/hashicorp/terraform-provider-aws/issues/43984)) * resource/aws_ecr_repository_creation_template: Add `image_tag_mutability_exclusion_filter` configuration block ([#43886](https://github.com/hashicorp/terraform-provider-aws/issues/43886)) +* resource/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, and `R.8X` as valid values for `worker_type` ([#43988](https://github.com/hashicorp/terraform-provider-aws/issues/43988)) * resource/aws_lambda_permission: Add resource identity support ([#43954](https://github.com/hashicorp/terraform-provider-aws/issues/43954)) * resource/aws_lightsail_static_ip_attachment: Support resource import ([#43874](https://github.com/hashicorp/terraform-provider-aws/issues/43874)) +* resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_logging: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_notification: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_ownership_controls: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_policy: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_public_access_block: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_versioning: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) * resource/aws_secretsmanager_secret: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_policy: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_rotation: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) From 777e23b7aaf035cad294073e87402d8d1c48cc14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 14:49:18 -0400 Subject: [PATCH 0620/2115] Tweak CHANGELOG entry. --- .changelog/42188.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.changelog/42188.txt b/.changelog/42188.txt index 5aeb12ccccad..2632458a81b6 100644 --- a/.changelog/42188.txt +++ b/.changelog/42188.txt @@ -1,11 +1,11 @@ ```release-note:enhancement -resource/aws_network_interface: Add `attachment.network_card_index` argument to support multiple network interfaces, which is supported by some instance types. +resource/aws_network_interface: Add `attachment.network_card_index` argument ``` ```release-note:enhancement -resource/aws_network_interface_attachment: Add `network_card_index` argument to support multiple network interfaces, which is supported by some instance types. +resource/aws_network_interface_attachment: Add `network_card_index` argument ``` ```release-note:enhancement -data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute. +data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute ``` From 7f1badba7dbec14f9667a5939a9218b2e890d57e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 14:59:37 -0400 Subject: [PATCH 0621/2115] Cosmetics. --- docs/acc-test-environment-variables.md | 6 +++--- internal/service/ec2/find.go | 12 +++++++++++- internal/service/ec2/vpc_network_interface.go | 13 ++++++------- .../ec2/vpc_network_interface_attachment.go | 17 ++++++++++------- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/docs/acc-test-environment-variables.md b/docs/acc-test-environment-variables.md index aff2df381b73..f7b999109042 100644 --- a/docs/acc-test-environment-variables.md +++ b/docs/acc-test-environment-variables.md @@ -101,7 +101,7 @@ Environment variables (beyond standard AWS Go SDK ones) used by acceptance testi | `TF_AWS_LICENSE_MANAGER_GRANT_LICENSE_ARN` | ARN for a License Manager license imported into the current account. | | `TF_AWS_LICENSE_MANAGER_GRANT_PRINCIPAL` | ARN of a principal to share the License Manager license with. Either a root user, Organization, or Organizational Unit. | | `TF_AWS_QUICKSIGHT_IDC_GROUP` | Name of the IAM Identity Center Group to be assigned role membership. | -| `TF_TEST_CLOUDFRONT_RETAIN` | Flag to disable but dangle CloudFront Distributions during testing to reduce feedback time (must be manually destroyed afterwards) | -| `TF_TEST_ELASTICACHE_RESERVED_CACHE_NODE` | Flag to enable resource tests for ElastiCache reserved nodes. Set to `1` to run tests | +| `TF_TEST_CLOUDFRONT_RETAIN` | Flag to disable but dangle CloudFront Distributions during testing to reduce feedback time (must be manually destroyed afterwards). | +| `TF_TEST_ELASTICACHE_RESERVED_CACHE_NODE` | Flag to enable resource tests for ElastiCache reserved nodes. Set to `1` to run tests. | | `TRUST_ANCHOR_CERTIFICATE` | Trust anchor certificate for KMS custom key store acceptance tests. | -| `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_CARDS` | Flag to execute tests that enable to attach multiple network interfaces.| +| `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_CARDS` | Flag to execute tests that enable to attach multiple network interfaces. | diff --git a/internal/service/ec2/find.go b/internal/service/ec2/find.go index 4a4a37d6ad5a..8c1b6267bb39 100644 --- a/internal/service/ec2/find.go +++ b/internal/service/ec2/find.go @@ -2294,7 +2294,17 @@ func findNetworkInterfaceByAttachmentID(ctx context.Context, conn *ec2.Client, i }), } - return findNetworkInterface(ctx, conn, &input) + output, err := findNetworkInterface(ctx, conn, &input) + + if err != nil { + return nil, err + } + + if output.Attachment == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output, nil } func findNetworkInterfaceSecurityGroup(ctx context.Context, conn *ec2.Client, networkInterfaceID string, securityGroupID string) (*awstypes.GroupIdentifier, error) { diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index ba6cb20ab9e8..0a91573d0942 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" + sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "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" @@ -353,9 +353,8 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, ipv4PrefixesSpecified := false ipv6PrefixesSpecified := false - input := ec2.CreateNetworkInterfaceInput{ - ClientToken: aws.String(id.UniqueId()), + ClientToken: aws.String(sdkid.UniqueId()), SubnetId: aws.String(d.Get(names.AttrSubnetID).(string)), } @@ -494,12 +493,12 @@ func resourceNetworkInterfaceCreate(ctx context.Context, d *schema.ResourceData, if v, ok := d.GetOk("attachment"); ok && v.(*schema.Set).Len() > 0 { attachment := v.(*schema.Set).List()[0].(map[string]any) - input := ec2.AttachNetworkInterfaceInput{ NetworkInterfaceId: aws.String(d.Id()), InstanceId: aws.String(attachment["instance"].(string)), DeviceIndex: aws.Int32(int32(attachment["device_index"].(int))), } + if v, ok := attachment["network_card_index"]; ok { if v, ok := v.(int); ok { input.NetworkCardIndex = aws.Int32(int32(v)) @@ -632,7 +631,6 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if n == nil { n = new(schema.Set) } - os := o.(*schema.Set) ns := n.(*schema.Set) @@ -678,6 +676,7 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if n == nil { n = make([]string, 0) } + if len(o.([]any))-1 > 0 { privateIPsToUnassign := make([]any, len(o.([]any))-1) idx := 0 @@ -802,7 +801,6 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if n == nil { n = new(schema.Set) } - os := o.(*schema.Set) ns := n.(*schema.Set) @@ -844,6 +842,7 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, } _, err := conn.ModifyNetworkInterfaceAttribute(ctx, &input) + if err != nil { return sdkdiag.AppendErrorf(diags, "modifying EC2 Network Interface (%s) enable primary IPv6: %s", d.Id(), err) } @@ -857,7 +856,6 @@ func resourceNetworkInterfaceUpdate(ctx context.Context, d *schema.ResourceData, if n == nil { n = new(schema.Set) } - os := o.(*schema.Set) ns := n.(*schema.Set) @@ -1097,6 +1095,7 @@ func resourceNetworkInterfaceDelete(ctx context.Context, d *schema.ResourceData, if err := deleteNetworkInterface(ctx, conn, d.Id()); err != nil { return sdkdiag.AppendFromErr(diags, err) } + return diags } diff --git a/internal/service/ec2/vpc_network_interface_attachment.go b/internal/service/ec2/vpc_network_interface_attachment.go index e6dc26de9f62..4fb99dee543f 100644 --- a/internal/service/ec2/vpc_network_interface_attachment.go +++ b/internal/service/ec2/vpc_network_interface_attachment.go @@ -23,6 +23,7 @@ func resourceNetworkInterfaceAttachment() *schema.Resource { CreateWithoutTimeout: resourceNetworkInterfaceAttachmentCreate, ReadWithoutTimeout: resourceNetworkInterfaceAttachmentRead, DeleteWithoutTimeout: resourceNetworkInterfaceAttachmentDelete, + Importer: &schema.ResourceImporter{ StateContext: schema.ImportStatePassthroughContext, }, @@ -70,6 +71,7 @@ func resourceNetworkInterfaceAttachmentCreate(ctx context.Context, d *schema.Res InstanceId: aws.String(d.Get(names.AttrInstanceID).(string)), DeviceIndex: aws.Int32(int32(d.Get("device_index").(int))), } + if v, ok := d.GetOk("network_card_index"); ok { if v, ok := v.(int); ok { input.NetworkCardIndex = aws.Int32(int32(v)) @@ -93,7 +95,7 @@ func resourceNetworkInterfaceAttachmentRead(ctx context.Context, d *schema.Resou var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) - network_interface, err := findNetworkInterfaceByAttachmentID(ctx, conn, d.Id()) + eni, err := findNetworkInterfaceByAttachmentID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] EC2 Network Interface Attachment (%s) not found, removing from state", d.Id()) @@ -105,12 +107,13 @@ func resourceNetworkInterfaceAttachmentRead(ctx context.Context, d *schema.Resou return sdkdiag.AppendErrorf(diags, "reading EC2 Network Interface Attachment (%s): %s", d.Id(), err) } - d.Set(names.AttrNetworkInterfaceID, network_interface.NetworkInterfaceId) - d.Set("attachment_id", network_interface.Attachment.AttachmentId) - d.Set("device_index", network_interface.Attachment.DeviceIndex) - d.Set(names.AttrInstanceID, network_interface.Attachment.InstanceId) - d.Set("network_card_index", network_interface.Attachment.NetworkCardIndex) - d.Set(names.AttrStatus, network_interface.Attachment.Status) + attachment := eni.Attachment + d.Set("attachment_id", attachment.AttachmentId) + d.Set("device_index", attachment.DeviceIndex) + d.Set(names.AttrInstanceID, attachment.InstanceId) + d.Set("network_card_index", attachment.NetworkCardIndex) + d.Set(names.AttrNetworkInterfaceID, eni.NetworkInterfaceId) + d.Set(names.AttrStatus, eni.Attachment.Status) return diags } From 28b2d98c93edff76b94b41fb57619ffc8972848e Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 12:23:19 -0700 Subject: [PATCH 0622/2115] Updates CHANGELOG and version --- CHANGELOG.md | 2 +- version/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5e536bd1dd8..e46cfd31fe75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 6.10.0 (Unreleased) +## 6.10.0 (August 21, 2025) NOTES: diff --git a/version/VERSION b/version/VERSION index b81ba511f6db..11946a9fd794 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.9.1 \ No newline at end of file +6.10.0 \ No newline at end of file From e841889d07235c9bd3ce0254332fb5ae93bbd851 Mon Sep 17 00:00:00 2001 From: djglaser Date: Thu, 21 Aug 2025 14:31:55 -0400 Subject: [PATCH 0623/2115] Improves waitServiceStable abstraction for readability --- internal/service/ecs/service.go | 81 ++++++++++++++++------------ internal/service/ecs/service_test.go | 6 +-- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 48c15bc7e060..b8a998cbd054 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -2113,7 +2113,7 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa } } -func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time, primaryTaskSet **awstypes.Deployment, isNewPrimaryDeployment *bool, isNewECSDeployment *bool) retry.StateRefreshFunc { +func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time, primaryTaskSet **awstypes.Deployment, isNewECSDeployment *bool) retry.StateRefreshFunc { return func() (any, string, error) { outputRaw, serviceStatus, err := statusService(ctx, conn, serviceName, clusterNameOrARN)() if err != nil { @@ -2129,16 +2129,15 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa if *primaryTaskSet == nil { *primaryTaskSet = findPrimaryTaskSet(output.Deployments) + var isNewPrimaryDeployment bool + if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() - *isNewPrimaryDeployment = createdAtUTC.After(operationTime) + isNewPrimaryDeployment = createdAtUTC.After(operationTime) } - } - - if !*isNewECSDeployment { *isNewECSDeployment = output.DeploymentController != nil && output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && - *isNewPrimaryDeployment + isNewPrimaryDeployment } // For new deployments with ECS deployment controller, check the deployment status @@ -2250,8 +2249,8 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn **string, operationTime time.Time) { <-ctx.Done() log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") - newContext := context.Background() - err := rollbackBlueGreenDeployment(newContext, conn, clusterName, serviceName, *primaryDeploymentArn, operationTime) + newCtx := context.Background() + err := rollbackBlueGreenDeployment(newCtx, conn, clusterName, serviceName, *primaryDeploymentArn, operationTime) if err != nil { log.Printf("[ERROR] Failed to rollback deployment: %s", err) } else { @@ -2308,44 +2307,26 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, prim // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { - var ( - primaryDeploymentArn **string = new(*string) - primaryTaskSet *awstypes.Deployment - isNewPrimaryDeployment bool - isNewECSDeployment bool - cancelFunc context.CancelFunc - cancelCtx context.Context - done chan struct{} - goroutineStarted bool - ) + deployment := &deploymentState{ + primaryDeploymentArn: new(*string), + } + + cancellation := &cancellationState{} stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, Refresh: func() (any, string, error) { - result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, primaryDeploymentArn, operationTime, &primaryTaskSet, &isNewPrimaryDeployment, &isNewECSDeployment)() - - // Create context and start goroutine only when needed - if sigintCancellation && !goroutineStarted && *primaryDeploymentArn != nil { - cancelCtx, cancelFunc = context.WithCancel(ctx) - done = make(chan struct{}) - go func() { - defer close(done) - waitForCancellation(cancelCtx, conn, clusterNameOrARN, serviceName, primaryDeploymentArn, operationTime) - }() - goroutineStarted = true - } - - return result, status, err + return refreshStatusAndHandleCancellation(ctx, conn, serviceName, clusterNameOrARN, operationTime, sigintCancellation, deployment, cancellation) }, Timeout: timeout, } outputRaw, err := stateConf.WaitForStateContext(ctx) - if goroutineStarted { - cancelFunc() - <-done + if cancellation.goroutineStarted { + cancellation.cancelFunc() + <-cancellation.done } if output, ok := outputRaw.(*awstypes.Service); ok { @@ -2355,6 +2336,36 @@ func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clust return nil, err } +type deploymentState struct { + primaryDeploymentArn **string + primaryTaskSet *awstypes.Deployment + isNewECSDeployment bool +} + +type cancellationState struct { + cancelFunc context.CancelFunc + cancelCtx context.Context + done chan struct{} + goroutineStarted bool +} + +func refreshStatusAndHandleCancellation(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, deployment *deploymentState, cancellation *cancellationState) (any, string, error) { + result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, deployment.primaryDeploymentArn, operationTime, &deployment.primaryTaskSet, &deployment.isNewECSDeployment)() + + // Create context and start goroutine only when needed + if sigintCancellation && !cancellation.goroutineStarted && *deployment.primaryDeploymentArn != nil { + cancellation.cancelCtx, cancellation.cancelFunc = context.WithCancel(ctx) + cancellation.done = make(chan struct{}) + go func() { + defer close(cancellation.done) + waitForCancellation(cancellation.cancelCtx, conn, clusterNameOrARN, serviceName, deployment.primaryDeploymentArn, operationTime) + }() + cancellation.goroutineStarted = true + } + + return result, status, err +} + // Does not return tags. func waitServiceActive(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, timeout time.Duration) (*awstypes.Service, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 97353d13e659..101ff6fdda92 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -3398,7 +3398,7 @@ resource "aws_ecs_task_definition" "test" { essential = true environment = [ { - name = "TEST_SUFFIX" + name = "test_name" value = "test_val" } ] @@ -3538,7 +3538,7 @@ resource "aws_ecs_task_definition" "should_fail" { ] environment = [ { - name = "TEST_SUFFIX" + name = "test_name" value = "test_val" } ] @@ -3661,7 +3661,7 @@ resource "aws_ecs_task_definition" "test2" { essential = true environment = [ { - name = "TEST_SUFFIX_2" + name = "test_name_2" value = "test_val_2" } ] From 9532cb5033972c7ea347c43b2de8ebed67e56931 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 15:38:10 -0400 Subject: [PATCH 0624/2115] Improve 'TestAccMWAAEnvironment_updateAirflowWorkerReplacementStrategy'. --- internal/service/mwaa/environment_test.go | 43 +++++++++++++++++------ 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/internal/service/mwaa/environment_test.go b/internal/service/mwaa/environment_test.go index db05a598ce1e..8cb496111ed9 100644 --- a/internal/service/mwaa/environment_test.go +++ b/internal/service/mwaa/environment_test.go @@ -13,8 +13,12 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/mwaa/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfmwaa "github.com/hashicorp/terraform-provider-aws/internal/service/mwaa" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -309,16 +313,14 @@ func TestAccMWAAEnvironment_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "webserver_access_mode", string(awstypes.WebserverAccessModePublicOnly)), resource.TestCheckResourceAttrSet(resourceName, "webserver_url"), resource.TestCheckResourceAttr(resourceName, "weekly_maintenance_window_start", "SAT:03:00"), - resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", string(awstypes.WorkerReplacementStrategyGraceful)), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), resource.TestCheckResourceAttr(resourceName, "tags.Environment", "production"), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"worker_replacement_strategy"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -480,7 +482,7 @@ func TestAccMWAAEnvironment_updateAirflowWorkerReplacementStrategy(t *testing.T) } ctx := acctest.Context(t) - var environment1, environment2 awstypes.Environment + var environment awstypes.Environment rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_mwaa_environment.test" @@ -493,10 +495,21 @@ func TestAccMWAAEnvironment_updateAirflowWorkerReplacementStrategy(t *testing.T) { Config: testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckEnvironmentExists(ctx, resourceName, &environment1), + testAccCheckEnvironmentExists(ctx, resourceName, &environment), resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", "FORCED"), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, ExpectNonEmptyPlan: true, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_replacement_strategy"), tfknownvalue.StringExact(awstypes.WorkerReplacementStrategyForced)), + }, }, { ResourceName: resourceName, @@ -506,10 +519,19 @@ func TestAccMWAAEnvironment_updateAirflowWorkerReplacementStrategy(t *testing.T) { Config: testAccEnvironmentConfig_airflowWorkerReplacementStrategy(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckEnvironmentExists(ctx, resourceName, &environment2), - testAccCheckEnvironmentNotRecreated(&environment2, &environment1), - resource.TestCheckResourceAttr(resourceName, "worker_replacement_strategy", "GRACEFUL"), + testAccCheckEnvironmentExists(ctx, resourceName, &environment), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("worker_replacement_strategy"), tfknownvalue.StringExact(awstypes.WorkerReplacementStrategyGraceful)), + }, }, }, }) @@ -947,7 +969,6 @@ resource "aws_mwaa_environment" "test" { startup_script_s3_path = aws_s3_object.startup_script.key webserver_access_mode = "PUBLIC_ONLY" weekly_maintenance_window_start = "SAT:03:00" - worker_replacement_strategy = "GRACEFUL" tags = { Name = %[1]q From da402c438693ae7d9cb06dd80e0e4b9408a5cc70 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 12:57:39 -0700 Subject: [PATCH 0625/2115] Handles deletion if `TAINTED` or becomes `TAINTED` during deletion --- .../servicecatalog/provisioned_product.go | 25 +++++++++++++++---- internal/service/servicecatalog/wait.go | 22 ++++++++++++++-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index fd9943b16999..b052986e9c27 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -593,7 +593,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx) - input := &servicecatalog.TerminateProvisionedProductInput{ + input := servicecatalog.TerminateProvisionedProductInput{ TerminateToken: aws.String(id.UniqueId()), ProvisionedProductId: aws.String(d.Id()), } @@ -602,9 +602,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat input.AcceptLanguage = aws.String(v.(string)) } - if v, ok := d.Get(names.AttrStatus).(string); ok && v == string(awstypes.ProvisionedProductStatusTainted) { - input.IgnoreErrors = true - } else if v, ok := d.GetOk("ignore_errors"); ok { + if v, ok := d.GetOk("ignore_errors"); ok { input.IgnoreErrors = v.(bool) } @@ -612,7 +610,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat input.RetainPhysicalResources = v.(bool) } - _, err := conn.TerminateProvisionedProduct(ctx, input) + _, err := conn.TerminateProvisionedProduct(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return diags @@ -624,6 +622,23 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) + if failureErr, ok := errs.As[*ProvisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { + input.IgnoreErrors = true + + _, err = conn.TerminateProvisionedProduct(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return diags + } + + if err != nil { + return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) + } + + err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) + + } + if errs.IsA[*awstypes.ResourceNotFoundException](err) { return diags } diff --git a/internal/service/servicecatalog/wait.go b/internal/service/servicecatalog/wait.go index e62f42c5e299..4795fe778a8b 100644 --- a/internal/service/servicecatalog/wait.go +++ b/internal/service/servicecatalog/wait.go @@ -522,7 +522,6 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. stateConf := &retry.StateChangeConf{ Pending: enum.Slice( awstypes.ProvisionedProductStatusAvailable, - awstypes.ProvisionedProductStatusTainted, awstypes.ProvisionedProductStatusUnderChange, ), Target: []string{}, @@ -530,7 +529,26 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. Timeout: timeout, } - _, err := stateConf.WaitForStateContext(ctx) + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { + if detail := output.ProvisionedProductDetail; detail != nil { + var foo *retry.UnexpectedStateError + if errors.As(err, &foo) { + // If the status is `TAINTED`, we can retry with `IgnoreErrors` + status := string(detail.Status) + if status == string(awstypes.ProvisionedProductStatusTainted) { + // Create a custom error type that signals state refresh is needed + return &ProvisionedProductFailureError{ + StatusMessage: aws.ToString(detail.StatusMessage), + Status: status, + NeedsRefresh: true, + } + } + } + } + return err + } return err } From f86d8d729398a1056bfaad64671fb9e554fc76c6 Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel Date: Tue, 29 Jul 2025 16:49:12 -0300 Subject: [PATCH 0626/2115] fix(imagebuilder): recipe's EBS IOPS can go to 100000 - `io1` goes up to 5k - `io2` goes up to 100k - `gp3` goes up to 16k - Other type's IOPS can't be explicitly set Since there's no per-type validation, the best we can do is limit on the max across all types. --- .changelog/43981.txt | 3 +++ internal/service/imagebuilder/image_recipe.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .changelog/43981.txt diff --git a/.changelog/43981.txt b/.changelog/43981.txt new file mode 100644 index 000000000000..413d5bf9ca89 --- /dev/null +++ b/.changelog/43981.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` +``` diff --git a/internal/service/imagebuilder/image_recipe.go b/internal/service/imagebuilder/image_recipe.go index 6648a6ae5813..721cb136f1b9 100644 --- a/internal/service/imagebuilder/image_recipe.go +++ b/internal/service/imagebuilder/image_recipe.go @@ -80,7 +80,7 @@ func resourceImageRecipe() *schema.Resource { Type: schema.TypeInt, Optional: true, ForceNew: true, - ValidateFunc: validation.IntBetween(100, 10000), + ValidateFunc: validation.IntBetween(100, 100000), }, names.AttrKMSKeyID: { Type: schema.TypeString, From fb7fe0293d138a42e11a06c049476a9eac199dea Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 13:38:16 -0700 Subject: [PATCH 0627/2115] Updates test for current behaviour --- .../provisioned_product_test.go | 208 ++++++++++-------- .../testdata/foo/product_template.yaml | 167 ++++++++++++++ 2 files changed, 280 insertions(+), 95 deletions(-) create mode 100644 internal/service/servicecatalog/testdata/foo/product_template.yaml diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 642c86198312..2787732ee32d 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1004,6 +1004,9 @@ resource "aws_s3_bucket" "conflict" { func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_servicecatalog_provisioned_product.test" + const artifactsDataSourceName = "data.aws_servicecatalog_provisioning_artifacts.product_artifacts" + const initialArtifactID = "provisioning_artifact_details.0.id" + const newArtifactID = "provisioning_artifact_details.1.id" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) var pprod awstypes.ProvisionedProductDetail @@ -1015,44 +1018,66 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { Steps: []resource.TestStep{ // Step 1: Create with working configuration using simple template { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_working(rName), - Check: resource.ComposeTestCheckFunc( + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "none"), + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), + resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "false"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "none"), ), }, + // Step 2: Update to failing configuration - this should fail and leave resource TAINTED { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName), - ExpectError: regexache.MustCompile(`Properties validation failed`), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once"), + ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), }, + // Step 3: Verify resource is now TAINTED after the failed update // Use RefreshOnly to avoid triggering any plan changes due to config differences { RefreshState: true, - Check: resource.ComposeTestCheckFunc( - testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), + Check: resource.ComposeAggregateTestCheckFunc( + // testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), // Can't use this because it fails on TAINTED testAccCheckProvisionedProductStatus(ctx, resourceName, "TAINTED"), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "TAINTED"), + resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "true"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_once"), ), }, + // Step 4: CRITICAL TEST - Apply the same failing config again // BUG: Currently this shows "no changes" but should retry the update // ConfigPlanChecks should FAIL with current implementation, demonstrating the bug { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once"), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), }, }, - ExpectError: regexache.MustCompile(`Properties validation failed`), }, + // Step 5: Clean up by applying a working config { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_working(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "changed_to_force_an_update"), Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), + resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "false"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_to_force_an_update"), ), }, }, @@ -1093,73 +1118,72 @@ func testAccCheckProvisionedProductStatus(ctx context.Context, resourceName, exp } } -// testAccProvisionedProductConfig_retryTaintedUpdate_working creates a simple working CloudFormation template +// testAccProvisionedProductConfig_retryTaintedUpdate creates a simple working CloudFormation template // This avoids the complex conditional logic that was causing issues in the basic config -func testAccProvisionedProductConfig_retryTaintedUpdate_working(rName string) string { +func testAccProvisionedProductConfig_retryTaintedUpdate(rName string, useNewVersion bool, simulateFailure bool, extraParam string) string { return acctest.ConfigCompose( testAccProvisionedProductPortfolioBaseConfig(rName), fmt.Sprintf(` -resource "aws_s3_bucket" "test" { - bucket = %[1]q - force_destroy = true -} - -resource "aws_s3_object" "test" { - bucket = aws_s3_bucket.test.id - key = "%[1]s.json" +resource "aws_servicecatalog_provisioned_product" "test" { + name = %[1]q + product_id = aws_servicecatalog_product.test.id + provisioning_artifact_id = %[2]t ? local.new_provisioning_artifact.id : local.initial_provisioning_artifact.id - content = jsonencode({ - AWSTemplateFormatVersion = "2010-09-09" + provisioning_parameters { + key = "FailureSimulation" + value = "%[3]t" + } - Resources = { - TestBucket = { - Type = "AWS::S3::Bucket" - } - } + provisioning_parameters { + key = "ExtraParam" + value = %[4]q + } - Outputs = { - BucketName = { - Description = "Bucket Name" - Value = { - Ref = "TestBucket" - } - } - } - }) + depends_on = [ + aws_servicecatalog_constraint.launch_constraint, + ] } resource "aws_servicecatalog_product" "test" { description = %[1]q - distributor = "distributör" name = %[1]q owner = "ägare" type = "CLOUD_FORMATION_TEMPLATE" - support_description = %[1]q provisioning_artifact_parameters { - description = "artefaktbeskrivning" - disable_template_validation = true - name = %[1]q - template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" - type = "CLOUD_FORMATION_TEMPLATE" + name = "%[1]s - Initial" + description = "Initial" + template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" + type = "CLOUD_FORMATION_TEMPLATE" } } -resource "aws_servicecatalog_provisioned_product" "test" { - name = %[1]q - product_id = aws_servicecatalog_product.test.id - provisioning_artifact_name = %[1]q - path_id = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id +resource "aws_servicecatalog_provisioning_artifact" "new_version" { + product_id = aws_servicecatalog_product.test.id + + name = "%[1]s - New" + description = "New" + template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" + type = "CLOUD_FORMATION_TEMPLATE" + + # Force a new version to be created when MPI version changes + # Is this needed? + lifecycle { + create_before_destroy = true + } } -`, rName)) + +data "aws_servicecatalog_provisioning_artifacts" "product_artifacts" { + product_id = aws_servicecatalog_product.test.id + + depends_on = [aws_servicecatalog_provisioning_artifact.new_version] +} + +locals { + initial_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[0] + new_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[1] } -// testAccProvisionedProductConfig_retryTaintedUpdate_failing creates a CloudFormation template that will fail -// This uses an invalid S3 bucket name to trigger a CloudFormation validation error -func testAccProvisionedProductConfig_retryTaintedUpdate_failing(rName string) string { - return acctest.ConfigCompose( - testAccProvisionedProductPortfolioBaseConfig(rName), - fmt.Sprintf(` resource "aws_s3_bucket" "test" { bucket = %[1]q force_destroy = true @@ -1167,53 +1191,47 @@ resource "aws_s3_bucket" "test" { resource "aws_s3_object" "test" { bucket = aws_s3_bucket.test.id - key = "%[1]s.json" + key = "product_template.yaml" - content = jsonencode({ - AWSTemplateFormatVersion = "2010-09-09" + source = "${path.module}/testdata/foo/product_template.yaml" +} - Resources = { - TestBucket = { - Type = "AWS::S3::Bucket" - Properties = { - BucketName = "INVALID_BUCKET_NAME_WITH_UPPERCASE_AND_UNDERSCORES" - } - } - } +# Required to validate provisioned product on update +resource "aws_servicecatalog_constraint" "launch_constraint" { + description = "Launch constraint for test product" + portfolio_id = aws_servicecatalog_portfolio.test.id + product_id = aws_servicecatalog_product.test.id + type = "LAUNCH" - Outputs = { - BucketName = { - Description = "Bucket Name" - Value = { - Ref = "TestBucket" - } - } - } + parameters = jsonencode({ + "RoleArn" = aws_iam_role.launch_role.arn }) -} -resource "aws_servicecatalog_product" "test" { - description = %[1]q - distributor = "distributör" - name = %[1]q - owner = "ägare" - type = "CLOUD_FORMATION_TEMPLATE" - support_description = %[1]q + depends_on = [aws_iam_role_policy_attachment.launch_role] +} - provisioning_artifact_parameters { - description = "artefaktbeskrivning" - disable_template_validation = true - name = %[1]q - template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" - type = "CLOUD_FORMATION_TEMPLATE" - } +# IAM role for Service Catalog launch constraint +resource "aws_iam_role" "launch_role" { + name = "%[1]s-launch-role" + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Action = "sts:AssumeRole" + Effect = "Allow" + Principal = { + Service = "servicecatalog.amazonaws.com" + } + } + ] + }) } -resource "aws_servicecatalog_provisioned_product" "test" { - name = %[1]q - product_id = aws_servicecatalog_product.test.id - provisioning_artifact_name = %[1]q - path_id = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id +# Attach admin policy to launch role (for demo purposes only) +resource "aws_iam_role_policy_attachment" "launch_role" { + role = aws_iam_role.launch_role.name + policy_arn = "arn:aws:iam::aws:policy/AdministratorAccess" } -`, rName)) +`, rName, useNewVersion, simulateFailure, extraParam)) } diff --git a/internal/service/servicecatalog/testdata/foo/product_template.yaml b/internal/service/servicecatalog/testdata/foo/product_template.yaml new file mode 100644 index 000000000000..cfcb21370405 --- /dev/null +++ b/internal/service/servicecatalog/testdata/foo/product_template.yaml @@ -0,0 +1,167 @@ +AWSTemplateFormatVersion: '2010-09-09' +Description: 'Test product template for taint reproduction' + +Parameters: + ExtraParam: + Type: String + Description: Extra parameter + Default: 'none' + + FailureSimulation: + Type: String + Description: Boolean to simulate failure + Default: 'false' + AllowedValues: + - 'true' + - 'false' + +Resources: + TestLambdaFunction: + Type: AWS::Lambda::Function + Properties: + FunctionName: !Sub '${AWS::StackName}-test-function' + Handler: index.handler + Role: !GetAtt LambdaExecutionRole.Arn + Runtime: nodejs18.x + Code: + ZipFile: | + // cfnresponse module inline + const cfnresponse = (() => { + const SUCCESS = "SUCCESS"; + const FAILED = "FAILED"; + + function send(event, context, responseStatus, responseData, physicalResourceId, noEcho) { + return new Promise((resolve, reject) => { + const responseBody = JSON.stringify({ + Status: responseStatus, + Reason: `See the details in CloudWatch Log Stream: ${context.logStreamName}`, + PhysicalResourceId: physicalResourceId || context.logStreamName, + StackId: event.StackId, + RequestId: event.RequestId, + LogicalResourceId: event.LogicalResourceId, + NoEcho: noEcho || false, + Data: responseData || {} + }); + + console.log("Response body:", responseBody); + + const https = require("https"); + const url = require("url"); + + const parsedUrl = url.parse(event.ResponseURL); + const options = { + hostname: parsedUrl.hostname, + port: 443, + path: parsedUrl.path, + method: "PUT", + headers: { + "content-type": "", + "content-length": responseBody.length + } + }; + + const request = https.request(options, (response) => { + console.log(`Status code: ${response.statusCode}`); + console.log(`Status message: ${response.statusMessage}`); + resolve(); + }); + + request.on("error", (error) => { + console.log(`Send CFN response failed: ${error}`); + reject(error); + }); + + request.write(responseBody); + request.end(); + }); + } + + return { + SUCCESS, + FAILED, + send + }; + })(); + + exports.handler = async (event, context) => { + console.log('Event:', JSON.stringify(event)); + + // For CloudFormation custom resources + if (event.RequestType) { + try { + // Simulate failure if parameter is set to true + if (event.ResourceProperties.FailureSimulation === 'true' && + (event.RequestType === 'Create' || event.RequestType === 'Update')) { + console.log('Simulating failure as requested'); + await cfnresponse.send(event, context, cfnresponse.FAILED, { + Message: 'Simulated failure' + }); + return; + } + + // Process the request based on the RequestType + let responseData = {}; + + if (event.RequestType === 'Create' || event.RequestType === 'Update') { + // Perform create or update actions + responseData = { + Message: 'Resource created/updated successfully', + Timestamp: new Date().toISOString() + }; + } else if (event.RequestType === 'Delete') { + // Perform delete actions + responseData = { + Message: 'Resource deleted successfully' + }; + } + + // Send success response + await cfnresponse.send(event, context, cfnresponse.SUCCESS, responseData); + } catch (error) { + console.error('Error:', error); + await cfnresponse.send(event, context, cfnresponse.FAILED, { + Error: error.message + }); + } + } else { + // For direct Lambda invocations + // Simulate failure if parameter is set to true + if (event.FailureSimulation === 'true') { + throw new Error('Simulated failure'); + } + + return { + statusCode: 200, + body: JSON.stringify('Success'), + }; + } + }; + Environment: + Variables: + # MPIVersion: !Ref MPIVersion + FailureSimulation: !Ref FailureSimulation + ExtraParam: !Ref ExtraParam + + LambdaExecutionRole: + Type: AWS::IAM::Role + Properties: + AssumeRolePolicyDocument: + Version: '2012-10-17' + Statement: + - Effect: Allow + Principal: + Service: lambda.amazonaws.com + Action: 'sts:AssumeRole' + ManagedPolicyArns: + - 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole' + + TestInvocation: + Type: Custom::TestInvocation + Properties: + ServiceToken: !GetAtt TestLambdaFunction.Arn + FailureSimulation: !Ref FailureSimulation + +Outputs: + LambdaArn: + Description: ARN of the Lambda function + Value: !GetAtt TestLambdaFunction.Arn From 5b6bb02ebb518ca3e35e053a5ea3fb4fa5c233d5 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:53:30 -0400 Subject: [PATCH 0628/2115] Bumped product version to 6.10.1. --- version/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/VERSION b/version/VERSION index 11946a9fd794..83c2b6325bd0 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.10.0 \ No newline at end of file +6.10.1 \ No newline at end of file From 511cc9e542af36a4e231ec439a65fa435e7f4d96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 21 Aug 2025 16:54:27 -0400 Subject: [PATCH 0629/2115] Fix v6.10.0 CHANGELOG entry #43925 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e46cfd31fe75..72676d0881db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,11 +34,11 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_batch_compute_environment: Allow in-place updates of compute environments that have the `SPOT_PRICE_CAPACITY_OPTIMIZED` strategy ([#40148](https://github.com/hashicorp/terraform-provider-aws/issues/40148)) +* resource/aws_imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error when `policy_detail.exclusion_rules.amis.is_public` is omitted ([#43925](https://github.com/hashicorp/terraform-provider-aws/issues/43925)) * resource/aws_instance: Adds `primary_network_interface` to allow importing resources with custom primary network interface. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) * resource/aws_rds_cluster: Fixes the behavior when enabling database_insights_mode="advanced" without changing performance insights retention window ([#43919](https://github.com/hashicorp/terraform-provider-aws/issues/43919)) * resource/aws_rds_cluster: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key ([#43942](https://github.com/hashicorp/terraform-provider-aws/issues/43942)) * resource/aws_spot_instance_request: Adds `primary_network_interface` to allow importing resources with custom primary network interface. ([#43953](https://github.com/hashicorp/terraform-provider-aws/issues/43953)) -* resource/imagebuilder_lifecycle_policy: Fix `Provider produced inconsistent result after apply` error when `policy_detail.exclusion_rules.amis.is_public` is omitted ([#43925](https://github.com/hashicorp/terraform-provider-aws/issues/43925)) ## 6.9.0 (August 14, 2025) From fa9d607130ede8f36e525b404c46570ac1607335 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:57:12 -0400 Subject: [PATCH 0630/2115] Add changelog entry for v6.11.0 (#43994) Co-authored-by: changelogbot --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e46cfd31fe75..8e13f013fb46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 6.11.0 (Unreleased) + ## 6.10.0 (August 21, 2025) NOTES: From 0c92f86c5b101ee70ed623b7d440e178c1296a95 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 14:17:44 -0700 Subject: [PATCH 0631/2115] Reverts resource changes from "service cat debuggery" --- .../servicecatalog/provisioned_product.go | 66 ++++++++++--------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index b052986e9c27..534eabbd3787 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -439,34 +439,38 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // or after an invalid update that returns a 'FAILED' record state. Thus, waiters are now present in the CREATE and UPDATE methods of this resource instead. // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/24574#issuecomment-1126339193 - // For TAINTED resources, we need to get parameters from the last successful record - // not the last provisioning record which may have failed - var recordIdToUse *string - if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { - recordIdToUse = detail.LastSuccessfulProvisioningRecordId - log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), aws.ToString(recordIdToUse)) - } else { - recordIdToUse = detail.LastProvisioningRecordId - } + // // For TAINTED resources, we need to get parameters from the last successful record + // // not the last provisioning record which may have failed + // var recordIdToUse *string + // if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { + // recordIdToUse = detail.LastSuccessfulProvisioningRecordId + // log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), aws.ToString(recordIdToUse)) + // } else { + // recordIdToUse = detail.LastProvisioningRecordId + // } recordInput := &servicecatalog.DescribeRecordInput{ - Id: recordIdToUse, + Id: detail.LastProvisioningRecordId, + // Id: recordIdToUse, AcceptLanguage: aws.String(acceptLanguage), } recordOutput, err := conn.DescribeRecord(ctx, recordInput) if !d.IsNewResource() && errs.IsA[*awstypes.ResourceNotFoundException](err) { - log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(recordIdToUse)) + log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) + // log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(recordIdToUse)) return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(recordIdToUse), err) + return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(detail.LastProvisioningRecordId), err) + // return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(recordIdToUse), err) } if recordOutput == nil || recordOutput.RecordDetail == nil { - return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(recordIdToUse)) + return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) + // return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(recordIdToUse)) } // To enable debugging of potential v, log as a warning @@ -565,24 +569,24 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat } if _, err := waitProvisionedProductReady(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutUpdate)); err != nil { - // Check if this is a state inconsistency error - var failureErr *ProvisionedProductFailureError - if errors.As(err, &failureErr) && failureErr.IsStateInconsistent() { - // Force a state refresh to get actual AWS values before returning error - log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) - - // Perform state refresh to get actual current values from AWS - refreshDiags := resourceProvisionedProductRead(ctx, d, meta) - if refreshDiags.HasError() { - // If refresh fails, return both errors - return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) - } - - // Return the original failure error after state is corrected - return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) - } - - // For other errors, proceed as before + // // Check if this is a state inconsistency error + // var failureErr *ProvisionedProductFailureError + // if errors.As(err, &failureErr) && failureErr.IsStateInconsistent() { + // // Force a state refresh to get actual AWS values before returning error + // log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) + + // // Perform state refresh to get actual current values from AWS + // refreshDiags := resourceProvisionedProductRead(ctx, d, meta) + // if refreshDiags.HasError() { + // // If refresh fails, return both errors + // return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) + // } + + // // Return the original failure error after state is corrected + // return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) + // } + + // // For other errors, proceed as before return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } From c8d9f45b5cfc4399195743b6d59c100f8ce4a38f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Thu, 21 Aug 2025 14:18:10 -0700 Subject: [PATCH 0632/2115] Updates tests --- .../provisioned_product_test.go | 58 +++++++++++-------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 2787732ee32d..819509c221cc 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1016,9 +1016,9 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckProvisionedProductDestroy(ctx), Steps: []resource.TestStep{ - // Step 1: Create with working configuration using simple template + // Step 1: Create with working configuration { - Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "none"), + Config: testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), @@ -1031,44 +1031,44 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { ), }, - // Step 2: Update to failing configuration - this should fail and leave resource TAINTED + // Step 2: Update to failing configuration { - Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once"), + Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), }, - // Step 3: Verify resource is now TAINTED after the failed update - // Use RefreshOnly to avoid triggering any plan changes due to config differences - { - RefreshState: true, - Check: resource.ComposeAggregateTestCheckFunc( - // testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), // Can't use this because it fails on TAINTED - testAccCheckProvisionedProductStatus(ctx, resourceName, "TAINTED"), - resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "TAINTED"), - resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "true"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_once"), - ), - }, + // // Step 3: Verify resource is now TAINTED after the failed update + // // Use RefreshState to avoid triggering any plan changes due to config differences + // { + // RefreshState: true, + // Check: resource.ComposeAggregateTestCheckFunc( + // // testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), // Can't use this because it fails on TAINTED + // testAccCheckProvisionedProductStatus(ctx, resourceName, "TAINTED"), + // resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "TAINTED"), + // resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), + // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), + // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), + // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "true"), + // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), + // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_once"), + // ), + // }, // Step 4: CRITICAL TEST - Apply the same failing config again // BUG: Currently this shows "no changes" but should retry the update // ConfigPlanChecks should FAIL with current implementation, demonstrating the bug { - Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once"), + Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), }, }, }, // Step 5: Clean up by applying a working config { - Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "changed_to_force_an_update"), + Config: testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName), Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), @@ -1118,6 +1118,18 @@ func testAccCheckProvisionedProductStatus(ctx context.Context, resourceName, exp } } +func testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName string) string { + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "none") +} + +func testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName string) string { + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once") +} + +func testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName string) string { + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "changed_to_force_an_update") +} + // testAccProvisionedProductConfig_retryTaintedUpdate creates a simple working CloudFormation template // This avoids the complex conditional logic that was causing issues in the basic config func testAccProvisionedProductConfig_retryTaintedUpdate(rName string, useNewVersion bool, simulateFailure bool, extraParam string) string { From a751d0de004ad95a62ff22641a095769fcc31708 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 08:22:48 +0900 Subject: [PATCH 0633/2115] Fix expected run_config.0.memory_in_mb values --- internal/service/synthetics/canary_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 72e00c33c1ad..506236dc53ba 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -41,7 +41,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1000"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), resource.TestCheckResourceAttr(resourceName, "failure_retention_period", "31"), resource.TestCheckResourceAttr(resourceName, "success_retention_period", "31"), @@ -73,7 +73,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1000"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), resource.TestCheckResourceAttr(resourceName, "failure_retention_period", "31"), resource.TestCheckResourceAttr(resourceName, "success_retention_period", "31"), @@ -330,7 +330,7 @@ func TestAccSyntheticsCanary_s3(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1000"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), resource.TestCheckResourceAttr(resourceName, "run_config.0.active_tracing", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "failure_retention_period", "31"), @@ -372,7 +372,7 @@ func TestAccSyntheticsCanary_run(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1000"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "60"), ), }, From 9683d7d94044dd2e8328b286186f7dba5988040b Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 22 Aug 2025 08:23:25 +0900 Subject: [PATCH 0634/2115] Fix the function names to satisfy the Caps rules --- internal/service/synthetics/canary_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 506236dc53ba..9ae5f6732f4b 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -540,7 +540,7 @@ func TestAccSyntheticsCanary_vpc(t *testing.T) { }) } -func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { +func TestAccSyntheticsCanary_vpcIPv6AllowedForDualStack(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -557,7 +557,7 @@ func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { CheckDestroy: testAccCheckCanaryDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, true), + Config: testAccCanaryConfig_vpcIPv6AllowedForDualStack(rName, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), @@ -573,7 +573,7 @@ func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { ImportStateVerifyIgnore: []string{"zip_file", "start_canary", "delete_lambda"}, }, { - Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, false), + Config: testAccCanaryConfig_vpcIPv6AllowedForDualStack(rName, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), @@ -583,7 +583,7 @@ func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { ), }, { - Config: testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName, true), + Config: testAccCanaryConfig_vpcIPv6AllowedForDualStack(rName, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), @@ -593,7 +593,7 @@ func TestAccSyntheticsCanary_vpcIpv6AllowedForDualStack(t *testing.T) { ), }, { - Config: testAccCanaryConfig_vpcIpv6AllowedForDualStackUpdated(rName), + Config: testAccCanaryConfig_vpcIPv6AllowedForDualStackUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "vpc_config.0.subnet_ids.#", "2"), @@ -1332,7 +1332,7 @@ resource "aws_synthetics_canary" "test" { `, rName)) } -func testAccCanaryConfig_vpcIpv6AllowedForDualStack(rName string, ipv6 bool) string { +func testAccCanaryConfig_vpcIPv6AllowedForDualStack(rName string, ipv6 bool) string { return acctest.ConfigCompose( testAccCanaryConfig_base(rName), acctest.ConfigVPCWithSubnetsIPv6(rName, 2), @@ -1363,7 +1363,7 @@ resource "aws_synthetics_canary" "test" { `, rName, ipv6)) } -func testAccCanaryConfig_vpcIpv6AllowedForDualStackUpdated(rName string) string { +func testAccCanaryConfig_vpcIPv6AllowedForDualStackUpdated(rName string) string { return acctest.ConfigCompose( testAccCanaryConfig_base(rName), acctest.ConfigVPCWithSubnetsIPv6(rName, 2), From e884b95b19061e4194f13ef06fab40289d0a919c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 07:24:49 +0000 Subject: [PATCH 0635/2115] Bump the aws-sdk-go-v2 group across 1 directory with 258 updates --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-version: 1.18.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-version: 1.18.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-version: 1.19.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/accessanalyzer dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/account dependency-version: 1.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acm dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acmpca dependency-version: 1.43.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amp dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amplify dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigateway dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigatewayv2 dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appconfig dependency-version: 1.41.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appfabric dependency-version: 1.16.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appflow dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appintegrations dependency-version: 1.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationautoscaling dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationinsights dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationsignals dependency-version: 1.15.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appmesh dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apprunner dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appstream dependency-version: 1.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appsync dependency-version: 1.50.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/athena dependency-version: 1.54.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/auditmanager dependency-version: 1.45.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-version: 1.57.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscalingplans dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/backup dependency-version: 1.47.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/batch dependency-version: 1.57.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bcmdataexports dependency-version: 1.11.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrock dependency-version: 1.44.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagent dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol dependency-version: 1.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/billing dependency-version: 1.7.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/budgets dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chatbot dependency-version: 1.13.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chime dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines dependency-version: 1.25.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkvoice dependency-version: 1.25.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloud9 dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudcontrol dependency-version: 1.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.64.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfront dependency-version: 1.53.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore dependency-version: 1.12.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudsearch dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudtrail dependency-version: 1.53.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.48.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-version: 1.56.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeartifact dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codebuild dependency-version: 1.66.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecatalyst dependency-version: 1.20.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecommit dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeconnections dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codedeploy dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeguruprofiler dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codegurureviewer dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codepipeline dependency-version: 1.45.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarconnections dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarnotifications dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentity dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/comprehend dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/computeoptimizer dependency-version: 1.46.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/configservice dependency-version: 1.57.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connect dependency-version: 1.137.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connectcases dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/controltower dependency-version: 1.25.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costandusagereportservice dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costexplorer dependency-version: 1.55.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costoptimizationhub dependency-version: 1.20.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/customerprofiles dependency-version: 1.52.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databasemigrationservice dependency-version: 1.57.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databrew dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dataexchange dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datapipeline dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datasync dependency-version: 1.53.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datazone dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dax dependency-version: 1.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/detective dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devicefarm dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devopsguru dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directconnect dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directoryservice dependency-version: 1.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dlm dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdb dependency-version: 1.45.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdbelastic dependency-version: 1.18.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/drs dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dsql dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dynamodb dependency-version: 1.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.245.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecrpublic dependency-version: 1.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-version: 1.63.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/efs dependency-version: 1.40.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-version: 1.71.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticache dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 dependency-version: 1.50.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticsearchservice dependency-version: 1.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elastictranscoder dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emr dependency-version: 1.53.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrcontainers dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrserverless dependency-version: 1.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eventbridge dependency-version: 1.44.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evidently dependency-version: 1.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evs dependency-version: 1.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/finspace dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/firehose dependency-version: 1.40.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fis dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fms dependency-version: 1.43.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fsx dependency-version: 1.60.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/gamelift dependency-version: 1.45.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glacier dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/globalaccelerator dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glue dependency-version: 1.127.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/grafana dependency-version: 1.31.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/greengrass dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/groundstation dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/guardduty dependency-version: 1.63.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/healthlake dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-version: 1.47.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/identitystore dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/imagebuilder dependency-version: 1.45.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector2 dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/internetmonitor dependency-version: 1.24.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/invoicing dependency-version: 1.6.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iot dependency-version: 1.68.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivs dependency-version: 1.47.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivschat dependency-version: 1.20.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafka dependency-version: 1.42.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafkaconnect dependency-version: 1.26.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kendra dependency-version: 1.59.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/keyspaces dependency-version: 1.22.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesis dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalytics dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisvideo dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kms dependency-version: 1.44.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lakeformation dependency-version: 1.44.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lambda dependency-version: 1.76.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/launchwizard dependency-version: 1.12.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 dependency-version: 1.55.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/licensemanager dependency-version: 1.35.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lightsail dependency-version: 1.48.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/location dependency-version: 1.48.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lookoutmetrics dependency-version: 1.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/m2 dependency-version: 1.24.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/macie2 dependency-version: 1.48.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconnect dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconvert dependency-version: 1.81.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/medialive dependency-version: 1.80.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackage dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagev2 dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagevod dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediastore dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/memorydb dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mgn dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mq dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mwaa dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptune dependency-version: 1.40.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptunegraph dependency-version: 1.20.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkfirewall dependency-version: 1.54.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmanager dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmonitor dependency-version: 1.11.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notifications dependency-version: 1.6.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notificationscontacts dependency-version: 1.5.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/oam dependency-version: 1.21.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/odb dependency-version: 1.3.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearch dependency-version: 1.51.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearchserverless dependency-version: 1.24.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/organizations dependency-version: 1.43.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/osis dependency-version: 1.18.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/outposts dependency-version: 1.55.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/paymentcryptography dependency-version: 1.22.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcaconnectorad dependency-version: 1.14.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcs dependency-version: 1.11.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpoint dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 dependency-version: 1.24.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pipes dependency-version: 1.22.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/polly dependency-version: 1.52.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pricing dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qbusiness dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qldb dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/quicksight dependency-version: 1.92.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ram dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rbin dependency-version: 1.25.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.103.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshift dependency-version: 1.57.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftdata dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftserverless dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rekognition dependency-version: 1.50.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resiliencehub dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 dependency-version: 1.20.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroups dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rolesanywhere dependency-version: 1.20.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53 dependency-version: 1.56.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53domains dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53profiles dependency-version: 1.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness dependency-version: 1.25.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53resolver dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rum dependency-version: 1.27.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-version: 1.87.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3control dependency-version: 1.65.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3outposts dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3tables dependency-version: 1.9.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3vectors dependency-version: 1.4.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.211.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/scheduler dependency-version: 1.16.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/schemas dependency-version: 1.32.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/secretsmanager dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securityhub dependency-version: 1.62.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securitylake dependency-version: 1.24.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalog dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicediscovery dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicequotas dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ses dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sesv2 dependency-version: 1.52.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sfn dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/shield dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/signer dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sns dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sqs dependency-version: 1.41.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-version: 1.63.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmcontacts dependency-version: 1.30.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmincidents dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmquicksetup dependency-version: 1.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmsap dependency-version: 1.23.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sso dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssoadmin dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/storagegateway dependency-version: 1.41.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-version: 1.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/swf dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/synthetics dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/taxsettings dependency-version: 1.15.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb dependency-version: 1.15.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamquery dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamwrite dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transcribe dependency-version: 1.51.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transfer dependency-version: 1.64.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/verifiedpermissions dependency-version: 1.28.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/vpclattice dependency-version: 1.17.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/waf dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafregional dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafv2 dependency-version: 1.66.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wellarchitected dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspaces dependency-version: 1.62.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspacesweb dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/xray dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 532 ++++++++++++++-------------- go.sum | 1064 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 798 insertions(+), 798 deletions(-) diff --git a/go.mod b/go.mod index 3db6a428a592..0991a4540902 100644 --- a/go.mod +++ b/go.mod @@ -11,264 +11,264 @@ require ( github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 - github.com/aws/aws-sdk-go-v2 v1.38.0 - github.com/aws/aws-sdk-go-v2/config v1.31.1 - github.com/aws/aws-sdk-go-v2/credentials v1.18.5 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 - github.com/aws/aws-sdk-go-v2/service/account v1.27.1 - github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 - github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 - github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 - github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 - github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 - github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 - github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 - github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 - github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 - github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 - github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 - github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 - github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 - github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 - github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 - github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 - github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 - github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 - github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 - github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 - github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 - github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 - github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 - github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 - github.com/aws/aws-sdk-go-v2/service/location v1.48.1 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 - github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 - github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 - github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 - github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 - github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 - github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 - github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 - github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 - github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 - github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 - github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 - github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 - github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 - github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 - github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 - github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 + github.com/aws/aws-sdk-go-v2 v1.38.1 + github.com/aws/aws-sdk-go-v2/config v1.31.2 + github.com/aws/aws-sdk-go-v2/credentials v1.18.6 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 + github.com/aws/aws-sdk-go-v2/service/account v1.27.2 + github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 + github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 + github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 + github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 + github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 + github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 + github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 + github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 + github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 + github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 + github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 + github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 + github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 + github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 + github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 + github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 + github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 + github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 + github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 + github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 + github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 + github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 + github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 + github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 + github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 + github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 + github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 + github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 + github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 + github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 + github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 + github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 + github.com/aws/aws-sdk-go-v2/service/location v1.48.2 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 + github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 + github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 + github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 + github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 + github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 + github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 + github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 + github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 + github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 + github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 + github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 + github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 + github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 + github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 + github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 + github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 + github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 + github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 + github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 + github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 + github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 + github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 + github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 + github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 + github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 + github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 + github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 + github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 + github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 + github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 + github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 + github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 github.com/aws/smithy-go v1.22.5 github.com/beevik/etree v1.5.1 github.com/cedar-policy/cedar-go v1.2.6 @@ -322,16 +322,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.7.0 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index 42e9a67c78ff..e1e915e679c8 100644 --- a/go.sum +++ b/go.sum @@ -23,544 +23,544 @@ 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-v2 v1.38.0 h1:UCRQ5mlqcFk9HJDIqENSLR3wiG1VTWlyUfLDEvY7RxU= -github.com/aws/aws-sdk-go-v2 v1.38.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= +github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8= +github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.1 h1:PSQn4ObaQLaHl6qjs+XYH2pkxyHzZlk1GgQDrKlRJ7I= -github.com/aws/aws-sdk-go-v2/config v1.31.1/go.mod h1:3UA8Gj+2nzpV8WBUF0b19onBfz0YMXDQyGEW0Ru1ntI= -github.com/aws/aws-sdk-go-v2/credentials v1.18.5 h1:DATc1xnpHUV8VgvtnVQul+zuCwK6vz7gtkbKEUZcuNI= -github.com/aws/aws-sdk-go-v2/credentials v1.18.5/go.mod h1:y7aigZzjm1jUZuCgOrlBng+VJrKkknY2Cl0JWxG7vHU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 h1:WTNSeU/4f/vevwK7zwEEjlX27LPZB1IwyjVAh+Q74iQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5/go.mod h1:O84Dxp02jFDHRDbziaCRqMbe12+o+qih3ZD6Dio+1v0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 h1:o9RnO+YZ4X+kt5Z7Nvcishlz0nksIt2PIzDglLMP0vA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3/go.mod h1:+6aLJzOG1fvMOyzIySYjOFjcguGvVRL68R+uoRencN4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 h1:joyyUFhiTQQmVK6ImzNU9TQSNRNeD9kOklqTzyk5v6s= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3/go.mod h1:+vNIyZQP3b3B1tSLI0lxvrU9cfM7gpdRXMFfm67ZcPc= +github.com/aws/aws-sdk-go-v2/config v1.31.2 h1:NOaSZpVGEH2Np/c1toSeW0jooNl+9ALmsUTZ8YvkJR0= +github.com/aws/aws-sdk-go-v2/config v1.31.2/go.mod h1:17ft42Yb2lF6OigqSYiDAiUcX4RIkEMY6XxEMJsrAes= +github.com/aws/aws-sdk-go-v2/credentials v1.18.6 h1:AmmvNEYrru7sYNJnp3pf57lGbiarX4T9qU/6AZ9SucU= +github.com/aws/aws-sdk-go-v2/credentials v1.18.6/go.mod h1:/jdQkh1iVPa01xndfECInp1v1Wnp70v3K4MvtlLGVEc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 h1:2FFgK3oFA8PTNBjprLFfcmkgg7U9YuSimBvR64RUmiA= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0/go.mod h1:xdxj6nC1aU/jAO80RIlIj3fU40MOSqutEA9N2XFct04= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/rH0vddEAamsHUIs= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq8CwNro0qm3Sru+7ZrP0p1c2HRs= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5xfDgrO7+dh40xdXjmSwc= -github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6nH5bMuDYVJABCLY= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5vO+np5mgJxxRMH6y/gQ= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJomKVzCgo/u1k9it4= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+IPIaPVEXYycEMi0IP1l8= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxVHiboQcDD5dcRPjvTaO7EgA= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pBexCXCwvSNBS7syZQXe3hVIHE= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgyL2/k3BiEn5a1AeBR8Qk/M= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWLWpdUUHbxBmdHnKtvdENQs= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9JPv7SRJX9YRlMNQ3EUA= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62UJJFRxvY7PKJGFUPYi6MM44jnpY= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbvsq75VUtbS2waQc9QMS/EC1CDXc4utBfANQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6h5Dn6caiKuY86UACNaxMh3UL5XhLHhc= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDYFzus27Rzee6aDgg9binbrJ7KAgCPW8= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRwh+gX3kXcZp+VQ0qaLVE= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5op3siDO3CQEa05bQ2ulEM= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxAS1bg3rntaMltGgvywp3JY= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOionUPy8JObJcvn21TvEpJU= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5YQyq5LFBYOfngkta3YM= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC11hIuePfiZfVOYKgfm1rZDIds= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprieF/Y1OVKg5zvPbAFyLuQGuoI= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/rBZIbwSOzeTNTs0zXdBrEl/Zo+rXk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbdEdNX1+vOM2H5QTyD38= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZdxlwv8evg97dQufb+U= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrAPCXtRMEtLASleDA/oPiMNe2fVA= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpHmSzP6W+JIGEQld3e4PQ= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drULsC2fz3imdjba+pYnTqm/mkmY= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBPjzVe72EhDqVLAMKmgtQoXdohzdfB0DTxb0= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZESLsNSz/s+LfXWs2Oo= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47dNh/U51t9mtlVRYfn5A= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMVg7GRx8jqKZrkRoq673E= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6sglQ187akFDPJu8fQ= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuKw61TsDbviht2BC/gV0PXQ8g4OXxd0K5DoA= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JPFSCB2igk8KK1uKRh5FpeSCBN8= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcgQlNkUzzDxko7AUOm445Tzs= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokKIux0SHqkkJzbBtDMkk= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA+TEOevVhA2u5RmcECE9lHLaI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3Y7sjOtH2NzTD6ngCO1PkdrrXDw= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPcX+GPmGbz07Y/1llNdly6VQ= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX/DLifEnaw4z+UPOFkvy5tMkFzNzenTYPv1E= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6IjsS8ytLoVZD3N0FEktpR30= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMac+CB0Nik0k9iMNW+t4VW3SQ= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3JDDgbvhuLfzgnMB7zLksL4s= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdyDAvFU9CC0qA2Oxi+bLliXQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN41+Cko0INmM0YR5zXAqQEQnta40= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuzn9ms74biIxu/YW7EgzQqlJWg= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/an1YyM1U/KXDRLIe8atCrs= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGBTm2f+tBs7h9iL35dhYGHZADY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z6qGShPCgi2pYhMDOMpHtvo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uKEakpDP/HCLroOLS7+7TykR56ck= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tTp07fBiSQpenGZD6fpDCwe0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0t6Zd7Yng2o+XM6DtLd/+WnN6G1lA= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr9svujyBtiL+P49lGkVTiWArXS7wY= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv0kfh9kS/IXuWT7KQ3KieJMO8= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwcQQ0G9NPvhHASzG+DHEJE5acwFdvQqr4= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdEVgydpwe7J67mihtIdTWU6bl6KkrnrYExk= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGFdXWIeVPzEp73Q5Nr1QQs4klJvYU= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe9nJvQOgv0hbiBO5jSP9i71LkMIyao9/jArY= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOYFStHLHirAKn5MWQa9wWF3k= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOrp7m+IbkK39VoclC71Nfl9g2Jnfko= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5LC8M0vwhlGlvuHQrboIQbeor84= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT0sKDAbA4pCDXEMHxlzOc= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EVIK1MruqQaWMplBXCivBsdJvQ= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dWr7l75Yq8WXO3OqpHmlAWDFE4= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorlvmboxxMjpfFFe18TkFOjBo6wHtSGGMAVhrs+w= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss5cLuCwOp2s7aZ53I0jRTb0aA= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf365Qj+kfv43xA3/C1MbA5rwn3TQBQCjns= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr5G9/mz492E/NZ8BwmcpCqOwMGe0w= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0kPb957Ik8WWK891n1TEIK82jorIAlr57Wpe0= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiNuxit+Ust9V2Xh9vIVitU= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zRXfGl+z+/G+OepNoVsDHRtPWM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbCblFgOa6v1LKrjab7uzxiSvx0= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7dRexP9npk0DKjBGHBRmk= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBkNTeMfO1iXeazduNjZghw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZMcOeDawZAmA2JhY8= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcBOr1dxiVvgp/eeh69VX51g= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hLC4Ef3fBUEBMymeJ6LA3oiM= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPomVLQGFHD9z2H0ygmWVglxTo= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5DsgS/GinFFru/K+zExATiuv36xw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq27Z9mw9XtpS0tmPjPk4jUGTgX7RM= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3NhpsijsoikffXNQjpfW6ClgtIAw= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DXfyTMLBQjePEBxA13A= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58VFfsO73Hr09/i3J3IPqf74HEs= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg9NTwRDQH9tne9Fk= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBaq2lNDYc7H6Gqjfo= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnIKqm0IFCwJPtJrwPULODY= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRodjXoSCG7WPwjeLgQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6SqbHvTH8F9MO/sw= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54chTlqVyR7T7u1qUlSECFJf4= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7tHumyNb7/JXpbvMw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/KXpIuElu3RK3U+fE= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2uUwOJ3Zv0evH3LE= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQflXCciN0qmwCTtRS5pfMZMRg= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXnSVkDvVtGb5p4wp3hVB6nunJ7meYA= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/d/KXH4I0D/g4VAmaYkD4SwzJjEYgWLbs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPqFh69RSzPvGIjKJAKjBIB86ZlfSg1lePJMU= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBYsZF60ovGQ+QP1zeTMRVduZN/f9pwR8fo= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFwi8ulI5dQIyfxY7WRkPIqwxzmhfgog= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPClR4nacB2z2Z9GMY= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1DdytzxaKpkSBuPJiCJHJAka0x1Kw= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93SsPqw7zHtcLDc5sE1uxQWv3qo= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910QWdjQIxfi4syx3Jgu1bRCJ0= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl9MJzdgYGWLr31S4Ot4MzM= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56N9yckM6ECJx6Pk= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/NoD/1HKd9yf+XB6F50/VU= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/ybLKdSdcCttE8hw/+NK99E= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyXqr+tT5T7PckuuW4= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2dQvZGlIXeD1YuPE= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rFiG2+mQJK7Q3F7OU= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OKooVwFZIOhKIxXX7OcReY= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpbD+xLmYKpB+eH7ZHBvaU= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3BnF+SVU1h5VKTS+4Wy5bE1xRBuuCU= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQzPRBBfmkZeeWh8eU4= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9jtlVhL6ErvNd6FoL/Fw0= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2Jax46aZYwgEZzOdh/fIJDWg= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyxSp8lfMqlvgmxExw48mhM6tYvw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRKlJxdsxxBLhv5w5eBBhk+8= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUglJGh7lH+jOpDkiotb0IB7A= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfijI55jb7wB6vFiJo= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsmAiYIKWZRqBinXrZXeg88ftz2E= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKudWP8MFS0fiwzKAe0VK2UfTQE0= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 h1:BpZCG4dzq0TD9A/aEZiF/uCU12AtHYnmjSvo+TkaVIQ= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 h1:vSoGG3q9KhtWQ2UQz0HOrO2OYxFnmcpDTfiuV7jwgtA= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= +github.com/aws/aws-sdk-go-v2/service/account v1.27.2 h1:3Ty4wy83i58eNiElTpf7Ya9BFpVOdPonfk49jJCIFsY= +github.com/aws/aws-sdk-go-v2/service/account v1.27.2/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 h1:Rfqqo14uUh05AQcrgmigh4s6AECbanfGEEJYfj0qgmg= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 h1:PPj2SnoPf4VA3fQenKKSIqKL2kavEiBqGDRMTuAC3nw= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 h1:ANVsTLsewss+NP/IUN+rihzWCpUONNDCH+7u9LxfdpA= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2/go.mod h1:j4ljfkDaFO0JGTmRrewZX2GrYRszvPfTCiSuFFEJSbg= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmiOAFI+ztwUa1q9Vr7u4MceyA0B4Rhg2E= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 h1:C2pxVJYYZV9il2q/aiSIqAxZD9Bx87LdIlTV0qYpvZI= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x9s28FTv0JL0RS7CeOAdq4= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 h1:ukEmvOnPItoNWDH9RmxtOYNmZBTj4YpJR/ZhwzMnADE= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 h1:iX32f9UGNPLhdlyu7Jl8QfuOr/P1Lbi68Sx3DsHhrgc= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.2/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 h1:hYsUHj0wgtj4ZNRNKpnZ24l43TL/7iDpD0xlemzxBO0= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.0/go.mod h1:PLB+glHatjJZVbRG5Gx0TodUaoLxdNy9pDmOTaEV2vg= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/VzguUMWd+B2gyuBDkmU= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 h1:lyicd67IMM/eRoQaKpZdImaUOQUexFbpIDT71KayWUo= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 h1:9iXNQ2b5cDSmZHjNN4j0F/QRGTiA5kpGV/JIPPi9gO4= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 h1:rhvd+Sza4DuXzrTGLsJ1jO6wdKnb9KXqXyw4r6o4tIk= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 h1:FT0Y2iOC056nBalWZU0s5jfpIoFieN7mZR6H028U904= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 h1:uFp6NEFas2RXeuBr1DLN/VoXuia8Xh3NPe9j8PsHKXo= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 h1:QOsVXn4JOYT/hijI83NKENLuPBgNnoCsZRYevszDFMs= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 h1:ah7hfvNnINvdcXOqkasIJFvti3jCLCQZTk5SyeqRQG4= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 h1:pcho6kw8xOS5MV9yHTySeO36FC/QMC4WBy7RJAYB9hY= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 h1:HvA12hXcyI07mrRK6143JAkfgRAK+RXWUwtVHTatHU8= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 h1:39sQgVlfCQkWC6Q+lKa1sVJuyLouiHIek3lyZz7hsCo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2/go.mod h1:ieLXOKII97L7fYQa7Xm+PsCGJBaskvWk+wGux22jRCc= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE5uGKGIIPGjyWnyofjbu7Bxb9LmHg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 h1:N1wHW0oAUV2ao2m7nO4GrfdjXklCM7JQLEQ1e0zBJV4= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1/go.mod h1:+UxryRSMGMtqsvxdnws+VpNyFYWRkw4ZlM+5AC160XA= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 h1:4YiGEEgooJbSl88+t0NTqRUrjsjh0hcoLrUyrEj+qJQ= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0/go.mod h1:P52KZMWQ26jGqhCrkIqVvzDgh8HRhsLN28v+tRNOvZg= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 h1:CZYoQ2fFHANjml5Mn5pOE49Qt0I+hV609IQWMAEfvxM= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2/go.mod h1:6gViEWwaPejA9LOah/Mn31v1zfANfQovYWmp4w+rt1U= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 h1:WmDAyFGFt6p8d/Xqh3ER37W3lxUxsQltQ+XjF7PDwJc= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0/go.mod h1:0/USfxsqE00FryTj9aacEC/ufCg+clmEIt1DlQvRW68= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQIHijjP5kmhn8u/jp0U/yU= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 h1:NunFZHMwVtv7pZP348zakolv1lRLuq06xaRKPPI6rBo= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 h1:AVbMDG/wcIMAcJBRtXzpEIC5p3Y/sG/hsOvKF7j/imo= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0/go.mod h1:v7oA5ayEizyswwdsNlsXSNI69FSAf06tjLwXkKjGUhE= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 h1:TtvQtkarc56cSKeFWySb0xYHy8fQ6pVVeCIrpSaQMGA= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0/go.mod h1:ngNGhK4pbO2IoditdtA6uaC4VB+JKi+y4Z4+Pq8c8FU= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DASC0gnUiSauGfyqFdm/7vbcpS3Ka7J+cHmgew= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 h1:VX9zcDqLRdrhkIdvm8sQJBIbfz9OvmH5UZJn8K7g10s= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 h1:knoQ9bJuxXStprRcf0QDGqnQtlfcMrt4UC5IjiRGwB4= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 h1:6NNrslvojclUa8DhsMWzi66Uxo/5S/Q2CdOh4+ERBFI= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.2/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 h1:oABPzKfUcm/KHlQ5nYr9sxmpwQp4jorqhCBN3x0uq/I= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 h1:gYxiWv5qRdJEITZoZLws3ulWvScdm2ghfVTX40CfsC8= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 h1:CPpJPsaVCpno+RaolifsilbkrCXj63o9BskbmuNP6ZU= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 h1:P94OfRObDwjklbvdJTGuRZXeGYF7Bv5NNUo+I628kKQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0/go.mod h1:l8epARFi0/1WoAdjQf4VAiwkyg8YNm+8Xffd5t/KxRo= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiACR05QOS0q58U8QY= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 h1:94CuP2LDRD8zwfJIm+oOEx0vRuwodfon0BPImHs8aww= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.1/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 h1:5gfKj9+gRRVTzsrDp1z8AoEuSV3iLZpDJTiKsSqet6I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8fltzI3o5gsZ71mqqfHhePHvQjrpsFM= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 h1:1PO/iNikPYeD+b4vGIC0D/kmlHFNr+K9Ti/sL4PmJ90= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC1TkdrH4Z43QVHk= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 h1:narXLgKIbS6nFYldm57umsw1aExyMbxLdzKA4spdiaw= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 h1:0ADY6sOC594lvWksDrmFddKvP84KSL4Y7zvs2pzR3/Q= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 h1:Tq2dmRDBSaIX57tWZmywS/oGhA5qPmMXT+fjDsaYTao= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03iNY3FcPtz9h2EoAixPRjNE2li8= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 h1:NEiSwGWC395TVfy8mHw1wxLYjJqQ3qJwtk0BHmpiDh4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 h1:FRn5UEas0vIL+fGbQcnB3KRl0QIjR+IRv8h5x8xjODY= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0/go.mod h1:jyjTKrkxcH3DSiy5Oc8Acgcw/Mk0xC0tgo77aPPJXN0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 h1:3ZKmesYBaFX33czDl6mbrcHb6jeheg6LqjJhQdefhsY= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3/go.mod h1:7ryVb78GLCnjq7cw45N6oUb9REl7/vNUwjvIqC5UgdY= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 h1:xMmJPUT0G1q9+I0mzH4B6oN9fB5PkDoD+jvpVIcom1I= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3/go.mod h1:U0JFMTY/gPxV07XTXXz152nX0Hg1eBenzyslKF2j4j4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 h1:ieRzyHXypu5ByllM7Sp4hC5f/1Fy5wqxqY0yB85hC7s= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3/go.mod h1:O5ROz8jHiOAKAwx179v+7sHMhfobFVi6nZt8DEyiYoM= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05RuxzLcjT+S5ZpQobj3ie3UTaSf2NnZc= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw36rErepMlJyARnfAfYHHqD/kBR8= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/pBO1QfEd79+0XsB1pbjY= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYeWgTLgbW1KiAJ8Yk= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9Ox0LhKSvU0812W0= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk+CWDAQ/WWHCTvk/DKlQ= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvWYrQxrJmyT54aohWSs= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ6KIJ4V+9LrZm41BCH7h/xOmI= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfyPMWDpNoJH/pIAMIlLI= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFeo0WnBJ69vIVuiyS4Q3tCU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/TXYDjbZXvshpg3pl5ks= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/K5BYbEXfwztRG5M5EOtqXAd6uHqE= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1kS4ItUgFhY3gSFAKbYD0mBYFUK6vvdk= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqOMzl/bDbAsfl0nzLa2A2LGw4c= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVBlMSfSo5aDlM7b+o= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtucfgoU+866Xu45/6T/3Bmky/+LY= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZrGUJBnYv7FFo4j94zI= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQshTcIhPST+L3FOvzNJuZNWVQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEqc89raV43prmVry2b172lQwYAdbMh5ClvYgM= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hhcin4Vrdv+NAk39v9Bs65zkc= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrvbGwvkLUQKullX+qH81vAExkm3I= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFGP3lxwa8CJfqzJLwXnp6xY= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7UN8O+ePHOukC+qpj7eUjY= -github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5ZplpbOnFXtq2TJSOgAm5XTMQd8= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yzGvbL3msBcrMZmE= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoqJ7NkoKxapHby/g2+VA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq1GyeGv7Dd0tmEvbGTMzKX0iQ= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43oI+x6Bm3l4UMT63o3kQOheL7M= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+GJlgylsOBfHpQqfgpl0QVI= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXIIvx/69lISetJyPn/O01Gltmw= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/AxeVbw9z0xrOjLhBUz1Ry5ERGp0s= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy3GZUjrR8Ixp8bxuo4dd9WJXXN1s= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3bvZ0yM6LQwoqTmdsx/W/fEM= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFsGM9gyN/RoUgvQBQmIj6c= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXali2QeL+WGXUBew4= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnYOyrLz1xs1EY1hE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZMeF17Cve6tfKIzITE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/8bvBIoprUy1QYeEYaU0= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNUlxPO5UHr3nXAqakzYV3gS+kg= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaqT25cmhakK3rd0d/8Wxn2VwbDIbA= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNTUDw+vzcm/DiYsIaz5Nbg1HQnHY= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi97aiWXNMkEBFQswuY3IZVeJdWJg= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/HpbeaUtqtalIGN+SW3s8G0tpgBk0= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUFKjWKNQNb64yplb0Z9fU/YqpS8GZEzie8= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TXt5amOPinYayB1oA= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPCS2/GadcFuGg4kA= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C4dvFhP7ypQfJvDncmwimHQ= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCFgYBOJotsbXS3yaiW6vFI6iPfK6o3TiWI= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0PCuJ+12Cd+2NwRejcaC8UhLrJs= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCpGHU5rpaLf3VhZlo8= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075eykwvu1i1n2Mex9x4Lcs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+jIExhMUYU9uor2pVYfHEShFWjL5GGn8= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmAaOikap1971w6SrCN/vvcrDR9SY= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0XNVyefAaogYGufA= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY2aFzOXp2ypplpsYa5mcU= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhTaC+Au1n92O+vNVKuGxDpYDXZJP47/I= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1vCascKDbZ5C9MJNt7c= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK80PnPa4XqXoQKl7PFk= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3WwwLeyehPOrG0/N/8fc= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF76wFQNNQLLu/RUFPx32ulM= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9hgk36ydnybnb6RwU= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUhwp7B8IcemxgUzk5os7KL+o= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro4LD4IT+qYi2WUsQ= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBiagko7v0EF6xwW0yo= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ7c2sO4e4yMD6vLss= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XMft2EV3FXR/2STXFoSfn4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS9nLw7zsG8jnJHoBDW0HAIAtY= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzIYhI9rmN5d+X2UF7MPGXKvjx3G/XGGM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigilserDQum3vfQQVY38RzIuYk= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 h1:KNy1faYRqcN1PYqtHtWENQnc2GlyknihYHcUw1kwvsE= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEVCtNFZCMz2Y8S103j7uedO7bh9g2iXtHMcjuI= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2idqDf2hIksDhPgRaFQO1hb4yCk= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmifR/+T5TuXIHn2ivu8zKQ= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItEhVwfP/xfHmNHtENN8VoiB7NBFA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gSDqAJIoBDNmjpNihYjCQORAg/yc= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U1M4miaC/+iLFjllYtvr4N4JfxFfvHv+wWvGrbZ+E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1YqSV8O9QpeuDTBoDncph5pJpTaIeK5FivKwfSI= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 h1:Peg2o4ykhpoUrGu+teNnBVL5AnNoypKjVv3M8nbzGUM= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 h1:LubFJpiNFFpuuvz1d0wUtmSfyy/XO9zdw7QdlmQX91E= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.1/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx53ImR4HUPCO5/qS7a48pek= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF15sTosQczlMR5nAkT8rC0g= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNtsXPEo9KPtChTbzzNbvnE= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9gFDMT6fFMNCq3H1V/ZpZA= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsPM85IGqw8ixfRCMMMT8Nz48= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWkJViT8nwdUd+1bMOnHpiYI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggMTiEpq+QvvmkVnnxDyJs= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9cO45R0i8+fFJ74nyb7S+unUpQM= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLxm0shtfYujiIR7ERqQpJtsAM= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4YAL2mPdmgf2WkdRxQ5RtPP00= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1:RP9nJ5v3fPoUFZOKz/NRPqS9PsWTY4Bb0N8AEsaMxKs= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0LsJA01RzrpO/oyNmlEc2w/LLvcN4= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKuDgy63OVHrvVME8S8YaBVSofI6WwtGNH0XwrJ0= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkAHHvMTkWq/IzoDNwRHnT9/uy7z8Ds= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwViwkbP9rcD4HuuyXsgUO0KZ04V0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzfeqnAS4K3oRDEVWY= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY/S8ej2IBhGu3XTOv8= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQF1iRGhHsjA9pSW0= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIup8fr4HWmUSwVNAni6s= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJEU0Ohp704KkfDdumIbM= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+NmiSnwDSWpU7+wP60Q= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2ZvTopJJhjiar/8EEo= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7PNPCQjsQBEIYqTLA= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0FOL83Jc+7xTHBqtItk8rKMBM= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5MpWXOQnWKMsZkERDVcOZuNx8c= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 h1:Wdc/2+ZT0SOKPu11GNwU08KR6/jREOhmMUrF6TbqD+s= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 h1:AAo94xHcAQFBxzuS6jnIp+gEKfWDoQQAbqyhKmMGOYo= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 h1:HctWK6IduY4jkWT4t5IIatg0zYhG1uvLN04cVjwHCnQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 h1:kCJG+jFRrD54jRPaat2ViEHVHd11vvTFd03rt20fHrE= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbrHuueSpLBnhVkgDo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30VaLreZURieCr0sKiuRPXTHmQ= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDpsYaGrl3FPcQn2zaUWmp91pXw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0VnligLJs4O0DNTLYYPkQ29faFhmcho= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXmWNe3o/0SnoI6xMaTdMb/AgN3WgQ= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zuG0cnmJPuR7reYm6maElCEjjx3Xw= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3JxyzLPK6IBq489lptSrbj2ikcw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIWqxViY8BrdKxPMaQe0s5g= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3YyvFKQ5lQKnv2EUpOprtM8TfVeqAk0rYc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznLiKrc72n4j2aDPAbXaj7YC8= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw5kMoliPPzI+WJGM= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLKu9W2gK8gIGTV4+z8fBsptPY= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7YbMbVA9k4LN6dR+boo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn2pu7pW3nwXjFMfe6HE8yIyj3xKY= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+ZquOi+377Chmz01PhU6Pdt8= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 h1:p6NR+K5innSuOAO4PQlrXGbeSzRFQ2u3yFJpTUi1iFM= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 h1:09b9HHUpdLKsCrWa5+juB/fBXhyNLRq9t3gevDRUf4w= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.1/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 h1:upi++G3fQCAUBXQe58TbjXmdVPwrqMnRQMThOAIz7KM= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4/go.mod h1:swb+GqWXTZMOyVV9rVePAUu5L80+X5a+Lui1RNOyUFo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 h1:JmmZEFvBaUH1m/38gJbdurfKXuWwsEwdNmob8wzKN9I= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2/go.mod h1:Xx0NjUVWuBTEbWsPKzlb5EGM7CXfNeZT/yYuDs0LU9I= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 h1:7pjtnLwOsSkXqUSUh0eM4FvtBrEAIIpZnpWMfYMInAQ= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2/go.mod h1:Mkxqo2gpKhOv6hzBwASIizK/jrMYRYC3jgxou79HPFs= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 h1:2cLDi8pUtPZpy4SxVl/8qGSOEXD1C9B6S9DbYdS+il0= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.2/go.mod h1:t+dAKgSxvyyBLYfX7uRjVWLmSfB9oHVYrnr7xYgB7nI= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3r/1s2/LGP3I56Z8= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rOOwKLSc5jvNdU1iang= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 h1:6yvhusf2JqDouf2vID1uxgQjuLje4kXPXRbFDQxf93c= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 h1:pVadjOT9l8aWdRH6vNb9RzdV9ogiAL0z0xllp9odDOU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 h1:JfL0vQRSLMJLt+XSsXeVxHRNEk5sTNaHqff+mzF5tRw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2/go.mod h1:L8AA5x3ERX5vhzrxTsRoTJxtMk3VBtzUclRE01z9HP0= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiNWpiJ9DdB2mCAMzo= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 h1:SKdQK4/Q7vIKIUtDd09ip69rahh6e+hOtfCYgNvtDEw= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/NkeOgqlMexDsikmRhmMdUoxSsM= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= +github.com/aws/aws-sdk-go-v2/service/location v1.48.2 h1:/6HHSaPooetm78X+kIp9pLr4f/cWKA/uKvFvI1Tih0o= +github.com/aws/aws-sdk-go-v2/service/location v1.48.2/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 h1:EP6rsrGrKlJ5mBsODeBBcoqHf/tX42Za/m8yJLiKWRg= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 h1:JaDARBJwqzSg3Ccclf9Gzw/+kqG+orqGQAKUyWfsUQs= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0GMovPHAO54gCPbiI+zzXqQmS0wg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 h1:QjVz2wrfmEEpu8G3FEo9gF3umZvi7unsG1b99FtkyzE= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.2/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2/go.mod h1:xq+4xu0T5W23GDTPj+olFc6wqBrTj8Mc2wSTvqMMLv4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 h1:k1ia1mxgufRVSzwAaen8l7/VbFnk5xu/6zJMYzSgMEg= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2/go.mod h1:9gwYWqGoNfNs0MHi6F1FadJ2aai+z9E2dkTFNBZlrLU= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OUisLz0OcVIsDKwX6zMvom3tBkGPk= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 h1:JOdUdSV9RDvZyNt3/oWlIk2y4hddH2vqn6BK6dqJ9VI= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 h1:o7gKGdpE0AS+kdt9pBi+gQyN2jZb1MPo+CE/iblnaBA= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.2/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 h1:XJOb8AutXqrywbDXa5nlIr+0G93AlUltuYoXWHprCyE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 h1:nk8xdDkgWZAU8GHr4WUUCaevs/98WVPPelgRGxsNh4A= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 h1:/8mz+v/viFY1i8d3+sVCZi7T64D5eRmN9FM5EonxuGI= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 h1:Z0hXXBcnqPdpmQwf/LNIaqlgxcDs5BWC74JR0sX8sw8= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 h1:U0b+yGV+uu+9JHOfn9bUHPJIenoelWvc4xLN35JgKfI= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.2/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 h1:hdwUjAp9efZ3RMpdndoPG4SM/LXmyp0SZ9AaBoPUcOk= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 h1:I4DJs64ligwwPzChWFXVM/b5FO9FjB4bbrbIIXmwGwE= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 h1:o69fIeRrr7TdDBGq9uh9y/4Y/5xMJLSN/LBMIZ0fJGk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 h1:FFQjXqKbTFgN/BT9/4YinF3vwUeiZ3rGyhLJ71v0k2Q= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 h1:STec5l4m/cd+VUPDC+4pBqGgTFTanelfJoKiHcobT/M= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.2/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2/go.mod h1:PxKvSpaiyU4RF1vqdtgcjNz4UfzPhCmNEvuLEtbFdNk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 h1:DK4wkPe5hqJ/lGenYmlzP+xEaTVufeWwlcwBYun0yrU= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0/go.mod h1:mPnKXr7MlpLhdPrDIp7A7wrn8KZczClUR3cCiOoiurw= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6EqsTDpmZqtOEwMkQ8q/co= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 h1:H3iWnVnEPYD8JOkKIvgALPCTbinIoebBTrNfOAZ+sJY= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 h1:BvsTLbavBCIWhGav8Rm/vPPyyhDwkOMSi0pkGaohCag= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCCSKm0gUruc8BFzFwjvmeLZBE= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 h1:45G3hjtf001+XN+JgOf0j6IufhHJfGIKEEMvaTBqqH4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uKqBVkQXOxDfKWkwZMTHMLZrXRFI= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 h1:5m5YPqPzZ2kunWiC3pld0wHcwWzx/U9/VFpWfkc1OJg= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 h1:Fx3su5YVfkkjdbXZl56T1KKLsdIxr+q28VFoUXDWsd4= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 h1:Ecwq3xNoQQYKCvssG0zKU1ebXw1dMM7uscXqn8w1I7U= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.2/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 h1:yBi89yZecBo3z/lKtOYwveOyGYBCqusZb6GbircmPXU= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFMC+vZiPGjTmZaeaVY+w= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 h1:RibOkweLBwdRGOxSL154qu294WOkTGSv3cDESKOCaQU= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 h1:hGjHhpdzNJb/IPaRZT8qoClVieXa8+arkgtcgLQ1XkA= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 h1:NXywrPzON1EICJEvKKI7yaQ8XCzNhsJQUsD95stqZpw= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 h1:6U0E5il6rPEcS97BO8XVSb5HBOa3zxblhdUgm9E8pcQ= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 h1:7PbqJKf+IU/y12Wn63vOw6PTHXfGp/aWeD4MfEfFRGo= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= From 022badbd18c89e8492cb771f0a125cb600866b49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 09:36:47 -0400 Subject: [PATCH 0636/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 532 ++++++++++----------- tools/tfsdk2fw/go.sum | 1064 ++++++++++++++++++++--------------------- 2 files changed, 798 insertions(+), 798 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 325724f7587c..b75c10a158a3 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -18,275 +18,275 @@ 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-v2 v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2 v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.48.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 // indirect github.com/aws/smithy-go v1.22.5 // indirect github.com/beevik/etree v1.5.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index e2eea26e2202..786ea3280559 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -23,544 +23,544 @@ 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-v2 v1.38.0 h1:UCRQ5mlqcFk9HJDIqENSLR3wiG1VTWlyUfLDEvY7RxU= -github.com/aws/aws-sdk-go-v2 v1.38.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= +github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8= +github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.1 h1:PSQn4ObaQLaHl6qjs+XYH2pkxyHzZlk1GgQDrKlRJ7I= -github.com/aws/aws-sdk-go-v2/config v1.31.1/go.mod h1:3UA8Gj+2nzpV8WBUF0b19onBfz0YMXDQyGEW0Ru1ntI= -github.com/aws/aws-sdk-go-v2/credentials v1.18.5 h1:DATc1xnpHUV8VgvtnVQul+zuCwK6vz7gtkbKEUZcuNI= -github.com/aws/aws-sdk-go-v2/credentials v1.18.5/go.mod h1:y7aigZzjm1jUZuCgOrlBng+VJrKkknY2Cl0JWxG7vHU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5 h1:WTNSeU/4f/vevwK7zwEEjlX27LPZB1IwyjVAh+Q74iQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.5/go.mod h1:O84Dxp02jFDHRDbziaCRqMbe12+o+qih3ZD6Dio+1v0= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 h1:o9RnO+YZ4X+kt5Z7Nvcishlz0nksIt2PIzDglLMP0vA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3/go.mod h1:+6aLJzOG1fvMOyzIySYjOFjcguGvVRL68R+uoRencN4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 h1:joyyUFhiTQQmVK6ImzNU9TQSNRNeD9kOklqTzyk5v6s= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3/go.mod h1:+vNIyZQP3b3B1tSLI0lxvrU9cfM7gpdRXMFfm67ZcPc= +github.com/aws/aws-sdk-go-v2/config v1.31.2 h1:NOaSZpVGEH2Np/c1toSeW0jooNl+9ALmsUTZ8YvkJR0= +github.com/aws/aws-sdk-go-v2/config v1.31.2/go.mod h1:17ft42Yb2lF6OigqSYiDAiUcX4RIkEMY6XxEMJsrAes= +github.com/aws/aws-sdk-go-v2/credentials v1.18.6 h1:AmmvNEYrru7sYNJnp3pf57lGbiarX4T9qU/6AZ9SucU= +github.com/aws/aws-sdk-go-v2/credentials v1.18.6/go.mod h1:/jdQkh1iVPa01xndfECInp1v1Wnp70v3K4MvtlLGVEc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 h1:2FFgK3oFA8PTNBjprLFfcmkgg7U9YuSimBvR64RUmiA= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0/go.mod h1:xdxj6nC1aU/jAO80RIlIj3fU40MOSqutEA9N2XFct04= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/rH0vddEAamsHUIs= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1 h1:eNBKepQ/F7RMSemdq8CwNro0qm3Sru+7ZrP0p1c2HRs= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.43.1/go.mod h1:ubuqhQ5cwPPRnuqkDwW0BkA7s4CTsLdRhT/F0Jh5aPY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.1 h1:slshma1csbj3bC7/QR4vqN5xfDgrO7+dh40xdXjmSwc= -github.com/aws/aws-sdk-go-v2/service/account v1.27.1/go.mod h1:yFx5lCxY8Inoi6DAnHA4zV99t9XK3Xm4jVTGJK834yg= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.1 h1:01jLDh/rml5I9qwGpxArK32oRYA6nH5bMuDYVJABCLY= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.1/go.mod h1:fdYDfiFuQij96Ryxl5uJK5xGAjyLhHGiBwquH7mpuAc= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1 h1:wY3InjxjvCqJoqiqlRC442B5vO+np5mgJxxRMH6y/gQ= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.1/go.mod h1:z6+6Jmnp4CXxXzJwydQhFVtPwYu9+6oTeEzx3oRcIL8= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.1 h1:fZw5YFGX01AFC3JLmwrZw4/ZttJomKVzCgo/u1k9it4= -github.com/aws/aws-sdk-go-v2/service/amp v1.38.1/go.mod h1:LouVPFytdICLhyHVjIlFAO4nE5OJi3KXO+VmOhKwGWI= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1 h1:miPlrPodLUfiiblQTwUbbo+IPIaPVEXYycEMi0IP1l8= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.1/go.mod h1:UfCqtNa9PMpuD2KSJ8DELqJpgmG78U5CoUW2Vf2ZWKQ= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1 h1:t9ybZKqU8xrc0fkalJoxVHiboQcDD5dcRPjvTaO7EgA= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.1/go.mod h1:WuGmD7SWYen7UZcDGptMvzl6bN5OZ1x+Io1eI5XN7kU= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1 h1:4OnCOkiVtbUd5D/f0pBexCXCwvSNBS7syZQXe3hVIHE= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.1/go.mod h1:qlUNYJtHoTWiJQMJkgi93jwRNRt9uIOUSMZrwMODh7Y= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1 h1:5+BGgc4i7GOyaz/CYQQqgyL2/k3BiEn5a1AeBR8Qk/M= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.1/go.mod h1:iC0QI9BkqzOa3bqZ3SI1GGobEOML7mV+tBTnh8hOoYI= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1 h1:WBIOOySJdIoO88afInaTWLWpdUUHbxBmdHnKtvdENQs= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.15.1/go.mod h1:qKKz05wkdIZ+tkR3rnV66+sxYKIsppwx2hJiT3fuFdk= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1 h1:wKW9qXM4IPFSpdFjkEEWpEH9JPv7SRJX9YRlMNQ3EUA= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.1/go.mod h1:1vwP4HwCMVBINGTry8iEgeWJG8T7BCMUbwGq6jv2fyU= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1 h1:cF5ZglFO7JCvLa62UJJFRxvY7PKJGFUPYi6MM44jnpY= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.35.1/go.mod h1:BE6N7P4vcnkAK/ThYR7d65SMt+zjxpo3JMI+ccryyvg= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1 h1:zK8qm7xbvsq75VUtbS2waQc9QMS/EC1CDXc4utBfANQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.1/go.mod h1:5KVddKIBcX5dqvw5NOxIW7/c5m2eP5OpdgOOtOmZV+k= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1 h1:oBXtIqiOhjl6h5Dn6caiKuY86UACNaxMh3UL5XhLHhc= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.1/go.mod h1:g4GYCgL5sPZYHuq+20i4MbtbyzQVtdq46RNBsXtl8OA= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1 h1:dy1jxtL1LavDYFzus27Rzee6aDgg9binbrJ7KAgCPW8= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.1/go.mod h1:uisXhUwAotYm2Fq/wZ/o2n41DjZJ6wOqOPKg3wg71vA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1 h1:vKc00J9TNUlmyoFSkgHzMyRwh+gX3kXcZp+VQ0qaLVE= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.1/go.mod h1:5d1YrmN3Md75Nu30REsNbXZuiFPZr/jFgB66VAP62v8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1 h1:V15W3RSJ0QDxg9DsBl71Q5op3siDO3CQEa05bQ2ulEM= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.1/go.mod h1:V4jZDgQOKB2SQReBF+3/0isB/C2UnBV4A//4GhXZw+U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1 h1:n8CiFjwOhvl2l3WZKcWDxAS1bg3rntaMltGgvywp3JY= -github.com/aws/aws-sdk-go-v2/service/appstream v1.48.1/go.mod h1:i0zZFMnPUEbkFUjy5cgpbLONEpFQ/M1X+K1VxYG76l8= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1 h1:fWBIyW0dyrjl63OWPlbhOionUPy8JObJcvn21TvEpJU= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.1/go.mod h1:wktq06C/DKgzBnfiAG91irzV6V/YZq3rjPfZn+Yxfp8= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.1 h1:xMPewZhaBo53MhgBiLlMQzA5YQyq5LFBYOfngkta3YM= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.1/go.mod h1:jph/XCzsyc69PoY1QOXFoGm/bk5VC5snc4uFYy6mrGU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1 h1:148l+Rn3YAzEMOPTgC11hIuePfiZfVOYKgfm1rZDIds= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.44.1/go.mod h1:Q3FAo0fs6pq3Mgs0OU4kG73jfFFe8Q+n47ocWKdDUNc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1 h1:Lax5qsrv98BD+rhOprieF/Y1OVKg5zvPbAFyLuQGuoI= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.1/go.mod h1:MSY6dUZpI3obWYZlH77CXNR0gOsAX7bKVFv4fOIKODI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1 h1:XLnV7RzQRN2xv/rBZIbwSOzeTNTs0zXdBrEl/Zo+rXk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.1/go.mod h1:Oph1NMrQKGeygUJXWkxSub/ZaBHoXCGL0ikBWKqmwQ0= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.1 h1:HWZuWUyH/fr6CBXG807hrCcbdEdNX1+vOM2H5QTyD38= -github.com/aws/aws-sdk-go-v2/service/backup v1.46.1/go.mod h1:oZRnbfpP4suZxn9T13hpOy0JW1UAj+dY0cHuvQEzhl8= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.2 h1:4skMprYSh3rLj7br7DFgZxVmZdxlwv8evg97dQufb+U= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.2/go.mod h1:j1X5R4qrXpQlWH8JpQyTGHQ48KVTMyl4+W+bETY2x6k= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1 h1:vXsul4QlTmTWqohrAPCXtRMEtLASleDA/oPiMNe2fVA= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.1/go.mod h1:u3oQZCGzxgN7coRlIY7WoU3xRDm9M6hXL1S+vDMwNHo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1 h1:WduEybbGs+y0CoprQ51baHpHmSzP6W+JIGEQld3e4PQ= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.1/go.mod h1:jogJ8f7UaV3PgmblRtn1AJ+Xe8k+A6hjhHLUZlNI74s= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1 h1:oQIZZH4wc+n7wD9drULsC2fz3imdjba+pYnTqm/mkmY= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.1/go.mod h1:Ff+BaL5h7/pTZxEVZfIFvqxD28GSDr05gjOErxsEvss= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1 h1:cL66VSwBPjzVe72EhDqVLAMKmgtQoXdohzdfB0DTxb0= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.1/go.mod h1:y63i77wmkgOiBLuDo+BhQIkOogCi4YGEfWw8FLziSyA= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.0 h1:FrT0nooWeBwDqbiuXYf/NaXPZESLsNSz/s+LfXWs2Oo= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.0/go.mod h1:NGrGJEAUifD+yk6yDu18vcwB0/onrE/2duTXyWtpQpA= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0 h1:jw5FTanwN0l9vkggfjOiEf47dNh/U51t9mtlVRYfn5A= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.0/go.mod h1:hN7Azd0je7dP3pNZX2zwUqQUe1FnwT/lBqXFZcyeF4M= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1 h1:1InKXFSD7WQ3NW5UfsTBTHMVg7GRx8jqKZrkRoq673E= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.1/go.mod h1:Hy1FNUMiWlbH1j54n2JHARTWa2s9SuC1EDV8/5rWneo= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.1 h1:fw/zmJ07f43AZOBGPH6Hk7AYw6sglQ187akFDPJu8fQ= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.1/go.mod h1:gAVdkdTSn/Kp/2aj5bQWX6RAjBtk0mhtx9kulUz6IdY= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1 h1:cd91MAQuKw61TsDbviht2BC/gV0PXQ8g4OXxd0K5DoA= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.1/go.mod h1:hX5xwl8FzmIQMxfkaNxMbGVnTzDyCaNCe0qGApFDSHc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1 h1:Czg6OUb34u4MhfA1JPFSCB2igk8KK1uKRh5FpeSCBN8= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.1/go.mod h1:TzNwrF98kIjcl1NOYUqZ9P0OsUsD1GN8fSJrt+gOUMU= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1 h1:zAGk0BJJmWwd63AFYhOcgQlNkUzzDxko7AUOm445Tzs= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.1/go.mod h1:s1Uq5wrZPR4SHPux9chAZ0woE7zzpTBaeFDOxNWEfOw= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1 h1:Nudyvo+YH3EjgNAkhAnP+fokKIux0SHqkkJzbBtDMkk= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.1/go.mod h1:ZuzNLZis3yt5/NyM5jn7SWQ3uhtq9I5c3JQLcQZcOEI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1 h1:O5FYEva91w5uHrSRpyA+TEOevVhA2u5RmcECE9lHLaI= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.1/go.mod h1:3i2UYK7+Me+/0j/X5PWt8lXpbxeIEHFqt9Y0yuP3lBU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1 h1:JS2lAj0wvcbl3Rdk3Y7sjOtH2NzTD6ngCO1PkdrrXDw= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.1/go.mod h1:CSZ4pTMdDdwePgGxMo5KOfOw+I0r0cOwLsyULTjFuUc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1 h1:QR2TkN2QUCM6V3KHIPAPcX+GPmGbz07Y/1llNdly6VQ= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.52.1/go.mod h1:qTc2+9g3YGM5d/u+c4tmHun6vmEKwBjJ7rEM6N3qGVI= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1 h1:HixcDncX/DLifEnaw4z+UPOFkvy5tMkFzNzenTYPv1E= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.1/go.mod h1:9FB5f838TtTLjmTrEkeZL1d75cbVNrTgQodokjUtwNU= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1 h1:QjfvIM5cC1b2G06f7FI6IjsS8ytLoVZD3N0FEktpR30= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.1/go.mod h1:KcpoisoNJWn7kQf+b6fzdBDBtxzLfwc2UL+0stF8pVk= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1 h1:nGHxok6RyV1Pf2jpvcMac+CB0Nik0k9iMNW+t4VW3SQ= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.1/go.mod h1:Dw/juJ9555u2hj4dnUA8fP68B5IHzS0wnxaPdNJPWNs= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1 h1:WEkzyxaakg21Y8syXEL3JDDgbvhuLfzgnMB7zLksL4s= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.52.1/go.mod h1:TSIIBxkIwUawJ9JyiymBksYZYsvIv8GIF2DkrlcTc5o= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1 h1:gpmVFDNwQL/Cp1gDXcNdyDAvFU9CC0qA2Oxi+bLliXQ= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.1/go.mod h1:s+juX6Mf6RF+y14IK9Ed02U/q86Tqc3PKHIDtuzBMa4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1 h1:YivgqgM75ipXrODN41+Cko0INmM0YR5zXAqQEQnta40= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.1/go.mod h1:0jzhov8WzD4VylEv83E+RkqA8W6k7DX37XyrwMavyvQ= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1 h1:Rpm49z8bhqJBB2Y0tuzn9ms74biIxu/YW7EgzQqlJWg= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.1/go.mod h1:tNVsC5SHowfci8r2wS95tND/l5np9AyHs7P8+MHcqfU= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1 h1:BR3Uz6iaqgtOAHM9V/ap/an1YyM1U/KXDRLIe8atCrs= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.1/go.mod h1:HiaBb3/RkkKBXLfkHch1Wy8tdMkyxhAR75PDf2BZyd0= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1 h1:v5HBtPJZE+679yJOeGBTm2f+tBs7h9iL35dhYGHZADY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.1/go.mod h1:/YU2KmYK0mw3Nwo/Odx3vFsqfR9GYeirr2trSazXGFc= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1 h1:SwUdbTy8cefiHjX0n3C9z6qGShPCgi2pYhMDOMpHtvo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.1/go.mod h1:OsWM+ToUGgq2s3odxVhJazzPUvmC5PTc/dnaV3Lotow= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1 h1:heKBDSp88Z1B9y7uKEakpDP/HCLroOLS7+7TykR56ck= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.1/go.mod h1:/LWsV6gbnhvGjoh8VYYoCPLvmJARA8YrZ6c4YBQnPK0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1 h1:+tITXz+sHQrbOjEWEl5tTp07fBiSQpenGZD6fpDCwe0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.1/go.mod h1:OGx3gxawc0hbWRDXdCjBvNge9lca3jVugD3B+4FzdFw= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1 h1:53AG/+bdbcd5OV0t6Zd7Yng2o+XM6DtLd/+WnN6G1lA= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.1/go.mod h1:uiGz8IkroknF/60Jb4ORQmcMw8EXyDKzgOt4BWn6hJg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1 h1:8rHtPTzrk9lPFcr9svujyBtiL+P49lGkVTiWArXS7wY= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.1/go.mod h1:LN5B61rqDh0EmmqAjIq7n0DUILP21RsFy2FWs5W39VY= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1 h1:czyjbKesET8K4z1YvGv0kfh9kS/IXuWT7KQ3KieJMO8= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.1/go.mod h1:yQNvzfwnOPhssQgu5vPAI7HPOF4A13sdL8Q6fzu6Jss= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1 h1:EP3gNOHtkzwcQQ0G9NPvhHASzG+DHEJE5acwFdvQqr4= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.1/go.mod h1:cAIrqVfSEiixle0xrVTIFhI9PdJCmHPNGbhX2ZH+5Ho= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1 h1:Jj+freXkdEVgydpwe7J67mihtIdTWU6bl6KkrnrYExk= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.1/go.mod h1:fqp3NJHc6O/LQMtoocsMxGGeAO9LKiLEv9cDXG2uHxw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1 h1:QAFz0SG3AEvcdDGFdXWIeVPzEp73Q5Nr1QQs4klJvYU= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.32.1/go.mod h1:6Xk2rhL0WJmxuJUzMNeFafKcQVF5iQWsSouJDHJo7YE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0 h1:S9xUAMGe9nJvQOgv0hbiBO5jSP9i71LkMIyao9/jArY= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.0/go.mod h1:DuMkTI7zRRP+kWbSt0+SnE2qXdQp9YUCZckt+rDDH7Q= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1 h1:XcOS4J/WITPWUWoIi3WOYFStHLHirAKn5MWQa9wWF3k= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.39.1/go.mod h1:GjEauPr57vlcBPWW1DyiqkNySZRnMZBf/SmRPwqIXOs= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1 h1:rVTWmWiYNe/RsOrp7m+IbkK39VoclC71Nfl9g2Jnfko= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.1/go.mod h1:eYtOdX3+8Uj0HjOytehszSvtuTpSCsCzlKEriU8xifk= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1 h1:hLSiKbRRsoTLJJQo5LC8M0vwhlGlvuHQrboIQbeor84= -github.com/aws/aws-sdk-go-v2/service/configservice v1.56.1/go.mod h1:46dDCtKXik+9IWU9oEOKBWzfQnyqn7EsmPnFUT7zqQw= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.1 h1:lL9vR8XWk8fmVyYX6oPkiDT0sKDAbA4pCDXEMHxlzOc= -github.com/aws/aws-sdk-go-v2/service/connect v1.136.1/go.mod h1:UNYwIAeewfxeNd8AraZR/l1oj8sVfsz71JmSm0c+yhA= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1 h1:Tufb6T2PwMwfVOOy3EVIK1MruqQaWMplBXCivBsdJvQ= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.29.1/go.mod h1:jYSsyjaru199f/yo0FRn5Z9/BnQEq/XLAl89ksJBe9c= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1 h1:PxO6gYGyv0n1ePYw5dWr7l75Yq8WXO3OqpHmlAWDFE4= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.1/go.mod h1:lGLCOsEUl7bFyjKgcp4ka3GHia6C1hTasvWGGFlaQ6Y= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1 h1:EUuorlvmboxxMjpfFFe18TkFOjBo6wHtSGGMAVhrs+w= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.1/go.mod h1:es7bS0XlU7PJHV3VFHuwPgFXvHtFzkC+9i5omJt+5Ug= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0 h1:uVagOOPucDkB4us7/Ss5cLuCwOp2s7aZ53I0jRTb0aA= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.0/go.mod h1:tR04F/rUvoQ/5YFp3XS+SDB6pWc/Ls0f19WKA8PauDI= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1 h1:sHM8QtZyzf365Qj+kfv43xA3/C1MbA5rwn3TQBQCjns= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.19.1/go.mod h1:6Zn4eLosXezMNnIpHy2YeOz7lPtoR5Bc69C5RCpeEd4= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1 h1:lyIuF+BH2XMhDKr5G9/mz492E/NZ8BwmcpCqOwMGe0w= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.51.1/go.mod h1:35+xMcyogL7u49YQ3TJjJadjJWg8+LuDBdDgxyepZic= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1 h1:oGzECC0kPb957Ik8WWK891n1TEIK82jorIAlr57Wpe0= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.56.1/go.mod h1:9M7lHwBQ/U86clroDhC9PKzHjXicJHn1kOcrMNjzfXo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1 h1:PXzwPhWrm2hv3DbQkBSreiNuxit+Ust9V2Xh9vIVitU= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.1/go.mod h1:ukMQiiI+wmYPs3kMxbnUa/OqgDeJx+/euWAkoScrUtM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1 h1:Gme/adTg52tAkyEs7zRXfGl+z+/G+OepNoVsDHRtPWM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.1/go.mod h1:z9BGYSQJFFReD7cHnDrScpSYsCDa/1T2enrQ9sKA7yM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1 h1:azLuMFfmPE8e3+LCjbCblFgOa6v1LKrjab7uzxiSvx0= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.1/go.mod h1:iXVvFT/t6B96iXExuxVp4QMKfU2XUIGazYkptjmF+AQ= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1 h1:KuJL1IVij7mBVPb8zSLEuW7dRexP9npk0DKjBGHBRmk= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.1/go.mod h1:4gU+dv/Prdb8CB3TaRbrSFLO2tSqPNRnDqIX9IPuQHQ= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0 h1:ia9vLdjU2i6GHFJ0hs0pWBkNTeMfO1iXeazduNjZghw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.0/go.mod h1:TG25xNgljNX2+CjQ0gkXiOjJG6BTyM7gRJdfC6jGIBw= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.1 h1:ufJkNvdH8aQjA6KvmshkerG4zxZMcOeDawZAmA2JhY8= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.1/go.mod h1:SG2yNQjCwUNkjUxW7YCsUiIKQgoWUZpblEHpmf6Az3E= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.0 h1:4mM64EFIB0NBzQHSQHLTcBOr1dxiVvgp/eeh69VX51g= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.0/go.mod h1:mS/k1sKOFKsE7Jr34gvsnX52nLSjAWfnjvvoUJwhkTU= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1 h1:etKKg805YgZYurjsUv6hLC4Ef3fBUEBMymeJ6LA3oiM= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.1/go.mod h1:3QfEUV+KuDYX+oOpu86CUe1/m9yVBO8Z+72OLmPGsWA= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1 h1:RgvRJ0kPbJt0aul49RPomVLQGFHD9z2H0ygmWVglxTo= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.1/go.mod h1:yfBgovuMZJiyeD7iv6LNn45JYSLLWoNjALM0OPPf23I= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1 h1:ZMWp1dL/JP7hl9t5DsgS/GinFFru/K+zExATiuv36xw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.1/go.mod h1:nfTthF0vgdEKFt79wWB4mdX8YuLq2slQxG+mv3U+rmA= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1 h1:G+je6EXdUqzNYfq27Z9mw9XtpS0tmPjPk4jUGTgX7RM= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.35.1/go.mod h1:8ibkf4LivDOjEESETtUUWPVNKBGALuKQ8ApPNNJvQBU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1 h1:lDikIREhG79SV1a3NhpsijsoikffXNQjpfW6ClgtIAw= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.1/go.mod h1:9s516VTcyI6csh0GJxLpd0hGETtdHNVSVyq0R9cli04= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1 h1:H1YAEuXljNZyCK6l2RpuRje4DXfyTMLBQjePEBxA13A= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.1/go.mod h1:KHmHW5rJJ7bf8J56Rn2voXfsNTbUXS/TKdGNDurx7EQ= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1 h1:pya7Yt8j6psq5iZw58VFfsO73Hr09/i3J3IPqf74HEs= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.1/go.mod h1:gGqhhqgs7rxjEYwH1T1cKaq3HL0yH6Ap/UvmLVCr2MQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.1 h1:1toVIJuhc+CsEnP2LE3ttNwGCXwg9NTwRDQH9tne9Fk= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.1/go.mod h1:E6H0jItb5XS0fk9Mb5OXU6tSoCoGnnWcXT3vaqTEB8o= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1 h1:IqEeP+eC3ZXZyqM+k2IOFRtBPFBaq2lNDYc7H6Gqjfo= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.1/go.mod h1:v4koXz6cYLm9p9kT2iYCcLCxxDkX8JFg3UBElyXB80I= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0 h1:JojThqkOwGGs7h/PDDgefnIKqm0IFCwJPtJrwPULODY= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.0/go.mod h1:tMQ/Edfn5xLcBFSVd3JDreJPias8GqBq0dVbCbMz9vs= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1 h1:h+f7uoS6CX5l7nF5gxBygynKHRodjXoSCG7WPwjeLgQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.1/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1 h1:gCi/M7R9EriQUAN1eMlxDIqgbIk6SqbHvTH8F9MO/sw= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.1/go.mod h1:bi1dAg6vk8KC8nyf6DjQ3dkNJbzTirMSmZHbcRNa2vE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1 h1:MvGQ44zq4F3sRmPkeB54chTlqVyR7T7u1qUlSECFJf4= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.36.1/go.mod h1:yz4NeCWotlbHoT41Vc9NofCbKEyiNlKYZFT4SiqVQCY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1 h1:ZT8/t70U7pDIpkdTYBiTN0HidS7tHumyNb7/JXpbvMw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.1/go.mod h1:k5xD9wMxhUgcFU0Q1F1iB3YJkmBmW7+o4rrsBg8yhdc= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.0 h1:BS98Z2j83DJseXiLHY+ffo/VaG/KXpIuElu3RK3U+fE= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.0/go.mod h1:8Ij4/TIExqfWWjcyQy82/V/aec2kQruuyndljE+Vuo0= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.0 h1:fHsBWv7PRSpB1ZrDKfu1+ns0FlY2uUwOJ3Zv0evH3LE= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.0/go.mod h1:HKX0JNwYDW543nJozPRB0PS1bo8qAdR74Gava69dNg4= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1 h1:2f+PX7W5EK4Z+KwymsQflXCciN0qmwCTtRS5pfMZMRg= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.1/go.mod h1:CeEl4WwCPhtncasl9kdhSp1rigeO3HdVJ3hiPu6ZdZI= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1 h1:/CBqUm53BSLQZXnSVkDvVtGb5p4wp3hVB6nunJ7meYA= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.32.1/go.mod h1:L72prIIk4I4TMwyVXRtoOVkwA4PGaOzWHE8dkGSTgPE= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1 h1:2JNZHdAMqx/d/KXH4I0D/g4VAmaYkD4SwzJjEYgWLbs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.1/go.mod h1:q2K5uszrJv1SBxKYp5M9KUf7XR/Xnu38vSCiQ/wwhfI= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1 h1:z2DiNCYPqFh69RSzPvGIjKJAKjBIB86ZlfSg1lePJMU= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.49.1/go.mod h1:vJgvNz01VmSuXKzoUwQxQCzYklI/f09wXCWoj6TBGJE= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1 h1:TKPuw7iHoBYsZF60ovGQ+QP1zeTMRVduZN/f9pwR8fo= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.36.1/go.mod h1:tUWbqh4G+5bPwtn3noFemaiOphmiW2ZHs9+ETgAP2yw= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1 h1:7QS58P5BaXGzFwi8ulI5dQIyfxY7WRkPIqwxzmhfgog= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.1/go.mod h1:tu9W2f8Uc606uWFnnJ31chJhFYzuBhnlAiwlhODst9c= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.1 h1:L9IGouoOcpSmFamjYlNxwP3V2qPClR4nacB2z2Z9GMY= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.1/go.mod h1:NEXNTLFLUFSXQ5VVZeVTthpxBR3l7VbjBrlnOAb/WvE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1 h1:wiX0/21vNbpeqC1DdytzxaKpkSBuPJiCJHJAka0x1Kw= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.1/go.mod h1:IcV4x6tPgVZZiIFaZnv7VwasNR4m53Tlxr4/CNUxD34= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1 h1:aILqZ5+DuujzJWzg93SsPqw7zHtcLDc5sE1uxQWv3qo= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.1/go.mod h1:3gM+RYyfJVwLiVmUnsNVWcLgQXDmrH1joddL7SWMgg4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1 h1:AsgGSKOFuPhojp2qH910QWdjQIxfi4syx3Jgu1bRCJ0= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.1/go.mod h1:yX+96FURJgbIEv+9tAhlAayu551vVVZMD+yAro++VFA= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1 h1:+q3Hyki6SdvRSj5mfDVZhl9MJzdgYGWLr31S4Ot4MzM= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.1/go.mod h1:k1YfbZV8p8ab9fjRvlUTjCgWrrvonTEFKCg7P2Idxhw= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.1 h1:KxDWFvrhzdJGMn9xBde+ZIgHb1U56N9yckM6ECJx6Pk= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.1/go.mod h1:7P6+h9cvKgq4qDOe58rsI//rxVXb0nb+bLwEkuLDxiE= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1 h1:84iXoC/jX4Jo20bVpRWXj/NoD/1HKd9yf+XB6F50/VU= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.1/go.mod h1:EpxiRnvkTpQfwgOxPdFEFGUxOT3heC375s5MFWHDX9c= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1 h1:AEiUb9J94Sdvo/v3CY31/ybLKdSdcCttE8hw/+NK99E= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.1/go.mod h1:XklPdrzHJNpFs9Wpq6takjsBigK2VxxlpREcLSM8nnQ= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.1 h1:1xmP3cGqZQTPoK9+j0bJICQjixyXqr+tT5T7PckuuW4= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.1/go.mod h1:OOOhb7pKoJhZKCVzheRRd+aPKv9Ep+zNUPQtfcoxP5M= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.1 h1:QjoqJx5oudrzKgLrAXdGekBWGjX2dQvZGlIXeD1YuPE= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.1/go.mod h1:YtgJpTqlpa7n71B9snaa05vHND7UbQyOHjU4zouPpUM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1 h1:LAoGVtIPwcytq3nhPewQw0Gwr/rFiG2+mQJK7Q3F7OU= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.1/go.mod h1:tUva+sOgmPwfMu02pXdg+zKO02Zcu812xG8doKd7ogA= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1 h1:c20x4bQsZNeo47wF81U0/OKooVwFZIOhKIxXX7OcReY= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.1/go.mod h1:j6XU2uooS9YUEfpviJM3f/TFtGlBh/yYHUMhO82XT3o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1 h1:B35OqLzzN8Memg0x42e1BRpbD+xLmYKpB+eH7ZHBvaU= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.1/go.mod h1:yqs+luUVTNkd9iVIstDEnJ7j0XReWABgJmTDVIhxBGc= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1 h1:wyCYRmXGLKWWF3BnF+SVU1h5VKTS+4Wy5bE1xRBuuCU= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.1/go.mod h1:u4X7GrZWh5nMBiGkJPJoNaDZQvjikjCoPTf7rg0vKpc= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.1 h1:3VhrhRzlq5F50lKrps/qFECygQzPRBBfmkZeeWh8eU4= -github.com/aws/aws-sdk-go-v2/service/glue v1.126.1/go.mod h1:xDM3DkasatX1hkG/dHQjh5F/vAYL7fsvuas0SgofNc4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1 h1:bSBOaixTq+5x9XLSlt83fl9jtlVhL6ErvNd6FoL/Fw0= -github.com/aws/aws-sdk-go-v2/service/grafana v1.30.1/go.mod h1:LYAjxQeHmDeDHajiAQofIQLFzUfioTLXNl79+9olIkU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1 h1:QLf6BuvJc7OWzkfIN2z2Jax46aZYwgEZzOdh/fIJDWg= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.1/go.mod h1:yHdROXdauuEdWsTTuOZ2MCkw1MC352BJvHbzhvHjOJY= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1 h1:UrIIr4g/i9IbuH8oyxSp8lfMqlvgmxExw48mhM6tYvw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.1/go.mod h1:4t0gY0t3e/xdxDoCxIUEXZkhg+Mp503K64+cs/JE65A= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1 h1:BJQynKcb7fbnWRc1A3APRKlJxdsxxBLhv5w5eBBhk+8= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.62.1/go.mod h1:0RpdeWC47aAKjRQhmFkWB7AU7acRQ7t3C3sox93F69Y= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1 h1:MY/s6ON6CqpA0XTW4BCUglJGh7lH+jOpDkiotb0IB7A= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.1/go.mod h1:nRqPmywyo+J7YWO/z4oq+qxn10C6IncV40ALIiQcMxY= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.0 h1:ni7WcJSR88TBcGsuhXCjp8brXJfijI55jb7wB6vFiJo= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.0/go.mod h1:WsQuuejKHNC3UWs+n4usF+nNy1DFGYgWRugqFf+gGD4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1 h1:aZyP04GgYXHZNsZDsmAiYIKWZRqBinXrZXeg88ftz2E= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.1/go.mod h1:K1K6uXkdxb7GDvUTVfvEkE75fDI2eY5ISyr77St091Y= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1 h1:WKwGx+1AJAUXjFLCKudWP8MFS0fiwzKAe0VK2UfTQE0= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.1/go.mod h1:hHqxHKHoCnne1DZS/GKsjYU8JoQUuWOCEIfFcuDzDLY= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1 h1:BpZCG4dzq0TD9A/aEZiF/uCU12AtHYnmjSvo+TkaVIQ= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.1/go.mod h1:9bew1fUtgB9LK1O+JGpkNxUcRO7Sj3O2GxlRd7G+UUU= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1 h1:vSoGG3q9KhtWQ2UQz0HOrO2OYxFnmcpDTfiuV7jwgtA= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.43.1/go.mod h1:yHwqyTje7gDZtLivPaXrk8fLAvT6LaM/XR1Fxxaf/hg= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= +github.com/aws/aws-sdk-go-v2/service/account v1.27.2 h1:3Ty4wy83i58eNiElTpf7Ya9BFpVOdPonfk49jJCIFsY= +github.com/aws/aws-sdk-go-v2/service/account v1.27.2/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= +github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 h1:Rfqqo14uUh05AQcrgmigh4s6AECbanfGEEJYfj0qgmg= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 h1:PPj2SnoPf4VA3fQenKKSIqKL2kavEiBqGDRMTuAC3nw= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 h1:ANVsTLsewss+NP/IUN+rihzWCpUONNDCH+7u9LxfdpA= +github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2/go.mod h1:j4ljfkDaFO0JGTmRrewZX2GrYRszvPfTCiSuFFEJSbg= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmiOAFI+ztwUa1q9Vr7u4MceyA0B4Rhg2E= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 h1:C2pxVJYYZV9il2q/aiSIqAxZD9Bx87LdIlTV0qYpvZI= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x9s28FTv0JL0RS7CeOAdq4= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 h1:ukEmvOnPItoNWDH9RmxtOYNmZBTj4YpJR/ZhwzMnADE= +github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 h1:iX32f9UGNPLhdlyu7Jl8QfuOr/P1Lbi68Sx3DsHhrgc= +github.com/aws/aws-sdk-go-v2/service/athena v1.54.2/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 h1:hYsUHj0wgtj4ZNRNKpnZ24l43TL/7iDpD0xlemzxBO0= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.0/go.mod h1:PLB+glHatjJZVbRG5Gx0TodUaoLxdNy9pDmOTaEV2vg= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/VzguUMWd+B2gyuBDkmU= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 h1:lyicd67IMM/eRoQaKpZdImaUOQUexFbpIDT71KayWUo= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 h1:9iXNQ2b5cDSmZHjNN4j0F/QRGTiA5kpGV/JIPPi9gO4= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 h1:rhvd+Sza4DuXzrTGLsJ1jO6wdKnb9KXqXyw4r6o4tIk= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= +github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 h1:FT0Y2iOC056nBalWZU0s5jfpIoFieN7mZR6H028U904= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 h1:uFp6NEFas2RXeuBr1DLN/VoXuia8Xh3NPe9j8PsHKXo= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 h1:QOsVXn4JOYT/hijI83NKENLuPBgNnoCsZRYevszDFMs= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 h1:ah7hfvNnINvdcXOqkasIJFvti3jCLCQZTk5SyeqRQG4= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 h1:pcho6kw8xOS5MV9yHTySeO36FC/QMC4WBy7RJAYB9hY= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 h1:HvA12hXcyI07mrRK6143JAkfgRAK+RXWUwtVHTatHU8= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 h1:39sQgVlfCQkWC6Q+lKa1sVJuyLouiHIek3lyZz7hsCo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2/go.mod h1:ieLXOKII97L7fYQa7Xm+PsCGJBaskvWk+wGux22jRCc= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE5uGKGIIPGjyWnyofjbu7Bxb9LmHg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 h1:N1wHW0oAUV2ao2m7nO4GrfdjXklCM7JQLEQ1e0zBJV4= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1/go.mod h1:+UxryRSMGMtqsvxdnws+VpNyFYWRkw4ZlM+5AC160XA= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 h1:4YiGEEgooJbSl88+t0NTqRUrjsjh0hcoLrUyrEj+qJQ= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0/go.mod h1:P52KZMWQ26jGqhCrkIqVvzDgh8HRhsLN28v+tRNOvZg= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 h1:CZYoQ2fFHANjml5Mn5pOE49Qt0I+hV609IQWMAEfvxM= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2/go.mod h1:6gViEWwaPejA9LOah/Mn31v1zfANfQovYWmp4w+rt1U= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 h1:WmDAyFGFt6p8d/Xqh3ER37W3lxUxsQltQ+XjF7PDwJc= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0/go.mod h1:0/USfxsqE00FryTj9aacEC/ufCg+clmEIt1DlQvRW68= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQIHijjP5kmhn8u/jp0U/yU= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 h1:NunFZHMwVtv7pZP348zakolv1lRLuq06xaRKPPI6rBo= +github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 h1:AVbMDG/wcIMAcJBRtXzpEIC5p3Y/sG/hsOvKF7j/imo= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0/go.mod h1:v7oA5ayEizyswwdsNlsXSNI69FSAf06tjLwXkKjGUhE= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 h1:TtvQtkarc56cSKeFWySb0xYHy8fQ6pVVeCIrpSaQMGA= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0/go.mod h1:ngNGhK4pbO2IoditdtA6uaC4VB+JKi+y4Z4+Pq8c8FU= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DASC0gnUiSauGfyqFdm/7vbcpS3Ka7J+cHmgew= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 h1:VX9zcDqLRdrhkIdvm8sQJBIbfz9OvmH5UZJn8K7g10s= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= +github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 h1:knoQ9bJuxXStprRcf0QDGqnQtlfcMrt4UC5IjiRGwB4= +github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 h1:6NNrslvojclUa8DhsMWzi66Uxo/5S/Q2CdOh4+ERBFI= +github.com/aws/aws-sdk-go-v2/service/dax v1.27.2/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 h1:oABPzKfUcm/KHlQ5nYr9sxmpwQp4jorqhCBN3x0uq/I= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 h1:gYxiWv5qRdJEITZoZLws3ulWvScdm2ghfVTX40CfsC8= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= +github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 h1:CPpJPsaVCpno+RaolifsilbkrCXj63o9BskbmuNP6ZU= +github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= +github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 h1:P94OfRObDwjklbvdJTGuRZXeGYF7Bv5NNUo+I628kKQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0/go.mod h1:l8epARFi0/1WoAdjQf4VAiwkyg8YNm+8Xffd5t/KxRo= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiACR05QOS0q58U8QY= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 h1:94CuP2LDRD8zwfJIm+oOEx0vRuwodfon0BPImHs8aww= +github.com/aws/aws-sdk-go-v2/service/eks v1.71.1/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 h1:5gfKj9+gRRVTzsrDp1z8AoEuSV3iLZpDJTiKsSqet6I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8fltzI3o5gsZ71mqqfHhePHvQjrpsFM= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 h1:1PO/iNikPYeD+b4vGIC0D/kmlHFNr+K9Ti/sL4PmJ90= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= +github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC1TkdrH4Z43QVHk= +github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= +github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 h1:narXLgKIbS6nFYldm57umsw1aExyMbxLdzKA4spdiaw= +github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 h1:0ADY6sOC594lvWksDrmFddKvP84KSL4Y7zvs2pzR3/Q= +github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= +github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 h1:Tq2dmRDBSaIX57tWZmywS/oGhA5qPmMXT+fjDsaYTao= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03iNY3FcPtz9h2EoAixPRjNE2li8= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 h1:NEiSwGWC395TVfy8mHw1wxLYjJqQ3qJwtk0BHmpiDh4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 h1:FRn5UEas0vIL+fGbQcnB3KRl0QIjR+IRv8h5x8xjODY= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0/go.mod h1:jyjTKrkxcH3DSiy5Oc8Acgcw/Mk0xC0tgo77aPPJXN0= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 h1:3ZKmesYBaFX33czDl6mbrcHb6jeheg6LqjJhQdefhsY= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3/go.mod h1:7ryVb78GLCnjq7cw45N6oUb9REl7/vNUwjvIqC5UgdY= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3 h1:xMmJPUT0G1q9+I0mzH4B6oN9fB5PkDoD+jvpVIcom1I= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.3/go.mod h1:U0JFMTY/gPxV07XTXXz152nX0Hg1eBenzyslKF2j4j4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 h1:ieRzyHXypu5ByllM7Sp4hC5f/1Fy5wqxqY0yB85hC7s= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3/go.mod h1:O5ROz8jHiOAKAwx179v+7sHMhfobFVi6nZt8DEyiYoM= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05RuxzLcjT+S5ZpQobj3ie3UTaSf2NnZc= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1 h1:WKi6alNc55a4njzw36rErepMlJyARnfAfYHHqD/kBR8= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.1/go.mod h1:q+A4de5nxY2w1IxXmxSz2ybaW71gjNr634rj8AaBeOs= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1 h1:eP3t8f5IsHTsJLD7LtPZlT/pBO1QfEd79+0XsB1pbjY= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.1/go.mod h1:Unu+LGlKbxjDYhpgap35rN7vwxSalaiXzIlQIUH2n0I= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.1 h1:nTZCu0rTNIJlEXMz/DXAYQt9/kYeWgTLgbW1KiAJ8Yk= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.1/go.mod h1:bJop9Eo7sy4kUxLfjXsgBUVzXMiEeVdnycU3AvyCG9Y= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1 h1:ZAaBzZ5yRRZbsr2rRC/4fnE2Pzb9Ox0LhKSvU0812W0= -github.com/aws/aws-sdk-go-v2/service/ivs v1.46.1/go.mod h1:oZEFz9f6yBBPA1+CIKd5qDKX3+P0avnvsv4ZRbWefuE= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1 h1:vgh7mSGtfZp3tzqKYAcg/lEk+CWDAQ/WWHCTvk/DKlQ= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.1/go.mod h1:MsE+ZmmlW+UOhKhq8Ahp2CumqeVfwbpFxk0tFIZUtRQ= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1 h1:wgDbg3dtIX/K5+F8KX7m2plfvWYrQxrJmyT54aohWSs= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.1/go.mod h1:uvEnl4e5ie3zB+2qlQCqcv0CgOyI8ajOegLEKERjqfs= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1 h1:Ot9dBLBz1oVvDWC0JeJ6KIJ4V+9LrZm41BCH7h/xOmI= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.1/go.mod h1:p50f5u0jxoFWTV6l54BxrE+7zJ1/Iucap85GrSnpptY= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1 h1:U/tsDI5BfcZvt29FtGMfrTkfyPMWDpNoJH/pIAMIlLI= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.1/go.mod h1:edFwG9l6+RJ9BjapAgxfnHY13/FsufZekEjw/T1Xp8I= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1 h1:MoI7V1QCaWIr33BSwqFdFeo0WnBJ69vIVuiyS4Q3tCU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.1/go.mod h1:V6Iy+0hEq/ebivBZ7wBENH0cohMrhk77z1UW7Icp70E= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0 h1:u0T+W0qH9qgU2puOwJ+KcXN/TXYDjbZXvshpg3pl5ks= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.0/go.mod h1:No5RhgJ+mKYZKCSrJQOdDtyz+8dAfNaeYwMnTJBJV/Q= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1 h1:L1R2ThWQ+ip6KK/K5BYbEXfwztRG5M5EOtqXAd6uHqE= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.1/go.mod h1:jYH0HRqYnukQt14eBIgAfnIRjihLy5osnU0BN0G+Do8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0 h1:soIrKP54CUf1kS4ItUgFhY3gSFAKbYD0mBYFUK6vvdk= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.0/go.mod h1:E4piy+DkyYY+2sIOdlI91iLrygWzEfIuldAwgyQmWQs= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1 h1:Qc/0s1ldtdUxmR4pJqOMzl/bDbAsfl0nzLa2A2LGw4c= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.1/go.mod h1:h095RtNvHu1cWmPHWxEitFuK7AcAjO6sKbovcmF+7mw= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.1 h1:tYOF7fg6eClWwPjYTrcw+yeg1qVBlMSfSo5aDlM7b+o= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.1/go.mod h1:DqcSngL7jJeU1fOzh5Ll5rSvX/MlMV6OZlE4mVdFAQc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1 h1:Hz3voradFRzFmkCtucfgoU+866Xu45/6T/3Bmky/+LY= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.1/go.mod h1:pp21VYtkJxgEINbEvBNkovKr3C1GOzKNYxxUiMM3tsY= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1 h1:yzFJ3uUQ2XCmh/9xxJHHR64lZrGUJBnYv7FFo4j94zI= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.1/go.mod h1:Uy6Tm+/QiIz3zvTOySvpMHTTQShZ/jZ0rVLtG/a+BE8= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1 h1:go2YdWWAN9+h6IbWMoQshTcIhPST+L3FOvzNJuZNWVQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.1/go.mod h1:o3afUpWusM84fxzwOswLeKjAutBrLH5WZxC5Bg2+Kag= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1 h1:Rk6tPfEqc89raV43prmVry2b172lQwYAdbMh5ClvYgM= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.1/go.mod h1:EaraoM/hBrcTVf5ykRkMepUaJH7O5JJ+/D0uEz1k4Zk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1 h1:etexnCmVJB6grM7t38Hhcin4Vrdv+NAk39v9Bs65zkc= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.1/go.mod h1:2E047X7x62z38tMw0lJ7smqSv1YeSiQTQFK+8/ONiok= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1 h1:zeYgViRxyvRdczKrvbGwvkLUQKullX+qH81vAExkm3I= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.1/go.mod h1:TBm4Zxk3cVPC/qu7CBBtxeDBRm+NxPumhD39np/9HZM= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1 h1:tkWtGIaytwytx89XJ5YrFGP3lxwa8CJfqzJLwXnp6xY= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.47.1/go.mod h1:k+O6WzXkLorOOArYPtOPtpVXtCJBAeUsV/7gQRR0wt4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.1 h1:Ooi2irwWrRiGMzgAwdB3q7UN8O+ePHOukC+qpj7eUjY= -github.com/aws/aws-sdk-go-v2/service/location v1.48.1/go.mod h1:VL8j8BiySNuq5pDthDsyd4uqBXxtqjJlBb5WWbFbZmY= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1 h1:0VnoWD58FCnAYLHd5ZplpbOnFXtq2TJSOgAm5XTMQd8= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.35.1/go.mod h1:lfJ6B6p/KQY1W7a2qVwYtXgQvbYPIZi+BQPHMfs7pWA= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1 h1:3qjisg2EHG4pFTYJOPVn/UFAYp2yzGvbL3msBcrMZmE= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.1/go.mod h1:AFrHabRFBc00+A3Jh65w2KrPPUbj11tXqBb2dW0+7UA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1 h1:QPS+b4QcULO2ggAp1btJzwXoqJ7NkoKxapHby/g2+VA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.1/go.mod h1:TWKvkEe8yeOKDNCMW47xAQJiqln+pa4RWDXUE6PGHjA= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1 h1:ik4FFnSXd7Kocu8m5zq1GyeGv7Dd0tmEvbGTMzKX0iQ= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.43.1/go.mod h1:+h6ngXuktUq919fdzDtWspFrg4Y+C15VlIra9CGVw1w= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1 h1:qklMYernIUAjV4QM43oI+x6Bm3l4UMT63o3kQOheL7M= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.80.1/go.mod h1:QOmlr6sjqSPtQXGhi7hhj+ihkU47qs3ZTIh3vTbqX7o= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1 h1:fvBMBELv3zPjDI+iop1Q+GJlgylsOBfHpQqfgpl0QVI= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.1/go.mod h1:ztAXVYzpWC8UtMzvZ5VPBmytv9exEv6BsAq7Z2oSJK8= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1 h1:As5wRZIpMOEw8EGLtXIIvx/69lISetJyPn/O01Gltmw= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.38.1/go.mod h1:LizOnQyvCXr58pqNFq6Fijjzg6o38w5bnxxhnfBAQsI= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1 h1:n4rOFaJ0OvqV5W/AxeVbw9z0xrOjLhBUz1Ry5ERGp0s= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.29.1/go.mod h1:JGsiQ3sKXi5OwUAJZfCppe4Cks0kN32eH6+oD2bq63Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1 h1:tOjyksYJ+N3WlxOy3GZUjrR8Ixp8bxuo4dd9WJXXN1s= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.1/go.mod h1:EZC3Zxx4zA/VL5dHqUMBQZQh1GdN7ye1SgPSIpcB/Gg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1 h1:cypGtBqPORlozgkBvsJ3bvZ0yM6LQwoqTmdsx/W/fEM= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.1/go.mod h1:J9usg9CZaYqNdF9h0ggRA3oYbjp3YWwCaKNKD+VVVns= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1 h1:hxTpJIsCZlnFpPntbkl7rFsGM9gyN/RoUgvQBQmIj6c= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.1/go.mod h1:NNlta0IS4G5ti97P4p0eDNYGBnv2uRLzSgVWpSARNdg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1 h1:6V3SpE8ey1WiEEba3Qlj0Qe9HdXali2QeL+WGXUBew4= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.1/go.mod h1:tDCA72Dhugy3hO10vTlROD3ahbJGuqnRvRrjvX4a/iE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.1 h1:Li0mJou0MUOixako5nw1rp4J9EWnYOyrLz1xs1EY1hE= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.1/go.mod h1:tVSPpsQhalaf+DchZKFeDoohUeNE8dVSFGNRjZrDSQE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1 h1:4qioKyJlI2a0lc4cbZ7EBlrkKZMeF17Cve6tfKIzITE= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.38.1/go.mod h1:Mi/tghAzRmlNlqFwV/5D0NMLfhrkqSabMxA1wY6dCTw= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1 h1:5YSKtwFT71tByW9gn98PlWi/8bvBIoprUy1QYeEYaU0= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.1/go.mod h1:lvD4yDK2ULNV+u6h3uVBlGNtcGj157l0e8rcRijqxhQ= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1 h1:uHyYdnJW3cQ0Z+OxqNUlxPO5UHr3nXAqakzYV3gS+kg= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.1/go.mod h1:uIZJKA3sBDgaXKxORwej5uNIXInMaTtjROVFbhCoGQ4= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1 h1:/yHa1ai7uAg4rwaqT25cmhakK3rd0d/8Wxn2VwbDIbA= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.1/go.mod h1:HKJfDUSWabuQ8Evx8mqmk/nNuL5JmZl5IRNlJ/iR6j4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0 h1:Vfwj6Lav5KOwzSDNTUDw+vzcm/DiYsIaz5Nbg1HQnHY= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.0/go.mod h1:bXguklweVIXFjJ05yXJ1Jr5EoOofLT77UOrjYhmW/Qk= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1 h1:Vd0eIp8RGEI1ChYi97aiWXNMkEBFQswuY3IZVeJdWJg= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.1/go.mod h1:Z3pgjAIFoLaTC2GIBeE4wY31OeTAW7Yu59G+oJHUy+E= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1 h1:gw7X+r4pqFE0l9/HpbeaUtqtalIGN+SW3s8G0tpgBk0= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.1/go.mod h1:2lcjRCU4jc7gouZFBGJw62bZDtDFy3DRCm9rho+BIVs= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1 h1:4x9RNhYgrUFKjWKNQNb64yplb0Z9fU/YqpS8GZEzie8= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.1/go.mod h1:ZWRIBbneNn04ltFXrYN6r4j2GvC8KtilEWMRswSB8wQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.1 h1:9+gRsriocwfvNY1PwSlIGR0Eh2TXt5amOPinYayB1oA= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.1/go.mod h1:I9L7HVx7wBiIpnt8oV77si3ZqTA8BBCEB7RU3jk8F34= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.1 h1:TLRVXGhwxrEWQpLufhO8ALkUEFEPCS2/GadcFuGg4kA= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.1/go.mod h1:MLlHYMY+BRF9keX86rRA1zv4J7O2jIVeooJ3OpHTk/M= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1 h1:++PGLt6SfNjsak7uASw+C4dvFhP7ypQfJvDncmwimHQ= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.1/go.mod h1:NQvq4ckAgpR9/QqqI5+eWnP6rNlpOVta9udBG9GVHcw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1 h1:OO5/vCiakCFgYBOJotsbXS3yaiW6vFI6iPfK6o3TiWI= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.1/go.mod h1:anGtuIsRziAehQRV6pPE6LbaGBQ2q1Gg20D3Ixtm4LU= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1 h1:40mSeSt4fjHEFK8W0PCuJ+12Cd+2NwRejcaC8UhLrJs= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.1/go.mod h1:DbK1D8dgPVhcX1eNASHk5Q9C+N58RFw5PvN+2osa+Ws= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.1 h1:vnWogx7AEBDyfVnVg133ECyjZCpGHU5rpaLf3VhZlo8= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.1/go.mod h1:O3bVtO289aQvaGA56/SPbLeoEBvkbr1BerS/A94Xeik= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1 h1:PyUx0qRz/hhWdM397I34075eykwvu1i1n2Mex9x4Lcs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.1/go.mod h1:3pSTlomz+DwHpKcE9mN+kOdPCMZyj1O2C/0tvPbSzKM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1 h1:Bc37aZDtWP3+jIExhMUYU9uor2pVYfHEShFWjL5GGn8= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.1/go.mod h1:sAThYxAnlQ/hkntlxj/KcD/8T0rShXIx0xA42eMiJe0= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1 h1:4xET5KKn9TnGa6TmAaOikap1971w6SrCN/vvcrDR9SY= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.1/go.mod h1:eVYoJ/sxF8Zc3DEo+O3CNpCuEYutm16FB0vAtFLaGgk= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1 h1:vSMf2cnY4fKPYNVhG+rjw83eGzp0XNVyefAaogYGufA= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.1/go.mod h1:B7H2wug0rXya8R4w8u2gw+NvbPjd/3W/28dCkpYUmaE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1 h1:j6qGZFYk8kNIdgNh/yI/faY2aFzOXp2ypplpsYa5mcU= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.1/go.mod h1:i3U6njVpG1uB9l9ueSttsU4+0NdH8V0U8QKjNdMvdUM= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0 h1:xKXztVJyXWPhTaC+Au1n92O+vNVKuGxDpYDXZJP47/I= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.0/go.mod h1:SMXXR2N0zJmYAjJazRlfNSKCV4ei228xhFO+ZoqXH7w= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1 h1:rZdm+F/Ql4JXhDSVY7eQUjTU1vCascKDbZ5C9MJNt7c= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.1/go.mod h1:1AhqeD/xOF18b3v19C3p0gJigmQ52Kxe/Fifijwqtlo= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.1 h1:pgCjPr6Sjtk3qM4IRaS8YacyK80PnPa4XqXoQKl7PFk= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.1/go.mod h1:S4iYoRxJQK+7h0jBi6fiUW9JyW8adhtoXW5mEc0qzhU= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1 h1:Lzj+8KO5yeUIAT6SxpP8rUc3WwwLeyehPOrG0/N/8fc= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.1/go.mod h1:6XKuQQSJAmFkNQ+6JxygxJw1rjbS4AMJ998ZvQAMGhI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1 h1:yqGmY8E0i4e12iMyc7AoF76wFQNNQLLu/RUFPx32ulM= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.1/go.mod h1:Sjk/KzOJtKspO7hmHvT/oHZw5AtX1tsmbI0WAbrNu6E= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1 h1:VZuiH3HeosnAsEKoqTBVaCKj4j9hgk36ydnybnb6RwU= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.1/go.mod h1:eBVhzKjNK//VOPAetMab3jT/njEna4DKLvlK+dcJfLA= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1 h1:PAtyKfAA0mlhSvFlUpTUhwp7B8IcemxgUzk5os7KL+o= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.1/go.mod h1:MKyuqaCqFV/T4cD00DDWbrBZbxDp6WLyHbSOBNxWHZI= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.1 h1:8/s7GuFHr4+5sG5ZrbQ6o0muhSro4LD4IT+qYi2WUsQ= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.1/go.mod h1:ugO++LtUnJAM+y+SkHc/MnZdgIevyA2Eotn3J0UNluQ= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1 h1:UKevA8SMbxO6CxLPB7OgiBvHPBiagko7v0EF6xwW0yo= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.1/go.mod h1:V9wi+fIOqZV2lNpSeWGEs4FJBNF2ROkPWLhbweCl7NM= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.1 h1:QXqw9iT6bL4PNjaJltw4Ub2omUZ7c2sO4e4yMD6vLss= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.1/go.mod h1:tUKTkGAlJo0Gs4t0Z46vaSGD6H1Z6RvtuF03mZY+tPk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1 h1:mrodap2XYB2e9WkCy9RZ8XMft2EV3FXR/2STXFoSfn4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.1/go.mod h1:royODzFrVBRoek5vd76xF7WnwhMGjDj9ZdYcg7Hj8Es= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1 h1:rqPdyu5kSxBAvKa7LeS9nLw7zsG8jnJHoBDW0HAIAtY= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.1/go.mod h1:fKbyyPpRvNxxd3FC8IllvIVic0l4C/IGKIcU7lb5tfI= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1 h1:fj7FtosxkIjzIYhI9rmN5d+X2UF7MPGXKvjx3G/XGGM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.1/go.mod h1:qPNYvgSCnM6m27k766S1vd+QquZYz5efWKbMGjB2cU8= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1 h1:d/SJ7dD1a3nSP4HPqigilserDQum3vfQQVY38RzIuYk= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.1/go.mod h1:5vEhAy+7ycQg3WVq7kp1YWTi43DxOqbUPkDLP8vB1Yk= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1 h1:KNy1faYRqcN1PYqtHtWENQnc2GlyknihYHcUw1kwvsE= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.1/go.mod h1:SLrdEDIWvazT0GTFQ6ph3QW2EAYYeizvd7g9CMpoMs0= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1 h1:fvQSF8BwbMF/b8QtcdVhGOOipQD+arT3D1Co2deHUYo= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.1/go.mod h1:eFxDYEcdKWIT77Mrq/fT+6KL9bu3ACn5sDFk7Be8FKg= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1 h1:W7tz8KLdlQgXtdIZrN1rPP/KtzRzowaQRT9LT/Sp3Pk= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.32.1/go.mod h1:uGcWLsjkPjZYRpw67cFbNND8jtLokfgLTvZSGpAT7cs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1 h1:Nx23hEVCtNFZCMz2Y8S103j7uedO7bh9g2iXtHMcjuI= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.1/go.mod h1:t/zZb99l0WrcNYbDIF3tgj0rJNklhiVa6B1x/Rz4rHc= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1 h1:dXGrrIGy+oNe0p3e2idqDf2hIksDhPgRaFQO1hb4yCk= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.1/go.mod h1:mWcjTY8epINHRpQmgBLjOTYM5TYUeBOysugdyG128io= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1 h1:EqIPe7aD4cdk0xJINBhnxmifR/+T5TuXIHn2ivu8zKQ= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.1/go.mod h1:aSIshIhq15I4lMlrkvvIoH7E4eLTAEW+isWbga9guNg= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1 h1:9cangbr2XXvZ8dItEhVwfP/xfHmNHtENN8VoiB7NBFA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.1/go.mod h1:v6BvxeZNn9Ys2Fv/6IGmGCcrf5a10guA3YvlpQId/1o= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1 h1:lohDZFmjqEKsd50gSDqAJIoBDNmjpNihYjCQORAg/yc= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.8.1/go.mod h1:3m2fCUiYfoCDxPMHZGP6u5w9oMOTJnmI8rEc0iKEba0= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0 h1:X1U1M4miaC/+iLFjllYtvr4N4JfxFfvHv+wWvGrbZ+E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.0/go.mod h1:XTAEe+ed1/YhRZr7IwJOcd7LxwEhdHgXFyAbhW5/0GU= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1 h1:wuIR1YqSV8O9QpeuDTBoDncph5pJpTaIeK5FivKwfSI= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.1/go.mod h1:P9I8vfH8zNEoQNAqKYgpuWRce0tdKZQaCHHs1oF7SV8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1 h1:Peg2o4ykhpoUrGu+teNnBVL5AnNoypKjVv3M8nbzGUM= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.39.1/go.mod h1:gF2Hv8YowjskA+/IKprIj9QroaE0HdD7H0Ay39K4y2s= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.1 h1:LubFJpiNFFpuuvz1d0wUtmSfyy/XO9zdw7QdlmQX91E= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.1/go.mod h1:P7vki/W7C8Yufk6IMf8pZys8ZecwQ9AELEQf2KtRAXA= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1 h1:1ph77Ah2Eb7jT1q0/+FLx53ImR4HUPCO5/qS7a48pek= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.1/go.mod h1:W2e0S97cCup2ME32T3fECFSELYcU71486wsnjMG5GwQ= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1 h1:G0bymm4rPqnJFtKLC32UF15sTosQczlMR5nAkT8rC0g= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.32.1/go.mod h1:CiSms5HhJ3M2Q0sYi27TI7a11rVYW4J92nYKpwRm7qk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1 h1:GDvdx0952qZen3oZiooEzNtsXPEo9KPtChTbzzNbvnE= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.1/go.mod h1:jVLVoLsG7vN8XEO7OQ7Bqw6qqHXMqWbSBMZ7tmY8R9Q= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1 h1:y1+TH64cG0azYzQ/BwRDx9gFDMT6fFMNCq3H1V/ZpZA= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.1/go.mod h1:1ByJ/xRNkPDVddSxcpou91CiBIose3JWIWwFw/QjzD8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0 h1:wjijE9IbM1afwJdaBFjsPM85IGqw8ixfRCMMMT8Nz48= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.0/go.mod h1:sawKpnbUfWJb/Q/i2P3rXiM+vXUosAqJ1KOsuKxPRxU= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1 h1:G7sSRFG3VJOjrR9AiM6VWkJViT8nwdUd+1bMOnHpiYI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.1/go.mod h1:2XG5FGAj7Ao8KR3scdaU76/YEsdUG304Qt1dIUfHIGM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1 h1:wKivWYMUg9MzxV5BWtkDwggMTiEpq+QvvmkVnnxDyJs= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.1/go.mod h1:kZyD0Nd+qn+NgT7Bc3wWwkgTs+J9ufgH46zvV/aC1x0= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1 h1:sVy1D4HSLDiqxxeD9cO45R0i8+fFJ74nyb7S+unUpQM= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.1/go.mod h1:Vjg2dOkHDyjU1GFkMtly8DF0r2hKzddAnotNHN6qovY= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1 h1:shN/WJ38jkxQitsaBYLxm0shtfYujiIR7ERqQpJtsAM= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.1/go.mod h1:O3x2LxaDhY0QmJKHLaw2MGgKeYhDMWvi7zsJ+rcnWQU= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1 h1:I4Ne8Y06l3A1Yu318E4YAL2mPdmgf2WkdRxQ5RtPP00= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.23.1/go.mod h1:QV9oXwcwhXmG0epKJcTFu0mfZEwkowRVpkhIteltA5M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1 h1:RP9nJ5v3fPoUFZOKz/NRPqS9PsWTY4Bb0N8AEsaMxKs= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.1/go.mod h1:HYxuleUSaHgXo2zG8LX1x//z561i55ilDsrVdLbxt78= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1 h1:rPiuAxyIYXpZwa0LsJA01RzrpO/oyNmlEc2w/LLvcN4= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.1/go.mod h1:r7nLneDqXu0JsahY3BLtRYyQhsIBloK9O2KLYbSvHU8= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1 h1:/SycKuDgy63OVHrvVME8S8YaBVSofI6WwtGNH0XwrJ0= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.1/go.mod h1:6QMbXmJiAJ/+xLTDMZJUq36LdNsMXKj9cH5MeG69a5c= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1 h1:GlxFaWXTU83RUkAHHvMTkWq/IzoDNwRHnT9/uy7z8Ds= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.1/go.mod h1:nnG6Pe7Qu1Bv/mE3eL/3gCiQYrAWyXFXDOtOKcC7eh0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1 h1:d9eqcZK+0RTr9NuwViwkbP9rcD4HuuyXsgUO0KZ04V0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.1/go.mod h1:q+dUus04tyoWH3qZxKzu68bfL4MFs5ahSTSkyFIqmFQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.1 h1:uSkuLDU3kxne5uCvX4KclzMqHJzfeqnAS4K3oRDEVWY= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.1/go.mod h1:WvsgG068tbYpznWb1e4z09bo7pdNfKyHK05muGk3JPA= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0 h1:uXeeO0cIv0VniybebysoNrr7iY/S8ej2IBhGu3XTOv8= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.0/go.mod h1:z/Ty4fCI3RR3vFh/z2kYmdv4KgXh6z/ydK5XN/hfCcY= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1 h1:KwJJJxYzaV1GEfjMSfRJFwoS4yTQF1iRGhHsjA9pSW0= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.1/go.mod h1:UXg+xZNhGCuhG8tg8Qj9XBH3qRA5WgmJkelLEyOassI= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.1 h1:R+iRSApRZVigWr9iWFk/YfZIup8fr4HWmUSwVNAni6s= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.1/go.mod h1:oT7arIE6sZstDjgtKfXZtLqpnsJuX261eFPfp7+0LR8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.1 h1:yKujPK+U3MSPR4v56aIvp7iJEU0Ohp704KkfDdumIbM= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.1/go.mod h1:9zSvP8LjLc7+ZKNU7wiKFYdtT103jk43rZ8VLh+SxOI= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.1 h1:rDo2bWVfwQww1nfxJF9E7u/A+NmiSnwDSWpU7+wP60Q= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.1/go.mod h1:O4eFpSa/AodvDLJqarL+0vnRgDP9d/FEKHZmzLnA/1c= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1 h1:Naqa0rqaFjNBUk3ggpg4B6aoz2ZvTopJJhjiar/8EEo= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.1/go.mod h1:RExz4LhRKY5iogQ1dz7KVa3JyBY0PBotXovrDj850Sc= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1 h1:fdUWpQTvZM6RDMtmMc9T6r80fb7PNPCQjsQBEIYqTLA= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.1/go.mod h1:CDVmu8K5JKdgdJakdZ9gC3K6OJ/+izv/kUncFeGRIj4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1 h1:IGggts6VTEMZ+CbEKf0FOL83Jc+7xTHBqtItk8rKMBM= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.1/go.mod h1:76T1ZqJLS3lBmShTO2230KTCoqjw7Lbxj6U7YwEQv+o= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1 h1:ZX5/4njY4W8Re4uFo5MpWXOQnWKMsZkERDVcOZuNx8c= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.1/go.mod h1:vAUirHmPQmQF5LO19CMdt10p/9Nl4cqqdygIsdPjx4Y= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1 h1:Wdc/2+ZT0SOKPu11GNwU08KR6/jREOhmMUrF6TbqD+s= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.7.1/go.mod h1:/B5AIPHVKVfZSsofTSfqrvl5QH5r/XK8/qcdHW3jjV4= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1 h1:AAo94xHcAQFBxzuS6jnIp+gEKfWDoQQAbqyhKmMGOYo= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.1/go.mod h1:tLEEa+UsBhm/fZNrnA1O8Vf69/Y94pYuLFP/v1UpB3U= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.1 h1:YfsU8hHGvVT+c6Q8MUs8haDbFQajAImrB7yZ9XnPcBY= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.1/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1 h1:HctWK6IduY4jkWT4t5IIatg0zYhG1uvLN04cVjwHCnQ= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.1/go.mod h1:0PiTFSuC4ripX730Y5aU/E6Nvge5JgVJUR36FAnCFCw= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1 h1:b4REsk5C0hooowAPmV8fS2haHb+HCyb5FKSKOZRBBfU= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.1/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1 h1:kCJG+jFRrD54jRPaat2ViEHVHd11vvTFd03rt20fHrE= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.1/go.mod h1:WcJG/CyL+W/E19D8G5fV16EBWP/V1mxsZChP1i6HflA= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.1 h1:ssCHKyNJqTnqRH4Vlf+jI0brtGQYBvzWwnATsOMk1mk= -github.com/aws/aws-sdk-go-v2/service/sts v1.37.1/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.1 h1:UU57RKiS6jyU2y8gW703Sj2kTlbrHuueSpLBnhVkgDo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.1/go.mod h1:K53Z8VIehp17bkIdte5qQJGIg/TTAnSijG5M3SRVQvo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1 h1:ZviWyumuMUXjDpyXm30VaLreZURieCr0sKiuRPXTHmQ= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.1/go.mod h1:W+FGMMTt/jHWUUM5es5OTFA22E2Ofia4wT9sqs8RmQM= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1 h1:IyKEyjbTHmMSFauCsDpsYaGrl3FPcQn2zaUWmp91pXw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.1/go.mod h1:VHRAf77eBVojkVkK/6Eh0YyqW474JYo2rkdo0ZSbT9U= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1 h1:ktd2e144+hLs0VnligLJs4O0DNTLYYPkQ29faFhmcho= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.14.1/go.mod h1:k9gnnRDj9A3E71aGKvAT6cZTTDQCQ1hHT9mu6ayNjkg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1 h1:3Pb4/A3ulYr32cXmWNe3o/0SnoI6xMaTdMb/AgN3WgQ= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.1/go.mod h1:DwajsOry3HW3LDuBdlkTA2YbZkOXl0lGqf/Tmh52RhU= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1 h1:ZXGk1DuDche405zuG0cnmJPuR7reYm6maElCEjjx3Xw= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.1/go.mod h1:zR+5dzF2qJz6WneebK+JkFEheDRa8CbRKYs//5XycJU= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1 h1:oEupgG58uPSui+oT3JxyzLPK6IBq489lptSrbj2ikcw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.1/go.mod h1:zKZY1p5qYRYG/NMOMv8GVeUJLliaK+EpgD9Q2q4v7O4= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1 h1:5FVVM5sKMWXU83AvUrgsGIWqxViY8BrdKxPMaQe0s5g= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.1/go.mod h1:LYJ3Lj45sKL6TmHqQQGGzOBTUWjPvo9rqjYmMzbpIlY= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1 h1:NFGAB3F6B3YyvFKQ5lQKnv2EUpOprtM8TfVeqAk0rYc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.27.1/go.mod h1:XHTOqO6Iy5JS7BTOT5fg5HvmMTxUJRksaypat8yHexw= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1 h1:Yh7uNwH8vJRmoPo9vIznLiKrc72n4j2aDPAbXaj7YC8= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.1/go.mod h1:lVuOOAjNmWYyLy+pHYu0QzZ07u8b+0rfPXrQNJ48N9o= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.1 h1:OqnzQgwg04K5nBMOVhTKOsWAQ/fw5kMoliPPzI+WJGM= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.1/go.mod h1:DVC3u2m55AWSV5tUmODpmG4gojAwO94Osa7YDLw9BCg= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1 h1:+m5eHO0hyX0Ps0+VSRLKu9W2gK8gIGTV4+z8fBsptPY= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.1/go.mod h1:brjH7E2LWOtLNsAupQL1Lv803e2xm3v+3wzqlX4BAOk= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1 h1:pqXQpjw0bfCeJrOUgfFJYFbl7YbMbVA9k4LN6dR+boo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.1/go.mod h1:EPNcb1lt/lfWkpjINo7eP5AwfvlG8ioVT9frx5w5k9s= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1 h1:mKJ+LTu4x65pSgMn2pu7pW3nwXjFMfe6HE8yIyj3xKY= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.1/go.mod h1:ObNr9KblAM/kLbDQAhRAqmi8sY5CPdEd9VqeyZxU79Y= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1 h1:yjHWB5KDZitNQRKHNPS+ZquOi+377Chmz01PhU6Pdt8= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.1/go.mod h1:AJ7eKGcsgQ07kXJ4YWAf7PTFOvkoHc0Voh7CkAj9Bqk= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1 h1:p6NR+K5innSuOAO4PQlrXGbeSzRFQ2u3yFJpTUi1iFM= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.31.1/go.mod h1:fCtcQlrmCiCA0BRxpkhrOCFPGDSi7YNw7IV+NS2bKyY= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.1 h1:09b9HHUpdLKsCrWa5+juB/fBXhyNLRq9t3gevDRUf4w= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.1/go.mod h1:zzWVXnnO820ouM6JAIv2dQa8p5rPTVOCRoEvkljwnnM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 h1:upi++G3fQCAUBXQe58TbjXmdVPwrqMnRQMThOAIz7KM= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4/go.mod h1:swb+GqWXTZMOyVV9rVePAUu5L80+X5a+Lui1RNOyUFo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 h1:JmmZEFvBaUH1m/38gJbdurfKXuWwsEwdNmob8wzKN9I= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2/go.mod h1:Xx0NjUVWuBTEbWsPKzlb5EGM7CXfNeZT/yYuDs0LU9I= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 h1:7pjtnLwOsSkXqUSUh0eM4FvtBrEAIIpZnpWMfYMInAQ= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2/go.mod h1:Mkxqo2gpKhOv6hzBwASIizK/jrMYRYC3jgxou79HPFs= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 h1:2cLDi8pUtPZpy4SxVl/8qGSOEXD1C9B6S9DbYdS+il0= +github.com/aws/aws-sdk-go-v2/service/iot v1.68.2/go.mod h1:t+dAKgSxvyyBLYfX7uRjVWLmSfB9oHVYrnr7xYgB7nI= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3r/1s2/LGP3I56Z8= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rOOwKLSc5jvNdU1iang= +github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 h1:6yvhusf2JqDouf2vID1uxgQjuLje4kXPXRbFDQxf93c= +github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 h1:pVadjOT9l8aWdRH6vNb9RzdV9ogiAL0z0xllp9odDOU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 h1:JfL0vQRSLMJLt+XSsXeVxHRNEk5sTNaHqff+mzF5tRw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2/go.mod h1:L8AA5x3ERX5vhzrxTsRoTJxtMk3VBtzUclRE01z9HP0= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiNWpiJ9DdB2mCAMzo= +github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= +github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 h1:SKdQK4/Q7vIKIUtDd09ip69rahh6e+hOtfCYgNvtDEw= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/NkeOgqlMexDsikmRhmMdUoxSsM= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= +github.com/aws/aws-sdk-go-v2/service/location v1.48.2 h1:/6HHSaPooetm78X+kIp9pLr4f/cWKA/uKvFvI1Tih0o= +github.com/aws/aws-sdk-go-v2/service/location v1.48.2/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= +github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 h1:EP6rsrGrKlJ5mBsODeBBcoqHf/tX42Za/m8yJLiKWRg= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 h1:JaDARBJwqzSg3Ccclf9Gzw/+kqG+orqGQAKUyWfsUQs= +github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0GMovPHAO54gCPbiI+zzXqQmS0wg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 h1:QjVz2wrfmEEpu8G3FEo9gF3umZvi7unsG1b99FtkyzE= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= +github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= +github.com/aws/aws-sdk-go-v2/service/mq v1.32.2/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= +github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2/go.mod h1:xq+4xu0T5W23GDTPj+olFc6wqBrTj8Mc2wSTvqMMLv4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 h1:k1ia1mxgufRVSzwAaen8l7/VbFnk5xu/6zJMYzSgMEg= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2/go.mod h1:9gwYWqGoNfNs0MHi6F1FadJ2aai+z9E2dkTFNBZlrLU= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OUisLz0OcVIsDKwX6zMvom3tBkGPk= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 h1:JOdUdSV9RDvZyNt3/oWlIk2y4hddH2vqn6BK6dqJ9VI= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 h1:o7gKGdpE0AS+kdt9pBi+gQyN2jZb1MPo+CE/iblnaBA= +github.com/aws/aws-sdk-go-v2/service/odb v1.3.2/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 h1:XJOb8AutXqrywbDXa5nlIr+0G93AlUltuYoXWHprCyE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= +github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 h1:nk8xdDkgWZAU8GHr4WUUCaevs/98WVPPelgRGxsNh4A= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= +github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 h1:/8mz+v/viFY1i8d3+sVCZi7T64D5eRmN9FM5EonxuGI= +github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 h1:Z0hXXBcnqPdpmQwf/LNIaqlgxcDs5BWC74JR0sX8sw8= +github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= +github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= +github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 h1:U0b+yGV+uu+9JHOfn9bUHPJIenoelWvc4xLN35JgKfI= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.2/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= +github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 h1:hdwUjAp9efZ3RMpdndoPG4SM/LXmyp0SZ9AaBoPUcOk= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 h1:I4DJs64ligwwPzChWFXVM/b5FO9FjB4bbrbIIXmwGwE= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 h1:o69fIeRrr7TdDBGq9uh9y/4Y/5xMJLSN/LBMIZ0fJGk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 h1:FFQjXqKbTFgN/BT9/4YinF3vwUeiZ3rGyhLJ71v0k2Q= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 h1:STec5l4m/cd+VUPDC+4pBqGgTFTanelfJoKiHcobT/M= +github.com/aws/aws-sdk-go-v2/service/rum v1.27.2/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2/go.mod h1:PxKvSpaiyU4RF1vqdtgcjNz4UfzPhCmNEvuLEtbFdNk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 h1:DK4wkPe5hqJ/lGenYmlzP+xEaTVufeWwlcwBYun0yrU= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0/go.mod h1:mPnKXr7MlpLhdPrDIp7A7wrn8KZczClUR3cCiOoiurw= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6EqsTDpmZqtOEwMkQ8q/co= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 h1:H3iWnVnEPYD8JOkKIvgALPCTbinIoebBTrNfOAZ+sJY= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= +github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 h1:BvsTLbavBCIWhGav8Rm/vPPyyhDwkOMSi0pkGaohCag= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCCSKm0gUruc8BFzFwjvmeLZBE= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 h1:45G3hjtf001+XN+JgOf0j6IufhHJfGIKEEMvaTBqqH4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uKqBVkQXOxDfKWkwZMTHMLZrXRFI= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 h1:5m5YPqPzZ2kunWiC3pld0wHcwWzx/U9/VFpWfkc1OJg= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 h1:Fx3su5YVfkkjdbXZl56T1KKLsdIxr+q28VFoUXDWsd4= +github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 h1:Ecwq3xNoQQYKCvssG0zKU1ebXw1dMM7uscXqn8w1I7U= +github.com/aws/aws-sdk-go-v2/service/shield v1.33.2/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= +github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= +github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 h1:yBi89yZecBo3z/lKtOYwveOyGYBCqusZb6GbircmPXU= +github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= +github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFMC+vZiPGjTmZaeaVY+w= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 h1:RibOkweLBwdRGOxSL154qu294WOkTGSv3cDESKOCaQU= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 h1:hGjHhpdzNJb/IPaRZT8qoClVieXa8+arkgtcgLQ1XkA= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 h1:NXywrPzON1EICJEvKKI7yaQ8XCzNhsJQUsD95stqZpw= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 h1:6U0E5il6rPEcS97BO8XVSb5HBOa3zxblhdUgm9E8pcQ= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= +github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 h1:7PbqJKf+IU/y12Wn63vOw6PTHXfGp/aWeD4MfEfFRGo= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= From 74d95957a46b50fc93ab47cfaeeb7ea85e1515cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 13:41:56 +0000 Subject: [PATCH 0637/2115] Bump actions/checkout from 4.2.2 to 5.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/11bd71901bbe5b1630ceea73d27597364c9af683...08c6903cd8c0fde910a37f88322edcfb5dd907a8) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../acctest-terraform-embedded-lint.yml | 4 ++-- .github/workflows/acctest-terraform-lint.yml | 4 ++-- .github/workflows/build.yml | 10 +++++----- .github/workflows/changelog_misspell.yml | 2 +- .github/workflows/closed_items.yml | 2 +- .github/workflows/comments.yml | 2 +- .github/workflows/copyright.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/documentation.yml | 6 +++--- .github/workflows/examples.yml | 4 ++-- .github/workflows/gen-teamcity.yml | 2 +- .github/workflows/generate_changelog.yml | 2 +- .github/workflows/golangci-lint.yml | 10 +++++----- .github/workflows/maintainer_helpers.yml | 4 ++-- .github/workflows/milestone.yml | 2 +- .github/workflows/mkdocs.yml | 2 +- .github/workflows/modern_go.yml | 2 +- .github/workflows/provider.yml | 20 +++++++++---------- .github/workflows/providerlint.yml | 2 +- .github/workflows/pull_request_review.yml | 2 +- .github/workflows/pull_request_target.yml | 2 +- .github/workflows/readiness_comment.yml | 2 +- .github/workflows/resource-counts.yml | 2 +- .github/workflows/semgrep-ci.yml | 18 ++++++++--------- .github/workflows/skaff.yml | 2 +- .github/workflows/smarterr.yml | 2 +- .github/workflows/triage.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/website.yml | 14 ++++++------- .github/workflows/workflow-lint.yml | 2 +- .github/workflows/yamllint.yml | 2 +- 31 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/acctest-terraform-embedded-lint.yml b/.github/workflows/acctest-terraform-embedded-lint.yml index 0e68dea75762..ccc3ece16b63 100644 --- a/.github/workflows/acctest-terraform-embedded-lint.yml +++ b/.github/workflows/acctest-terraform-embedded-lint.yml @@ -23,7 +23,7 @@ jobs: terrafmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -51,7 +51,7 @@ jobs: TEST_FILES_PARTITION: '\./internal/service/${{ matrix.path }}.*/.*_test\.go' steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/acctest-terraform-lint.yml b/.github/workflows/acctest-terraform-lint.yml index 9abfa30ca79c..076541dd38e9 100644 --- a/.github/workflows/acctest-terraform-lint.yml +++ b/.github/workflows/acctest-terraform-lint.yml @@ -22,7 +22,7 @@ jobs: terrafmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bbe23f6d9a3..2e6b2532679b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: outputs: go-version: ${{ steps.get-go-version.outputs.go-version }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: 'go.mod' @@ -52,7 +52,7 @@ jobs: product-prerelease-version: ${{ steps.set-product-version.outputs.prerelease-product-version }} product-minor-version: ${{ steps.set-product-version.outputs.minor-product-version }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set variables id: set-product-version uses: hashicorp/actions-set-product-version@v2 @@ -67,7 +67,7 @@ jobs: filepath: ${{ steps.generate-metadata-file.outputs.filepath }} steps: - name: "Checkout directory" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Generate metadata file id: generate-metadata-file uses: hashicorp/actions-generate-metadata@v1 @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checkout directory" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: path: ${{ env.PKG_NAME }} - name: "Copy manifest from checkout directory to a file with the desired name" @@ -137,7 +137,7 @@ jobs: name: Go ${{ needs.get-go-version.outputs.go-version }} ${{ matrix.goos }} ${{ matrix.goarch }} build steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: hashicorp/actions-go-build@v1 env: CGO_ENABLED: 0 diff --git a/.github/workflows/changelog_misspell.yml b/.github/workflows/changelog_misspell.yml index d11e072cc909..83704d35c548 100644 --- a/.github/workflows/changelog_misspell.yml +++ b/.github/workflows/changelog_misspell.yml @@ -20,7 +20,7 @@ jobs: misspell: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/closed_items.yml b/.github/workflows/closed_items.yml index c53b06ad758c..63d0e49879a3 100644 --- a/.github/workflows/closed_items.yml +++ b/.github/workflows/closed_items.yml @@ -42,7 +42,7 @@ jobs: > > Ongoing conversations amongst community members are welcome, however, the issue will be locked after 30 days. Moving conversations to another venue, such as the [AWS Provider forum](https://discuss.hashicorp.com/c/terraform-providers/tf-aws/33), is recommended. If you have additional concerns, please open a new issue, referencing this one where needed." - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 id: checkout if: github.event.pull_request.merged with: diff --git a/.github/workflows/comments.yml b/.github/workflows/comments.yml index d2a2f5df175f..ac4cdc01045c 100644 --- a/.github/workflows/comments.yml +++ b/.github/workflows/comments.yml @@ -13,7 +13,7 @@ jobs: comment: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: .github/actions/community_check diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml index a25d413ed778..fdb1a58cc9d9 100644 --- a/.github/workflows/copyright.yml +++ b/.github/workflows/copyright.yml @@ -24,7 +24,7 @@ jobs: name: add headers check runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 9e5d8d212ac5..7bea3f72e464 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -37,7 +37,7 @@ jobs: contents: read steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - name: Setup Go diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 175eb0ae9218..359ff8babc5a 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -23,7 +23,7 @@ jobs: env: UV_THREADPOOL_SIZE: 128 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: YakDriver/md-check-links@0a295ce2e08c544aae01cccc9b4c6801a8398942 # v2.2.0 with: quiet: 'yes' @@ -36,14 +36,14 @@ jobs: markdown-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0 with: args: 'docs' misspell: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 6660d1e29b1f..16aabd1644f9 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -24,7 +24,7 @@ jobs: tflint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -61,7 +61,7 @@ jobs: env: TF_IN_AUTOMATION: "1" steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/gen-teamcity.yml b/.github/workflows/gen-teamcity.yml index 2405202efc7b..436f8185b0ea 100644 --- a/.github/workflows/gen-teamcity.yml +++ b/.github/workflows/gen-teamcity.yml @@ -13,7 +13,7 @@ jobs: name: Validate TeamCity Configuration runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: distribution: adopt diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml index 953a581fca2c..ef6dd34034fe 100644 --- a/.github/workflows/generate_changelog.yml +++ b/.github/workflows/generate_changelog.yml @@ -13,7 +13,7 @@ jobs: with: app-id: ${{ secrets.APP_ID }} private-key: ${{ secrets.APP_PEM }} - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 token: ${{ steps.app-token.outputs.token }} diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index e3fc5325b737..6e386cc9f46c 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -27,7 +27,7 @@ jobs: name: 1 of 5 runs-on: custom-ubuntu-22.04-large steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -50,7 +50,7 @@ jobs: needs: [golangci-linta] runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -78,7 +78,7 @@ jobs: needs: [golangci-linta] runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -106,7 +106,7 @@ jobs: needs: [golangci-linta] runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -134,7 +134,7 @@ jobs: needs: [golangci-linta] runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/maintainer_helpers.yml b/.github/workflows/maintainer_helpers.yml index 3dba8b4db589..b93174b8cead 100644 --- a/.github/workflows/maintainer_helpers.yml +++ b/.github/workflows/maintainer_helpers.yml @@ -45,7 +45,7 @@ jobs: app-id: ${{ secrets.APP_ID }} private-key: ${{ secrets.APP_PEM }} - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: .github/actions/ @@ -104,7 +104,7 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: .github/actions/ diff --git a/.github/workflows/milestone.yml b/.github/workflows/milestone.yml index 3232df1fc638..ba98dc0e44d8 100644 --- a/.github/workflows/milestone.yml +++ b/.github/workflows/milestone.yml @@ -27,7 +27,7 @@ jobs: MILESTONE: ${{ github.event.milestone.number }} steps: - name: 'Checkout Repo' - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: 'Remove Prioritized Label' env: diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml index f8bfb0b32414..df12f1014210 100644 --- a/.github/workflows/mkdocs.yml +++ b/.github/workflows/mkdocs.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout main - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Deploy docs uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26 diff --git a/.github/workflows/modern_go.yml b/.github/workflows/modern_go.yml index b9129a28b385..2037bb984776 100644 --- a/.github/workflows/modern_go.yml +++ b/.github/workflows/modern_go.yml @@ -21,7 +21,7 @@ jobs: name: Check for modern Go code runs-on: custom-ubuntu-22.04-medium steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/provider.yml b/.github/workflows/provider.yml index e83c95e44e05..6dfb8416cc60 100644 --- a/.github/workflows/provider.yml +++ b/.github/workflows/provider.yml @@ -37,7 +37,7 @@ jobs: name: go mod download runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -56,7 +56,7 @@ jobs: needs: [go_mod_download] runs-on: custom-ubuntu-22.04-medium steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 continue-on-error: true id: cache-terraform-plugin-dir @@ -92,7 +92,7 @@ jobs: needs: [go_build] runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -125,7 +125,7 @@ jobs: needs: [go_build] runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 @@ -154,7 +154,7 @@ jobs: needs: [go_build] runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -185,7 +185,7 @@ jobs: needs: [go_build] runs-on: custom-ubuntu-22.04-medium steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 @@ -243,7 +243,7 @@ jobs: needs: [go_build] runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 continue-on-error: true id: cache-terraform-providers-schema @@ -278,7 +278,7 @@ jobs: needs: [terraform_providers_schema] runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod @@ -306,7 +306,7 @@ jobs: markdown-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0 with: args: "." @@ -315,7 +315,7 @@ jobs: misspell: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/providerlint.yml b/.github/workflows/providerlint.yml index c3b687765fec..6cd160ee96a4 100644 --- a/.github/workflows/providerlint.yml +++ b/.github/workflows/providerlint.yml @@ -23,7 +23,7 @@ jobs: providerlint: runs-on: custom-ubuntu-22.04-medium steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/pull_request_review.yml b/.github/workflows/pull_request_review.yml index f6020d56b708..203d6f597f64 100644 --- a/.github/workflows/pull_request_review.yml +++ b/.github/workflows/pull_request_review.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Community Check - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: .github/actions/community_check diff --git a/.github/workflows/pull_request_target.yml b/.github/workflows/pull_request_target.yml index 122c7fca3a86..7648db878b6f 100644 --- a/.github/workflows/pull_request_target.yml +++ b/.github/workflows/pull_request_target.yml @@ -29,7 +29,7 @@ jobs: contents: read steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - name: Setup Go diff --git a/.github/workflows/readiness_comment.yml b/.github/workflows/readiness_comment.yml index 8f60b8e58afa..0acaaf9f3885 100644 --- a/.github/workflows/readiness_comment.yml +++ b/.github/workflows/readiness_comment.yml @@ -49,7 +49,7 @@ jobs: has: - '.changelog/**' - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 id: checkout if: | steps.filter.outputs.changelog == 'true' diff --git a/.github/workflows/resource-counts.yml b/.github/workflows/resource-counts.yml index 331baa6af823..4be90153b0c3 100644 --- a/.github/workflows/resource-counts.yml +++ b/.github/workflows/resource-counts.yml @@ -18,7 +18,7 @@ jobs: installation_retrieval_mode: id installation_retrieval_payload: ${{ secrets.INSTALLATION_ID }} private_key: ${{secrets.APP_PEM }} - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd with: terraform_version: ${{ env.TERRAFORM_VERSION }} diff --git a/.github/workflows/semgrep-ci.yml b/.github/workflows/semgrep-ci.yml index 635341c89b72..508c2c1f64ba 100644 --- a/.github/workflows/semgrep-ci.yml +++ b/.github/workflows/semgrep-ci.yml @@ -30,7 +30,7 @@ jobs: container: image: "returntocorp/semgrep:1.52.0" steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: | semgrep --validate \ --config .ci/.semgrep.yml \ @@ -45,7 +45,7 @@ jobs: container: image: "returntocorp/semgrep:1.52.0" steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: | semgrep --quiet --test .ci/semgrep/ @@ -56,7 +56,7 @@ jobs: container: image: "returntocorp/semgrep:1.52.0" steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: | semgrep $SEMGREP_ARGS \ --config .ci/.semgrep.yml \ @@ -77,7 +77,7 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-caps-aws-ec2.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-caps-aws-ec2.yml @@ -88,7 +88,7 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-configs.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-configs.yml @@ -99,7 +99,7 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-service-name0.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-service-name0.yml @@ -110,7 +110,7 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-service-name1.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-service-name1.yml @@ -121,7 +121,7 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-service-name2.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-service-name2.yml @@ -132,6 +132,6 @@ jobs: image: "returntocorp/semgrep:1.52.0" if: (github.action != 'dependabot[bot]') steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - run: semgrep --validate --config .ci/.semgrep-service-name3.yml - run: semgrep $SEMGREP_ARGS --config .ci/.semgrep-service-name3.yml diff --git a/.github/workflows/skaff.yml b/.github/workflows/skaff.yml index b71df2acb4ca..990c86eb720b 100644 --- a/.github/workflows/skaff.yml +++ b/.github/workflows/skaff.yml @@ -21,7 +21,7 @@ jobs: name: Compile skaff runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 diff --git a/.github/workflows/smarterr.yml b/.github/workflows/smarterr.yml index d960b7dad7da..f552489feaf7 100644 --- a/.github/workflows/smarterr.yml +++ b/.github/workflows/smarterr.yml @@ -21,7 +21,7 @@ jobs: name: Check smarterr config runs-on: custom-ubuntu-22.04-medium steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: go.mod diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 92409f313879..fbe0d380e792 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -25,7 +25,7 @@ jobs: name: Labelers runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: sparse-checkout: .github diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 3d3ed01020df..f25f935065f3 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0 diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 48cf5ec227a5..74c12b1de310 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -26,7 +26,7 @@ jobs: markdown-link-check-a-h-markdown: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: YakDriver/md-check-links@0a295ce2e08c544aae01cccc9b4c6801a8398942 # v2.2.0 name: markdown-link-check website/docs/**/[a-h].markdown with: @@ -42,7 +42,7 @@ jobs: markdown-link-check-i-z-markdown: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: YakDriver/md-check-links@0a295ce2e08c544aae01cccc9b4c6801a8398942 # v2.2.0 name: markdown-link-check website/docs/**/[i-z].markdown with: @@ -58,7 +58,7 @@ jobs: markdown-link-check-md: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: YakDriver/md-check-links@0a295ce2e08c544aae01cccc9b4c6801a8398942 # v2.2.0 name: markdown-link-check website/docs/**/*.md with: @@ -76,7 +76,7 @@ jobs: markdown-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: avto-dev/markdown-lint@04d43ee9191307b50935a753da3b775ab695eceb # v1.5.0 with: args: "website/docs" @@ -86,7 +86,7 @@ jobs: misspell: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: .ci/tools/go.mod @@ -102,7 +102,7 @@ jobs: terrafmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: .ci/tools/go.mod @@ -118,7 +118,7 @@ jobs: tflint: runs-on: custom-ubuntu-22.04-xl steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 diff --git a/.github/workflows/workflow-lint.yml b/.github/workflows/workflow-lint.yml index a855d41ee7a1..6b11aea1651b 100644 --- a/.github/workflows/workflow-lint.yml +++ b/.github/workflows/workflow-lint.yml @@ -19,7 +19,7 @@ jobs: actionlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version-file: .ci/tools/go.mod diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml index 682351ca7493..3f444a6e21fb 100644 --- a/.github/workflows/yamllint.yml +++ b/.github/workflows/yamllint.yml @@ -20,7 +20,7 @@ jobs: yamllint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Run yamllint uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.1.1 with: From aabbdcc65f9bd4ad518d77d1122e05a707d848ee Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 22 Aug 2025 13:45:05 +0000 Subject: [PATCH 0638/2115] Update CHANGELOG.md for #43977 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd5e1b3e2d60..29888a7b5b36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## 6.11.0 (Unreleased) +ENHANCEMENTS: + +* data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) +* resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) +* resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) + +BUG FIXES: + +* resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) + ## 6.10.0 (August 21, 2025) NOTES: From 70939a153bf55e435b9ebcc6d5050a13b73d2fb0 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 22 Aug 2025 14:21:02 +0000 Subject: [PATCH 0639/2115] Update CHANGELOG.md for #43997 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29888a7b5b36..b2bb761fedb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,12 @@ ENHANCEMENTS: +* data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) +* resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) +* resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) BUG FIXES: From a783fdbb73574aab0299ba6078a32d872b0bb1b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 10:23:37 -0400 Subject: [PATCH 0640/2115] Correct CHANGELOG entry --- .changelog/42188.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/42188.txt b/.changelog/42188.txt index 2632458a81b6..7d66b0f776f4 100644 --- a/.changelog/42188.txt +++ b/.changelog/42188.txt @@ -7,5 +7,5 @@ resource/aws_network_interface_attachment: Add `network_card_index` argument ``` ```release-note:enhancement -data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute +data-source/aws_network_interface: Add `attachment.network_card_index` attribute ``` From 24083749873af743ef9cc57c6642b7539af640ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 10:28:11 -0400 Subject: [PATCH 0641/2115] Correct CHANGELOG entry. --- .changelog/26702.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/26702.txt b/.changelog/26702.txt index 5c8e322b7976..8026e5c5e3c7 100644 --- a/.changelog/26702.txt +++ b/.changelog/26702.txt @@ -1,3 +1,3 @@ ```release-note:bug -internal/service/glue/catalog_table.go: "partition_keys" schema was missing the optional attribute "parameters" to match AWS definition found at github.com/aws/aws-sdk-go/service/glue +resource/aws_glue_catalog_table: Fix `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ``` From 87b19bb0b0776f5a50da16eebe1469ac6f6c91e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 10:45:08 -0400 Subject: [PATCH 0642/2115] d/aws_glue_catalog_table: Add `partition_keys.parameters` attribute. --- .changelog/26702.txt | 6 +++- internal/service/glue/catalog_table.go | 34 +++++++++---------- .../service/glue/catalog_table_data_source.go | 5 +++ .../docs/d/glue_catalog_table.html.markdown | 1 + .../docs/r/glue_catalog_table.html.markdown | 1 + 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.changelog/26702.txt b/.changelog/26702.txt index 8026e5c5e3c7..09f93896ed39 100644 --- a/.changelog/26702.txt +++ b/.changelog/26702.txt @@ -1,3 +1,7 @@ ```release-note:bug -resource/aws_glue_catalog_table: Fix `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors +resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ``` + +```release-note:bug +data-source/aws_glue_catalog_table: Add `partition_keys.parameters` attribute +``` \ No newline at end of file diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index df163d96eff2..67dc1ecab811 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -93,16 +93,16 @@ func resourceCatalogTable() *schema.Resource { Required: true, ValidateFunc: validation.StringLenBetween(1, 255), }, + names.AttrParameters: { + Type: schema.TypeMap, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, names.AttrType: { Type: schema.TypeString, Optional: true, ValidateFunc: validation.StringLenBetween(0, 131072), }, - "parameters": { - Type: schema.TypeMap, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, - }, }, }, }, @@ -783,14 +783,14 @@ func expandColumns(columns []any) []awstypes.Column { column.Comment = aws.String(v.(string)) } - if v, ok := elementMap[names.AttrType]; ok { - column.Type = aws.String(v.(string)) - } - if v, ok := elementMap[names.AttrParameters]; ok { column.Parameters = flex.ExpandStringValueMap(v.(map[string]any)) } + if v, ok := elementMap[names.AttrType]; ok { + column.Type = aws.String(v.(string)) + } + columnSlice = append(columnSlice, column) } @@ -956,22 +956,22 @@ func flattenColumns(cs []awstypes.Column) []map[string]any { func flattenColumn(c awstypes.Column) map[string]any { column := make(map[string]any) - if v := aws.ToString(c.Name); v != "" { - column[names.AttrName] = v - } - - if v := aws.ToString(c.Type); v != "" { - column[names.AttrType] = v - } - if v := aws.ToString(c.Comment); v != "" { column[names.AttrComment] = v } + if v := aws.ToString(c.Name); v != "" { + column[names.AttrName] = v + } + if v := c.Parameters; v != nil { column[names.AttrParameters] = v } + if v := aws.ToString(c.Type); v != "" { + column[names.AttrType] = v + } + return column } diff --git a/internal/service/glue/catalog_table_data_source.go b/internal/service/glue/catalog_table_data_source.go index 5072af45087f..9cf970ee0903 100644 --- a/internal/service/glue/catalog_table_data_source.go +++ b/internal/service/glue/catalog_table_data_source.go @@ -96,6 +96,11 @@ func dataSourceCatalogTable() *schema.Resource { Type: schema.TypeString, Computed: true, }, + names.AttrParameters: { + Type: schema.TypeMap, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, names.AttrType: { Type: schema.TypeString, Computed: true, diff --git a/website/docs/d/glue_catalog_table.html.markdown b/website/docs/d/glue_catalog_table.html.markdown index 212c212071c9..3c33b1d2b6ea 100644 --- a/website/docs/d/glue_catalog_table.html.markdown +++ b/website/docs/d/glue_catalog_table.html.markdown @@ -57,6 +57,7 @@ This data source exports the following attributes in addition to the arguments a * `comment` - Free-form text comment. * `name` - Name of the Partition Key. +* `parameters` - Map of key-value pairs. * `type` - Datatype of data in the Partition Key. ### storage_descriptor diff --git a/website/docs/r/glue_catalog_table.html.markdown b/website/docs/r/glue_catalog_table.html.markdown index 36433bc535b3..41dd1fe3a0ec 100644 --- a/website/docs/r/glue_catalog_table.html.markdown +++ b/website/docs/r/glue_catalog_table.html.markdown @@ -132,6 +132,7 @@ To add an index to an existing table, see the [`glue_partition_index` resource]( * `comment` - (Optional) Free-form text comment. * `name` - (Required) Name of the Partition Key. +* `parameters` - (Optional) Map of key-value pairs. * `type` - (Optional) Datatype of data in the Partition Key. ### storage_descriptor From 799e6e0dc1749e7f0fdb4ab4d43ec62d7d7ef74c Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 22 Aug 2025 14:52:12 +0000 Subject: [PATCH 0643/2115] Update CHANGELOG.md for #44000 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2bb761fedb9..094b7281ca1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ENHANCEMENTS: -* data-source/aws_network_interfaces: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) From b1d025fa65c9457eee00ad06d3a759630c6ccecc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 10:57:42 -0400 Subject: [PATCH 0644/2115] Correct 'TestAccGlueCatalogTable_targetTable'. --- internal/service/glue/catalog_table_test.go | 24 --------------------- 1 file changed, 24 deletions(-) diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index d5cd7df6ab8f..c461c07e35c6 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -1445,30 +1445,6 @@ resource "aws_glue_catalog_database" "test2" { resource "aws_glue_catalog_table" "test2" { name = "%[1]s-2" database_name = aws_glue_catalog_database.test2.name - - columns { - name = "my_column_1" - type = "int" - comment = "my_column1_comment" - } - - columns { - name = "my_column_2" - type = "string" - comment = "my_column2_comment" - } - - partition_keys { - name = "my_column_1" - type = "int" - comment = "my_column_1_comment" - } - - partition_keys { - name = "my_column_2" - type = "string" - comment = "my_column_2_comment" - } } `, rName) } From 482ae7f99d2a6cbfa8c79d288ee82810648dc201 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 22 Aug 2025 13:24:04 -0400 Subject: [PATCH 0645/2115] chore: fix changelog entry links (#44002) --- .changelog/{43876.txt => 43976.txt} | 0 CHANGELOG.md | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) rename .changelog/{43876.txt => 43976.txt} (100%) diff --git a/.changelog/43876.txt b/.changelog/43976.txt similarity index 100% rename from .changelog/43876.txt rename to .changelog/43976.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 094b7281ca1a..02e0273380ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,15 +30,15 @@ ENHANCEMENTS: * resource/aws_glue_job: Support `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, and `R.8X` as valid values for `worker_type` ([#43988](https://github.com/hashicorp/terraform-provider-aws/issues/43988)) * resource/aws_lambda_permission: Add resource identity support ([#43954](https://github.com/hashicorp/terraform-provider-aws/issues/43954)) * resource/aws_lightsail_static_ip_attachment: Support resource import ([#43874](https://github.com/hashicorp/terraform-provider-aws/issues/43874)) -* resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_logging: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_notification: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_ownership_controls: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_policy: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_public_access_block: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_versioning: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) -* resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43876](https://github.com/hashicorp/terraform-provider-aws/issues/43876)) +* resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_logging: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_notification: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_ownership_controls: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_policy: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_public_access_block: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_versioning: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_secretsmanager_secret: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_policy: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) * resource/aws_secretsmanager_secret_rotation: Add resource identity support ([#43872](https://github.com/hashicorp/terraform-provider-aws/issues/43872)) From 1c653426ec07f48c39e064394458ae12709a6962 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 22 Aug 2025 17:29:03 +0000 Subject: [PATCH 0646/2115] Update CHANGELOG.md for #44002 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02e0273380ac..12e9457c5517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,21 @@ ENHANCEMENTS: * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_logging: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_notification: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_ownership_controls: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_policy: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_public_access_block: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_versioning: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) BUG FIXES: +* data-source/aws_glue_catalog_table: Add `partition_keys.parameters` attribute ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) +* resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) ## 6.10.0 (August 21, 2025) From aee341eae5e0ef87eec13e192d892ee57a45524e Mon Sep 17 00:00:00 2001 From: nu Date: Fri, 22 Aug 2025 23:24:00 +0530 Subject: [PATCH 0647/2115] Fix doc for batch_job_definition --- website/docs/r/batch_job_definition.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/batch_job_definition.html.markdown b/website/docs/r/batch_job_definition.html.markdown index 7a3e03875298..5585e30e0559 100644 --- a/website/docs/r/batch_job_definition.html.markdown +++ b/website/docs/r/batch_job_definition.html.markdown @@ -344,7 +344,7 @@ The following arguments are optional: #### eks_metadata -* `labels` - Key-value pairs used to identify, sort, and organize cube resources. +* `labels` - Key-value pairs used to identify, sort, and organize kubernetes resources. #### `eks_secret` From 1da291e8f5eca91166a0e8f073d8f331bfae985d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 14:21:48 -0400 Subject: [PATCH 0648/2115] 'testAccGlobalReplicationGroupConfig_engineVersionInherit' -> 'testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit'. --- .../elasticache/global_replication_group_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 5702d8ee3443..57f40335fa6d 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -1229,7 +1229,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1266,7 +1266,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1312,7 +1312,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MinorDown CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1359,7 +1359,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MajorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1401,7 +1401,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineVersionOnUpdate_MajorUpgr CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "5.0.6"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestCheckResourceAttrPair(resourceName, "engine_version_actual", primaryReplicationGroupResourceName, "engine_version_actual"), @@ -1444,7 +1444,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetParameterGroupOnUpdate_NoVersio CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.2\.[[:digit:]]+$`)), @@ -1478,7 +1478,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetParameterGroupOnUpdate_MinorUpg CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), Steps: []resource.TestStep{ { - Config: testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "6.0"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.0\.[[:digit:]]+$`)), @@ -2069,7 +2069,7 @@ resource "aws_elasticache_replication_group" "test" { `, rName, numNodeGroups, globalNumNodeGroups) } -func testAccGlobalReplicationGroupConfig_engineVersionInherit(rName, primaryReplicationGroupId, repGroupEngineVersion string) string { +func testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, repGroupEngineVersion string) string { return fmt.Sprintf(` resource "aws_elasticache_global_replication_group" "test" { global_replication_group_id_suffix = %[1]q From 3d74d7b20f1fb58323695d12bfe41f4b38f013ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 14:31:37 -0400 Subject: [PATCH 0649/2115] r/aws_elasticache_global_replication_group: Acceptance test changes from #42636. --- .../global_replication_group_test.go | 236 ++++++++++++++++-- 1 file changed, 216 insertions(+), 20 deletions(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 57f40335fa6d..aa7f22267a50 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -1527,6 +1527,179 @@ func TestAccElastiCacheGlobalReplicationGroup_UpdateParameterGroupName(t *testin }) } +func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnCreate_ValkeyUpgrade(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + primaryReplicationGroupId := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckGlobalReplicationGroup(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), + Steps: []resource.TestStep{ + { + // create global datastore with valkey 8.0 engine version from a redis 7.1 primary replication group + Config: testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGroupId, "redis", "7.1", "valkey", "8.0", "default.valkey8"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^8\.0\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being upgraded by the global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + +func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + primaryReplicationGroupId := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckGlobalReplicationGroup(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), + Steps: []resource.TestStep{ + { + // create global datastore using redis 7.1 primary replication group engine version + Config: testAccGlobalReplicationGroupConfig_Redis_engineVersionInherit(rName, primaryReplicationGroupId, "7.1"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^7\.1\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being associated to global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "redis"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.1"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + { + // upgrade engine and version on global datastore + Config: testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGroupId, "redis", "7.1", "valkey", "7.2", "default.valkey7"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^7\.2\.[[:digit:]]+$`)), + ), + }, + { + // check import of global datastore + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrParameterGroupName}, + }, + { + // refresh primary replication group after being upgraded by the global datastore + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.2"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + +func TestAccElastiCacheGlobalReplicationGroup_InheritValkeyEngine_SecondaryReplicationGroup(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var globalReplicationGroup awstypes.GlobalReplicationGroup + + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + primaryReplicationGroupId := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + secondaryReplicationGroupId := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + resourceName := "aws_elasticache_global_replication_group.test" + primaryReplicationGroupResourceName := "aws_elasticache_replication_group.test" + secondaryReplicationGroupResourceName := "aws_elasticache_replication_group.secondary" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckMultipleRegion(t, 2) + testAccPreCheckGlobalReplicationGroup(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ElastiCacheServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 2), + CheckDestroy: testAccCheckGlobalReplicationGroupDestroy(ctx, t), + Steps: []resource.TestStep{ + { + // create global datastore using Valkey 8.0 primary replication group and add secondary replication group + Config: testAccGlobalReplicationGroupConfig_Valkey_inheritEngine_secondaryReplicationGroup(rName, primaryReplicationGroupId, secondaryReplicationGroupId), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckGlobalReplicationGroupExists(ctx, t, resourceName, &globalReplicationGroup), + resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^8\.0\.[[:digit:]]+$`)), + ), + }, + { + // refresh replication groups to pick up all engine and version computed changes + RefreshState: true, + Check: resource.ComposeAggregateTestCheckFunc( + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + + resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngine, "valkey"), + resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"), + resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)), + resource.TestCheckResourceAttrPair(secondaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"), + ), + }, + }, + }) +} + func testAccCheckGlobalReplicationGroupExists(ctx context.Context, t *testing.T, resourceName string, v *awstypes.GlobalReplicationGroup) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] @@ -2105,10 +2278,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion) } @@ -2130,10 +2299,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion) } @@ -2156,14 +2321,53 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion, parameterGroup) } +func testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGroupId, repGroupEngine, repGroupEngineVersion, globalEngine, globalEngineVersion, globalParamGroup string) string { + return fmt.Sprintf(` +resource "aws_elasticache_global_replication_group" "test" { + global_replication_group_id_suffix = %[1]q + primary_replication_group_id = aws_elasticache_replication_group.test.id + engine = %[5]q + engine_version = %[6]q + parameter_group_name = %[7]q +} +resource "aws_elasticache_replication_group" "test" { + replication_group_id = %[2]q + description = "test" + engine = %[3]q + engine_version = %[4]q + node_type = "cache.m5.large" + num_cache_clusters = 1 +} +`, rName, primaryReplicationGroupId, repGroupEngine, repGroupEngineVersion, globalEngine, globalEngineVersion, globalParamGroup) +} + +func testAccGlobalReplicationGroupConfig_Valkey_inheritEngine_secondaryReplicationGroup(rName, primaryReplicationGroupId, secondaryReplicationGroupId string) string { + return acctest.ConfigCompose(acctest.ConfigMultipleRegionProvider(2), fmt.Sprintf(` +resource "aws_elasticache_global_replication_group" "test" { + global_replication_group_id_suffix = %[1]q + primary_replication_group_id = aws_elasticache_replication_group.test.id +} +resource "aws_elasticache_replication_group" "test" { + replication_group_id = %[2]q + description = "test" + engine = "valkey" + engine_version = "8.0" + node_type = "cache.m5.large" + num_cache_clusters = 1 +} +resource "aws_elasticache_replication_group" "secondary" { + provider = awsalternate + replication_group_id = %[3]q + description = "test secondary" + global_replication_group_id = aws_elasticache_global_replication_group.test.id +} +`, rName, primaryReplicationGroupId, secondaryReplicationGroupId)) +} + func testAccGlobalReplicationGroupConfig_engineVersionCustomParam(rName, primaryReplicationGroupId, repGroupEngineVersion, globalEngineVersion, parameterGroupName, parameterGroupFamily string) string { return fmt.Sprintf(` resource "aws_elasticache_global_replication_group" "test" { @@ -2182,10 +2386,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } resource "aws_elasticache_parameter_group" "test" { @@ -2213,10 +2413,6 @@ resource "aws_elasticache_replication_group" "test" { engine_version = %[3]q node_type = "cache.m5.large" num_cache_clusters = 1 - - lifecycle { - ignore_changes = [engine_version] - } } `, rName, primaryReplicationGroupId, repGroupEngineVersion, parameterGroup) } From 720ec6cac8756acd50f0e2c42e614d7ccdc95afd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 14:41:18 -0400 Subject: [PATCH 0650/2115] r/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed. --- .changelog/42636.txt | 3 +++ internal/service/elasticache/global_replication_group.go | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changelog/42636.txt diff --git a/.changelog/42636.txt b/.changelog/42636.txt new file mode 100644 index 000000000000..e88f1ab8aaad --- /dev/null +++ b/.changelog/42636.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed +``` \ No newline at end of file diff --git a/internal/service/elasticache/global_replication_group.go b/internal/service/elasticache/global_replication_group.go index 24b50aca3be4..dbf37694964f 100644 --- a/internal/service/elasticache/global_replication_group.go +++ b/internal/service/elasticache/global_replication_group.go @@ -90,8 +90,10 @@ func resourceGlobalReplicationGroup() *schema.Resource { Computed: true, }, names.AttrEngine: { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{engineRedis, engineValkey}, true), }, names.AttrEngineVersion: { Type: schema.TypeString, From 9dc253b555cfccc0dff3d5a5abadc4da9ce7f485 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 22 Aug 2025 14:59:25 -0400 Subject: [PATCH 0651/2115] chore: adjust changelog --- .changelog/42382.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.changelog/42382.txt b/.changelog/42382.txt index 3b9c964b56e0..a2b8e0fc0319 100644 --- a/.changelog/42382.txt +++ b/.changelog/42382.txt @@ -1,7 +1,6 @@ ```release-note:new-resource aws_timestreaminfluxdb_db_cluster ``` - ```release-note:bug -resource/aws_timestreaminfluxdb_db_instance: Fix tag updates causing errors +resource/aws_timestreaminfluxdb_db_instance: Fix tag-only update errors ``` From 8c56615f02094aec19d72ea99ed923b63e2769c4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 22 Aug 2025 15:58:22 -0400 Subject: [PATCH 0652/2115] Cosmetics. --- .changelog/43914.txt | 2 +- .../service/dynamodb/contributor_insights.go | 25 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.changelog/43914.txt b/.changelog/43914.txt index 2f76ec5ec3a0..8038c6bcdf75 100644 --- a/.changelog/43914.txt +++ b/.changelog/43914.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_dynamodb_contributor_insights: Adds `mode` argument in support of [CloudWatch Contributor Insights Mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html) +resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ``` diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index 2abf150f9faf..44a7c0f916c8 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -46,17 +46,17 @@ func resourceContributorInsights() *schema.Resource { Optional: true, ForceNew: true, }, - names.AttrTableName: { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, names.AttrMode: { Type: schema.TypeString, Optional: true, Computed: true, ValidateDiagFunc: enum.Validate[awstypes.ContributorInsightsMode](), }, + names.AttrTableName: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, }, } } @@ -66,7 +66,7 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) tableName := d.Get(names.AttrTableName).(string) - input := &dynamodb.UpdateContributorInsightsInput{ + input := dynamodb.UpdateContributorInsightsInput{ ContributorInsightsAction: awstypes.ContributorInsightsActionEnable, TableName: aws.String(tableName), } @@ -81,7 +81,7 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa input.ContributorInsightsMode = awstypes.ContributorInsightsMode(v.(string)) } - _, err := conn.UpdateContributorInsights(ctx, input) + _, err := conn.UpdateContributorInsights(ctx, &input) if err != nil { return sdkdiag.AppendErrorf(diags, "creating DynamoDB Contributor Insights for table (%s): %s", tableName, err) @@ -118,8 +118,8 @@ func resourceContributorInsightsRead(ctx context.Context, d *schema.ResourceData } d.Set("index_name", output.IndexName) - d.Set(names.AttrTableName, output.TableName) d.Set(names.AttrMode, output.ContributorInsightsMode) + d.Set(names.AttrTableName, output.TableName) return diags } @@ -133,17 +133,16 @@ func resourceContributorInsightsDelete(ctx context.Context, d *schema.ResourceDa return sdkdiag.AppendFromErr(diags, err) } - input := &dynamodb.UpdateContributorInsightsInput{ + input := dynamodb.UpdateContributorInsightsInput{ ContributorInsightsAction: awstypes.ContributorInsightsActionDisable, TableName: aws.String(tableName), } - if indexName != "" { input.IndexName = aws.String(indexName) } log.Printf("[INFO] Deleting DynamoDB Contributor Insights: %s", d.Id()) - _, err = conn.UpdateContributorInsights(ctx, input) + _, err = conn.UpdateContributorInsights(ctx, &input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return diags @@ -179,14 +178,14 @@ func contributorInsightsParseResourceID(id string) (string, string, error) { } func findContributorInsightsByTwoPartKey(ctx context.Context, conn *dynamodb.Client, tableName, indexName string) (*dynamodb.DescribeContributorInsightsOutput, error) { - input := &dynamodb.DescribeContributorInsightsInput{ + input := dynamodb.DescribeContributorInsightsInput{ TableName: aws.String(tableName), } if indexName != "" { input.IndexName = aws.String(indexName) } - output, err := findContributorInsights(ctx, conn, input) + output, err := findContributorInsights(ctx, conn, &input) if err != nil { return nil, err From 44133d00c00a4fd7c7be6e525ba14ed42d46f9ca Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 22 Aug 2025 15:59:48 -0400 Subject: [PATCH 0653/2115] r/aws_timesteaminfluxdb_db_cluster(test): refine `_disappears` test check --- internal/service/timestreaminfluxdb/db_cluster_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index ff49f43d12ee..a6982a126e50 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -15,6 +15,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -94,6 +95,11 @@ func TestAccTimestreamInfluxDBDBCluster_disappears(t *testing.T) { acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tftimestreaminfluxdb.ResourceDBCluster, resourceName), ), ExpectNonEmptyPlan: true, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, }, }, }) From f99d8a388acde65355ba5f4aac4988a4cedb2d36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 16:50:30 -0400 Subject: [PATCH 0654/2115] Tweak CHANGELOG entry. --- .changelog/42928.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/42928.txt b/.changelog/42928.txt index 9a9a40466e1a..fc783ed9357b 100644 --- a/.changelog/42928.txt +++ b/.changelog/42928.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_eks_cluster: Add support for `remote_network_config` on existing EKS Clusters +resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ``` \ No newline at end of file From 2a7306e554b63e1328e77d1171be5161e7c042a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 16:54:14 -0400 Subject: [PATCH 0655/2115] Cosmetics. --- internal/service/eks/cluster.go | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index 430fe40ebb09..bd87d57b49eb 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -336,7 +336,6 @@ func resourceCluster() *schema.Resource { "remote_network_config": { Type: schema.TypeList, Optional: true, - ForceNew: false, MaxItems: 1, ConflictsWith: []string{"outpost_config"}, Elem: &schema.Resource{ @@ -351,7 +350,6 @@ func resourceCluster() *schema.Resource { "cidrs": { Type: schema.TypeSet, Optional: true, - ForceNew: false, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -373,7 +371,6 @@ func resourceCluster() *schema.Resource { "cidrs": { Type: schema.TypeSet, Optional: true, - ForceNew: false, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -816,6 +813,25 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any } } + if d.HasChanges("remote_network_config.0.remote_node_networks", "remote_network_config.0.remote_pod_networks") { + input := eks.UpdateClusterConfigInput{ + Name: aws.String(d.Id()), + RemoteNetworkConfig: expandUpdateRemoteNetworkConfigRequest(d.Get("remote_network_config").([]any)), + } + + output, err := conn.UpdateClusterConfig(ctx, &input) + + if err != nil { + return sdkdiag.AppendErrorf(diags, "updating EKS Cluster (%s) remote network config: %s", d.Id(), err) + } + + updateID := aws.ToString(output.Update.Id) + + if _, err := waitClusterUpdateSuccessful(ctx, conn, d.Id(), updateID, d.Timeout(schema.TimeoutUpdate)); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for EKS Cluster (%s) remote network config update (%s): %s", d.Id(), updateID, err) + } + } + if d.HasChange("upgrade_policy") { input := eks.UpdateClusterConfigInput{ Name: aws.String(d.Id()), @@ -890,27 +906,6 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any } } - if d.HasChanges("remote_network_config.0.remote_node_networks", "remote_network_config.0.remote_pod_networks") { - remoteNetworkConfig := expandUpdateRemoteNetworkConfigRequest(d.Get("remote_network_config").([]any)) - - input := &eks.UpdateClusterConfigInput{ - Name: aws.String(d.Id()), - RemoteNetworkConfig: remoteNetworkConfig, - } - - output, err := conn.UpdateClusterConfig(ctx, input) - - if err != nil { - return sdkdiag.AppendErrorf(diags, "updating EKS Cluster (%s) remote network config: %s", d.Id(), err) - } - - updateID := aws.ToString(output.Update.Id) - - if _, err := waitClusterUpdateSuccessful(ctx, conn, d.Id(), updateID, d.Timeout(schema.TimeoutUpdate)); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for EKS Cluster (%s) remote network config update (%s): %s", d.Id(), updateID, err) - } - } - return append(diags, resourceClusterRead(ctx, d, meta)...) } From 6fd1e7f59c5bc5eb910bbef74a4c9b703e9f431b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 17:16:45 -0400 Subject: [PATCH 0656/2115] Better error handling. --- internal/service/workspacesweb/trust_store.go | 115 ++++++++++-------- 1 file changed, 64 insertions(+), 51 deletions(-) diff --git a/internal/service/workspacesweb/trust_store.go b/internal/service/workspacesweb/trust_store.go index 0839125157c6..c26449c7af76 100644 --- a/internal/service/workspacesweb/trust_store.go +++ b/internal/service/workspacesweb/trust_store.go @@ -123,13 +123,15 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create } // Convert string certificates to byte slices - for _, cert := range data.Certificates.Elements() { - var certValue certificateModel - if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { - continue + for _, certificate := range data.Certificates.Elements() { + var cert certificateModel + response.Diagnostics.Append(tfsdk.ValueAs(ctx, certificate, &cert)...) + if response.Diagnostics.HasError() { + return } - formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") - input.CertificateList = append(input.CertificateList, []byte(formatted_cert)) + + formattedCert := strings.ReplaceAll(strings.Trim(cert.Body.ValueString(), "\""), `\n`, "\n") + input.CertificateList = append(input.CertificateList, []byte(formattedCert)) } output, err := conn.CreateTrustStore(ctx, &input) @@ -160,20 +162,13 @@ func (r *trustStoreResource) Create(ctx context.Context, request resource.Create return } - var d diag.Diagnostics - data.Certificates, d = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) - - response.Diagnostics.Append(d...) + var diags diag.Diagnostics + data.Certificates, diags = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + response.Diagnostics.Append(diags...) if response.Diagnostics.HasError() { return } - for _, cert := range data.Certificates.Elements() { - var certValue certificateModel - if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { - continue - } - } response.Diagnostics.Append(response.State.Set(ctx, data)...) } @@ -210,7 +205,12 @@ func (r *trustStoreResource) Read(ctx context.Context, request resource.ReadRequ return } - data.Certificates, _ = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + var diags diag.Diagnostics + data.Certificates, diags = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } response.Diagnostics.Append(response.State.Set(ctx, &data)...) } @@ -230,40 +230,46 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update if !new.Certificates.Equal(old.Certificates) { input := workspacesweb.UpdateTrustStoreInput{ - TrustStoreArn: new.TrustStoreARN.ValueStringPointer(), ClientToken: aws.String(sdkid.UniqueId()), + TrustStoreArn: new.TrustStoreARN.ValueStringPointer(), } // Handle certificate additions and deletions oldCerts := make(map[string]string) // cert content -> thumbprint - for _, cert := range old.Certificates.Elements() { - var certValue certificateModel - if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { - continue + for _, certificate := range old.Certificates.Elements() { + var cert certificateModel + response.Diagnostics.Append(tfsdk.ValueAs(ctx, certificate, &cert)...) + if response.Diagnostics.HasError() { + return } - oldCerts[base64.StdEncoding.EncodeToString([]byte(certValue.Body.ValueString()))] = certValue.Thumbprint.ValueString() + + oldCerts[base64.StdEncoding.EncodeToString([]byte(cert.Body.ValueString()))] = cert.Thumbprint.ValueString() } newCertContents := make(map[string]bool) - for _, cert := range new.Certificates.Elements() { - var certValue certificateModel - if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { - continue + for _, certificate := range new.Certificates.Elements() { + var cert certificateModel + response.Diagnostics.Append(tfsdk.ValueAs(ctx, certificate, &cert)...) + if response.Diagnostics.HasError() { + return } - formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") - newCertContents[base64.StdEncoding.EncodeToString([]byte(formatted_cert))] = true + + formattedCert := strings.ReplaceAll(strings.Trim(cert.Body.ValueString(), "\""), `\n`, "\n") + newCertContents[base64.StdEncoding.EncodeToString([]byte(formattedCert))] = true } // Find certificates to add - for _, cert := range new.Certificates.Elements() { - var certValue certificateModel - if tfsdk.ValueAs(ctx, cert, &certValue).HasError() { - continue + for _, certificate := range new.Certificates.Elements() { + var cert certificateModel + response.Diagnostics.Append(tfsdk.ValueAs(ctx, certificate, &cert)...) + if response.Diagnostics.HasError() { + return } - formatted_cert := strings.ReplaceAll(strings.Trim(certValue.Body.String(), "\""), `\n`, "\n") - certEncoded := base64.StdEncoding.EncodeToString([]byte(formatted_cert)) + + formattedCert := strings.ReplaceAll(strings.Trim(cert.Body.String(), "\""), `\n`, "\n") + certEncoded := base64.StdEncoding.EncodeToString([]byte(formattedCert)) if _, exists := oldCerts[certEncoded]; !exists { - input.CertificatesToAdd = append(input.CertificatesToAdd, []byte(formatted_cert)) + input.CertificatesToAdd = append(input.CertificatesToAdd, []byte(formattedCert)) } } @@ -301,7 +307,12 @@ func (r *trustStoreResource) Update(ctx context.Context, request resource.Update return } - new.Certificates, _ = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + var diags diag.Diagnostics + new.Certificates, diags = fwtypes.NewSetNestedObjectValueOfValueSlice(ctx, certificates) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } response.Diagnostics.Append(response.State.Set(ctx, &new)...) } @@ -336,7 +347,7 @@ func (r *trustStoreResource) ImportState(ctx context.Context, request resource.I func findTrustStoreByARN(ctx context.Context, conn *workspacesweb.Client, arn string) (*awstypes.TrustStore, error) { input := workspacesweb.GetTrustStoreInput{ - TrustStoreArn: &arn, + TrustStoreArn: aws.String(arn), } output, err := conn.GetTrustStore(ctx, &input) @@ -364,33 +375,35 @@ func listTrustStoreCertificates(ctx context.Context, conn *workspacesweb.Client, } var certificates []certificateModel - paginator := workspacesweb.NewListTrustStoreCertificatesPaginator(conn, &input) + pages := workspacesweb.NewListTrustStoreCertificatesPaginator(conn, &input) + for pages.HasMorePages() { + output, err := pages.NextPage(ctx) - for paginator.HasMorePages() { - output, err := paginator.NextPage(ctx) if err != nil { return nil, err } for _, certSummary := range output.CertificateList { // Get detailed certificate information - certInput := workspacesweb.GetTrustStoreCertificateInput{ - TrustStoreArn: aws.String(arn), + input := workspacesweb.GetTrustStoreCertificateInput{ Thumbprint: certSummary.Thumbprint, + TrustStoreArn: aws.String(arn), } - certOutput, err := conn.GetTrustStoreCertificate(ctx, &certInput) + output, err := conn.GetTrustStoreCertificate(ctx, &input) + if err != nil { return nil, err } - if certOutput.Certificate != nil { + + if output.Certificate != nil { cert := certificateModel{ - Body: types.StringValue(string(certOutput.Certificate.Body)), - Issuer: types.StringPointerValue(certOutput.Certificate.Issuer), - NotValidAfter: types.StringValue(aws.ToTime(certOutput.Certificate.NotValidAfter).Format(time.RFC3339)), - NotValidBefore: types.StringValue(aws.ToTime(certOutput.Certificate.NotValidBefore).Format(time.RFC3339)), - Subject: types.StringPointerValue(certOutput.Certificate.Subject), - Thumbprint: types.StringPointerValue(certOutput.Certificate.Thumbprint), + Body: types.StringValue(string(output.Certificate.Body)), + Issuer: types.StringPointerValue(output.Certificate.Issuer), + NotValidAfter: types.StringValue(aws.ToTime(output.Certificate.NotValidAfter).Format(time.RFC3339)), + NotValidBefore: types.StringValue(aws.ToTime(output.Certificate.NotValidBefore).Format(time.RFC3339)), + Subject: types.StringPointerValue(output.Certificate.Subject), + Thumbprint: types.StringPointerValue(output.Certificate.Thumbprint), } certificates = append(certificates, cert) } From 24cdcba9714844378c3de484d0a4a6a1d95da429 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 17:43:22 -0400 Subject: [PATCH 0657/2115] Cosmetics. --- internal/service/workspacesweb/portal.go | 31 +++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/internal/service/workspacesweb/portal.go b/internal/service/workspacesweb/portal.go index ca69aa4ef188..74547db355f1 100644 --- a/internal/service/workspacesweb/portal.go +++ b/internal/service/workspacesweb/portal.go @@ -50,10 +50,6 @@ func newPortalResource(_ context.Context) (resource.ResourceWithConfigure, error return r, nil } -const ( - ResNamePortal = "Portal" -) - type portalResource struct { framework.ResourceWithModel[portalResourceModel] framework.WithTimeouts @@ -79,8 +75,9 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ }, }, "browser_settings_arn": schema.StringAttribute{ - Optional: true, - Computed: true, + CustomType: fwtypes.ARNType, + Optional: true, + Computed: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.UseStateForUnknown(), }, @@ -174,6 +171,8 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, + names.AttrTags: tftags.TagsAttribute(), + names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), "trust_store_arn": schema.StringAttribute{ Computed: true, PlanModifiers: []planmodifier.String{ @@ -192,8 +191,6 @@ func (r *portalResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, - names.AttrTags: tftags.TagsAttribute(), - names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), }, Blocks: map[string]schema.Block{ names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ @@ -234,11 +231,10 @@ func (r *portalResource) Create(ctx context.Context, request resource.CreateRequ data.PortalARN = fwflex.StringToFramework(ctx, output.PortalArn) data.PortalEndpoint = fwflex.StringToFramework(ctx, output.PortalEndpoint) - createTimeout := r.CreateTimeout(ctx, data.Timeouts) // Wait for portal to be created - portal, err := waitPortalCreated(ctx, conn, data.PortalARN.ValueString(), createTimeout) + portal, err := waitPortalCreated(ctx, conn, data.PortalARN.ValueString(), r.CreateTimeout(ctx, data.Timeouts)) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) creation", data.PortalARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) create", data.PortalARN.ValueString()), err.Error()) return } @@ -316,9 +312,8 @@ func (r *portalResource) Update(ctx context.Context, request resource.UpdateRequ return } - updateTimeout := r.CreateTimeout(ctx, new.Timeouts) // Wait for portal to be updated - portal, err := waitPortalUpdated(ctx, conn, new.PortalARN.ValueString(), updateTimeout) + portal, err := waitPortalUpdated(ctx, conn, new.PortalARN.ValueString(), r.UpdateTimeout(ctx, new.Timeouts)) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) update", new.PortalARN.ValueString()), err.Error()) return @@ -356,11 +351,10 @@ func (r *portalResource) Delete(ctx context.Context, request resource.DeleteRequ return } - deleteTimeout := r.DeleteTimeout(ctx, data.Timeouts) // Wait for portal to be deleted - _, err = waitPortalDeleted(ctx, conn, data.PortalARN.ValueString(), deleteTimeout) + _, err = waitPortalDeleted(ctx, conn, data.PortalARN.ValueString(), r.DeleteTimeout(ctx, data.Timeouts)) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) deletion", data.PortalARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("waiting for WorkSpacesWeb Portal (%s) delete", data.PortalARN.ValueString()), err.Error()) return } } @@ -376,7 +370,6 @@ func waitPortalCreated(ctx context.Context, conn *workspacesweb.Client, arn stri Target: enum.Slice(awstypes.PortalStatusIncomplete, awstypes.PortalStatusActive), Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, - NotFoundChecks: 20, ContinuousTargetOccurence: 2, } @@ -394,7 +387,6 @@ func waitPortalUpdated(ctx context.Context, conn *workspacesweb.Client, arn stri Target: enum.Slice(awstypes.PortalStatusIncomplete, awstypes.PortalStatusActive), Refresh: statusPortal(ctx, conn, arn), Timeout: timeout, - NotFoundChecks: 20, ContinuousTargetOccurence: 2, } @@ -445,6 +437,7 @@ func findPortalByARN(ctx context.Context, conn *workspacesweb.Client, arn string } output, err := conn.GetPortal(ctx, &input) + if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, @@ -468,7 +461,7 @@ type portalResourceModel struct { framework.WithRegionModel AdditionalEncryptionContext fwtypes.MapOfString `tfsdk:"additional_encryption_context"` AuthenticationType fwtypes.StringEnum[awstypes.AuthenticationType] `tfsdk:"authentication_type"` - BrowserSettingsARN types.String `tfsdk:"browser_settings_arn"` + BrowserSettingsARN fwtypes.ARN `tfsdk:"browser_settings_arn"` BrowserType fwtypes.StringEnum[awstypes.BrowserType] `tfsdk:"browser_type"` CreationDate timetypes.RFC3339 `tfsdk:"creation_date"` CustomerManagedKey types.String `tfsdk:"customer_managed_key"` From 74a472f39d2c0f4698169eef2faffa8864a92e47 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 17:52:31 -0400 Subject: [PATCH 0658/2115] Cosmetics. --- .changelog/43699.txt | 2 +- internal/service/elbv2/load_balancer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.changelog/43699.txt b/.changelog/43699.txt index a85f589e51ea..cc05a5c90b00 100644 --- a/.changelog/43699.txt +++ b/.changelog/43699.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_lb: Add secondary_ips_auto_assigned_per_subnet argument for Network Load Balancer +resource/aws_lb: Add `secondary_ips_auto_assigned_per_subnet` argument for Network Load Balancers ``` \ No newline at end of file diff --git a/internal/service/elbv2/load_balancer.go b/internal/service/elbv2/load_balancer.go index a9c12f60609a..a67f19064066 100644 --- a/internal/service/elbv2/load_balancer.go +++ b/internal/service/elbv2/load_balancer.go @@ -290,7 +290,7 @@ func resourceLoadBalancer() *schema.Resource { "secondary_ips_auto_assigned_per_subnet": { Type: schema.TypeInt, Optional: true, - Default: 0, + Computed: true, DiffSuppressFunc: suppressIfLBTypeNot(awstypes.LoadBalancerTypeEnumNetwork), ValidateFunc: validation.IntBetween(0, 7), }, From fafeaea3412dbfeb4f1a8f2eb9e0b02e032d7b83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 18:00:37 -0400 Subject: [PATCH 0659/2115] TestAccWorkSpacesWebPortal_update: Add 'acctest.PreCheckSSOAdminInstances'. --- internal/service/workspacesweb/portal_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/workspacesweb/portal_test.go b/internal/service/workspacesweb/portal_test.go index 28cefa9876de..68986eb12d36 100644 --- a/internal/service/workspacesweb/portal_test.go +++ b/internal/service/workspacesweb/portal_test.go @@ -92,6 +92,7 @@ func TestAccWorkSpacesWebPortal_update(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) acctest.PreCheckPartitionHasService(t, names.WorkSpacesWebEndpointID) + acctest.PreCheckSSOAdminInstances(ctx, t) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.WorkSpacesWebServiceID), From e34230519cf1c86c9ffc7a2a761a3a1a33908806 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 23 Aug 2025 18:08:25 -0400 Subject: [PATCH 0660/2115] Cosmetics. --- .../workspacesweb/identity_provider.go | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/internal/service/workspacesweb/identity_provider.go b/internal/service/workspacesweb/identity_provider.go index ed2436b32bcd..28745ecd0e0a 100644 --- a/internal/service/workspacesweb/identity_provider.go +++ b/internal/service/workspacesweb/identity_provider.go @@ -40,10 +40,6 @@ func newIdentityProviderResource(_ context.Context) (resource.ResourceWithConfig return &identityProviderResource{}, nil } -const ( - ResNameIdentityProvider = "Identity Provider" -) - type identityProviderResource struct { framework.ResourceWithModel[identityProviderResourceModel] } @@ -70,7 +66,8 @@ func (r *identityProviderResource) Schema(ctx context.Context, request resource. Required: true, }, "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -90,6 +87,7 @@ func (r *identityProviderResource) Create(ctx context.Context, request resource. conn := r.Meta().WorkSpacesWebClient(ctx) + name := fwflex.StringValueFromFramework(ctx, data.IdentityProviderName) var input workspacesweb.CreateIdentityProviderInput response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) if response.Diagnostics.HasError() { @@ -103,7 +101,7 @@ func (r *identityProviderResource) Create(ctx context.Context, request resource. output, err := conn.CreateIdentityProvider(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameIdentityProvider), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb Identity Provider (%s)", name), err.Error()) return } @@ -112,11 +110,11 @@ func (r *identityProviderResource) Create(ctx context.Context, request resource. // Get the identity provider details to populate other fields identityProvider, portalARN, err := findIdentityProviderByARN(ctx, conn, data.IdentityProviderARN.ValueString()) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Identity Provider (%s)", data.IdentityProviderARN.ValueString()), err.Error()) return } - data.PortalARN = types.StringValue(portalARN) + data.PortalARN = fwtypes.ARNValue(portalARN) response.Diagnostics.Append(fwflex.Flatten(ctx, identityProvider, &data)...) if response.Diagnostics.HasError() { @@ -143,11 +141,11 @@ func (r *identityProviderResource) Read(ctx context.Context, request resource.Re } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Identity Provider (%s)", data.IdentityProviderARN.ValueString()), err.Error()) return } - data.PortalARN = types.StringValue(portalARN) + data.PortalARN = fwtypes.ARNValue(portalARN) response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) if response.Diagnostics.HasError() { return @@ -184,7 +182,7 @@ func (r *identityProviderResource) Update(ctx context.Context, request resource. output, err := conn.UpdateIdentityProvider(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb %s (%s)", ResNameIdentityProvider, new.IdentityProviderARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Identity Provider (%s)", new.IdentityProviderARN.ValueString()), err.Error()) return } @@ -216,7 +214,7 @@ func (r *identityProviderResource) Delete(ctx context.Context, request resource. } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameIdentityProvider, data.IdentityProviderARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Identity Provider (%s)", data.IdentityProviderARN.ValueString()), err.Error()) return } } @@ -279,7 +277,7 @@ type identityProviderResourceModel struct { IdentityProviderDetails fwtypes.MapOfString `tfsdk:"identity_provider_details"` IdentityProviderName types.String `tfsdk:"identity_provider_name"` IdentityProviderType fwtypes.StringEnum[awstypes.IdentityProviderType] `tfsdk:"identity_provider_type"` - PortalARN types.String `tfsdk:"portal_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` Tags tftags.Map `tfsdk:"tags"` TagsAll tftags.Map `tfsdk:"tags_all"` } From 9a85353f68a0327bfbf67312ef57f32ff62e6aea Mon Sep 17 00:00:00 2001 From: Behn <7383025+BehnH@users.noreply.github.com> Date: Sun, 24 Aug 2025 08:17:00 +0100 Subject: [PATCH 0661/2115] Add support for key spec & usage settings --- internal/service/kms/external_key.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/internal/service/kms/external_key.go b/internal/service/kms/external_key.go index c2ef4a101460..26dbf7581c14 100644 --- a/internal/service/kms/external_key.go +++ b/internal/service/kms/external_key.go @@ -22,6 +22,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" "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" @@ -86,13 +87,23 @@ func resourceExternalKey() *schema.Resource { ForceNew: true, Sensitive: true, }, + "key_spec": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: awstypes.KeySpecSymmetricDefault, + ValidateDiagFunc: enum.Validate[awstypes.KeySpec](), + }, "key_state": { Type: schema.TypeString, Computed: true, }, "key_usage": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: awstypes.KeyUsageTypeEncryptDecrypt, + ValidateDiagFunc: enum.Validate[awstypes.KeyUsageType](), }, "multi_region": { Type: schema.TypeBool, @@ -118,7 +129,8 @@ func resourceExternalKeyCreate(ctx context.Context, d *schema.ResourceData, meta input := kms.CreateKeyInput{ BypassPolicyLockoutSafetyCheck: d.Get("bypass_policy_lockout_safety_check").(bool), - KeyUsage: awstypes.KeyUsageTypeEncryptDecrypt, + KeyUsage: awstypes.KeyUsageType(d.Get("key_usage").(string)), + KeySpec: awstypes.KeySpec(d.Get("key_spec").(string)), Origin: awstypes.OriginTypeExternal, Tags: getTagsIn(ctx), } From 1d50a852679ed842e41370978aa91a1899b87eae Mon Sep 17 00:00:00 2001 From: Behn <7383025+BehnH@users.noreply.github.com> Date: Sun, 24 Aug 2025 08:17:09 +0100 Subject: [PATCH 0662/2115] Add tests --- internal/service/kms/external_key_test.go | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index 4c2ca54f0404..84d4c333552b 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -19,6 +19,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfkms "github.com/hashicorp/terraform-provider-aws/internal/service/kms" @@ -437,6 +438,37 @@ func TestAccKMSExternalKey_validTo(t *testing.T) { }) } +func TestAccKMSExternalKey_Usages(t *testing.T) { + ctx := acctest.Context(t) + var key1, key2 awstypes.KeyMetadata + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_kms_external_key.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckExternalKeyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccExternalKeyConfig_usages(rName, "ENCRYPT_DECRYPT", "SYMMETRIC_DEFAULT"), + Check: resource.ComposeTestCheckFunc( + testAccCheckExternalKeyExists(ctx, resourceName, &key1), + resource.TestCheckResourceAttr(resourceName, "key_usage", "ENCRYPT_DECRYPT"), + resource.TestCheckResourceAttr(resourceName, "key_spec", "SYMMETRIC_DEFAULT"), + ), + }, + { + Config: testAccExternalKeyConfig_usages(rName, "SIGN_VERIFY", "RSA_2048"), + Check: resource.ComposeTestCheckFunc( + testAccCheckExternalKeyExists(ctx, resourceName, &key2), + resource.TestCheckResourceAttr(resourceName, "key_usage", "SIGN_VERIFY"), + resource.TestCheckResourceAttr(resourceName, "key_spec", "RSA_2048"), + ), + }, + }}) +} + func testAccCheckExternalKeyHasPolicy(ctx context.Context, name string, expectedPolicyText string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] @@ -628,3 +660,14 @@ resource "aws_kms_external_key" "test" { } `, rName, validTo) } + +func testAccExternalKeyConfig_usages(rName, usages, spec string) string { + return fmt.Sprintf(` +resource "aws_kms_external_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + key_usage = %[2]q + key_spec = %[3]q +} +`, rName, usages, spec) +} From 86f7df0c74a5b166c3fefef3173105158e670ada Mon Sep 17 00:00:00 2001 From: Behn <7383025+BehnH@users.noreply.github.com> Date: Sun, 24 Aug 2025 08:17:41 +0100 Subject: [PATCH 0663/2115] Update docs --- website/docs/r/kms_external_key.html.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/docs/r/kms_external_key.html.markdown b/website/docs/r/kms_external_key.html.markdown index 9fe2e10a4f1e..3f9aa7fb39d0 100644 --- a/website/docs/r/kms_external_key.html.markdown +++ b/website/docs/r/kms_external_key.html.markdown @@ -31,6 +31,10 @@ This resource supports the following arguments: * `description` - (Optional) Description of the key. * `enabled` - (Optional) Specifies whether the key is enabled. Keys pending import can only be `false`. Imported keys default to `true` unless expired. * `key_material_base64` - (Optional) Base64 encoded 256-bit symmetric encryption key material to import. The CMK is permanently associated with this key material. The same key material can be reimported, but you cannot import different key material. +* `key_spec` - (Optional) Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. +Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_224`, `HMAC_256`, `HMAC_384`, `HMAC_512`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, `ECC_SECG_P256K1`, `ML_DSA_44`, `ML_DSA_65`, `ML_DSA_87`, or `SM2` (China Regions only). Defaults to `SYMMETRIC_DEFAULT`. For help with choosing a key spec, see the [AWS KMS Developer Guide](https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html). +* `key_usage` - (Optional) Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT`, `SIGN_VERIFY`, or `GENERATE_VERIFY_MAC`. +Defaults to `ENCRYPT_DECRYPT`. * `multi_region` - (Optional) Indicates whether the KMS key is a multi-Region (`true`) or regional (`false`) key. Defaults to `false`. * `policy` - (Optional) A key policy JSON document. If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. * `tags` - (Optional) A key-value map of tags to assign to the key. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From 62cef03dcf23bb12525d1f24f329c241ee7b99ba Mon Sep 17 00:00:00 2001 From: Behn <7383025+BehnH@users.noreply.github.com> Date: Sun, 24 Aug 2025 15:05:17 +0100 Subject: [PATCH 0664/2115] Split to 2 different tests --- internal/service/kms/external_key_test.go | 51 +++++++++++++++++++---- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index 84d4c333552b..484529c5d53e 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -438,7 +438,7 @@ func TestAccKMSExternalKey_validTo(t *testing.T) { }) } -func TestAccKMSExternalKey_Usages(t *testing.T) { +func TestAccKMSExternalKey_Usage(t *testing.T) { ctx := acctest.Context(t) var key1, key2 awstypes.KeyMetadata rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -451,21 +451,49 @@ func TestAccKMSExternalKey_Usages(t *testing.T) { CheckDestroy: testAccCheckExternalKeyDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccExternalKeyConfig_usages(rName, "ENCRYPT_DECRYPT", "SYMMETRIC_DEFAULT"), + Config: testAccExternalKeyConfig_usage(rName, "ENCRYPT_DECRYPT"), Check: resource.ComposeTestCheckFunc( testAccCheckExternalKeyExists(ctx, resourceName, &key1), resource.TestCheckResourceAttr(resourceName, "key_usage", "ENCRYPT_DECRYPT"), - resource.TestCheckResourceAttr(resourceName, "key_spec", "SYMMETRIC_DEFAULT"), ), }, { - Config: testAccExternalKeyConfig_usages(rName, "SIGN_VERIFY", "RSA_2048"), + Config: testAccExternalKeyConfig_usage(rName, "SIGN_VERIFY"), Check: resource.ComposeTestCheckFunc( testAccCheckExternalKeyExists(ctx, resourceName, &key2), resource.TestCheckResourceAttr(resourceName, "key_usage", "SIGN_VERIFY"), + ), + }, + }}) +} + +func TestAccKMSExternalKey_Spec(t *testing.T) { + ctx := acctest.Context(t) + var key1, key2 awstypes.KeyMetadata + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_kms_external_key.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckExternalKeyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccExternalKeyConfig_spec(rName, "RSA_2048"), + Check: resource.ComposeTestCheckFunc( + testAccCheckExternalKeyExists(ctx, resourceName, &key1), resource.TestCheckResourceAttr(resourceName, "key_spec", "RSA_2048"), ), }, + { + Config: testAccExternalKeyConfig_spec(rName, "SYMMETRIC_DEFAULT"), + Check: resource.ComposeTestCheckFunc( + testAccCheckExternalKeyExists(ctx, resourceName, &key2), + testAccCheckExternalKeyRecreated(&key1, &key2), + resource.TestCheckResourceAttr(resourceName, "key_spec", "SYMMETRIC_DEFAULT"), + ), + }, }}) } @@ -661,13 +689,22 @@ resource "aws_kms_external_key" "test" { `, rName, validTo) } -func testAccExternalKeyConfig_usages(rName, usages, spec string) string { +func testAccExternalKeyConfig_usage(rName, usage string) string { return fmt.Sprintf(` resource "aws_kms_external_key" "test" { description = %[1]q deletion_window_in_days = 7 key_usage = %[2]q - key_spec = %[3]q } -`, rName, usages, spec) +`, rName, usage) +} + +func testAccExternalKeyConfig_spec(rName, spec string) string { + return fmt.Sprintf(` +resource "aws_kms_external_key" "test" { + description = %[1]q + deletion_window_in_days = 7 + key_spec = %[2]q +} +`, rName, spec) } From d6bce4e024bde5102c47e84e738bde90ad696cc9 Mon Sep 17 00:00:00 2001 From: Behn <7383025+BehnH@users.noreply.github.com> Date: Sun, 24 Aug 2025 15:19:49 +0100 Subject: [PATCH 0665/2115] Add changelog entry --- .changelog/44011.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44011.txt diff --git a/.changelog/44011.txt b/.changelog/44011.txt new file mode 100644 index 000000000000..392d15aca1a3 --- /dev/null +++ b/.changelog/44011.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_kms_external_key: Add key_spec and key_usage attributes +``` From ec5fb9b026843e8f45cabd964f7ce9a69740b156 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 16:53:55 -0400 Subject: [PATCH 0666/2115] Cosmetics. --- .../browser_settings_association.go | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/internal/service/workspacesweb/browser_settings_association.go b/internal/service/workspacesweb/browser_settings_association.go index dff24e3524d6..8f75bb10e546 100644 --- a/internal/service/workspacesweb/browser_settings_association.go +++ b/internal/service/workspacesweb/browser_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,10 +31,6 @@ func newBrowserSettingsAssociationResource(_ context.Context) (resource.Resource return &browserSettingsAssociationResource{}, nil } -const ( - ResNameBrowserSettingsAssociation = "Browser Settings Association" -) - type browserSettingsAssociationResource struct { framework.ResourceWithModel[browserSettingsAssociationResourceModel] } @@ -43,13 +39,15 @@ func (r *browserSettingsAssociationResource) Schema(ctx context.Context, request response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "browser_settings_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +73,7 @@ func (r *browserSettingsAssociationResource) Create(ctx context.Context, request _, err := conn.AssociateBrowserSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameBrowserSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb Browser Settings Association", err.Error()) return } @@ -100,7 +98,7 @@ func (r *browserSettingsAssociationResource) Read(ctx context.Context, request r } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameBrowserSettingsAssociation, data.BrowserSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Browser Settings Association (%s)", data.BrowserSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +112,6 @@ func (r *browserSettingsAssociationResource) Read(ctx context.Context, request r response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *browserSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *browserSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data browserSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +132,7 @@ func (r *browserSettingsAssociationResource) Delete(ctx context.Context, request } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameBrowserSettingsAssociation, data.BrowserSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Browser Settings Association (%s)", data.BrowserSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +158,6 @@ func (r *browserSettingsAssociationResource) ImportState(ctx context.Context, re type browserSettingsAssociationResourceModel struct { framework.WithRegionModel - BrowserSettingsARN types.String `tfsdk:"browser_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + BrowserSettingsARN fwtypes.ARN `tfsdk:"browser_settings_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` } From bb6925f08566c1d201477fd6add2284cf47f4395 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 16:59:14 -0400 Subject: [PATCH 0667/2115] Add 'TestAccWorkSpacesWebBrowserSettingsAssociation_disappears'. --- .../browser_settings_association.go | 1 + .../browser_settings_association_test.go | 56 +++---------------- .../service/workspacesweb/exports_test.go | 19 ++++--- 3 files changed, 19 insertions(+), 57 deletions(-) diff --git a/internal/service/workspacesweb/browser_settings_association.go b/internal/service/workspacesweb/browser_settings_association.go index 8f75bb10e546..fb3af29f3bee 100644 --- a/internal/service/workspacesweb/browser_settings_association.go +++ b/internal/service/workspacesweb/browser_settings_association.go @@ -33,6 +33,7 @@ func newBrowserSettingsAssociationResource(_ context.Context) (resource.Resource type browserSettingsAssociationResource struct { framework.ResourceWithModel[browserSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *browserSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { diff --git a/internal/service/workspacesweb/browser_settings_association_test.go b/internal/service/workspacesweb/browser_settings_association_test.go index cf1c1e574c2a..e4850625d04c 100644 --- a/internal/service/workspacesweb/browser_settings_association_test.go +++ b/internal/service/workspacesweb/browser_settings_association_test.go @@ -75,13 +75,10 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebBrowserSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var browserSettings1, browserSettings2 awstypes.BrowserSettings + var browserSettings awstypes.BrowserSettings resourceName := "aws_workspacesweb_browser_settings_association.test" - browserSettingsResourceName1 := "aws_workspacesweb_browser_settings.test" - browserSettingsResourceName2 := "aws_workspacesweb_browser_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" browserPolicy1 := `{ "chromePolicies": { @@ -90,14 +87,6 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { } } } ` - browserPolicy2 := `{ - "chromePolicies": - { - "DefaultDownloadDirectory": { - "value": "/home/as2-streaming-user/MyFiles/TemporaryFiles2" - } - } - } ` resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) @@ -111,18 +100,10 @@ func TestAccWorkSpacesWebBrowserSettingsAssociation_update(t *testing.T) { { Config: testAccBrowserSettingsAssociationConfig_basic(browserPolicy1), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings1), - resource.TestCheckResourceAttrPair(resourceName, "browser_settings_arn", browserSettingsResourceName1, "browser_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccBrowserSettingsAssociationConfig_updated(browserPolicy1, browserPolicy2), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings2), - resource.TestCheckResourceAttrPair(resourceName, "browser_settings_arn", browserSettingsResourceName2, "browser_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckBrowserSettingsAssociationExists(ctx, resourceName, &browserSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceBrowserSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -185,23 +166,6 @@ func testAccCheckBrowserSettingsAssociationExists(ctx context.Context, n string, } } -func testAccBrowserSettingsAssociationConfig_basic(browserPolicy string) string { - return fmt.Sprintf(` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_browser_settings" "test" { - browser_policy = %[1]q -} - -resource "aws_workspacesweb_browser_settings_association" "test" { - browser_settings_arn = aws_workspacesweb_browser_settings.test.browser_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -`, browserPolicy) -} - func testAccBrowserSettingsAssociationImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { return func(s *terraform.State) (string, error) { rs, ok := s.RootModule().Resources[resourceName] @@ -213,7 +177,7 @@ func testAccBrowserSettingsAssociationImportStateIdFunc(resourceName string) res } } -func testAccBrowserSettingsAssociationConfig_updated(browserPolicy1, browserPolicy2 string) string { +func testAccBrowserSettingsAssociationConfig_basic(browserPolicy string) string { return fmt.Sprintf(` resource "aws_workspacesweb_portal" "test" { display_name = "test" @@ -223,13 +187,9 @@ resource "aws_workspacesweb_browser_settings" "test" { browser_policy = %[1]q } -resource "aws_workspacesweb_browser_settings" "test2" { - browser_policy = %[2]q -} - resource "aws_workspacesweb_browser_settings_association" "test" { - browser_settings_arn = aws_workspacesweb_browser_settings.test2.browser_settings_arn + browser_settings_arn = aws_workspacesweb_browser_settings.test.browser_settings_arn portal_arn = aws_workspacesweb_portal.test.portal_arn } -`, browserPolicy1, browserPolicy2) +`, browserPolicy) } diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index c98aa444d371..e04bd93676e0 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -5,15 +5,16 @@ package workspacesweb // Exports for use in tests only. var ( - ResourceBrowserSettings = newBrowserSettingsResource - ResourceDataProtectionSettings = newDataProtectionSettingsResource - ResourceIdentityProvider = newIdentityProviderResource - ResourceIPAccessSettings = newIPAccessSettingsResource - ResourceNetworkSettings = newNetworkSettingsResource - ResourcePortal = newPortalResource - ResourceTrustStore = newTrustStoreResource - ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource - ResourceUserSettings = newUserSettingsResource + ResourceBrowserSettings = newBrowserSettingsResource + ResourceBrowserSettingsAssociation = newBrowserSettingsAssociationResource + ResourceDataProtectionSettings = newDataProtectionSettingsResource + ResourceIdentityProvider = newIdentityProviderResource + ResourceIPAccessSettings = newIPAccessSettingsResource + ResourceNetworkSettings = newNetworkSettingsResource + ResourcePortal = newPortalResource + ResourceTrustStore = newTrustStoreResource + ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource + ResourceUserSettings = newUserSettingsResource FindBrowserSettingsByARN = findBrowserSettingsByARN FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN From 6d2a09012d721583b3c0cf44d540656ca338bc85 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:11:07 -0400 Subject: [PATCH 0668/2115] Add 'TestAccWorkSpacesWebDataProtectionSettingsAssociation_disappears'. --- .../data_protection_settings_association.go | 28 +++++-------- ...ta_protection_settings_association_test.go | 42 +++---------------- .../service/workspacesweb/exports_test.go | 21 +++++----- 3 files changed, 27 insertions(+), 64 deletions(-) diff --git a/internal/service/workspacesweb/data_protection_settings_association.go b/internal/service/workspacesweb/data_protection_settings_association.go index f80bda4ef3b0..694f3e62e803 100644 --- a/internal/service/workspacesweb/data_protection_settings_association.go +++ b/internal/service/workspacesweb/data_protection_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newDataProtectionSettingsAssociationResource(_ context.Context) (resource.R return &dataProtectionSettingsAssociationResource{}, nil } -const ( - ResNameDataProtectionSettingsAssociation = "Data Protection Settings Association" -) - type dataProtectionSettingsAssociationResource struct { framework.ResourceWithModel[dataProtectionSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *dataProtectionSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "data_protection_settings_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *dataProtectionSettingsAssociationResource) Create(ctx context.Context, _, err := conn.AssociateDataProtectionSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameDataProtectionSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb Data Protection Settings Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *dataProtectionSettingsAssociationResource) Read(ctx context.Context, re } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameDataProtectionSettingsAssociation, data.DataProtectionSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Data Protection Settings Association (%s)", data.DataProtectionSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *dataProtectionSettingsAssociationResource) Read(ctx context.Context, re response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *dataProtectionSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *dataProtectionSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data dataProtectionSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *dataProtectionSettingsAssociationResource) Delete(ctx context.Context, } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameDataProtectionSettingsAssociation, data.DataProtectionSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Data Protection Settings Association (%s)", data.DataProtectionSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *dataProtectionSettingsAssociationResource) ImportState(ctx context.Cont type dataProtectionSettingsAssociationResourceModel struct { framework.WithRegionModel - DataProtectionSettingsARN types.String `tfsdk:"data_protection_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + DataProtectionSettingsARN fwtypes.ARN `tfsdk:"data_protection_settings_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` } diff --git a/internal/service/workspacesweb/data_protection_settings_association_test.go b/internal/service/workspacesweb/data_protection_settings_association_test.go index dad2caff3b6a..951bf87fac40 100644 --- a/internal/service/workspacesweb/data_protection_settings_association_test.go +++ b/internal/service/workspacesweb/data_protection_settings_association_test.go @@ -68,13 +68,10 @@ func TestAccWorkSpacesWebDataProtectionSettingsAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebDataProtectionSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebDataProtectionSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var dataProtectionSettings1, dataProtectionSettings2 awstypes.DataProtectionSettings + var dataProtectionSettings awstypes.DataProtectionSettings resourceName := "aws_workspacesweb_data_protection_settings_association.test" - dataProtectionSettingsResourceName1 := "aws_workspacesweb_data_protection_settings.test" - dataProtectionSettingsResourceName2 := "aws_workspacesweb_data_protection_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -89,18 +86,10 @@ func TestAccWorkSpacesWebDataProtectionSettingsAssociation_update(t *testing.T) { Config: testAccDataProtectionSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings1), - resource.TestCheckResourceAttrPair(resourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName1, "data_protection_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccDataProtectionSettingsAssociationConfig_updated(), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings2), - resource.TestCheckResourceAttrPair(resourceName, "data_protection_settings_arn", dataProtectionSettingsResourceName2, "data_protection_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckDataProtectionSettingsAssociationExists(ctx, resourceName, &dataProtectionSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceDataProtectionSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -190,24 +179,3 @@ resource "aws_workspacesweb_data_protection_settings_association" "test" { } ` } - -func testAccDataProtectionSettingsAssociationConfig_updated() string { - return ` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_data_protection_settings" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_data_protection_settings" "test2" { - display_name = "test2" -} - -resource "aws_workspacesweb_data_protection_settings_association" "test" { - data_protection_settings_arn = aws_workspacesweb_data_protection_settings.test2.data_protection_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -` -} diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index e04bd93676e0..4d948249be11 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -5,16 +5,17 @@ package workspacesweb // Exports for use in tests only. var ( - ResourceBrowserSettings = newBrowserSettingsResource - ResourceBrowserSettingsAssociation = newBrowserSettingsAssociationResource - ResourceDataProtectionSettings = newDataProtectionSettingsResource - ResourceIdentityProvider = newIdentityProviderResource - ResourceIPAccessSettings = newIPAccessSettingsResource - ResourceNetworkSettings = newNetworkSettingsResource - ResourcePortal = newPortalResource - ResourceTrustStore = newTrustStoreResource - ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource - ResourceUserSettings = newUserSettingsResource + ResourceBrowserSettings = newBrowserSettingsResource + ResourceBrowserSettingsAssociation = newBrowserSettingsAssociationResource + ResourceDataProtectionSettings = newDataProtectionSettingsResource + ResourceDataProtectionSettingsAssociation = newDataProtectionSettingsAssociationResource + ResourceIdentityProvider = newIdentityProviderResource + ResourceIPAccessSettings = newIPAccessSettingsResource + ResourceNetworkSettings = newNetworkSettingsResource + ResourcePortal = newPortalResource + ResourceTrustStore = newTrustStoreResource + ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource + ResourceUserSettings = newUserSettingsResource FindBrowserSettingsByARN = findBrowserSettingsByARN FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN From a0507adbe3560f7b14a919c09848412c9bbd4e31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:19:20 -0400 Subject: [PATCH 0669/2115] Tweak CHANGELOG entries. --- .changelog/44011.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.changelog/44011.txt b/.changelog/44011.txt index 392d15aca1a3..1bc3a0cac0c2 100644 --- a/.changelog/44011.txt +++ b/.changelog/44011.txt @@ -1,3 +1,7 @@ ```release-note:enhancement -resource/aws_kms_external_key: Add key_spec and key_usage attributes +resource/aws_kms_external_key: Add `key_spec` argument ``` + +```release-note:enhancement +resource/aws_kms_external_key: Change `key_usage` to Optional and Computed +``` \ No newline at end of file From 0b60af707eb927348c8a1e9e23187bc3be9295d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:20:14 -0400 Subject: [PATCH 0670/2115] Fix impi 'Import groups are not in the proper order'. --- internal/service/kms/external_key.go | 1 - internal/service/kms/external_key_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/service/kms/external_key.go b/internal/service/kms/external_key.go index 26dbf7581c14..e0e245012b6e 100644 --- a/internal/service/kms/external_key.go +++ b/internal/service/kms/external_key.go @@ -22,7 +22,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" "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" diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index 484529c5d53e..9d5f7e2855f8 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -19,7 +19,6 @@ import ( "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" - "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfkms "github.com/hashicorp/terraform-provider-aws/internal/service/kms" From 39f61a3cf23b9c33ecf913d4c70777f91d017b6f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:21:48 -0400 Subject: [PATCH 0671/2115] Fix terrafmt errors. --- internal/service/kms/external_key_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index 9d5f7e2855f8..48da081a966f 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -691,9 +691,9 @@ resource "aws_kms_external_key" "test" { func testAccExternalKeyConfig_usage(rName, usage string) string { return fmt.Sprintf(` resource "aws_kms_external_key" "test" { - description = %[1]q + description = %[1]q deletion_window_in_days = 7 - key_usage = %[2]q + key_usage = %[2]q } `, rName, usage) } @@ -701,9 +701,9 @@ resource "aws_kms_external_key" "test" { func testAccExternalKeyConfig_spec(rName, spec string) string { return fmt.Sprintf(` resource "aws_kms_external_key" "test" { - description = %[1]q + description = %[1]q deletion_window_in_days = 7 - key_spec = %[2]q + key_spec = %[2]q } `, rName, spec) } From 56c73326489c713be3b0ac1f80056f4850747bb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:25:54 -0400 Subject: [PATCH 0672/2115] r/aws_kms_external_key: 'key_spec' and 'key_usage' are Optional+Computed. --- internal/service/kms/external_key.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/service/kms/external_key.go b/internal/service/kms/external_key.go index e0e245012b6e..13a01f44a3e2 100644 --- a/internal/service/kms/external_key.go +++ b/internal/service/kms/external_key.go @@ -89,8 +89,8 @@ func resourceExternalKey() *schema.Resource { "key_spec": { Type: schema.TypeString, Optional: true, + Computed: true, ForceNew: true, - Default: awstypes.KeySpecSymmetricDefault, ValidateDiagFunc: enum.Validate[awstypes.KeySpec](), }, "key_state": { @@ -100,8 +100,8 @@ func resourceExternalKey() *schema.Resource { "key_usage": { Type: schema.TypeString, Optional: true, + Computed: true, ForceNew: true, - Default: awstypes.KeyUsageTypeEncryptDecrypt, ValidateDiagFunc: enum.Validate[awstypes.KeyUsageType](), }, "multi_region": { @@ -128,8 +128,6 @@ func resourceExternalKeyCreate(ctx context.Context, d *schema.ResourceData, meta input := kms.CreateKeyInput{ BypassPolicyLockoutSafetyCheck: d.Get("bypass_policy_lockout_safety_check").(bool), - KeyUsage: awstypes.KeyUsageType(d.Get("key_usage").(string)), - KeySpec: awstypes.KeySpec(d.Get("key_spec").(string)), Origin: awstypes.OriginTypeExternal, Tags: getTagsIn(ctx), } @@ -138,6 +136,14 @@ func resourceExternalKeyCreate(ctx context.Context, d *schema.ResourceData, meta input.Description = aws.String(v.(string)) } + if v, ok := d.GetOk("key_spec"); ok { + input.KeySpec = awstypes.KeySpec(v.(string)) + } + + if v, ok := d.GetOk("key_usage"); ok { + input.KeyUsage = awstypes.KeyUsageType(v.(string)) + } + if v, ok := d.GetOk("multi_region"); ok { input.MultiRegion = aws.Bool(v.(bool)) } From 8776940cf5cb03d935b894f2cd09d73a754529f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:27:08 -0400 Subject: [PATCH 0673/2115] r/aws_kms_external_key: Tweak documentation. --- website/docs/r/kms_external_key.html.markdown | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/website/docs/r/kms_external_key.html.markdown b/website/docs/r/kms_external_key.html.markdown index 3f9aa7fb39d0..902d35c51144 100644 --- a/website/docs/r/kms_external_key.html.markdown +++ b/website/docs/r/kms_external_key.html.markdown @@ -25,18 +25,16 @@ resource "aws_kms_external_key" "example" { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `bypass_policy_lockout_safety_check` - (Optional) Specifies whether to disable the policy lockout check performed when creating or updating the key's policy. Setting this value to `true` increases the risk that the key becomes unmanageable. For more information, refer to the scenario in the [Default Key Policy](https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam) section in the AWS Key Management Service Developer Guide. Defaults to `false`. * `deletion_window_in_days` - (Optional) Duration in days after which the key is deleted after destruction of the resource. Must be between `7` and `30` days. Defaults to `30`. * `description` - (Optional) Description of the key. * `enabled` - (Optional) Specifies whether the key is enabled. Keys pending import can only be `false`. Imported keys default to `true` unless expired. * `key_material_base64` - (Optional) Base64 encoded 256-bit symmetric encryption key material to import. The CMK is permanently associated with this key material. The same key material can be reimported, but you cannot import different key material. -* `key_spec` - (Optional) Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. -Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_224`, `HMAC_256`, `HMAC_384`, `HMAC_512`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, `ECC_SECG_P256K1`, `ML_DSA_44`, `ML_DSA_65`, `ML_DSA_87`, or `SM2` (China Regions only). Defaults to `SYMMETRIC_DEFAULT`. For help with choosing a key spec, see the [AWS KMS Developer Guide](https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html). -* `key_usage` - (Optional) Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT`, `SIGN_VERIFY`, or `GENERATE_VERIFY_MAC`. -Defaults to `ENCRYPT_DECRYPT`. +* `key_spec` - (Optional) Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_224`, `HMAC_256`, `HMAC_384`, `HMAC_512`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, `ECC_SECG_P256K1`, `ML_DSA_44`, `ML_DSA_65`, `ML_DSA_87`, or `SM2` (China Regions only). Defaults to `SYMMETRIC_DEFAULT`. For help with choosing a key spec, see the [AWS KMS Developer Guide](https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html). +* `key_usage` - (Optional) Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT`, `SIGN_VERIFY`, or `GENERATE_VERIFY_MAC`. Defaults to `ENCRYPT_DECRYPT`. * `multi_region` - (Optional) Indicates whether the KMS key is a multi-Region (`true`) or regional (`false`) key. Defaults to `false`. * `policy` - (Optional) A key policy JSON document. If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `tags` - (Optional) A key-value map of tags to assign to the key. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `valid_to` - (Optional) Time at which the imported key material expires. When the key material expires, AWS KMS deletes the key material and the CMK becomes unusable. If not specified, key material does not expire. Valid values: [RFC3339 time string](https://tools.ietf.org/html/rfc3339#section-5.8) (`YYYY-MM-DDTHH:MM:SSZ`) @@ -48,7 +46,6 @@ This resource exports the following attributes in addition to the arguments abov * `expiration_model` - Whether the key material expires. Empty when pending key material import, otherwise `KEY_MATERIAL_EXPIRES` or `KEY_MATERIAL_DOES_NOT_EXPIRE`. * `id` - The unique identifier for the key. * `key_state` - The state of the CMK. -* `key_usage` - The cryptographic operations for which you can use the CMK. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Import From aadb771d7d6dd2d80d7dab0d0fafce319debadca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:37:35 -0400 Subject: [PATCH 0674/2115] r/aws_s3tables_table_bucket: Standard 'force_destroy' documentation. --- website/docs/r/s3tables_table_bucket.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/s3tables_table_bucket.html.markdown b/website/docs/r/s3tables_table_bucket.html.markdown index 85baa1f026c0..3b8c45677e78 100644 --- a/website/docs/r/s3tables_table_bucket.html.markdown +++ b/website/docs/r/s3tables_table_bucket.html.markdown @@ -31,12 +31,12 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `encryption_configuration` - (Optional) A single table bucket encryption configuration object. [See `encryption_configuration` below](#encryption_configuration). -* `force_destroy` - (Optional) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. Defaults to `false`. +* `force_destroy` - (Optional, Default:`false`) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. These tables and namespaces are *not* recoverable. This only deletes tables and namespaces when the table bucket is destroyed, *not* when setting this parameter to `true`. Once this parameter is set to `true`, there must be a successful `terraform apply` run before a destroy is required to update this value in the resource state. Without a successful `terraform apply` after this parameter is set, this flag will have no effect. If setting this field in the same operation that would require replacing the table bucket or destroying the table bucket, this flag will not work. Additionally when importing a table bucket, a successful `terraform apply` is required to set this value in state before it will take effect on a destroy operation. * `maintenance_configuration` - (Optional) A single table bucket maintenance configuration object. [See `maintenance_configuration` below](#maintenance_configuration). + * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### `encryption_configuration` From ef16b980f21748b73b8bd22ba87eb67fa9c17617 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:49:19 -0400 Subject: [PATCH 0675/2115] Fix 'TestAccKMSExternalKey_keySpec. --- internal/service/kms/external_key_test.go | 70 +++++++++++++++-------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index 48da081a966f..e131bf85a15c 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -16,10 +16,12 @@ import ( sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfkms "github.com/hashicorp/terraform-provider-aws/internal/service/kms" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -257,7 +259,7 @@ func TestAccKMSExternalKey_enabled(t *testing.T) { func TestAccKMSExternalKey_keyMaterialBase64(t *testing.T) { ctx := acctest.Context(t) - var key1, key2 awstypes.KeyMetadata + var key awstypes.KeyMetadata rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_kms_external_key.test" @@ -271,9 +273,16 @@ func TestAccKMSExternalKey_keyMaterialBase64(t *testing.T) { // ACCEPTANCE TESTING ONLY -- NEVER EXPOSE YOUR KEY MATERIAL Config: testAccExternalKeyConfig_materialBase64(rName, "Wblj06fduthWggmsT0cLVoIMOkeLbc2kVfMud77i/JY="), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key1), - resource.TestCheckResourceAttr(resourceName, "key_material_base64", "Wblj06fduthWggmsT0cLVoIMOkeLbc2kVfMud77i/JY="), + testAccCheckExternalKeyExists(ctx, resourceName, &key), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_material_base64"), knownvalue.StringExact("Wblj06fduthWggmsT0cLVoIMOkeLbc2kVfMud77i/JY=")), + }, }, { ResourceName: resourceName, @@ -289,10 +298,17 @@ func TestAccKMSExternalKey_keyMaterialBase64(t *testing.T) { // ACCEPTANCE TESTING ONLY -- NEVER EXPOSE YOUR KEY MATERIAL Config: testAccExternalKeyConfig_materialBase64(rName, "O1zsg06cKRCsZnoT5oizMlwHEtnk0HoOmBLkFtwh2Vw="), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key2), - testAccCheckExternalKeyRecreated(&key1, &key2), + testAccCheckExternalKeyExists(ctx, resourceName, &key), resource.TestCheckResourceAttr(resourceName, "key_material_base64", "O1zsg06cKRCsZnoT5oizMlwHEtnk0HoOmBLkFtwh2Vw="), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionReplace), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_material_base64"), knownvalue.StringExact("O1zsg06cKRCsZnoT5oizMlwHEtnk0HoOmBLkFtwh2Vw=")), + }, }, }, }) @@ -466,9 +482,9 @@ func TestAccKMSExternalKey_Usage(t *testing.T) { }}) } -func TestAccKMSExternalKey_Spec(t *testing.T) { +func TestAccKMSExternalKey_keySpec(t *testing.T) { ctx := acctest.Context(t) - var key1, key2 awstypes.KeyMetadata + var key awstypes.KeyMetadata rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_kms_external_key.test" @@ -479,19 +495,32 @@ func TestAccKMSExternalKey_Spec(t *testing.T) { CheckDestroy: testAccCheckExternalKeyDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccExternalKeyConfig_spec(rName, "RSA_2048"), + Config: testAccExternalKeyConfig_keySpec(rName, "RSA_2048"), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key1), - resource.TestCheckResourceAttr(resourceName, "key_spec", "RSA_2048"), + testAccCheckExternalKeyExists(ctx, resourceName, &key), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_spec"), tfknownvalue.StringExact(awstypes.KeySpecRsa2048)), + }, }, { - Config: testAccExternalKeyConfig_spec(rName, "SYMMETRIC_DEFAULT"), + Config: testAccExternalKeyConfig_keySpec(rName, "SYMMETRIC_DEFAULT"), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key2), - testAccCheckExternalKeyRecreated(&key1, &key2), - resource.TestCheckResourceAttr(resourceName, "key_spec", "SYMMETRIC_DEFAULT"), + testAccCheckExternalKeyExists(ctx, resourceName, &key), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionReplace), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_spec"), tfknownvalue.StringExact(awstypes.KeySpecSymmetricDefault)), + }, }, }}) } @@ -585,16 +614,6 @@ func testAccCheckExternalKeyNotRecreated(i, j *awstypes.KeyMetadata) resource.Te } } -func testAccCheckExternalKeyRecreated(i, j *awstypes.KeyMetadata) resource.TestCheckFunc { - return func(s *terraform.State) error { - if aws.ToTime(i.CreationDate).Equal(aws.ToTime(j.CreationDate)) { - return fmt.Errorf("KMS External Key not recreated") - } - - return nil - } -} - func testAccExternalKeyConfig_basic() string { return ` resource "aws_kms_external_key" "test" {} @@ -698,12 +717,13 @@ resource "aws_kms_external_key" "test" { `, rName, usage) } -func testAccExternalKeyConfig_spec(rName, spec string) string { +func testAccExternalKeyConfig_keySpec(rName, spec string) string { return fmt.Sprintf(` resource "aws_kms_external_key" "test" { description = %[1]q deletion_window_in_days = 7 key_spec = %[2]q + key_usage = "ENCRYPT_DECRYPT" } `, rName, spec) } From e77b6a528ae26fee0271235992958b4774cf50bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sun, 24 Aug 2025 17:54:48 -0400 Subject: [PATCH 0676/2115] Fix 'TestAccKMSExternalKey_keyUsage. --- internal/service/kms/external_key_test.go | 37 ++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index e131bf85a15c..cd09a6c9af8f 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -453,9 +453,9 @@ func TestAccKMSExternalKey_validTo(t *testing.T) { }) } -func TestAccKMSExternalKey_Usage(t *testing.T) { +func TestAccKMSExternalKey_keyUsage(t *testing.T) { ctx := acctest.Context(t) - var key1, key2 awstypes.KeyMetadata + var key awstypes.KeyMetadata rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_kms_external_key.test" @@ -466,18 +466,32 @@ func TestAccKMSExternalKey_Usage(t *testing.T) { CheckDestroy: testAccCheckExternalKeyDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccExternalKeyConfig_usage(rName, "ENCRYPT_DECRYPT"), + Config: testAccExternalKeyConfig_keyUsage(rName, "RSA_4096", "ENCRYPT_DECRYPT"), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key1), - resource.TestCheckResourceAttr(resourceName, "key_usage", "ENCRYPT_DECRYPT"), + testAccCheckExternalKeyExists(ctx, resourceName, &key), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_usage"), tfknownvalue.StringExact(awstypes.KeyUsageTypeEncryptDecrypt)), + }, }, { - Config: testAccExternalKeyConfig_usage(rName, "SIGN_VERIFY"), + Config: testAccExternalKeyConfig_keyUsage(rName, "RSA_4096", "SIGN_VERIFY"), Check: resource.ComposeTestCheckFunc( - testAccCheckExternalKeyExists(ctx, resourceName, &key2), - resource.TestCheckResourceAttr(resourceName, "key_usage", "SIGN_VERIFY"), + testAccCheckExternalKeyExists(ctx, resourceName, &key), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionReplace), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("key_usage"), tfknownvalue.StringExact(awstypes.KeyUsageTypeSignVerify)), + }, }, }}) } @@ -707,14 +721,15 @@ resource "aws_kms_external_key" "test" { `, rName, validTo) } -func testAccExternalKeyConfig_usage(rName, usage string) string { +func testAccExternalKeyConfig_keyUsage(rName, spec, usage string) string { return fmt.Sprintf(` resource "aws_kms_external_key" "test" { description = %[1]q deletion_window_in_days = 7 - key_usage = %[2]q + key_spec = %[2]q + key_usage = %[3]q } -`, rName, usage) +`, rName, spec, usage) } func testAccExternalKeyConfig_keySpec(rName, spec string) string { From 659b8e9c73c59c29babf7209993e305974f6432a Mon Sep 17 00:00:00 2001 From: team-tf-cdk Date: Mon, 25 Aug 2025 00:26:38 +0000 Subject: [PATCH 0677/2115] cdktf: update index.html.markdown,r/xray_sampling_rule.html.markdown,r/xray_resource_policy.html.markdown,r/xray_group.html.markdown,r/xray_encryption_config.html.markdown,r/workspacesweb_user_settings.html.markdown,r/workspacesweb_user_access_logging_settings.html.markdown,r/workspacesweb_network_settings.html.markdown,r/workspacesweb_ip_access_settings.html.markdown,r/workspacesweb_data_protection_settings.html.markdown,r/workspacesweb_browser_settings.html.markdown,r/workspaces_workspace.html.markdown,r/workspaces_ip_group.html.markdown,r/workspaces_directory.html.markdown,r/workspaces_connection_alias.html.markdown,r/wafv2_web_acl_rule_group_association.html.markdown,r/wafv2_web_acl_logging_configuration.html.markdown,r/wafv2_web_acl_association.html.markdown,r/wafv2_web_acl.html.markdown,r/wafv2_rule_group.html.markdown,r/wafv2_regex_pattern_set.html.markdown,r/wafv2_ip_set.html.markdown,r/wafv2_api_key.html.markdown,r/wafregional_xss_match_set.html.markdown,r/wafregional_web_acl_association.html.markdown,r/wafregional_web_acl.html.markdown,r/wafregional_sql_injection_match_set.html.markdown,r/wafregional_size_constraint_set.html.markdown,r/wafregional_rule_group.html.markdown,r/wafregional_rule.html.markdown,r/wafregional_regex_pattern_set.html.markdown,r/wafregional_regex_match_set.html.markdown,r/wafregional_rate_based_rule.html.markdown,r/wafregional_ipset.html.markdown,r/wafregional_geo_match_set.html.markdown,r/wafregional_byte_match_set.html.markdown,r/waf_xss_match_set.html.markdown,r/waf_web_acl.html.markdown,r/waf_sql_injection_match_set.html.markdown,r/waf_size_constraint_set.html.markdown,r/waf_rule_group.html.markdown,r/waf_rule.html.markdown,r/waf_regex_pattern_set.html.markdown,r/waf_regex_match_set.html.markdown,r/waf_rate_based_rule.html.markdown,r/waf_ipset.html.markdown,r/waf_geo_match_set.html.markdown,r/waf_byte_match_set.html.markdown,r/vpn_gateway_route_propagation.html.markdown,r/vpn_gateway_attachment.html.markdown,r/vpn_gateway.html.markdown,r/vpn_connection_route.html.markdown,r/vpn_connection.html.markdown,r/vpclattice_target_group_attachment.html.markdown,r/vpclattice_target_group.html.markdown,r/vpclattice_service_network_vpc_association.html.markdown,r/vpclattice_service_network_service_association.html.markdown,r/vpclattice_service_network_resource_association.html.markdown,r/vpclattice_service_network.html.markdown,r/vpclattice_service.html.markdown,r/vpclattice_resource_policy.html.markdown,r/vpclattice_resource_gateway.html.markdown,r/vpclattice_resource_configuration.html.markdown,r/vpclattice_listener_rule.html.markdown,r/vpclattice_listener.html.markdown,r/vpclattice_auth_policy.html.markdown,r/vpclattice_access_log_subscription.html.markdown,r/vpc_security_group_vpc_association.html.markdown,r/vpc_security_group_ingress_rule.html.markdown,r/vpc_security_group_egress_rule.html.markdown,r/vpc_route_server_vpc_association.html.markdown,r/vpc_route_server_propagation.html.markdown,r/vpc_route_server_peer.html.markdown,r/vpc_route_server_endpoint.html.markdown,r/vpc_route_server.html.markdown,r/vpc_peering_connection_options.html.markdown,r/vpc_peering_connection_accepter.html.markdown,r/vpc_peering_connection.html.markdown,r/vpc_network_performance_metric_subscription.html.markdown,r/vpc_ipv6_cidr_block_association.html.markdown,r/vpc_ipv4_cidr_block_association.html.markdown,r/vpc_ipam_scope.html.markdown,r/vpc_ipam_resource_discovery_association.html.markdown,r/vpc_ipam_resource_discovery.html.markdown,r/vpc_ipam_preview_next_cidr.html.markdown,r/vpc_ipam_pool_cidr_allocation.html.markdown,r/vpc_ipam_pool_cidr.html.markdown,r/vpc_ipam_pool.html.markdown,r/vpc_ipam_organization_admin_account.html.markdown,r/vpc_ipam.html.markdown,r/vpc_endpoint_subnet_association.html.markdown,r/vpc_endpoint_service_private_dns_verification.html.markdown,r/vpc_endpoint_service_allowed_principal.html.markdown,r/vpc_endpoint_service.html.markdown,r/vpc_endpoint_security_group_association.html.markdown,r/vpc_endpoint_route_table_association.html.markdown,r/vpc_endpoint_private_dns.html.markdown,r/vpc_endpoint_policy.html.markdown,r/vpc_endpoint_connection_notification.html.markdown,r/vpc_endpoint_connection_accepter.html.markdown,r/vpc_endpoint.html.markdown,r/vpc_dhcp_options_association.html.markdown,r/vpc_dhcp_options.html.markdown,r/vpc_block_public_access_options.html.markdown,r/vpc_block_public_access_exclusion.html.markdown,r/vpc.html.markdown,r/volume_attachment.html.markdown,r/verifiedpermissions_schema.html.markdown,r/verifiedpermissions_policy_template.html.markdown,r/verifiedpermissions_policy_store.html.markdown,r/verifiedpermissions_policy.html.markdown,r/verifiedpermissions_identity_source.html.markdown,r/verifiedaccess_trust_provider.html.markdown,r/verifiedaccess_instance_trust_provider_attachment.html.markdown,r/verifiedaccess_instance_logging_configuration.html.markdown,r/verifiedaccess_instance.html.markdown,r/verifiedaccess_group.html.markdown,r/verifiedaccess_endpoint.html.markdown,r/transfer_workflow.html.markdown,r/transfer_user.html.markdown,r/transfer_tag.html.markdown,r/transfer_ssh_key.html.markdown,r/transfer_server.html.markdown,r/transfer_profile.html.markdown,r/transfer_connector.html.markdown,r/transfer_certificate.html.markdown,r/transfer_agreement.html.markdown,r/transfer_access.html.markdown,r/transcribe_vocabulary_filter.html.markdown,r/transcribe_vocabulary.html.markdown,r/transcribe_medical_vocabulary.html.markdown,r/transcribe_language_model.html.markdown,r/timestreamwrite_table.html.markdown,r/timestreamwrite_database.html.markdown,r/timestreamquery_scheduled_query.html.markdown,r/timestreaminfluxdb_db_instance.html.markdown,r/synthetics_group_association.html.markdown,r/synthetics_group.html.markdown,r/synthetics_canary.html.markdown,r/swf_domain.html.markdown,r/subnet.html.markdown,r/storagegateway_working_storage.html.markdown,r/storagegateway_upload_buffer.html.markdown,r/storagegateway_tape_pool.html.markdown,r/storagegateway_stored_iscsi_volume.html.markdown,r/storagegateway_smb_file_share.html.markdown,r/storagegateway_nfs_file_share.html.markdown,r/storagegateway_gateway.html.markdown,r/storagegateway_file_system_association.html.markdown,r/storagegateway_cached_iscsi_volume.html.markdown,r/storagegateway_cache.html.markdown,r/ssoadmin_trusted_token_issuer.html.markdown,r/ssoadmin_permissions_boundary_attachment.html.markdown,r/ssoadmin_permission_set_inline_policy.html.markdown,r/ssoadmin_permission_set.html.markdown,r/ssoadmin_managed_policy_attachment.html.markdown,r/ssoadmin_instance_access_control_attributes.html.markdown,r/ssoadmin_customer_managed_policy_attachment.html.markdown,r/ssoadmin_application_assignment_configuration.html.markdown,r/ssoadmin_application_assignment.html.markdown,r/ssoadmin_application_access_scope.html.markdown,r/ssoadmin_application.html.markdown,r/ssoadmin_account_assignment.html.markdown,r/ssmquicksetup_configuration_manager.html.markdown,r/ssmincidents_response_plan.html.markdown,r/ssmincidents_replication_set.html.markdown,r/ssmcontacts_rotation.html.markdown,r/ssmcontacts_plan.html.markdown,r/ssmcontacts_contact_channel.html.markdown,r/ssmcontacts_contact.html.markdown,r/ssm_service_setting.html.markdown,r/ssm_resource_data_sync.html.markdown,r/ssm_patch_group.html.markdown,r/ssm_patch_baseline.html.markdown,r/ssm_parameter.html.markdown,r/ssm_maintenance_window_task.html.markdown,r/ssm_maintenance_window_target.html.markdown,r/ssm_maintenance_window.html.markdown,r/ssm_document.html.markdown,r/ssm_default_patch_baseline.html.markdown,r/ssm_association.html.markdown,r/ssm_activation.html.markdown,r/sqs_queue_redrive_policy.html.markdown,r/sqs_queue_redrive_allow_policy.html.markdown,r/sqs_queue_policy.html.markdown,r/sqs_queue.html.markdown,r/spot_instance_request.html.markdown,r/spot_fleet_request.html.markdown,r/spot_datafeed_subscription.html.markdown,r/sns_topic_subscription.html.markdown,r/sns_topic_policy.html.markdown,r/sns_topic_data_protection_policy.html.markdown,r/sns_topic.html.markdown,r/sns_sms_preferences.html.markdown,r/sns_platform_application.html.markdown,r/snapshot_create_volume_permission.html.markdown,r/signer_signing_profile_permission.html.markdown,r/signer_signing_profile.html.markdown,r/signer_signing_job.html.markdown,r/shield_subscription.html.markdown,r/shield_protection_health_check_association.html.markdown,r/shield_protection_group.html.markdown,r/shield_protection.html.markdown,r/shield_proactive_engagement.html.markdown,r/shield_drt_access_role_arn_association.html.markdown,r/shield_drt_access_log_bucket_association.html.markdown,r/shield_application_layer_automatic_response.html.markdown,r/sfn_state_machine.html.markdown,r/sfn_alias.html.markdown,r/sfn_activity.html.markdown,r/sesv2_email_identity_policy.html.markdown,r/sesv2_email_identity_mail_from_attributes.html.markdown,r/sesv2_email_identity_feedback_attributes.html.markdown,r/sesv2_email_identity.html.markdown,r/sesv2_dedicated_ip_pool.html.markdown,r/sesv2_dedicated_ip_assignment.html.markdown,r/sesv2_contact_list.html.markdown,r/sesv2_configuration_set_event_destination.html.markdown,r/sesv2_configuration_set.html.markdown,r/sesv2_account_vdm_attributes.html.markdown,r/sesv2_account_suppression_attributes.html.markdown,r/ses_template.html.markdown,r/ses_receipt_rule_set.html.markdown,r/ses_receipt_rule.html.markdown,r/ses_receipt_filter.html.markdown,r/ses_identity_policy.html.markdown,r/ses_identity_notification_topic.html.markdown,r/ses_event_destination.html.markdown,r/ses_email_identity.html.markdown,r/ses_domain_mail_from.html.markdown,r/ses_domain_identity_verification.html.markdown,r/ses_domain_identity.html.markdown,r/ses_domain_dkim.html.markdown,r/ses_configuration_set.html.markdown,r/ses_active_receipt_rule_set.html.markdown,r/servicequotas_template_association.html.markdown,r/servicequotas_template.html.markdown,r/servicequotas_service_quota.html.markdown,r/servicecatalogappregistry_attribute_group_association.html.markdown,r/servicecatalogappregistry_attribute_group.html.markdown,r/servicecatalogappregistry_application.html.markdown,r/servicecatalog_tag_option_resource_association.html.markdown,r/servicecatalog_tag_option.html.markdown,r/servicecatalog_service_action.html.markdown,r/servicecatalog_provisioning_artifact.html.markdown,r/servicecatalog_provisioned_product.html.markdown,r/servicecatalog_product_portfolio_association.html.markdown,r/servicecatalog_product.html.markdown,r/servicecatalog_principal_portfolio_association.html.markdown,r/servicecatalog_portfolio_share.html.markdown,r/servicecatalog_portfolio.html.markdown,r/servicecatalog_organizations_access.html.markdown,r/servicecatalog_constraint.html.markdown,r/servicecatalog_budget_resource_association.html.markdown,r/service_discovery_service.html.markdown,r/service_discovery_public_dns_namespace.html.markdown,r/service_discovery_private_dns_namespace.html.markdown,r/service_discovery_instance.html.markdown,r/service_discovery_http_namespace.html.markdown,r/serverlessapplicationrepository_cloudformation_stack.html.markdown,r/securitylake_subscriber_notification.html.markdown,r/securitylake_subscriber.html.markdown,r/securitylake_data_lake.html.markdown,r/securitylake_custom_log_source.html.markdown,r/securitylake_aws_log_source.html.markdown,r/securityhub_standards_subscription.html.markdown,r/securityhub_standards_control_association.html.markdown,r/securityhub_standards_control.html.markdown,r/securityhub_product_subscription.html.markdown,r/securityhub_organization_configuration.html.markdown,r/securityhub_organization_admin_account.html.markdown,r/securityhub_member.html.markdown,r/securityhub_invite_accepter.html.markdown,r/securityhub_insight.html.markdown,r/securityhub_finding_aggregator.html.markdown,r/securityhub_configuration_policy_association.markdown,r/securityhub_configuration_policy.html.markdown,r/securityhub_automation_rule.html.markdown,r/securityhub_action_target.html.markdown,r/securityhub_account.html.markdown,r/security_group_rule.html.markdown,r/security_group.html.markdown,r/secretsmanager_secret_version.html.markdown,r/secretsmanager_secret_rotation.html.markdown,r/secretsmanager_secret_policy.html.markdown,r/secretsmanager_secret.html.markdown,r/schemas_schema.html.markdown,r/schemas_registry_policy.html.markdown,r/schemas_registry.html.markdown,r/schemas_discoverer.html.markdown,r/scheduler_schedule_group.html.markdown,r/scheduler_schedule.html.markdown,r/sagemaker_workteam.html.markdown,r/sagemaker_workforce.html.markdown,r/sagemaker_user_profile.html.markdown,r/sagemaker_studio_lifecycle_config.html.markdown,r/sagemaker_space.html.markdown,r/sagemaker_servicecatalog_portfolio_status.html.markdown,r/sagemaker_project.html.markdown,r/sagemaker_pipeline.html.markdown,r/sagemaker_notebook_instance_lifecycle_configuration.html.markdown,r/sagemaker_notebook_instance.html.markdown,r/sagemaker_monitoring_schedule.html.markdown,r/sagemaker_model_package_group_policy.html.markdown,r/sagemaker_model_package_group.html.markdown,r/sagemaker_model.html.markdown,r/sagemaker_mlflow_tracking_server.html.markdown,r/sagemaker_image_version.html.markdown,r/sagemaker_image.html.markdown,r/sagemaker_human_task_ui.html.markdown,r/sagemaker_hub.html.markdown,r/sagemaker_flow_definition.html.markdown,r/sagemaker_feature_group.html.markdown,r/sagemaker_endpoint_configuration.html.markdown,r/sagemaker_endpoint.html.markdown,r/sagemaker_domain.html.markdown,r/sagemaker_device_fleet.html.markdown,r/sagemaker_device.html.markdown,r/sagemaker_data_quality_job_definition.html.markdown,r/sagemaker_code_repository.html.markdown,r/sagemaker_app_image_config.html.markdown,r/sagemaker_app.html.markdown,r/s3tables_table_policy.html.markdown,r/s3tables_table_bucket_policy.html.markdown,r/s3tables_table_bucket.html.markdown,r/s3tables_table.html.markdown,r/s3tables_namespace.html.markdown,r/s3outposts_endpoint.html.markdown,r/s3control_storage_lens_configuration.html.markdown,r/s3control_object_lambda_access_point_policy.html.markdown,r/s3control_object_lambda_access_point.html.markdown,r/s3control_multi_region_access_point_policy.html.markdown,r/s3control_multi_region_access_point.html.markdown,r/s3control_directory_bucket_access_point_scope.html.markdown,r/s3control_bucket_policy.html.markdown,r/s3control_bucket_lifecycle_configuration.html.markdown,r/s3control_bucket.html.markdown,r/s3control_access_point_policy.html.markdown,r/s3control_access_grants_location.html.markdown,r/s3control_access_grants_instance_resource_policy.html.markdown,r/s3control_access_grants_instance.html.markdown,r/s3control_access_grant.html.markdown,r/s3_object_copy.html.markdown,r/s3_object.html.markdown,r/s3_directory_bucket.html.markdown,r/s3_bucket_website_configuration.html.markdown,r/s3_bucket_versioning.html.markdown,r/s3_bucket_server_side_encryption_configuration.html.markdown,r/s3_bucket_request_payment_configuration.html.markdown,r/s3_bucket_replication_configuration.html.markdown,r/s3_bucket_public_access_block.html.markdown,r/s3_bucket_policy.html.markdown,r/s3_bucket_ownership_controls.html.markdown,r/s3_bucket_object_lock_configuration.html.markdown,r/s3_bucket_object.html.markdown,r/s3_bucket_notification.html.markdown,r/s3_bucket_metric.html.markdown,r/s3_bucket_metadata_configuration.html.markdown,r/s3_bucket_logging.html.markdown,r/s3_bucket_lifecycle_configuration.html.markdown,r/s3_bucket_inventory.html.markdown,r/s3_bucket_intelligent_tiering_configuration.html.markdown,r/s3_bucket_cors_configuration.html.markdown,r/s3_bucket_analytics_configuration.html.markdown,r/s3_bucket_acl.html.markdown,r/s3_bucket_accelerate_configuration.html.markdown,r/s3_bucket.html.markdown,r/s3_account_public_access_block.html.markdown,r/s3_access_point.html.markdown,r/rum_metrics_destination.html.markdown,r/rum_app_monitor.html.markdown,r/route_table_association.html.markdown,r/route_table.html.markdown,r/route53recoveryreadiness_resource_set.html.markdown,r/route53recoveryreadiness_recovery_group.html.markdown,r/route53recoveryreadiness_readiness_check.html.markdown,r/route53recoveryreadiness_cell.html.markdown,r/route53recoverycontrolconfig_safety_rule.html.markdown,r/route53recoverycontrolconfig_routing_control.html.markdown,r/route53recoverycontrolconfig_control_panel.html.markdown,r/route53recoverycontrolconfig_cluster.html.markdown,r/route53profiles_resource_association.html.markdown,r/route53profiles_profile.html.markdown,r/route53profiles_association.html.markdown,r/route53domains_registered_domain.html.markdown,r/route53domains_domain.html.markdown,r/route53domains_delegation_signer_record.html.markdown,r/route53_zone_association.html.markdown,r/route53_zone.html.markdown,r/route53_vpc_association_authorization.html.markdown,r/route53_traffic_policy_instance.html.markdown,r/route53_traffic_policy.html.markdown,r/route53_resolver_rule_association.html.markdown,r/route53_resolver_rule.html.markdown,r/route53_resolver_query_log_config_association.html.markdown,r/route53_resolver_query_log_config.html.markdown,r/route53_resolver_firewall_rule_group_association.html.markdown,r/route53_resolver_firewall_rule_group.html.markdown,r/route53_resolver_firewall_rule.html.markdown,r/route53_resolver_firewall_domain_list.html.markdown,r/route53_resolver_firewall_config.html.markdown,r/route53_resolver_endpoint.html.markdown,r/route53_resolver_dnssec_config.html.markdown,r/route53_resolver_config.html.markdown,r/route53_records_exclusive.html.markdown,r/route53_record.html.markdown,r/route53_query_log.html.markdown,r/route53_key_signing_key.html.markdown,r/route53_hosted_zone_dnssec.html.markdown,r/route53_health_check.html.markdown,r/route53_delegation_set.html.markdown,r/route53_cidr_location.html.markdown,r/route53_cidr_collection.html.markdown,r/route.html.markdown,r/rolesanywhere_trust_anchor.html.markdown,r/rolesanywhere_profile.html.markdown,r/resourcegroups_resource.html.markdown,r/resourcegroups_group.html.markdown,r/resourceexplorer2_view.html.markdown,r/resourceexplorer2_index.html.markdown,r/resiliencehub_resiliency_policy.html.markdown,r/rekognition_stream_processor.html.markdown,r/rekognition_project.html.markdown,r/rekognition_collection.html.markdown,r/redshiftserverless_workgroup.html.markdown,r/redshiftserverless_usage_limit.html.markdown,r/redshiftserverless_snapshot.html.markdown,r/redshiftserverless_resource_policy.html.markdown,r/redshiftserverless_namespace.html.markdown,r/redshiftserverless_endpoint_access.html.markdown,r/redshiftserverless_custom_domain_association.html.markdown,r/redshiftdata_statement.html.markdown,r/redshift_usage_limit.html.markdown,r/redshift_subnet_group.html.markdown,r/redshift_snapshot_schedule_association.html.markdown,r/redshift_snapshot_schedule.html.markdown,r/redshift_snapshot_copy_grant.html.markdown,r/redshift_snapshot_copy.html.markdown,r/redshift_scheduled_action.html.markdown,r/redshift_resource_policy.html.markdown,r/redshift_partner.html.markdown,r/redshift_parameter_group.html.markdown,r/redshift_logging.html.markdown,r/redshift_integration.html.markdown,r/redshift_hsm_configuration.html.markdown,r/redshift_hsm_client_certificate.html.markdown,r/redshift_event_subscription.html.markdown,r/redshift_endpoint_authorization.html.markdown,r/redshift_endpoint_access.html.markdown,r/redshift_data_share_consumer_association.html.markdown,r/redshift_data_share_authorization.html.markdown,r/redshift_cluster_snapshot.html.markdown,r/redshift_cluster_iam_roles.html.markdown,r/redshift_cluster.html.markdown,r/redshift_authentication_profile.html.markdown,r/rds_shard_group.html.markdown,r/rds_reserved_instance.html.markdown,r/rds_integration.html.markdown,r/rds_instance_state.html.markdown,r/rds_global_cluster.html.markdown,r/rds_export_task.html.markdown,r/rds_custom_db_engine_version.markdown,r/rds_cluster_snapshot_copy.html.markdown,r/rds_cluster_role_association.html.markdown,r/rds_cluster_parameter_group.html.markdown,r/rds_cluster_instance.html.markdown,r/rds_cluster_endpoint.html.markdown,r/rds_cluster_activity_stream.html.markdown,r/rds_cluster.html.markdown,r/rds_certificate.html.markdown,r/rbin_rule.html.markdown,r/ram_sharing_with_organization.html.markdown,r/ram_resource_share_accepter.html.markdown,r/ram_resource_share.html.markdown,r/ram_resource_association.html.markdown,r/ram_principal_association.html.markdown,r/quicksight_vpc_connection.html.markdown,r/quicksight_user_custom_permission.html.markdown,r/quicksight_user.html.markdown,r/quicksight_theme.html.markdown,r/quicksight_template_alias.html.markdown,r/quicksight_template.html.markdown,r/quicksight_role_membership.html.markdown,r/quicksight_role_custom_permission.html.markdown,r/quicksight_refresh_schedule.html.markdown,r/quicksight_namespace.html.markdown,r/quicksight_key_registration.html.markdown,r/quicksight_ip_restriction.html.markdown,r/quicksight_ingestion.html.markdown,r/quicksight_iam_policy_assignment.html.markdown,r/quicksight_group_membership.html.markdown,r/quicksight_group.html.markdown,r/quicksight_folder_membership.html.markdown,r/quicksight_folder.html.markdown,r/quicksight_data_source.html.markdown,r/quicksight_data_set.html.markdown,r/quicksight_dashboard.html.markdown,r/quicksight_custom_permissions.html.markdown,r/quicksight_analysis.html.markdown,r/quicksight_account_subscription.html.markdown,r/quicksight_account_settings.html.markdown,r/qldb_stream.html.markdown,r/qldb_ledger.html.markdown,r/qbusiness_application.html.markdown,r/proxy_protocol_policy.html.markdown,r/prometheus_workspace_configuration.html.markdown,r/prometheus_workspace.html.markdown,r/prometheus_scraper.html.markdown,r/prometheus_rule_group_namespace.html.markdown,r/prometheus_query_logging_configuration.html.markdown,r/prometheus_alert_manager_definition.html.markdown,r/placement_group.html.markdown,r/pipes_pipe.html.markdown,r/pinpointsmsvoicev2_phone_number.html.markdown,r/pinpointsmsvoicev2_opt_out_list.html.markdown,r/pinpointsmsvoicev2_configuration_set.html.markdown,r/pinpoint_sms_channel.html.markdown,r/pinpoint_gcm_channel.html.markdown,r/pinpoint_event_stream.html.markdown,r/pinpoint_email_template.markdown,r/pinpoint_email_channel.html.markdown,r/pinpoint_baidu_channel.html.markdown,r/pinpoint_app.html.markdown,r/pinpoint_apns_voip_sandbox_channel.html.markdown,r/pinpoint_apns_voip_channel.html.markdown,r/pinpoint_apns_sandbox_channel.html.markdown,r/pinpoint_apns_channel.html.markdown,r/pinpoint_adm_channel.html.markdown,r/paymentcryptography_key_alias.html.markdown,r/paymentcryptography_key.html.markdown,r/osis_pipeline.html.markdown,r/organizations_resource_policy.html.markdown,r/organizations_policy_attachment.html.markdown,r/organizations_policy.html.markdown,r/organizations_organizational_unit.html.markdown,r/organizations_organization.html.markdown,r/organizations_delegated_administrator.html.markdown,r/organizations_account.html.markdown,r/opensearchserverless_vpc_endpoint.html.markdown,r/opensearchserverless_security_policy.html.markdown,r/opensearchserverless_security_config.html.markdown,r/opensearchserverless_lifecycle_policy.html.markdown,r/opensearchserverless_collection.html.markdown,r/opensearchserverless_access_policy.html.markdown,r/opensearch_vpc_endpoint.html.markdown,r/opensearch_package_association.html.markdown,r/opensearch_package.html.markdown,r/opensearch_outbound_connection.html.markdown,r/opensearch_inbound_connection_accepter.html.markdown,r/opensearch_domain_saml_options.html.markdown,r/opensearch_domain_policy.html.markdown,r/opensearch_domain.html.markdown,r/opensearch_authorize_vpc_endpoint_access.html.markdown,r/oam_sink_policy.html.markdown,r/oam_sink.html.markdown,r/oam_link.html.markdown,r/notificationscontacts_email_contact.html.markdown,r/notifications_notification_hub.html.markdown,r/notifications_notification_configuration.html.markdown,r/notifications_event_rule.html.markdown,r/notifications_channel_association.html.markdown,r/networkmonitor_probe.html.markdown,r/networkmonitor_monitor.html.markdown,r/networkmanager_vpc_attachment.html.markdown,r/networkmanager_transit_gateway_route_table_attachment.html.markdown,r/networkmanager_transit_gateway_registration.html.markdown,r/networkmanager_transit_gateway_peering.html.markdown,r/networkmanager_transit_gateway_connect_peer_association.html.markdown,r/networkmanager_site_to_site_vpn_attachment.html.markdown,r/networkmanager_site.html.markdown,r/networkmanager_link_association.html.markdown,r/networkmanager_link.html.markdown,r/networkmanager_global_network.html.markdown,r/networkmanager_dx_gateway_attachment.html.markdown,r/networkmanager_device.html.markdown,r/networkmanager_customer_gateway_association.html.markdown,r/networkmanager_core_network_policy_attachment.html.markdown,r/networkmanager_core_network.html.markdown,r/networkmanager_connection.html.markdown,r/networkmanager_connect_peer.html.markdown,r/networkmanager_connect_attachment.html.markdown,r/networkmanager_attachment_accepter.html.markdown,r/networkfirewall_vpc_endpoint_association.html.markdown,r/networkfirewall_tls_inspection_configuration.html.markdown,r/networkfirewall_rule_group.html.markdown,r/networkfirewall_resource_policy.html.markdown,r/networkfirewall_logging_configuration.html.markdown,r/networkfirewall_firewall_transit_gateway_attachment_accepter.html.markdown,r/networkfirewall_firewall_policy.html.markdown,r/networkfirewall_firewall.html.markdown,r/network_interface_sg_attachment.html.markdown,r/network_interface_permission.html.markdown,r/network_interface_attachment.html.markdown,r/network_interface.html.markdown,r/network_acl_rule.html.markdown,r/network_acl_association.html.markdown,r/network_acl.html.markdown,r/neptunegraph_graph.html.markdown,r/neptune_subnet_group.html.markdown,r/neptune_parameter_group.html.markdown,r/neptune_global_cluster.html.markdown,r/neptune_event_subscription.html.markdown,r/neptune_cluster_snapshot.html.markdown,r/neptune_cluster_parameter_group.html.markdown,r/neptune_cluster_instance.html.markdown,r/neptune_cluster_endpoint.html.markdown,r/neptune_cluster.html.markdown,r/nat_gateway_eip_association.html.markdown,r/nat_gateway.html.markdown,r/mwaa_environment.html.markdown,r/mskconnect_worker_configuration.html.markdown,r/mskconnect_custom_plugin.html.markdown,r/mskconnect_connector.html.markdown,r/msk_vpc_connection.html.markdown,r/msk_single_scram_secret_association.html.markdown,r/msk_serverless_cluster.html.markdown,r/msk_scram_secret_association.html.markdown,r/msk_replicator.html.markdown,r/msk_configuration.html.markdown,r/msk_cluster_policy.html.markdown,r/msk_cluster.html.markdown,r/mq_configuration.html.markdown,r/mq_broker.html.markdown,r/memorydb_user.html.markdown,r/memorydb_subnet_group.html.markdown,r/memorydb_snapshot.html.markdown,r/memorydb_parameter_group.html.markdown,r/memorydb_multi_region_cluster.html.markdown,r/memorydb_cluster.html.markdown,r/memorydb_acl.html.markdown,r/medialive_multiplex_program.html.markdown,r/medialive_multiplex.html.markdown,r/medialive_input_security_group.html.markdown,r/medialive_input.html.markdown,r/medialive_channel.html.markdown,r/media_store_container_policy.html.markdown,r/media_store_container.html.markdown,r/media_packagev2_channel_group.html.markdown,r/media_package_channel.html.markdown,r/media_convert_queue.html.markdown,r/main_route_table_association.html.markdown,r/macie2_organization_configuration.html.markdown,r/macie2_organization_admin_account.html.markdown,r/macie2_member.html.markdown,r/macie2_invitation_accepter.html.markdown,r/macie2_findings_filter.html.markdown,r/macie2_custom_data_identifier.html.markdown,r/macie2_classification_job.html.markdown,r/macie2_classification_export_configuration.html.markdown,r/macie2_account.html.markdown,r/m2_environment.html.markdown,r/m2_deployment.html.markdown,r/m2_application.html.markdown,r/location_tracker_association.html.markdown,r/location_tracker.html.markdown,r/location_route_calculator.html.markdown,r/location_place_index.html.markdown,r/location_map.html.markdown,r/location_geofence_collection.html.markdown,r/load_balancer_policy.html.markdown,r/load_balancer_listener_policy.html.markdown,r/load_balancer_backend_server_policy.html.markdown,r/lightsail_static_ip_attachment.html.markdown,r/lightsail_static_ip.html.markdown,r/lightsail_lb_stickiness_policy.html.markdown,r/lightsail_lb_https_redirection_policy.html.markdown,r/lightsail_lb_certificate_attachment.html.markdown,r/lightsail_lb_certificate.html.markdown,r/lightsail_lb_attachment.html.markdown,r/lightsail_lb.html.markdown,r/lightsail_key_pair.html.markdown,r/lightsail_instance_public_ports.html.markdown,r/lightsail_instance.html.markdown,r/lightsail_domain_entry.html.markdown,r/lightsail_domain.html.markdown,r/lightsail_distribution.html.markdown,r/lightsail_disk_attachment.html.markdown,r/lightsail_disk.html.markdown,r/lightsail_database.html.markdown,r/lightsail_container_service_deployment_version.html.markdown,r/lightsail_container_service.html.markdown,r/lightsail_certificate.html.markdown,r/lightsail_bucket_resource_access.html.markdown,r/lightsail_bucket_access_key.html.markdown,r/lightsail_bucket.html.markdown,r/licensemanager_license_configuration.html.markdown,r/licensemanager_grant_accepter.html.markdown,r/licensemanager_grant.html.markdown,r/licensemanager_association.html.markdown,r/lexv2models_slot_type.html.markdown,r/lexv2models_slot.html.markdown,r/lexv2models_intent.html.markdown,r/lexv2models_bot_version.html.markdown,r/lexv2models_bot_locale.html.markdown,r/lexv2models_bot.html.markdown,r/lex_slot_type.html.markdown,r/lex_intent.html.markdown,r/lex_bot_alias.html.markdown,r/lex_bot.html.markdown,r/lb_trust_store_revocation.html.markdown,r/lb_trust_store.html.markdown,r/lb_target_group_attachment.html.markdown,r/lb_target_group.html.markdown,r/lb_ssl_negotiation_policy.html.markdown,r/lb_listener_rule.html.markdown,r/lb_listener_certificate.html.markdown,r/lb_listener.html.markdown,r/lb_cookie_stickiness_policy.html.markdown,r/lb.html.markdown,r/launch_template.html.markdown,r/launch_configuration.html.markdown,r/lambda_runtime_management_config.html.markdown,r/lambda_provisioned_concurrency_config.html.markdown,r/lambda_permission.html.markdown,r/lambda_layer_version_permission.html.markdown,r/lambda_layer_version.html.markdown,r/lambda_invocation.html.markdown,r/lambda_function_url.html.markdown,r/lambda_function_recursion_config.html.markdown,r/lambda_function_event_invoke_config.html.markdown,r/lambda_function.html.markdown,r/lambda_event_source_mapping.html.markdown,r/lambda_code_signing_config.html.markdown,r/lambda_alias.html.markdown,r/lakeformation_resource_lf_tags.html.markdown,r/lakeformation_resource_lf_tag.html.markdown,r/lakeformation_resource.html.markdown,r/lakeformation_permissions.html.markdown,r/lakeformation_opt_in.html.markdown,r/lakeformation_lf_tag.html.markdown,r/lakeformation_data_lake_settings.html.markdown,r/lakeformation_data_cells_filter.html.markdown,r/kms_replica_key.html.markdown,r/kms_replica_external_key.html.markdown,r/kms_key_policy.html.markdown,r/kms_key.html.markdown,r/kms_grant.html.markdown,r/kms_external_key.html.markdown,r/kms_custom_key_store.html.markdown,r/kms_ciphertext.html.markdown,r/kms_alias.html.markdown,r/kinesisanalyticsv2_application_snapshot.html.markdown,r/kinesisanalyticsv2_application.html.markdown,r/kinesis_video_stream.html.markdown,r/kinesis_stream_consumer.html.markdown,r/kinesis_stream.html.markdown,r/kinesis_resource_policy.html.markdown,r/kinesis_firehose_delivery_stream.html.markdown,r/kinesis_analytics_application.html.markdown,r/keyspaces_table.html.markdown,r/keyspaces_keyspace.html.markdown,r/key_pair.html.markdown,r/kendra_thesaurus.html.markdown,r/kendra_query_suggestions_block_list.html.markdown,r/kendra_index.html.markdown,r/kendra_faq.html.markdown,r/kendra_experience.html.markdown,r/kendra_data_source.html.markdown,r/ivschat_room.html.markdown,r/ivschat_logging_configuration.html.markdown,r/ivs_recording_configuration.html.markdown,r/ivs_playback_key_pair.html.markdown,r/ivs_channel.html.markdown,r/iot_topic_rule_destination.html.markdown,r/iot_topic_rule.html.markdown,r/iot_thing_type.html.markdown,r/iot_thing_principal_attachment.html.markdown,r/iot_thing_group_membership.html.markdown,r/iot_thing_group.html.markdown,r/iot_thing.html.markdown,r/iot_role_alias.html.markdown,r/iot_provisioning_template.html.markdown,r/iot_policy_attachment.html.markdown,r/iot_policy.html.markdown,r/iot_logging_options.html.markdown,r/iot_indexing_configuration.html.markdown,r/iot_event_configurations.html.markdown,r/iot_domain_configuration.html.markdown,r/iot_certificate.html.markdown,r/iot_ca_certificate.html.markdown,r/iot_billing_group.html.markdown,r/iot_authorizer.html.markdown,r/internetmonitor_monitor.html.markdown,r/internet_gateway_attachment.html.markdown,r/internet_gateway.html.markdown,r/instance.html.markdown,r/inspector_resource_group.html.markdown,r/inspector_assessment_template.html.markdown,r/inspector_assessment_target.html.markdown,r/inspector2_organization_configuration.html.markdown,r/inspector2_member_association.html.markdown,r/inspector2_filter.html.markdown,r/inspector2_enabler.html.markdown,r/inspector2_delegated_admin_account.html.markdown,r/imagebuilder_workflow.html.markdown,r/imagebuilder_lifecycle_policy.html.markdown,r/imagebuilder_infrastructure_configuration.html.markdown,r/imagebuilder_image_recipe.html.markdown,r/imagebuilder_image_pipeline.html.markdown,r/imagebuilder_image.html.markdown,r/imagebuilder_distribution_configuration.html.markdown,r/imagebuilder_container_recipe.html.markdown,r/imagebuilder_component.html.markdown,r/identitystore_user.html.markdown,r/identitystore_group_membership.html.markdown,r/identitystore_group.html.markdown,r/iam_virtual_mfa_device.html.markdown,r/iam_user_ssh_key.html.markdown,r/iam_user_policy_attachments_exclusive.html.markdown,r/iam_user_policy_attachment.html.markdown,r/iam_user_policy.html.markdown,r/iam_user_policies_exclusive.html.markdown,r/iam_user_login_profile.html.markdown,r/iam_user_group_membership.html.markdown,r/iam_user.html.markdown,r/iam_signing_certificate.html.markdown,r/iam_service_specific_credential.html.markdown,r/iam_service_linked_role.html.markdown,r/iam_server_certificate.html.markdown,r/iam_security_token_service_preferences.html.markdown,r/iam_saml_provider.html.markdown,r/iam_role_policy_attachments_exclusive.html.markdown,r/iam_role_policy_attachment.html.markdown,r/iam_role_policy.html.markdown,r/iam_role_policies_exclusive.html.markdown,r/iam_role.html.markdown,r/iam_policy_attachment.html.markdown,r/iam_policy.html.markdown,r/iam_organizations_features.html.markdown,r/iam_openid_connect_provider.html.markdown,r/iam_instance_profile.html.markdown,r/iam_group_policy_attachments_exclusive.html.markdown,r/iam_group_policy_attachment.html.markdown,r/iam_group_policy.html.markdown,r/iam_group_policies_exclusive.html.markdown,r/iam_group_membership.html.markdown,r/iam_group.html.markdown,r/iam_account_password_policy.html.markdown,r/iam_account_alias.html.markdown,r/iam_access_key.html.markdown,r/guardduty_threatintelset.html.markdown,r/guardduty_publishing_destination.html.markdown,r/guardduty_organization_configuration_feature.html.markdown,r/guardduty_organization_configuration.html.markdown,r/guardduty_organization_admin_account.html.markdown,r/guardduty_member_detector_feature.html.markdown,r/guardduty_member.html.markdown,r/guardduty_malware_protection_plan.html.markdown,r/guardduty_ipset.html.markdown,r/guardduty_invite_accepter.html.markdown,r/guardduty_filter.html.markdown,r/guardduty_detector_feature.html.markdown,r/guardduty_detector.html.markdown,r/grafana_workspace_service_account_token.html.markdown,r/grafana_workspace_service_account.html.markdown,r/grafana_workspace_saml_configuration.html.markdown,r/grafana_workspace_api_key.html.markdown,r/grafana_workspace.html.markdown,r/grafana_role_association.html.markdown,r/grafana_license_association.html.markdown,r/glue_workflow.html.markdown,r/glue_user_defined_function.html.markdown,r/glue_trigger.html.markdown,r/glue_security_configuration.html.markdown,r/glue_schema.html.markdown,r/glue_resource_policy.html.markdown,r/glue_registry.html.markdown,r/glue_partition_index.html.markdown,r/glue_partition.html.markdown,r/glue_ml_transform.html.markdown,r/glue_job.html.markdown,r/glue_dev_endpoint.html.markdown,r/glue_data_quality_ruleset.html.markdown,r/glue_data_catalog_encryption_settings.html.markdown,r/glue_crawler.html.markdown,r/glue_connection.html.markdown,r/glue_classifier.html.markdown,r/glue_catalog_table_optimizer.html.markdown,r/glue_catalog_table.html.markdown,r/glue_catalog_database.html.markdown,r/globalaccelerator_listener.html.markdown,r/globalaccelerator_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_listener.html.markdown,r/globalaccelerator_custom_routing_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_accelerator.html.markdown,r/globalaccelerator_cross_account_attachment.html.markdown,r/globalaccelerator_accelerator.html.markdown,r/glacier_vault_lock.html.markdown,r/glacier_vault.html.markdown,r/gamelift_script.html.markdown,r/gamelift_game_session_queue.html.markdown,r/gamelift_game_server_group.html.markdown,r/gamelift_fleet.html.markdown,r/gamelift_build.html.markdown,r/gamelift_alias.html.markdown,r/fsx_windows_file_system.html.markdown,r/fsx_s3_access_point_attachment.html.markdown,r/fsx_openzfs_volume.html.markdown,r/fsx_openzfs_snapshot.html.markdown,r/fsx_openzfs_file_system.html.markdown,r/fsx_ontap_volume.html.markdown,r/fsx_ontap_storage_virtual_machine.html.markdown,r/fsx_ontap_file_system.html.markdown,r/fsx_lustre_file_system.html.markdown,r/fsx_file_cache.html.markdown,r/fsx_data_repository_association.html.markdown,r/fsx_backup.html.markdown,r/fms_resource_set.html.markdown,r/fms_policy.html.markdown,r/fms_admin_account.html.markdown,r/flow_log.html.markdown,r/fis_experiment_template.html.markdown,r/finspace_kx_volume.html.markdown,r/finspace_kx_user.html.markdown,r/finspace_kx_scaling_group.html.markdown,r/finspace_kx_environment.html.markdown,r/finspace_kx_dataview.html.markdown,r/finspace_kx_database.html.markdown,r/finspace_kx_cluster.html.markdown,r/evidently_segment.html.markdown,r/evidently_project.html.markdown,r/evidently_launch.html.markdown,r/evidently_feature.html.markdown,r/emrserverless_application.html.markdown,r/emrcontainers_virtual_cluster.html.markdown,r/emrcontainers_job_template.html.markdown,r/emr_studio_session_mapping.html.markdown,r/emr_studio.html.markdown,r/emr_security_configuration.html.markdown,r/emr_managed_scaling_policy.html.markdown,r/emr_instance_group.html.markdown,r/emr_instance_fleet.html.markdown,r/emr_cluster.html.markdown,r/emr_block_public_access_configuration.html.markdown,r/elb_attachment.html.markdown,r/elb.html.markdown,r/elastictranscoder_preset.html.markdown,r/elastictranscoder_pipeline.html.markdown,r/elasticsearch_vpc_endpoint.html.markdown,r/elasticsearch_domain_saml_options.html.markdown,r/elasticsearch_domain_policy.html.markdown,r/elasticsearch_domain.html.markdown,r/elasticache_user_group_association.html.markdown,r/elasticache_user_group.html.markdown,r/elasticache_user.html.markdown,r/elasticache_subnet_group.html.markdown,r/elasticache_serverless_cache.html.markdown,r/elasticache_reserved_cache_node.html.markdown,r/elasticache_replication_group.html.markdown,r/elasticache_parameter_group.html.markdown,r/elasticache_global_replication_group.html.markdown,r/elasticache_cluster.html.markdown,r/elastic_beanstalk_environment.html.markdown,r/elastic_beanstalk_configuration_template.html.markdown,r/elastic_beanstalk_application_version.html.markdown,r/elastic_beanstalk_application.html.markdown,r/eks_pod_identity_association.html.markdown,r/eks_node_group.html.markdown,r/eks_identity_provider_config.html.markdown,r/eks_fargate_profile.html.markdown,r/eks_cluster.html.markdown,r/eks_addon.html.markdown,r/eks_access_policy_association.html.markdown,r/eks_access_entry.html.markdown,r/eip_domain_name.html.markdown,r/eip_association.html.markdown,r/eip.html.markdown,r/egress_only_internet_gateway.html.markdown,r/efs_replication_configuration.html.markdown,r/efs_mount_target.html.markdown,r/efs_file_system_policy.html.markdown,r/efs_file_system.html.markdown,r/efs_backup_policy.html.markdown,r/efs_access_point.html.markdown,r/ecs_task_set.html.markdown,r/ecs_task_definition.html.markdown,r/ecs_tag.html.markdown,r/ecs_service.html.markdown,r/ecs_cluster_capacity_providers.html.markdown,r/ecs_cluster.html.markdown,r/ecs_capacity_provider.html.markdown,r/ecs_account_setting_default.html.markdown,r/ecrpublic_repository_policy.html.markdown,r/ecrpublic_repository.html.markdown,r/ecr_repository_policy.html.markdown,r/ecr_repository_creation_template.html.markdown,r/ecr_repository.html.markdown,r/ecr_replication_configuration.html.markdown,r/ecr_registry_scanning_configuration.html.markdown,r/ecr_registry_policy.html.markdown,r/ecr_pull_through_cache_rule.html.markdown,r/ecr_lifecycle_policy.html.markdown,r/ecr_account_setting.html.markdown,r/ec2_transit_gateway_vpc_attachment_accepter.html.markdown,r/ec2_transit_gateway_vpc_attachment.html.markdown,r/ec2_transit_gateway_route_table_propagation.html.markdown,r/ec2_transit_gateway_route_table_association.html.markdown,r/ec2_transit_gateway_route_table.html.markdown,r/ec2_transit_gateway_route.html.markdown,r/ec2_transit_gateway_prefix_list_reference.html.markdown,r/ec2_transit_gateway_policy_table_association.html.markdown,r/ec2_transit_gateway_policy_table.html.markdown,r/ec2_transit_gateway_peering_attachment_accepter.html.markdown,r/ec2_transit_gateway_peering_attachment.html.markdown,r/ec2_transit_gateway_multicast_group_source.html.markdown,r/ec2_transit_gateway_multicast_group_member.html.markdown,r/ec2_transit_gateway_multicast_domain_association.html.markdown,r/ec2_transit_gateway_multicast_domain.html.markdown,r/ec2_transit_gateway_default_route_table_propagation.html.markdown,r/ec2_transit_gateway_default_route_table_association.html.markdown,r/ec2_transit_gateway_connect_peer.html.markdown,r/ec2_transit_gateway_connect.html.markdown,r/ec2_transit_gateway.html.markdown,r/ec2_traffic_mirror_target.html.markdown,r/ec2_traffic_mirror_session.html.markdown,r/ec2_traffic_mirror_filter_rule.html.markdown,r/ec2_traffic_mirror_filter.html.markdown,r/ec2_tag.html.markdown,r/ec2_subnet_cidr_reservation.html.markdown,r/ec2_serial_console_access.html.markdown,r/ec2_network_insights_path.html.markdown,r/ec2_network_insights_analysis.html.markdown,r/ec2_managed_prefix_list_entry.html.markdown,r/ec2_managed_prefix_list.html.markdown,r/ec2_local_gateway_route_table_vpc_association.html.markdown,r/ec2_local_gateway_route.html.markdown,r/ec2_instance_state.html.markdown,r/ec2_instance_metadata_defaults.html.markdown,r/ec2_instance_connect_endpoint.html.markdown,r/ec2_image_block_public_access.markdown,r/ec2_host.html.markdown,r/ec2_fleet.html.markdown,r/ec2_default_credit_specification.html.markdown,r/ec2_client_vpn_route.html.markdown,r/ec2_client_vpn_network_association.html.markdown,r/ec2_client_vpn_endpoint.html.markdown,r/ec2_client_vpn_authorization_rule.html.markdown,r/ec2_carrier_gateway.html.markdown,r/ec2_capacity_reservation.html.markdown,r/ec2_capacity_block_reservation.html.markdown,r/ec2_availability_zone_group.html.markdown,r/ebs_volume.html.markdown,r/ebs_snapshot_import.html.markdown,r/ebs_snapshot_copy.html.markdown,r/ebs_snapshot_block_public_access.html.markdown,r/ebs_snapshot.html.markdown,r/ebs_fast_snapshot_restore.html.markdown,r/ebs_encryption_by_default.html.markdown,r/ebs_default_kms_key.html.markdown,r/dynamodb_tag.html.markdown,r/dynamodb_table_replica.html.markdown,r/dynamodb_table_item.html.markdown,r/dynamodb_table_export.html.markdown,r/dynamodb_table.html.markdown,r/dynamodb_resource_policy.html.markdown,r/dynamodb_kinesis_streaming_destination.html.markdown,r/dynamodb_global_table.html.markdown,r/dynamodb_contributor_insights.html.markdown,r/dx_transit_virtual_interface.html.markdown,r/dx_public_virtual_interface.html.markdown,r/dx_private_virtual_interface.html.markdown,r/dx_macsec_key_association.html.markdown,r/dx_lag.html.markdown,r/dx_hosted_transit_virtual_interface_accepter.html.markdown,r/dx_hosted_transit_virtual_interface.html.markdown,r/dx_hosted_public_virtual_interface_accepter.html.markdown,r/dx_hosted_public_virtual_interface.html.markdown,r/dx_hosted_private_virtual_interface_accepter.html.markdown,r/dx_hosted_private_virtual_interface.html.markdown,r/dx_hosted_connection.html.markdown,r/dx_gateway_association_proposal.html.markdown,r/dx_gateway_association.html.markdown,r/dx_gateway.html.markdown,r/dx_connection_confirmation.html.markdown,r/dx_connection_association.html.markdown,r/dx_connection.html.markdown,r/dx_bgp_peer.html.markdown,r/dsql_cluster_peering.html.markdown,r/dsql_cluster.html.markdown,r/drs_replication_configuration_template.html.markdown,r/docdbelastic_cluster.html.markdown,r/docdb_subnet_group.html.markdown,r/docdb_global_cluster.html.markdown,r/docdb_event_subscription.html.markdown,r/docdb_cluster_snapshot.html.markdown,r/docdb_cluster_parameter_group.html.markdown,r/docdb_cluster_instance.html.markdown,r/docdb_cluster.html.markdown,r/dms_s3_endpoint.html.markdown,r/dms_replication_task.html.markdown,r/dms_replication_subnet_group.html.markdown,r/dms_replication_instance.html.markdown,r/dms_replication_config.html.markdown,r/dms_event_subscription.html.markdown,r/dms_endpoint.html.markdown,r/dms_certificate.html.markdown,r/dlm_lifecycle_policy.html.markdown,r/directory_service_trust.html.markdown,r/directory_service_shared_directory_accepter.html.markdown,r/directory_service_shared_directory.html.markdown,r/directory_service_region.html.markdown,r/directory_service_radius_settings.html.markdown,r/directory_service_log_subscription.html.markdown,r/directory_service_directory.html.markdown,r/directory_service_conditional_forwarder.html.markdown,r/devopsguru_service_integration.html.markdown,r/devopsguru_resource_collection.html.markdown,r/devopsguru_notification_channel.html.markdown,r/devopsguru_event_sources_config.html.markdown,r/devicefarm_upload.html.markdown,r/devicefarm_test_grid_project.html.markdown,r/devicefarm_project.html.markdown,r/devicefarm_network_profile.html.markdown,r/devicefarm_instance_profile.html.markdown,r/devicefarm_device_pool.html.markdown,r/detective_organization_configuration.html.markdown,r/detective_organization_admin_account.html.markdown,r/detective_member.html.markdown,r/detective_invitation_accepter.html.markdown,r/detective_graph.html.markdown,r/default_vpc_dhcp_options.html.markdown,r/default_vpc.html.markdown,r/default_subnet.html.markdown,r/default_security_group.html.markdown,r/default_route_table.html.markdown,r/default_network_acl.html.markdown,r/db_subnet_group.html.markdown,r/db_snapshot_copy.html.markdown,r/db_snapshot.html.markdown,r/db_proxy_target.html.markdown,r/db_proxy_endpoint.html.markdown,r/db_proxy_default_target_group.html.markdown,r/db_proxy.html.markdown,r/db_parameter_group.html.markdown,r/db_option_group.html.markdown,r/db_instance_role_association.html.markdown,r/db_instance_automated_backups_replication.html.markdown,r/db_instance.html.markdown,r/db_event_subscription.html.markdown,r/db_cluster_snapshot.html.markdown,r/dax_subnet_group.html.markdown,r/dax_parameter_group.html.markdown,r/dax_cluster.html.markdown,r/datazone_user_profile.html.markdown,r/datazone_project.html.markdown,r/datazone_glossary_term.html.markdown,r/datazone_glossary.html.markdown,r/datazone_form_type.html.markdown,r/datazone_environment_profile.html.markdown,r/datazone_environment_blueprint_configuration.html.markdown,r/datazone_environment.html.markdown,r/datazone_domain.html.markdown,r/datazone_asset_type.html.markdown,r/datasync_task.html.markdown,r/datasync_location_smb.html.markdown,r/datasync_location_s3.html.markdown,r/datasync_location_object_storage.html.markdown,r/datasync_location_nfs.html.markdown,r/datasync_location_hdfs.html.markdown,r/datasync_location_fsx_windows_file_system.html.markdown,r/datasync_location_fsx_openzfs_file_system.html.markdown,r/datasync_location_fsx_ontap_file_system.html.markdown,r/datasync_location_fsx_lustre_file_system.html.markdown,r/datasync_location_efs.html.markdown,r/datasync_location_azure_blob.html.markdown,r/datasync_agent.html.markdown,r/datapipeline_pipeline_definition.html.markdown,r/datapipeline_pipeline.html.markdown,r/dataexchange_revision_assets.html.markdown,r/dataexchange_revision.html.markdown,r/dataexchange_event_action.html.markdown,r/dataexchange_data_set.html.markdown,r/customerprofiles_profile.html.markdown,r/customerprofiles_domain.html.markdown,r/customer_gateway.html.markdown,r/cur_report_definition.html.markdown,r/costoptimizationhub_preferences.html.markdown,r/costoptimizationhub_enrollment_status.html.markdown,r/controltower_landing_zone.html.markdown,r/controltower_control.html.markdown,r/connect_vocabulary.html.markdown,r/connect_user_hierarchy_structure.html.markdown,r/connect_user_hierarchy_group.html.markdown,r/connect_user.html.markdown,r/connect_security_profile.html.markdown,r/connect_routing_profile.html.markdown,r/connect_quick_connect.html.markdown,r/connect_queue.html.markdown,r/connect_phone_number_contact_flow_association.html.markdown,r/connect_phone_number.html.markdown,r/connect_lambda_function_association.html.markdown,r/connect_instance_storage_config.html.markdown,r/connect_instance.html.markdown,r/connect_hours_of_operation.html.markdown,r/connect_contact_flow_module.html.markdown,r/connect_contact_flow.html.markdown,r/connect_bot_association.html.markdown,r/config_retention_configuration.html.markdown,r/config_remediation_configuration.html.markdown,r/config_organization_managed_rule.html.markdown,r/config_organization_custom_rule.html.markdown,r/config_organization_custom_policy_rule.html.markdown,r/config_organization_conformance_pack.html.markdown,r/config_delivery_channel.html.markdown,r/config_conformance_pack.html.markdown,r/config_configuration_recorder_status.html.markdown,r/config_configuration_recorder.html.markdown,r/config_configuration_aggregator.html.markdown,r/config_config_rule.html.markdown,r/config_aggregate_authorization.html.markdown,r/computeoptimizer_recommendation_preferences.html.markdown,r/computeoptimizer_enrollment_status.html.markdown,r/comprehend_entity_recognizer.html.markdown,r/comprehend_document_classifier.html.markdown,r/cognito_user_pool_ui_customization.html.markdown,r/cognito_user_pool_domain.html.markdown,r/cognito_user_pool_client.html.markdown,r/cognito_user_pool.html.markdown,r/cognito_user_in_group.html.markdown,r/cognito_user_group.html.markdown,r/cognito_user.html.markdown,r/cognito_risk_configuration.html.markdown,r/cognito_resource_server.html.markdown,r/cognito_managed_user_pool_client.html.markdown,r/cognito_log_delivery_configuration.html.markdown,r/cognito_identity_provider.html.markdown,r/cognito_identity_pool_roles_attachment.html.markdown,r/cognito_identity_pool_provider_principal_tag.html.markdown,r/cognito_identity_pool.html.markdown,r/codestarnotifications_notification_rule.html.markdown,r/codestarconnections_host.html.markdown,r/codestarconnections_connection.html.markdown,r/codepipeline_webhook.html.markdown,r/codepipeline_custom_action_type.html.markdown,r/codepipeline.html.markdown,r/codegurureviewer_repository_association.html.markdown,r/codeguruprofiler_profiling_group.html.markdown,r/codedeploy_deployment_group.html.markdown,r/codedeploy_deployment_config.html.markdown,r/codedeploy_app.html.markdown,r/codeconnections_host.html.markdown,r/codeconnections_connection.html.markdown,r/codecommit_trigger.html.markdown,r/codecommit_repository.html.markdown,r/codecommit_approval_rule_template_association.html.markdown,r/codecommit_approval_rule_template.html.markdown,r/codecatalyst_source_repository.html.markdown,r/codecatalyst_project.html.markdown,r/codecatalyst_dev_environment.html.markdown,r/codebuild_webhook.html.markdown,r/codebuild_source_credential.html.markdown,r/codebuild_resource_policy.html.markdown,r/codebuild_report_group.html.markdown,r/codebuild_project.html.markdown,r/codebuild_fleet.html.markdown,r/codeartifact_repository_permissions_policy.html.markdown,r/codeartifact_repository.html.markdown,r/codeartifact_domain_permissions_policy.html.markdown,r/codeartifact_domain.html.markdown,r/cloudwatch_query_definition.html.markdown,r/cloudwatch_metric_stream.html.markdown,r/cloudwatch_metric_alarm.html.markdown,r/cloudwatch_log_subscription_filter.html.markdown,r/cloudwatch_log_stream.html.markdown,r/cloudwatch_log_resource_policy.html.markdown,r/cloudwatch_log_metric_filter.html.markdown,r/cloudwatch_log_index_policy.html.markdown,r/cloudwatch_log_group.html.markdown,r/cloudwatch_log_destination_policy.html.markdown,r/cloudwatch_log_destination.html.markdown,r/cloudwatch_log_delivery_source.html.markdown,r/cloudwatch_log_delivery_destination_policy.html.markdown,r/cloudwatch_log_delivery_destination.html.markdown,r/cloudwatch_log_delivery.html.markdown,r/cloudwatch_log_data_protection_policy.html.markdown,r/cloudwatch_log_anomaly_detector.html.markdown,r/cloudwatch_log_account_policy.html.markdown,r/cloudwatch_event_target.html.markdown,r/cloudwatch_event_rule.html.markdown,r/cloudwatch_event_permission.html.markdown,r/cloudwatch_event_endpoint.html.markdown,r/cloudwatch_event_connection.html.markdown,r/cloudwatch_event_bus_policy.html.markdown,r/cloudwatch_event_bus.html.markdown,r/cloudwatch_event_archive.html.markdown,r/cloudwatch_event_api_destination.html.markdown,r/cloudwatch_dashboard.html.markdown,r/cloudwatch_contributor_managed_insight_rule.html.markdown,r/cloudwatch_contributor_insight_rule.html.markdown,r/cloudwatch_composite_alarm.html.markdown,r/cloudtrail_organization_delegated_admin_account.html.markdown,r/cloudtrail_event_data_store.html.markdown,r/cloudtrail.html.markdown,r/cloudsearch_domain_service_access_policy.html.markdown,r/cloudsearch_domain.html.markdown,r/cloudhsm_v2_hsm.html.markdown,r/cloudhsm_v2_cluster.html.markdown,r/cloudfrontkeyvaluestore_keys_exclusive.html.markdown,r/cloudfrontkeyvaluestore_key.html.markdown,r/cloudfront_vpc_origin.html.markdown,r/cloudfront_response_headers_policy.html.markdown,r/cloudfront_realtime_log_config.html.markdown,r/cloudfront_public_key.html.markdown,r/cloudfront_origin_request_policy.html.markdown,r/cloudfront_origin_access_identity.html.markdown,r/cloudfront_origin_access_control.html.markdown,r/cloudfront_monitoring_subscription.html.markdown,r/cloudfront_key_value_store.html.markdown,r/cloudfront_key_group.html.markdown,r/cloudfront_function.html.markdown,r/cloudfront_field_level_encryption_profile.html.markdown,r/cloudfront_field_level_encryption_config.html.markdown,r/cloudfront_distribution.html.markdown,r/cloudfront_continuous_deployment_policy.html.markdown,r/cloudfront_cache_policy.html.markdown,r/cloudformation_type.html.markdown,r/cloudformation_stack_set_instance.html.markdown,r/cloudformation_stack_set.html.markdown,r/cloudformation_stack_instances.html.markdown,r/cloudformation_stack.html.markdown,r/cloudcontrolapi_resource.html.markdown,r/cloud9_environment_membership.html.markdown,r/cloud9_environment_ec2.html.markdown,r/cleanrooms_membership.html.markdown,r/cleanrooms_configured_table.html.markdown,r/cleanrooms_collaboration.html.markdown,r/chimesdkvoice_voice_profile_domain.html.markdown,r/chimesdkvoice_sip_rule.html.markdown,r/chimesdkvoice_sip_media_application.html.markdown,r/chimesdkvoice_global_settings.html.markdown,r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown,r/chime_voice_connector_termination_credentials.html.markdown,r/chime_voice_connector_termination.html.markdown,r/chime_voice_connector_streaming.html.markdown,r/chime_voice_connector_origination.html.markdown,r/chime_voice_connector_logging.html.markdown,r/chime_voice_connector_group.html.markdown,r/chime_voice_connector.html.markdown,r/chatbot_teams_channel_configuration.html.markdown,r/chatbot_slack_channel_configuration.html.markdown,r/ce_cost_category.html.markdown,r/ce_cost_allocation_tag.html.markdown,r/ce_anomaly_subscription.html.markdown,r/ce_anomaly_monitor.html.markdown,r/budgets_budget_action.html.markdown,r/budgets_budget.html.markdown,r/bedrockagent_prompt.html.markdown,r/bedrockagent_knowledge_base.html.markdown,r/bedrockagent_flow.html.markdown,r/bedrockagent_data_source.html.markdown,r/bedrockagent_agent_knowledge_base_association.html.markdown,r/bedrockagent_agent_collaborator.html.markdown,r/bedrockagent_agent_alias.html.markdown,r/bedrockagent_agent_action_group.html.markdown,r/bedrockagent_agent.html.markdown,r/bedrock_provisioned_model_throughput.html.markdown,r/bedrock_model_invocation_logging_configuration.html.markdown,r/bedrock_inference_profile.html.markdown,r/bedrock_guardrail_version.html.markdown,r/bedrock_guardrail.html.markdown,r/bedrock_custom_model.html.markdown,r/bcmdataexports_export.html.markdown,r/batch_scheduling_policy.html.markdown,r/batch_job_queue.html.markdown,r/batch_job_definition.html.markdown,r/batch_compute_environment.html.markdown,r/backup_vault_policy.html.markdown,r/backup_vault_notifications.html.markdown,r/backup_vault_lock_configuration.html.markdown,r/backup_vault.html.markdown,r/backup_selection.html.markdown,r/backup_restore_testing_selection.html.markdown,r/backup_restore_testing_plan.html.markdown,r/backup_report_plan.html.markdown,r/backup_region_settings.html.markdown,r/backup_plan.html.markdown,r/backup_logically_air_gapped_vault.html.markdown,r/backup_global_settings.html.markdown,r/backup_framework.html.markdown,r/autoscalingplans_scaling_plan.html.markdown,r/autoscaling_traffic_source_attachment.html.markdown,r/autoscaling_schedule.html.markdown,r/autoscaling_policy.html.markdown,r/autoscaling_notification.html.markdown,r/autoscaling_lifecycle_hook.html.markdown,r/autoscaling_group_tag.html.markdown,r/autoscaling_group.html.markdown,r/autoscaling_attachment.html.markdown,r/auditmanager_organization_admin_account_registration.html.markdown,r/auditmanager_framework_share.html.markdown,r/auditmanager_framework.html.markdown,r/auditmanager_control.html.markdown,r/auditmanager_assessment_report.html.markdown,r/auditmanager_assessment_delegation.html.markdown,r/auditmanager_assessment.html.markdown,r/auditmanager_account_registration.html.markdown,r/athena_workgroup.html.markdown,r/athena_prepared_statement.html.markdown,r/athena_named_query.html.markdown,r/athena_database.html.markdown,r/athena_data_catalog.html.markdown,r/athena_capacity_reservation.html.markdown,r/appsync_type.html.markdown,r/appsync_source_api_association.html.markdown,r/appsync_resolver.html.markdown,r/appsync_graphql_api.html.markdown,r/appsync_function.html.markdown,r/appsync_domain_name_api_association.html.markdown,r/appsync_domain_name.html.markdown,r/appsync_datasource.html.markdown,r/appsync_channel_namespace.html.markdown,r/appsync_api_key.html.markdown,r/appsync_api_cache.html.markdown,r/appsync_api.html.markdown,r/appstream_user_stack_association.html.markdown,r/appstream_user.html.markdown,r/appstream_stack.html.markdown,r/appstream_image_builder.html.markdown,r/appstream_fleet_stack_association.html.markdown,r/appstream_fleet.html.markdown,r/appstream_directory_config.html.markdown,r/apprunner_vpc_ingress_connection.html.markdown,r/apprunner_vpc_connector.html.markdown,r/apprunner_service.html.markdown,r/apprunner_observability_configuration.html.markdown,r/apprunner_deployment.html.markdown,r/apprunner_default_auto_scaling_configuration_version.html.markdown,r/apprunner_custom_domain_association.html.markdown,r/apprunner_connection.html.markdown,r/apprunner_auto_scaling_configuration_version.html.markdown,r/appmesh_virtual_service.html.markdown,r/appmesh_virtual_router.html.markdown,r/appmesh_virtual_node.html.markdown,r/appmesh_virtual_gateway.html.markdown,r/appmesh_route.html.markdown,r/appmesh_mesh.html.markdown,r/appmesh_gateway_route.html.markdown,r/applicationinsights_application.html.markdown,r/appintegrations_event_integration.html.markdown,r/appintegrations_data_integration.html.markdown,r/appflow_flow.html.markdown,r/appflow_connector_profile.html.markdown,r/appfabric_ingestion_destination.html.markdown,r/appfabric_ingestion.html.markdown,r/appfabric_app_bundle.html.markdown,r/appfabric_app_authorization_connection.html.markdown,r/appfabric_app_authorization.html.markdown,r/appconfig_hosted_configuration_version.html.markdown,r/appconfig_extension_association.html.markdown,r/appconfig_extension.html.markdown,r/appconfig_environment.html.markdown,r/appconfig_deployment_strategy.html.markdown,r/appconfig_deployment.html.markdown,r/appconfig_configuration_profile.html.markdown,r/appconfig_application.html.markdown,r/appautoscaling_target.html.markdown,r/appautoscaling_scheduled_action.html.markdown,r/appautoscaling_policy.html.markdown,r/app_cookie_stickiness_policy.html.markdown,r/apigatewayv2_vpc_link.html.markdown,r/apigatewayv2_stage.html.markdown,r/apigatewayv2_route_response.html.markdown,r/apigatewayv2_route.html.markdown,r/apigatewayv2_model.html.markdown,r/apigatewayv2_integration_response.html.markdown,r/apigatewayv2_integration.html.markdown,r/apigatewayv2_domain_name.html.markdown,r/apigatewayv2_deployment.html.markdown,r/apigatewayv2_authorizer.html.markdown,r/apigatewayv2_api_mapping.html.markdown,r/apigatewayv2_api.html.markdown,r/api_gateway_vpc_link.html.markdown,r/api_gateway_usage_plan_key.html.markdown,r/api_gateway_usage_plan.html.markdown,r/api_gateway_stage.html.markdown,r/api_gateway_rest_api_put.markdown,r/api_gateway_rest_api_policy.html.markdown,r/api_gateway_rest_api.html.markdown,r/api_gateway_resource.html.markdown,r/api_gateway_request_validator.html.markdown,r/api_gateway_model.html.markdown,r/api_gateway_method_settings.html.markdown,r/api_gateway_method_response.html.markdown,r/api_gateway_method.html.markdown,r/api_gateway_integration_response.html.markdown,r/api_gateway_integration.html.markdown,r/api_gateway_gateway_response.html.markdown,r/api_gateway_domain_name_access_association.html.markdown,r/api_gateway_domain_name.html.markdown,r/api_gateway_documentation_version.html.markdown,r/api_gateway_documentation_part.html.markdown,r/api_gateway_deployment.html.markdown,r/api_gateway_client_certificate.html.markdown,r/api_gateway_base_path_mapping.html.markdown,r/api_gateway_authorizer.html.markdown,r/api_gateway_api_key.html.markdown,r/api_gateway_account.html.markdown,r/amplify_webhook.html.markdown,r/amplify_domain_association.html.markdown,r/amplify_branch.html.markdown,r/amplify_backend_environment.html.markdown,r/amplify_app.html.markdown,r/ami_launch_permission.html.markdown,r/ami_from_instance.html.markdown,r/ami_copy.html.markdown,r/ami.html.markdown,r/acmpca_policy.html.markdown,r/acmpca_permission.html.markdown,r/acmpca_certificate_authority_certificate.html.markdown,r/acmpca_certificate_authority.html.markdown,r/acmpca_certificate.html.markdown,r/acm_certificate_validation.html.markdown,r/acm_certificate.html.markdown,r/account_region.markdown,r/account_primary_contact.html.markdown,r/account_alternate_contact.html.markdown,r/accessanalyzer_archive_rule.html.markdown,r/accessanalyzer_analyzer.html.markdown,guides/version-6-upgrade.html.markdown,guides/version-5-upgrade.html.markdown,guides/version-4-upgrade.html.markdown,guides/version-3-upgrade.html.markdown,guides/version-2-upgrade.html.markdown,guides/using-aws-with-awscc-provider.html.markdown,guides/resource-tagging.html.markdown,guides/enhanced-region-support.html.markdown,guides/custom-service-endpoints.html.markdown,guides/continuous-validation-examples.html.markdown,functions/trim_iam_role_path.html.markdown,functions/arn_parse.html.markdown,functions/arn_build.html.markdown,ephemeral-resources/ssm_parameter.html.markdown,ephemeral-resources/secretsmanager_secret_version.html.markdown,ephemeral-resources/secretsmanager_random_password.html.markdown,ephemeral-resources/lambda_invocation.html.markdown,ephemeral-resources/kms_secrets.html.markdown,ephemeral-resources/eks_cluster_auth.html.markdown,ephemeral-resources/cognito_identity_openid_token_for_developer_identity.markdown,d/workspaces_workspace.html.markdown,d/workspaces_image.html.markdown,d/workspaces_directory.html.markdown,d/workspaces_bundle.html.markdown,d/wafv2_web_acl.html.markdown,d/wafv2_rule_group.html.markdown,d/wafv2_regex_pattern_set.html.markdown,d/wafv2_ip_set.html.markdown,d/wafregional_web_acl.html.markdown,d/wafregional_subscribed_rule_group.html.markdown,d/wafregional_rule.html.markdown,d/wafregional_rate_based_rule.html.markdown,d/wafregional_ipset.html.markdown,d/waf_web_acl.html.markdown,d/waf_subscribed_rule_group.html.markdown,d/waf_rule.html.markdown,d/waf_rate_based_rule.html.markdown,d/waf_ipset.html.markdown,d/vpn_gateway.html.markdown,d/vpcs.html.markdown,d/vpclattice_service_network.html.markdown,d/vpclattice_service.html.markdown,d/vpclattice_resource_policy.html.markdown,d/vpclattice_listener.html.markdown,d/vpclattice_auth_policy.html.markdown,d/vpc_security_group_rules.html.markdown,d/vpc_security_group_rule.html.markdown,d/vpc_peering_connections.html.markdown,d/vpc_peering_connection.html.markdown,d/vpc_ipams.html.markdown,d/vpc_ipam_preview_next_cidr.html.markdown,d/vpc_ipam_pools.html.markdown,d/vpc_ipam_pool_cidrs.html.markdown,d/vpc_ipam_pool.html.markdown,d/vpc_ipam.html.markdown,d/vpc_endpoint_service.html.markdown,d/vpc_endpoint_associations.html.markdown,d/vpc_endpoint.html.markdown,d/vpc_dhcp_options.html.markdown,d/vpc.html.markdown,d/verifiedpermissions_policy_store.html.markdown,d/transfer_server.html.markdown,d/transfer_connector.html.markdown,d/timestreamwrite_table.html.markdown,d/timestreamwrite_database.html.markdown,d/synthetics_runtime_versions.html.markdown,d/synthetics_runtime_version.html.markdown,d/subnets.html.markdown,d/subnet.html.markdown,d/storagegateway_local_disk.html.markdown,d/ssoadmin_principal_application_assignments.html.markdown,d/ssoadmin_permission_sets.html.markdown,d/ssoadmin_permission_set.html.markdown,d/ssoadmin_instances.html.markdown,d/ssoadmin_application_providers.html.markdown,d/ssoadmin_application_assignments.html.markdown,d/ssoadmin_application.html.markdown,d/ssmincidents_response_plan.html.markdown,d/ssmincidents_replication_set.html.markdown,d/ssmcontacts_rotation.html.markdown,d/ssmcontacts_plan.html.markdown,d/ssmcontacts_contact_channel.html.markdown,d/ssmcontacts_contact.html.markdown,d/ssm_patch_baselines.html.markdown,d/ssm_patch_baseline.html.markdown,d/ssm_parameters_by_path.html.markdown,d/ssm_parameter.html.markdown,d/ssm_maintenance_windows.html.markdown,d/ssm_instances.html.markdown,d/ssm_document.html.markdown,d/sqs_queues.html.markdown,d/sqs_queue.html.markdown,d/spot_datafeed_subscription.html.markdown,d/sns_topic.html.markdown,d/signer_signing_profile.html.markdown,d/signer_signing_job.html.markdown,d/shield_protection.html.markdown,d/sfn_state_machine_versions.html.markdown,d/sfn_state_machine.html.markdown,d/sfn_alias.html.markdown,d/sfn_activity.html.markdown,d/sesv2_email_identity_mail_from_attributes.html.markdown,d/sesv2_email_identity.html.markdown,d/sesv2_dedicated_ip_pool.html.markdown,d/sesv2_configuration_set.html.markdown,d/ses_email_identity.html.markdown,d/ses_domain_identity.html.markdown,d/ses_active_receipt_rule_set.html.markdown,d/servicequotas_templates.html.markdown,d/servicequotas_service_quota.html.markdown,d/servicequotas_service.html.markdown,d/servicecatalogappregistry_attribute_group_associations.html.markdown,d/servicecatalogappregistry_attribute_group.html.markdown,d/servicecatalogappregistry_application.html.markdown,d/servicecatalog_provisioning_artifacts.html.markdown,d/servicecatalog_product.html.markdown,d/servicecatalog_portfolio_constraints.html.markdown,d/servicecatalog_portfolio.html.markdown,d/servicecatalog_launch_paths.html.markdown,d/servicecatalog_constraint.html.markdown,d/service_principal.html.markdown,d/service_discovery_service.html.markdown,d/service_discovery_http_namespace.html.markdown,d/service_discovery_dns_namespace.html.markdown,d/service.html.markdown,d/serverlessapplicationrepository_application.html.markdown,d/securityhub_standards_control_associations.html.markdown,d/security_groups.html.markdown,d/security_group.html.markdown,d/secretsmanager_secrets.html.markdown,d/secretsmanager_secret_versions.html.markdown,d/secretsmanager_secret_version.html.markdown,d/secretsmanager_secret_rotation.html.markdown,d/secretsmanager_secret.html.markdown,d/secretsmanager_random_password.html.markdown,d/sagemaker_prebuilt_ecr_image.html.markdown,d/s3control_multi_region_access_point.html.markdown,d/s3_objects.html.markdown,d/s3_object.html.markdown,d/s3_directory_buckets.html.markdown,d/s3_bucket_policy.html.markdown,d/s3_bucket_objects.html.markdown,d/s3_bucket_object.html.markdown,d/s3_bucket.html.markdown,d/s3_account_public_access_block.html.markdown,d/s3_access_point.html.markdown,d/route_tables.html.markdown,d/route_table.html.markdown,d/route53profiles_profiles.html.markdown,d/route53_zones.html.markdown,d/route53_zone.html.markdown,d/route53_traffic_policy_document.html.markdown,d/route53_resolver_rules.html.markdown,d/route53_resolver_rule.html.markdown,d/route53_resolver_query_log_config.html.markdown,d/route53_resolver_firewall_rules.html.markdown,d/route53_resolver_firewall_rule_group_association.html.markdown,d/route53_resolver_firewall_rule_group.html.markdown,d/route53_resolver_firewall_domain_list.html.markdown,d/route53_resolver_firewall_config.html.markdown,d/route53_resolver_endpoint.html.markdown,d/route53_records.html.markdown,d/route53_delegation_set.html.markdown,d/route.html.markdown,d/resourcegroupstaggingapi_resources.html.markdown,d/resourceexplorer2_search.html.markdown,d/regions.html.markdown,d/region.html.markdown,d/redshiftserverless_workgroup.html.markdown,d/redshiftserverless_namespace.html.markdown,d/redshiftserverless_credentials.html.markdown,d/redshift_subnet_group.html.markdown,d/redshift_producer_data_shares.html.markdown,d/redshift_orderable_cluster.html.markdown,d/redshift_data_shares.html.markdown,d/redshift_cluster_credentials.html.markdown,d/redshift_cluster.html.markdown,d/rds_reserved_instance_offering.html.markdown,d/rds_orderable_db_instance.html.markdown,d/rds_engine_version.html.markdown,d/rds_clusters.html.markdown,d/rds_cluster_parameter_group.html.markdown,d/rds_cluster.html.markdown,d/rds_certificate.html.markdown,d/ram_resource_share.html.markdown,d/quicksight_user.html.markdown,d/quicksight_theme.html.markdown,d/quicksight_group.html.markdown,d/quicksight_data_set.html.markdown,d/quicksight_analysis.html.markdown,d/qldb_ledger.html.markdown,d/prometheus_workspaces.html.markdown,d/prometheus_workspace.html.markdown,d/prometheus_default_scraper_configuration.html.markdown,d/pricing_product.html.markdown,d/prefix_list.html.markdown,d/polly_voices.html.markdown,d/partition.html.markdown,d/outposts_sites.html.markdown,d/outposts_site.html.markdown,d/outposts_outposts.html.markdown,d/outposts_outpost_instance_types.html.markdown,d/outposts_outpost_instance_type.html.markdown,d/outposts_outpost.html.markdown,d/outposts_assets.html.markdown,d/outposts_asset.html.markdown,d/organizations_resource_tags.html.markdown,d/organizations_policy.html.markdown,d/organizations_policies_for_target.html.markdown,d/organizations_policies.html.markdown,d/organizations_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_accounts.html.markdown,d/organizations_organizational_unit_child_accounts.html.markdown,d/organizations_organizational_unit.html.markdown,d/organizations_organization.html.markdown,d/organizations_delegated_services.html.markdown,d/organizations_delegated_administrators.html.markdown,d/opensearchserverless_vpc_endpoint.html.markdown,d/opensearchserverless_security_policy.html.markdown,d/opensearchserverless_security_config.html.markdown,d/opensearchserverless_lifecycle_policy.html.markdown,d/opensearchserverless_collection.html.markdown,d/opensearchserverless_access_policy.html.markdown,d/opensearch_domain.html.markdown,d/oam_sinks.html.markdown,d/oam_sink.html.markdown,d/oam_links.html.markdown,d/oam_link.html.markdown,d/networkmanager_sites.html.markdown,d/networkmanager_site.html.markdown,d/networkmanager_links.html.markdown,d/networkmanager_link.html.markdown,d/networkmanager_global_networks.html.markdown,d/networkmanager_global_network.html.markdown,d/networkmanager_devices.html.markdown,d/networkmanager_device.html.markdown,d/networkmanager_core_network_policy_document.html.markdown,d/networkmanager_connections.html.markdown,d/networkmanager_connection.html.markdown,d/networkfirewall_resource_policy.html.markdown,d/networkfirewall_firewall_policy.html.markdown,d/networkfirewall_firewall.html.markdown,d/network_interfaces.html.markdown,d/network_interface.html.markdown,d/network_acls.html.markdown,d/neptune_orderable_db_instance.html.markdown,d/neptune_engine_version.html.markdown,d/nat_gateways.html.markdown,d/nat_gateway.html.markdown,d/mskconnect_worker_configuration.html.markdown,d/mskconnect_custom_plugin.html.markdown,d/mskconnect_connector.html.markdown,d/msk_vpc_connection.html.markdown,d/msk_kafka_version.html.markdown,d/msk_configuration.html.markdown,d/msk_cluster.html.markdown,d/msk_broker_nodes.html.markdown,d/msk_bootstrap_brokers.html.markdown,d/mq_broker_instance_type_offerings.html.markdown,d/mq_broker_engine_types.html.markdown,d/mq_broker.html.markdown,d/memorydb_user.html.markdown,d/memorydb_subnet_group.html.markdown,d/memorydb_snapshot.html.markdown,d/memorydb_parameter_group.html.markdown,d/memorydb_cluster.html.markdown,d/memorydb_acl.html.markdown,d/medialive_input.html.markdown,d/media_convert_queue.html.markdown,d/location_tracker_associations.html.markdown,d/location_tracker_association.html.markdown,d/location_tracker.html.markdown,d/location_route_calculator.html.markdown,d/location_place_index.html.markdown,d/location_map.html.markdown,d/location_geofence_collection.html.markdown,d/licensemanager_received_licenses.html.markdown,d/licensemanager_received_license.html.markdown,d/licensemanager_grants.html.markdown,d/lex_slot_type.html.markdown,d/lex_intent.html.markdown,d/lex_bot_alias.html.markdown,d/lex_bot.html.markdown,d/lbs.html.markdown,d/lb_trust_store.html.markdown,d/lb_target_group.html.markdown,d/lb_listener_rule.html.markdown,d/lb_listener.html.markdown,d/lb_hosted_zone_id.html.markdown,d/lb.html.markdown,d/launch_template.html.markdown,d/launch_configuration.html.markdown,d/lambda_layer_version.html.markdown,d/lambda_invocation.html.markdown,d/lambda_functions.html.markdown,d/lambda_function_url.html.markdown,d/lambda_function.html.markdown,d/lambda_code_signing_config.html.markdown,d/lambda_alias.html.markdown,d/lakeformation_resource.html.markdown,d/lakeformation_permissions.html.markdown,d/lakeformation_data_lake_settings.html.markdown,d/kms_secrets.html.markdown,d/kms_secret.html.markdown,d/kms_public_key.html.markdown,d/kms_key.html.markdown,d/kms_custom_key_store.html.markdown,d/kms_ciphertext.html.markdown,d/kms_alias.html.markdown,d/kinesis_stream_consumer.html.markdown,d/kinesis_stream.html.markdown,d/kinesis_firehose_delivery_stream.html.markdown,d/key_pair.html.markdown,d/kendra_thesaurus.html.markdown,d/kendra_query_suggestions_block_list.html.markdown,d/kendra_index.html.markdown,d/kendra_faq.html.markdown,d/kendra_experience.html.markdown,d/ivs_stream_key.html.markdown,d/ip_ranges.html.markdown,d/iot_registration_code.html.markdown,d/iot_endpoint.html.markdown,d/internet_gateway.html.markdown,d/instances.html.markdown,d/instance.html.markdown,d/inspector_rules_packages.html.markdown,d/imagebuilder_infrastructure_configurations.html.markdown,d/imagebuilder_infrastructure_configuration.html.markdown,d/imagebuilder_image_recipes.html.markdown,d/imagebuilder_image_recipe.html.markdown,d/imagebuilder_image_pipelines.html.markdown,d/imagebuilder_image_pipeline.html.markdown,d/imagebuilder_image.html.markdown,d/imagebuilder_distribution_configurations.html.markdown,d/imagebuilder_distribution_configuration.html.markdown,d/imagebuilder_container_recipes.html.markdown,d/imagebuilder_container_recipe.html.markdown,d/imagebuilder_components.html.markdown,d/imagebuilder_component.html.markdown,d/identitystore_users.html.markdown,d/identitystore_user.html.markdown,d/identitystore_groups.html.markdown,d/identitystore_group_memberships.html.markdown,d/identitystore_group.html.markdown,d/iam_users.html.markdown,d/iam_user_ssh_key.html.markdown,d/iam_user.html.markdown,d/iam_session_context.html.markdown,d/iam_server_certificate.html.markdown,d/iam_saml_provider.html.markdown,d/iam_roles.html.markdown,d/iam_role.html.markdown,d/iam_principal_policy_simulation.html.markdown,d/iam_policy_document.html.markdown,d/iam_policy.html.markdown,d/iam_openid_connect_provider.html.markdown,d/iam_instance_profiles.html.markdown,d/iam_instance_profile.html.markdown,d/iam_group.html.markdown,d/iam_account_alias.html.markdown,d/iam_access_keys.html.markdown,d/guardduty_finding_ids.html.markdown,d/guardduty_detector.html.markdown,d/grafana_workspace.html.markdown,d/glue_script.html.markdown,d/glue_registry.html.markdown,d/glue_data_catalog_encryption_settings.html.markdown,d/glue_connection.html.markdown,d/glue_catalog_table.html.markdown,d/globalaccelerator_custom_routing_accelerator.html.markdown,d/globalaccelerator_accelerator.html.markdown,d/fsx_windows_file_system.html.markdown,d/fsx_openzfs_snapshot.html.markdown,d/fsx_ontap_storage_virtual_machines.html.markdown,d/fsx_ontap_storage_virtual_machine.html.markdown,d/fsx_ontap_file_system.html.markdown,d/fis_experiment_templates.html.markdown,d/emrcontainers_virtual_cluster.html.markdown,d/emr_supported_instance_types.html.markdown,d/emr_release_labels.html.markdown,d/elb_service_account.html.markdown,d/elb_hosted_zone_id.html.markdown,d/elb.html.markdown,d/elasticsearch_domain.html.markdown,d/elasticache_user.html.markdown,d/elasticache_subnet_group.html.markdown,d/elasticache_serverless_cache.html.markdown,d/elasticache_reserved_cache_node_offering.html.markdown,d/elasticache_replication_group.html.markdown,d/elasticache_cluster.html.markdown,d/elastic_beanstalk_solution_stack.html.markdown,d/elastic_beanstalk_hosted_zone.html.markdown,d/elastic_beanstalk_application.html.markdown,d/eks_node_groups.html.markdown,d/eks_node_group.html.markdown,d/eks_clusters.html.markdown,d/eks_cluster_versions.html.markdown,d/eks_cluster_auth.html.markdown,d/eks_cluster.html.markdown,d/eks_addon_version.html.markdown,d/eks_addon.html.markdown,d/eks_access_entry.html.markdown,d/eips.html.markdown,d/eip.html.markdown,d/efs_mount_target.html.markdown,d/efs_file_system.html.markdown,d/efs_access_points.html.markdown,d/efs_access_point.html.markdown,d/ecs_task_execution.html.markdown,d/ecs_task_definition.html.markdown,d/ecs_service.html.markdown,d/ecs_container_definition.html.markdown,d/ecs_clusters.html.markdown,d/ecs_cluster.html.markdown,d/ecrpublic_authorization_token.html.markdown,d/ecr_repository_creation_template.html.markdown,d/ecr_repository.html.markdown,d/ecr_repositories.html.markdown,d/ecr_pull_through_cache_rule.html.markdown,d/ecr_lifecycle_policy_document.html.markdown,d/ecr_images.html.markdown,d/ecr_image.html.markdown,d/ecr_authorization_token.html.markdown,d/ec2_transit_gateway_vpn_attachment.html.markdown,d/ec2_transit_gateway_vpc_attachments.html.markdown,d/ec2_transit_gateway_vpc_attachment.html.markdown,d/ec2_transit_gateway_route_tables.html.markdown,d/ec2_transit_gateway_route_table_routes.html.markdown,d/ec2_transit_gateway_route_table_propagations.html.markdown,d/ec2_transit_gateway_route_table_associations.html.markdown,d/ec2_transit_gateway_route_table.html.markdown,d/ec2_transit_gateway_peering_attachments.html.markdown,d/ec2_transit_gateway_peering_attachment.html.markdown,d/ec2_transit_gateway_multicast_domain.html.markdown,d/ec2_transit_gateway_dx_gateway_attachment.html.markdown,d/ec2_transit_gateway_connect_peer.html.markdown,d/ec2_transit_gateway_connect.html.markdown,d/ec2_transit_gateway_attachments.html.markdown,d/ec2_transit_gateway_attachment.html.markdown,d/ec2_transit_gateway.html.markdown,d/ec2_spot_price.html.markdown,d/ec2_serial_console_access.html.markdown,d/ec2_public_ipv4_pools.html.markdown,d/ec2_public_ipv4_pool.html.markdown,d/ec2_network_insights_path.html.markdown,d/ec2_network_insights_analysis.html.markdown,d/ec2_managed_prefix_lists.html.markdown,d/ec2_managed_prefix_list.html.markdown,d/ec2_local_gateways.html.markdown,d/ec2_local_gateway_virtual_interface_groups.html.markdown,d/ec2_local_gateway_virtual_interface_group.html.markdown,d/ec2_local_gateway_virtual_interface.html.markdown,d/ec2_local_gateway_route_tables.html.markdown,d/ec2_local_gateway_route_table.html.markdown,d/ec2_local_gateway.html.markdown,d/ec2_instance_types.html.markdown,d/ec2_instance_type_offerings.html.markdown,d/ec2_instance_type_offering.html.markdown,d/ec2_instance_type.html.markdown,d/ec2_host.html.markdown,d/ec2_coip_pools.html.markdown,d/ec2_coip_pool.html.markdown,d/ec2_client_vpn_endpoint.html.markdown,d/ec2_capacity_block_offering.html.markdown,d/ebs_volumes.html.markdown,d/ebs_volume.html.markdown,d/ebs_snapshot_ids.html.markdown,d/ebs_snapshot.html.markdown,d/ebs_encryption_by_default.html.markdown,d/ebs_default_kms_key.html.markdown,d/dynamodb_tables.html.markdown,d/dynamodb_table_item.html.markdown,d/dynamodb_table.html.markdown,d/dx_router_configuration.html.markdown,d/dx_locations.html.markdown,d/dx_location.html.markdown,d/dx_gateway.html.markdown,d/dx_connection.html.markdown,d/docdb_orderable_db_instance.html.markdown,d/docdb_engine_version.html.markdown,d/dms_replication_task.html.markdown,d/dms_replication_subnet_group.html.markdown,d/dms_replication_instance.html.markdown,d/dms_endpoint.html.markdown,d/dms_certificate.html.markdown,d/directory_service_directory.html.markdown,d/devopsguru_resource_collection.html.markdown,d/devopsguru_notification_channel.html.markdown,d/default_tags.html.markdown,d/db_subnet_group.html.markdown,d/db_snapshot.html.markdown,d/db_proxy.html.markdown,d/db_parameter_group.html.markdown,d/db_instances.html.markdown,d/db_instance.html.markdown,d/db_event_categories.html.markdown,d/db_cluster_snapshot.html.markdown,d/datazone_environment_blueprint.html.markdown,d/datazone_domain.html.markdown,d/datapipeline_pipeline_definition.html.markdown,d/datapipeline_pipeline.html.markdown,d/customer_gateway.html.markdown,d/cur_report_definition.html.markdown,d/controltower_controls.html.markdown,d/connect_vocabulary.html.markdown,d/connect_user_hierarchy_structure.html.markdown,d/connect_user_hierarchy_group.html.markdown,d/connect_user.html.markdown,d/connect_security_profile.html.markdown,d/connect_routing_profile.html.markdown,d/connect_quick_connect.html.markdown,d/connect_queue.html.markdown,d/connect_prompt.html.markdown,d/connect_lambda_function_association.html.markdown,d/connect_instance_storage_config.html.markdown,d/connect_instance.html.markdown,d/connect_hours_of_operation.html.markdown,d/connect_contact_flow_module.html.markdown,d/connect_contact_flow.html.markdown,d/connect_bot_association.html.markdown,d/cognito_user_pools.html.markdown,d/cognito_user_pool_signing_certificate.html.markdown,d/cognito_user_pool_clients.html.markdown,d/cognito_user_pool_client.html.markdown,d/cognito_user_pool.html.markdown,d/cognito_user_groups.html.markdown,d/cognito_user_group.html.markdown,d/cognito_identity_pool.html.markdown,d/codestarconnections_connection.html.markdown,d/codeguruprofiler_profiling_group.html.markdown,d/codecommit_repository.html.markdown,d/codecommit_approval_rule_template.html.markdown,d/codecatalyst_dev_environment.html.markdown,d/codebuild_fleet.html.markdown,d/codeartifact_repository_endpoint.html.markdown,d/codeartifact_authorization_token.html.markdown,d/cloudwatch_log_groups.html.markdown,d/cloudwatch_log_group.html.markdown,d/cloudwatch_log_data_protection_policy_document.html.markdown,d/cloudwatch_event_source.html.markdown,d/cloudwatch_event_connection.html.markdown,d/cloudwatch_event_buses.html.markdown,d/cloudwatch_event_bus.html.markdown,d/cloudwatch_contributor_managed_insight_rules.html.markdown,d/cloudtrail_service_account.html.markdown,d/cloudhsm_v2_cluster.html.markdown,d/cloudfront_response_headers_policy.html.markdown,d/cloudfront_realtime_log_config.html.markdown,d/cloudfront_origin_request_policy.html.markdown,d/cloudfront_origin_access_identity.html.markdown,d/cloudfront_origin_access_identities.html.markdown,d/cloudfront_origin_access_control.html.markdown,d/cloudfront_log_delivery_canonical_user_id.html.markdown,d/cloudfront_function.html.markdown,d/cloudfront_distribution.html.markdown,d/cloudfront_cache_policy.html.markdown,d/cloudformation_type.html.markdown,d/cloudformation_stack.html.markdown,d/cloudformation_export.html.markdown,d/cloudcontrolapi_resource.html.markdown,d/chatbot_slack_workspace.html.markdown,d/ce_tags.html.markdown,d/ce_cost_category.html.markdown,d/canonical_user_id.html.markdown,d/caller_identity.html.markdown,d/budgets_budget.html.markdown,d/billing_service_account.html.markdown,d/bedrockagent_agent_versions.html.markdown,d/bedrock_inference_profiles.html.markdown,d/bedrock_inference_profile.html.markdown,d/bedrock_foundation_models.html.markdown,d/bedrock_foundation_model.html.markdown,d/bedrock_custom_models.html.markdown,d/bedrock_custom_model.html.markdown,d/batch_scheduling_policy.html.markdown,d/batch_job_queue.html.markdown,d/batch_job_definition.html.markdown,d/batch_compute_environment.html.markdown,d/backup_vault.html.markdown,d/backup_selection.html.markdown,d/backup_report_plan.html.markdown,d/backup_plan.html.markdown,d/backup_framework.html.markdown,d/availability_zones.html.markdown,d/availability_zone.html.markdown,d/autoscaling_groups.html.markdown,d/autoscaling_group.html.markdown,d/auditmanager_framework.html.markdown,d/auditmanager_control.html.markdown,d/athena_named_query.html.markdown,d/arn.html.markdown,d/appstream_image.html.markdown,d/apprunner_hosted_zone_id.html.markdown,d/appmesh_virtual_service.html.markdown,d/appmesh_virtual_router.html.markdown,d/appmesh_virtual_node.html.markdown,d/appmesh_virtual_gateway.html.markdown,d/appmesh_route.html.markdown,d/appmesh_mesh.html.markdown,d/appmesh_gateway_route.html.markdown,d/appintegrations_event_integration.html.markdown,d/appconfig_environments.html.markdown,d/appconfig_environment.html.markdown,d/appconfig_configuration_profiles.html.markdown,d/appconfig_configuration_profile.html.markdown,d/apigatewayv2_vpc_link.html.markdown,d/apigatewayv2_export.html.markdown,d/apigatewayv2_apis.html.markdown,d/apigatewayv2_api.html.markdown,d/api_gateway_vpc_link.html.markdown,d/api_gateway_sdk.html.markdown,d/api_gateway_rest_api.html.markdown,d/api_gateway_resource.html.markdown,d/api_gateway_export.html.markdown,d/api_gateway_domain_name.html.markdown,d/api_gateway_authorizers.html.markdown,d/api_gateway_authorizer.html.markdown,d/api_gateway_api_keys.html.markdown,d/api_gateway_api_key.html.markdown,d/ami_ids.html.markdown,d/ami.html.markdown,d/acmpca_certificate_authority.html.markdown,d/acmpca_certificate.html.markdown,d/acm_certificate.html.markdown,d/account_primary_contact.html.markdown --- .../python/d/glue_catalog_table.html.markdown | 3 +- .../python/d/network_interface.html.markdown | 13 ++- ...s_reserved_instance_offering.html.markdown | 4 +- .../d/signer_signing_profile.html.markdown | 5 +- .../cdktf/python/d/vpc_ipam.html.markdown | 3 +- website/docs/cdktf/python/index.html.markdown | 4 +- .../r/bcmdataexports_export.html.markdown | 13 ++- .../python/r/cognito_user_pool.html.markdown | 10 +-- .../r/dlm_lifecycle_policy.html.markdown | 4 +- .../python/r/glue_catalog_table.html.markdown | 3 +- .../cdktf/python/r/glue_job.html.markdown | 19 ++--- .../python/r/inspector2_filter.html.markdown | 6 +- .../cdktf/python/r/instance.html.markdown | 45 ++++++---- ...t_thing_principal_attachment.html.markdown | 3 +- .../python/r/mwaa_environment.html.markdown | 7 +- .../python/r/network_interface.html.markdown | 3 +- ...network_interface_attachment.html.markdown | 3 +- .../python/r/s3_bucket_logging.html.markdown | 73 +++++++++++++++- ...ration_set_event_destination.html.markdown | 8 +- .../r/signer_signing_profile.html.markdown | 3 +- .../r/spot_instance_request.html.markdown | 13 +-- .../python/r/synthetics_canary.html.markdown | 3 +- .../cdktf/python/r/vpc_endpoint.html.markdown | 4 +- .../cdktf/python/r/vpc_ipam.html.markdown | 3 +- .../d/glue_catalog_table.html.markdown | 3 +- .../d/network_interface.html.markdown | 13 ++- ...s_reserved_instance_offering.html.markdown | 4 +- .../d/signer_signing_profile.html.markdown | 5 +- .../cdktf/typescript/d/vpc_ipam.html.markdown | 3 +- .../docs/cdktf/typescript/index.html.markdown | 4 +- .../r/bcmdataexports_export.html.markdown | 18 +++- .../r/cognito_user_pool.html.markdown | 10 +-- .../r/dlm_lifecycle_policy.html.markdown | 4 +- .../r/glue_catalog_table.html.markdown | 3 +- .../cdktf/typescript/r/glue_job.html.markdown | 19 ++--- .../r/inspector2_filter.html.markdown | 6 +- .../cdktf/typescript/r/instance.html.markdown | 48 +++++++---- ...t_thing_principal_attachment.html.markdown | 3 +- .../r/mwaa_environment.html.markdown | 7 +- .../r/network_interface.html.markdown | 3 +- ...network_interface_attachment.html.markdown | 3 +- .../r/s3_bucket_logging.html.markdown | 83 ++++++++++++++++++- ...ration_set_event_destination.html.markdown | 8 +- .../r/signer_signing_profile.html.markdown | 3 +- .../r/spot_instance_request.html.markdown | 13 +-- .../r/synthetics_canary.html.markdown | 3 +- .../typescript/r/vpc_endpoint.html.markdown | 4 +- .../cdktf/typescript/r/vpc_ipam.html.markdown | 3 +- 48 files changed, 378 insertions(+), 150 deletions(-) diff --git a/website/docs/cdktf/python/d/glue_catalog_table.html.markdown b/website/docs/cdktf/python/d/glue_catalog_table.html.markdown index 9de67af745fe..558a02cf2929 100644 --- a/website/docs/cdktf/python/d/glue_catalog_table.html.markdown +++ b/website/docs/cdktf/python/d/glue_catalog_table.html.markdown @@ -70,6 +70,7 @@ This data source exports the following attributes in addition to the arguments a * `comment` - Free-form text comment. * `name` - Name of the Partition Key. +* `parameters` - Map of key-value pairs. * `type` - Datatype of data in the Partition Key. ### storage_descriptor @@ -132,4 +133,4 @@ This data source exports the following attributes in addition to the arguments a * `name` - Name of the target table. * `region` - Region of the target table. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/network_interface.html.markdown b/website/docs/cdktf/python/d/network_interface.html.markdown index e82708022bfc..a31d42efda6b 100644 --- a/website/docs/cdktf/python/d/network_interface.html.markdown +++ b/website/docs/cdktf/python/d/network_interface.html.markdown @@ -44,7 +44,8 @@ This data source supports the following arguments: This data source exports the following attributes in addition to the arguments above: * `arn` - ARN of the network interface. -* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See supported fields below. +* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See [association](#association) below. +* `attachment` - Attachment of the ENI. See [attachment](#attachment) below. * `availability_zone` - Availability Zone. * `description` - Description of the network interface. * `interface_type` - Type of interface. @@ -71,10 +72,18 @@ This data source exports the following attributes in addition to the arguments a * `public_dns_name` - Public DNS name. * `public_ip` - Address of the Elastic IP address bound to the network interface. +### `attachment` + +* `attachment_id` - ID of the network interface attachment. +* `device_index` - Device index of the network interface attachment on the instance. +* `instance_id` - ID of the instance. +* `instance_owner_id` - AWS account ID of the owner of the instance. +* `network_card_index` - Index of the network card. + ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): - `read` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/rds_reserved_instance_offering.html.markdown b/website/docs/cdktf/python/d/rds_reserved_instance_offering.html.markdown index 7dbe186a9338..a556aedfe959 100644 --- a/website/docs/cdktf/python/d/rds_reserved_instance_offering.html.markdown +++ b/website/docs/cdktf/python/d/rds_reserved_instance_offering.html.markdown @@ -44,7 +44,7 @@ This data source supports the following arguments: * `duration` - (Required) Duration of the reservation in years or seconds. Valid values are `1`, `3`, `31536000`, `94608000` * `multi_az` - (Required) Whether the reservation applies to Multi-AZ deployments. * `offering_type` - (Required) Offering type of this reserved DB instance. Valid values are `No Upfront`, `Partial Upfront`, `All Upfront`. -* `product_description` - (Required) Description of the reserved DB instance. +* `product_description` - (Required) Description of the reserved DB instance. Example values are `postgresql`, `aurora-postgresql`, `mysql`, `aurora-mysql`, `mariadb`. ## Attribute Reference @@ -55,4 +55,4 @@ This data source exports the following attributes in addition to the arguments a * `fixed_price` - Fixed price charged for this reserved DB instance. * `offering_id` - Unique identifier for the reservation. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/signer_signing_profile.html.markdown b/website/docs/cdktf/python/d/signer_signing_profile.html.markdown index ac5fb3c72747..49a1299c792d 100644 --- a/website/docs/cdktf/python/d/signer_signing_profile.html.markdown +++ b/website/docs/cdktf/python/d/signer_signing_profile.html.markdown @@ -47,9 +47,12 @@ This data source exports the following attributes in addition to the arguments a * `platform_id` - ID of the platform that is used by the target signing profile. * `revocation_record` - Revocation information for a signing profile. * `signature_validity_period` - The validity period for a signing job. +* `signing_material` - AWS Certificate Manager certificate that will be used to sign code with the new signing profile. + * `certificate_arn` - ARN of the certificate used for signing. +* `signing_parameters` - Map of key-value pairs for signing. * `status` - Status of the target signing profile. * `tags` - List of tags associated with the signing profile. * `version` - Current version of the signing profile. * `version_arn` - Signing profile ARN, including the profile version. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/vpc_ipam.html.markdown b/website/docs/cdktf/python/d/vpc_ipam.html.markdown index 31f088f23689..a2371aacb4bc 100644 --- a/website/docs/cdktf/python/d/vpc_ipam.html.markdown +++ b/website/docs/cdktf/python/d/vpc_ipam.html.markdown @@ -51,6 +51,7 @@ This data source exports the following attributes in addition to the arguments a * `enable_private_gua` - If private GUA is enabled. * `id` - ID of the IPAM resource. * `ipam_region` - Region that the IPAM exists in. +* `metered_account` - AWS account that is charged for active IP addresses managed in IPAM. * `operating_regions` - Regions that the IPAM is configured to operate in. * `owner_id` - ID of the account that owns this IPAM. * `private_default_scope_id` - ID of the default private scope. @@ -62,4 +63,4 @@ This data source exports the following attributes in addition to the arguments a * `tier` - IPAM Tier. * `tags` - Tags of the IPAM resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/index.html.markdown b/website/docs/cdktf/python/index.html.markdown index 1c3f10786f63..4b061487e164 100644 --- a/website/docs/cdktf/python/index.html.markdown +++ b/website/docs/cdktf/python/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,514 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -897,4 +897,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown b/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown index d21188665286..7e54a10d52ef 100644 --- a/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown +++ b/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown @@ -25,15 +25,22 @@ from cdktf import Token, TerraformStack # See https://cdk.tf/provider-generation for more details. # from imports.aws.bcmdataexports_export import BcmdataexportsExport +from imports.aws.data_aws_caller_identity import DataAwsCallerIdentity +from imports.aws.data_aws_partition import DataAwsPartition class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) + current = DataAwsCallerIdentity(self, "current") + data_aws_partition_current = DataAwsPartition(self, "current_1") + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_partition_current.override_logical_id("current") BcmdataexportsExport(self, "test", export=[BcmdataexportsExportExport( data_query=[BcmdataexportsExportExportDataQuery( query_statement="SELECT identity_line_item_id, identity_time_interval, line_item_product_code,line_item_unblended_cost FROM COST_AND_USAGE_REPORT", table_configurations={ "COST_AND_USAGE_REPORT": { + "BILLING_VIEW_ARN": "arn:${" + data_aws_partition_current.partition + "}:billing::${" + current.account_id + "}:billingview/primary", "INCLUDE_MANUAL_DISCOUNT_COMPATIBILITY": "FALSE", "INCLUDE_RESOURCES": "FALSE", "INCLUDE_SPLIT_COST_ALLOCATION_DATA": "FALSE", @@ -84,8 +91,8 @@ The following arguments are required: ### `data_query` Argument Reference -* `query_statement` - (Required) Query statement. -* `table_configurations` - (Optional) Table configuration. +* `query_statement` - (Required) Query statement. The SQL table name for CUR 2.0 is `COST_AND_USAGE_REPORT`. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html) for a list of available columns. +* `table_configurations` - (Optional) Table configuration. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html#cur2-table-configurations) for the available configurations. In addition to those listed in the documentation, `BILLING_VIEW_ARN` must also be included, as shown in the example above. ### `destination_configurations` Argument Reference @@ -148,4 +155,4 @@ Using `terraform import`, import BCM Data Exports Export using the export ARN. F % terraform import aws_bcmdataexports_export.example arn:aws:bcm-data-exports:us-east-1:123456789012:export/CostUsageReport-9f1c75f3-f982-4d9a-b936-1e7ecab814b7 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/cognito_user_pool.html.markdown b/website/docs/cdktf/python/r/cognito_user_pool.html.markdown index 5b1f544da3a1..147f2338e5d6 100644 --- a/website/docs/cdktf/python/r/cognito_user_pool.html.markdown +++ b/website/docs/cdktf/python/r/cognito_user_pool.html.markdown @@ -104,18 +104,18 @@ This resource supports the following arguments: * `deletion_protection` - (Optional) When active, DeletionProtection prevents accidental deletion of your user pool. Before you can delete a user pool that you have protected against deletion, you must deactivate this feature. Valid values are `ACTIVE` and `INACTIVE`, Default value is `INACTIVE`. * `device_configuration` - (Optional) Configuration block for the user pool's device tracking. [Detailed below](#device_configuration). * `email_configuration` - (Optional) Configuration block for configuring email. [Detailed below](#email_configuration). -* `email_mfa_configuration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `account_recovery_setting` entries; requires an `email_configuration` configuration block. [Detailed below](#email_mfa_configuration). +* `email_mfa_configuration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `account_recovery_setting` entries; requires an `email_configuration` configuration block. Effective only when `mfa_configuration` is `ON` or `OPTIONAL`. [Detailed below](#email_mfa_configuration). * `email_verification_message` - (Optional) String representing the email verification message. Conflicts with `verification_message_template` configuration block `email_message` argument. * `email_verification_subject` - (Optional) String representing the email verification subject. Conflicts with `verification_message_template` configuration block `email_subject` argument. * `lambda_config` - (Optional) Configuration block for the AWS Lambda triggers associated with the user pool. [Detailed below](#lambda_config). -* `mfa_configuration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `sms_configuration` or `software_token_mfa_configuration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `sms_configuration` or `software_token_mfa_configuration` to be configured). +* `mfa_configuration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `email_mfa_configuration`, `sms_configuration` or `software_token_mfa_configuration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `email_mfa_configuration`, `sms_configuration` or `software_token_mfa_configuration` to be configured). * `password_policy` - (Optional) Configuration block for information about the user pool password policy. [Detailed below](#password_policy). * `schema` - (Optional) Configuration block for the schema attributes of a user pool. [Detailed below](#schema). Schema attributes from the [standard attribute set](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-settings-attributes.html#cognito-user-pools-standard-attributes) only need to be specified if they are different from the default configuration. Attributes can be added, but not modified or removed. Maximum of 50 attributes. * `sign_in_policy` - (Optional) Configuration block for information about the user pool sign in policy. [Detailed below](#sign_in_policy). * `sms_authentication_message` - (Optional) String representing the SMS authentication message. The Message must contain the `{####}` placeholder, which will be replaced with the code. -* `sms_configuration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). +* `sms_configuration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). SMS MFA is activated only when `mfa_configuration` is set to `ON` or `OPTIONAL` along with this block. Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). * `sms_verification_message` - (Optional) String representing the SMS verification message. Conflicts with `verification_message_template` configuration block `sms_message` argument. -* `software_token_mfa_configuration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. [Detailed below](#software_token_mfa_configuration). +* `software_token_mfa_configuration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. Effective only when `mfa_configuration` is `ON` or `OPTIONAL`. [Detailed below](#software_token_mfa_configuration). * `tags` - (Optional) Map of tags to assign to the User Pool. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `user_attribute_update_settings` - (Optional) Configuration block for user attribute update settings. [Detailed below](#user_attribute_update_settings). * `user_pool_add_ons` - (Optional) Configuration block for user pool add-ons to enable user pool advanced security mode features. [Detailed below](#user_pool_add_ons). @@ -345,4 +345,4 @@ Using `terraform import`, import Cognito User Pools using the `id`. For example: % terraform import aws_cognito_user_pool.pool us-west-2_abc123 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown b/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown index 30c603dfc9ea..e378f14f5dc1 100644 --- a/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown @@ -251,7 +251,7 @@ This resource supports the following arguments: * `policy_type` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. -* `target_tags` (Optional) A map of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. +* `target_tags` (Optional) A map of tag keys and their values. Any resources that match the `resource_types` and are tagged with _any_ of these tags will be targeted. Required when `policy_type` is `EBS_SNAPSHOT_MANAGEMENT` or `IMAGE_MANAGEMENT`. Must not be specified when `policy_type` is `EVENT_BASED_POLICY`. ~> Note: You cannot have overlapping lifecycle policies that share the same `target_tags`. Terraform is unable to detect this at plan time but it will fail during apply. @@ -385,4 +385,4 @@ Using `terraform import`, import DLM lifecycle policies using their policy ID. F % terraform import aws_dlm_lifecycle_policy.example policy-abcdef12345678901 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/glue_catalog_table.html.markdown b/website/docs/cdktf/python/r/glue_catalog_table.html.markdown index 8b0e3c481583..a2e6559b29f2 100644 --- a/website/docs/cdktf/python/r/glue_catalog_table.html.markdown +++ b/website/docs/cdktf/python/r/glue_catalog_table.html.markdown @@ -143,6 +143,7 @@ To add an index to an existing table, see the [`glue_partition_index` resource]( * `comment` - (Optional) Free-form text comment. * `name` - (Required) Name of the Partition Key. +* `parameters` - (Optional) Map of key-value pairs. * `type` - (Optional) Datatype of data in the Partition Key. ### storage_descriptor @@ -237,4 +238,4 @@ Using `terraform import`, import Glue Tables using the catalog ID (usually AWS a % terraform import aws_glue_catalog_table.MyTable 123456789012:MyDatabase:MyTable ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/glue_job.html.markdown b/website/docs/cdktf/python/r/glue_job.html.markdown index 8e9c66fc31fa..9d59519e862e 100644 --- a/website/docs/cdktf/python/r/glue_job.html.markdown +++ b/website/docs/cdktf/python/r/glue_job.html.markdown @@ -268,36 +268,29 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `command` - (Required) The command of the job. Defined below. * `connections` - (Optional) The list of connections used for this job. * `default_arguments` - (Optional) The map of default arguments for this job. You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes. For information about how to specify and consume your own Job arguments, see the [Calling AWS Glue APIs in Python](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html) topic in the developer guide. For information about the key-value pairs that AWS Glue consumes to set up your job, see the [Special Parameters Used by AWS Glue](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-glue-arguments.html) topic in the developer guide. -* `non_overridable_arguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `description` - (Optional) Description of the job. +* `execution_class` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `execution_property` - (Optional) Execution property of the job. Defined below. * `glue_version` - (Optional) The version of glue to use, for example "1.0". Ray jobs should set this to 4.0 or greater. For information about available versions, see the [AWS Glue Release Notes](https://docs.aws.amazon.com/glue/latest/dg/release-notes.html). * `job_mode` - (Optional) Describes how a job was created. Valid values are `SCRIPT`, `NOTEBOOK` and `VISUAL`. * `job_run_queuing_enabled` - (Optional) Specifies whether job run queuing is enabled for the job runs for this job. A value of true means job run queuing is enabled for the job runs. If false or not populated, the job runs will not be considered for queueing. -* `execution_class` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `maintenance_window` - (Optional) Specifies the day of the week and hour for the maintenance window for streaming jobs. * `max_capacity` - (Optional) The maximum number of AWS Glue data processing units (DPUs) that can be allocated when this job runs. `Required` when `pythonshell` is set, accept either `0.0625` or `1.0`. Use `number_of_workers` and `worker_type` arguments instead with `glue_version` `2.0` and above. * `max_retries` - (Optional) The maximum number of times to retry this job if it fails. * `name` - (Required) The name you assign to this job. It must be unique in your account. +* `non_overridable_arguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `notification_property` - (Optional) Notification property of the job. Defined below. +* `number_of_workers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `role_arn` - (Required) The ARN of the IAM role associated with this job. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) The job timeout in minutes. The default is 2880 minutes (48 hours) for `glueetl` and `pythonshell` jobs, and null (unlimited) for `gluestreaming` jobs. * `security_configuration` - (Optional) The name of the Security Configuration to be associated with the job. * `source_control_details` - (Optional) The details for a source control configuration for a job, allowing synchronization of job artifacts to or from a remote repository. Defined below. -* `worker_type` - (Optional) The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or G.025X for Spark jobs. Accepts the value Z.2X for Ray jobs. - * For the Standard worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker. - * For the G.1X worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.2X worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.4X worker type, each worker maps to 4 DPU (16 vCPUs, 64 GB of memory) with 256GB disk (approximately 235GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.8X worker type, each worker maps to 8 DPU (32 vCPUs, 128 GB of memory) with 512GB disk (approximately 487GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.025X worker type, each worker maps to 0.25 DPU (2 vCPU, 4GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for low volume streaming jobs. Only available for Glue version 3.0. - * For the Z.2X worker type, each worker maps to 2 M-DPU (8vCPU, 64 GB of m emory, 128 GB disk), and provides up to 8 Ray workers based on the autoscaler. -* `number_of_workers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `worker_type` - (Optional) The type of predefined worker that is allocated when a job runs. Valid values: `Standard`, `G.1X`, `G.2X`, `G.025X`, `G.4X`, `G.8X`, `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X`, `Z.2X` (Ray jobs). See the [AWS documentation](https://docs.aws.amazon.com/glue/latest/dg/worker-types.html) for details. ### command Argument Reference @@ -358,4 +351,4 @@ Using `terraform import`, import Glue Jobs using `name`. For example: % terraform import aws_glue_job.MyJob MyJob ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/inspector2_filter.html.markdown b/website/docs/cdktf/python/r/inspector2_filter.html.markdown index dbd52acdddc4..c5d2c9cd0f73 100644 --- a/website/docs/cdktf/python/r/inspector2_filter.html.markdown +++ b/website/docs/cdktf/python/r/inspector2_filter.html.markdown @@ -69,6 +69,8 @@ This resource exports the following attributes in addition to the arguments abov The `filter_criteria` configuration block supports the following attributes: * `aws_account_id` - (Optional) The AWS account ID in which the finding was generated. [Documented below](#string-filter). +* `code_repository_project_name` - (Optional) The project name in a code repository. [Documented below](#string-filter). +* `code_repository_provider_type` - (Optional) The repository provider type (such as GitHub, GitLab, etc.) [Documented below](#string-filter). * `code_vulnerability_detector_name` - (Optional) The ID of the component. [Documented below](#string-filter). * `code_vulnerability_detector_tags` - (Optional) The ID of the component. [Documented below](#string-filter). * `code_vulnerability_file_path` - (Optional) The ID of the component. [Documented below](#string-filter). @@ -78,6 +80,8 @@ The `filter_criteria` configuration block supports the following attributes: * `ec2_instance_subnet_id` - (Optional) The ID of the subnet. [Documented below](#string-filter). * `ec2_instance_vpc_id` - (Optional) The ID of the VPC. [Documented below](#string-filter). * `ecr_image_architecture` - (Optional) The architecture of the ECR image. [Documented below](#string-filter). +* `ecr_image_in_use_count` - (Optional) The number of the ECR images in use. [Documented below](#number-filter). +* `ecr_image_last_in_use_at` - (Optional) The date range when an ECR image was last used in an ECS cluster task or EKS cluster pod. [Documented below](#date-filter). * `ecr_image_hash` - (Optional) The SHA256 hash of the ECR image. [Documented below](#string-filter). * `ecr_image_pushed_at` - (Optional) The date range when the image was pushed. [Documented below](#date-filter). * `ecr_image_registry` - (Optional) The registry of the ECR image. [Documented below](#string-filter). @@ -185,4 +189,4 @@ Using `terraform import`, import Inspector Filter using the `arn`. For example: % terraform import aws_inspector2_filter.example "arn:aws:inspector2:us-east-1:111222333444:owner/111222333444/filter/abcdefgh12345678" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/instance.html.markdown b/website/docs/cdktf/python/r/instance.html.markdown index 58e5160d703a..65c410e5baee 100644 --- a/website/docs/cdktf/python/r/instance.html.markdown +++ b/website/docs/cdktf/python/r/instance.html.markdown @@ -43,7 +43,7 @@ class MyConvertedCode(TerraformStack): most_recent=True, owners=["099720109477"] ) - Instance(self, "web", + Instance(self, "example", ami=Token.as_string(ubuntu.id), instance_type="t3.micro", tags={ @@ -66,7 +66,7 @@ from imports.aws.instance import Instance class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - Instance(self, "web", + Instance(self, "example", ami="resolve:ssm:/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", instance_type="t3.micro", tags={ @@ -90,7 +90,7 @@ from imports.aws.instance import Instance class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - this_var = DataAwsAmi(self, "this", + example = DataAwsAmi(self, "example", filter=[DataAwsAmiFilter( name="architecture", values=["arm64"] @@ -102,8 +102,8 @@ class MyConvertedCode(TerraformStack): most_recent=True, owners=["amazon"] ) - aws_instance_this = Instance(self, "this_1", - ami=Token.as_string(this_var.id), + aws_instance_example = Instance(self, "example_1", + ami=Token.as_string(example.id), instance_market_options=InstanceInstanceMarketOptions( market_type="spot", spot_options=InstanceInstanceMarketOptionsSpotOptions( @@ -116,7 +116,7 @@ class MyConvertedCode(TerraformStack): } ) # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. - aws_instance_this.override_logical_id("this") + aws_instance_example.override_logical_id("example") ``` ### Network and credit specification example @@ -150,27 +150,25 @@ class MyConvertedCode(TerraformStack): }, vpc_id=my_vpc.id ) - foo = NetworkInterface(self, "foo", + example = NetworkInterface(self, "example", private_ips=["172.16.10.100"], subnet_id=my_subnet.id, tags={ "Name": "primary_network_interface" } ) - aws_instance_foo = Instance(self, "foo_3", + aws_instance_example = Instance(self, "example_3", ami="ami-005e54dee72cc1d00", credit_specification=InstanceCreditSpecification( cpu_credits="unlimited" ), instance_type="t2.micro", - network_interface=[InstanceNetworkInterface( - device_index=0, - network_interface_id=foo.id + primary_network_interface=InstancePrimaryNetworkInterface( + network_interface_id=example.id ) - ] ) # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. - aws_instance_foo.override_logical_id("foo") + aws_instance_example.override_logical_id("example") ``` ### CPU options example @@ -303,9 +301,10 @@ This resource supports the following arguments: * `maintenance_options` - (Optional) Maintenance and recovery options for the instance. See [Maintenance Options](#maintenance-options) below for more details. * `metadata_options` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) -* `network_interface` - (Optional) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. +* `network_interface` - (Optional, **Deprecated** to specify the primary network interface, use `primary_network_interface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. * `placement_group` - (Optional) Placement Group to start the instance in. * `placement_partition_number` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. +* `primary_network_interface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `private_dns_name_options` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. * `private_ip` - (Optional) Private IP address to associate with the instance in a VPC. * `root_block_device` - (Optional) Configuration block to customize details about the root block device of the instance. See [Block Devices](#ebs-ephemeral-and-root-block-devices) below for details. When accessing this as an attribute reference, it is a list containing one object. @@ -452,7 +451,11 @@ For more information, see the documentation on the [Instance Metadata Service](h ### Network Interfaces -Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use the `aws_network_interface` or `aws_network_interface_attachment` resources instead. +`network_interface` is **deprecated**. +Use `primary_network_interface` to specify the primary network interface. +To attach additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. + +Each of the `network_interface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources instead. The `network_interface` configuration block _does_, however, allow users to supply their own network interface to be used as the default network interface on an EC2 Instance, attached at `eth0`. @@ -463,6 +466,16 @@ Each `network_interface` block supports the following: * `network_card_index` - (Optional) Integer index of the network card. Limited by instance type. The default index is `0`. * `network_interface_id` - (Required) ID of the network interface to attach. +### Primary Network Interface + +Represents the primary network interface on the EC2 Instance. +To manage additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. + +Each `primary_network_interface` block supports the following: + +* `delete_on_termination` - (Read-Only) Whether the network interface will be deleted when the instance terminates. +* `network_interface_id` - (Required) ID of the network interface to attach. + ### Private DNS Name Options The `private_dns_name_options` block supports the following: @@ -559,4 +572,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/iot_thing_principal_attachment.html.markdown b/website/docs/cdktf/python/r/iot_thing_principal_attachment.html.markdown index 7ff93e225fd5..15dc6d73123d 100644 --- a/website/docs/cdktf/python/r/iot_thing_principal_attachment.html.markdown +++ b/website/docs/cdktf/python/r/iot_thing_principal_attachment.html.markdown @@ -48,9 +48,10 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `principal` - (Required) The AWS IoT Certificate ARN or Amazon Cognito Identity ID. * `thing` - (Required) The name of the thing. +* `thing_principal_type` - (Optional) The type of relationship to specify when attaching a principal to a thing. Valid values are `EXCLUSIVE_THING` (the thing will be the only one attached to the principal) or `NON_EXCLUSIVE_THING` (multiple things can be attached to the principal). Defaults to `NON_EXCLUSIVE_THING`. ## Attribute Reference This resource exports no additional attributes. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/mwaa_environment.html.markdown b/website/docs/cdktf/python/r/mwaa_environment.html.markdown index 4ab48b3f83ea..74332ce7d3ad 100644 --- a/website/docs/cdktf/python/r/mwaa_environment.html.markdown +++ b/website/docs/cdktf/python/r/mwaa_environment.html.markdown @@ -156,7 +156,6 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `airflow_configuration_options` - (Optional) The `airflow_configuration_options` parameter specifies airflow override options. Check the [Official documentation](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-env-variables.html#configuring-env-variables-reference) for all possible configuration options. * `airflow_version` - (Optional) Airflow version of your environment, will be set by default to the latest version that MWAA supports. * `dag_s3_path` - (Required) The relative path to the DAG folder on your Amazon S3 storage bucket. For example, dags. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). @@ -173,15 +172,17 @@ This resource supports the following arguments: * `network_configuration` - (Required) Specifies the network configuration for your Apache Airflow Environment. This includes two private subnets as well as security groups for the Airflow environment. Each subnet requires internet connection, otherwise the deployment will fail. See [`network_configuration` Block](#network_configuration-block) for details. * `plugins_s3_object_version` - (Optional) The plugins.zip file version you want to use. * `plugins_s3_path` - (Optional) The relative path to the plugins.zip file on your Amazon S3 storage bucket. For example, plugins.zip. If a relative path is provided in the request, then plugins_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `requirements_s3_object_version` - (Optional) The requirements.txt file version you want to use. * `requirements_s3_path` - (Optional) The relative path to the requirements.txt file on your Amazon S3 storage bucket. For example, requirements.txt. If a relative path is provided in the request, then requirements_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). * `schedulers` - (Optional) The number of schedulers that you want to run in your environment. v2.0.2 and above accepts `2` - `5`, default `2`. v1.10.12 accepts `1`. * `source_bucket_arn` - (Required) The Amazon Resource Name (ARN) of your Amazon S3 storage bucket. For example, arn:aws:s3:::airflow-mybucketname. * `startup_script_s3_object_version` - (Optional) The version of the startup shell script you want to use. You must specify the version ID that Amazon S3 assigns to the file every time you update the script. * `startup_script_s3_path` - (Optional) The relative path to the script hosted in your bucket. The script runs as your environment starts before starting the Apache Airflow process. Use this script to install dependencies, modify configuration options, and set environment variables. See [Using a startup script](https://docs.aws.amazon.com/mwaa/latest/userguide/using-startup-script.html). Supported for environment versions 2.x and later. +* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `webserver_access_mode` - (Optional) Specifies whether the webserver should be accessible over the internet or via your specified VPC. Possible options: `PRIVATE_ONLY` (default) and `PUBLIC_ONLY`. * `weekly_maintenance_window_start` - (Optional) Specifies the start date for the weekly maintenance window. -* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `worker_replacement_strategy` - (Optional) Worker replacement strategy. Valid values: `FORCED`, `GRACEFUL`. ### `logging_configuration` Block @@ -254,4 +255,4 @@ Using `terraform import`, import MWAA Environment using `Name`. For example: % terraform import aws_mwaa_environment.example MyAirflowEnvironment ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/network_interface.html.markdown b/website/docs/cdktf/python/r/network_interface.html.markdown index cec78b821e44..634677475b53 100644 --- a/website/docs/cdktf/python/r/network_interface.html.markdown +++ b/website/docs/cdktf/python/r/network_interface.html.markdown @@ -90,6 +90,7 @@ The `attachment` block supports the following: * `instance` - (Required) ID of the instance to attach to. * `device_index` - (Required) Integer to define the devices index. +* `network_card_index` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference @@ -127,4 +128,4 @@ Using `terraform import`, import Network Interfaces using the `id`. For example: % terraform import aws_network_interface.test eni-e5aa89a3 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/network_interface_attachment.html.markdown b/website/docs/cdktf/python/r/network_interface_attachment.html.markdown index 346936584dfb..60b2870fe38d 100644 --- a/website/docs/cdktf/python/r/network_interface_attachment.html.markdown +++ b/website/docs/cdktf/python/r/network_interface_attachment.html.markdown @@ -41,6 +41,7 @@ This resource supports the following arguments: * `instance_id` - (Required) Instance ID to attach. * `network_interface_id` - (Required) ENI ID to attach. * `device_index` - (Required) Network interface index (int). +* `network_card_index` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference @@ -76,4 +77,4 @@ Using `terraform import`, import Elastic network interface (ENI) Attachments usi % terraform import aws_network_interface_attachment.secondary_nic eni-attach-0a33842b4ec347c4c ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/s3_bucket_logging.html.markdown b/website/docs/cdktf/python/r/s3_bucket_logging.html.markdown index 7fa57b34c70f..602752399c3a 100644 --- a/website/docs/cdktf/python/r/s3_bucket_logging.html.markdown +++ b/website/docs/cdktf/python/r/s3_bucket_logging.html.markdown @@ -20,6 +20,73 @@ to decide which method meets your requirements. ## Example Usage +### Grant permission by using bucket policy + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_caller_identity import DataAwsCallerIdentity +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.s3_bucket import S3Bucket +from imports.aws.s3_bucket_logging import S3BucketLoggingA +from imports.aws.s3_bucket_policy import S3BucketPolicy +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = S3Bucket(self, "example", + bucket="example-bucket" + ) + logging = S3Bucket(self, "logging", + bucket="access-logging-bucket" + ) + aws_s3_bucket_logging_example = S3BucketLoggingA(self, "example_2", + bucket=example.bucket, + target_bucket=logging.bucket, + target_object_key_format=S3BucketLoggingTargetObjectKeyFormat( + partitioned_prefix=S3BucketLoggingTargetObjectKeyFormatPartitionedPrefix( + partition_date_source="EventTime" + ) + ), + target_prefix="log/" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_logging_example.override_logical_id("example") + current = DataAwsCallerIdentity(self, "current") + logging_bucket_policy = DataAwsIamPolicyDocument(self, "logging_bucket_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["s3:PutObject"], + condition=[DataAwsIamPolicyDocumentStatementCondition( + test="StringEquals", + values=[Token.as_string(current.account_id)], + variable="aws:SourceAccount" + ) + ], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["logging.s3.amazonaws.com"], + type="Service" + ) + ], + resources=["${" + logging.arn + "}/*"] + ) + ] + ) + aws_s3_bucket_policy_logging = S3BucketPolicy(self, "logging_5", + bucket=logging.bucket, + policy=Token.as_string(logging_bucket_policy.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_policy_logging.override_logical_id("logging") +``` + +### Grant permission by using bucket ACL + +The [AWS Documentation](https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html) does not recommend using the ACL. + ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct @@ -91,8 +158,8 @@ The `grantee` configuration block supports the following arguments: The `target_object_key_format` configuration block supports the following arguments: -* `partitioned_prefix` - (Optional) Partitioned S3 key for log objects. [See below](#partitioned_prefix). -* `simple_prefix` - (Optional) Use the simple format for S3 keys for log objects. To use, set `simple_prefix {}`. +* `partitioned_prefix` - (Optional) Partitioned S3 key for log objects, in the form `[target_prefix][SourceAccountId]/[SourceRegion]/[SourceBucket]/[YYYY]/[MM]/[DD]/[YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. Conflicts with `simple_prefix`. [See below](#partitioned_prefix). +* `simple_prefix` - (Optional) Use the simple format for S3 keys for log objects, in the form `[target_prefix][YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. To use, set `simple_prefix {}`. Conflicts with `partitioned_prefix`. ### partitioned_prefix @@ -158,4 +225,4 @@ If the owner (account ID) of the source bucket differs from the account used to % terraform import aws_s3_bucket_logging.example bucket-name,123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sesv2_configuration_set_event_destination.html.markdown b/website/docs/cdktf/python/r/sesv2_configuration_set_event_destination.html.markdown index 367dc4ff3364..591104d87ead 100644 --- a/website/docs/cdktf/python/r/sesv2_configuration_set_event_destination.html.markdown +++ b/website/docs/cdktf/python/r/sesv2_configuration_set_event_destination.html.markdown @@ -203,7 +203,7 @@ The `event_destination` configuration block supports the following arguments: * `matching_event_types` - (Required) - An array that specifies which events the Amazon SES API v2 should send to the destinations. Valid values: `SEND`, `REJECT`, `BOUNCE`, `COMPLAINT`, `DELIVERY`, `OPEN`, `CLICK`, `RENDERING_FAILURE`, `DELIVERY_DELAY`, `SUBSCRIPTION`. * `cloud_watch_destination` - (Optional) An object that defines an Amazon CloudWatch destination for email events. See [`cloud_watch_destination` Block](#cloud_watch_destination-block) for details. * `enabled` - (Optional) When the event destination is enabled, the specified event types are sent to the destinations. Default: `false`. -* `event_bridge_configuration` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`event_bridge_configuration` Block](#event_bridge_configuration-block) for details. +* `event_bridge_destination` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`event_bridge_destination` Block](#event_bridge_destination-block) for details. * `kinesis_firehose_destination` - (Optional) An object that defines an Amazon Kinesis Data Firehose destination for email events. See [`kinesis_firehose_destination` Block](#kinesis_firehose_destination-block) for details. * `pinpoint_destination` - (Optional) An object that defines an Amazon Pinpoint project destination for email events. See [`pinpoint_destination` Block](#pinpoint_destination-block) for details. * `sns_destination` - (Optional) An object that defines an Amazon SNS destination for email events. See [`sns_destination` Block](#sns_destination-block) for details. @@ -222,9 +222,9 @@ The `dimension_configuration` configuration block supports the following argumen * `dimension_name` - (Required) The name of an Amazon CloudWatch dimension associated with an email sending metric. * `dimension_value_source` - (Required) The location where the Amazon SES API v2 finds the value of a dimension to publish to Amazon CloudWatch. Valid values: `MESSAGE_TAG`, `EMAIL_HEADER`, `LINK_TAG`. -### `event_bridge_configuration` Block +### `event_bridge_destination` Block -The `event_bridge_configuration` configuration block supports the following arguments: +The `event_bridge_destination` configuration block supports the following arguments: * `event_bus_arn` - (Required) The Amazon Resource Name (ARN) of the Amazon EventBridge bus to publish email events to. Only the default bus is supported. @@ -278,4 +278,4 @@ Using `terraform import`, import SESv2 (Simple Email V2) Configuration Set Event % terraform import aws_sesv2_configuration_set_event_destination.example example_configuration_set|example_event_destination ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/signer_signing_profile.html.markdown b/website/docs/cdktf/python/r/signer_signing_profile.html.markdown index 22a495ace0dd..28ade7df0776 100644 --- a/website/docs/cdktf/python/r/signer_signing_profile.html.markdown +++ b/website/docs/cdktf/python/r/signer_signing_profile.html.markdown @@ -53,6 +53,7 @@ This resource supports the following arguments: * `name_prefix` - (Optional, Forces new resource) A signing profile name prefix. Terraform will generate a unique suffix. Conflicts with `name`. * `signature_validity_period` - (Optional, Forces new resource) The validity period for a signing job. See [`signature_validity_period` Block](#signature_validity_period-block) below for details. * `signing_material` - (Optional, Forces new resource) The AWS Certificate Manager certificate that will be used to sign code with the new signing profile. See [`signing_material` Block](#signing_material-block) below for details. +* `signing_parameters` - (Optional, Forces new resource) Map of key-value pairs for signing. These can include any information that you want to use during signing. * `tags` - (Optional) A list of tags associated with the signing profile. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `signature_validity_period` Block @@ -114,4 +115,4 @@ Using `terraform import`, import Signer signing profiles using the `name`. For e % terraform import aws_signer_signing_profile.test_signer_signing_profile test_sp_DdW3Mk1foYL88fajut4mTVFGpuwfd4ACO6ANL0D1uIj7lrn8adK ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/spot_instance_request.html.markdown b/website/docs/cdktf/python/r/spot_instance_request.html.markdown index c2145e844fb5..a77eff1ea670 100644 --- a/website/docs/cdktf/python/r/spot_instance_request.html.markdown +++ b/website/docs/cdktf/python/r/spot_instance_request.html.markdown @@ -27,8 +27,8 @@ price availability or by a user. ~> **NOTE:** Because their behavior depends on the live status of the spot market, Spot Instance Requests have a unique lifecycle that makes them behave -differently than other Terraform resources. Most importantly: there is __no -guarantee__ that a Spot Instance exists to fulfill the request at any given +differently than other Terraform resources. Most importantly: there is **no +guarantee** that a Spot Instance exists to fulfill the request at any given point in time. See the [AWS Spot Instance documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-instances.html) for more information. @@ -65,7 +65,9 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + Spot Instance Requests support all the same arguments as [`aws_instance`](instance.html), with the addition of: + * `spot_price` - (Optional; Default: On-demand price) The maximum price to request on the spot market. * `wait_for_fulfillment` - (Optional; Default: false) If set, Terraform will wait for the Spot Request to be fulfilled, and will throw an error if the @@ -84,9 +86,9 @@ Spot Instance Requests support all the same arguments as [`aws_instance`](instan This resource exports the following attributes in addition to the arguments above: * `id` - The Spot Instance Request ID. +* `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). -These attributes are exported, but they are expected to change over time and so -should only be used for informational purposes, not for resource dependencies: +The following attributes are exported, but they are expected to change over time and so should only be used for informational purposes, not for resource dependencies: * `spot_bid_status` - The current [bid status](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html) @@ -103,7 +105,6 @@ should only be used for informational purposes, not for resource dependencies: used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC * `private_ip` - The private IP address assigned to the instance -* `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Timeouts @@ -113,4 +114,4 @@ should only be used for informational purposes, not for resource dependencies: * `read` - (Default `15m`) * `delete` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/synthetics_canary.html.markdown b/website/docs/cdktf/python/r/synthetics_canary.html.markdown index 4227cf471a92..ad6638d66db4 100644 --- a/website/docs/cdktf/python/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/python/r/synthetics_canary.html.markdown @@ -95,6 +95,7 @@ If this canary tests an endpoint in a VPC, this structure contains information a * `subnet_ids` - (Required) IDs of the subnets where this canary is to run. * `security_group_ids` - (Required) IDs of the security groups for this canary. +* `ipv6_allowed_for_dual_stack` - (Optional) If `true`, allow outbound IPv6 traffic on VPC canaries that are connected to dual-stack subnets. The default is `false`. ## Attribute Reference @@ -144,4 +145,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/vpc_endpoint.html.markdown b/website/docs/cdktf/python/r/vpc_endpoint.html.markdown index 883ca0d33bb6..d25851cae1e1 100644 --- a/website/docs/cdktf/python/r/vpc_endpoint.html.markdown +++ b/website/docs/cdktf/python/r/vpc_endpoint.html.markdown @@ -272,7 +272,7 @@ If no security groups are specified, the VPC's [default security group](https:// * `ipv4` - (Optional) The IPv4 address to assign to the endpoint network interface in the subnet. You must provide an IPv4 address if the VPC endpoint supports IPv4. * `ipv6` - (Optional) The IPv6 address to assign to the endpoint network interface in the subnet. You must provide an IPv6 address if the VPC endpoint supports IPv6. -* `subnet` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnet_ids` argument. +* `subnet_id` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnet_ids` argument. ## Timeouts @@ -327,4 +327,4 @@ Using `terraform import`, import VPC Endpoints using the VPC endpoint `id`. For % terraform import aws_vpc_endpoint.endpoint1 vpce-3ecf2a57 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/vpc_ipam.html.markdown b/website/docs/cdktf/python/r/vpc_ipam.html.markdown index 04498223bad1..00fd402e2f96 100644 --- a/website/docs/cdktf/python/r/vpc_ipam.html.markdown +++ b/website/docs/cdktf/python/r/vpc_ipam.html.markdown @@ -88,6 +88,7 @@ This resource supports the following arguments: * `cascade` - (Optional) Enables you to quickly delete an IPAM, private scopes, pools in private scopes, and any allocations in the pools in private scopes. * `description` - (Optional) A description for the IPAM. * `enable_private_gua` - (Optional) Enable this option to use your own GUA ranges as private IPv6 addresses. Default: `false`. +* `metered_account` - (Optional) AWS account that is charged for active IP addresses managed in IPAM. Valid values are `ipam-owner` (default) and `resource-owner`. * `operating_regions` - (Required) Determines which locales can be chosen when you create pools. Locale is the Region where you want to make an IPAM pool available for allocations. You can only create pools with locales that match the operating Regions of the IPAM. You can only create VPCs from a pool whose locale matches the VPC's Region. You specify a region using the [region_name](#operating_regions) parameter. You **must** set your provider block region as an operating_region. * `tier` - (Optional) specifies the IPAM tier. Valid options include `free` and `advanced`. Default is `advanced`. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -135,4 +136,4 @@ Using `terraform import`, import IPAMs using the IPAM `id`. For example: % terraform import aws_vpc_ipam.example ipam-0178368ad2146a492 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/glue_catalog_table.html.markdown b/website/docs/cdktf/typescript/d/glue_catalog_table.html.markdown index 939af2dcd4b9..d9796b8fd2c1 100644 --- a/website/docs/cdktf/typescript/d/glue_catalog_table.html.markdown +++ b/website/docs/cdktf/typescript/d/glue_catalog_table.html.markdown @@ -73,6 +73,7 @@ This data source exports the following attributes in addition to the arguments a * `comment` - Free-form text comment. * `name` - Name of the Partition Key. +* `parameters` - Map of key-value pairs. * `type` - Datatype of data in the Partition Key. ### storage_descriptor @@ -135,4 +136,4 @@ This data source exports the following attributes in addition to the arguments a * `name` - Name of the target table. * `region` - Region of the target table. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/network_interface.html.markdown b/website/docs/cdktf/typescript/d/network_interface.html.markdown index 69bcba50533f..29bc6155f51d 100644 --- a/website/docs/cdktf/typescript/d/network_interface.html.markdown +++ b/website/docs/cdktf/typescript/d/network_interface.html.markdown @@ -47,7 +47,8 @@ This data source supports the following arguments: This data source exports the following attributes in addition to the arguments above: * `arn` - ARN of the network interface. -* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See supported fields below. +* `association` - Association information for an Elastic IP address (IPv4) associated with the network interface. See [association](#association) below. +* `attachment` - Attachment of the ENI. See [attachment](#attachment) below. * `availabilityZone` - Availability Zone. * `description` - Description of the network interface. * `interfaceType` - Type of interface. @@ -74,10 +75,18 @@ This data source exports the following attributes in addition to the arguments a * `public_dns_name` - Public DNS name. * `publicIp` - Address of the Elastic IP address bound to the network interface. +### `attachment` + +* `attachmentId` - ID of the network interface attachment. +* `deviceIndex` - Device index of the network interface attachment on the instance. +* `instanceId` - ID of the instance. +* `instanceOwnerId` - AWS account ID of the owner of the instance. +* `networkCardIndex` - Index of the network card. + ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): - `read` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/rds_reserved_instance_offering.html.markdown b/website/docs/cdktf/typescript/d/rds_reserved_instance_offering.html.markdown index 516db077c34a..3b9265f4275c 100644 --- a/website/docs/cdktf/typescript/d/rds_reserved_instance_offering.html.markdown +++ b/website/docs/cdktf/typescript/d/rds_reserved_instance_offering.html.markdown @@ -47,7 +47,7 @@ This data source supports the following arguments: * `duration` - (Required) Duration of the reservation in years or seconds. Valid values are `1`, `3`, `31536000`, `94608000` * `multiAz` - (Required) Whether the reservation applies to Multi-AZ deployments. * `offeringType` - (Required) Offering type of this reserved DB instance. Valid values are `No Upfront`, `Partial Upfront`, `All Upfront`. -* `productDescription` - (Required) Description of the reserved DB instance. +* `productDescription` - (Required) Description of the reserved DB instance. Example values are `postgresql`, `aurora-postgresql`, `mysql`, `aurora-mysql`, `mariadb`. ## Attribute Reference @@ -58,4 +58,4 @@ This data source exports the following attributes in addition to the arguments a * `fixedPrice` - Fixed price charged for this reserved DB instance. * `offeringId` - Unique identifier for the reservation. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/signer_signing_profile.html.markdown b/website/docs/cdktf/typescript/d/signer_signing_profile.html.markdown index 4ed598de73b5..c844e0f86f91 100644 --- a/website/docs/cdktf/typescript/d/signer_signing_profile.html.markdown +++ b/website/docs/cdktf/typescript/d/signer_signing_profile.html.markdown @@ -50,9 +50,12 @@ This data source exports the following attributes in addition to the arguments a * `platformId` - ID of the platform that is used by the target signing profile. * `revocationRecord` - Revocation information for a signing profile. * `signatureValidityPeriod` - The validity period for a signing job. +* `signingMaterial` - AWS Certificate Manager certificate that will be used to sign code with the new signing profile. + * `certificateArn` - ARN of the certificate used for signing. +* `signing_parameters` - Map of key-value pairs for signing. * `status` - Status of the target signing profile. * `tags` - List of tags associated with the signing profile. * `version` - Current version of the signing profile. * `versionArn` - Signing profile ARN, including the profile version. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/vpc_ipam.html.markdown b/website/docs/cdktf/typescript/d/vpc_ipam.html.markdown index b2a02fef8fa6..4d1d46a8f1ab 100644 --- a/website/docs/cdktf/typescript/d/vpc_ipam.html.markdown +++ b/website/docs/cdktf/typescript/d/vpc_ipam.html.markdown @@ -54,6 +54,7 @@ This data source exports the following attributes in addition to the arguments a * `enablePrivateGua` - If private GUA is enabled. * `id` - ID of the IPAM resource. * `ipamRegion` - Region that the IPAM exists in. +* `metered_account` - AWS account that is charged for active IP addresses managed in IPAM. * `operatingRegions` - Regions that the IPAM is configured to operate in. * `ownerId` - ID of the account that owns this IPAM. * `privateDefaultScopeId` - ID of the default private scope. @@ -65,4 +66,4 @@ This data source exports the following attributes in addition to the arguments a * `tier` - IPAM Tier. * `tags` - Tags of the IPAM resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/index.html.markdown b/website/docs/cdktf/typescript/index.html.markdown index 42333c8ee233..5ff551941d19 100644 --- a/website/docs/cdktf/typescript/index.html.markdown +++ b/website/docs/cdktf/typescript/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,514 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -948,4 +948,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown b/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown index 509814fb03f5..f71831de0f9d 100644 --- a/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown +++ b/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown @@ -25,9 +25,15 @@ import { Token, TerraformStack } from "cdktf"; * See https://cdk.tf/provider-generation for more details. */ import { BcmdataexportsExport } from "./.gen/providers/aws/bcmdataexports-export"; +import { DataAwsCallerIdentity } from "./.gen/providers/aws/data-aws-caller-identity"; +import { DataAwsPartition } from "./.gen/providers/aws/data-aws-partition"; class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); + const current = new DataAwsCallerIdentity(this, "current", {}); + const dataAwsPartitionCurrent = new DataAwsPartition(this, "current_1", {}); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsPartitionCurrent.overrideLogicalId("current"); new BcmdataexportsExport(this, "test", { export: [ { @@ -37,6 +43,12 @@ class MyConvertedCode extends TerraformStack { "SELECT identity_line_item_id, identity_time_interval, line_item_product_code,line_item_unblended_cost FROM COST_AND_USAGE_REPORT", tableConfigurations: { COST_AND_USAGE_REPORT: { + BILLING_VIEW_ARN: + "arn:${" + + dataAwsPartitionCurrent.partition + + "}:billing::${" + + current.accountId + + "}:billingview/primary", INCLUDE_MANUAL_DISCOUNT_COMPATIBILITY: "FALSE", INCLUDE_RESOURCES: "FALSE", INCLUDE_SPLIT_COST_ALLOCATION_DATA: "FALSE", @@ -94,8 +106,8 @@ The following arguments are required: ### `dataQuery` Argument Reference -* `queryStatement` - (Required) Query statement. -* `tableConfigurations` - (Optional) Table configuration. +* `queryStatement` - (Required) Query statement. The SQL table name for CUR 2.0 is `COST_AND_USAGE_REPORT`. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html) for a list of available columns. +* `tableConfigurations` - (Optional) Table configuration. See the [AWS documentation](https://docs.aws.amazon.com/cur/latest/userguide/table-dictionary-cur2.html#cur2-table-configurations) for the available configurations. In addition to those listed in the documentation, `BILLING_VIEW_ARN` must also be included, as shown in the example above. ### `destinationConfigurations` Argument Reference @@ -165,4 +177,4 @@ Using `terraform import`, import BCM Data Exports Export using the export ARN. F % terraform import aws_bcmdataexports_export.example arn:aws:bcm-data-exports:us-east-1:123456789012:export/CostUsageReport-9f1c75f3-f982-4d9a-b936-1e7ecab814b7 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/cognito_user_pool.html.markdown b/website/docs/cdktf/typescript/r/cognito_user_pool.html.markdown index 81338f26d0af..378a65426c0f 100644 --- a/website/docs/cdktf/typescript/r/cognito_user_pool.html.markdown +++ b/website/docs/cdktf/typescript/r/cognito_user_pool.html.markdown @@ -118,18 +118,18 @@ This resource supports the following arguments: * `deletionProtection` - (Optional) When active, DeletionProtection prevents accidental deletion of your user pool. Before you can delete a user pool that you have protected against deletion, you must deactivate this feature. Valid values are `ACTIVE` and `INACTIVE`, Default value is `INACTIVE`. * `deviceConfiguration` - (Optional) Configuration block for the user pool's device tracking. [Detailed below](#device_configuration). * `emailConfiguration` - (Optional) Configuration block for configuring email. [Detailed below](#email_configuration). -* `emailMfaConfiguration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `accountRecoverySetting` entries; requires an `emailConfiguration` configuration block. [Detailed below](#email_mfa_configuration). +* `emailMfaConfiguration` - (Optional) Configuration block for configuring email Multi-Factor Authentication (MFA); requires at least 2 `accountRecoverySetting` entries; requires an `emailConfiguration` configuration block. Effective only when `mfaConfiguration` is `ON` or `OPTIONAL`. [Detailed below](#email_mfa_configuration). * `emailVerificationMessage` - (Optional) String representing the email verification message. Conflicts with `verificationMessageTemplate` configuration block `emailMessage` argument. * `emailVerificationSubject` - (Optional) String representing the email verification subject. Conflicts with `verificationMessageTemplate` configuration block `emailSubject` argument. * `lambdaConfig` - (Optional) Configuration block for the AWS Lambda triggers associated with the user pool. [Detailed below](#lambda_config). -* `mfaConfiguration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `smsConfiguration` or `softwareTokenMfaConfiguration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `smsConfiguration` or `softwareTokenMfaConfiguration` to be configured). +* `mfaConfiguration` - (Optional) Multi-Factor Authentication (MFA) configuration for the User Pool. Defaults of `OFF`. Valid values are `OFF` (MFA Tokens are not required), `ON` (MFA is required for all users to sign in; requires at least one of `emailMfaConfiguration`, `smsConfiguration` or `softwareTokenMfaConfiguration` to be configured), or `OPTIONAL` (MFA Will be required only for individual users who have MFA Enabled; requires at least one of `emailMfaConfiguration`, `smsConfiguration` or `softwareTokenMfaConfiguration` to be configured). * `passwordPolicy` - (Optional) Configuration block for information about the user pool password policy. [Detailed below](#password_policy). * `schema` - (Optional) Configuration block for the schema attributes of a user pool. [Detailed below](#schema). Schema attributes from the [standard attribute set](https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-settings-attributes.html#cognito-user-pools-standard-attributes) only need to be specified if they are different from the default configuration. Attributes can be added, but not modified or removed. Maximum of 50 attributes. * `signInPolicy` - (Optional) Configuration block for information about the user pool sign in policy. [Detailed below](#sign_in_policy). * `smsAuthenticationMessage` - (Optional) String representing the SMS authentication message. The Message must contain the `{####}` placeholder, which will be replaced with the code. -* `smsConfiguration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). +* `smsConfiguration` - (Optional) Configuration block for Short Message Service (SMS) settings. [Detailed below](#sms_configuration). These settings apply to SMS user verification and SMS Multi-Factor Authentication (MFA). SMS MFA is activated only when `mfaConfiguration` is set to `ON` or `OPTIONAL` along with this block. Due to Cognito API restrictions, the SMS configuration cannot be removed without recreating the Cognito User Pool. For user data safety, this resource will ignore the removal of this configuration by disabling drift detection. To force resource recreation after this configuration has been applied, see the [`taint` command](https://www.terraform.io/docs/commands/taint.html). * `smsVerificationMessage` - (Optional) String representing the SMS verification message. Conflicts with `verificationMessageTemplate` configuration block `smsMessage` argument. -* `softwareTokenMfaConfiguration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. [Detailed below](#software_token_mfa_configuration). +* `softwareTokenMfaConfiguration` - (Optional) Configuration block for software token Mult-Factor Authentication (MFA) settings. Effective only when `mfaConfiguration` is `ON` or `OPTIONAL`. [Detailed below](#software_token_mfa_configuration). * `tags` - (Optional) Map of tags to assign to the User Pool. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `userAttributeUpdateSettings` - (Optional) Configuration block for user attribute update settings. [Detailed below](#user_attribute_update_settings). * `userPoolAddOns` - (Optional) Configuration block for user pool add-ons to enable user pool advanced security mode features. [Detailed below](#user_pool_add_ons). @@ -369,4 +369,4 @@ Using `terraform import`, import Cognito User Pools using the `id`. For example: % terraform import aws_cognito_user_pool.pool us-west-2_abc123 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown b/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown index 6f068c316e12..a515669ac314 100644 --- a/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown @@ -293,7 +293,7 @@ This resource supports the following arguments: * `policyType` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. -* `targetTags` (Optional) A map of tag keys and their values. Any resources that match the `resourceTypes` and are tagged with _any_ of these tags will be targeted. +* `targetTags` (Optional) A map of tag keys and their values. Any resources that match the `resourceTypes` and are tagged with _any_ of these tags will be targeted. Required when `policyType` is `EBS_SNAPSHOT_MANAGEMENT` or `IMAGE_MANAGEMENT`. Must not be specified when `policyType` is `EVENT_BASED_POLICY`. ~> Note: You cannot have overlapping lifecycle policies that share the same `targetTags`. Terraform is unable to detect this at plan time but it will fail during apply. @@ -434,4 +434,4 @@ Using `terraform import`, import DLM lifecycle policies using their policy ID. F % terraform import aws_dlm_lifecycle_policy.example policy-abcdef12345678901 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/glue_catalog_table.html.markdown b/website/docs/cdktf/typescript/r/glue_catalog_table.html.markdown index ea187607600f..2a013c945053 100644 --- a/website/docs/cdktf/typescript/r/glue_catalog_table.html.markdown +++ b/website/docs/cdktf/typescript/r/glue_catalog_table.html.markdown @@ -157,6 +157,7 @@ To add an index to an existing table, see the [`glue_partition_index` resource]( * `comment` - (Optional) Free-form text comment. * `name` - (Required) Name of the Partition Key. +* `parameters` - (Optional) Map of key-value pairs. * `type` - (Optional) Datatype of data in the Partition Key. ### storage_descriptor @@ -258,4 +259,4 @@ Using `terraform import`, import Glue Tables using the catalog ID (usually AWS a % terraform import aws_glue_catalog_table.MyTable 123456789012:MyDatabase:MyTable ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/glue_job.html.markdown b/website/docs/cdktf/typescript/r/glue_job.html.markdown index 84dfa13b5e2a..ac12ac73c193 100644 --- a/website/docs/cdktf/typescript/r/glue_job.html.markdown +++ b/website/docs/cdktf/typescript/r/glue_job.html.markdown @@ -297,36 +297,29 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `command` - (Required) The command of the job. Defined below. * `connections` - (Optional) The list of connections used for this job. * `defaultArguments` - (Optional) The map of default arguments for this job. You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes. For information about how to specify and consume your own Job arguments, see the [Calling AWS Glue APIs in Python](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html) topic in the developer guide. For information about the key-value pairs that AWS Glue consumes to set up your job, see the [Special Parameters Used by AWS Glue](http://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-glue-arguments.html) topic in the developer guide. -* `nonOverridableArguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `description` - (Optional) Description of the job. +* `executionClass` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `executionProperty` - (Optional) Execution property of the job. Defined below. * `glueVersion` - (Optional) The version of glue to use, for example "1.0". Ray jobs should set this to 4.0 or greater. For information about available versions, see the [AWS Glue Release Notes](https://docs.aws.amazon.com/glue/latest/dg/release-notes.html). * `jobMode` - (Optional) Describes how a job was created. Valid values are `SCRIPT`, `NOTEBOOK` and `VISUAL`. * `jobRunQueuingEnabled` - (Optional) Specifies whether job run queuing is enabled for the job runs for this job. A value of true means job run queuing is enabled for the job runs. If false or not populated, the job runs will not be considered for queueing. -* `executionClass` - (Optional) Indicates whether the job is run with a standard or flexible execution class. The standard execution class is ideal for time-sensitive workloads that require fast job startup and dedicated resources. Valid value: `FLEX`, `STANDARD`. * `maintenanceWindow` - (Optional) Specifies the day of the week and hour for the maintenance window for streaming jobs. * `maxCapacity` - (Optional) The maximum number of AWS Glue data processing units (DPUs) that can be allocated when this job runs. `Required` when `pythonshell` is set, accept either `0.0625` or `1.0`. Use `numberOfWorkers` and `workerType` arguments instead with `glueVersion` `2.0` and above. * `maxRetries` - (Optional) The maximum number of times to retry this job if it fails. * `name` - (Required) The name you assign to this job. It must be unique in your account. +* `nonOverridableArguments` - (Optional) Non-overridable arguments for this job, specified as name-value pairs. * `notificationProperty` - (Optional) Notification property of the job. Defined below. +* `numberOfWorkers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `roleArn` - (Required) The ARN of the IAM role associated with this job. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) The job timeout in minutes. The default is 2880 minutes (48 hours) for `glueetl` and `pythonshell` jobs, and null (unlimited) for `gluestreaming` jobs. * `securityConfiguration` - (Optional) The name of the Security Configuration to be associated with the job. * `sourceControlDetails` - (Optional) The details for a source control configuration for a job, allowing synchronization of job artifacts to or from a remote repository. Defined below. -* `workerType` - (Optional) The type of predefined worker that is allocated when a job runs. Accepts a value of Standard, G.1X, G.2X, or G.025X for Spark jobs. Accepts the value Z.2X for Ray jobs. - * For the Standard worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker. - * For the G.1X worker type, each worker maps to 1 DPU (4 vCPU, 16 GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.2X worker type, each worker maps to 2 DPU (8 vCPU, 32 GB of memory, 128 GB disk), and provides 1 executor per worker. Recommended for memory-intensive jobs. - * For the G.4X worker type, each worker maps to 4 DPU (16 vCPUs, 64 GB of memory) with 256GB disk (approximately 235GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.8X worker type, each worker maps to 8 DPU (32 vCPUs, 128 GB of memory) with 512GB disk (approximately 487GB free), and provides 1 executor per worker. Recommended for memory-intensive jobs. Only available for Glue version 3.0. Available AWS Regions: US East (Ohio), US East (N. Virginia), US West (Oregon), Asia Pacific (Singapore), Asia Pacific (Sydney), Asia Pacific (Tokyo), Canada (Central), Europe (Frankfurt), Europe (Ireland), and Europe (Stockholm). - * For the G.025X worker type, each worker maps to 0.25 DPU (2 vCPU, 4GB of memory, 64 GB disk), and provides 1 executor per worker. Recommended for low volume streaming jobs. Only available for Glue version 3.0. - * For the Z.2X worker type, each worker maps to 2 M-DPU (8vCPU, 64 GB of m emory, 128 GB disk), and provides up to 8 Ray workers based on the autoscaler. -* `numberOfWorkers` - (Optional) The number of workers of a defined workerType that are allocated when a job runs. +* `workerType` - (Optional) The type of predefined worker that is allocated when a job runs. Valid values: `Standard`, `G.1X`, `G.2X`, `G.025X`, `G.4X`, `G.8X`, `G.12X`, `G.16X`, `R.1X`, `R.2X`, `R.4X`, `R.8X`, `Z.2X` (Ray jobs). See the [AWS documentation](https://docs.aws.amazon.com/glue/latest/dg/worker-types.html) for details. ### command Argument Reference @@ -390,4 +383,4 @@ Using `terraform import`, import Glue Jobs using `name`. For example: % terraform import aws_glue_job.MyJob MyJob ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/inspector2_filter.html.markdown b/website/docs/cdktf/typescript/r/inspector2_filter.html.markdown index 423c9c9d7374..fc864835e3d7 100644 --- a/website/docs/cdktf/typescript/r/inspector2_filter.html.markdown +++ b/website/docs/cdktf/typescript/r/inspector2_filter.html.markdown @@ -74,6 +74,8 @@ This resource exports the following attributes in addition to the arguments abov The `filterCriteria` configuration block supports the following attributes: * `awsAccountId` - (Optional) The AWS account ID in which the finding was generated. [Documented below](#string-filter). +* `code_repository_project_name` - (Optional) The project name in a code repository. [Documented below](#string-filter). +* `code_repository_provider_type` - (Optional) The repository provider type (such as GitHub, GitLab, etc.) [Documented below](#string-filter). * `codeVulnerabilityDetectorName` - (Optional) The ID of the component. [Documented below](#string-filter). * `codeVulnerabilityDetectorTags` - (Optional) The ID of the component. [Documented below](#string-filter). * `codeVulnerabilityFilePath` - (Optional) The ID of the component. [Documented below](#string-filter). @@ -83,6 +85,8 @@ The `filterCriteria` configuration block supports the following attributes: * `ec2InstanceSubnetId` - (Optional) The ID of the subnet. [Documented below](#string-filter). * `ec2InstanceVpcId` - (Optional) The ID of the VPC. [Documented below](#string-filter). * `ecrImageArchitecture` - (Optional) The architecture of the ECR image. [Documented below](#string-filter). +* `ecr_image_in_use_count` - (Optional) The number of the ECR images in use. [Documented below](#number-filter). +* `ecr_image_last_in_use_at` - (Optional) The date range when an ECR image was last used in an ECS cluster task or EKS cluster pod. [Documented below](#date-filter). * `ecrImageHash` - (Optional) The SHA256 hash of the ECR image. [Documented below](#string-filter). * `ecrImagePushedAt` - (Optional) The date range when the image was pushed. [Documented below](#date-filter). * `ecrImageRegistry` - (Optional) The registry of the ECR image. [Documented below](#string-filter). @@ -197,4 +201,4 @@ Using `terraform import`, import Inspector Filter using the `arn`. For example: % terraform import aws_inspector2_filter.example "arn:aws:inspector2:us-east-1:111222333444:owner/111222333444/filter/abcdefgh12345678" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/instance.html.markdown b/website/docs/cdktf/typescript/r/instance.html.markdown index 21e786c61e5a..267bf8f39fb2 100644 --- a/website/docs/cdktf/typescript/r/instance.html.markdown +++ b/website/docs/cdktf/typescript/r/instance.html.markdown @@ -45,7 +45,7 @@ class MyConvertedCode extends TerraformStack { mostRecent: true, owners: ["099720109477"], }); - new Instance(this, "web", { + new Instance(this, "example", { ami: Token.asString(ubuntu.id), instanceType: "t3.micro", tags: { @@ -71,7 +71,7 @@ import { Instance } from "./.gen/providers/aws/instance"; class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); - new Instance(this, "web", { + new Instance(this, "example", { ami: "resolve:ssm:/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64", instanceType: "t3.micro", tags: { @@ -98,7 +98,7 @@ import { Instance } from "./.gen/providers/aws/instance"; class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); - const thisVar = new DataAwsAmi(this, "this", { + const example = new DataAwsAmi(this, "example", { filter: [ { name: "architecture", @@ -112,8 +112,8 @@ class MyConvertedCode extends TerraformStack { mostRecent: true, owners: ["amazon"], }); - const awsInstanceThis = new Instance(this, "this_1", { - ami: Token.asString(thisVar.id), + const awsInstanceExample = new Instance(this, "example_1", { + ami: Token.asString(example.id), instanceMarketOptions: { marketType: "spot", spotOptions: { @@ -126,7 +126,7 @@ class MyConvertedCode extends TerraformStack { }, }); /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ - awsInstanceThis.overrideLogicalId("this"); + awsInstanceExample.overrideLogicalId("example"); } } @@ -163,28 +163,25 @@ class MyConvertedCode extends TerraformStack { }, vpcId: myVpc.id, }); - const foo = new NetworkInterface(this, "foo", { + const example = new NetworkInterface(this, "example", { privateIps: ["172.16.10.100"], subnetId: mySubnet.id, tags: { Name: "primary_network_interface", }, }); - const awsInstanceFoo = new Instance(this, "foo_3", { + const awsInstanceExample = new Instance(this, "example_3", { ami: "ami-005e54dee72cc1d00", creditSpecification: { cpuCredits: "unlimited", }, instanceType: "t2.micro", - networkInterface: [ - { - deviceIndex: 0, - networkInterfaceId: foo.id, - }, - ], + primaryNetworkInterface: { + networkInterfaceId: example.id, + }, }); /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ - awsInstanceFoo.overrideLogicalId("foo"); + awsInstanceExample.overrideLogicalId("example"); } } @@ -328,9 +325,10 @@ This resource supports the following arguments: * `maintenanceOptions` - (Optional) Maintenance and recovery options for the instance. See [Maintenance Options](#maintenance-options) below for more details. * `metadataOptions` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) -* `networkInterface` - (Optional) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. +* `networkInterface` - (Optional, **Deprecated** to specify the primary network interface, use `primaryNetworkInterface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. * `placementGroup` - (Optional) Placement Group to start the instance in. * `placementPartitionNumber` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. +* `primaryNetworkInterface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `privateDnsNameOptions` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. * `privateIp` - (Optional) Private IP address to associate with the instance in a VPC. * `rootBlockDevice` - (Optional) Configuration block to customize details about the root block device of the instance. See [Block Devices](#ebs-ephemeral-and-root-block-devices) below for details. When accessing this as an attribute reference, it is a list containing one object. @@ -477,7 +475,11 @@ For more information, see the documentation on the [Instance Metadata Service](h ### Network Interfaces -Each of the `networkInterface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use the `aws_network_interface` or `aws_network_interface_attachment` resources instead. +`networkInterface` is **deprecated**. +Use `primaryNetworkInterface` to specify the primary network interface. +To attach additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. + +Each of the `networkInterface` blocks attach a network interface to an EC2 Instance during boot time. However, because the network interface is attached at boot-time, replacing/modifying the network interface **WILL** trigger a recreation of the EC2 Instance. If you should need at any point to detach/modify/re-attach a network interface to the instance, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources instead. The `networkInterface` configuration block _does_, however, allow users to supply their own network interface to be used as the default network interface on an EC2 Instance, attached at `eth0`. @@ -488,6 +490,16 @@ Each `networkInterface` block supports the following: * `networkCardIndex` - (Optional) Integer index of the network card. Limited by instance type. The default index is `0`. * `networkInterfaceId` - (Required) ID of the network interface to attach. +### Primary Network Interface + +Represents the primary network interface on the EC2 Instance. +To manage additional network interfaces, use [`aws_network_interface_attachment`](docs/r/network_interface_attachment.html.markdown) resources. + +Each `primaryNetworkInterface` block supports the following: + +* `deleteOnTermination` - (Read-Only) Whether the network interface will be deleted when the instance terminates. +* `networkInterfaceId` - (Required) ID of the network interface to attach. + ### Private DNS Name Options The `privateDnsNameOptions` block supports the following: @@ -587,4 +599,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/iot_thing_principal_attachment.html.markdown b/website/docs/cdktf/typescript/r/iot_thing_principal_attachment.html.markdown index feb496e1819f..5f2f6fd3568a 100644 --- a/website/docs/cdktf/typescript/r/iot_thing_principal_attachment.html.markdown +++ b/website/docs/cdktf/typescript/r/iot_thing_principal_attachment.html.markdown @@ -51,9 +51,10 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `principal` - (Required) The AWS IoT Certificate ARN or Amazon Cognito Identity ID. * `thing` - (Required) The name of the thing. +* `thing_principal_type` - (Optional) The type of relationship to specify when attaching a principal to a thing. Valid values are `EXCLUSIVE_THING` (the thing will be the only one attached to the principal) or `NON_EXCLUSIVE_THING` (multiple things can be attached to the principal). Defaults to `NON_EXCLUSIVE_THING`. ## Attribute Reference This resource exports no additional attributes. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/mwaa_environment.html.markdown b/website/docs/cdktf/typescript/r/mwaa_environment.html.markdown index 923b7385d629..667ca0502d9b 100644 --- a/website/docs/cdktf/typescript/r/mwaa_environment.html.markdown +++ b/website/docs/cdktf/typescript/r/mwaa_environment.html.markdown @@ -168,7 +168,6 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `airflowConfigurationOptions` - (Optional) The `airflowConfigurationOptions` parameter specifies airflow override options. Check the [Official documentation](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-env-variables.html#configuring-env-variables-reference) for all possible configuration options. * `airflowVersion` - (Optional) Airflow version of your environment, will be set by default to the latest version that MWAA supports. * `dagS3Path` - (Required) The relative path to the DAG folder on your Amazon S3 storage bucket. For example, dags. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). @@ -185,15 +184,17 @@ This resource supports the following arguments: * `networkConfiguration` - (Required) Specifies the network configuration for your Apache Airflow Environment. This includes two private subnets as well as security groups for the Airflow environment. Each subnet requires internet connection, otherwise the deployment will fail. See [`networkConfiguration` Block](#network_configuration-block) for details. * `pluginsS3ObjectVersion` - (Optional) The plugins.zip file version you want to use. * `pluginsS3Path` - (Optional) The relative path to the plugins.zip file on your Amazon S3 storage bucket. For example, plugins.zip. If a relative path is provided in the request, then plugins_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `requirementsS3ObjectVersion` - (Optional) The requirements.txt file version you want to use. * `requirementsS3Path` - (Optional) The relative path to the requirements.txt file on your Amazon S3 storage bucket. For example, requirements.txt. If a relative path is provided in the request, then requirements_s3_object_version is required. For more information, see [Importing DAGs on Amazon MWAA](https://docs.aws.amazon.com/mwaa/latest/userguide/configuring-dag-import.html). * `schedulers` - (Optional) The number of schedulers that you want to run in your environment. v2.0.2 and above accepts `2` - `5`, default `2`. v1.10.12 accepts `1`. * `sourceBucketArn` - (Required) The Amazon Resource Name (ARN) of your Amazon S3 storage bucket. For example, arn:aws:s3:::airflow-mybucketname. * `startupScriptS3ObjectVersion` - (Optional) The version of the startup shell script you want to use. You must specify the version ID that Amazon S3 assigns to the file every time you update the script. * `startupScriptS3Path` - (Optional) The relative path to the script hosted in your bucket. The script runs as your environment starts before starting the Apache Airflow process. Use this script to install dependencies, modify configuration options, and set environment variables. See [Using a startup script](https://docs.aws.amazon.com/mwaa/latest/userguide/using-startup-script.html). Supported for environment versions 2.x and later. +* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `webserverAccessMode` - (Optional) Specifies whether the webserver should be accessible over the internet or via your specified VPC. Possible options: `PRIVATE_ONLY` (default) and `PUBLIC_ONLY`. * `weeklyMaintenanceWindowStart` - (Optional) Specifies the start date for the weekly maintenance window. -* `tags` - (Optional) A map of resource tags to associate with the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `worker_replacement_strategy` - (Optional) Worker replacement strategy. Valid values: `FORCED`, `GRACEFUL`. ### `loggingConfiguration` Block @@ -273,4 +274,4 @@ Using `terraform import`, import MWAA Environment using `Name`. For example: % terraform import aws_mwaa_environment.example MyAirflowEnvironment ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/network_interface.html.markdown b/website/docs/cdktf/typescript/r/network_interface.html.markdown index 8136a1564beb..ff6ab7d9c685 100644 --- a/website/docs/cdktf/typescript/r/network_interface.html.markdown +++ b/website/docs/cdktf/typescript/r/network_interface.html.markdown @@ -94,6 +94,7 @@ The `attachment` block supports the following: * `instance` - (Required) ID of the instance to attach to. * `deviceIndex` - (Required) Integer to define the devices index. +* `networkCardIndex` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference @@ -134,4 +135,4 @@ Using `terraform import`, import Network Interfaces using the `id`. For example: % terraform import aws_network_interface.test eni-e5aa89a3 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/network_interface_attachment.html.markdown b/website/docs/cdktf/typescript/r/network_interface_attachment.html.markdown index fba2752f1dfb..19c92cd866bb 100644 --- a/website/docs/cdktf/typescript/r/network_interface_attachment.html.markdown +++ b/website/docs/cdktf/typescript/r/network_interface_attachment.html.markdown @@ -44,6 +44,7 @@ This resource supports the following arguments: * `instanceId` - (Required) Instance ID to attach. * `networkInterfaceId` - (Required) ENI ID to attach. * `deviceIndex` - (Required) Network interface index (int). +* `networkCardIndex` - (Optional) Index of the network card. Specify a value greater than 0 when using multiple network cards, which are supported by [some instance types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#network-cards). The default is 0. ## Attribute Reference @@ -86,4 +87,4 @@ Using `terraform import`, import Elastic network interface (ENI) Attachments usi % terraform import aws_network_interface_attachment.secondary_nic eni-attach-0a33842b4ec347c4c ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/s3_bucket_logging.html.markdown b/website/docs/cdktf/typescript/r/s3_bucket_logging.html.markdown index 049c64181eef..21e523034dc4 100644 --- a/website/docs/cdktf/typescript/r/s3_bucket_logging.html.markdown +++ b/website/docs/cdktf/typescript/r/s3_bucket_logging.html.markdown @@ -20,6 +20,83 @@ to decide which method meets your requirements. ## Example Usage +### Grant permission by using bucket policy + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsCallerIdentity } from "./.gen/providers/aws/data-aws-caller-identity"; +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { S3Bucket } from "./.gen/providers/aws/s3-bucket"; +import { S3BucketLoggingA } from "./.gen/providers/aws/s3-bucket-logging"; +import { S3BucketPolicy } from "./.gen/providers/aws/s3-bucket-policy"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new S3Bucket(this, "example", { + bucket: "example-bucket", + }); + const logging = new S3Bucket(this, "logging", { + bucket: "access-logging-bucket", + }); + const awsS3BucketLoggingExample = new S3BucketLoggingA(this, "example_2", { + bucket: example.bucket, + targetBucket: logging.bucket, + targetObjectKeyFormat: { + partitionedPrefix: { + partitionDateSource: "EventTime", + }, + }, + targetPrefix: "log/", + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketLoggingExample.overrideLogicalId("example"); + const current = new DataAwsCallerIdentity(this, "current", {}); + const loggingBucketPolicy = new DataAwsIamPolicyDocument( + this, + "logging_bucket_policy", + { + statement: [ + { + actions: ["s3:PutObject"], + condition: [ + { + test: "StringEquals", + values: [Token.asString(current.accountId)], + variable: "aws:SourceAccount", + }, + ], + principals: [ + { + identifiers: ["logging.s3.amazonaws.com"], + type: "Service", + }, + ], + resources: ["${" + logging.arn + "}/*"], + }, + ], + } + ); + const awsS3BucketPolicyLogging = new S3BucketPolicy(this, "logging_5", { + bucket: logging.bucket, + policy: Token.asString(loggingBucketPolicy.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketPolicyLogging.overrideLogicalId("logging"); + } +} + +``` + +### Grant permission by using bucket ACL + +The [AWS Documentation](https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html) does not recommend using the ACL. + ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; @@ -94,8 +171,8 @@ The `grantee` configuration block supports the following arguments: The `targetObjectKeyFormat` configuration block supports the following arguments: -* `partitionedPrefix` - (Optional) Partitioned S3 key for log objects. [See below](#partitioned_prefix). -* `simplePrefix` - (Optional) Use the simple format for S3 keys for log objects. To use, set `simple_prefix {}`. +* `partitionedPrefix` - (Optional) Partitioned S3 key for log objects, in the form `[target_prefix][SourceAccountId]/[SourceRegion]/[SourceBucket]/[YYYY]/[MM]/[DD]/[YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. Conflicts with `simplePrefix`. [See below](#partitioned_prefix). +* `simplePrefix` - (Optional) Use the simple format for S3 keys for log objects, in the form `[target_prefix][YYYY]-[MM]-[DD]-[hh]-[mm]-[ss]-[UniqueString]`. To use, set `simple_prefix {}`. Conflicts with `partitionedPrefix`. ### partitioned_prefix @@ -171,4 +248,4 @@ If the owner (account ID) of the source bucket differs from the account used to % terraform import aws_s3_bucket_logging.example bucket-name,123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sesv2_configuration_set_event_destination.html.markdown b/website/docs/cdktf/typescript/r/sesv2_configuration_set_event_destination.html.markdown index 27f34345773a..d5d5239c3199 100644 --- a/website/docs/cdktf/typescript/r/sesv2_configuration_set_event_destination.html.markdown +++ b/website/docs/cdktf/typescript/r/sesv2_configuration_set_event_destination.html.markdown @@ -231,7 +231,7 @@ The `eventDestination` configuration block supports the following arguments: * `matchingEventTypes` - (Required) - An array that specifies which events the Amazon SES API v2 should send to the destinations. Valid values: `SEND`, `REJECT`, `BOUNCE`, `COMPLAINT`, `DELIVERY`, `OPEN`, `CLICK`, `RENDERING_FAILURE`, `DELIVERY_DELAY`, `SUBSCRIPTION`. * `cloudWatchDestination` - (Optional) An object that defines an Amazon CloudWatch destination for email events. See [`cloudWatchDestination` Block](#cloud_watch_destination-block) for details. * `enabled` - (Optional) When the event destination is enabled, the specified event types are sent to the destinations. Default: `false`. -* `event_bridge_configuration` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`event_bridge_configuration` Block](#event_bridge_configuration-block) for details. +* `eventBridgeDestination` - (Optional) An object that defines an Amazon EventBridge destination for email events. You can use Amazon EventBridge to send notifications when certain email events occur. See [`eventBridgeDestination` Block](#event_bridge_destination-block) for details. * `kinesisFirehoseDestination` - (Optional) An object that defines an Amazon Kinesis Data Firehose destination for email events. See [`kinesisFirehoseDestination` Block](#kinesis_firehose_destination-block) for details. * `pinpointDestination` - (Optional) An object that defines an Amazon Pinpoint project destination for email events. See [`pinpointDestination` Block](#pinpoint_destination-block) for details. * `snsDestination` - (Optional) An object that defines an Amazon SNS destination for email events. See [`snsDestination` Block](#sns_destination-block) for details. @@ -250,9 +250,9 @@ The `dimensionConfiguration` configuration block supports the following argument * `dimensionName` - (Required) The name of an Amazon CloudWatch dimension associated with an email sending metric. * `dimensionValueSource` - (Required) The location where the Amazon SES API v2 finds the value of a dimension to publish to Amazon CloudWatch. Valid values: `MESSAGE_TAG`, `EMAIL_HEADER`, `LINK_TAG`. -### `event_bridge_configuration` Block +### `eventBridgeDestination` Block -The `event_bridge_configuration` configuration block supports the following arguments: +The `eventBridgeDestination` configuration block supports the following arguments: * `eventBusArn` - (Required) The Amazon Resource Name (ARN) of the Amazon EventBridge bus to publish email events to. Only the default bus is supported. @@ -313,4 +313,4 @@ Using `terraform import`, import SESv2 (Simple Email V2) Configuration Set Event % terraform import aws_sesv2_configuration_set_event_destination.example example_configuration_set|example_event_destination ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/signer_signing_profile.html.markdown b/website/docs/cdktf/typescript/r/signer_signing_profile.html.markdown index 5083299aee9a..ee7e736a971c 100644 --- a/website/docs/cdktf/typescript/r/signer_signing_profile.html.markdown +++ b/website/docs/cdktf/typescript/r/signer_signing_profile.html.markdown @@ -56,6 +56,7 @@ This resource supports the following arguments: * `namePrefix` - (Optional, Forces new resource) A signing profile name prefix. Terraform will generate a unique suffix. Conflicts with `name`. * `signatureValidityPeriod` - (Optional, Forces new resource) The validity period for a signing job. See [`signatureValidityPeriod` Block](#signature_validity_period-block) below for details. * `signingMaterial` - (Optional, Forces new resource) The AWS Certificate Manager certificate that will be used to sign code with the new signing profile. See [`signingMaterial` Block](#signing_material-block) below for details. +* `signing_parameters` - (Optional, Forces new resource) Map of key-value pairs for signing. These can include any information that you want to use during signing. * `tags` - (Optional) A list of tags associated with the signing profile. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `signatureValidityPeriod` Block @@ -124,4 +125,4 @@ Using `terraform import`, import Signer signing profiles using the `name`. For e % terraform import aws_signer_signing_profile.test_signer_signing_profile test_sp_DdW3Mk1foYL88fajut4mTVFGpuwfd4ACO6ANL0D1uIj7lrn8adK ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/spot_instance_request.html.markdown b/website/docs/cdktf/typescript/r/spot_instance_request.html.markdown index a9f9b0afac27..19a3570d3c03 100644 --- a/website/docs/cdktf/typescript/r/spot_instance_request.html.markdown +++ b/website/docs/cdktf/typescript/r/spot_instance_request.html.markdown @@ -27,8 +27,8 @@ price availability or by a user. ~> **NOTE:** Because their behavior depends on the live status of the spot market, Spot Instance Requests have a unique lifecycle that makes them behave -differently than other Terraform resources. Most importantly: there is __no -guarantee__ that a Spot Instance exists to fulfill the request at any given +differently than other Terraform resources. Most importantly: there is **no +guarantee** that a Spot Instance exists to fulfill the request at any given point in time. See the [AWS Spot Instance documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-spot-instances.html) for more information. @@ -68,7 +68,9 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + Spot Instance Requests support all the same arguments as [`aws_instance`](instance.html), with the addition of: + * `spotPrice` - (Optional; Default: On-demand price) The maximum price to request on the spot market. * `waitForFulfillment` - (Optional; Default: false) If set, Terraform will wait for the Spot Request to be fulfilled, and will throw an error if the @@ -87,9 +89,9 @@ Spot Instance Requests support all the same arguments as [`aws_instance`](instan This resource exports the following attributes in addition to the arguments above: * `id` - The Spot Instance Request ID. +* `tagsAll` - A map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). -These attributes are exported, but they are expected to change over time and so -should only be used for informational purposes, not for resource dependencies: +The following attributes are exported, but they are expected to change over time and so should only be used for informational purposes, not for resource dependencies: * `spotBidStatus` - The current [bid status](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html) @@ -106,7 +108,6 @@ should only be used for informational purposes, not for resource dependencies: used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC * `privateIp` - The private IP address assigned to the instance -* `tagsAll` - A map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Timeouts @@ -116,4 +117,4 @@ should only be used for informational purposes, not for resource dependencies: * `read` - (Default `15m`) * `delete` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown index 34db8d0937b1..289fc2396cc7 100644 --- a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown @@ -98,6 +98,7 @@ If this canary tests an endpoint in a VPC, this structure contains information a * `subnetIds` - (Required) IDs of the subnets where this canary is to run. * `securityGroupIds` - (Required) IDs of the security groups for this canary. +* `ipv6AllowedForDualStack` - (Optional) If `true`, allow outbound IPv6 traffic on VPC canaries that are connected to dual-stack subnets. The default is `false`. ## Attribute Reference @@ -150,4 +151,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown b/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown index 98c05fc99a9d..f3cf28dabf75 100644 --- a/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown +++ b/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown @@ -305,7 +305,7 @@ If no security groups are specified, the VPC's [default security group](https:// * `ipv4` - (Optional) The IPv4 address to assign to the endpoint network interface in the subnet. You must provide an IPv4 address if the VPC endpoint supports IPv4. * `ipv6` - (Optional) The IPv6 address to assign to the endpoint network interface in the subnet. You must provide an IPv6 address if the VPC endpoint supports IPv6. -* `subnet` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnetIds` argument. +* `subnetId` - (Optional) The ID of the subnet. Must have a corresponding subnet in the `subnetIds` argument. ## Timeouts @@ -363,4 +363,4 @@ Using `terraform import`, import VPC Endpoints using the VPC endpoint `id`. For % terraform import aws_vpc_endpoint.endpoint1 vpce-3ecf2a57 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/vpc_ipam.html.markdown b/website/docs/cdktf/typescript/r/vpc_ipam.html.markdown index 6b53acc65fe2..4c11c3bcfa54 100644 --- a/website/docs/cdktf/typescript/r/vpc_ipam.html.markdown +++ b/website/docs/cdktf/typescript/r/vpc_ipam.html.markdown @@ -104,6 +104,7 @@ This resource supports the following arguments: * `cascade` - (Optional) Enables you to quickly delete an IPAM, private scopes, pools in private scopes, and any allocations in the pools in private scopes. * `description` - (Optional) A description for the IPAM. * `enablePrivateGua` - (Optional) Enable this option to use your own GUA ranges as private IPv6 addresses. Default: `false`. +* `metered_account` - (Optional) AWS account that is charged for active IP addresses managed in IPAM. Valid values are `ipam-owner` (default) and `resource-owner`. * `operatingRegions` - (Required) Determines which locales can be chosen when you create pools. Locale is the Region where you want to make an IPAM pool available for allocations. You can only create pools with locales that match the operating Regions of the IPAM. You can only create VPCs from a pool whose locale matches the VPC's Region. You specify a region using the [region_name](#operating_regions) parameter. You **must** set your provider block region as an operating_region. * `tier` - (Optional) specifies the IPAM tier. Valid options include `free` and `advanced`. Default is `advanced`. * `tags` - (Optional) A map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -154,4 +155,4 @@ Using `terraform import`, import IPAMs using the IPAM `id`. For example: % terraform import aws_vpc_ipam.example ipam-0178368ad2146a492 ``` - \ No newline at end of file + \ No newline at end of file From 64f57f054742e6bb9f8b4461b5fc7d59d3cd6452 Mon Sep 17 00:00:00 2001 From: jordanst3wart Date: Mon, 25 Aug 2025 22:10:34 +1000 Subject: [PATCH 0678/2115] tech debt: move to maintained yaml library (issue 43991) --- go.mod | 3 +-- internal/verify/verify.go | 2 +- internal/yaml/decode.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 0991a4540902..847ae680d558 100644 --- a/go.mod +++ b/go.mod @@ -275,6 +275,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/dlclark/regexp2 v1.11.5 github.com/gertd/go-pluralize v0.2.1 + github.com/goccy/go-yaml v1.18.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 @@ -311,7 +312,6 @@ require ( golang.org/x/text v0.28.0 golang.org/x/tools v0.36.0 gopkg.in/dnaeon/go-vcr.v4 v4.0.5 - gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -339,7 +339,6 @@ require ( github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/internal/verify/verify.go b/internal/verify/verify.go index 2b1d69fa3a09..5a9915d06b66 100644 --- a/internal/verify/verify.go +++ b/internal/verify/verify.go @@ -4,7 +4,7 @@ package verify import ( - "gopkg.in/yaml.v3" + "github.com/goccy/go-yaml" ) const UUIDRegexPattern = `[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[ab89][0-9a-f]{3}-[0-9a-f]{12}` diff --git a/internal/yaml/decode.go b/internal/yaml/decode.go index bc9082bd898b..f9725ffd37c4 100644 --- a/internal/yaml/decode.go +++ b/internal/yaml/decode.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "gopkg.in/yaml.v3" + "github.com/goccy/go-yaml" ) // DecodeFromBytes decodes (unmarshals) the given byte slice, containing valid YAML, into `to`. From 0a7086c38494d84a76e12396cc90fd601c42fb33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 12:51:22 +0000 Subject: [PATCH 0679/2115] Bump github.com/beevik/etree from 1.5.1 to 1.6.0 Bumps [github.com/beevik/etree](https://github.com/beevik/etree) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/beevik/etree/releases) - [Changelog](https://github.com/beevik/etree/blob/main/RELEASE_NOTES.md) - [Commits](https://github.com/beevik/etree/compare/v1.5.1...v1.6.0) --- updated-dependencies: - dependency-name: github.com/beevik/etree dependency-version: 1.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0991a4540902..180cbb01d5ab 100644 --- a/go.mod +++ b/go.mod @@ -270,7 +270,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 github.com/aws/smithy-go v1.22.5 - github.com/beevik/etree v1.5.1 + github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 github.com/davecgh/go-spew v1.1.1 github.com/dlclark/regexp2 v1.11.5 diff --git a/go.sum b/go.sum index e1e915e679c8..f2c907db7e19 100644 --- a/go.sum +++ b/go.sum @@ -563,8 +563,8 @@ github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVk github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= -github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= -github.com/beevik/etree v1.5.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= +github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= +github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= From 104882ff0a3f5013a12fa62dd5fe718e5a8793da Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 25 Aug 2025 13:17:52 +0000 Subject: [PATCH 0680/2115] Update CHANGELOG.md for #44014 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12e9457c5517..5f40f20ea2da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ ENHANCEMENTS: * data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) +* resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) @@ -17,11 +19,14 @@ ENHANCEMENTS: * resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_versioning: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_signer_signing_profile: Add `signing_parameters` argument ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) +* resource/aws_synthetics_canary: Add `vpc_config.ipv6_allowed_for_dual_stack` argument ([#43989](https://github.com/hashicorp/terraform-provider-aws/issues/43989)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) BUG FIXES: * data-source/aws_glue_catalog_table: Add `partition_keys.parameters` attribute ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) +* resource/aws_cognito_user_pool: Fixed to accept an empty `email_mfa_configuration` block ([#43926](https://github.com/hashicorp/terraform-provider-aws/issues/43926)) * resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) From c839abfec96d9732db9b9efec0c61a262f2c99e7 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 25 Aug 2025 13:37:51 +0000 Subject: [PATCH 0681/2115] Update CHANGELOG.md for #44023 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f40f20ea2da..9d5bedf06b0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ ENHANCEMENTS: * data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) +* resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) +* resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) @@ -27,8 +29,10 @@ BUG FIXES: * data-source/aws_glue_catalog_table: Add `partition_keys.parameters` attribute ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_cognito_user_pool: Fixed to accept an empty `email_mfa_configuration` block ([#43926](https://github.com/hashicorp/terraform-provider-aws/issues/43926)) +* resource/aws_dx_hosted_connection: Fix `DescribeHostedConnections failed for connection dxcon-xxxx doesn't exist` by pointing to the correct connection ID when doing the describe. ([#43499](https://github.com/hashicorp/terraform-provider-aws/issues/43499)) * resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) +* resource/aws_nat_gateway: Fix inconsistent final plan for `secondary_private_ip_addresses` ([#43708](https://github.com/hashicorp/terraform-provider-aws/issues/43708)) ## 6.10.0 (August 21, 2025) From 17d086b0f956f792441ce40c537bdae711526090 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Aug 2025 09:39:36 -0400 Subject: [PATCH 0682/2115] Bump the aws-sdk-go-v2 group across 1 directory with 30 updates (#44022) * Bump the aws-sdk-go-v2 group across 1 directory with 30 updates Bumps the aws-sdk-go-v2 group with 30 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/account](https://github.com/aws/aws-sdk-go-v2) | `1.27.2` | `1.28.0` | | [github.com/aws/aws-sdk-go-v2/service/apigateway](https://github.com/aws/aws-sdk-go-v2) | `1.34.2` | `1.35.0` | | [github.com/aws/aws-sdk-go-v2/service/apigatewayv2](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/codepipeline](https://github.com/aws/aws-sdk-go-v2) | `1.45.2` | `1.46.0` | | [github.com/aws/aws-sdk-go-v2/service/dataexchange](https://github.com/aws/aws-sdk-go-v2) | `1.38.2` | `1.39.0` | | [github.com/aws/aws-sdk-go-v2/service/docdb](https://github.com/aws/aws-sdk-go-v2) | `1.45.2` | `1.46.0` | | [github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing](https://github.com/aws/aws-sdk-go-v2) | `1.32.2` | `1.33.0` | | [github.com/aws/aws-sdk-go-v2/service/emrserverless](https://github.com/aws/aws-sdk-go-v2) | `1.35.2` | `1.36.0` | | [github.com/aws/aws-sdk-go-v2/service/firehose](https://github.com/aws/aws-sdk-go-v2) | `1.40.2` | `1.41.0` | | [github.com/aws/aws-sdk-go-v2/service/healthlake](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/launchwizard](https://github.com/aws/aws-sdk-go-v2) | `1.12.2` | `1.13.0` | | [github.com/aws/aws-sdk-go-v2/service/location](https://github.com/aws/aws-sdk-go-v2) | `1.48.2` | `1.49.0` | | [github.com/aws/aws-sdk-go-v2/service/macie2](https://github.com/aws/aws-sdk-go-v2) | `1.48.2` | `1.49.0` | | [github.com/aws/aws-sdk-go-v2/service/medialive](https://github.com/aws/aws-sdk-go-v2) | `1.80.2` | `1.81.0` | | [github.com/aws/aws-sdk-go-v2/service/memorydb](https://github.com/aws/aws-sdk-go-v2) | `1.30.2` | `1.31.0` | | [github.com/aws/aws-sdk-go-v2/service/networkmonitor](https://github.com/aws/aws-sdk-go-v2) | `1.11.2` | `1.12.0` | | [github.com/aws/aws-sdk-go-v2/service/organizations](https://github.com/aws/aws-sdk-go-v2) | `1.43.2` | `1.44.0` | | [github.com/aws/aws-sdk-go-v2/service/paymentcryptography](https://github.com/aws/aws-sdk-go-v2) | `1.22.2` | `1.23.0` | | [github.com/aws/aws-sdk-go-v2/service/pricing](https://github.com/aws/aws-sdk-go-v2) | `1.38.2` | `1.39.0` | | [github.com/aws/aws-sdk-go-v2/service/qldb](https://github.com/aws/aws-sdk-go-v2) | `1.29.2` | `1.30.0` | | [github.com/aws/aws-sdk-go-v2/service/rds](https://github.com/aws/aws-sdk-go-v2) | `1.103.2` | `1.103.3` | | [github.com/aws/aws-sdk-go-v2/service/redshiftdata](https://github.com/aws/aws-sdk-go-v2) | `1.36.2` | `1.37.0` | | [github.com/aws/aws-sdk-go-v2/service/rolesanywhere](https://github.com/aws/aws-sdk-go-v2) | `1.20.2` | `1.21.0` | | [github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness](https://github.com/aws/aws-sdk-go-v2) | `1.25.2` | `1.26.0` | | [github.com/aws/aws-sdk-go-v2/service/rum](https://github.com/aws/aws-sdk-go-v2) | `1.27.2` | `1.28.0` | | [github.com/aws/aws-sdk-go-v2/service/sagemaker](https://github.com/aws/aws-sdk-go-v2) | `1.211.1` | `1.212.0` | | [github.com/aws/aws-sdk-go-v2/service/servicediscovery](https://github.com/aws/aws-sdk-go-v2) | `1.39.2` | `1.39.3` | | [github.com/aws/aws-sdk-go-v2/service/sqs](https://github.com/aws/aws-sdk-go-v2) | `1.41.2` | `1.42.0` | | [github.com/aws/aws-sdk-go-v2/service/synthetics](https://github.com/aws/aws-sdk-go-v2) | `1.39.2` | `1.40.0` | | [github.com/aws/aws-sdk-go-v2/service/wafv2](https://github.com/aws/aws-sdk-go-v2) | `1.66.2` | `1.67.0` | Updates `github.com/aws/aws-sdk-go-v2/service/account` from 1.27.2 to 1.28.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.27.2...v1.28.0) Updates `github.com/aws/aws-sdk-go-v2/service/apigateway` from 1.34.2 to 1.35.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/pi/v1.34.2...v1.35.0) Updates `github.com/aws/aws-sdk-go-v2/service/apigatewayv2` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/codepipeline` from 1.45.2 to 1.46.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.45.2...service/s3/v1.46.0) Updates `github.com/aws/aws-sdk-go-v2/service/dataexchange` from 1.38.2 to 1.39.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.2...service/s3/v1.39.0) Updates `github.com/aws/aws-sdk-go-v2/service/docdb` from 1.45.2 to 1.46.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.45.2...service/s3/v1.46.0) Updates `github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing` from 1.32.2 to 1.33.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.32.2...v1.33.0) Updates `github.com/aws/aws-sdk-go-v2/service/emrserverless` from 1.35.2 to 1.36.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecr/v1.35.2...v1.36.0) Updates `github.com/aws/aws-sdk-go-v2/service/firehose` from 1.40.2 to 1.41.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.40.2...service/s3/v1.41.0) Updates `github.com/aws/aws-sdk-go-v2/service/healthlake` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/launchwizard` from 1.12.2 to 1.13.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.13.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/m2/v1.12.2...v1.13.0) Updates `github.com/aws/aws-sdk-go-v2/service/location` from 1.48.2 to 1.49.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/eks/v1.48.2...service/s3/v1.49.0) Updates `github.com/aws/aws-sdk-go-v2/service/macie2` from 1.48.2 to 1.49.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/eks/v1.48.2...service/s3/v1.49.0) Updates `github.com/aws/aws-sdk-go-v2/service/medialive` from 1.80.2 to 1.81.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.80.2...service/s3/v1.81.0) Updates `github.com/aws/aws-sdk-go-v2/service/memorydb` from 1.30.2 to 1.31.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.30.2...v1.31.0) Updates `github.com/aws/aws-sdk-go-v2/service/networkmonitor` from 1.11.2 to 1.12.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.12.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.11.2...v1.12.0) Updates `github.com/aws/aws-sdk-go-v2/service/organizations` from 1.43.2 to 1.44.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ssm/v1.43.2...service/s3/v1.44.0) Updates `github.com/aws/aws-sdk-go-v2/service/paymentcryptography` from 1.22.2 to 1.23.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.22.2...v1.23.0) Updates `github.com/aws/aws-sdk-go-v2/service/pricing` from 1.38.2 to 1.39.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.2...service/s3/v1.39.0) Updates `github.com/aws/aws-sdk-go-v2/service/qldb` from 1.29.2 to 1.30.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.29.2...v1.30.0) Updates `github.com/aws/aws-sdk-go-v2/service/rds` from 1.103.2 to 1.103.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.103.2...service/rds/v1.103.3) Updates `github.com/aws/aws-sdk-go-v2/service/redshiftdata` from 1.36.2 to 1.37.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.36.2...v1.37.0) Updates `github.com/aws/aws-sdk-go-v2/service/rolesanywhere` from 1.20.2 to 1.21.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.20.2...v1.21.0) Updates `github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness` from 1.25.2 to 1.26.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.25.2...v1.26.0) Updates `github.com/aws/aws-sdk-go-v2/service/rum` from 1.27.2 to 1.28.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.27.2...v1.28.0) Updates `github.com/aws/aws-sdk-go-v2/service/sagemaker` from 1.211.1 to 1.212.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.211.1...service/ec2/v1.212.0) Updates `github.com/aws/aws-sdk-go-v2/service/servicediscovery` from 1.39.2 to 1.39.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ivs/v1.39.2...service/iot/v1.39.3) Updates `github.com/aws/aws-sdk-go-v2/service/sqs` from 1.41.2 to 1.42.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/kms/v1.41.2...service/s3/v1.42.0) Updates `github.com/aws/aws-sdk-go-v2/service/synthetics` from 1.39.2 to 1.40.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ivs/v1.39.2...service/s3/v1.40.0) Updates `github.com/aws/aws-sdk-go-v2/service/wafv2` from 1.66.2 to 1.67.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.66.2...service/s3/v1.67.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/account dependency-version: 1.28.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigateway dependency-version: 1.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigatewayv2 dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codepipeline dependency-version: 1.46.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dataexchange dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdb dependency-version: 1.46.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrserverless dependency-version: 1.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/firehose dependency-version: 1.41.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/healthlake dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/launchwizard dependency-version: 1.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/location dependency-version: 1.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/macie2 dependency-version: 1.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/medialive dependency-version: 1.81.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/memorydb dependency-version: 1.31.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmonitor dependency-version: 1.12.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/organizations dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/paymentcryptography dependency-version: 1.23.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pricing dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qldb dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.103.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftdata dependency-version: 1.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rolesanywhere dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness dependency-version: 1.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rum dependency-version: 1.28.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.212.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicediscovery dependency-version: 1.39.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sqs dependency-version: 1.42.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/synthetics dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafv2 dependency-version: 1.67.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 60 ++++++++++----------- go.sum | 120 +++++++++++++++++++++--------------------- tools/tfsdk2fw/go.mod | 60 ++++++++++----------- tools/tfsdk2fw/go.sum | 120 +++++++++++++++++++++--------------------- 4 files changed, 180 insertions(+), 180 deletions(-) diff --git a/go.mod b/go.mod index 180cbb01d5ab..9ca3abd96615 100644 --- a/go.mod +++ b/go.mod @@ -17,13 +17,13 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 - github.com/aws/aws-sdk-go-v2/service/account v1.27.2 + github.com/aws/aws-sdk-go-v2/service/account v1.28.0 github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 @@ -111,18 +111,18 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 @@ -156,23 +156,23 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 - github.com/aws/aws-sdk-go-v2/service/location v1.48.2 + github.com/aws/aws-sdk-go-v2/service/location v1.49.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 @@ -180,52 +180,52 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 - github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 + github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 - github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 @@ -234,7 +234,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 @@ -242,7 +242,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 @@ -253,7 +253,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 @@ -264,7 +264,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 diff --git a/go.sum b/go.sum index f2c907db7e19..bc200e03ce41 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQe github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= -github.com/aws/aws-sdk-go-v2/service/account v1.27.2 h1:3Ty4wy83i58eNiElTpf7Ya9BFpVOdPonfk49jJCIFsY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.2/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= +github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= +github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= @@ -55,10 +55,10 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMM github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 h1:Rfqqo14uUh05AQcrgmigh4s6AECbanfGEEJYfj0qgmg= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 h1:PPj2SnoPf4VA3fQenKKSIqKL2kavEiBqGDRMTuAC3nw= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3XMA6l2E/6AjeZs7Os/+8Ts= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= @@ -151,8 +151,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 h1:N1wHW0oAUV2ao2m7nO4GrfdjXklCM7JQLEQ1e0zBJV4= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DA github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 h1:VX9zcDqLRdrhkIdvm8sQJBIbfz9OvmH5UZJn8K7g10s= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2MLkq48cxD5vMwr7Dexcrp0fiX4= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= @@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 h1:CPpJPsaVCpno+RaolifsilbkrCXj63o9BskbmuNP6ZU= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= @@ -233,8 +233,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuU github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 h1:5gfKj9+gRRVTzsrDp1z8AoEuSV3iLZpDJTiKsSqet6I= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= @@ -245,8 +245,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOX github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 h1:1PO/iNikPYeD+b4vGIC0D/kmlHFNr+K9Ti/sL4PmJ90= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 h1:narXLgKIbS6nFYldm57umsw1aExyMbxLdzKA4spdiaw= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03i github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 h1:NEiSwGWC395TVfy8mHw1wxLYjJqQ3qJwtk0BHmpiDh4= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= @@ -333,8 +333,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 h1:SKdQK4/Q7vIKIUtDd09ip69rahh6e+hOtfCYgNvtDEw= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= @@ -343,20 +343,20 @@ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.2 h1:/6HHSaPooetm78X+kIp9pLr4f/cWKA/uKvFvI1Tih0o= -github.com/aws/aws-sdk-go-v2/service/location v1.48.2/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= +github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= +github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 h1:EP6rsrGrKlJ5mBsODeBBcoqHf/tX42Za/m8yJLiKWRg= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 h1:JaDARBJwqzSg3Ccclf9Gzw/+kqG+orqGQAKUyWfsUQs= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= @@ -365,8 +365,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 h1:QjVz2wrfmEEpu8G3FEo9gF3umZvi7unsG1b99FtkyzE= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= @@ -381,8 +381,8 @@ github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OU github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 h1:JOdUdSV9RDvZyNt3/oWlIk2y4hddH2vqn6BK6dqJ9VI= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 h1:6n/+GvyaH5iBi2F5HAFvpuaPPQBTeHOltEBaP3T5/7Q= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= @@ -395,14 +395,14 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFV github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 h1:XJOb8AutXqrywbDXa5nlIr+0G93AlUltuYoXWHprCyE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 h1:nk8xdDkgWZAU8GHr4WUUCaevs/98WVPPelgRGxsNh4A= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= @@ -415,24 +415,24 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 h1:/8mz+v/viFY1i8d3+sVCZi7T64D5eRmN9FM5EonxuGI= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 h1:Z0hXXBcnqPdpmQwf/LNIaqlgxcDs5BWC74JR0sX8sw8= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 h1:U0b+yGV+uu+9JHOfn9bUHPJIenoelWvc4xLN35JgKfI= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.2/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 h1:hdwUjAp9efZ3RMpdndoPG4SM/LXmyp0SZ9AaBoPUcOk= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= @@ -445,8 +445,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 h1:o69fIeRrr7TdDBGq9uh9y/4Y/5xMJLSN/LBMIZ0fJGk= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= @@ -455,12 +455,12 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 h1:FFQjXqKbTFgN/BT9/4YinF3vwUeiZ3rGyhLJ71v0k2Q= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZflpVAJzIAqt3xb3Es6xd/NksnH6XwK956lKUg= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 h1:STec5l4m/cd+VUPDC+4pBqGgTFTanelfJoKiHcobT/M= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.2/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 h1:qfHLulL2U0MkQ6d339wUtc5B2xoFWLQAHNOoWpGXD7c= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.0/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= @@ -471,8 +471,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6Eq github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 h1:H3iWnVnEPYD8JOkKIvgALPCTbinIoebBTrNfOAZ+sJY= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 h1:diWWTewadd8nspQ4cLgB8agJa+iGZKOB86xXSzoVWKo= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= @@ -489,8 +489,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uK github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 h1:5m5YPqPzZ2kunWiC3pld0wHcwWzx/U9/VFpWfkc1OJg= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAf github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 h1:yBi89yZecBo3z/lKtOYwveOyGYBCqusZb6GbircmPXU= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 h1:dbxXhQu0wVhmGY8qnSXUEFZ4ZfQFTjBDEadxsmgtdS8= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= @@ -529,8 +529,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 h1:NXywrPzON1EICJEvKKI7yaQ8XCzNhsJQUsD95stqZpw= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= @@ -551,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 h1:7PbqJKf+IU/y12Wn63vOw6PTHXfGp/aWeD4MfEfFRGo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index b75c10a158a3..9d534a3a0576 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -29,13 +29,13 @@ require ( github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 // indirect github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 // indirect github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 // indirect @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 // indirect @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 // indirect github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 // indirect github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 // indirect github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 // indirect @@ -110,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 // indirect github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 // indirect @@ -123,18 +123,18 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 // indirect github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 // indirect github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 // indirect github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 // indirect github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 // indirect github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 // indirect github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 // indirect @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 // indirect github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 // indirect @@ -173,23 +173,23 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 // indirect github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 // indirect github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 // indirect github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 // indirect @@ -197,52 +197,52 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 // indirect github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 // indirect github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 // indirect github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 // indirect github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 // indirect github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 // indirect github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 // indirect github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 // indirect github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 // indirect github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 // indirect github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 // indirect github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 // indirect github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 // indirect github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 // indirect @@ -251,7 +251,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 // indirect github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 // indirect @@ -259,7 +259,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 // indirect @@ -271,7 +271,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 // indirect github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 // indirect github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 // indirect github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 // indirect @@ -282,7 +282,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 // indirect github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 786ea3280559..2082bf8757b5 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -45,8 +45,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQe github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= -github.com/aws/aws-sdk-go-v2/service/account v1.27.2 h1:3Ty4wy83i58eNiElTpf7Ya9BFpVOdPonfk49jJCIFsY= -github.com/aws/aws-sdk-go-v2/service/account v1.27.2/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= +github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= +github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= @@ -55,10 +55,10 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMM github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2 h1:Rfqqo14uUh05AQcrgmigh4s6AECbanfGEEJYfj0qgmg= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.34.2/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2 h1:PPj2SnoPf4VA3fQenKKSIqKL2kavEiBqGDRMTuAC3nw= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.31.2/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3XMA6l2E/6AjeZs7Os/+8Ts= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= @@ -151,8 +151,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2 h1:N1wHW0oAUV2ao2m7nO4GrfdjXklCM7JQLEQ1e0zBJV4= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.45.2/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DA github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2 h1:VX9zcDqLRdrhkIdvm8sQJBIbfz9OvmH5UZJn8K7g10s= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.38.2/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2MLkq48cxD5vMwr7Dexcrp0fiX4= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= @@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2 h1:CPpJPsaVCpno+RaolifsilbkrCXj63o9BskbmuNP6ZU= -github.com/aws/aws-sdk-go-v2/service/docdb v1.45.2/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= @@ -233,8 +233,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuU github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2 h1:5gfKj9+gRRVTzsrDp1z8AoEuSV3iLZpDJTiKsSqet6I= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.32.2/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= @@ -245,8 +245,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOX github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2 h1:1PO/iNikPYeD+b4vGIC0D/kmlHFNr+K9Ti/sL4PmJ90= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.35.2/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2 h1:narXLgKIbS6nFYldm57umsw1aExyMbxLdzKA4spdiaw= -github.com/aws/aws-sdk-go-v2/service/firehose v1.40.2/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03i github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2 h1:NEiSwGWC395TVfy8mHw1wxLYjJqQ3qJwtk0BHmpiDh4= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.33.2/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= @@ -333,8 +333,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2 h1:SKdQK4/Q7vIKIUtDd09ip69rahh6e+hOtfCYgNvtDEw= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.12.2/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= @@ -343,20 +343,20 @@ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= -github.com/aws/aws-sdk-go-v2/service/location v1.48.2 h1:/6HHSaPooetm78X+kIp9pLr4f/cWKA/uKvFvI1Tih0o= -github.com/aws/aws-sdk-go-v2/service/location v1.48.2/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= +github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= +github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2 h1:EP6rsrGrKlJ5mBsODeBBcoqHf/tX42Za/m8yJLiKWRg= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.48.2/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2 h1:JaDARBJwqzSg3Ccclf9Gzw/+kqG+orqGQAKUyWfsUQs= -github.com/aws/aws-sdk-go-v2/service/medialive v1.80.2/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= @@ -365,8 +365,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2 h1:QjVz2wrfmEEpu8G3FEo9gF3umZvi7unsG1b99FtkyzE= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.30.2/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= @@ -381,8 +381,8 @@ github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OU github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2 h1:JOdUdSV9RDvZyNt3/oWlIk2y4hddH2vqn6BK6dqJ9VI= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.11.2/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 h1:6n/+GvyaH5iBi2F5HAFvpuaPPQBTeHOltEBaP3T5/7Q= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= @@ -395,14 +395,14 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFV github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2 h1:XJOb8AutXqrywbDXa5nlIr+0G93AlUltuYoXWHprCyE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.43.2/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2 h1:nk8xdDkgWZAU8GHr4WUUCaevs/98WVPPelgRGxsNh4A= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.22.2/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= @@ -415,24 +415,24 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2 h1:/8mz+v/viFY1i8d3+sVCZi7T64D5eRmN9FM5EonxuGI= -github.com/aws/aws-sdk-go-v2/service/pricing v1.38.2/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2 h1:Z0hXXBcnqPdpmQwf/LNIaqlgxcDs5BWC74JR0sX8sw8= -github.com/aws/aws-sdk-go-v2/service/qldb v1.29.2/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.2 h1:U0b+yGV+uu+9JHOfn9bUHPJIenoelWvc4xLN35JgKfI= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.2/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2 h1:hdwUjAp9efZ3RMpdndoPG4SM/LXmyp0SZ9AaBoPUcOk= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.36.2/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= @@ -445,8 +445,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2 h1:o69fIeRrr7TdDBGq9uh9y/4Y/5xMJLSN/LBMIZ0fJGk= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.20.2/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= @@ -455,12 +455,12 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2 h1:FFQjXqKbTFgN/BT9/4YinF3vwUeiZ3rGyhLJ71v0k2Q= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.25.2/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZflpVAJzIAqt3xb3Es6xd/NksnH6XwK956lKUg= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.2 h1:STec5l4m/cd+VUPDC+4pBqGgTFTanelfJoKiHcobT/M= -github.com/aws/aws-sdk-go-v2/service/rum v1.27.2/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 h1:qfHLulL2U0MkQ6d339wUtc5B2xoFWLQAHNOoWpGXD7c= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.0/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= @@ -471,8 +471,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6Eq github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1 h1:H3iWnVnEPYD8JOkKIvgALPCTbinIoebBTrNfOAZ+sJY= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.211.1/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 h1:diWWTewadd8nspQ4cLgB8agJa+iGZKOB86xXSzoVWKo= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= @@ -489,8 +489,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uK github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2 h1:5m5YPqPzZ2kunWiC3pld0wHcwWzx/U9/VFpWfkc1OJg= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.2/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAf github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2 h1:yBi89yZecBo3z/lKtOYwveOyGYBCqusZb6GbircmPXU= -github.com/aws/aws-sdk-go-v2/service/sqs v1.41.2/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 h1:dbxXhQu0wVhmGY8qnSXUEFZ4ZfQFTjBDEadxsmgtdS8= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= @@ -529,8 +529,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2 h1:NXywrPzON1EICJEvKKI7yaQ8XCzNhsJQUsD95stqZpw= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.39.2/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= @@ -551,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2 h1:7PbqJKf+IU/y12Wn63vOw6PTHXfGp/aWeD4MfEfFRGo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.66.2/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= From ccd5b9f2fb222cfbf988975c03b707214258f365 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 09:44:48 -0400 Subject: [PATCH 0683/2115] Update internal/service/workspacesweb/trust_store_test.go Co-authored-by: Jared Baker --- internal/service/workspacesweb/trust_store_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index df458e35b3ca..3298ccd44568 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -23,7 +23,6 @@ func TestAccWorkSpacesWebTrustStore_basic(t *testing.T) { ctx := acctest.Context(t) var trustStore awstypes.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { From 1d2a974caf3329f83d860be20a960dee6e4a7d41 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 09:52:53 -0400 Subject: [PATCH 0684/2115] Remove commented-out line. --- internal/service/workspacesweb/trust_store_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/service/workspacesweb/trust_store_test.go b/internal/service/workspacesweb/trust_store_test.go index 3298ccd44568..4b4bae7e7434 100644 --- a/internal/service/workspacesweb/trust_store_test.go +++ b/internal/service/workspacesweb/trust_store_test.go @@ -63,7 +63,6 @@ func TestAccWorkSpacesWebTrustStore_multipleCerts(t *testing.T) { ctx := acctest.Context(t) var trustStore awstypes.TrustStore resourceName := "aws_workspacesweb_trust_store.test" - //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -109,7 +108,6 @@ func TestAccWorkSpacesWebTrustStore_multipleCerts(t *testing.T) { func TestAccWorkSpacesWebTrustStore_disappears(t *testing.T) { ctx := acctest.Context(t) var trustStore awstypes.TrustStore - //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) resourceName := "aws_workspacesweb_trust_store.test" resource.ParallelTest(t, resource.TestCase{ @@ -137,7 +135,6 @@ func TestAccWorkSpacesWebTrustStore_disappears(t *testing.T) { func TestAccWorkSpacesWebTrustStore_update(t *testing.T) { ctx := acctest.Context(t) var trustStore awstypes.TrustStore - //caKey := acctest.TLSRSAPrivateKeyPEM(t, 2048) resourceName := "aws_workspacesweb_trust_store.test" resource.ParallelTest(t, resource.TestCase{ From 0acec277164ede0d542265da7279f89213b44702 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 09:55:14 -0400 Subject: [PATCH 0685/2115] r/aws_quicksight_account_subscription(doc): add note on import limitations (#44005) Due to the limited fields returned by the `DescribeAccountSettings` API, an imported account subscription resource will always be immediately planned for replacement in the absence of an `ignore_changes` lifecycle argument. This adds a note to the registry documentation describing this limitation. --- website/docs/r/quicksight_account_subscription.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/quicksight_account_subscription.html.markdown b/website/docs/r/quicksight_account_subscription.html.markdown index 5b76193bfa1e..42adb2c206c0 100644 --- a/website/docs/r/quicksight_account_subscription.html.markdown +++ b/website/docs/r/quicksight_account_subscription.html.markdown @@ -65,6 +65,8 @@ This resource exports the following attributes in addition to the arguments abov In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Account Subscription using `aws_account_id`. For example: +~> Due to the absence of required arguments in the [`DescribeAccountSettings`](https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeAccountSettings.html) API response, importing an existing account subscription will result in a planned replacement on the subsequent `apply` operation. Until the Describe API response in extended to include all configurable arguments, an [`ignore_changes` lifecycle argument](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle#ignore_changes) can be used to suppress differences on arguments not read into state. + ```terraform import { to = aws_quicksight_account_subscription.example From 553f03e7f497bca314de0d75cf168e721a83e24a Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 25 Aug 2025 14:00:16 +0000 Subject: [PATCH 0686/2115] Update CHANGELOG.md for #44005 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d5bedf06b0b..8ce9ae924d69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ ENHANCEMENTS: * resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) +* resource/aws_kms_external_key: Add `key_spec` argument ([#44011](https://github.com/hashicorp/terraform-provider-aws/issues/44011)) +* resource/aws_kms_external_key: Change `key_usage` to Optional and Computed ([#44011](https://github.com/hashicorp/terraform-provider-aws/issues/44011)) +* resource/aws_lb: Add `secondary_ips_auto_assigned_per_subnet` argument for Network Load Balancers ([#43699](https://github.com/hashicorp/terraform-provider-aws/issues/43699)) * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) From cead37b6fcade1a852eda7f9d39610acadf08adb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 09:42:58 -0400 Subject: [PATCH 0687/2115] Tweak return type of 'findTableEncryption'. --- internal/service/s3tables/table.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/s3tables/table.go b/internal/service/s3tables/table.go index a48b29cbe760..fdf15d2f7cae 100644 --- a/internal/service/s3tables/table.go +++ b/internal/service/s3tables/table.go @@ -358,7 +358,7 @@ func (r *tableResource) Create(ctx context.Context, request resource.CreateReque data.MaintenanceConfiguration = value } - outputGTE, err := findTableEncryptionByThreePartKey(ctx, conn, tableBucketARN, namespace, name) + awsEncryptionConfig, err := findTableEncryptionByThreePartKey(ctx, conn, tableBucketARN, namespace, name) switch { case tfresource.NotFound(err): @@ -368,7 +368,7 @@ func (r *tableResource) Create(ctx context.Context, request resource.CreateReque return default: var encryptionConfiguration encryptionConfigurationModel - response.Diagnostics.Append(fwflex.Flatten(ctx, outputGTE.EncryptionConfiguration, &encryptionConfiguration)...) + response.Diagnostics.Append(fwflex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) if response.Diagnostics.HasError() { return } @@ -431,7 +431,7 @@ func (r *tableResource) Read(ctx context.Context, request resource.ReadRequest, data.MaintenanceConfiguration = value } - outputGTE, err := findTableEncryptionByThreePartKey(ctx, conn, tableBucketARN, namespace, name) + awsEncryptionConfig, err := findTableEncryptionByThreePartKey(ctx, conn, tableBucketARN, namespace, name) switch { case tfresource.NotFound(err): @@ -441,7 +441,7 @@ func (r *tableResource) Read(ctx context.Context, request resource.ReadRequest, return default: var encryptionConfiguration encryptionConfigurationModel - response.Diagnostics.Append(fwflex.Flatten(ctx, outputGTE.EncryptionConfiguration, &encryptionConfiguration)...) + response.Diagnostics.Append(fwflex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) if response.Diagnostics.HasError() { return } @@ -622,18 +622,18 @@ func (r *tableResource) Delete(ctx context.Context, request resource.DeleteReque } } -func (r *tableResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - identifier, err := parseTableIdentifier(req.ID) +func (r *tableResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + identifier, err := parseTableIdentifier(request.ID) if err != nil { - resp.Diagnostics.AddError( + response.Diagnostics.AddError( "Invalid Import ID", "Import IDs for S3 Tables Tables must use the format "+tableIDSeparator+""+tableIDSeparator+"
.\n"+ - fmt.Sprintf("Had %q", req.ID), + fmt.Sprintf("Had %q", request.ID), ) return } - identifier.PopulateState(ctx, &resp.State, &resp.Diagnostics) + identifier.PopulateState(ctx, &response.State, &response.Diagnostics) } func findTableByThreePartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace, name string) (*s3tables.GetTableOutput, error) { @@ -666,7 +666,7 @@ func findTable(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTa return output, nil } -func findTableEncryptionByThreePartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace, name string) (*s3tables.GetTableEncryptionOutput, error) { +func findTableEncryptionByThreePartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace, name string) (*awstypes.EncryptionConfiguration, error) { input := s3tables.GetTableEncryptionInput{ Name: aws.String(name), Namespace: aws.String(namespace), @@ -676,7 +676,7 @@ func findTableEncryptionByThreePartKey(ctx context.Context, conn *s3tables.Clien return findTableEncryption(ctx, conn, &input) } -func findTableEncryption(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableEncryptionInput) (*s3tables.GetTableEncryptionOutput, error) { +func findTableEncryption(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableEncryptionInput) (*awstypes.EncryptionConfiguration, error) { output, err := conn.GetTableEncryption(ctx, input) if errs.IsA[*awstypes.NotFoundException](err) { @@ -689,11 +689,11 @@ func findTableEncryption(ctx context.Context, conn *s3tables.Client, input *s3ta return nil, err } - if output == nil { + if output == nil || output.EncryptionConfiguration == nil { return nil, tfresource.NewEmptyResultError(input) } - return output, nil + return output.EncryptionConfiguration, nil } func findTableMaintenanceConfigurationByThreePartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace, name string) (*s3tables.GetTableMaintenanceConfigurationOutput, error) { From bf6af91bd05c9bcf6c21b190386ee331779c8726 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 11:28:43 -0400 Subject: [PATCH 0688/2115] Add parameterized resource identity to `aws_route_table` (#43990) * Add parameterized resource identity to `aws_route_table` Adds resource identity support to the `aws_route_table` resource. This is a parameterized resource with a single attribute, `id`, corresponding to the route table ID generated by AWS during creation. ```console % make testacc PKG=vpc TESTS=TestAccVPCRouteTable_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCRouteTable_' -timeout 360m -vet=off 2025/08/21 13:17:04 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/21 13:17:04 Initializing Terraform AWS Provider (SDKv2-style)... === NAME TestAccVPCRouteTable_ipv4ToCarrierGateway wavelength_carrier_gateway_test.go:198: skipping since no Wavelength Zones are available --- SKIP: TestAccVPCRouteTable_ipv4ToCarrierGateway (0.97s) === CONT TestAccVPCRouteTable_Disappears_subnetAssociation === NAME TestAccVPCRouteTable_ipv4ToLocalGateway vpc_route_table_test.go:495: skipping since no Outposts found --- SKIP: TestAccVPCRouteTable_ipv4ToLocalGateway (0.97s) === CONT TestAccVPCRouteTable_tags_EmptyMap --- PASS: TestAccVPCRouteTable_requireRouteTarget (19.75s) === CONT TestAccVPCRouteTable_ipv4ToNatGateway --- PASS: TestAccVPCRouteTable_disappears (28.20s) === CONT TestAccVPCRouteTable_conditionalCIDRBlock --- PASS: TestAccVPCRouteTable_Disappears_subnetAssociation (36.47s) === CONT TestAccVPCRouteTable_Identity_ExistingResource --- PASS: TestAccVPCRouteTable_ipv4ToVPCPeeringConnection (43.15s) === CONT TestAccVPCRouteTable_tags --- PASS: TestAccVPCRouteTable_gatewayVPCEndpoint (51.46s) === CONT TestAccVPCRouteTable_tags_DefaultTags_providerOnly --- PASS: TestAccVPCRouteTable_ipv4ToInternetGateway (54.56s) === CONT TestAccVPCRouteTable_tags_DefaultTags_overlapping --- PASS: TestAccVPCRouteTable_IPv6ToNetworkInterface_unattached (57.32s) === CONT TestAccVPCRouteTable_tags_DefaultTags_nonOverlapping --- PASS: TestAccVPCRouteTable_Identity_Basic (59.24s) === CONT TestAccVPCRouteTable_Identity_RegionOverride --- PASS: TestAccVPCRouteTable_vpcMultipleCIDRs (61.01s) === CONT TestAccVPCRouteTable_tags_ComputedTag_OnCreate --- PASS: TestAccVPCRouteTable_tags_null (62.69s) === CONT TestAccVPCRouteTable_basic === CONT TestAccVPCRouteTable_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccVPCRouteTable_tags_EmptyMap (62.09s) --- PASS: TestAccVPCRouteTable_tags_AddOnUpdate (69.31s) === CONT TestAccVPCRouteTable_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccVPCRouteTable_tags_DefaultTags_updateToProviderOnly (69.89s) === CONT TestAccVPCRouteTable_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccVPCRouteTable_tags_EmptyTag_OnCreate (71.42s) === CONT TestAccVPCRouteTable_tags_ComputedTag_OnUpdate_Add --- PASS: TestAccVPCRouteTable_ipv6ToEgressOnlyInternetGateway (73.04s) === CONT TestAccVPCRouteTable_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccVPCRouteTable_Route_mode (95.32s) === CONT TestAccVPCRouteTable_localRoute --- PASS: TestAccVPCRouteTable_basic (37.07s) === CONT TestAccVPCRouteTable_localRouteImportUpdate --- PASS: TestAccVPCRouteTable_conditionalCIDRBlock (73.56s) === CONT TestAccVPCRouteTable_localRouteAdoptUpdate --- PASS: TestAccVPCRouteTable_tags_ComputedTag_OnCreate (41.95s) === CONT TestAccVPCRouteTable_ipv4ToVPCEndpoint --- PASS: TestAccVPCRouteTable_ipv4ToInstance (104.02s) === CONT TestAccVPCRouteTable_tags_DefaultTags_emptyProviderOnlyTag --- PASS: TestAccVPCRouteTable_Identity_RegionOverride (51.99s) === CONT TestAccVPCRouteTable_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccVPCRouteTable_IPv4ToNetworkInterfaces_unattached (113.85s) === CONT TestAccVPCRouteTable_tags_DefaultTags_nullOverlappingResourceTag --- PASS: TestAccVPCRouteTable_Identity_ExistingResource (78.37s) === CONT TestAccVPCRouteTable_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccVPCRouteTable_localRoute (39.07s) === CONT TestAccVPCRouteTable_ipv4ToTransitGateway --- PASS: TestAccVPCRouteTable_requireRouteDestination (138.48s) === CONT TestAccVPCRouteTable_prefixListToInternetGateway --- PASS: TestAccVPCRouteTable_tags_ComputedTag_OnUpdate_Replace (69.80s) === CONT TestAccVPCRouteTable_multipleRoutes --- PASS: TestAccVPCRouteTable_tags_EmptyTag_OnUpdate_Replace (70.14s) === CONT TestAccVPCRouteTable_tags_DefaultTags_emptyResourceTag --- PASS: TestAccVPCRouteTable_tags_ComputedTag_OnUpdate_Add (73.52s) === CONT TestAccVPCRouteTable_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccVPCRouteTable_tags_DefaultTags_emptyProviderOnlyTag (43.76s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_nullNonOverlappingResourceTag (40.17s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_nullOverlappingResourceTag (41.32s) --- PASS: TestAccVPCRouteTable_tags_IgnoreTags_Overlap_DefaultTag (86.41s) --- PASS: TestAccVPCRouteTable_tags_IgnoreTags_Overlap_ResourceTag (93.90s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_nonOverlapping (107.59s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_overlapping (111.61s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_emptyResourceTag (29.39s) --- PASS: TestAccVPCRouteTable_tags (130.41s) --- PASS: TestAccVPCRouteTable_prefixListToInternetGateway (36.61s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_providerOnly (127.03s) --- PASS: TestAccVPCRouteTable_vgwRoutePropagation (178.90s) --- PASS: TestAccVPCRouteTable_localRouteAdoptUpdate (78.25s) --- PASS: TestAccVPCRouteTable_tags_EmptyTag_OnUpdate_Add (72.19s) --- PASS: TestAccVPCRouteTable_tags_DefaultTags_updateToResourceOnly (43.74s) --- PASS: TestAccVPCRouteTable_localRouteImportUpdate (102.11s) --- PASS: TestAccVPCRouteTable_ipv4ToNatGateway (197.80s) --- PASS: TestAccVPCRouteTable_multipleRoutes (143.25s) --- PASS: TestAccVPCRouteTable_ipv4ToVPCEndpoint (370.55s) --- PASS: TestAccVPCRouteTable_ipv4ToTransitGateway (399.89s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 540.977s ``` * r/aws_route_table(doc): add import by identity instructions * chore: fix tfproviderdocs lint * chore: fix markdown-lint finding --- .changelog/43990.txt | 3 + internal/service/ec2/service_package_gen.go | 6 +- .../ec2/testdata/RouteTable/basic/main_gen.tf | 11 + .../RouteTable/basic_v6.9.0/main_gen.tf | 21 ++ .../RouteTable/region_override/main_gen.tf | 21 ++ .../testdata/tmpl/vpc_route_table_tags.gtpl | 2 + internal/service/ec2/vpc_route_table.go | 6 +- .../ec2/vpc_route_table_identity_gen_test.go | 231 ++++++++++++++++++ website/docs/r/route_table.html.markdown | 26 ++ 9 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 .changelog/43990.txt create mode 100644 internal/service/ec2/testdata/RouteTable/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/RouteTable/basic_v6.9.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/RouteTable/region_override/main_gen.tf create mode 100644 internal/service/ec2/vpc_route_table_identity_gen_test.go diff --git a/.changelog/43990.txt b/.changelog/43990.txt new file mode 100644 index 000000000000..6f6611213fc0 --- /dev/null +++ b/.changelog/43990.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_route_table: Add resource identity support +``` diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index a375e325575d..9abecc066055 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -1412,7 +1412,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceRouteTableAssociation, diff --git a/internal/service/ec2/testdata/RouteTable/basic/main_gen.tf b/internal/service/ec2/testdata/RouteTable/basic/main_gen.tf new file mode 100644 index 000000000000..c4b31f642229 --- /dev/null +++ b/internal/service/ec2/testdata/RouteTable/basic/main_gen.tf @@ -0,0 +1,11 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route_table" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" +} + diff --git a/internal/service/ec2/testdata/RouteTable/basic_v6.9.0/main_gen.tf b/internal/service/ec2/testdata/RouteTable/basic_v6.9.0/main_gen.tf new file mode 100644 index 000000000000..16206b2738fe --- /dev/null +++ b/internal/service/ec2/testdata/RouteTable/basic_v6.9.0/main_gen.tf @@ -0,0 +1,21 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route_table" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" +} + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.9.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/RouteTable/region_override/main_gen.tf b/internal/service/ec2/testdata/RouteTable/region_override/main_gen.tf new file mode 100644 index 000000000000..8322514840aa --- /dev/null +++ b/internal/service/ec2/testdata/RouteTable/region_override/main_gen.tf @@ -0,0 +1,21 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route_table" "test" { + region = var.region + + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.1.0.0/16" +} + + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/tmpl/vpc_route_table_tags.gtpl b/internal/service/ec2/testdata/tmpl/vpc_route_table_tags.gtpl index bf1e66e1abe5..909ac3392652 100644 --- a/internal/service/ec2/testdata/tmpl/vpc_route_table_tags.gtpl +++ b/internal/service/ec2/testdata/tmpl/vpc_route_table_tags.gtpl @@ -1,9 +1,11 @@ resource "aws_route_table" "test" { +{{- template "region" }} vpc_id = aws_vpc.test.id {{- template "tags" . }} } resource "aws_vpc" "test" { +{{- template "region" }} cidr_block = "10.1.0.0/16" } diff --git a/internal/service/ec2/vpc_route_table.go b/internal/service/ec2/vpc_route_table.go index 9bc6ed77016a..0620f8d0d5ba 100644 --- a/internal/service/ec2/vpc_route_table.go +++ b/internal/service/ec2/vpc_route_table.go @@ -51,6 +51,8 @@ var routeTableValidTargets = []string{ // @Tags(identifierAttribute="id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;awstypes;awstypes.RouteTable") // @Testing(generator=false) +// @IdentityAttribute("id") +// @Testing(preIdentityVersion="v6.9.0") func resourceRouteTable() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRouteTableCreate, @@ -58,10 +60,6 @@ func resourceRouteTable() *schema.Resource { UpdateWithoutTimeout: resourceRouteTableUpdate, DeleteWithoutTimeout: resourceRouteTableDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(2 * time.Minute), diff --git a/internal/service/ec2/vpc_route_table_identity_gen_test.go b/internal/service/ec2/vpc_route_table_identity_gen_test.go new file mode 100644 index 000000000000..4c9f6f8d63c3 --- /dev/null +++ b/internal/service/ec2/vpc_route_table_identity_gen_test.go @@ -0,0 +1,231 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCRouteTable_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.RouteTable + resourceName := "aws_route_table.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckRouteTableDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic/"), + ConfigVariables: config.Variables{}, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRouteTableExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic/"), + ConfigVariables: config.Variables{}, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic/"), + ConfigVariables: config.Variables{}, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic/"), + ConfigVariables: config.Variables{}, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccVPCRouteTable_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_route_table.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.9.0 +func TestAccVPCRouteTable_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.RouteTable + resourceName := "aws_route_table.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckRouteTableDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic_v6.9.0/"), + ConfigVariables: config.Variables{}, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRouteTableExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/RouteTable/basic/"), + ConfigVariables: config.Variables{}, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/website/docs/r/route_table.html.markdown b/website/docs/r/route_table.html.markdown index 1e1db59ae66b..a17951bc2fc8 100644 --- a/website/docs/r/route_table.html.markdown +++ b/website/docs/r/route_table.html.markdown @@ -175,6 +175,32 @@ attribute once the route resource is created. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route_table.example + identity = { + id = "rtb-4e616f6d69" + } +} + +resource "aws_route_table" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the routing table. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route Tables using the route table `id`. For example: ```terraform From 298f682987a17a366574a0bc3d2de382d26524f9 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 25 Aug 2025 15:33:47 +0000 Subject: [PATCH 0689/2115] Update CHANGELOG.md for #43990 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce9ae924d69..d17566ac90b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 6.11.0 (Unreleased) +FEATURES: + +* **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) +* **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) + ENHANCEMENTS: * data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) @@ -15,6 +20,7 @@ ENHANCEMENTS: * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* resource/aws_route_table: Add resource identity support ([#43990](https://github.com/hashicorp/terraform-provider-aws/issues/43990)) * resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_logging: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_notification: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) From f0cdbd89600279af59be7fedee1b8a6d52d947ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 11:54:32 -0400 Subject: [PATCH 0690/2115] Tidy up. --- internal/service/s3tables/exports_test.go | 6 +- internal/service/s3tables/table_bucket.go | 503 +++++++++--------- .../service/s3tables/table_bucket_test.go | 31 +- 3 files changed, 280 insertions(+), 260 deletions(-) diff --git a/internal/service/s3tables/exports_test.go b/internal/service/s3tables/exports_test.go index 44ea3e7acf15..8ca8c7ca056f 100644 --- a/internal/service/s3tables/exports_test.go +++ b/internal/service/s3tables/exports_test.go @@ -12,7 +12,7 @@ var ( FindNamespace = findNamespace FindTableByThreePartKey = findTableByThreePartKey - FindTableBucket = findTableBucket + FindTableBucketByARN = findTableBucketByARN FindTableBucketPolicy = findTableBucketPolicy FindTablePolicy = findTablePolicy @@ -20,9 +20,7 @@ var ( ) const ( - ResNameNamespace = resNameNamespace - ResNameTableBucket = resNameTableBucket - + ResNameNamespace = resNameNamespace NamespaceIDSeparator = namespaceIDSeparator ) diff --git a/internal/service/s3tables/table_bucket.go b/internal/service/s3tables/table_bucket.go index 1eff18da4741..445550a5017c 100644 --- a/internal/service/s3tables/table_bucket.go +++ b/internal/service/s3tables/table_bucket.go @@ -5,7 +5,6 @@ package s3tables import ( "context" - "errors" "fmt" "github.com/aws/aws-sdk-go-v2/aws" @@ -25,10 +24,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/framework/validators" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -40,16 +39,12 @@ func newTableBucketResource(_ context.Context) (resource.ResourceWithConfigure, return &tableBucketResource{}, nil } -const ( - resNameTableBucket = "Table Bucket" -) - type tableBucketResource struct { framework.ResourceWithModel[tableBucketResourceModel] } -func (r *tableBucketResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *tableBucketResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrARN: framework.ARNAttributeComputedOnly(), names.AttrCreatedAt: schema.StringAttribute{ @@ -114,397 +109,417 @@ func (r *tableBucketResource) Schema(ctx context.Context, req resource.SchemaReq } } -func (r *tableBucketResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var plan tableBucketResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data tableBucketResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.Name) var input s3tables.CreateTableBucketInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } - out, err := conn.CreateTableBucket(ctx, &input) + outputCTB, err := conn.CreateTableBucket(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) - return - } - if out == nil || out.Arn == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameTableBucket, plan.Name.String(), nil), - errors.New("empty output").Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("creating S3 Tables Table Bucket (%s)", name), err.Error()) + return } - if !plan.MaintenanceConfiguration.IsUnknown() && !plan.MaintenanceConfiguration.IsNull() { - mc, d := plan.MaintenanceConfiguration.ToPtr(ctx) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + tableBucketARN := aws.ToString(outputCTB.Arn) + if !data.MaintenanceConfiguration.IsUnknown() && !data.MaintenanceConfiguration.IsNull() { + mc, diags := data.MaintenanceConfiguration.ToPtr(ctx) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } if !mc.IcebergUnreferencedFileRemovalSettings.IsNull() { + typ := awstypes.TableBucketMaintenanceTypeIcebergUnreferencedFileRemoval input := s3tables.PutTableBucketMaintenanceConfigurationInput{ - TableBucketARN: out.Arn, - Type: awstypes.TableBucketMaintenanceTypeIcebergUnreferencedFileRemoval, + TableBucketARN: aws.String(tableBucketARN), + Type: typ, } - value, d := expandTableBucketMaintenanceIcebergUnreferencedFileRemoval(ctx, mc.IcebergUnreferencedFileRemovalSettings) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + value, diags := expandTableBucketMaintenanceIcebergUnreferencedFileRemoval(ctx, mc.IcebergUnreferencedFileRemovalSettings) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } - input.Value = &value _, err := conn.PutTableBucketMaintenanceConfiguration(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("putting S3 Tables Table Bucket (%s) maintenance configuration (%s)", name, typ), err.Error()) + return } } } - bucket, err := findTableBucket(ctx, conn, aws.ToString(out.Arn)) + outputGTB, err := findTableBucketByARN(ctx, conn, tableBucketARN) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, bucket, &plan)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, outputGTB, &data)...) + if response.Diagnostics.HasError() { return } - awsMaintenanceConfig, err := findTableBucketMaintenanceConfiguration(ctx, conn, plan.ARN.ValueString()) + outputGTBMC, err := findTableBucketMaintenanceConfigurationByARN(ctx, conn, tableBucketARN) + switch { case tfresource.NotFound(err): case err != nil: - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s) maintenance configuration", name), err.Error()) + + return default: - maintenanceConfiguration, d := flattenTableBucketMaintenanceConfiguration(ctx, awsMaintenanceConfig) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + value, diags := flattenTableBucketMaintenanceConfiguration(ctx, outputGTBMC) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } - plan.MaintenanceConfiguration = maintenanceConfiguration + data.MaintenanceConfiguration = value } - awsEncryptionConfig, err := findTableBucketEncryptionConfiguration(ctx, conn, plan.ARN.ValueString()) + awsEncryptionConfig, err := findTableBucketEncryptionConfigurationByARN(ctx, conn, tableBucketARN) + switch { case tfresource.NotFound(err): case err != nil: - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s) encryption", name), err.Error()) + + return default: var encryptionConfiguration encryptionConfigurationModel - resp.Diagnostics.Append(flex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) + if response.Diagnostics.HasError() { + return + } + var diags diag.Diagnostics + data.EncryptionConfiguration, diags = fwtypes.NewObjectValueOf(ctx, &encryptionConfiguration) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } - plan.EncryptionConfiguration = fwtypes.NewObjectValueOfMust(ctx, &encryptionConfiguration) } - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *tableBucketResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tableBucketResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data tableBucketResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findTableBucket(ctx, conn, state.ARN.ValueString()) + conn := r.Meta().S3TablesClient(ctx) + + name, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Name), fwflex.StringValueFromFramework(ctx, data.ARN) + outputGTB, err := findTableBucketByARN(ctx, conn, tableBucketARN) + if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, state.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, outputGTB, &data)...) + if response.Diagnostics.HasError() { return } - awsMaintenanceConfig, err := findTableBucketMaintenanceConfiguration(ctx, conn, state.ARN.ValueString()) + outputGTBMC, err := findTableBucketMaintenanceConfigurationByARN(ctx, conn, tableBucketARN) + switch { case tfresource.NotFound(err): case err != nil: - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, state.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s) maintenance configuration", name), err.Error()) + + return default: - maintenanceConfiguration, d := flattenTableBucketMaintenanceConfiguration(ctx, awsMaintenanceConfig) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + value, diags := flattenTableBucketMaintenanceConfiguration(ctx, outputGTBMC) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } - state.MaintenanceConfiguration = maintenanceConfiguration + data.MaintenanceConfiguration = value } - awsEncryptionConfig, err := findTableBucketEncryptionConfiguration(ctx, conn, state.ARN.ValueString()) + awsEncryptionConfig, err := findTableBucketEncryptionConfigurationByARN(ctx, conn, tableBucketARN) + switch { case tfresource.NotFound(err): case err != nil: - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, state.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s) encryption", name), err.Error()) + + return default: var encryptionConfiguration encryptionConfigurationModel - resp.Diagnostics.Append(flex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, awsEncryptionConfig, &encryptionConfiguration)...) + if response.Diagnostics.HasError() { + return + } + var diags diag.Diagnostics + data.EncryptionConfiguration, diags = fwtypes.NewObjectValueOf(ctx, &encryptionConfiguration) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } - state.EncryptionConfiguration = fwtypes.NewObjectValueOfMust(ctx, &encryptionConfiguration) } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *tableBucketResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - var state, plan tableBucketResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var old, new tableBucketResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.State.Get(ctx, &old)...) + if response.Diagnostics.HasError() { return } conn := r.Meta().S3TablesClient(ctx) - if !plan.EncryptionConfiguration.Equal(state.EncryptionConfiguration) { - ec, d := plan.EncryptionConfiguration.ToPtr(ctx) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + name, tableBucketARN := fwflex.StringValueFromFramework(ctx, new.Name), fwflex.StringValueFromFramework(ctx, new.ARN) + + if !new.EncryptionConfiguration.Equal(old.EncryptionConfiguration) { + ec, diags := new.EncryptionConfiguration.ToPtr(ctx) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { return } input := s3tables.PutTableBucketEncryptionInput{ - TableBucketARN: plan.ARN.ValueStringPointer(), + TableBucketARN: aws.String(tableBucketARN), } var encryptionConfiguration awstypes.EncryptionConfiguration - - resp.Diagnostics.Append(flex.Expand(ctx, ec, &encryptionConfiguration)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, ec, &encryptionConfiguration)...) + if response.Diagnostics.HasError() { return } - input.EncryptionConfiguration = &encryptionConfiguration _, err := conn.PutTableBucketEncryption(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionUpdating, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("putting S3 Tables Table Bucket (%s) encryption configuration", name), err.Error()) + return } } - if !state.MaintenanceConfiguration.Equal(plan.MaintenanceConfiguration) { - mc, d := plan.MaintenanceConfiguration.ToPtr(ctx) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + if !old.MaintenanceConfiguration.Equal(new.MaintenanceConfiguration) { + mc, d := new.MaintenanceConfiguration.ToPtr(ctx) + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { return } if !mc.IcebergUnreferencedFileRemovalSettings.IsNull() { + typ := awstypes.TableBucketMaintenanceTypeIcebergUnreferencedFileRemoval input := s3tables.PutTableBucketMaintenanceConfigurationInput{ - TableBucketARN: state.ARN.ValueStringPointer(), - Type: awstypes.TableBucketMaintenanceTypeIcebergUnreferencedFileRemoval, + TableBucketARN: aws.String(tableBucketARN), + Type: typ, } value, d := expandTableBucketMaintenanceIcebergUnreferencedFileRemoval(ctx, mc.IcebergUnreferencedFileRemovalSettings) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { return } - input.Value = &value _, err := conn.PutTableBucketMaintenanceConfiguration(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionUpdating, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("putting S3 Tables Table Bucket (%s) maintenance configuration (%s)", name, typ), err.Error()) + return } } - awsMaintenanceConfig, err := findTableBucketMaintenanceConfiguration(ctx, conn, plan.ARN.ValueString()) + outputGTBMC, err := findTableBucketMaintenanceConfigurationByARN(ctx, conn, tableBucketARN) + switch { case tfresource.NotFound(err): case err != nil: - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameTableBucket, plan.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket (%s) maintenance configuration", name), err.Error()) + + return default: - maintenanceConfiguration, d := flattenTableBucketMaintenanceConfiguration(ctx, awsMaintenanceConfig) - resp.Diagnostics.Append(d...) - if resp.Diagnostics.HasError() { + value, d := flattenTableBucketMaintenanceConfiguration(ctx, outputGTBMC) + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { return } - plan.MaintenanceConfiguration = maintenanceConfiguration + new.MaintenanceConfiguration = value } } - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } -func (r *tableBucketResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tableBucketResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data tableBucketResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - input := &s3tables.DeleteTableBucketInput{ - TableBucketARN: state.ARN.ValueStringPointer(), + conn := r.Meta().S3TablesClient(ctx) + + name, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Name), fwflex.StringValueFromFramework(ctx, data.ARN) + input := s3tables.DeleteTableBucketInput{ + TableBucketARN: aws.String(tableBucketARN), } + _, err := conn.DeleteTableBucket(ctx, &input) - _, err := conn.DeleteTableBucket(ctx, input) if errs.IsA[*awstypes.NotFoundException](err) { return } - // If deletion fails due to bucket not being empty and force_destroy is enabled - if err != nil && state.ForceDestroy.ValueBool() { - // Check if the error indicates the bucket is not empty + // If deletion fails due to bucket not being empty and force_destroy is enabled. + if err != nil && data.ForceDestroy.ValueBool() { + // Check if the error indicates the bucket is not empty. if errs.IsA[*awstypes.ConflictException](err) || errs.IsA[*awstypes.BadRequestException](err) { tflog.Debug(ctx, "Table bucket not empty, attempting to empty it", map[string]any{ - "table_bucket_arn": state.ARN.ValueString(), + "table_bucket_arn": data.ARN.ValueString(), }) - // Empty the table bucket by deleting all tables - if emptyErr := emptyTableBucket(ctx, conn, state.ARN.ValueString()); emptyErr != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, resNameTableBucket, state.Name.String(), emptyErr), - fmt.Sprintf("Failed to empty table bucket before deletion: %s", emptyErr.Error()), - ) + // Empty the table bucket by deleting all tables and namespaces. + if err := emptyTableBucket(ctx, conn, tableBucketARN); err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting S3 Tables Table Bucket (%s) (force_destroy = true)", name), err.Error()) + return } - // Retry deletion after emptying - _, err = conn.DeleteTableBucket(ctx, input) + // Retry deletion after emptying. + _, err = conn.DeleteTableBucket(ctx, &input) } } if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, resNameTableBucket, state.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("deleting S3 Tables Table Bucket (%s)", name), err.Error()) + return } } -func (r *tableBucketResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), req, resp) +func (r *tableBucketResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), request, response) // Set force_destroy to false on import to prevent accidental deletion - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(names.AttrForceDestroy), types.BoolValue(false))...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrForceDestroy), types.BoolValue(false))...) } -func findTableBucket(ctx context.Context, conn *s3tables.Client, arn string) (*s3tables.GetTableBucketOutput, error) { - in := s3tables.GetTableBucketInput{ +func findTableBucketByARN(ctx context.Context, conn *s3tables.Client, arn string) (*s3tables.GetTableBucketOutput, error) { + input := s3tables.GetTableBucketInput{ TableBucketARN: aws.String(arn), } - out, err := conn.GetTableBucket(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findTableBucket(ctx, conn, &input) +} + +func findTableBucket(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableBucketInput) (*s3tables.GetTableBucketOutput, error) { + output, err := conn.GetTableBucket(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - if out == nil { - return nil, tfresource.NewEmptyResultError(in) + if output == nil { + return nil, tfresource.NewEmptyResultError(input) } - return out, nil + return output, nil } -func findTableBucketEncryptionConfiguration(ctx context.Context, conn *s3tables.Client, arn string) (*awstypes.EncryptionConfiguration, error) { - in := s3tables.GetTableBucketEncryptionInput{ +func findTableBucketEncryptionConfigurationByARN(ctx context.Context, conn *s3tables.Client, arn string) (*awstypes.EncryptionConfiguration, error) { + input := s3tables.GetTableBucketEncryptionInput{ TableBucketARN: aws.String(arn), } - out, err := conn.GetTableBucketEncryption(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findTableBucketEncryptionConfiguration(ctx, conn, &input) +} + +func findTableBucketEncryptionConfiguration(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableBucketEncryptionInput) (*awstypes.EncryptionConfiguration, error) { + output, err := conn.GetTableBucketEncryption(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - return out.EncryptionConfiguration, nil + if output == nil || output.EncryptionConfiguration == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.EncryptionConfiguration, nil } -func findTableBucketMaintenanceConfiguration(ctx context.Context, conn *s3tables.Client, arn string) (*s3tables.GetTableBucketMaintenanceConfigurationOutput, error) { - in := s3tables.GetTableBucketMaintenanceConfigurationInput{ +func findTableBucketMaintenanceConfigurationByARN(ctx context.Context, conn *s3tables.Client, arn string) (*s3tables.GetTableBucketMaintenanceConfigurationOutput, error) { + input := s3tables.GetTableBucketMaintenanceConfigurationInput{ TableBucketARN: aws.String(arn), } - out, err := conn.GetTableBucketMaintenanceConfiguration(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findTableBucketMaintenanceConfiguration(ctx, conn, &input) +} + +func findTableBucketMaintenanceConfiguration(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableBucketMaintenanceConfigurationInput) (*s3tables.GetTableBucketMaintenanceConfigurationOutput, error) { + output, err := conn.GetTableBucketMaintenanceConfiguration(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - return out, nil + if output == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output, nil } type tableBucketResourceModel struct { @@ -611,7 +626,7 @@ func expandIcebergUnreferencedFileRemovalSettings(ctx context.Context, in fwtype var value awstypes.IcebergUnreferencedFileRemovalSettings - diags.Append(flex.Expand(ctx, model, &value)...) + diags.Append(fwflex.Expand(ctx, model, &value)...) return &awstypes.TableBucketMaintenanceSettingsMemberIcebergUnreferencedFileRemoval{ Value: value, @@ -622,7 +637,7 @@ func flattenIcebergUnreferencedFileRemovalSettings(ctx context.Context, in awsty switch t := in.(type) { case *awstypes.TableBucketMaintenanceSettingsMemberIcebergUnreferencedFileRemoval: var model icebergUnreferencedFileRemovalSettingsModel - diags.Append(flex.Flatten(ctx, t.Value, &model)...) + diags.Append(fwflex.Flatten(ctx, t.Value, &model)...) result = fwtypes.NewObjectValueOfMust(ctx, &model) case *awstypes.UnknownUnionMember: @@ -643,67 +658,79 @@ func emptyTableBucket(ctx context.Context, conn *s3tables.Client, tableBucketARN "table_bucket_arn": tableBucketARN, }) - // First, list all namespaces in the table bucket - namespaces := s3tables.NewListNamespacesPaginator(conn, &s3tables.ListNamespacesInput{ + // First, list all namespaces in the table bucket. + input := s3tables.ListNamespacesInput{ TableBucketARN: aws.String(tableBucketARN), - }) + } + pages := s3tables.NewListNamespacesPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) - for namespaces.HasMorePages() { - namespacePage, err := namespaces.NextPage(ctx) if err != nil { - return fmt.Errorf("listing namespaces in table bucket %s: %w", tableBucketARN, err) + return fmt.Errorf("listing S3 Tables Table Bucket (%s) namespaces: %w", tableBucketARN, err) } - // For each namespace, list and delete all tables - for _, namespace := range namespacePage.Namespaces { - namespaceName := namespace.Namespace[0] + // For each namespace, list and delete all tables. + for _, v := range page.Namespaces { + namespace := v.Namespace[0] tflog.Debug(ctx, "Processing namespace", map[string]any{ - names.AttrNamespace: namespaceName, + names.AttrNamespace: namespace, }) - tables := s3tables.NewListTablesPaginator(conn, &s3tables.ListTablesInput{ + inputLT := s3tables.ListTablesInput{ + Namespace: aws.String(namespace), TableBucketARN: aws.String(tableBucketARN), - Namespace: aws.String(namespaceName), - }) + } + pages := s3tables.NewListTablesPaginator(conn, &inputLT) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) - for tables.HasMorePages() { - tablePage, err := tables.NextPage(ctx) if err != nil { - return fmt.Errorf("listing tables in namespace %s: %w", namespaceName, err) + return fmt.Errorf("listing S3 Tables Table Bucket (%s,%s) tables: %w", tableBucketARN, namespace, err) } - // Delete each table - for _, table := range tablePage.Tables { - tableName := aws.ToString(table.Name) + // Delete each table. + for _, v := range page.Tables { + name := aws.ToString(v.Name) tflog.Debug(ctx, "Deleting table", map[string]any{ - names.AttrTableName: tableName, - names.AttrNamespace: namespaceName, + names.AttrName: name, + names.AttrNamespace: namespace, }) - _, err := conn.DeleteTable(ctx, &s3tables.DeleteTableInput{ + input := s3tables.DeleteTableInput{ + Name: aws.String(name), + Namespace: aws.String(namespace), TableBucketARN: aws.String(tableBucketARN), - Namespace: aws.String(namespaceName), - Name: aws.String(tableName), - }) + } + _, err := conn.DeleteTable(ctx, &input) + + if errs.IsA[*awstypes.NotFoundException](err) { + continue + } - if err != nil && !errs.IsA[*awstypes.NotFoundException](err) { - return fmt.Errorf("deleting table %s in namespace %s: %w", tableName, namespaceName, err) + if err != nil { + return fmt.Errorf("deleting S3 Tables Table Bucket (%s,%s) table (%s): %w", tableBucketARN, namespace, name, err) } } } - // After deleting all tables in the namespace, delete the namespace itself + // After deleting all tables in the namespace, delete the namespace itself. tflog.Debug(ctx, "Deleting namespace", map[string]any{ - names.AttrNamespace: namespaceName, + names.AttrNamespace: namespace, }) - _, err = conn.DeleteNamespace(ctx, &s3tables.DeleteNamespaceInput{ + inputDN := s3tables.DeleteNamespaceInput{ + Namespace: aws.String(namespace), TableBucketARN: aws.String(tableBucketARN), - Namespace: aws.String(namespaceName), - }) + } + _, err = conn.DeleteNamespace(ctx, &inputDN) - if err != nil && !errs.IsA[*awstypes.NotFoundException](err) { - return fmt.Errorf("deleting namespace %s: %w", namespaceName, err) + if errs.IsA[*awstypes.NotFoundException](err) { + continue + } + + if err != nil { + return fmt.Errorf("deleting S3 Tables Table Bucket (%s) namespace (%s): %w", tableBucketARN, namespace, err) } } } diff --git a/internal/service/s3tables/table_bucket_test.go b/internal/service/s3tables/table_bucket_test.go index 7d52c0598c46..22b503b8c85f 100644 --- a/internal/service/s3tables/table_bucket_test.go +++ b/internal/service/s3tables/table_bucket_test.go @@ -5,7 +5,6 @@ package s3tables_test import ( "context" - "errors" "fmt" "testing" @@ -21,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/acctest" tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" "github.com/hashicorp/terraform-provider-aws/internal/conns" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" tfs3tables "github.com/hashicorp/terraform-provider-aws/internal/service/s3tables" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -379,42 +377,39 @@ func testAccCheckTableBucketDestroy(ctx context.Context) resource.TestCheckFunc continue } - _, err := tfs3tables.FindTableBucket(ctx, conn, rs.Primary.Attributes[names.AttrARN]) + _, err := tfs3tables.FindTableBucketByARN(ctx, conn, rs.Primary.Attributes[names.AttrARN]) + if tfresource.NotFound(err) { - return nil + continue } + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTableBucket, rs.Primary.ID, err) + return err } - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTableBucket, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("S3 Tables Table Bucket %s still exists", rs.Primary.Attributes[names.AttrARN]) } return nil } } -func testAccCheckTableBucketExists(ctx context.Context, name string, tablebucket *s3tables.GetTableBucketOutput) resource.TestCheckFunc { +func testAccCheckTableBucketExists(ctx context.Context, n string, v *s3tables.GetTableBucketOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucket, name, errors.New("not found")) - } - - if rs.Primary.Attributes[names.AttrARN] == "" { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucket, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) - resp, err := tfs3tables.FindTableBucket(ctx, conn, rs.Primary.Attributes[names.AttrARN]) + output, err := tfs3tables.FindTableBucketByARN(ctx, conn, rs.Primary.Attributes[names.AttrARN]) + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucket, rs.Primary.ID, err) + return err } - if tablebucket != nil { - *tablebucket = *resp - } + *v = *output return nil } From 4d3425d88345938d97a2e1df432bc50a46aa35e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 12:02:10 -0400 Subject: [PATCH 0691/2115] Fix markdown-lint 'MD007/ul-indent Unordered list indentation [Expected: 4; Actual: 2]'. --- website/docs/r/s3tables_table_bucket.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/s3tables_table_bucket.html.markdown b/website/docs/r/s3tables_table_bucket.html.markdown index 3b8c45677e78..e58a2b6aa233 100644 --- a/website/docs/r/s3tables_table_bucket.html.markdown +++ b/website/docs/r/s3tables_table_bucket.html.markdown @@ -36,7 +36,7 @@ The following arguments are optional: * `force_destroy` - (Optional, Default:`false`) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. These tables and namespaces are *not* recoverable. This only deletes tables and namespaces when the table bucket is destroyed, *not* when setting this parameter to `true`. Once this parameter is set to `true`, there must be a successful `terraform apply` run before a destroy is required to update this value in the resource state. Without a successful `terraform apply` after this parameter is set, this flag will have no effect. If setting this field in the same operation that would require replacing the table bucket or destroying the table bucket, this flag will not work. Additionally when importing a table bucket, a successful `terraform apply` is required to set this value in state before it will take effect on a destroy operation. * `maintenance_configuration` - (Optional) A single table bucket maintenance configuration object. [See `maintenance_configuration` below](#maintenance_configuration). - * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### `encryption_configuration` From 464e155bc9fc6f93f468f8d8c64df99f0d1bacca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 12:05:18 -0400 Subject: [PATCH 0692/2115] The resource which is the subject of the generated test should appear first in the template. --- .../testdata/IdentityProvider/tags/main_gen.tf | 8 ++++---- .../testdata/IdentityProvider/tagsComputed1/main_gen.tf | 8 ++++---- .../testdata/IdentityProvider/tagsComputed2/main_gen.tf | 8 ++++---- .../testdata/IdentityProvider/tags_defaults/main_gen.tf | 8 ++++---- .../testdata/IdentityProvider/tags_ignore/main_gen.tf | 8 ++++---- .../testdata/tmpl/identity_provider_tags.gtpl | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf index 315a53ab052b..ffc430fda93a 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags/main_gen.tf @@ -1,10 +1,6 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -18,6 +14,10 @@ resource "aws_workspacesweb_identity_provider" "test" { } +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf index 44c938101466..8d416e77279b 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed1/main_gen.tf @@ -3,10 +3,6 @@ provider "null" {} -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -22,6 +18,10 @@ resource "aws_workspacesweb_identity_provider" "test" { } +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + resource "null_resource" "test" {} variable "unknownTagKey" { diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf index 6bfddc53109a..5d7fc45282c9 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tagsComputed2/main_gen.tf @@ -3,10 +3,6 @@ provider "null" {} -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -23,6 +19,10 @@ resource "aws_workspacesweb_identity_provider" "test" { } +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + resource "null_resource" "test" {} variable "unknownTagKey" { diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf index 37c291796db0..f6ad7382aae1 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_defaults/main_gen.tf @@ -7,10 +7,6 @@ provider "aws" { } } -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -24,6 +20,10 @@ resource "aws_workspacesweb_identity_provider" "test" { } +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf index bb9a08e01ef9..401b72e64cc4 100644 --- a/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/IdentityProvider/tags_ignore/main_gen.tf @@ -10,10 +10,6 @@ provider "aws" { } } -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -27,6 +23,10 @@ resource "aws_workspacesweb_identity_provider" "test" { } +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} + variable "resource_tags" { description = "Tags to set on resource. To specify no tags, set to `null`" # Not setting a default, so that this must explicitly be set to `null` to specify no tags diff --git a/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl index e0370c766c82..ea73cdd94725 100644 --- a/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/identity_provider_tags.gtpl @@ -1,7 +1,3 @@ -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - resource "aws_workspacesweb_identity_provider" "test" { identity_provider_name = "test" identity_provider_type = "SAML" @@ -14,3 +10,7 @@ resource "aws_workspacesweb_identity_provider" "test" { {{- template "tags" . }} } + +resource "aws_workspacesweb_portal" "test" { + display_name = "test" +} From 894651619ee7398140551637db85f7921b3e89ef Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 12:08:42 -0400 Subject: [PATCH 0693/2115] r/aws_timesteaminfluxdb: enable go-vcr ```console % make testacc PKG=timestreaminfluxdb TESTS="TestAccTimestreamInfluxDBDBCluster_basic|TestAccTimestreamInfluxDBDBCluster_disappears|TestAccTimestreamInfluxDBDBCluster_dbInstanceType|TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration|TestAccTimestreamInfluxDBDBCluster_networkType|TestAccTimestreamInfluxDBDBCluster_port" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 20 -run='TestAccTimestreamInfluxDBDBCluster_basic|TestAccTimestreamInfluxDBDBCluster_disappears|TestAccTimestreamInfluxDBDBCluster_dbInstanceType|TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration|TestAccTimestreamInfluxDBDBCluster_networkType|TestAccTimestreamInfluxDBDBCluster_port' -timeout 360m -vet=off 2025/08/25 11:01:27 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 11:01:27 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccTimestreamInfluxDBDBCluster_disappears (934.11s) --- PASS: TestAccTimestreamInfluxDBDBCluster_basic (956.20s) --- PASS: TestAccTimestreamInfluxDBDBCluster_networkType (2181.41s) --- PASS: TestAccTimestreamInfluxDBDBCluster_port (2692.20s) --- PASS: TestAccTimestreamInfluxDBDBCluster_dbInstanceType (3412.04s) --- PASS: TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration (3844.16s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb 3850.647s ``` --- .../service/timestreaminfluxdb/db_cluster.go | 23 +- .../db_cluster_tags_gen_test.go | 236 ++++++++++-------- .../timestreaminfluxdb/db_cluster_test.go | 112 ++++----- .../service/timestreaminfluxdb/db_instance.go | 21 +- .../db_instance_tags_gen_test.go | 130 +++++----- .../timestreaminfluxdb/db_instance_test.go | 120 +++++---- 6 files changed, 330 insertions(+), 312 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster.go b/internal/service/timestreaminfluxdb/db_cluster.go index 0707519d654d..578f941e03d9 100644 --- a/internal/service/timestreaminfluxdb/db_cluster.go +++ b/internal/service/timestreaminfluxdb/db_cluster.go @@ -30,7 +30,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" @@ -38,6 +37,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -47,6 +47,8 @@ import ( // @Tags(identifierAttribute="arn") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb;timestreaminfluxdb.GetDbClusterOutput") // @Testing(importIgnore="bucket;username;organization;password") +// @Testing(existsTakesT=true) +// @Testing(destroyTakesT=true) func newDBClusterResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &dbClusterResource{} @@ -442,7 +444,7 @@ func (r *dbClusterResource) Read(ctx context.Context, req resource.ReadRequest, } output, err := findDBClusterByID(ctx, conn, state.ID.ValueString()) - if tfresource.NotFound(err) { + if retry.NotFound(err) { resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) resp.State.RemoveResource(ctx) return @@ -450,7 +452,7 @@ func (r *dbClusterResource) Read(ctx context.Context, req resource.ReadRequest, if err != nil { resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionSetting, ResNameDBCluster, state.ID.String(), err), + create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionReading, ResNameDBCluster, state.ID.String(), err), err.Error(), ) return @@ -585,7 +587,7 @@ func waitDBClusterCreated(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.ClusterStatusCreating), Target: enum.Slice(awstypes.ClusterStatusAvailable), - Refresh: statusDBCluster(ctx, conn, id), + Refresh: statusDBCluster(conn, id), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, @@ -603,7 +605,7 @@ func waitDBClusterUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(string(awstypes.ClusterStatusUpdating), string(awstypes.StatusUpdatingInstanceType)), Target: enum.Slice(awstypes.ClusterStatusAvailable), - Refresh: statusDBCluster(ctx, conn, id), + Refresh: statusDBCluster(conn, id), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, @@ -621,7 +623,7 @@ func waitDBClusterDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.ClusterStatusDeleting, awstypes.ClusterStatusDeleted), Target: []string{}, - Refresh: statusDBCluster(ctx, conn, id), + Refresh: statusDBCluster(conn, id), Timeout: timeout, Delay: 30 * time.Second, } @@ -634,10 +636,10 @@ func waitDBClusterDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, return nil, err } -func statusDBCluster(ctx context.Context, conn *timestreaminfluxdb.Client, id string) retry.StateRefreshFunc { - return func() (any, string, error) { +func statusDBCluster(conn *timestreaminfluxdb.Client, id string) retry.StateRefreshFunc { + return func(ctx context.Context) (any, string, error) { out, err := findDBClusterByID(ctx, conn, id) - if tfresource.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -657,8 +659,7 @@ func findDBClusterByID(ctx context.Context, conn *timestreaminfluxdb.Client, id if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, + LastError: err, } } diff --git a/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go index 290aa91ba379..3d73b909834d 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_tags_gen_test.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" "github.com/hashicorp/terraform-plugin-testing/config" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -19,14 +18,15 @@ import ( func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -38,7 +38,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -85,7 +85,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -136,7 +136,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -180,7 +180,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -213,14 +213,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags(t *testing.T) { func TestAccTimestreamInfluxDBDBCluster_tags_null(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -232,7 +233,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_null(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -276,14 +277,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_null(t *testing.T) { func TestAccTimestreamInfluxDBDBCluster_tags_EmptyMap(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -293,7 +295,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyMap(t *testing.T) { acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), @@ -327,14 +329,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyMap(t *testing.T) { func TestAccTimestreamInfluxDBDBCluster_tags_AddOnUpdate(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -344,7 +347,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_AddOnUpdate(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -367,7 +370,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_AddOnUpdate(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -410,14 +413,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_AddOnUpdate(t *testing.T) { func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -429,7 +433,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnCreate(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -473,7 +477,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnCreate(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -506,14 +510,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnCreate(t *testing.T) { func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -525,7 +530,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -557,7 +562,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -608,7 +613,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -651,14 +656,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Add(t *testing.T) func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -670,7 +676,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Replace(t *testin }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -701,7 +707,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Replace(t *testin }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -744,14 +750,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_EmptyTag_OnUpdate_Replace(t *testin func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -764,7 +771,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -811,7 +818,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -860,7 +867,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -903,7 +910,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -937,14 +944,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_providerOnly(t *testing func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -959,7 +967,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testi }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1016,7 +1024,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testi }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1072,7 +1080,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testi acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1106,14 +1114,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nonOverlapping(t *testi func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1128,7 +1137,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing. }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1184,7 +1193,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing. }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1244,7 +1253,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing. }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1291,14 +1300,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_overlapping(t *testing. func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToProviderOnly(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1310,7 +1320,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToProviderOnly(t }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1343,7 +1353,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToProviderOnly(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1384,14 +1394,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToProviderOnly(t func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToResourceOnly(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1404,7 +1415,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToResourceOnly(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1432,7 +1443,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToResourceOnly(t }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1476,14 +1487,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_updateToResourceOnly(t func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1498,7 +1510,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyResourceTag(t *tes }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1545,14 +1557,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyResourceTag(t *tes func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyProviderOnlyTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1565,7 +1578,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyProviderOnlyTag(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1606,14 +1619,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_emptyProviderOnlyTag(t func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1628,7 +1642,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullOverlappingResource }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1676,14 +1690,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullOverlappingResource func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullNonOverlappingResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1698,7 +1713,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullNonOverlappingResou }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1748,14 +1763,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_DefaultTags_nullNonOverlappingResou func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnCreate(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1765,7 +1781,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnCreate(t *testing.T) "unknownTagKey": config.StringVariable("computedkey1"), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -1806,14 +1822,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnCreate(t *testing.T) func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Add(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1825,7 +1842,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Add(t *testing }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1857,7 +1874,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Add(t *testing "knownTagValue": config.StringVariable(acctest.CtValue1), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -1906,14 +1923,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Add(t *testing func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Replace(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1925,7 +1943,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Replace(t *tes }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1955,7 +1973,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Replace(t *tes "unknownTagKey": config.StringVariable(acctest.CtKey1), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -1996,14 +2014,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_ComputedTag_OnUpdate_Replace(t *tes func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ // 1: Create { @@ -2022,7 +2041,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2071,7 +2090,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2120,7 +2139,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2158,14 +2177,15 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_DefaultTag(t *te func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) { ctx := acctest.Context(t) + var v timestreaminfluxdb.GetDbClusterOutput resourceName := "aws_timestreaminfluxdb_db_cluster.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ // 1: Create { @@ -2182,7 +2202,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2240,7 +2260,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2297,7 +2317,7 @@ func TestAccTimestreamInfluxDBDBCluster_tags_IgnoreTags_Overlap_ResourceTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &v), + testAccCheckDBClusterExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index a6982a126e50..a0ea2ee43180 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -13,15 +13,13 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/types" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" "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/create" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tftimestreaminfluxdb "github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -32,22 +30,22 @@ func TestAccTimestreamInfluxDBDBCluster_basic(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "timestream-influxdb", regexache.MustCompile(`db-cluster/.+$`)), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), @@ -76,22 +74,22 @@ func TestAccTimestreamInfluxDBDBCluster_disappears(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tftimestreaminfluxdb.ResourceDBCluster, resourceName), ), ExpectNonEmptyPlan: true, @@ -112,22 +110,22 @@ func TestAccTimestreamInfluxDBDBCluster_dbInstanceType(t *testing.T) { } var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxMedium)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster1), resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxMedium)), ), }, @@ -140,7 +138,7 @@ func TestAccTimestreamInfluxDBDBCluster_dbInstanceType(t *testing.T) { { Config: testAccDBClusterConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxLarge)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxLarge)), ), @@ -162,22 +160,22 @@ func TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration(t *testing.T) { } var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName, true), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster1), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtTrue), @@ -192,7 +190,7 @@ func TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration(t *testing.T) { { Config: testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName, false), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), @@ -216,22 +214,22 @@ func TestAccTimestreamInfluxDBDBCluster_networkType(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_networkTypeIPV4(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeIpv4)), ), }, @@ -254,22 +252,22 @@ func TestAccTimestreamInfluxDBDBCluster_port(t *testing.T) { var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput port1 := "8086" port2 := "8087" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_port(rName, port1), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster1), resource.TestCheckResourceAttr(resourceName, names.AttrPort, port1), ), }, @@ -282,7 +280,7 @@ func TestAccTimestreamInfluxDBDBCluster_port(t *testing.T) { { Config: testAccDBClusterConfig_port(rName, port2), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, names.AttrPort, port2), ), @@ -305,22 +303,22 @@ func TestAccTimestreamInfluxDBDBCluster_allocatedStorage(t *testing.T) { var dbCluster timestreaminfluxdb.GetDbClusterOutput allocatedStorage := "20" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_allocatedStorage(rName, allocatedStorage), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage), ), }, @@ -341,22 +339,22 @@ func TestAccTimestreamInfluxDBDBCluster_dbStorageType(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT1)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), ), }, @@ -377,22 +375,22 @@ func TestAccTimestreamInfluxDBDBCluster_publiclyAccessible(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_publiclyAccessible(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), resource.TestCheckResourceAttrSet(resourceName, names.AttrEndpoint), resource.TestCheckResourceAttrSet(resourceName, "reader_endpoint"), resource.TestCheckResourceAttr(resourceName, names.AttrPubliclyAccessible, acctest.CtTrue), @@ -415,22 +413,22 @@ func TestAccTimestreamInfluxDBDBCluster_deploymentType(t *testing.T) { } var dbCluster timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_deploymentType(rName, string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.ClusterDeploymentTypeMultiNodeReadReplicas)), ), }, @@ -451,22 +449,22 @@ func TestAccTimestreamInfluxDBDBCluster_failoverMode(t *testing.T) { } var dbCluster1, dbCluster2 timestreaminfluxdb.GetDbClusterOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_cluster.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBClusters(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBClusterDestroy(ctx), + CheckDestroy: testAccCheckDBClusterDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBClusterConfig_failoverMode(rName, string(awstypes.FailoverModeAutomatic)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster1), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster1), resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeAutomatic)), ), }, @@ -479,7 +477,7 @@ func TestAccTimestreamInfluxDBDBCluster_failoverMode(t *testing.T) { { Config: testAccDBClusterConfig_failoverMode(rName, string(awstypes.FailoverModeNoFailover)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBClusterExists(ctx, resourceName, &dbCluster2), + testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeNoFailover)), ), @@ -494,9 +492,9 @@ func TestAccTimestreamInfluxDBDBCluster_failoverMode(t *testing.T) { }) } -func testAccCheckDBClusterDestroy(ctx context.Context) resource.TestCheckFunc { +func testAccCheckDBClusterDestroy(ctx context.Context, t *testing.T) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_timestreaminfluxdb_db_cluster" { @@ -505,7 +503,7 @@ func testAccCheckDBClusterDestroy(ctx context.Context) resource.TestCheckFunc { _, err := tftimestreaminfluxdb.FindDBClusterByID(ctx, conn, rs.Primary.ID) - if tfresource.NotFound(err) { + if retry.NotFound(err) { continue } @@ -520,7 +518,7 @@ func testAccCheckDBClusterDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckDBClusterExists(ctx context.Context, name string, dbCluster *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { +func testAccCheckDBClusterExists(ctx context.Context, t *testing.T, name string, dbCluster *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -531,7 +529,7 @@ func testAccCheckDBClusterExists(ctx context.Context, name string, dbCluster *ti return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingExistence, tftimestreaminfluxdb.ResNameDBCluster, name, errors.New("not set")) } - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) resp, err := tftimestreaminfluxdb.FindDBClusterByID(ctx, conn, rs.Primary.ID) if err != nil { @@ -545,7 +543,7 @@ func testAccCheckDBClusterExists(ctx context.Context, name string, dbCluster *ti } func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) input := ×treaminfluxdb.ListDbClustersInput{} _, err := conn.ListDbClusters(ctx, input) diff --git a/internal/service/timestreaminfluxdb/db_instance.go b/internal/service/timestreaminfluxdb/db_instance.go index 649da0230948..6e1e36ebfe3d 100644 --- a/internal/service/timestreaminfluxdb/db_instance.go +++ b/internal/service/timestreaminfluxdb/db_instance.go @@ -29,7 +29,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" @@ -37,6 +36,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -46,6 +46,8 @@ import ( // @Tags(identifierAttribute="arn") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb;timestreaminfluxdb.GetDbInstanceOutput") // @Testing(importIgnore="bucket;username;organization;password") +// @Testing(existsTakesT=true) +// @Testing(destroyTakesT=true) func newDBInstanceResource(_ context.Context) (resource.ResourceWithConfigure, error) { r := &dbInstanceResource{} @@ -425,7 +427,7 @@ func (r *dbInstanceResource) Read(ctx context.Context, req resource.ReadRequest, } output, err := findDBInstanceByID(ctx, conn, state.ID.ValueString()) - if tfresource.NotFound(err) { + if retry.NotFound(err) { resp.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) resp.State.RemoveResource(ctx) return @@ -577,7 +579,7 @@ func waitDBInstanceCreated(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.StatusCreating), Target: enum.Slice(awstypes.StatusAvailable), - Refresh: statusDBInstance(ctx, conn, id), + Refresh: statusDBInstance(conn, id), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, @@ -595,7 +597,7 @@ func waitDBInstanceUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.StatusModifying, awstypes.StatusUpdating, awstypes.StatusUpdatingInstanceType, awstypes.StatusUpdatingDeploymentType), Target: enum.Slice(awstypes.StatusAvailable), - Refresh: statusDBInstance(ctx, conn, id), + Refresh: statusDBInstance(conn, id), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, @@ -613,7 +615,7 @@ func waitDBInstanceDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.StatusDeleting, awstypes.StatusDeleted), Target: []string{}, - Refresh: statusDBInstance(ctx, conn, id), + Refresh: statusDBInstance(conn, id), Timeout: timeout, Delay: 30 * time.Second, } @@ -626,10 +628,10 @@ func waitDBInstanceDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, return nil, err } -func statusDBInstance(ctx context.Context, conn *timestreaminfluxdb.Client, id string) retry.StateRefreshFunc { - return func() (any, string, error) { +func statusDBInstance(conn *timestreaminfluxdb.Client, id string) retry.StateRefreshFunc { + return func(ctx context.Context) (any, string, error) { out, err := findDBInstanceByID(ctx, conn, id) - if tfresource.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -649,8 +651,7 @@ func findDBInstanceByID(ctx context.Context, conn *timestreaminfluxdb.Client, id if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, + LastError: err, } } diff --git a/internal/service/timestreaminfluxdb/db_instance_tags_gen_test.go b/internal/service/timestreaminfluxdb/db_instance_tags_gen_test.go index 2e5e78fbe989..2857471b769b 100644 --- a/internal/service/timestreaminfluxdb/db_instance_tags_gen_test.go +++ b/internal/service/timestreaminfluxdb/db_instance_tags_gen_test.go @@ -26,7 +26,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags(t *testing.T) { acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -38,7 +38,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -85,7 +85,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -136,7 +136,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -180,7 +180,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -221,7 +221,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_null(t *testing.T) { acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -233,7 +233,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_null(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -285,7 +285,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap(t *testing.T) { acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -295,7 +295,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap(t *testing.T) { acctest.CtResourceTags: config.MapVariable(map[string]config.Variable{}), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{})), @@ -337,7 +337,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate(t *testing.T) { acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -347,7 +347,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -370,7 +370,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -421,7 +421,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate(t *testing.T) { acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -433,7 +433,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate(t *testing.T) { }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -477,7 +477,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate(t *testing.T) { acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -518,7 +518,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add(t *testing.T acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -530,7 +530,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add(t *testing.T }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -562,7 +562,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add(t *testing.T }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -613,7 +613,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add(t *testing.T }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -664,7 +664,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace(t *testi acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { @@ -676,7 +676,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace(t *testi }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -707,7 +707,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace(t *testi }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -758,7 +758,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly(t *testin acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -771,7 +771,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly(t *testin acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -818,7 +818,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly(t *testin acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -867,7 +867,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly(t *testin acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -910,7 +910,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly(t *testin acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -952,7 +952,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping(t *test acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -967,7 +967,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping(t *test }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1024,7 +1024,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping(t *test }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1080,7 +1080,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping(t *test acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1122,7 +1122,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping(t *testing acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1137,7 +1137,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping(t *testing }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1193,7 +1193,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping(t *testing }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1253,7 +1253,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping(t *testing }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1308,7 +1308,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly(t acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1320,7 +1320,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly(t }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1353,7 +1353,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1402,7 +1402,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly(t acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1415,7 +1415,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1443,7 +1443,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly(t }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1495,7 +1495,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag(t *te acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1510,7 +1510,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag(t *te }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1565,7 +1565,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag(t acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1578,7 +1578,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag(t acctest.CtResourceTags: nil, }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.Null()), @@ -1627,7 +1627,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourc acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1642,7 +1642,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourc }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1698,7 +1698,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingReso acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1713,7 +1713,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingReso }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1771,7 +1771,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate(t *testing.T) acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1781,7 +1781,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate(t *testing.T) "unknownTagKey": config.StringVariable("computedkey1"), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -1830,7 +1830,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add(t *testin acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1842,7 +1842,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add(t *testin }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1874,7 +1874,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add(t *testin "knownTagValue": config.StringVariable(acctest.CtValue1), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "tags.computedkey1", "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -1931,7 +1931,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace(t *te acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -1943,7 +1943,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace(t *te }), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -1973,7 +1973,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace(t *te "unknownTagKey": config.StringVariable(acctest.CtKey1), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsKey1, "null_resource.test", names.AttrID), ), ConfigStateChecks: []statecheck.StateCheck{ @@ -2022,7 +2022,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag(t *t acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ // 1: Create { @@ -2041,7 +2041,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2090,7 +2090,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2139,7 +2139,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag(t *t ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2185,7 +2185,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag(t * acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ // 1: Create { @@ -2202,7 +2202,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag(t * ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2260,7 +2260,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag(t * ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ @@ -2317,7 +2317,7 @@ func TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag(t * ), }, Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &v), + testAccCheckDBInstanceExists(ctx, t, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrTags), knownvalue.MapExact(map[string]knownvalue.Check{ diff --git a/internal/service/timestreaminfluxdb/db_instance_test.go b/internal/service/timestreaminfluxdb/db_instance_test.go index e000024043b9..a970a68e8eef 100644 --- a/internal/service/timestreaminfluxdb/db_instance_test.go +++ b/internal/service/timestreaminfluxdb/db_instance_test.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/types" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -22,10 +21,9 @@ import ( "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" - "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tftimestreaminfluxdb "github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -36,22 +34,22 @@ func TestAccTimestreamInfluxDBDBInstance_basic(t *testing.T) { } var dbInstance timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "timestream-influxdb", regexache.MustCompile(`db-instance/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), @@ -79,22 +77,22 @@ func TestAccTimestreamInfluxDBDBInstance_disappears(t *testing.T) { } var dbInstance timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance), acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tftimestreaminfluxdb.ResourceDBInstance, resourceName), ), ExpectNonEmptyPlan: true, @@ -110,22 +108,22 @@ func TestAccTimestreamInfluxDBDBInstance_dbInstanceType(t *testing.T) { } var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxMedium)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxMedium)), ), }, @@ -138,7 +136,7 @@ func TestAccTimestreamInfluxDBDBInstance_dbInstanceType(t *testing.T) { { Config: testAccDBInstanceConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxLarge)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxLarge)), ), @@ -160,22 +158,22 @@ func TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration(t *testing.T) } var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_logDeliveryConfigurationEnabled(rName, true), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtTrue), @@ -190,7 +188,7 @@ func TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration(t *testing.T) { Config: testAccDBInstanceConfig_logDeliveryConfigurationEnabled(rName, false), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), @@ -214,22 +212,22 @@ func TestAccTimestreamInfluxDBDBInstance_networkType(t *testing.T) { } var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_networkTypeIPV4(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeIpv4)), ), }, @@ -242,7 +240,7 @@ func TestAccTimestreamInfluxDBDBInstance_networkType(t *testing.T) { { Config: testAccDBInstanceConfig_networkTypeDual(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), resource.TestCheckResourceAttr(resourceName, "network_type", string(awstypes.NetworkTypeDual)), ), }, @@ -265,22 +263,22 @@ func TestAccTimestreamInfluxDBDBInstance_port(t *testing.T) { var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput port1 := "8086" port2 := "8087" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_port(rName, port1), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, names.AttrPort, port1), ), }, @@ -293,7 +291,7 @@ func TestAccTimestreamInfluxDBDBInstance_port(t *testing.T) { { Config: testAccDBInstanceConfig_port(rName, port2), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, names.AttrPort, port2), ), @@ -317,22 +315,22 @@ func TestAccTimestreamInfluxDBDBInstance_allocatedStorage(t *testing.T) { var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput allocatedStorage1 := "20" allocatedStorage2 := "40" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_allocatedStorage(rName, allocatedStorage1), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage1), ), }, @@ -345,7 +343,7 @@ func TestAccTimestreamInfluxDBDBInstance_allocatedStorage(t *testing.T) { { Config: testAccDBInstanceConfig_allocatedStorage(rName, allocatedStorage2), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, allocatedStorage2), ), @@ -367,22 +365,22 @@ func TestAccTimestreamInfluxDBDBInstance_dbStorageType(t *testing.T) { } var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT1)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), ), }, @@ -395,7 +393,7 @@ func TestAccTimestreamInfluxDBDBInstance_dbStorageType(t *testing.T) { { Config: testAccDBInstanceConfig_dbStorageType(rName, string(awstypes.DbStorageTypeInfluxIoIncludedT2)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT2)), ), @@ -417,22 +415,22 @@ func TestAccTimestreamInfluxDBDBInstance_publiclyAccessible(t *testing.T) { } var dbInstance timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_publiclyAccessible(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance), resource.TestCheckResourceAttrSet(resourceName, names.AttrEndpoint), resource.TestCheckResourceAttr(resourceName, names.AttrPubliclyAccessible, acctest.CtTrue), ), @@ -454,22 +452,22 @@ func TestAccTimestreamInfluxDBDBInstance_deploymentType(t *testing.T) { } var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), Steps: []resource.TestStep{ { Config: testAccDBInstanceConfig_deploymentType(rName, string(awstypes.DeploymentTypeWithMultiazStandby)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance1), // DB instance will not be publicly accessible and will not have an endpoint. // DB instance will have a secondary availability zone. resource.TestCheckResourceAttrSet(resourceName, "secondary_availability_zone"), @@ -485,7 +483,7 @@ func TestAccTimestreamInfluxDBDBInstance_deploymentType(t *testing.T) { { Config: testAccDBInstanceConfig_deploymentType(rName, string(awstypes.DeploymentTypeSingleAz)), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance2), testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), resource.TestCheckResourceAttr(resourceName, "secondary_availability_zone", ""), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.DeploymentTypeSingleAz)), @@ -509,16 +507,16 @@ func TestAccTimestreamInfluxDBDBInstance_upgradeV5_90_0(t *testing.T) { } var dbInstance timestreaminfluxdb.GetDbInstanceOutput - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) resourceName := "aws_timestreaminfluxdb_db_instance.test" - resource.ParallelTest(t, resource.TestCase{ + acctest.ParallelTest(ctx, t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheckDBInstances(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), - CheckDestroy: testAccCheckDBInstanceDestroy(ctx), + CheckDestroy: testAccCheckDBInstanceDestroy(ctx, t), AdditionalCLIOptions: &resource.AdditionalCLIOptions{ Plan: resource.PlanOptions{ NoRefresh: true, @@ -534,7 +532,7 @@ func TestAccTimestreamInfluxDBDBInstance_upgradeV5_90_0(t *testing.T) { }, Config: testAccDBInstanceConfig_basicV5_90_0(rName, rName), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance), ), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ @@ -552,7 +550,7 @@ func TestAccTimestreamInfluxDBDBInstance_upgradeV5_90_0(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Config: testAccDBInstanceConfig_basicV5_90_0(rName, rName+"-updated"), Check: resource.ComposeTestCheckFunc( - testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + testAccCheckDBInstanceExists(ctx, t, resourceName, &dbInstance), ), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ @@ -576,9 +574,9 @@ func TestAccTimestreamInfluxDBDBInstance_upgradeV5_90_0(t *testing.T) { }) } -func testAccCheckDBInstanceDestroy(ctx context.Context) resource.TestCheckFunc { +func testAccCheckDBInstanceDestroy(ctx context.Context, t *testing.T) resource.TestCheckFunc { return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) for _, rs := range s.RootModule().Resources { if rs.Type != "aws_timestreaminfluxdb_db_instance" { @@ -587,7 +585,7 @@ func testAccCheckDBInstanceDestroy(ctx context.Context) resource.TestCheckFunc { _, err := tftimestreaminfluxdb.FindDBInstanceByID(ctx, conn, rs.Primary.ID) - if tfresource.NotFound(err) { + if retry.NotFound(err) { continue } @@ -602,7 +600,7 @@ func testAccCheckDBInstanceDestroy(ctx context.Context) resource.TestCheckFunc { } } -func testAccCheckDBInstanceExists(ctx context.Context, name string, dbInstance *timestreaminfluxdb.GetDbInstanceOutput) resource.TestCheckFunc { +func testAccCheckDBInstanceExists(ctx context.Context, t *testing.T, name string, dbInstance *timestreaminfluxdb.GetDbInstanceOutput) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[name] if !ok { @@ -613,7 +611,7 @@ func testAccCheckDBInstanceExists(ctx context.Context, name string, dbInstance * return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingExistence, tftimestreaminfluxdb.ResNameDBInstance, name, errors.New("not set")) } - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) resp, err := tftimestreaminfluxdb.FindDBInstanceByID(ctx, conn, rs.Primary.ID) if err != nil { @@ -627,7 +625,7 @@ func testAccCheckDBInstanceExists(ctx context.Context, name string, dbInstance * } func testAccPreCheckDBInstances(ctx context.Context, t *testing.T) { - conn := acctest.Provider.Meta().(*conns.AWSClient).TimestreamInfluxDBClient(ctx) + conn := acctest.ProviderMeta(ctx, t).TimestreamInfluxDBClient(ctx) input := ×treaminfluxdb.ListDbInstancesInput{} _, err := conn.ListDbInstances(ctx, input) From 7eef0d505bbf22a27ff15f8350aaa25b3ddf4ae4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 12:16:09 -0400 Subject: [PATCH 0694/2115] Fix crash in 'TestAccS3TablesTableBucket_forceDestroy'. --- .../service/s3tables/table_bucket_test.go | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/internal/service/s3tables/table_bucket_test.go b/internal/service/s3tables/table_bucket_test.go index 22b503b8c85f..acfa94cedcd8 100644 --- a/internal/service/s3tables/table_bucket_test.go +++ b/internal/service/s3tables/table_bucket_test.go @@ -28,8 +28,7 @@ import ( func TestAccS3TablesTableBucket_basic(t *testing.T) { ctx := acctest.Context(t) - - var tablebucket s3tables.GetTableBucketOutput + var v s3tables.GetTableBucketOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_s3tables_table_bucket.test" @@ -45,7 +44,7 @@ func TestAccS3TablesTableBucket_basic(t *testing.T) { { Config: testAccTableBucketConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -78,8 +77,7 @@ func TestAccS3TablesTableBucket_basic(t *testing.T) { func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { ctx := acctest.Context(t) - - var tablebucket s3tables.GetTableBucketOutput + var v s3tables.GetTableBucketOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_s3tables_table_bucket.test" resourceKeyOne := "aws_kms_key.test" @@ -97,7 +95,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { { Config: testAccTableBucketConfig_encryptionConfiguration(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -121,7 +119,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { { Config: testAccTableBucketConfig_encryptionConfigurationUpdate(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3tables", "bucket/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -156,8 +154,7 @@ func TestAccS3TablesTableBucket_encryptionConfiguration(t *testing.T) { func TestAccS3TablesTableBucket_disappears(t *testing.T) { ctx := acctest.Context(t) - - var tablebucket s3tables.GetTableBucketOutput + var v s3tables.GetTableBucketOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_s3tables_table_bucket.test" @@ -173,7 +170,7 @@ func TestAccS3TablesTableBucket_disappears(t *testing.T) { { Config: testAccTableBucketConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.NewResourceTableBucket, resourceName), ), ExpectNonEmptyPlan: true, @@ -184,8 +181,7 @@ func TestAccS3TablesTableBucket_disappears(t *testing.T) { func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { ctx := acctest.Context(t) - - var tablebucket s3tables.GetTableBucketOutput + var v s3tables.GetTableBucketOutput rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_s3tables_table_bucket.test" @@ -201,7 +197,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { { Config: testAccTableBucketConfig_maintenanceConfiguration(rName, awstypes.MaintenanceStatusEnabled, 20, 6), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("maintenance_configuration"), knownvalue.ObjectExact(map[string]knownvalue.Check{ @@ -226,7 +222,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { { Config: testAccTableBucketConfig_maintenanceConfiguration(rName, awstypes.MaintenanceStatusEnabled, 15, 4), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("maintenance_configuration"), knownvalue.ObjectExact(map[string]knownvalue.Check{ @@ -251,7 +247,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { { Config: testAccTableBucketConfig_maintenanceConfiguration(rName, awstypes.MaintenanceStatusDisabled, 15, 4), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, &tablebucket), + testAccCheckTableBucketExists(ctx, resourceName, &v), ), ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("maintenance_configuration"), knownvalue.ObjectExact(map[string]knownvalue.Check{ @@ -279,6 +275,7 @@ func TestAccS3TablesTableBucket_maintenanceConfiguration(t *testing.T) { func TestAccS3TablesTableBucket_forceDestroy(t *testing.T) { ctx := acctest.Context(t) + var v s3tables.GetTableBucketOutput resourceName := "aws_s3tables_table_bucket.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -294,7 +291,7 @@ func TestAccS3TablesTableBucket_forceDestroy(t *testing.T) { { Config: testAccTableBucketConfig_forceDestroy(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, nil), + testAccCheckTableBucketExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtTrue), testAccCheckTableBucketAddTables(ctx, resourceName, "namespace1", "table1"), ), @@ -305,6 +302,7 @@ func TestAccS3TablesTableBucket_forceDestroy(t *testing.T) { func TestAccS3TablesTableBucket_forceDestroyMultipleNamespacesAndTables(t *testing.T) { ctx := acctest.Context(t) + var v s3tables.GetTableBucketOutput resourceName := "aws_s3tables_table_bucket.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -320,7 +318,7 @@ func TestAccS3TablesTableBucket_forceDestroyMultipleNamespacesAndTables(t *testi { Config: testAccTableBucketConfig_forceDestroy(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTableBucketExists(ctx, resourceName, nil), + testAccCheckTableBucketExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtTrue), testAccCheckTableBucketAddTables(ctx, resourceName, "namespace1", "table1"), testAccCheckTableBucketAddTables(ctx, resourceName, "namespace2", "table2", "table3"), From 6cd0a8fae534e3d80c2270acb4acf2725d5dde34 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 12:38:03 -0400 Subject: [PATCH 0695/2115] 'portalARNFromIdentityProviderARN' use 'arn' package and add unit tests. --- internal/service/globalaccelerator/arn.go | 12 ++--- .../service/workspacesweb/exports_test.go | 2 + .../workspacesweb/identity_provider.go | 39 +++++++++++---- .../workspacesweb/identity_provider_test.go | 48 +++++++++++++++++++ 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/internal/service/globalaccelerator/arn.go b/internal/service/globalaccelerator/arn.go index d842e5c22083..238f01ced276 100644 --- a/internal/service/globalaccelerator/arn.go +++ b/internal/service/globalaccelerator/arn.go @@ -11,8 +11,8 @@ import ( ) const ( - arnSeparator = "/" - arnService = "globalaccelerator" + arnResourceSeparator = "/" + arnService = "globalaccelerator" ) // endpointGroupARNToListenerARN converts an endpoint group ARN to a listener ARN. @@ -28,7 +28,7 @@ func endpointGroupARNToListenerARN(inputARN string) (string, error) { return "", fmt.Errorf("expected service %s in ARN (%s), got: %s", expected, inputARN, actual) } - resourceParts := strings.Split(parsedARN.Resource, arnSeparator) + resourceParts := strings.Split(parsedARN.Resource, arnResourceSeparator) if actual, expected := len(resourceParts), 6; actual < expected { return "", fmt.Errorf("expected at least %d resource parts in ARN (%s), got: %d", expected, inputARN, actual) @@ -39,7 +39,7 @@ func endpointGroupARNToListenerARN(inputARN string) (string, error) { Service: parsedARN.Service, Region: parsedARN.Region, AccountID: parsedARN.AccountID, - Resource: strings.Join(resourceParts[0:4], arnSeparator), + Resource: strings.Join(resourceParts[0:4], arnResourceSeparator), }.String() return outputARN, nil @@ -58,7 +58,7 @@ func listenerOrEndpointGroupARNToAcceleratorARN(inputARN string) (string, error) return "", fmt.Errorf("expected service %s in ARN (%s), got: %s", expected, inputARN, actual) } - resourceParts := strings.Split(parsedARN.Resource, arnSeparator) + resourceParts := strings.Split(parsedARN.Resource, arnResourceSeparator) if actual, expected := len(resourceParts), 4; actual < expected { return "", fmt.Errorf("expected at least %d resource parts in ARN (%s), got: %d", expected, inputARN, actual) @@ -69,7 +69,7 @@ func listenerOrEndpointGroupARNToAcceleratorARN(inputARN string) (string, error) Service: parsedARN.Service, Region: parsedARN.Region, AccountID: parsedARN.AccountID, - Resource: strings.Join(resourceParts[0:2], arnSeparator), + Resource: strings.Join(resourceParts[0:2], arnResourceSeparator), }.String() return outputARN, nil diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index c98aa444d371..1dcb6d20e604 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -24,4 +24,6 @@ var ( FindTrustStoreByARN = findTrustStoreByARN FindUserAccessLoggingSettingsByARN = findUserAccessLoggingSettingsByARN FindUserSettingsByARN = findUserSettingsByARN + + PortalARNFromIdentityProviderARN = portalARNFromIdentityProviderARN ) diff --git a/internal/service/workspacesweb/identity_provider.go b/internal/service/workspacesweb/identity_provider.go index 28745ecd0e0a..bbdad81309e5 100644 --- a/internal/service/workspacesweb/identity_provider.go +++ b/internal/service/workspacesweb/identity_provider.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" "github.com/hashicorp/terraform-plugin-framework/path" @@ -223,22 +224,42 @@ func (r *identityProviderResource) ImportState(ctx context.Context, request reso resource.ImportStatePassthroughID(ctx, path.Root("identity_provider_arn"), request, response) } +const ( + arnResourceSeparator = "/" + arnService = "workspaces-web" +) + func portalARNFromIdentityProviderARN(identityProviderARN string) (string, error) { // Identity Provider ARN format: arn:{PARTITION}:workspaces-web:{REGION}:{ACCOUNT_ID}:identityProvider/{PORTAL_ID}/{IDP_RESOURCE_ID} // Portal ARN format: arn:{PARTITION}:workspaces-web:{REGION}:{ACCOUNT_ID}:portal/{PORTAL_ID} - parts := strings.Split(identityProviderARN, ":") - if len(parts) != 6 { - return "", fmt.Errorf("invalid identity provider ARN format: %s", identityProviderARN) + parsedARN, err := arn.Parse(identityProviderARN) + + if err != nil { + return "", fmt.Errorf("parsing ARN (%s): %w", identityProviderARN, err) + } + + if actual, expected := parsedARN.Service, arnService; actual != expected { + return "", fmt.Errorf("expected service %s in ARN (%s), got: %s", expected, identityProviderARN, actual) } - resourcePart := parts[5] // identityProvider/{PORTAL_ID}/{IDP_RESOURCE_ID} - resourceParts := strings.Split(resourcePart, "/") - if len(resourceParts) != 3 || resourceParts[0] != "identityProvider" { - return "", fmt.Errorf("invalid identity provider ARN resource format: %s", identityProviderARN) + resourceParts := strings.Split(parsedARN.Resource, arnResourceSeparator) + + if actual, expected := len(resourceParts), 3; actual != expected { + return "", fmt.Errorf("expected %d resource parts in ARN (%s), got: %d", expected, identityProviderARN, actual) } - portalID := resourceParts[1] - portalARN := fmt.Sprintf("%s:%s:%s:%s:%s:portal/%s", parts[0], parts[1], parts[2], parts[3], parts[4], portalID) + if actual, expected := resourceParts[0], "identityProvider"; actual != expected { + return "", fmt.Errorf("expected %s in ARN (%s), got: %s", expected, identityProviderARN, actual) + } + + portalARN := arn.ARN{ + Partition: parsedARN.Partition, + Service: parsedARN.Service, + Region: parsedARN.Region, + AccountID: parsedARN.AccountID, + Resource: "portal" + arnResourceSeparator + resourceParts[1], + }.String() + return portalARN, nil } diff --git a/internal/service/workspacesweb/identity_provider_test.go b/internal/service/workspacesweb/identity_provider_test.go index 308d52b38391..31e6b0f84d31 100644 --- a/internal/service/workspacesweb/identity_provider_test.go +++ b/internal/service/workspacesweb/identity_provider_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" + "github.com/google/go-cmp/cmp" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -19,6 +20,53 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) +func TestPortalARNFromIdentityProviderARN(t *testing.T) { + t.Parallel() + + testCases := map[string]struct { + identityProviderARN string + wantPortalARN string + wantErr bool + }{ + "empty ARN": { + wantErr: true, + }, + "unparsable ARN": { + identityProviderARN: "test", + wantErr: true, + }, + "invalid ARN service": { + identityProviderARN: "arn:aws:workspaces:us-west-2:123456789012:identityProvider/portal-123/ip-456", //lintignore:AWSAT003,AWSAT005 + wantErr: true, + }, + "invalid ARN resource parts": { + identityProviderARN: "arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/bs-789", //lintignore:AWSAT003,AWSAT005 + wantErr: true, + }, + "valid ARN": { + identityProviderARN: "arn:aws:workspaces-web:us-west-2:123456789012:identityProvider/portal-123/ip-456", //lintignore:AWSAT003,AWSAT005 + wantPortalARN: "arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-123", //lintignore:AWSAT003,AWSAT005 + }, + } + + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + t.Parallel() + + got, err := tfworkspacesweb.PortalARNFromIdentityProviderARN(testCase.identityProviderARN) + + if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { + t.Errorf("PortalARNFromIdentityProviderARN(%s) err %t, want %t", testCase.identityProviderARN, got, want) + } + if err == nil { + if diff := cmp.Diff(got, testCase.wantPortalARN); diff != "" { + t.Errorf("unexpected diff (+wanted, -got): %s", diff) + } + } + }) + } +} + func TestAccWorkSpacesWebIdentityProvider_basic(t *testing.T) { ctx := acctest.Context(t) var identityProvider awstypes.IdentityProvider From bfb84400bef8ef989a04670628701a036050fdd0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 12:44:42 -0400 Subject: [PATCH 0696/2115] Add parameterized resource identity to `aws_kms_key` ```console % make testacc PKG=kms TESTS=TestAccKMSKey_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/kms/... -v -count 1 -parallel 20 -run='TestAccKMSKey_' -timeout 360m -vet=off 2025/08/25 12:07:41 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 12:07:41 Initializing Terraform AWS Provider (SDKv2-style)... === NAME TestAccKMSKey_postQuantum key_test.go:181: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-west-1] --- SKIP: TestAccKMSKey_postQuantum (0.39s) === CONT TestAccKMSKey_tags_IgnoreTags_Overlap_ResourceTag === NAME TestAccKMSKey_hmacKey acctest.go:1699: skipping test for aws/us-west-2: Error running apply: exit status 1 Error: enabling KMS Key (4b7718ef-0e49-4dc1-a97d-ddfed23420e1) rotation: operation error KMS: EnableKeyRotation, https response error StatusCode: 400, RequestID: 7613de3c-e880-461c-bb67-bf42d8f1e44d, UnsupportedOperationException: with aws_kms_key.test, on terraform_plugin_test.tf line 12, in resource "aws_kms_key" "test": 12: resource "aws_kms_key" "test" { === NAME TestAccKMSKey_asymmetricKey acctest.go:1699: skipping test for aws/us-west-2: Error running apply: exit status 1 Error: enabling KMS Key (bc9e7e4b-4fb1-4671-95f0-20673a65728b) rotation: operation error KMS: EnableKeyRotation, https response error StatusCode: 400, RequestID: 2d69253b-8293-4b81-9e46-56138cc3fc5e, UnsupportedOperationException: with aws_kms_key.test, on terraform_plugin_test.tf line 12, in resource "aws_kms_key" "test": 12: resource "aws_kms_key" "test" { --- SKIP: TestAccKMSKey_hmacKey (15.27s) === CONT TestAccKMSKey_tags_IgnoreTags_Overlap_DefaultTag --- SKIP: TestAccKMSKey_asymmetricKey (15.36s) === CONT TestAccKMSKey_tags_AddOnUpdate --- PASS: TestAccKMSKey_multiRegion (25.99s) === CONT TestAccKMSKey_tags_DefaultTags_providerOnly --- PASS: TestAccKMSKey_disappears (30.21s) === CONT TestAccKMSKey_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccKMSKey_tags_DefaultTags_nullNonOverlappingResourceTag (53.98s) === CONT TestAccKMSKey_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccKMSKey_tags_DefaultTags_emptyResourceTag (54.32s) === CONT TestAccKMSKey_tags_EmptyTag_OnCreate --- PASS: TestAccKMSKey_tags_ComputedTag_OnCreate (55.74s) === CONT TestAccKMSKey_Policy_iamServiceLinkedRole --- PASS: TestAccKMSKey_tags_DefaultTags_emptyProviderOnlyTag (55.76s) === CONT TestAccKMSKey_tags_IgnoreTags_ModifyOutOfBand --- PASS: TestAccKMSKey_tags_DefaultTags_nullOverlappingResourceTag (56.16s) === CONT TestAccKMSKey_rotation --- PASS: TestAccKMSKey_Identity_Basic (59.87s) === CONT TestAccKMSKey_isEnabled --- PASS: TestAccKMSKey_basic (62.00s) === CONT TestAccKMSKey_Policy_booleanCondition --- PASS: TestAccKMSKey_Policy_basic (67.99s) === CONT TestAccKMSKey_Policy_iamRoleUpdate --- PASS: TestAccKMSKey_tags_DefaultTags_updateToResourceOnly (75.26s) === CONT TestAccKMSKey_Policy_iamRoleOrder --- PASS: TestAccKMSKey_tags_DefaultTags_updateToProviderOnly (81.08s) === CONT TestAccKMSKey_tags --- PASS: TestAccKMSKey_tags_ComputedTag_OnUpdate_Add (85.06s) === CONT TestAccKMSKey_tags_EmptyMap --- PASS: TestAccKMSKey_tags_AddOnUpdate (70.21s) === CONT TestAccKMSKey_tags_null --- PASS: TestAccKMSKey_tags_ComputedTag_OnUpdate_Replace (86.32s) === CONT TestAccKMSKey_Identity_ExistingResource --- PASS: TestAccKMSKey_Policy_booleanCondition (34.96s) === CONT TestAccKMSKey_Identity_RegionOverride --- PASS: TestAccKMSKey_tags_IgnoreTags_Overlap_DefaultTag (88.30s) === CONT TestAccKMSKey_Policy_iamRole --- PASS: TestAccKMSKey_tags_EmptyTag_OnUpdate_Replace (75.93s) === CONT TestAccKMSKey_Policy_bypassUpdate --- PASS: TestAccKMSKey_tags_IgnoreTags_Overlap_ResourceTag (111.89s) --- PASS: TestAccKMSKey_tags_DefaultTags_overlapping (123.29s) --- PASS: TestAccKMSKey_Policy_iamServiceLinkedRole (70.21s) --- PASS: TestAccKMSKey_tags_DefaultTags_nonOverlapping (126.25s) --- PASS: TestAccKMSKey_Policy_iamRoleOrder (51.39s) === NAME TestAccKMSKey_tags_IgnoreTags_ModifyOutOfBand key_test.go:528: Step 3/3 error: Post-apply refresh state check(s) failed: error checking remote tags for aws_kms_key.test: key1 map element: expected value value1updated for StringExact check, got: value1 --- PASS: TestAccKMSKey_tags_EmptyTag_OnCreate (77.16s) --- PASS: TestAccKMSKey_Policy_iamRoleUpdate (63.62s) --- FAIL: TestAccKMSKey_tags_IgnoreTags_ModifyOutOfBand (75.94s) --- PASS: TestAccKMSKey_rotation (77.25s) --- PASS: TestAccKMSKey_tags_EmptyMap (51.87s) --- PASS: TestAccKMSKey_tags_null (52.06s) --- PASS: TestAccKMSKey_Identity_RegionOverride (41.34s) --- PASS: TestAccKMSKey_Identity_ExistingResource (61.10s) --- PASS: TestAccKMSKey_tags_EmptyTag_OnUpdate_Add (94.24s) --- PASS: TestAccKMSKey_Policy_bypassUpdate (45.27s) --- PASS: TestAccKMSKey_Policy_iamRole (48.08s) --- PASS: TestAccKMSKey_tags_DefaultTags_providerOnly (132.02s) --- PASS: TestAccKMSKey_Policy_bypass (170.16s) --- PASS: TestAccKMSKey_tags (102.38s) --- PASS: TestAccKMSKey_isEnabled (126.43s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/kms 192.820s ``` Failures are unrelated to the resource identity implementation. --- internal/service/kms/generate.go | 1 + internal/service/kms/key.go | 6 +- internal/service/kms/key_identity_gen_test.go | 265 ++++++++++++++++++ internal/service/kms/service_package_gen.go | 6 +- .../kms/testdata/Key/basic/main_gen.tf | 14 + .../testdata/Key/basic_v6.10.0/main_gen.tf | 24 ++ .../testdata/Key/region_override/main_gen.tf | 22 ++ .../service/kms/testdata/tmpl/key_tags.gtpl | 1 + website/docs/r/kms_key.html.markdown | 26 ++ 9 files changed, 360 insertions(+), 5 deletions(-) create mode 100644 internal/service/kms/key_identity_gen_test.go create mode 100644 internal/service/kms/testdata/Key/basic/main_gen.tf create mode 100644 internal/service/kms/testdata/Key/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/kms/testdata/Key/region_override/main_gen.tf diff --git a/internal/service/kms/generate.go b/internal/service/kms/generate.go index 6a2a6ac5e84f..ad52c6b130e9 100644 --- a/internal/service/kms/generate.go +++ b/internal/service/kms/generate.go @@ -4,6 +4,7 @@ //go:generate go run ../../generate/tags/main.go -ListTags -ListTagsOp=ListResourceTags -ListTagsOpPaginated -ListTagsInIDElem=KeyId -ServiceTagsSlice -TagInIDElem=KeyId -TagTypeKeyElem=TagKey -TagTypeValElem=TagValue -UpdateTags -Wait -WaitContinuousOccurence 5 -WaitMinTimeout 1s -WaitTimeout 10m -ParentNotFoundErrCode=NotFoundException //go:generate go run ../../generate/servicepackage/main.go //go:generate go run ../../generate/tagstests/main.go +//go:generate go run ../../generate/identitytests/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. package kms diff --git a/internal/service/kms/key.go b/internal/service/kms/key.go index fcbd44af6f37..a67d0d5f2edb 100644 --- a/internal/service/kms/key.go +++ b/internal/service/kms/key.go @@ -33,8 +33,10 @@ import ( // @SDKResource("aws_kms_key", name="Key") // @Tags(identifierAttribute="id") +// @IdentityAttribute("id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/kms/types;awstypes;awstypes.KeyMetadata") // @Testing(importIgnore="deletion_window_in_days;bypass_policy_lockout_safety_check") +// @Testing(preIdentityVersion="v6.10.0") func resourceKey() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceKeyCreate, @@ -42,10 +44,6 @@ func resourceKey() *schema.Resource { UpdateWithoutTimeout: resourceKeyUpdate, DeleteWithoutTimeout: resourceKeyDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(iamPropagationTimeout), }, diff --git a/internal/service/kms/key_identity_gen_test.go b/internal/service/kms/key_identity_gen_test.go new file mode 100644 index 000000000000..53c8cf3297f1 --- /dev/null +++ b/internal/service/kms/key_identity_gen_test.go @@ -0,0 +1,265 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package kms_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/kms/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccKMSKey_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.KeyMetadata + resourceName := "aws_kms_key.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: testAccCheckKeyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Key/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckKeyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Key/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "deletion_window_in_days", "bypass_policy_lockout_safety_check", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Key/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + ExpectNonEmptyPlan: true, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Key/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func TestAccKMSKey_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_kms_key.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Key/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Key/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "deletion_window_in_days", "bypass_policy_lockout_safety_check", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Key/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + ExpectNonEmptyPlan: true, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Key/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccKMSKey_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.KeyMetadata + resourceName := "aws_kms_key.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: testAccCheckKeyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Key/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckKeyExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Key/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index 84b5fe2cd3b2..3470bfac629a 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -126,7 +126,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceKeyPolicy, diff --git a/internal/service/kms/testdata/Key/basic/main_gen.tf b/internal/service/kms/testdata/Key/basic/main_gen.tf new file mode 100644 index 000000000000..571bc4c67fbd --- /dev/null +++ b/internal/service/kms/testdata/Key/basic/main_gen.tf @@ -0,0 +1,14 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_key" "test" { + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/kms/testdata/Key/basic_v6.10.0/main_gen.tf b/internal/service/kms/testdata/Key/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..e25e4c3647de --- /dev/null +++ b/internal/service/kms/testdata/Key/basic_v6.10.0/main_gen.tf @@ -0,0 +1,24 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_key" "test" { + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/kms/testdata/Key/region_override/main_gen.tf b/internal/service/kms/testdata/Key/region_override/main_gen.tf new file mode 100644 index 000000000000..b4602252d79e --- /dev/null +++ b/internal/service/kms/testdata/Key/region_override/main_gen.tf @@ -0,0 +1,22 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_key" "test" { + region = var.region + + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/kms/testdata/tmpl/key_tags.gtpl b/internal/service/kms/testdata/tmpl/key_tags.gtpl index 8c5db0c2f9ca..414bc75a15cc 100644 --- a/internal/service/kms/testdata/tmpl/key_tags.gtpl +++ b/internal/service/kms/testdata/tmpl/key_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_kms_key" "test" { +{{- template "region" }} description = var.rName deletion_window_in_days = 7 enable_key_rotation = true diff --git a/website/docs/r/kms_key.html.markdown b/website/docs/r/kms_key.html.markdown index ceb047817c49..c7f54f75a90c 100644 --- a/website/docs/r/kms_key.html.markdown +++ b/website/docs/r/kms_key.html.markdown @@ -353,6 +353,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_key.example + identity = { + id = "1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_kms_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the KMS key. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS Keys using the `id`. For example: ```terraform From 171e8cdb6eed6de477d99b3ed01a92fedc8f2350 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 13:06:58 -0400 Subject: [PATCH 0697/2115] Add parameterized resource identity to `aws_kms_alias` ```console % make testacc PKG=kms TESTS=TestAccKMSAlias_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/kms/... -v -count 1 -parallel 20 -run='TestAccKMSAlias_' -timeout 360m -vet=off 2025/08/25 13:07:22 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 13:07:22 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccKMSAlias_disappears (27.01s) --- PASS: TestAccKMSAlias_namePrefix (29.21s) --- PASS: TestAccKMSAlias_multipleAliasesForSameKey (29.44s) --- PASS: TestAccKMSAlias_basic (29.86s) --- PASS: TestAccKMSAlias_Name_generated (29.97s) --- PASS: TestAccKMSAlias_Identity_RegionOverride (37.57s) --- PASS: TestAccKMSAlias_arnDiffSuppress (40.34s) --- PASS: TestAccKMSAlias_Identity_Basic (40.59s) --- PASS: TestAccKMSAlias_updateKeyID (45.62s) --- PASS: TestAccKMSAlias_Identity_ExistingResource (53.27s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/kms 59.810s ``` --- .changelog/44025.txt | 6 + internal/service/kms/alias.go | 7 +- .../service/kms/alias_identity_gen_test.go | 251 ++++++++++++++++++ internal/service/kms/service_package_gen.go | 4 + .../kms/testdata/Alias/basic/main_gen.tf | 19 ++ .../testdata/Alias/basic_v6.10.0/main_gen.tf | 29 ++ .../Alias/region_override/main_gen.tf | 29 ++ .../kms/testdata/tmpl/alias_basic.gtpl | 12 + website/docs/r/kms_alias.html.markdown | 26 ++ 9 files changed, 379 insertions(+), 4 deletions(-) create mode 100644 .changelog/44025.txt create mode 100644 internal/service/kms/alias_identity_gen_test.go create mode 100644 internal/service/kms/testdata/Alias/basic/main_gen.tf create mode 100644 internal/service/kms/testdata/Alias/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/kms/testdata/Alias/region_override/main_gen.tf create mode 100644 internal/service/kms/testdata/tmpl/alias_basic.gtpl diff --git a/.changelog/44025.txt b/.changelog/44025.txt new file mode 100644 index 000000000000..cd2b84ac492e --- /dev/null +++ b/.changelog/44025.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +resource/aws_kms_key: Add resource identity support +``` +```release-note:enhancement +resource/aws_kms_alias: Add resource identity support +``` diff --git a/internal/service/kms/alias.go b/internal/service/kms/alias.go index cad38e222d69..69bbd7138877 100644 --- a/internal/service/kms/alias.go +++ b/internal/service/kms/alias.go @@ -22,6 +22,9 @@ import ( ) // @SDKResource("aws_kms_alias", name="Alias") +// @IdentityAttribute("name") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/kms/types;awstypes;awstypes.AliasListEntry") +// @Testing(preIdentityVersion="v6.10.0") func resourceAlias() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceAliasCreate, @@ -29,10 +32,6 @@ func resourceAlias() *schema.Resource { UpdateWithoutTimeout: resourceAliasUpdate, DeleteWithoutTimeout: resourceAliasDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/kms/alias_identity_gen_test.go b/internal/service/kms/alias_identity_gen_test.go new file mode 100644 index 000000000000..fb1ba5660ac7 --- /dev/null +++ b/internal/service/kms/alias_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package kms_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/kms/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccKMSAlias_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.AliasListEntry + resourceName := "aws_kms_alias.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: testAccCheckAliasDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAliasExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccKMSAlias_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_kms_alias.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccKMSAlias_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.AliasListEntry + resourceName := "aws_kms_alias.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.KMSServiceID), + CheckDestroy: testAccCheckAliasDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAliasExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Alias/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + }, + }) +} diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index 3470bfac629a..ae83fa0c9fb2 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -91,6 +91,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_kms_alias", Name: "Alias", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrName), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceCiphertext, diff --git a/internal/service/kms/testdata/Alias/basic/main_gen.tf b/internal/service/kms/testdata/Alias/basic/main_gen.tf new file mode 100644 index 000000000000..6ed27ee53667 --- /dev/null +++ b/internal/service/kms/testdata/Alias/basic/main_gen.tf @@ -0,0 +1,19 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_alias" "test" { + name = "alias/${var.rName}" + target_key_id = aws_kms_key.test.id +} + +resource "aws_kms_key" "test" { + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/kms/testdata/Alias/basic_v6.10.0/main_gen.tf b/internal/service/kms/testdata/Alias/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..99a0ca77e26c --- /dev/null +++ b/internal/service/kms/testdata/Alias/basic_v6.10.0/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_alias" "test" { + name = "alias/${var.rName}" + target_key_id = aws_kms_key.test.id +} + +resource "aws_kms_key" "test" { + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/kms/testdata/Alias/region_override/main_gen.tf b/internal/service/kms/testdata/Alias/region_override/main_gen.tf new file mode 100644 index 000000000000..7137985ef276 --- /dev/null +++ b/internal/service/kms/testdata/Alias/region_override/main_gen.tf @@ -0,0 +1,29 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_kms_alias" "test" { + region = var.region + + name = "alias/${var.rName}" + target_key_id = aws_kms_key.test.id +} + +resource "aws_kms_key" "test" { + region = var.region + + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/kms/testdata/tmpl/alias_basic.gtpl b/internal/service/kms/testdata/tmpl/alias_basic.gtpl new file mode 100644 index 000000000000..268698df355b --- /dev/null +++ b/internal/service/kms/testdata/tmpl/alias_basic.gtpl @@ -0,0 +1,12 @@ +resource "aws_kms_alias" "test" { +{{- template "region" }} + name = "alias/${var.rName}" + target_key_id = aws_kms_key.test.id +} + +resource "aws_kms_key" "test" { +{{- template "region" }} + description = var.rName + deletion_window_in_days = 7 + enable_key_rotation = true +} diff --git a/website/docs/r/kms_alias.html.markdown b/website/docs/r/kms_alias.html.markdown index d5a62d006cee..135c7686598b 100644 --- a/website/docs/r/kms_alias.html.markdown +++ b/website/docs/r/kms_alias.html.markdown @@ -42,6 +42,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_alias.example + identity = { + name = "alias/my-key-alias" + } +} + +resource "aws_kms_alias" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the KMS key alias. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS aliases using the `name`. For example: ```terraform From c0e388c90929a5eec4756b5a5e299aee0d8bc708 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 14:03:21 -0400 Subject: [PATCH 0698/2115] Tweak CHANGELOG entry. --- .changelog/43742.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/43742.txt b/.changelog/43742.txt index a58c334857d7..eb2b0bf0b2b0 100644 --- a/.changelog/43742.txt +++ b/.changelog/43742.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_networkmanager_vpc_attachment: Add dns_support and security_group_referencing_support arguments +resource/aws_networkmanager_vpc_attachment: Add `options.dns_support` and `options.security_group_referencing_support` arguments ``` \ No newline at end of file From 95ea04ba008a6b6b310efd64c82318c59844bf3d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 14:29:52 -0400 Subject: [PATCH 0699/2115] Add 'TestAccWorkSpacesWebIPAccessSettingsAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 1 + .../ip_access_settings_association.go | 28 ++++------- .../ip_access_settings_association_test.go | 50 ++----------------- 3 files changed, 17 insertions(+), 62 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 04892a8c55a6..adc8d2ff49a6 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -11,6 +11,7 @@ var ( ResourceDataProtectionSettingsAssociation = newDataProtectionSettingsAssociationResource ResourceIdentityProvider = newIdentityProviderResource ResourceIPAccessSettings = newIPAccessSettingsResource + ResourceIPAccessSettingsAssociation = newIPAccessSettingsAssociationResource ResourceNetworkSettings = newNetworkSettingsResource ResourcePortal = newPortalResource ResourceTrustStore = newTrustStoreResource diff --git a/internal/service/workspacesweb/ip_access_settings_association.go b/internal/service/workspacesweb/ip_access_settings_association.go index b5242a8ea6c7..afc3ed4cf439 100644 --- a/internal/service/workspacesweb/ip_access_settings_association.go +++ b/internal/service/workspacesweb/ip_access_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newIPAccessSettingsAssociationResource(_ context.Context) (resource.Resourc return &ipAccessSettingsAssociationResource{}, nil } -const ( - ResNameIPAccessSettingsAssociation = "IP Access Settings Association" -) - type ipAccessSettingsAssociationResource struct { framework.ResourceWithModel[ipAccessSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *ipAccessSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "ip_access_settings_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *ipAccessSettingsAssociationResource) Create(ctx context.Context, reques _, err := conn.AssociateIpAccessSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameIPAccessSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb IP Access Settings Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *ipAccessSettingsAssociationResource) Read(ctx context.Context, request } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameIPAccessSettingsAssociation, data.IPAccessSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb IP Access Settings Association (%s)", data.IPAccessSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *ipAccessSettingsAssociationResource) Read(ctx context.Context, request response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *ipAccessSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *ipAccessSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data ipAccessSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *ipAccessSettingsAssociationResource) Delete(ctx context.Context, reques } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameIPAccessSettingsAssociation, data.IPAccessSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb IP Access Settings Association (%s)", data.IPAccessSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *ipAccessSettingsAssociationResource) ImportState(ctx context.Context, r type ipAccessSettingsAssociationResourceModel struct { framework.WithRegionModel - IPAccessSettingsARN types.String `tfsdk:"ip_access_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + IPAccessSettingsARN fwtypes.ARN `tfsdk:"ip_access_settings_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` } diff --git a/internal/service/workspacesweb/ip_access_settings_association_test.go b/internal/service/workspacesweb/ip_access_settings_association_test.go index 73541f413fd0..a83269cbdc25 100644 --- a/internal/service/workspacesweb/ip_access_settings_association_test.go +++ b/internal/service/workspacesweb/ip_access_settings_association_test.go @@ -68,13 +68,10 @@ func TestAccWorkSpacesWebIPAccessSettingsAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebIPAccessSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebIPAccessSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var ipAccessSettings1, ipAccessSettings2 awstypes.IpAccessSettings + var ipAccessSettings awstypes.IpAccessSettings resourceName := "aws_workspacesweb_ip_access_settings_association.test" - ipAccessSettingsResourceName1 := "aws_workspacesweb_ip_access_settings.test" - ipAccessSettingsResourceName2 := "aws_workspacesweb_ip_access_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -89,18 +86,10 @@ func TestAccWorkSpacesWebIPAccessSettingsAssociation_update(t *testing.T) { { Config: testAccIPAccessSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings1), - resource.TestCheckResourceAttrPair(resourceName, "ip_access_settings_arn", ipAccessSettingsResourceName1, "ip_access_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccIPAccessSettingsAssociationConfig_updated(), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings2), - resource.TestCheckResourceAttrPair(resourceName, "ip_access_settings_arn", ipAccessSettingsResourceName2, "ip_access_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckIPAccessSettingsAssociationExists(ctx, resourceName, &ipAccessSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceIPAccessSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -194,32 +183,3 @@ resource "aws_workspacesweb_ip_access_settings_association" "test" { } ` } - -func testAccIPAccessSettingsAssociationConfig_updated() string { - return ` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_ip_access_settings" "test" { - display_name = "test" - - ip_rule { - ip_range = "10.0.0.0/16" - } -} - -resource "aws_workspacesweb_ip_access_settings" "test2" { - display_name = "test2" - - ip_rule { - ip_range = "192.168.0.0/24" - } -} - -resource "aws_workspacesweb_ip_access_settings_association" "test" { - ip_access_settings_arn = aws_workspacesweb_ip_access_settings.test2.ip_access_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -` -} From dd0a2d47a28faec6713a003a29c578ce2e8c6619 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 14:49:50 -0400 Subject: [PATCH 0700/2115] Additional CHANGELOG entry. --- .changelog/42636.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.changelog/42636.txt b/.changelog/42636.txt index e88f1ab8aaad..527fa8c6f689 100644 --- a/.changelog/42636.txt +++ b/.changelog/42636.txt @@ -1,3 +1,7 @@ ```release-note:enhancement resource/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed +``` + +```release-note:enhancement +resource/aws_elasticache_replication_group: `engine` no longer has a default value ``` \ No newline at end of file From 06aa9101dbe7e75a1f18b8cc315dafa1ab0c2b48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 14:51:55 -0400 Subject: [PATCH 0701/2115] Revert "Additional CHANGELOG entry." This reverts commit dd0a2d47a28faec6713a003a29c578ce2e8c6619. --- .changelog/42636.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.changelog/42636.txt b/.changelog/42636.txt index 527fa8c6f689..e88f1ab8aaad 100644 --- a/.changelog/42636.txt +++ b/.changelog/42636.txt @@ -1,7 +1,3 @@ ```release-note:enhancement resource/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed -``` - -```release-note:enhancement -resource/aws_elasticache_replication_group: `engine` no longer has a default value ``` \ No newline at end of file From 8e62428461a2854bb73b5cf67e24a173c2355a4e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:07:09 -0400 Subject: [PATCH 0702/2115] tfresource.RetryWhenG: Use 'internal/retry'. --- internal/tfresource/retry.go | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index fc564baad2b9..c33972ac99d5 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -23,7 +23,7 @@ var ErrFoundResource = retry.ErrFoundResource // The error argument can be `nil`. // If the error is retryable, returns a bool value of `true` and an error (not necessarily the error passed as the argument). // If the error is not retryable, returns a bool value of `false` and either no error (success state) or an error (not necessarily the error passed as the argument). -type Retryable func(error) (bool, error) +type Retryable = retryable // RetryWhen retries the function `f` when the error it returns satisfies `retryable`. // `f` is retried until `timeout` expires. @@ -62,37 +62,8 @@ func RetryWhen(ctx context.Context, timeout time.Duration, f func() (any, error) // RetryGWhen is the generic version of RetryWhen which obviates the need for a type // assertion after the call. It retries the function `f` when the error it returns // satisfies `retryable`. `f` is retried until `timeout` expires. -func RetryGWhen[T any](ctx context.Context, timeout time.Duration, f func() (T, error), retryable Retryable) (T, error) { - var output T - - err := Retry(ctx, timeout, func() *sdkretry.RetryError { - var err error - var again bool - - output, err = f() - again, err = retryable(err) - - if again { - return sdkretry.RetryableError(err) - } - - if err != nil { - return sdkretry.NonRetryableError(err) - } - - return nil - }) - - if TimedOut(err) { - output, err = f() - } - - if err != nil { - var zero T - return zero, err - } - - return output, nil +func RetryGWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable Retryable) (T, error) { + return retryWhen(ctx, timeout, f, retryable) } // RetryWhenAWSErrCodeEquals retries the specified function when it returns one of the specified AWS error codes. From a04d39cff7c13bf32c5113f2adef523389ef9a14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:09:15 -0400 Subject: [PATCH 0703/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhenG' - apigateway. --- internal/service/apigateway/account.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/apigateway/account.go b/internal/service/apigateway/account.go index a6e24489f0e9..6472ac6cf36a 100644 --- a/internal/service/apigateway/account.go +++ b/internal/service/apigateway/account.go @@ -97,7 +97,7 @@ func (r *accountResource) Create(ctx context.Context, request resource.CreateReq } output, err := tfresource.RetryGWhen(ctx, propagationTimeout, - func() (*apigateway.UpdateAccountOutput, error) { + func(ctx context.Context) (*apigateway.UpdateAccountOutput, error) { return conn.UpdateAccount(ctx, &input) }, func(err error) (bool, error) { @@ -188,7 +188,7 @@ func (r *accountResource) Update(ctx context.Context, request resource.UpdateReq } output, err := tfresource.RetryGWhen(ctx, propagationTimeout, - func() (*apigateway.UpdateAccountOutput, error) { + func(ctx context.Context) (*apigateway.UpdateAccountOutput, error) { return conn.UpdateAccount(ctx, &input) }, func(err error) (bool, error) { From 1595da8feaf0b3cea731d6baf9dd7981c5cbc038 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:09:17 -0400 Subject: [PATCH 0704/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhenG' - bedrock. --- internal/service/bedrock/inference_profile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/bedrock/inference_profile.go b/internal/service/bedrock/inference_profile.go index 41699afb61d8..623216bfd46c 100644 --- a/internal/service/bedrock/inference_profile.go +++ b/internal/service/bedrock/inference_profile.go @@ -161,7 +161,7 @@ func (r *inferenceProfileResource) Create(ctx context.Context, req resource.Crea input.Tags = getTagsIn(ctx) - out, err := tfresource.RetryGWhen(ctx, 2*time.Minute, func() (*bedrock.CreateInferenceProfileOutput, error) { + out, err := tfresource.RetryGWhen(ctx, 2*time.Minute, func(ctx context.Context) (*bedrock.CreateInferenceProfileOutput, error) { return conn.CreateInferenceProfile(ctx, &input) }, func(err error) (bool, error) { if errs.IsA[*awstypes.ConflictException](err) { From 14dde8b38a90067ecac7dfca9ed816a898879bf1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:09:18 -0400 Subject: [PATCH 0705/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhenG' - bedrockagent. --- internal/service/bedrockagent/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go index faa1fa212fb9..411183222a0d 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -515,7 +515,7 @@ func prepareSupervisorToReleaseCollaborator(ctx context.Context, conn *bedrockag func updateAgentWithRetry(ctx context.Context, conn *bedrockagent.Client, input bedrockagent.UpdateAgentInput, timeout time.Duration) (*bedrockagent.UpdateAgentOutput, error) { return tfresource.RetryGWhen(ctx, timeout, - func() (*bedrockagent.UpdateAgentOutput, error) { + func(ctx context.Context) (*bedrockagent.UpdateAgentOutput, error) { return conn.UpdateAgent(ctx, &input) }, func(err error) (bool, error) { From 5a202c956190a9c637640fc26bf486a581116190 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:09:19 -0400 Subject: [PATCH 0706/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhenG' - cloudformation. --- internal/service/cloudformation/stack_set_instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloudformation/stack_set_instance.go b/internal/service/cloudformation/stack_set_instance.go index c6b8be872dd8..8b955746d1dc 100644 --- a/internal/service/cloudformation/stack_set_instance.go +++ b/internal/service/cloudformation/stack_set_instance.go @@ -292,7 +292,7 @@ func resourceStackSetInstanceCreate(ctx context.Context, d *schema.ResourceData, } output, err := tfresource.RetryGWhen(ctx, propagationTimeout, - func() (*cloudformation.CreateStackInstancesOutput, error) { + func(ctx context.Context) (*cloudformation.CreateStackInstancesOutput, error) { input.OperationId = aws.String(sdkid.UniqueId()) return conn.CreateStackInstances(ctx, input) From 2734b49f519d242d3d7f3eced886fe8148bbdf48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:09:40 -0400 Subject: [PATCH 0707/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhenG' - quicksight. --- internal/service/quicksight/account_settings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/quicksight/account_settings.go b/internal/service/quicksight/account_settings.go index 4634cd623bf1..c036722e803e 100644 --- a/internal/service/quicksight/account_settings.go +++ b/internal/service/quicksight/account_settings.go @@ -166,7 +166,7 @@ func (r *accountSettingsResource) ImportState(ctx context.Context, request resou func updateAccountSettings(ctx context.Context, conn *quicksight.Client, input *quicksight.UpdateAccountSettingsInput, timeout time.Duration) (*awstypes.AccountSettings, error) { return tfresource.RetryGWhen(ctx, timeout, - func() (*awstypes.AccountSettings, error) { + func(ctx context.Context) (*awstypes.AccountSettings, error) { _, err := conn.UpdateAccountSettings(ctx, input) if err != nil { From fd5f3361f3e3b7730c2921a9aa761448d365d414 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 25 Aug 2025 19:10:50 +0000 Subject: [PATCH 0708/2115] Update CHANGELOG.md for #44025 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d17566ac90b8..1c762efdda7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ FEATURES: +* **New Resource:** `aws_workspacesweb_browser_settings_association` ([#43735](https://github.com/hashicorp/terraform-provider-aws/issues/43735)) +* **New Resource:** `aws_workspacesweb_data_protection_settings_association` ([#43773](https://github.com/hashicorp/terraform-provider-aws/issues/43773)) +* **New Resource:** `aws_workspacesweb_identity_provider` ([#43729](https://github.com/hashicorp/terraform-provider-aws/issues/43729)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) @@ -14,8 +17,10 @@ ENHANCEMENTS: * resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) +* resource/aws_kms_alias: Add resource identity support ([#44025](https://github.com/hashicorp/terraform-provider-aws/issues/44025)) * resource/aws_kms_external_key: Add `key_spec` argument ([#44011](https://github.com/hashicorp/terraform-provider-aws/issues/44011)) * resource/aws_kms_external_key: Change `key_usage` to Optional and Computed ([#44011](https://github.com/hashicorp/terraform-provider-aws/issues/44011)) +* resource/aws_kms_key: Add resource identity support ([#44025](https://github.com/hashicorp/terraform-provider-aws/issues/44025)) * resource/aws_lb: Add `secondary_ips_auto_assigned_per_subnet` argument for Network Load Balancers ([#43699](https://github.com/hashicorp/terraform-provider-aws/issues/43699)) * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) From 91999dc395fb74135e59d64e9fcb3d2b76204831 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 15:18:00 -0400 Subject: [PATCH 0709/2115] r/aws_timesteaminfluxdb_db_cluster(test): prefer `ConfigPlanCheck` for verifying update ```console % make testacc PKG=timestreaminfluxdb TESTS="TestAccTimestreamInfluxDBDBCluster_dbInstanceType|TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration|TestAccTimestreamInfluxDBDBCluster_port|TestAccTimestreamInfluxDBDBCluster_failoverMode" ACCTEST_PARALLELISM=2 make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 2 -run='TestAccTimestreamInfluxDBDBCluster_dbInstanceType|TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration|TestAccTimestreamInfluxDBDBCluster_port|TestAccTimestreamInfluxDBDBCluster_failoverMode' -timeout 360m -vet=off 2025/08/25 13:11:04 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 13:11:05 Initializing Terraform AWS Provider (SDKv2-style)... === CONT TestAccTimestreamInfluxDBDBCluster_port --- PASS: TestAccTimestreamInfluxDBDBCluster_port (1504.16s) === CONT TestAccTimestreamInfluxDBDBCluster_failoverMode --- PASS: TestAccTimestreamInfluxDBDBCluster_dbInstanceType (1544.95s) === CONT TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration --- PASS: TestAccTimestreamInfluxDBDBCluster_failoverMode (1579.61s) --- PASS: TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration (1750.68s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb 3302.184s ``` --- .../timestreaminfluxdb/db_cluster_test.go | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/internal/service/timestreaminfluxdb/db_cluster_test.go b/internal/service/timestreaminfluxdb/db_cluster_test.go index a0ea2ee43180..4c93ba9a1b80 100644 --- a/internal/service/timestreaminfluxdb/db_cluster_test.go +++ b/internal/service/timestreaminfluxdb/db_cluster_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb" awstypes "github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb/types" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -139,9 +138,13 @@ func TestAccTimestreamInfluxDBDBCluster_dbInstanceType(t *testing.T) { Config: testAccDBClusterConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxLarge)), Check: resource.ComposeTestCheckFunc( testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxLarge)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { ResourceName: resourceName, @@ -191,11 +194,15 @@ func TestAccTimestreamInfluxDBDBCluster_logDeliveryConfiguration(t *testing.T) { Config: testAccDBClusterConfig_logDeliveryConfigurationEnabled(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.%", "2"), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.bucket_name", rName), resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtFalse), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { ResourceName: resourceName, @@ -281,9 +288,13 @@ func TestAccTimestreamInfluxDBDBCluster_port(t *testing.T) { Config: testAccDBClusterConfig_port(rName, port2), Check: resource.ComposeTestCheckFunc( testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, names.AttrPort, port2), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { ResourceName: resourceName, @@ -478,9 +489,13 @@ func TestAccTimestreamInfluxDBDBCluster_failoverMode(t *testing.T) { Config: testAccDBClusterConfig_failoverMode(rName, string(awstypes.FailoverModeNoFailover)), Check: resource.ComposeTestCheckFunc( testAccCheckDBClusterExists(ctx, t, resourceName, &dbCluster2), - testAccCheckDBClusterNotRecreated(&dbCluster1, &dbCluster2), resource.TestCheckResourceAttr(resourceName, "failover_mode", string(awstypes.FailoverModeNoFailover)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { ResourceName: resourceName, @@ -556,19 +571,6 @@ func testAccPreCheckDBClusters(ctx context.Context, t *testing.T) { } } -func testAccCheckDBClusterNotRecreated(before, after *timestreaminfluxdb.GetDbClusterOutput) resource.TestCheckFunc { - return func(s *terraform.State) error { - if beforeID, afterID := aws.ToString(before.Id), aws.ToString(after.Id); beforeID != afterID { - return create.Error(names.TimestreamInfluxDB, create.ErrActionCheckingNotRecreated, - tftimestreaminfluxdb.ResNameDBCluster, - fmt.Sprintf("before: %s, after: %s", beforeID, afterID), - errors.New("resource was recreated when it should have been updated in-place")) - } - - return nil - } -} - func testAccDBClusterConfig_base(rName string, subnetCount int) string { return acctest.ConfigCompose(acctest.ConfigVPCWithSubnets(rName, subnetCount), ` resource "aws_security_group" "test" { From 322d4842a6e331c97de80eb12dd12f3764124a38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:29:34 -0400 Subject: [PATCH 0710/2115] Fix terrafmt errors. --- .../global_replication_group_test.go | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index aa7f22267a50..58ff92fbe361 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -2330,17 +2330,19 @@ func testAccGlobalReplicationGroupConfig_engineParam(rName, primaryReplicationGr resource "aws_elasticache_global_replication_group" "test" { global_replication_group_id_suffix = %[1]q primary_replication_group_id = aws_elasticache_replication_group.test.id + engine = %[5]q engine_version = %[6]q parameter_group_name = %[7]q } + resource "aws_elasticache_replication_group" "test" { replication_group_id = %[2]q description = "test" - engine = %[3]q - engine_version = %[4]q - node_type = "cache.m5.large" - num_cache_clusters = 1 + engine = %[3]q + engine_version = %[4]q + node_type = "cache.m5.large" + num_cache_clusters = 1 } `, rName, primaryReplicationGroupId, repGroupEngine, repGroupEngineVersion, globalEngine, globalEngineVersion, globalParamGroup) } @@ -2351,16 +2353,19 @@ resource "aws_elasticache_global_replication_group" "test" { global_replication_group_id_suffix = %[1]q primary_replication_group_id = aws_elasticache_replication_group.test.id } + resource "aws_elasticache_replication_group" "test" { replication_group_id = %[2]q description = "test" - engine = "valkey" - engine_version = "8.0" - node_type = "cache.m5.large" - num_cache_clusters = 1 + engine = "valkey" + engine_version = "8.0" + node_type = "cache.m5.large" + num_cache_clusters = 1 } + resource "aws_elasticache_replication_group" "secondary" { provider = awsalternate + replication_group_id = %[3]q description = "test secondary" global_replication_group_id = aws_elasticache_global_replication_group.test.id From 2b4811a730e20aab400a30f28291c7b7369ec802 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:31:44 -0400 Subject: [PATCH 0711/2115] Rename test. --- .../elasticache/engine_version_test.go | 4 +-- internal/service/elasticache/exports_test.go | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/service/elasticache/engine_version_test.go b/internal/service/elasticache/engine_version_test.go index cb350f585d7b..cd866181df73 100644 --- a/internal/service/elasticache/engine_version_test.go +++ b/internal/service/elasticache/engine_version_test.go @@ -819,7 +819,7 @@ func (d *mockChangesDiffer) GetChange(key string) (any, any) { return d.values[key].GetChange() } -func TestParamGroupNameRequiresMajorVersionUpgrade(t *testing.T) { +func TestParamGroupNameRequiresEngineOrMajorVersionUpgrade(t *testing.T) { t.Parallel() testcases := map[string]struct { @@ -918,7 +918,7 @@ func TestParamGroupNameRequiresMajorVersionUpgrade(t *testing.T) { diff.id = "some id" } - err := tfelasticache.ParamGroupNameRequiresMajorVersionUpgrade(diff) + err := tfelasticache.ParamGroupNameRequiresEngineOrMajorVersionUpgrade(diff) if testcase.expectError == nil { if err != nil { diff --git a/internal/service/elasticache/exports_test.go b/internal/service/elasticache/exports_test.go index 4904a245956c..e366fa7c900a 100644 --- a/internal/service/elasticache/exports_test.go +++ b/internal/service/elasticache/exports_test.go @@ -31,21 +31,21 @@ var ( WaitCacheClusterDeleted = waitCacheClusterDeleted WaitReplicationGroupAvailable = waitReplicationGroupAvailable - DeleteCacheCluster = deleteCacheCluster - DiffVersion = diffVersion - EmptyDescription = emptyDescription - EngineMemcached = engineMemcached - EngineRedis = engineRedis - EngineValkey = engineValkey - EngineVersionForceNewOnDowngrade = engineVersionForceNewOnDowngrade - EngineVersionIsDowngrade = engineVersionIsDowngrade - GlobalReplicationGroupRegionPrefixFormat = globalReplicationGroupRegionPrefixFormat - NormalizeEngineVersion = normalizeEngineVersion - ParamGroupNameRequiresMajorVersionUpgrade = paramGroupNameRequiresEngineOrMajorVersionUpgrade - ValidateClusterEngineVersion = validateClusterEngineVersion - ValidMemcachedVersionString = validMemcachedVersionString - ValidRedisVersionString = validRedisVersionString - ValidValkeyVersionString = validValkeyVersionString + DeleteCacheCluster = deleteCacheCluster + DiffVersion = diffVersion + EmptyDescription = emptyDescription + EngineMemcached = engineMemcached + EngineRedis = engineRedis + EngineValkey = engineValkey + EngineVersionForceNewOnDowngrade = engineVersionForceNewOnDowngrade + EngineVersionIsDowngrade = engineVersionIsDowngrade + GlobalReplicationGroupRegionPrefixFormat = globalReplicationGroupRegionPrefixFormat + NormalizeEngineVersion = normalizeEngineVersion + ParamGroupNameRequiresEngineOrMajorVersionUpgrade = paramGroupNameRequiresEngineOrMajorVersionUpgrade + ValidateClusterEngineVersion = validateClusterEngineVersion + ValidMemcachedVersionString = validMemcachedVersionString + ValidRedisVersionString = validRedisVersionString + ValidValkeyVersionString = validValkeyVersionString ) type ( From 47ee93005a8380d9653b2b56c38bfac327ba271d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:32:45 -0400 Subject: [PATCH 0712/2115] Fix terrafmt error. --- internal/service/elasticache/global_replication_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 58ff92fbe361..99034dd6df32 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -2335,7 +2335,7 @@ resource "aws_elasticache_global_replication_group" "test" { engine_version = %[6]q parameter_group_name = %[7]q } - + resource "aws_elasticache_replication_group" "test" { replication_group_id = %[2]q description = "test" From ad4d3bab2774c53fbaae234535d5ed2878e6f679 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:52:07 -0400 Subject: [PATCH 0713/2115] internal/verify: Use 'internal/yaml'. --- internal/service/apigatewayv2/api.go | 8 ++++---- internal/verify/verify.go | 8 ++++---- internal/yaml/decode.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/apigatewayv2/api.go b/internal/service/apigatewayv2/api.go index 878ed77adc26..2d753cc2b15e 100644 --- a/internal/service/apigatewayv2/api.go +++ b/internal/service/apigatewayv2/api.go @@ -21,12 +21,12 @@ import ( "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/json" + tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" - "github.com/hashicorp/terraform-provider-aws/internal/yaml" + tfyaml "github.com/hashicorp/terraform-provider-aws/internal/yaml" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -542,10 +542,10 @@ func apiInvokeARN(ctx context.Context, c *conns.AWSClient, apiID string) string func decodeOpenAPIDefinition(v string) (map[string]any, error) { var output map[string]any - err := json.DecodeFromString(v, &output) + err := tfjson.DecodeFromString(v, &output) if err != nil { - err = yaml.DecodeFromString(v, &output) + err = tfyaml.DecodeFromString(v, &output) } if err != nil { diff --git a/internal/verify/verify.go b/internal/verify/verify.go index 5a9915d06b66..8f1b7ed5b632 100644 --- a/internal/verify/verify.go +++ b/internal/verify/verify.go @@ -4,7 +4,7 @@ package verify import ( - "github.com/goccy/go-yaml" + tfyaml "github.com/hashicorp/terraform-provider-aws/internal/yaml" ) const UUIDRegexPattern = `[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[ab89][0-9a-f]{3}-[0-9a-f]{12}` @@ -13,15 +13,15 @@ const UUIDRegexPattern = `[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[ab89][0-9a-f // the YAML parser. Returns either a parsing // error or original YAML string. func checkYAMLString(yamlString any) (string, error) { - var y any - if yamlString == nil || yamlString.(string) == "" { return "", nil } + var y any + s := yamlString.(string) - err := yaml.Unmarshal([]byte(s), &y) + err := tfyaml.DecodeFromString(s, &y) return s, err } diff --git a/internal/yaml/decode.go b/internal/yaml/decode.go index f9725ffd37c4..d65abb678cc9 100644 --- a/internal/yaml/decode.go +++ b/internal/yaml/decode.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/goccy/go-yaml" + yaml "github.com/goccy/go-yaml" ) // DecodeFromBytes decodes (unmarshals) the given byte slice, containing valid YAML, into `to`. From 3c9ccb263c332bd76f923b0486f601d7146d1126 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 25 Aug 2025 15:52:45 -0400 Subject: [PATCH 0714/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 3 +-- tools/tfsdk2fw/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 9d534a3a0576..bdbb773357c3 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -288,7 +288,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 // indirect github.com/aws/smithy-go v1.22.5 // indirect - github.com/beevik/etree v1.5.1 // indirect + github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cedar-policy/cedar-go v1.2.6 // indirect github.com/cloudflare/circl v1.6.1 // indirect @@ -373,7 +373,6 @@ require ( google.golang.org/grpc v1.72.1 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/dnaeon/go-vcr.v4 v4.0.5 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) replace github.com/hashicorp/terraform-provider-aws => ../.. diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 2082bf8757b5..6e5973ca97c8 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -563,8 +563,8 @@ github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVk github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= -github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= -github.com/beevik/etree v1.5.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= +github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= +github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= From 0042e8ea0de293c6cd8b003f89f7f4d2fb5fcf31 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 16:16:53 -0400 Subject: [PATCH 0715/2115] Add parameterized resource identity to `aws_secretsmanager_secret_version` Adds resource identity support to the `aws_secretsmanager_secret_version` resource, which is a parameterized identity composed of `secret_id` and `version_id`. ```console % make testacc PKG=secretsmanager TESTS="TestAccSecretsManagerSecretVersion_" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/secretsmanager/... -v -count 1 -parallel 20 -run='TestAccSecretsManagerSecretVersion_' -timeout 360m -vet=off 2025/08/25 16:12:51 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 16:12:51 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSecretsManagerSecretVersion_disappears (21.78s) --- PASS: TestAccSecretsManagerSecretVersion_multipleVersions (22.80s) --- PASS: TestAccSecretsManagerSecretVersion_Disappears_secret (23.10s) --- PASS: TestAccSecretsManagerSecretVersion_basicString (24.47s) --- PASS: TestAccSecretsManagerSecretVersion_base64Binary (25.78s) --- PASS: TestAccSecretsManagerSecretVersion_stringWriteOnly (30.84s) --- PASS: TestAccSecretsManagerSecretVersion_versionStagesExternalUpdate (31.03s) --- PASS: TestAccSecretsManagerSecretVersion_Identity_RegionOverride (31.08s) --- PASS: TestAccSecretsManagerSecretVersion_Identity_Basic (34.22s) --- PASS: TestAccSecretsManagerSecretVersion_versionStages (43.96s) --- PASS: TestAccSecretsManagerSecretVersion_Identity_ExistingResource (47.48s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/secretsmanager 54.104s ``` --- .changelog/44031.txt | 3 + .../service/secretsmanager/secret_version.go | 90 ++++-- .../secret_version_identity_gen_test.go | 269 ++++++++++++++++++ .../secretsmanager/secret_version_test.go | 11 + .../secretsmanager/service_package_gen.go | 8 + .../testdata/SecretVersion/basic/main_gen.tf | 17 ++ .../SecretVersion/basic_v6.10.0/main_gen.tf | 27 ++ .../SecretVersion/region_override/main_gen.tf | 27 ++ .../testdata/tmpl/secret_version_basic.gtpl | 10 + ...ecretsmanager_secret_version.html.markdown | 28 ++ 10 files changed, 461 insertions(+), 29 deletions(-) create mode 100644 .changelog/44031.txt create mode 100644 internal/service/secretsmanager/secret_version_identity_gen_test.go create mode 100644 internal/service/secretsmanager/testdata/SecretVersion/basic/main_gen.tf create mode 100644 internal/service/secretsmanager/testdata/SecretVersion/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/secretsmanager/testdata/SecretVersion/region_override/main_gen.tf create mode 100644 internal/service/secretsmanager/testdata/tmpl/secret_version_basic.gtpl diff --git a/.changelog/44031.txt b/.changelog/44031.txt new file mode 100644 index 000000000000..6e93e8580bca --- /dev/null +++ b/.changelog/44031.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_secretsmanager_secret_version: Add resource identity support +``` diff --git a/internal/service/secretsmanager/secret_version.go b/internal/service/secretsmanager/secret_version.go index 65c0175df1db..8ecafb69562c 100644 --- a/internal/service/secretsmanager/secret_version.go +++ b/internal/service/secretsmanager/secret_version.go @@ -22,7 +22,7 @@ import ( "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" - itypes "github.com/hashicorp/terraform-provider-aws/internal/types" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -33,6 +33,14 @@ const ( ) // @SDKResource("aws_secretsmanager_secret_version", name="Secret Version") +// @IdentityAttribute("secret_id") +// @IdentityAttribute("version_id") +// @Testing(preIdentityVersion="v6.10.0") +// @ImportIDHandler("secretVersionImportID") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/secretsmanager;secretsmanager.GetSecretValueOutput") +// @Testing(importStateIdFunc="testAccSecretVersionImportStateIdFunc") +// @Testing(importIgnore="has_secret_string_wo") +// @Testing(plannableImportAction="NoOp") func resourceSecretVersion() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceSecretVersionCreate, @@ -40,13 +48,6 @@ func resourceSecretVersion() *schema.Resource { UpdateWithoutTimeout: resourceSecretVersionUpdate, DeleteWithoutTimeout: resourceSecretVersionDelete, - Importer: &schema.ResourceImporter{ - StateContext: func(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - d.Set("has_secret_string_wo", false) - return []*schema.ResourceData{d}, nil - }, - }, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, @@ -116,7 +117,7 @@ func resourceSecretVersionCreate(ctx context.Context, d *schema.ResourceData, me if v, ok := d.GetOk("secret_binary"); ok { var err error - input.SecretBinary, err = itypes.Base64Decode(v.(string)) + input.SecretBinary, err = inttypes.Base64Decode(v.(string)) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -182,7 +183,7 @@ func resourceSecretVersionRead(ctx context.Context, d *schema.ResourceData, meta } d.Set(names.AttrARN, output.ARN) - d.Set("secret_binary", itypes.Base64EncodeOnce(output.SecretBinary)) + d.Set("secret_binary", inttypes.Base64EncodeOnce(output.SecretBinary)) d.Set("secret_id", secretID) d.Set("secret_string", output.SecretString) d.Set("version_id", output.VersionId) @@ -354,25 +355,6 @@ func resourceSecretVersionDelete(ctx context.Context, d *schema.ResourceData, me return diags } -const secretVersionIDSeparator = "|" - -func secretVersionCreateResourceID(secretID, versionID string) string { - parts := []string{secretID, versionID} - id := strings.Join(parts, secretVersionIDSeparator) - - return id -} - -func secretVersionParseResourceID(id string) (string, string, error) { - parts := strings.SplitN(id, secretVersionIDSeparator, 2) - - if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - return "", "", fmt.Errorf("unexpected format of ID (%[1]s), expected SecretID%[2]sVersionID", id, secretVersionIDSeparator) - } - - return parts[0], parts[1], nil -} - func findSecretVersion(ctx context.Context, conn *secretsmanager.Client, input *secretsmanager.GetSecretValueInput) (*secretsmanager.GetSecretValueOutput, error) { output, err := conn.GetSecretValue(ctx, input) @@ -404,3 +386,53 @@ func findSecretVersionByTwoPartKey(ctx context.Context, conn *secretsmanager.Cli return findSecretVersion(ctx, conn, input) } + +const secretVersionIDSeparator = "|" + +func secretVersionCreateResourceID(secretID, versionID string) string { + parts := []string{secretID, versionID} + id := strings.Join(parts, secretVersionIDSeparator) + + return id +} + +func secretVersionParseResourceID(id string) (string, string, error) { + parts := strings.SplitN(id, secretVersionIDSeparator, 2) + + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return "", "", fmt.Errorf("unexpected format of ID (%[1]s), expected SecretID%[2]sVersionID", id, secretVersionIDSeparator) + } + + return parts[0], parts[1], nil +} + +var _ inttypes.SDKv2ImportID = secretVersionImportID{} + +type secretVersionImportID struct{} + +func (secretVersionImportID) Create(d *schema.ResourceData) string { + secretID := d.Get("secret_id").(string) + versionID := d.Get("version_id").(string) + return secretVersionCreateResourceID(secretID, versionID) +} + +func (secretVersionImportID) Parse(id string) (string, map[string]string, error) { + secretID, versionID, err := secretVersionParseResourceID(id) + if err != nil { + return id, nil, err + } + + results := map[string]string{ + "secret_id": secretID, + "version_id": versionID, + + // TODO - Always set to false on import + // + // The Parse method currently only supports string attributes. Attempting to + // set this boolean will result in a panic. + // panic: has_secret_string_wo: '' expected type 'bool', got unconvertible type 'string', value: 'false' + // "has_secret_string_wo": "false", + } + + return id, results, nil +} diff --git a/internal/service/secretsmanager/secret_version_identity_gen_test.go b/internal/service/secretsmanager/secret_version_identity_gen_test.go new file mode 100644 index 000000000000..c132e393833c --- /dev/null +++ b/internal/service/secretsmanager/secret_version_identity_gen_test.go @@ -0,0 +1,269 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package secretsmanager_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSecretsManagerSecretVersion_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v secretsmanager.GetSecretValueOutput + resourceName := "aws_secretsmanager_secret_version.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SecretsManagerServiceID), + CheckDestroy: testAccCheckSecretVersionDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecretVersionExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "secret_id": knownvalue.NotNull(), + "version_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("secret_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("version_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccSecretVersionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "has_secret_string_wo", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccSecretVersionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("secret_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("version_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("secret_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("version_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSecretsManagerSecretVersion_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_secretsmanager_secret_version.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SecretsManagerServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "secret_id": knownvalue.NotNull(), + "version_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("secret_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("version_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccSecretVersionImportStateIdFunc), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "has_secret_string_wo", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccSecretVersionImportStateIdFunc), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("secret_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("version_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("secret_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("version_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSecretsManagerSecretVersion_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v secretsmanager.GetSecretValueOutput + resourceName := "aws_secretsmanager_secret_version.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SecretsManagerServiceID), + CheckDestroy: testAccCheckSecretVersionDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecretVersionExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SecretVersion/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "secret_id": knownvalue.NotNull(), + "version_id": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("secret_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("version_id")), + }, + }, + }, + }) +} diff --git a/internal/service/secretsmanager/secret_version_test.go b/internal/service/secretsmanager/secret_version_test.go index 8754c62f310a..3c01c5bd5db2 100644 --- a/internal/service/secretsmanager/secret_version_test.go +++ b/internal/service/secretsmanager/secret_version_test.go @@ -363,6 +363,17 @@ func testAccCheckSecretVersionExists(ctx context.Context, n string, v *secretsma } } +func testAccSecretVersionImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return func(s *terraform.State) (string, error) { + rs, ok := s.RootModule().Resources[resourceName] + if !ok { + return "", fmt.Errorf("Not found: %s", resourceName) + } + + return fmt.Sprintf("%s|%s", rs.Primary.Attributes["secret_id"], rs.Primary.Attributes["version_id"]), nil + } +} + func testAccCheckSecretVersionWriteOnlyValueEqual(t *testing.T, param *secretsmanager.GetSecretValueOutput, writeOnlyValue string) resource.TestCheckFunc { return func(s *terraform.State) error { if aws.ToString(param.SecretString) != writeOnlyValue { diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index c96633c4a540..62004095aac4 100644 --- a/internal/service/secretsmanager/service_package_gen.go +++ b/internal/service/secretsmanager/service_package_gen.go @@ -134,6 +134,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_secretsmanager_secret_version", Name: "Secret Version", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("secret_id", true), + inttypes.StringIdentityAttribute("version_id", true), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: secretVersionImportID{}, + }, }, } } diff --git a/internal/service/secretsmanager/testdata/SecretVersion/basic/main_gen.tf b/internal/service/secretsmanager/testdata/SecretVersion/basic/main_gen.tf new file mode 100644 index 000000000000..b1a06680d7d0 --- /dev/null +++ b/internal/service/secretsmanager/testdata/SecretVersion/basic/main_gen.tf @@ -0,0 +1,17 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_secretsmanager_secret_version" "test" { + secret_id = aws_secretsmanager_secret.test.id + secret_string = "test-string" +} + +resource "aws_secretsmanager_secret" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/secretsmanager/testdata/SecretVersion/basic_v6.10.0/main_gen.tf b/internal/service/secretsmanager/testdata/SecretVersion/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..e0fd8c952298 --- /dev/null +++ b/internal/service/secretsmanager/testdata/SecretVersion/basic_v6.10.0/main_gen.tf @@ -0,0 +1,27 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_secretsmanager_secret_version" "test" { + secret_id = aws_secretsmanager_secret.test.id + secret_string = "test-string" +} + +resource "aws_secretsmanager_secret" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/secretsmanager/testdata/SecretVersion/region_override/main_gen.tf b/internal/service/secretsmanager/testdata/SecretVersion/region_override/main_gen.tf new file mode 100644 index 000000000000..edba78da0591 --- /dev/null +++ b/internal/service/secretsmanager/testdata/SecretVersion/region_override/main_gen.tf @@ -0,0 +1,27 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_secretsmanager_secret_version" "test" { + region = var.region + + secret_id = aws_secretsmanager_secret.test.id + secret_string = "test-string" +} + +resource "aws_secretsmanager_secret" "test" { + region = var.region + + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/secretsmanager/testdata/tmpl/secret_version_basic.gtpl b/internal/service/secretsmanager/testdata/tmpl/secret_version_basic.gtpl new file mode 100644 index 000000000000..1bbc02f019cc --- /dev/null +++ b/internal/service/secretsmanager/testdata/tmpl/secret_version_basic.gtpl @@ -0,0 +1,10 @@ +resource "aws_secretsmanager_secret_version" "test" { +{{- template "region" }} + secret_id = aws_secretsmanager_secret.test.id + secret_string = "test-string" +} + +resource "aws_secretsmanager_secret" "test" { +{{- template "region" }} + name = var.rName +} diff --git a/website/docs/r/secretsmanager_secret_version.html.markdown b/website/docs/r/secretsmanager_secret_version.html.markdown index 6919d7331a54..17fb9a21dbe1 100644 --- a/website/docs/r/secretsmanager_secret_version.html.markdown +++ b/website/docs/r/secretsmanager_secret_version.html.markdown @@ -81,6 +81,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_version.example + identity = { + secret_id = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + version_id = "xxxxx-xxxxxxx-xxxxxxx-xxxxx" + } +} + +resource "aws_secretsmanager_secret_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `secret_id` - (String) ID of the secret. +* `version_id` - (String) ID of the secret version. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_version` using the secret ID and version ID. For example: ```terraform From 98029ba94aa8fcf4cdbcf03b23a7ecc7e507b8dc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 16:46:54 -0400 Subject: [PATCH 0716/2115] r/aws_timesteaminfluxdb: use `ConfigVPCWithSubnets` template ```console % make testacc PKG=timestreaminfluxdb TESTS='^TestAccTimestreamInfluxDBDBInstance_tags$$|^TestAccTimestreamInfluxDBDBCluster_tags$$' make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 20 -run='^TestAccTimestreamInfluxDBDBInstance_tags$|^TestAccTimestreamInfluxDBDBCluster_tags$' -timeout 360m -vet=off 2025/08/25 16:09:10 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/25 16:09:10 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccTimestreamInfluxDBDBCluster_tags === PAUSE TestAccTimestreamInfluxDBDBCluster_tags === RUN TestAccTimestreamInfluxDBDBInstance_tags === PAUSE TestAccTimestreamInfluxDBDBInstance_tags === CONT TestAccTimestreamInfluxDBDBCluster_tags === CONT TestAccTimestreamInfluxDBDBInstance_tags --- PASS: TestAccTimestreamInfluxDBDBCluster_tags (903.79s) --- PASS: TestAccTimestreamInfluxDBDBInstance_tags (1403.63s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb 1410.171s ``` --- .../testdata/DBCluster/tags/main_gen.tf | 52 ++++++++++------- .../DBCluster/tagsComputed1/main_gen.tf | 56 ++++++++++-------- .../DBCluster/tagsComputed2/main_gen.tf | 58 +++++++++++-------- .../DBCluster/tags_defaults/main_gen.tf | 52 ++++++++++------- .../DBCluster/tags_ignore/main_gen.tf | 52 ++++++++++------- .../testdata/DBInstance/tags/main_gen.tf | 49 +++++++++------- .../DBInstance/tagsComputed1/main_gen.tf | 53 ++++++++++------- .../DBInstance/tagsComputed2/main_gen.tf | 55 ++++++++++-------- .../DBInstance/tags_defaults/main_gen.tf | 49 +++++++++------- .../DBInstance/tags_ignore/main_gen.tf | 49 +++++++++------- .../testdata/tmpl/db_cluster_tags.gtpl | 32 ++-------- .../testdata/tmpl/db_instance_tags.gtpl | 34 +++-------- 12 files changed, 318 insertions(+), 273 deletions(-) diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf index 8ba6f55f28da..8131c416ab85 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags/main_gen.tf @@ -1,12 +1,39 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 2) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -15,33 +42,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_cluster" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - failover_mode = "AUTOMATIC" - - tags = var.resource_tags -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf index f265c77d220e..d0e8aaf2498f 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed1/main_gen.tf @@ -3,12 +3,41 @@ provider "null" {} +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = { + (var.unknownTagKey) = null_resource.test.id + } +} + +# acctest.ConfigVPCWithSubnets(rName, 2) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -17,35 +46,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_cluster" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - failover_mode = "AUTOMATIC" - - tags = { - (var.unknownTagKey) = null_resource.test.id - } -} - resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf index 1c8fa2919223..f5ce67b05544 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tagsComputed2/main_gen.tf @@ -3,12 +3,42 @@ provider "null" {} +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } +} + +# acctest.ConfigVPCWithSubnets(rName, 2) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -17,36 +47,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_cluster" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - failover_mode = "AUTOMATIC" - - tags = { - (var.unknownTagKey) = null_resource.test.id - (var.knownTagKey) = var.knownTagValue - } -} - resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf index 0ac96a7a0ea3..c625761a9717 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_defaults/main_gen.tf @@ -7,12 +7,39 @@ provider "aws" { } } +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 2) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -21,33 +48,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_cluster" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - failover_mode = "AUTOMATIC" - - tags = var.resource_tags -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf index e8967ad97853..7776c2d666af 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBCluster/tags_ignore/main_gen.tf @@ -10,12 +10,39 @@ provider "aws" { } } +resource "aws_timestreaminfluxdb_db_cluster" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + failover_mode = "AUTOMATIC" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 2) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 2 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -24,33 +51,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_cluster" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - failover_mode = "AUTOMATIC" - - tags = var.resource_tags -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags/main_gen.tf index a933a60a994c..ecff113c73d2 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags/main_gen.tf @@ -1,12 +1,38 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 +resource "aws_timestreaminfluxdb_db_instance" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 1) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 1 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -15,31 +41,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_instance" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - - tags = var.resource_tags -} variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed1/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed1/main_gen.tf index 729d296dafe4..7e1d53008bfa 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed1/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed1/main_gen.tf @@ -3,12 +3,40 @@ provider "null" {} +resource "aws_timestreaminfluxdb_db_instance" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + tags = { + (var.unknownTagKey) = null_resource.test.id + } +} + +# acctest.ConfigVPCWithSubnets(rName, 1) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 1 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -17,33 +45,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_instance" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - - tags = { - (var.unknownTagKey) = null_resource.test.id - } -} resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed2/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed2/main_gen.tf index 31bcbc6eb1c5..d8ef9a7594bc 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed2/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBInstance/tagsComputed2/main_gen.tf @@ -3,12 +3,41 @@ provider "null" {} +resource "aws_timestreaminfluxdb_db_instance" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + tags = { + (var.unknownTagKey) = null_resource.test.id + (var.knownTagKey) = var.knownTagValue + } +} + +# acctest.ConfigVPCWithSubnets(rName, 1) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 1 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -17,34 +46,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_instance" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - - tags = { - (var.unknownTagKey) = null_resource.test.id - (var.knownTagKey) = var.knownTagValue - } -} resource "null_resource" "test" {} variable "rName" { diff --git a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_defaults/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_defaults/main_gen.tf index 015c46bd72f2..26d17732378b 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_defaults/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_defaults/main_gen.tf @@ -7,12 +7,38 @@ provider "aws" { } } +resource "aws_timestreaminfluxdb_db_instance" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 1) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 1 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -21,31 +47,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_instance" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - - tags = var.resource_tags -} variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_ignore/main_gen.tf b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_ignore/main_gen.tf index 579f735e71d7..bee3f86058f8 100644 --- a/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_ignore/main_gen.tf +++ b/internal/service/timestreaminfluxdb/testdata/DBInstance/tags_ignore/main_gen.tf @@ -10,12 +10,38 @@ provider "aws" { } } +resource "aws_timestreaminfluxdb_db_instance" "test" { + name = var.rName + allocated_storage = 20 + username = "admin" + password = "testpassword" + vpc_subnet_ids = aws_subnet.test[*].id + vpc_security_group_ids = [aws_security_group.test.id] + db_instance_type = "db.influx.medium" + bucket = "initial" + organization = "organization" + + tags = var.resource_tags +} + +# acctest.ConfigVPCWithSubnets(rName, 1) + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" } +resource "aws_subnet" "test" { + count = 1 + + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[count.index] + cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +} + +# acctest.ConfigAvailableAZsNoOptInDefaultExclude + data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] + exclude_zone_ids = local.default_exclude_zone_ids state = "available" filter { @@ -24,31 +50,14 @@ data "aws_availability_zones" "available" { } } -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) +locals { + default_exclude_zone_ids = ["usw2-az4", "usgw1-az2"] } resource "aws_security_group" "test" { vpc_id = aws_vpc.test.id } -resource "aws_timestreaminfluxdb_db_instance" "test" { - name = var.rName - allocated_storage = 20 - username = "admin" - password = "testpassword" - vpc_subnet_ids = aws_subnet.test[*].id - vpc_security_group_ids = [aws_security_group.test.id] - db_instance_type = "db.influx.medium" - bucket = "initial" - organization = "organization" - - tags = var.resource_tags -} variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl b/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl index 97d893fedc0d..d999718ac693 100644 --- a/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl +++ b/internal/service/timestreaminfluxdb/testdata/tmpl/db_cluster_tags.gtpl @@ -1,29 +1,3 @@ -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" -} - -data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] - state = "available" - - filter { - name = "opt-in-status" - values = ["opt-in-not-required"] - } -} - -resource "aws_subnet" "test" { - count = 2 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) -} - -resource "aws_security_group" "test" { - vpc_id = aws_vpc.test.id -} - resource "aws_timestreaminfluxdb_db_cluster" "test" { name = var.rName allocated_storage = 20 @@ -38,3 +12,9 @@ resource "aws_timestreaminfluxdb_db_cluster" "test" { {{- template "tags" . }} } + +{{ template "acctest.ConfigVPCWithSubnets" 2 }} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} diff --git a/internal/service/timestreaminfluxdb/testdata/tmpl/db_instance_tags.gtpl b/internal/service/timestreaminfluxdb/testdata/tmpl/db_instance_tags.gtpl index dfc8a6fd24b3..97436bf16be9 100644 --- a/internal/service/timestreaminfluxdb/testdata/tmpl/db_instance_tags.gtpl +++ b/internal/service/timestreaminfluxdb/testdata/tmpl/db_instance_tags.gtpl @@ -1,29 +1,3 @@ -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" -} - -data "aws_availability_zones" "available" { - exclude_zone_ids = ["usw2-az4", "usgw1-az2"] - state = "available" - - filter { - name = "opt-in-status" - values = ["opt-in-not-required"] - } -} - -resource "aws_subnet" "test" { - count = 1 - - vpc_id = aws_vpc.test.id - availability_zone = data.aws_availability_zones.available.names[count.index] - cidr_block = cidrsubnet(aws_vpc.test.cidr_block, 8, count.index) -} - -resource "aws_security_group" "test" { - vpc_id = aws_vpc.test.id -} - resource "aws_timestreaminfluxdb_db_instance" "test" { name = var.rName allocated_storage = 20 @@ -36,4 +10,10 @@ resource "aws_timestreaminfluxdb_db_instance" "test" { organization = "organization" {{- template "tags" . }} -} \ No newline at end of file +} + +{{ template "acctest.ConfigVPCWithSubnets" 1 }} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id +} From 3f2f31d9c73d25d43ce388bda1d193d7f04d6009 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 26 Aug 2025 09:30:16 +0900 Subject: [PATCH 0717/2115] Add the missing `name` argument --- internal/service/wafv2/flex.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/wafv2/flex.go b/internal/service/wafv2/flex.go index 6f71b8715f56..572fb67e5b67 100644 --- a/internal/service/wafv2/flex.go +++ b/internal/service/wafv2/flex.go @@ -3330,6 +3330,7 @@ func flattenHeader(apiObject *awstypes.ResponseInspectionHeader) []any { } m := map[string]any{ + "name": apiObject.Name, "failure_values": apiObject.FailureValues, "success_values": apiObject.SuccessValues, } From f51a8d0a9b8167a4d5d6b04445369a5c4a78383c Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 26 Aug 2025 09:32:37 +0900 Subject: [PATCH 0718/2115] Add an acctest for header response inspection --- internal/service/wafv2/web_acl_test.go | 118 +++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/internal/service/wafv2/web_acl_test.go b/internal/service/wafv2/web_acl_test.go index 93cace0a57ea..ca5d3d0dbebb 100644 --- a/internal/service/wafv2/web_acl_test.go +++ b/internal/service/wafv2/web_acl_test.go @@ -3441,6 +3441,61 @@ func TestAccWAFV2WebACL_CloudFrontScope(t *testing.T) { }) } +func TestAccWAFV2WebACL_CloudFrontScopeResponseInspectionHeader(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.WebACL + webACLName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_wafv2_web_acl.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckWAFV2CloudFrontScope(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.WAFV2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckWebACLDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccWebACLConfig_CloudFrontScopeResponseInspectionHeader(webACLName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckWebACLExists(ctx, resourceName, &v), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`global/webacl/.+$`)), + resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), + resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeCloudfront)), + resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ + names.AttrName: "rule-1", + "statement.#": "1", + "statement.0.managed_rule_group_statement.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.login_path": "/api/1/signin", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.0.password_field.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.0.password_field.0.identifier": "/password", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.0.payload_type": "JSON", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.0.username_field.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.request_inspection.0.username_field.0.identifier": "/username", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.0.name": "sample-header", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.0.success_values.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.0.success_values.0": "f1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.0.failure_values.#": "1", + "statement.0.managed_rule_group_statement.0.managed_rule_group_configs.0.aws_managed_rules_atp_rule_set.0.response_inspection.0.header.0.failure_values.0": "f2", + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateIdFunc: testAccWebACLImportStateIdFunc(resourceName), + }, + }, + }) +} + func TestAccWAFV2WebACL_ruleJSON(t *testing.T) { ctx := acctest.Context(t) var v awstypes.WebACL @@ -7249,6 +7304,69 @@ resource "aws_wafv2_web_acl" "test" { `, rName) } +func testAccWebACLConfig_CloudFrontScopeResponseInspectionHeader(rName string) string { + return fmt.Sprintf(` +resource "aws_wafv2_web_acl" "test" { + name = %[1]q + description = %[1]q + scope = "CLOUDFRONT" + + default_action { + allow {} + } + + rule { + name = "rule-1" + priority = 1 + + override_action { + count {} + } + + statement { + managed_rule_group_statement { + name = "AWSManagedRulesATPRuleSet" + vendor_name = "AWS" + + managed_rule_group_configs { + aws_managed_rules_atp_rule_set { + login_path = "/api/1/signin" + request_inspection { + password_field { + identifier = "/password" + } + payload_type = "JSON" + username_field { + identifier = "/username" + } + } + response_inspection { + header { + name = "sample-header" + success_values = ["f1"] + failure_values = ["f2"] + } + } + } + } + } + } + visibility_config { + cloudwatch_metrics_enabled = true + metric_name = "AWSManagedRulesATPRuleSet_json" + sampled_requests_enabled = true + } + } + + visibility_config { + cloudwatch_metrics_enabled = false + metric_name = "friendly-metric-name" + sampled_requests_enabled = false + } +} +`, rName) +} + func testAccWebACLConfig_associationConfigCloudFront(rName string) string { return fmt.Sprintf(` resource "aws_wafv2_web_acl" "test" { From 67c99f6a64caebd65f1eb98a3b97f2f6afea2705 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 26 Aug 2025 09:51:23 +0900 Subject: [PATCH 0719/2115] alphabetized --- internal/service/wafv2/flex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/wafv2/flex.go b/internal/service/wafv2/flex.go index 572fb67e5b67..2dbd2236e9df 100644 --- a/internal/service/wafv2/flex.go +++ b/internal/service/wafv2/flex.go @@ -3330,8 +3330,8 @@ func flattenHeader(apiObject *awstypes.ResponseInspectionHeader) []any { } m := map[string]any{ - "name": apiObject.Name, "failure_values": apiObject.FailureValues, + "name": apiObject.Name, "success_values": apiObject.SuccessValues, } From ebef288cb144f37f1ceefecd834a0f386932ffea Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 26 Aug 2025 11:16:26 +0900 Subject: [PATCH 0720/2115] replace `name` with `names.AttrName` --- internal/service/wafv2/flex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/wafv2/flex.go b/internal/service/wafv2/flex.go index 2dbd2236e9df..c0809dbf0af3 100644 --- a/internal/service/wafv2/flex.go +++ b/internal/service/wafv2/flex.go @@ -3331,7 +3331,7 @@ func flattenHeader(apiObject *awstypes.ResponseInspectionHeader) []any { m := map[string]any{ "failure_values": apiObject.FailureValues, - "name": apiObject.Name, + names.AttrName: apiObject.Name, "success_values": apiObject.SuccessValues, } From e484dd416536bcc0a145b9af2d92c5c6b5efbe70 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 26 Aug 2025 11:16:41 +0900 Subject: [PATCH 0721/2115] add changelog --- .changelog/44032.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44032.txt diff --git a/.changelog/44032.txt b/.changelog/44032.txt new file mode 100644 index 000000000000..2f7d29c88819 --- /dev/null +++ b/.changelog/44032.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_wafv2_web_acl: Add missing flattening of `name` in `response_inspection.header` blocks for `AWSManagedRulesATPRuleSet` and `AWSManagedRulesACFPRuleSet` to avoid persistent plan diffs +``` From 2f3eac8844a18fc096cf5893894b1e0d65d7c55d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:12:59 -0400 Subject: [PATCH 0722/2115] 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 9ca3abd96615..b2b3fbc5bd04 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 github.com/aws/aws-sdk-go-v2/service/account v1.28.0 - github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 + github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 diff --git a/go.sum b/go.sum index bc200e03ce41..185df12f3731 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHp github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 h1:IEdXOosmvsQhyLWB6hbbAxkErPQijjscB7GsSAvh7II= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.0/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= From 50531b9449f78e967536bb5705ff43def2dadd8d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:03 -0400 Subject: [PATCH 0723/2115] 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 b2b3fbc5bd04..67fce1980c90 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 diff --git a/go.sum b/go.sum index 185df12f3731..9917a563a625 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrw github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 h1:ANVsTLsewss+NP/IUN+rihzWCpUONNDCH+7u9LxfdpA= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= From bc33de3eaa09f29490099a0977b057eb32b08289 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:08 -0400 Subject: [PATCH 0724/2115] 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 67fce1980c90..2321b96f0a3e 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 diff --git a/go.sum b/go.sum index 9917a563a625..4f9889e9f772 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 h1:ukEmvOnPItoNWDH9RmxtOYNmZBTj4YpJR/ZhwzMnADE= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 h1:iX32f9UGNPLhdlyu7Jl8QfuOr/P1Lbi68Sx3DsHhrgc= github.com/aws/aws-sdk-go-v2/service/athena v1.54.2/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= From 608cf8793c39622862556ab8c47cd42d0b3c0449 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:09 -0400 Subject: [PATCH 0725/2115] 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 2321b96f0a3e..81d3baaac68a 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 - github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 + github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 diff --git a/go.sum b/go.sum index 4f9889e9f772..8ecbe1eaac6a 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 h1:iX32f9UGNPLhdlyu7Jl8QfuOr/P1Lbi68Sx3DsHhrgc= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.2/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 h1:hYsUHj0wgtj4ZNRNKpnZ24l43TL/7iDpD0xlemzxBO0= From 8e5e07ca7e5f6a9d00ffe958ae03bbd7ba784852 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:10 -0400 Subject: [PATCH 0726/2115] 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 81d3baaac68a..7e42726014c9 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 diff --git a/go.sum b/go.sum index 8ecbe1eaac6a..ccb3b221d9fa 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdV github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 h1:hYsUHj0wgtj4ZNRNKpnZ24l43TL/7iDpD0xlemzxBO0= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 h1:T33TM/94TrgmFOYk9wLp5u1v45S5rQPlA2QQ9PdeGLo= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= From 00efcc56c65b50ad1810a20b650156a22c74f10e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:13 -0400 Subject: [PATCH 0727/2115] 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 7e42726014c9..4a8f2f5ee430 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 diff --git a/go.sum b/go.sum index ccb3b221d9fa..31d0601ea735 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,8 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/Vz github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 h1:lyicd67IMM/eRoQaKpZdImaUOQUexFbpIDT71KayWUo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JPu2nZdIky7iZbBcs61+M= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 h1:9iXNQ2b5cDSmZHjNN4j0F/QRGTiA5kpGV/JIPPi9gO4= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= From 423ba6382edf223917243a12a0ccba2127f609d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:14 -0400 Subject: [PATCH 0728/2115] 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 4a8f2f5ee430..303087540dc8 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 diff --git a/go.sum b/go.sum index 31d0601ea735..1709dd791f98 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0u github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JPu2nZdIky7iZbBcs61+M= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 h1:9iXNQ2b5cDSmZHjNN4j0F/QRGTiA5kpGV/JIPPi9gO4= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= From 66ac1558e2b979d3616fdccc337b8a481de17ca8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:17 -0400 Subject: [PATCH 0729/2115] 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 303087540dc8..3c2f0587ad7b 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 diff --git a/go.sum b/go.sum index 1709dd791f98..3348cb1e08ac 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 h1:rhvd+Sza4DuXzrTGLsJ1jO6wdKnb9KXqXyw4r6o4tIk= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 h1:uBcuEbBOFpFd/nKHLfhop7iSG6aeQNBQFczwMqyaLU0= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 h1:FT0Y2iOC056nBalWZU0s5jfpIoFieN7mZR6H028U904= From 2c7aab8defc6f47d28c58dd89bf035fbf7096020 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:18 -0400 Subject: [PATCH 0730/2115] 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 3c2f0587ad7b..82c1975a7a57 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 diff --git a/go.sum b/go.sum index 3348cb1e08ac..ad7bc4883e6d 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,8 @@ github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 h1:uBcuEbBOFpFd/nKHLfhop7iS github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 h1:FT0Y2iOC056nBalWZU0s5jfpIoFieN7mZR6H028U904= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUVXVVgmxFeXKGamIbNN0UDfpNov4JXMSplUo= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= From 238a9612235847e5c14e54ee41867fa7c1846859 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:21 -0400 Subject: [PATCH 0731/2115] 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 82c1975a7a57..7c4b0bf142f4 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 diff --git a/go.sum b/go.sum index ad7bc4883e6d..0f9901070519 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/R github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 h1:uFp6NEFas2RXeuBr1DLN/VoXuia8Xh3NPe9j8PsHKXo= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 h1:QOsVXn4JOYT/hijI83NKENLuPBgNnoCsZRYevszDFMs= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= From 66a3a8a3b7a1aeaf50287e45bceeb056020587cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:21 -0400 Subject: [PATCH 0732/2115] 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 7c4b0bf142f4..107d920fb72f 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 diff --git a/go.sum b/go.sum index 0f9901070519..3fdd2e32c495 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QK github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 h1:QOsVXn4JOYT/hijI83NKENLuPBgNnoCsZRYevszDFMs= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 h1:sujsuzoVNHNCiL4k5PLgo5O3fDTxqYFCjrUOPnuBB3w= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= From 54cb85e86fa781ad462dcbfc753ac999d7549780 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:24 -0400 Subject: [PATCH 0733/2115] 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 107d920fb72f..0fe19a475adf 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 diff --git a/go.sum b/go.sum index 3fdd2e32c495..60f784a6c898 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 h1:ah7hfvNnINvdcXOqkasIJFvti3jCLCQZTk5SyeqRQG4= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+RYVfhq5lcTZjyZPkpSe1S0o= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= From 3720392da04f0c7bb4229ccdaaba13d2531169a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:26 -0400 Subject: [PATCH 0734/2115] 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 0fe19a475adf..292ff4ab6d52 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 diff --git a/go.sum b/go.sum index 60f784a6c898..ed1521db4990 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCu github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 h1:pcho6kw8xOS5MV9yHTySeO36FC/QMC4WBy7RJAYB9hY= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 h1:HvA12hXcyI07mrRK6143JAkfgRAK+RXWUwtVHTatHU8= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= From 9a9aa829a90c8e84fe139bc7eb645b142f5e9a6d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:27 -0400 Subject: [PATCH 0735/2115] 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 292ff4ab6d52..b2abde2b01bd 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 diff --git a/go.sum b/go.sum index ed1521db4990..8b5501ad0170 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3Fk github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 h1:HvA12hXcyI07mrRK6143JAkfgRAK+RXWUwtVHTatHU8= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= From a6a292ebc121fba94d4956755e3ab8e2829512ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:32 -0400 Subject: [PATCH 0736/2115] 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 b2abde2b01bd..7bcd676adba3 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 diff --git a/go.sum b/go.sum index 8b5501ad0170..5ddc248200c7 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FP github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= From 3596c05ca251b61931ecdbb9b260033fa5bbdeb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:37 -0400 Subject: [PATCH 0737/2115] 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 7bcd676adba3..51f0a8eecbd4 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 diff --git a/go.sum b/go.sum index 5ddc248200c7..b50dbbc0b8f0 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQI github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 h1:NunFZHMwVtv7pZP348zakolv1lRLuq06xaRKPPI6rBo= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 h1:kEZC9UM7c+eIzVWPo9h8OP8hJhHwdafMcSazWEAIfVM= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 h1:AVbMDG/wcIMAcJBRtXzpEIC5p3Y/sG/hsOvKF7j/imo= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= From 2c90206540ada270dea69641c0fb604abcf2576c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:38 -0400 Subject: [PATCH 0738/2115] 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 51f0a8eecbd4..eb27545dd176 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 diff --git a/go.sum b/go.sum index b50dbbc0b8f0..5fcc12bce82c 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6Uri github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 h1:kEZC9UM7c+eIzVWPo9h8OP8hJhHwdafMcSazWEAIfVM= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 h1:AVbMDG/wcIMAcJBRtXzpEIC5p3Y/sG/hsOvKF7j/imo= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 h1:y6jqRCfWqshbHuc8pnTYB0tb6KzkNcsXGG+HNXpxm4g= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= From 5603f32a0ba3fe1e49d55f81fd2a78871045b87c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:43 -0400 Subject: [PATCH 0739/2115] 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 eb27545dd176..d2ea4e82bb18 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 - github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 diff --git a/go.sum b/go.sum index 5fcc12bce82c..379c4aa217ce 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwh github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 h1:knoQ9bJuxXStprRcf0QDGqnQtlfcMrt4UC5IjiRGwB4= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 h1:6NNrslvojclUa8DhsMWzi66Uxo/5S/Q2CdOh4+ERBFI= github.com/aws/aws-sdk-go-v2/service/dax v1.27.2/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= From cd1da13a5136c7ef6ef59d145ff2a51a2ed827dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:44 -0400 Subject: [PATCH 0740/2115] 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 d2ea4e82bb18..0c193a6f6c85 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 - github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 + github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 diff --git a/go.sum b/go.sum index 379c4aa217ce..e611cf7f64bb 100644 --- a/go.sum +++ b/go.sum @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+ github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 h1:6NNrslvojclUa8DhsMWzi66Uxo/5S/Q2CdOh4+ERBFI= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.2/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.0/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 h1:oABPzKfUcm/KHlQ5nYr9sxmpwQp4jorqhCBN3x0uq/I= From 5ebca69c7b18e3f7d718f890a82486d35b6170e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:46 -0400 Subject: [PATCH 0741/2115] 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 0c193a6f6c85..723cd76ccd50 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 diff --git a/go.sum b/go.sum index e611cf7f64bb..a8e07b2c0ffa 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRkna github.com/aws/aws-sdk-go-v2/service/dax v1.28.0/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 h1:oABPzKfUcm/KHlQ5nYr9sxmpwQp4jorqhCBN3x0uq/I= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2V4GZJwyG4fcl7EQwTfjCSI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 h1:gYxiWv5qRdJEITZoZLws3ulWvScdm2ghfVTX40CfsC8= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= From 7da72b6c895fca93815a3ecc95397f128fbf7980 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:47 -0400 Subject: [PATCH 0742/2115] 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 723cd76ccd50..2f338ff6cc1d 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 diff --git a/go.sum b/go.sum index a8e07b2c0ffa..c71fa1278625 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,8 @@ github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHm github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2V4GZJwyG4fcl7EQwTfjCSI= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 h1:gYxiWv5qRdJEITZoZLws3ulWvScdm2ghfVTX40CfsC8= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 h1:OSs7LJgZ8hWx/TpCLbqdNvzUlgSyCQZ6u7yL0qrBYLI= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= From 77b31b4a1aba1b46c6d3bd6a91ae9eea71e2fb86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:48 -0400 Subject: [PATCH 0743/2115] go get github.com/aws/aws-sdk-go-v2/service/directconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f338ff6cc1d..f065e932470b 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 diff --git a/go.sum b/go.sum index c71fa1278625..5d6886e25cb2 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,8 @@ github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 h1:OSs7LJgZ8hWx/TpCLbqdNvzUlgSyCQZ6u7yL0qrBYLI= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV3Cyo+BMcH1l7GwXI81vTonNho= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= From c92bf0d1f69d2854ff79d3fb1f1261ebaf7a60fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:50 -0400 Subject: [PATCH 0744/2115] 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 f065e932470b..df38bd98b768 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 diff --git a/go.sum b/go.sum index 5d6886e25cb2..559335ec42db 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,8 @@ github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6 github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= From 8a82950aa948742f479df42ebd0794ee6f231000 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:53 -0400 Subject: [PATCH 0745/2115] 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 df38bd98b768..c787badaaa7b 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 diff --git a/go.sum b/go.sum index 559335ec42db..4f8b31f5e812 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiM github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 h1:P94OfRObDwjklbvdJTGuRZXeGYF7Bv5NNUo+I628kKQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 h1:n/uCxI68tuO8NTrSCqlLQAMtWAH37RLhMw/3iugFanM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= From b94a0b9e53de2d34609a42dbce924593a570f0dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:13:56 -0400 Subject: [PATCH 0746/2115] 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 c787badaaa7b..54d5fef50f87 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 - github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 + github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 diff --git a/go.sum b/go.sum index 4f8b31f5e812..c7cd2b583c28 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiA github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 h1:94CuP2LDRD8zwfJIm+oOEx0vRuwodfon0BPImHs8aww= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.1/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= +github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCxf9TLQPxZuVvIdOI= +github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= From 0669839cad5d10cd1b9adfc5a449cff3496191a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:01 -0400 Subject: [PATCH 0747/2115] go get github.com/aws/aws-sdk-go-v2/service/emrcontainers. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 54d5fef50f87..50dba11d8716 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 diff --git a/go.sum b/go.sum index c7cd2b583c28..9ac8bae64199 100644 --- a/go.sum +++ b/go.sum @@ -243,8 +243,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8f github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= From 12c744032d5055e73bb5bda28bda81a2315737d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:06 -0400 Subject: [PATCH 0748/2115] go get github.com/aws/aws-sdk-go-v2/service/fsx. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 50dba11d8716..4c1ebead7e83 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 diff --git a/go.sum b/go.sum index 9ac8bae64199..622d5dc55324 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5Yg github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 h1:0ADY6sOC594lvWksDrmFddKvP84KSL4Y7zvs2pzR3/Q= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= From baef99012d6446f75d73a25bb02a474ff1acf18d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:10 -0400 Subject: [PATCH 0749/2115] 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 4c1ebead7e83..6ab940eda304 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 diff --git a/go.sum b/go.sum index 622d5dc55324..c4247d713ad1 100644 --- a/go.sum +++ b/go.sum @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03iNY3FcPtz9h2EoAixPRjNE2li8= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= From 5cec5a832662034c19a4a494b1e8c300df16ec1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:19 -0400 Subject: [PATCH 0750/2115] 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 6ab940eda304..0407db5cda37 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 diff --git a/go.sum b/go.sum index c4247d713ad1..bbc9eb660f3e 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rO github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 h1:6yvhusf2JqDouf2vID1uxgQjuLje4kXPXRbFDQxf93c= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 h1:pVadjOT9l8aWdRH6vNb9RzdV9ogiAL0z0xllp9odDOU= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= From 481ae397b5809296fb139eec5bbc447c5a8f5413 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:20 -0400 Subject: [PATCH 0751/2115] 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 0407db5cda37..34e477442ae6 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 diff --git a/go.sum b/go.sum index bbc9eb660f3e..f25d16460f44 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,8 @@ github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUx github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 h1:pVadjOT9l8aWdRH6vNb9RzdV9ogiAL0z0xllp9odDOU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 h1:q8dGXGYG9TSEb61QelksWI4WN7VruNzmF3iOEX2zPoU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 h1:JfL0vQRSLMJLt+XSsXeVxHRNEk5sTNaHqff+mzF5tRw= From 5150074b7c238ca2e9eeccf45f351e4c34c10537 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:21 -0400 Subject: [PATCH 0752/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalytics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 34e477442ae6..215e2672dfd4 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 diff --git a/go.sum b/go.sum index f25d16460f44..c40f2d67ee46 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 h1:q8dGXGYG9TSEb61QelksWI github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 h1:JfL0vQRSLMJLt+XSsXeVxHRNEk5sTNaHqff+mzF5tRw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 h1:FaN3ONYHItF50pzc8mflJZ2Nw7mxaqsLjCOncSStCaw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= From 48f993854c26762b6142ab91142874deb55bcc23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:24 -0400 Subject: [PATCH 0753/2115] 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 215e2672dfd4..e2758681b142 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 diff --git a/go.sum b/go.sum index c40f2d67ee46..9d1571b04c7b 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiN github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 h1:xjBkvUA+R02IZrK8WlRwsC3kG9LkMWI5s443jpz7aUw= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= From 92506014b5db5b0604d60073b3b9b60488d03147 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:26 -0400 Subject: [PATCH 0754/2115] 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 e2758681b142..54a3c8d82cb9 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 github.com/aws/aws-sdk-go-v2/service/location v1.49.0 diff --git a/go.sum b/go.sum index 9d1571b04c7b..3c0dff0d1ad1 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,8 @@ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1ad github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 h1:+kECYDKEF2eV7w9JPH3Y0gKXTQ0aqTqFUkrdvaX4Hn8= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/NkeOgqlMexDsikmRhmMdUoxSsM= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= From 474e0911004f2d8a512346fc894fa2d0c001dcf6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:27 -0400 Subject: [PATCH 0755/2115] go get github.com/aws/aws-sdk-go-v2/service/licensemanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 54a3c8d82cb9..1986abbd32a8 100644 --- a/go.mod +++ b/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 github.com/aws/aws-sdk-go-v2/service/location v1.49.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 diff --git a/go.sum b/go.sum index 3c0dff0d1ad1..fdf0e7409c2f 100644 --- a/go.sum +++ b/go.sum @@ -339,8 +339,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoV github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 h1:+kECYDKEF2eV7w9JPH3Y0gKXTQ0aqTqFUkrdvaX4Hn8= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/NkeOgqlMexDsikmRhmMdUoxSsM= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 h1:ob6Pfi0h6CNDpYIrWtQE5brfrly6eEzWzR+VHnljFUM= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= From 9947c70e5adaa169d9efd0fcc7676004e813c56e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:31 -0400 Subject: [PATCH 0756/2115] 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 1986abbd32a8..7b67699e3f8a 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 diff --git a/go.sum b/go.sum index fdf0e7409c2f..d92fefc77874 100644 --- a/go.sum +++ b/go.sum @@ -353,8 +353,8 @@ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 h1:2RNLZ1Ymov3rRuPUAVXSC1xXo6BJ5hpWF6ad72FGBAQ= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= From fee077bb2670e343c7b2b390af415f5eafc23952 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:33 -0400 Subject: [PATCH 0757/2115] go get github.com/aws/aws-sdk-go-v2/service/mediapackagevod. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7b67699e3f8a..b9876566fe70 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 diff --git a/go.sum b/go.sum index d92fefc77874..6f1fb956a4cb 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1G github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0GMovPHAO54gCPbiI+zzXqQmS0wg= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 h1:ltB0n2pWVrQgtyMrl7zt+8glzVcCDR7XAbu4fGQzh+Y= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= From 15bbbd7316e412adf044be96842e2ebd8ff3ed27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:34 -0400 Subject: [PATCH 0758/2115] 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 b9876566fe70..74777ab1659e 100644 --- a/go.mod +++ b/go.mod @@ -171,7 +171,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 diff --git a/go.sum b/go.sum index 6f1fb956a4cb..e499becb34a7 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1I github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 h1:ltB0n2pWVrQgtyMrl7zt+8glzVcCDR7XAbu4fGQzh+Y= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 h1:lOyLFvIq0NElKvCoZoxi6jkF10QXfa+uHwKIYnktu18= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= From 6a8b296593d697e6b403e1148a4437037f47010c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:41 -0400 Subject: [PATCH 0759/2115] go get github.com/aws/aws-sdk-go-v2/service/odb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 74777ab1659e..3b7192e609e0 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 - github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 + github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 diff --git a/go.sum b/go.sum index e499becb34a7..a49af8bfc812 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 h1:o7gKGdpE0AS+kdt9pBi+gQyN2jZb1MPo+CE/iblnaBA= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.2/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 h1:3+EJm4Prbjq1P3VmCjfPKLxMQerl14sjfK/3g8/M6LA= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.0/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= From a8965e4aa5e85ffb35fd293a96a5272323297134 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:42 -0400 Subject: [PATCH 0760/2115] 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 3b7192e609e0..d1b63ddbb668 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 diff --git a/go.sum b/go.sum index a49af8bfc812..73a3db66c098 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 h1:3+EJm4Prbjq1P3VmCjfPKLxMQerl1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.0/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 h1:c1e4iCdEt9kNgBDJWX5C7SI2taE2IgaUe31RcrOO6Zc= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= From fd18c5b03652aba1fd92d23715578293612b2ec0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:44 -0400 Subject: [PATCH 0761/2115] go get github.com/aws/aws-sdk-go-v2/service/outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d1b63ddbb668..0f042d8f8e7a 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 diff --git a/go.sum b/go.sum index 73a3db66c098..6175bddea572 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOg github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 h1:kOqT0HBrIn7nfX2X81VPnPqIj8kCyJFzW0EeiX9i644= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= From b0dfc370d51924d0f5896deb411b6e781eda9500 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:46 -0400 Subject: [PATCH 0762/2115] 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 0f042d8f8e7a..750552c21ebb 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 diff --git a/go.sum b/go.sum index 6175bddea572..fd94a0d9bf09 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 h1:kOqT0HBrIn7nfX2X81VPnPq github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7jtQYFQY0kBkmdhzylDwAxA7bHVg= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= From b778e493d0e231ff3f62f99c182d9e68c067fb1f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:50 -0400 Subject: [PATCH 0763/2115] 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 750552c21ebb..20a43d85e196 100644 --- a/go.mod +++ b/go.mod @@ -198,7 +198,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 diff --git a/go.sum b/go.sum index fd94a0d9bf09..ce3f32da6686 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pX github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= From 937e0dd78bb9bfa3556cbd0dbe1f5b24b2203e06 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:55 -0400 Subject: [PATCH 0764/2115] 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 20a43d85e196..2230e7be238c 100644 --- a/go.mod +++ b/go.mod @@ -206,7 +206,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 diff --git a/go.sum b/go.sum index ce3f32da6686..c0b51b926913 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJW github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 h1:f4Bj2dvWHwg5W+G04vlI2TXKy5bGKyIhWB8e3uuQ4Yg= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 h1:I4DJs64ligwwPzChWFXVM/b5FO9FjB4bbrbIIXmwGwE= From 43fd02f6d014430ba6827ef616de81209cfcf027 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:56 -0400 Subject: [PATCH 0765/2115] go get github.com/aws/aws-sdk-go-v2/service/resiliencehub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2230e7be238c..f98d8b944687 100644 --- a/go.mod +++ b/go.mod @@ -208,7 +208,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 diff --git a/go.sum b/go.sum index c0b51b926913..50b98b17cfa5 100644 --- a/go.sum +++ b/go.sum @@ -437,8 +437,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 h1:f4Bj2dvWHwg5W github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 h1:I4DJs64ligwwPzChWFXVM/b5FO9FjB4bbrbIIXmwGwE= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= From c3a5b82558f866e283c869d69680a8df3c96dc46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:14:58 -0400 Subject: [PATCH 0766/2115] 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 f98d8b944687..57c6ecb2f078 100644 --- a/go.mod +++ b/go.mod @@ -211,7 +211,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 diff --git a/go.sum b/go.sum index 50b98b17cfa5..5d3569dd5a69 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,8 @@ github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yO github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= From ce5e81acfd96624ab559b6a884fd57f918285371 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:03 -0400 Subject: [PATCH 0767/2115] 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 57c6ecb2f078..b460ac7c05f5 100644 --- a/go.mod +++ b/go.mod @@ -219,7 +219,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 - github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 diff --git a/go.sum b/go.sum index 5d3569dd5a69..520fa8293a0d 100644 --- a/go.sum +++ b/go.sum @@ -459,8 +459,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZf github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 h1:qfHLulL2U0MkQ6d339wUtc5B2xoFWLQAHNOoWpGXD7c= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.0/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 h1:55M6WukFPaLNGH/mKJhggsictC45iMOnRL0SfXCzsIM= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.1/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= From 2071a3273919e428d7b47928e015d2bdd5d9c071 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:09 -0400 Subject: [PATCH 0768/2115] go get github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b460ac7c05f5..3f56f281259a 100644 --- a/go.mod +++ b/go.mod @@ -231,7 +231,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 diff --git a/go.sum b/go.sum index 520fa8293a0d..41b357f94513 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCC github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 h1:45G3hjtf001+XN+JgOf0j6IufhHJfGIKEEMvaTBqqH4= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uKqBVkQXOxDfKWkwZMTHMLZrXRFI= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= From 2d3956a024c9abd53e1b4f2b1a08f9ce1cbfd60f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:10 -0400 Subject: [PATCH 0769/2115] go get github.com/aws/aws-sdk-go-v2/service/servicecatalog. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3f56f281259a..5399831ad2de 100644 --- a/go.mod +++ b/go.mod @@ -232,7 +232,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 diff --git a/go.sum b/go.sum index 41b357f94513..810bc40226d5 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uKqBVkQXOxDfKWkwZMTHMLZrXRFI= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= From 6eedeaf67dfd286c0cf636769573b5307c579847 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:13 -0400 Subject: [PATCH 0770/2115] go get github.com/aws/aws-sdk-go-v2/service/sfn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5399831ad2de..062c5dfae3ba 100644 --- a/go.mod +++ b/go.mod @@ -238,7 +238,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 diff --git a/go.sum b/go.sum index 810bc40226d5..8e47761a955f 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJk github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 h1:Fx3su5YVfkkjdbXZl56T1KKLsdIxr+q28VFoUXDWsd4= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUqGjV/yeobJi7TQo0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 h1:Ecwq3xNoQQYKCvssG0zKU1ebXw1dMM7uscXqn8w1I7U= github.com/aws/aws-sdk-go-v2/service/shield v1.33.2/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= From a6c0555ad4ae5fd277738996e9dcff8e65aed6eb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:14 -0400 Subject: [PATCH 0771/2115] 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 062c5dfae3ba..d6891450daa8 100644 --- a/go.mod +++ b/go.mod @@ -239,7 +239,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 - github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 + github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 diff --git a/go.sum b/go.sum index 8e47761a955f..e310ad05eef8 100644 --- a/go.sum +++ b/go.sum @@ -499,8 +499,8 @@ github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8Bn github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUqGjV/yeobJi7TQo0= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 h1:Ecwq3xNoQQYKCvssG0zKU1ebXw1dMM7uscXqn8w1I7U= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.2/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= From 6fa8690c47cf779f73a771b3a43ab89d6d16904b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:16 -0400 Subject: [PATCH 0772/2115] 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 d6891450daa8..36aa3c8bc7e1 100644 --- a/go.mod +++ b/go.mod @@ -242,7 +242,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 diff --git a/go.sum b/go.sum index e310ad05eef8..2e3bbd44815c 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAf github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 h1:dbxXhQu0wVhmGY8qnSXUEFZ4ZfQFTjBDEadxsmgtdS8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= From bdd40cfcd7f3b0bffdffc0eb274cc0710b03637b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:20 -0400 Subject: [PATCH 0773/2115] 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 36aa3c8bc7e1..6ebc33b95562 100644 --- a/go.mod +++ b/go.mod @@ -249,7 +249,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 diff --git a/go.sum b/go.sum index 2e3bbd44815c..59fc3e14512a 100644 --- a/go.sum +++ b/go.sum @@ -519,8 +519,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFM github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 h1:RibOkweLBwdRGOxSL154qu294WOkTGSv3cDESKOCaQU= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 h1:hGjHhpdzNJb/IPaRZT8qoClVieXa8+arkgtcgLQ1XkA= From 698ad099361ab2384ead5103ace71f264f43f967 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:21 -0400 Subject: [PATCH 0774/2115] go get github.com/aws/aws-sdk-go-v2/service/storagegateway. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6ebc33b95562..337751d34344 100644 --- a/go.mod +++ b/go.mod @@ -250,7 +250,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 diff --git a/go.sum b/go.sum index 59fc3e14512a..216c31fee41a 100644 --- a/go.sum +++ b/go.sum @@ -523,8 +523,8 @@ github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 h1:hGjHhpdzNJb/IPaRZT8qoClVieXa8+arkgtcgLQ1XkA= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= From dcc4554262f92008d6e08f73fb5205b4aff883a7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:23 -0400 Subject: [PATCH 0775/2115] go get github.com/aws/aws-sdk-go-v2/service/taxsettings. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 337751d34344..8b9459b64360 100644 --- a/go.mod +++ b/go.mod @@ -254,7 +254,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 diff --git a/go.sum b/go.sum index 216c31fee41a..d81b9091a0ad 100644 --- a/go.sum +++ b/go.sum @@ -531,8 +531,8 @@ github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmob github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 h1:oIANsrxMomHQt31QfRhc2v8w2FT6DrUZO0jESwVZVzs= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= From b4c5d1164d1242f34d1563f310c5399e0dfc906b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:24 -0400 Subject: [PATCH 0776/2115] 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 8b9459b64360..1f5640485243 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 diff --git a/go.sum b/go.sum index d81b9091a0ad..74e1fee273e6 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3o github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 h1:oIANsrxMomHQt31QfRhc2v8w2FT6DrUZO0jESwVZVzs= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 h1:pnnAt7y/R3PcSf6DB4b9b3dYPrbY0g/6q2r8ui8mUiA= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= From 7ddd01e1e9fab893890711163d492a2bc3da9955 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:26 -0400 Subject: [PATCH 0777/2115] 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 1f5640485243..e5cdf81a44ab 100644 --- a/go.mod +++ b/go.mod @@ -258,7 +258,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 diff --git a/go.sum b/go.sum index 74e1fee273e6..797a353a8461 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 h1:6U0E5il6rPEcS97BO8XVSb5HBOa3zxblhdUgm9E8pcQ= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= From 71d804973c4c5949f0efd50b91a3bb48b8f9b20f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:15:30 -0400 Subject: [PATCH 0778/2115] 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 e5cdf81a44ab..332eb16ff00f 100644 --- a/go.mod +++ b/go.mod @@ -265,7 +265,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 diff --git a/go.sum b/go.sum index 797a353a8461..edfd1790c74f 100644 --- a/go.sum +++ b/go.sum @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msm github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= From e2c8195cb570499737dc1065080f413274031056 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:17:50 -0400 Subject: [PATCH 0779/2115] Add 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 116 ++++++++++----------- tools/tfsdk2fw/go.sum | 232 +++++++++++++++++++++--------------------- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 9d534a3a0576..148ca1515208 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/account v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 // indirect github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 // indirect @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 // indirect github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 // indirect @@ -46,35 +46,35 @@ require ( github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 // indirect github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 // indirect github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 // indirect github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 // indirect github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 // indirect github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 // indirect github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 // indirect github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 // indirect github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 // indirect github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 // indirect github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 // indirect @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 // indirect github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 // indirect @@ -92,8 +92,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 // indirect github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 // indirect github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 // indirect github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 // indirect github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 // indirect @@ -102,25 +102,25 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 // indirect github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 // indirect @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 // indirect @@ -137,14 +137,14 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 // indirect github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 // indirect github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 // indirect github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 // indirect github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 // indirect github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 // indirect @@ -164,31 +164,31 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 // indirect github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 // indirect github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 // indirect github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 // indirect github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 // indirect github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 // indirect github.com/aws/aws-sdk-go-v2/service/location v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 // indirect github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 // indirect github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 // indirect @@ -201,21 +201,21 @@ require ( github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 // indirect github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 // indirect github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 // indirect github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 // indirect github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 // indirect github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 // indirect github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 // indirect @@ -223,12 +223,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 // indirect @@ -236,7 +236,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 // indirect @@ -248,47 +248,47 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 // indirect github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 // indirect github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 // indirect github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 // indirect github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 // indirect github.com/aws/smithy-go v1.22.5 // indirect - github.com/beevik/etree v1.5.1 // indirect + github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cedar-policy/cedar-go v1.2.6 // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 2082bf8757b5..013db2d9513c 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -47,8 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHp github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.2 h1:tXN4wiaqFcG2SSzt+AiuqYvxF30gpdV7xDpFPVDHk4U= -github.com/aws/aws-sdk-go-v2/service/acm v1.36.2/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 h1:IEdXOosmvsQhyLWB6hbbAxkErPQijjscB7GsSAvh7II= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.0/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrw github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2 h1:ANVsTLsewss+NP/IUN+rihzWCpUONNDCH+7u9LxfdpA= -github.com/aws/aws-sdk-go-v2/service/appflow v1.49.2/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= @@ -79,14 +79,14 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2 h1:ukEmvOnPItoNWDH9RmxtOYNmZBTj4YpJR/ZhwzMnADE= -github.com/aws/aws-sdk-go-v2/service/appsync v1.50.2/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.2 h1:iX32f9UGNPLhdlyu7Jl8QfuOr/P1Lbi68Sx3DsHhrgc= -github.com/aws/aws-sdk-go-v2/service/athena v1.54.2/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2 h1:hYsUHj0wgtj4ZNRNKpnZ24l43TL/7iDpD0xlemzxBO0= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.57.2/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 h1:T33TM/94TrgmFOYk9wLp5u1v45S5rQPlA2QQ9PdeGLo= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= @@ -95,48 +95,48 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/Vz github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2 h1:lyicd67IMM/eRoQaKpZdImaUOQUexFbpIDT71KayWUo= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.44.2/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2 h1:9iXNQ2b5cDSmZHjNN4j0F/QRGTiA5kpGV/JIPPi9gO4= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.49.2/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JPu2nZdIky7iZbBcs61+M= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2 h1:rhvd+Sza4DuXzrTGLsJ1jO6wdKnb9KXqXyw4r6o4tIk= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.13.2/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 h1:uBcuEbBOFpFd/nKHLfhop7iSG6aeQNBQFczwMqyaLU0= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2 h1:FT0Y2iOC056nBalWZU0s5jfpIoFieN7mZR6H028U904= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.25.2/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUVXVVgmxFeXKGamIbNN0UDfpNov4JXMSplUo= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2 h1:uFp6NEFas2RXeuBr1DLN/VoXuia8Xh3NPe9j8PsHKXo= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.27.2/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2 h1:QOsVXn4JOYT/hijI83NKENLuPBgNnoCsZRYevszDFMs= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.64.2/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 h1:sujsuzoVNHNCiL4k5PLgo5O3fDTxqYFCjrUOPnuBB3w= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2 h1:ah7hfvNnINvdcXOqkasIJFvti3jCLCQZTk5SyeqRQG4= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.30.2/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+RYVfhq5lcTZjyZPkpSe1S0o= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2 h1:pcho6kw8xOS5MV9yHTySeO36FC/QMC4WBy7RJAYB9hY= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.56.2/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2 h1:HvA12hXcyI07mrRK6143JAkfgRAK+RXWUwtVHTatHU8= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.37.2/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FP github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2 h1:zstJ05B3dNhvUUALEh/XtBUdpSMA06HkDgDS9EagdqE= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.30.2/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= @@ -171,10 +171,10 @@ github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQI github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2 h1:NunFZHMwVtv7pZP348zakolv1lRLuq06xaRKPPI6rBo= -github.com/aws/aws-sdk-go-v2/service/controltower v1.25.2/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2 h1:AVbMDG/wcIMAcJBRtXzpEIC5p3Y/sG/hsOvKF7j/imo= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.32.2/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 h1:kEZC9UM7c+eIzVWPo9h8OP8hJhHwdafMcSazWEAIfVM= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 h1:y6jqRCfWqshbHuc8pnTYB0tb6KzkNcsXGG+HNXpxm4g= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= @@ -191,34 +191,34 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwh github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1 h1:knoQ9bJuxXStprRcf0QDGqnQtlfcMrt4UC5IjiRGwB4= -github.com/aws/aws-sdk-go-v2/service/datazone v1.38.1/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.2 h1:6NNrslvojclUa8DhsMWzi66Uxo/5S/Q2CdOh4+ERBFI= -github.com/aws/aws-sdk-go-v2/service/dax v1.27.2/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.0/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2 h1:oABPzKfUcm/KHlQ5nYr9sxmpwQp4jorqhCBN3x0uq/I= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.34.2/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2 h1:gYxiWv5qRdJEITZoZLws3ulWvScdm2ghfVTX40CfsC8= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.38.2/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2 h1:eC4WZ++je9Vs69hKjqfFhvyP0CiXiaHOjWvcTZHKM8A= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.36.2/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2V4GZJwyG4fcl7EQwTfjCSI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 h1:OSs7LJgZ8hWx/TpCLbqdNvzUlgSyCQZ6u7yL0qrBYLI= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV3Cyo+BMcH1l7GwXI81vTonNho= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2 h1:EW/bDqbpiRPDC4vqWlAr7ZUCu4hzVTAQ/dSDTh6lq40= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.18.2/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2 h1:P94OfRObDwjklbvdJTGuRZXeGYF7Bv5NNUo+I628kKQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.245.2/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 h1:n/uCxI68tuO8NTrSCqlLQAMtWAH37RLhMw/3iugFanM= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= @@ -227,8 +227,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiA github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.1 h1:94CuP2LDRD8zwfJIm+oOEx0vRuwodfon0BPImHs8aww= -github.com/aws/aws-sdk-go-v2/service/eks v1.71.1/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= +github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCxf9TLQPxZuVvIdOI= +github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= @@ -243,8 +243,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8f github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2 h1:koRAh82fRV1LIbI/qy17NMwsLIvn3Vsg3LB7MUVoTRI= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.38.2/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= @@ -261,8 +261,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5Yg github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2 h1:0ADY6sOC594lvWksDrmFddKvP84KSL4Y7zvs2pzR3/Q= -github.com/aws/aws-sdk-go-v2/service/fsx v1.60.2/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2 h1:hOqC0k3XUdNYrhi03iNY3FcPtz9h2EoAixPRjNE2li8= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.36.2/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= @@ -315,14 +315,14 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rO github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2 h1:6yvhusf2JqDouf2vID1uxgQjuLje4kXPXRbFDQxf93c= -github.com/aws/aws-sdk-go-v2/service/kendra v1.59.2/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2 h1:pVadjOT9l8aWdRH6vNb9RzdV9ogiAL0z0xllp9odDOU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.22.2/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 h1:q8dGXGYG9TSEb61QelksWI4WN7VruNzmF3iOEX2zPoU= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2 h1:JfL0vQRSLMJLt+XSsXeVxHRNEk5sTNaHqff+mzF5tRw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.29.2/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 h1:FaN3ONYHItF50pzc8mflJZ2Nw7mxaqsLjCOncSStCaw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= @@ -331,16 +331,16 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiN github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2 h1:/mOkmwc5PcOlnzhsqfASiJMAyN6ih3JKxjvvVl7h8mE= -github.com/aws/aws-sdk-go-v2/service/lambda v1.76.2/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 h1:xjBkvUA+R02IZrK8WlRwsC3kG9LkMWI5s443jpz7aUw= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2 h1:ZR+VGnYM7Viksn07SJvbhYddVBF21nQZcSTv9KC3Onk= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.55.2/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2 h1:wessSCOf6hfRf23T/NkeOgqlMexDsikmRhmMdUoxSsM= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.35.2/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 h1:+kECYDKEF2eV7w9JPH3Y0gKXTQ0aqTqFUkrdvaX4Hn8= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 h1:ob6Pfi0h6CNDpYIrWtQE5brfrly6eEzWzR+VHnljFUM= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= @@ -353,18 +353,18 @@ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0 h1:74LNXF4J5NMYMX28KMStWN3Ur2GskWi+Mi19A9iGO3A= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.81.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 h1:2RNLZ1Ymov3rRuPUAVXSC1xXo6BJ5hpWF6ad72FGBAQ= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2 h1:pUSsXiqteXvVMPq0GMovPHAO54gCPbiI+zzXqQmS0wg= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.38.2/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2 h1:/FQlsO7QN75KZ7sB9nrNW3DK4+6JL1NcfRcPb3nByLI= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.28.2/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 h1:ltB0n2pWVrQgtyMrl7zt+8glzVcCDR7XAbu4fGQzh+Y= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 h1:lOyLFvIq0NElKvCoZoxi6jkF10QXfa+uHwKIYnktu18= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= @@ -389,22 +389,22 @@ github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.2 h1:o7gKGdpE0AS+kdt9pBi+gQyN2jZb1MPo+CE/iblnaBA= -github.com/aws/aws-sdk-go-v2/service/odb v1.3.2/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 h1:3+EJm4Prbjq1P3VmCjfPKLxMQerl14sjfK/3g8/M6LA= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.0/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2 h1:aSpj1b9Eh/RKTzLqFTKHajREBhKmMHnTNlmI4KEaKpw= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.24.2/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 h1:c1e4iCdEt9kNgBDJWX5C7SI2taE2IgaUe31RcrOO6Zc= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2 h1:rKLpCowVJIGY0tJl5Gl1sqpnfG3C0UwIvJUA1bIs62M= -github.com/aws/aws-sdk-go-v2/service/outposts v1.55.2/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 h1:kOqT0HBrIn7nfX2X81VPnPqIj8kCyJFzW0EeiX9i644= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2 h1:VAFDtiP1dwvrwLsRETzyIbENGZrYZU4EHeYeGJaT8nY= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.14.2/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7jtQYFQY0kBkmdhzylDwAxA7bHVg= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= @@ -417,8 +417,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pX github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2 h1:qvSuq8HxdC2ZfGfEw0jl3/FeA9QwAZ6hkQFRGHdC/sA= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.32.2/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= @@ -433,18 +433,18 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJW github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2 h1:/BEylrzFxG7R4dm1Df3TgMchZBijYW/7dJcgRVeQMII= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.30.2/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 h1:f4Bj2dvWHwg5W+G04vlI2TXKy5bGKyIhWB8e3uuQ4Yg= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2 h1:I4DJs64ligwwPzChWFXVM/b5FO9FjB4bbrbIIXmwGwE= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.33.2/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2 h1:xGJbaD07RxOfAhcKfnKVaCZvHDTTWPtD+DIdYMdnEFQ= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.29.2/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= @@ -459,8 +459,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZf github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.0 h1:qfHLulL2U0MkQ6d339wUtc5B2xoFWLQAHNOoWpGXD7c= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.0/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 h1:55M6WukFPaLNGH/mKJhggsictC45iMOnRL0SfXCzsIM= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.1/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= @@ -483,10 +483,10 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCC github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2 h1:45G3hjtf001+XN+JgOf0j6IufhHJfGIKEEMvaTBqqH4= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.28.2/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2 h1:xRJT463/9zAaol6uKqBVkQXOxDfKWkwZMTHMLZrXRFI= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.37.2/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= @@ -497,16 +497,16 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJk github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2 h1:Fx3su5YVfkkjdbXZl56T1KKLsdIxr+q28VFoUXDWsd4= -github.com/aws/aws-sdk-go-v2/service/sfn v1.38.2/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.2 h1:Ecwq3xNoQQYKCvssG0zKU1ebXw1dMM7uscXqn8w1I7U= -github.com/aws/aws-sdk-go-v2/service/shield v1.33.2/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUqGjV/yeobJi7TQo0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0 h1:dbxXhQu0wVhmGY8qnSXUEFZ4ZfQFTjBDEadxsmgtdS8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.0/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= @@ -519,28 +519,28 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFM github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2 h1:RibOkweLBwdRGOxSL154qu294WOkTGSv3cDESKOCaQU= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.34.2/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2 h1:hGjHhpdzNJb/IPaRZT8qoClVieXa8+arkgtcgLQ1XkA= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.41.2/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2 h1:kzfD46Q9FVrQomo3kLOXdSvqFA3FDfBWl2ku0Fw5q6k= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.15.2/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0 h1:Aw/xkOanBGK4RLD5SEGdNLgoBZXYVBo2X4OstW+iS0A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.15.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 h1:oIANsrxMomHQt31QfRhc2v8w2FT6DrUZO0jESwVZVzs= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 h1:pnnAt7y/R3PcSf6DB4b9b3dYPrbY0g/6q2r8ui8mUiA= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2 h1:6U0E5il6rPEcS97BO8XVSb5HBOa3zxblhdUgm9E8pcQ= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.51.2/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msm github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2 h1:vd6cgHRHqhLqLeQ2KuTGdKZGXLCtVZRpZ92mLBgaIK8= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.38.2/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= @@ -563,8 +563,8 @@ github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVk github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= -github.com/beevik/etree v1.5.1 h1:TC3zyxYp+81wAmbsi8SWUpZCurbxa6S8RITYRSkNRwo= -github.com/beevik/etree v1.5.1/go.mod h1:gPNJNaBGVZ9AwsidazFZyygnd+0pAU38N4D+WemwKNs= +github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= +github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= From 00d2bdb63d7d9a7baa757b5db43a6fa0ffedb2ec Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 09:20:16 -0400 Subject: [PATCH 0780/2115] r/aws_secretsmanager_secret_version: remove setting `has_secret_string_wo` on import After discussion internally, this step seems to be unnecessary and was leftover from prototyping the initial support for write-only attributes. --- internal/service/secretsmanager/secret_version.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/internal/service/secretsmanager/secret_version.go b/internal/service/secretsmanager/secret_version.go index 8ecafb69562c..8a1867d7d268 100644 --- a/internal/service/secretsmanager/secret_version.go +++ b/internal/service/secretsmanager/secret_version.go @@ -425,13 +425,6 @@ func (secretVersionImportID) Parse(id string) (string, map[string]string, error) results := map[string]string{ "secret_id": secretID, "version_id": versionID, - - // TODO - Always set to false on import - // - // The Parse method currently only supports string attributes. Attempting to - // set this boolean will result in a panic. - // panic: has_secret_string_wo: '' expected type 'bool', got unconvertible type 'string', value: 'false' - // "has_secret_string_wo": "false", } return id, results, nil From 091a303d8fd4b8a5a45777a2d2b4bc43cbd8418f Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 13:28:56 +0000 Subject: [PATCH 0781/2115] Update CHANGELOG.md for #44030 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c762efdda7f..8d2f4bd7b129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ FEATURES: * **New Resource:** `aws_workspacesweb_browser_settings_association` ([#43735](https://github.com/hashicorp/terraform-provider-aws/issues/43735)) * **New Resource:** `aws_workspacesweb_data_protection_settings_association` ([#43773](https://github.com/hashicorp/terraform-provider-aws/issues/43773)) * **New Resource:** `aws_workspacesweb_identity_provider` ([#43729](https://github.com/hashicorp/terraform-provider-aws/issues/43729)) +* **New Resource:** `aws_workspacesweb_ip_access_settings_association` ([#43774](https://github.com/hashicorp/terraform-provider-aws/issues/43774)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) @@ -35,6 +36,7 @@ ENHANCEMENTS: * resource/aws_s3_bucket_server_side_encryption_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_versioning: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) +* resource/aws_s3tables_table_bucket: Add `force_destroy` argument ([#43922](https://github.com/hashicorp/terraform-provider-aws/issues/43922)) * resource/aws_signer_signing_profile: Add `signing_parameters` argument ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * resource/aws_synthetics_canary: Add `vpc_config.ipv6_allowed_for_dual_stack` argument ([#43989](https://github.com/hashicorp/terraform-provider-aws/issues/43989)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) From dee804aa6827b41bce31a8c26620b254ba223ce7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 09:40:49 -0400 Subject: [PATCH 0782/2115] Add 'TestAccWorkSpacesWebNetworkSettingsAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 1 + .../network_settings_association.go | 28 +++++------ .../network_settings_association_test.go | 46 ++----------------- 3 files changed, 17 insertions(+), 58 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index adc8d2ff49a6..4857e104bf6d 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -13,6 +13,7 @@ var ( ResourceIPAccessSettings = newIPAccessSettingsResource ResourceIPAccessSettingsAssociation = newIPAccessSettingsAssociationResource ResourceNetworkSettings = newNetworkSettingsResource + ResourceNetworkSettingsAssociation = newNetworkSettingsAssociationResource ResourcePortal = newPortalResource ResourceTrustStore = newTrustStoreResource ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource diff --git a/internal/service/workspacesweb/network_settings_association.go b/internal/service/workspacesweb/network_settings_association.go index 6fec214a1423..a0515d5866ad 100644 --- a/internal/service/workspacesweb/network_settings_association.go +++ b/internal/service/workspacesweb/network_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newNetworkSettingsAssociationResource(_ context.Context) (resource.Resource return &networkSettingsAssociationResource{}, nil } -const ( - ResNameNetworkSettingsAssociation = "Network Settings Association" -) - type networkSettingsAssociationResource struct { framework.ResourceWithModel[networkSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *networkSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "network_settings_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *networkSettingsAssociationResource) Create(ctx context.Context, request _, err := conn.AssociateNetworkSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameNetworkSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb Network Settings Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *networkSettingsAssociationResource) Read(ctx context.Context, request r } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameNetworkSettingsAssociation, data.NetworkSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Network Settings Association (%s)", data.NetworkSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *networkSettingsAssociationResource) Read(ctx context.Context, request r response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *networkSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *networkSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data networkSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *networkSettingsAssociationResource) Delete(ctx context.Context, request } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameNetworkSettingsAssociation, data.NetworkSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Network Settings Association (%s)", data.NetworkSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *networkSettingsAssociationResource) ImportState(ctx context.Context, re type networkSettingsAssociationResourceModel struct { framework.WithRegionModel - NetworkSettingsARN types.String `tfsdk:"network_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + NetworkSettingsARN fwtypes.ARN `tfsdk:"network_settings_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` } diff --git a/internal/service/workspacesweb/network_settings_association_test.go b/internal/service/workspacesweb/network_settings_association_test.go index 597580d12ef7..ac780eba9f87 100644 --- a/internal/service/workspacesweb/network_settings_association_test.go +++ b/internal/service/workspacesweb/network_settings_association_test.go @@ -70,13 +70,10 @@ func TestAccWorkSpacesWebNetworkSettingsAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebNetworkSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebNetworkSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var networkSettings1, networkSettings2 awstypes.NetworkSettings + var networkSettings awstypes.NetworkSettings resourceName := "aws_workspacesweb_network_settings_association.test" - networkSettingsResourceName1 := "aws_workspacesweb_network_settings.test" - networkSettingsResourceName2 := "aws_workspacesweb_network_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -92,18 +89,10 @@ func TestAccWorkSpacesWebNetworkSettingsAssociation_update(t *testing.T) { { Config: testAccNetworkSettingsAssociationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings1), - resource.TestCheckResourceAttrPair(resourceName, "network_settings_arn", networkSettingsResourceName1, "network_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccNetworkSettingsAssociationConfig_updated(rName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings2), - resource.TestCheckResourceAttrPair(resourceName, "network_settings_arn", networkSettingsResourceName2, "network_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckNetworkSettingsAssociationExists(ctx, resourceName, &networkSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceNetworkSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -195,28 +184,3 @@ resource "aws_workspacesweb_network_settings_association" "test" { } `) } - -func testAccNetworkSettingsAssociationConfig_updated(rName string) string { - return acctest.ConfigCompose(testAccNetworkSettingsConfig_base(rName), ` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_network_settings" "test" { - vpc_id = aws_vpc.test.id - subnet_ids = [aws_subnet.test[0].id, aws_subnet.test[1].id] - security_group_ids = [aws_security_group.test[0].id, aws_security_group.test[1].id] -} - -resource "aws_workspacesweb_network_settings" "test2" { - vpc_id = aws_vpc.test2.id - subnet_ids = [aws_subnet.test2[0].id, aws_subnet.test2[1].id] - security_group_ids = [aws_security_group.test2[0].id, aws_security_group.test2[1].id] -} - -resource "aws_workspacesweb_network_settings_association" "test" { - network_settings_arn = aws_workspacesweb_network_settings.test2.network_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -`) -} From b38d97b2270a5a50804077574f9d07efb052901c Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 13:49:48 +0000 Subject: [PATCH 0783/2115] Update CHANGELOG.md for #44036 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d2f4bd7b129..fee0af3f135b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ BUG FIXES: * resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) * resource/aws_nat_gateway: Fix inconsistent final plan for `secondary_private_ip_addresses` ([#43708](https://github.com/hashicorp/terraform-provider-aws/issues/43708)) +* resource/aws_wafv2_web_acl: Add missing flattening of `name` in `response_inspection.header` blocks for `AWSManagedRulesATPRuleSet` and `AWSManagedRulesACFPRuleSet` to avoid persistent plan diffs ([#44032](https://github.com/hashicorp/terraform-provider-aws/issues/44032)) ## 6.10.0 (August 21, 2025) From aebfe99af3f4cb10fada675bd609bdb8a7b0306a Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 14:16:23 +0000 Subject: [PATCH 0784/2115] Update CHANGELOG.md for #44031 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fee0af3f135b..85b9c14182fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ FEATURES: * **New Resource:** `aws_workspacesweb_data_protection_settings_association` ([#43773](https://github.com/hashicorp/terraform-provider-aws/issues/43773)) * **New Resource:** `aws_workspacesweb_identity_provider` ([#43729](https://github.com/hashicorp/terraform-provider-aws/issues/43729)) * **New Resource:** `aws_workspacesweb_ip_access_settings_association` ([#43774](https://github.com/hashicorp/terraform-provider-aws/issues/43774)) +* **New Resource:** `aws_workspacesweb_network_settings_association` ([#43775](https://github.com/hashicorp/terraform-provider-aws/issues/43775)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) @@ -37,6 +38,7 @@ ENHANCEMENTS: * resource/aws_s3_bucket_versioning: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3tables_table_bucket: Add `force_destroy` argument ([#43922](https://github.com/hashicorp/terraform-provider-aws/issues/43922)) +* resource/aws_secretsmanager_secret_version: Add resource identity support ([#44031](https://github.com/hashicorp/terraform-provider-aws/issues/44031)) * resource/aws_signer_signing_profile: Add `signing_parameters` argument ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * resource/aws_synthetics_canary: Add `vpc_config.ipv6_allowed_for_dual_stack` argument ([#43989](https://github.com/hashicorp/terraform-provider-aws/issues/43989)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) From 07f9c42dc6e7eea8c004abb083a35e60d670b21f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:20:28 -0400 Subject: [PATCH 0785/2115] Add 'arcregionswitch' service metadata. --- names/data/names_data.hcl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index da2600fbf852..216e78a77fb9 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -548,6 +548,35 @@ service "applicationsignals" { brand = "Amazon" } +service "arcregionswitch" { + cli_v2_command { + aws_cli_v2_command = "arc-region-switch" + aws_cli_v2_command_no_dashes = "arcregionswitch" + } + + sdk { + id = "ARC Region Switch" + arn_namespace = "arcregionswitch" + } + + names { + provider_name_upper = "ARCRegionSwitch" + human_friendly = "Application Resilience Controller Region Switch" + } + + endpoint_info { + endpoint_api_call = "ListPlans" + } + + resource_prefix { + correct = "aws_arcregionswitch_" + } + + provider_package_correct = "arcregionswitch" + doc_prefix = ["arcregionswitch_"] + brand = "AWS" +} + service "discovery" { go_packages { v1_package = "applicationdiscoveryservice" From 9e6d8111fcb065772e2866ed1b4ae06ff1a5dca3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:22:29 -0400 Subject: [PATCH 0786/2115] Add 'arcregionswitch' service package. --- internal/service/arcregionswitch/generate.go | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 internal/service/arcregionswitch/generate.go diff --git a/internal/service/arcregionswitch/generate.go b/internal/service/arcregionswitch/generate.go new file mode 100644 index 000000000000..8c23dfdb1838 --- /dev/null +++ b/internal/service/arcregionswitch/generate.go @@ -0,0 +1,7 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +//go:generate go run ../../generate/servicepackage/main.go +// ONLY generate directives and package declaration! Do not add anything else to this file. + +package arcregionswitch From 9187e4f0b5988c1889834f8b90f9f81856e9ea49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:24:50 -0400 Subject: [PATCH 0787/2115] Require 'github.com/aws/aws-sdk-go-v2/service/arcregionswitch'. --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 4f82056d4974..64d11e6f1f08 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 From f8f5b39b35ab190776ec398d664b33df69e9cc82 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:31:42 -0400 Subject: [PATCH 0788/2115] Run 'make gen'. --- .ci/.semgrep-service-name0.yml | 104 +-- .ci/.semgrep-service-name1.yml | 61 +- .ci/.semgrep-service-name2.yml | 36 +- .ci/.semgrep-service-name3.yml | 18 + .github/labeler-issue-triage.yml | 2 + .github/labeler-pr-triage.yml | 6 + .../components/generated/services_all.kt | 1 + infrastructure/repository/labels-service.tf | 1 + internal/conns/awsclient_gen.go | 5 + internal/provider/framework/provider_gen.go | 7 + internal/provider/sdkv2/provider_gen.go | 8 + .../provider/sdkv2/service_packages_gen.go | 2 + .../service_endpoint_resolver_gen.go | 82 +++ .../service_endpoints_gen_test.go | 602 ++++++++++++++++++ .../arcregionswitch/service_package_gen.go | 88 +++ internal/sweep/service_packages_gen_test.go | 2 + names/consts_gen.go | 2 + website/allowed-subcategories.txt | 1 + .../custom-service-endpoints.html.markdown | 1 + 19 files changed, 950 insertions(+), 79 deletions(-) create mode 100644 internal/service/arcregionswitch/service_endpoint_resolver_gen.go create mode 100644 internal/service/arcregionswitch/service_endpoints_gen_test.go create mode 100644 internal/service/arcregionswitch/service_package_gen.go diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml index 519582fa3031..3ac18b537d88 100644 --- a/.ci/.semgrep-service-name0.yml +++ b/.ci/.semgrep-service-name0.yml @@ -1343,6 +1343,67 @@ rules: patterns: - pattern-regex: "(?i)AppSync" severity: WARNING + - id: arcregionswitch-in-func-name + languages: + - go + message: Do not use "ARCRegionSwitch" in func name inside arcregionswitch package + paths: + include: + - internal/service/arcregionswitch + exclude: + - internal/service/arcregionswitch/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)ARCRegionSwitch" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING + - id: arcregionswitch-in-test-name + languages: + - go + message: Include "ARCRegionSwitch" in test name + paths: + include: + - internal/service/arcregionswitch/*_test.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-not-regex: "^TestAccARCRegionSwitch" + - pattern-regex: ^TestAcc.* + severity: WARNING + - id: arcregionswitch-in-const-name + languages: + - go + message: Do not use "ARCRegionSwitch" in const name inside arcregionswitch package + paths: + include: + - internal/service/arcregionswitch + patterns: + - pattern: const $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)ARCRegionSwitch" + severity: WARNING + - id: arcregionswitch-in-var-name + languages: + - go + message: Do not use "ARCRegionSwitch" in var name inside arcregionswitch package + paths: + include: + - internal/service/arcregionswitch + patterns: + - pattern: var $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)ARCRegionSwitch" + severity: WARNING - id: athena-in-func-name languages: - go @@ -4375,46 +4436,3 @@ rules: - focus-metavariable: $NAME - pattern-not: func $NAME($T *testing.T) severity: WARNING - - id: configservice-in-test-name - languages: - - go - message: Include "ConfigService" in test name - paths: - include: - - internal/service/configservice/*_test.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-not-regex: "^TestAccConfigService" - - pattern-regex: ^TestAcc.* - severity: WARNING - - id: configservice-in-const-name - languages: - - go - message: Do not use "ConfigService" in const name inside configservice package - paths: - include: - - internal/service/configservice - patterns: - - pattern: const $NAME = ... - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)ConfigService" - severity: WARNING - - id: configservice-in-var-name - languages: - - go - message: Do not use "ConfigService" in var name inside configservice package - paths: - include: - - internal/service/configservice - patterns: - - pattern: var $NAME = ... - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)ConfigService" - severity: WARNING diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml index 91c627e0e7f9..b5c4a9d08d48 100644 --- a/.ci/.semgrep-service-name1.yml +++ b/.ci/.semgrep-service-name1.yml @@ -1,5 +1,48 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: + - id: configservice-in-test-name + languages: + - go + message: Include "ConfigService" in test name + paths: + include: + - internal/service/configservice/*_test.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-not-regex: "^TestAccConfigService" + - pattern-regex: ^TestAcc.* + severity: WARNING + - id: configservice-in-const-name + languages: + - go + message: Do not use "ConfigService" in const name inside configservice package + paths: + include: + - internal/service/configservice + patterns: + - pattern: const $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)ConfigService" + severity: WARNING + - id: configservice-in-var-name + languages: + - go + message: Do not use "ConfigService" in var name inside configservice package + paths: + include: + - internal/service/configservice + patterns: + - pattern: var $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)ConfigService" + severity: WARNING - id: connect-in-func-name languages: - go @@ -4399,21 +4442,3 @@ rules: patterns: - pattern-regex: "(?i)Invoicing" severity: WARNING - - id: iot-in-func-name - languages: - - go - message: Do not use "IoT" in func name inside iot package - paths: - include: - - internal/service/iot - exclude: - - internal/service/iot/list_pages_gen.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)IoT" - - focus-metavariable: $NAME - - pattern-not: func $NAME($T *testing.T) - severity: WARNING diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml index 4d9bcaf1968a..3e40968a2f2e 100644 --- a/.ci/.semgrep-service-name2.yml +++ b/.ci/.semgrep-service-name2.yml @@ -1,5 +1,23 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: + - id: iot-in-func-name + languages: + - go + message: Do not use "IoT" in func name inside iot package + paths: + include: + - internal/service/iot + exclude: + - internal/service/iot/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)IoT" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING - id: iot-in-test-name languages: - go @@ -4413,21 +4431,3 @@ rules: patterns: - pattern-regex: "(?i)RDS" severity: WARNING - - id: recyclebin-in-func-name - languages: - - go - message: Do not use "recyclebin" in func name inside rbin package - paths: - include: - - internal/service/rbin - exclude: - - internal/service/rbin/list_pages_gen.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)recyclebin" - - focus-metavariable: $NAME - - pattern-not: func $NAME($T *testing.T) - severity: WARNING diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml index 59c27147346c..e2d89c15a80a 100644 --- a/.ci/.semgrep-service-name3.yml +++ b/.ci/.semgrep-service-name3.yml @@ -1,5 +1,23 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: + - id: recyclebin-in-func-name + languages: + - go + message: Do not use "recyclebin" in func name inside rbin package + paths: + include: + - internal/service/rbin + exclude: + - internal/service/rbin/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)recyclebin" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING - id: recyclebin-in-const-name languages: - go diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml index 0bdfe2b5c673..093a1bceb403 100644 --- a/.github/labeler-issue-triage.yml +++ b/.github/labeler-issue-triage.yml @@ -77,6 +77,8 @@ service/appstream: - '((\*|-)\s*`?|(data|resource)\s+"?)aws_appstream_' service/appsync: - '((\*|-)\s*`?|(data|resource)\s+"?)aws_appsync_' +service/arcregionswitch: + - '((\*|-)\s*`?|(data|resource)\s+"?)aws_arcregionswitch_' service/athena: - '((\*|-)\s*`?|(data|resource)\s+"?)aws_athena_' service/auditmanager: diff --git a/.github/labeler-pr-triage.yml b/.github/labeler-pr-triage.yml index 53d3c782a3a5..a2c7f7f8628f 100644 --- a/.github/labeler-pr-triage.yml +++ b/.github/labeler-pr-triage.yml @@ -270,6 +270,12 @@ service/appsync: - any-glob-to-any-file: - 'internal/service/appsync/**/*' - 'website/**/appsync_*' +service/arcregionswitch: + - any: + - changed-files: + - any-glob-to-any-file: + - 'internal/service/arcregionswitch/**/*' + - 'website/**/arcregionswitch_*' service/athena: - any: - changed-files: diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt index ed0fe9a03529..215b15e2dc10 100644 --- a/.teamcity/components/generated/services_all.kt +++ b/.teamcity/components/generated/services_all.kt @@ -20,6 +20,7 @@ val services = mapOf( "apprunner" to ServiceSpec("App Runner"), "appstream" to ServiceSpec("AppStream 2.0", vpcLock = true, parallelismOverride = 10), "appsync" to ServiceSpec("AppSync"), + "arcregionswitch" to ServiceSpec("Application Resilience Controller Region Switch"), "athena" to ServiceSpec("Athena"), "auditmanager" to ServiceSpec("Audit Manager"), "autoscaling" to ServiceSpec("Auto Scaling", vpcLock = true), diff --git a/infrastructure/repository/labels-service.tf b/infrastructure/repository/labels-service.tf index 0b0b2991b290..a42cd86e03f1 100644 --- a/infrastructure/repository/labels-service.tf +++ b/infrastructure/repository/labels-service.tf @@ -26,6 +26,7 @@ variable "service_labels" { "apprunner", "appstream", "appsync", + "arcregionswitch", "athena", "auditmanager", "autoscaling", diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index ab86d8135ea4..14c22beaaaa6 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -23,6 +23,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/apprunner" "github.com/aws/aws-sdk-go-v2/service/appstream" "github.com/aws/aws-sdk-go-v2/service/appsync" + "github.com/aws/aws-sdk-go-v2/service/arcregionswitch" "github.com/aws/aws-sdk-go-v2/service/athena" "github.com/aws/aws-sdk-go-v2/service/auditmanager" "github.com/aws/aws-sdk-go-v2/service/autoscaling" @@ -281,6 +282,10 @@ func (c *AWSClient) APIGatewayV2Client(ctx context.Context) *apigatewayv2.Client return errs.Must(client[*apigatewayv2.Client](ctx, c, names.APIGatewayV2, make(map[string]any))) } +func (c *AWSClient) ARCRegionSwitchClient(ctx context.Context) *arcregionswitch.Client { + return errs.Must(client[*arcregionswitch.Client](ctx, c, names.ARCRegionSwitch, make(map[string]any))) +} + func (c *AWSClient) AccessAnalyzerClient(ctx context.Context) *accessanalyzer.Client { return errs.Must(client[*accessanalyzer.Client](ctx, c, names.AccessAnalyzer, make(map[string]any))) } diff --git a/internal/provider/framework/provider_gen.go b/internal/provider/framework/provider_gen.go index b9ef915c359c..7323c30a14c4 100644 --- a/internal/provider/framework/provider_gen.go +++ b/internal/provider/framework/provider_gen.go @@ -163,6 +163,13 @@ func endpointsBlock() schema.SetNestedBlock { Description: "Use this to override the default service endpoint URL", }, + // arcregionswitch + + "arcregionswitch": schema.StringAttribute{ + Optional: true, + Description: "Use this to override the default service endpoint URL", + }, + // athena "athena": schema.StringAttribute{ diff --git a/internal/provider/sdkv2/provider_gen.go b/internal/provider/sdkv2/provider_gen.go index 80f5ccb2a225..f8dc1605c498 100644 --- a/internal/provider/sdkv2/provider_gen.go +++ b/internal/provider/sdkv2/provider_gen.go @@ -195,6 +195,14 @@ func endpointsSchema() *schema.Schema { Description: "Use this to override the default service endpoint URL", }, + // arcregionswitch + + "arcregionswitch": { + Type: schema.TypeString, + Optional: true, + Description: "Use this to override the default service endpoint URL", + }, + // athena "athena": { diff --git a/internal/provider/sdkv2/service_packages_gen.go b/internal/provider/sdkv2/service_packages_gen.go index a62b3b8dd0d3..a9f570bdccc4 100644 --- a/internal/provider/sdkv2/service_packages_gen.go +++ b/internal/provider/sdkv2/service_packages_gen.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/service/apprunner" "github.com/hashicorp/terraform-provider-aws/internal/service/appstream" "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/service/arcregionswitch" "github.com/hashicorp/terraform-provider-aws/internal/service/athena" "github.com/hashicorp/terraform-provider-aws/internal/service/auditmanager" "github.com/hashicorp/terraform-provider-aws/internal/service/autoscaling" @@ -284,6 +285,7 @@ func servicePackages(ctx context.Context) []conns.ServicePackage { apprunner.ServicePackage(ctx), appstream.ServicePackage(ctx), appsync.ServicePackage(ctx), + arcregionswitch.ServicePackage(ctx), athena.ServicePackage(ctx), auditmanager.ServicePackage(ctx), autoscaling.ServicePackage(ctx), diff --git a/internal/service/arcregionswitch/service_endpoint_resolver_gen.go b/internal/service/arcregionswitch/service_endpoint_resolver_gen.go new file mode 100644 index 000000000000..5fa49c71caeb --- /dev/null +++ b/internal/service/arcregionswitch/service_endpoint_resolver_gen.go @@ -0,0 +1,82 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package arcregionswitch + +import ( + "context" + "fmt" + "net" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/arcregionswitch" + smithyendpoints "github.com/aws/smithy-go/endpoints" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/errs" +) + +var _ arcregionswitch.EndpointResolverV2 = resolverV2{} + +type resolverV2 struct { + defaultResolver arcregionswitch.EndpointResolverV2 +} + +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: arcregionswitch.NewDefaultEndpointResolverV2(), + } +} + +func (r resolverV2) ResolveEndpoint(ctx context.Context, params arcregionswitch.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { + params = params.WithDefaults() + useFIPS := aws.ToBool(params.UseFIPS) + + if eps := params.Endpoint; aws.ToString(eps) != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + + if useFIPS { + tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") + params.UseFIPS = aws.Bool(false) + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) + } else if useFIPS { + ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) + + endpoint, err = r.defaultResolver.ResolveEndpoint(ctx, params) + if err != nil { + return endpoint, err + } + + tflog.Debug(ctx, "endpoint resolved", map[string]any{ + "tf_aws.endpoint": endpoint.URI.String(), + }) + + hostname := endpoint.URI.Hostname() + _, err = net.LookupHost(hostname) + if err != nil { + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ + "tf_aws.hostname": hostname, + }) + params.UseFIPS = aws.Bool(false) + } else { + err = fmt.Errorf("looking up arcregionswitch endpoint %q: %w", hostname, err) + return + } + } else { + return endpoint, err + } + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) +} + +func withBaseEndpoint(endpoint string) func(*arcregionswitch.Options) { + return func(o *arcregionswitch.Options) { + if endpoint != "" { + o.BaseEndpoint = aws.String(endpoint) + } + } +} diff --git a/internal/service/arcregionswitch/service_endpoints_gen_test.go b/internal/service/arcregionswitch/service_endpoints_gen_test.go new file mode 100644 index 000000000000..fcf4a710c592 --- /dev/null +++ b/internal/service/arcregionswitch/service_endpoints_gen_test.go @@ -0,0 +1,602 @@ +// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. + +package arcregionswitch_test + +import ( + "context" + "errors" + "fmt" + "maps" + "net" + "net/url" + "os" + "path/filepath" + "reflect" + "strings" + "testing" + + "github.com/aws/aws-sdk-go-v2/aws" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/service/arcregionswitch" + "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" + terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "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/provider/sdkv2" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type endpointTestCase struct { + with []setupFunc + expected caseExpectations +} + +type caseSetup struct { + config map[string]any + configFile configFile + environmentVariables map[string]string +} + +type configFile struct { + baseUrl string + serviceUrl string +} + +type caseExpectations struct { + diags diag.Diagnostics + endpoint string + region string +} + +type apiCallParams struct { + endpoint string + region string +} + +type setupFunc func(setup *caseSetup) + +type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams + +const ( + packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" + awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" + baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" + serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" + baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" +) + +const ( + packageName = "arcregionswitch" + awsEnvVar = "AWS_ENDPOINT_URL_ARC_REGION_SWITCH" + baseEnvVar = "AWS_ENDPOINT_URL" + configParam = "arc_region_switch" +) + +const ( + expectedCallRegion = "us-west-2" //lintignore:AWSAT003 +) + +func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv + ctx := t.Context() + const providerRegion = "us-west-2" //lintignore:AWSAT003 + const expectedEndpointRegion = providerRegion + + testcases := map[string]endpointTestCase{ + "no config": { + with: []setupFunc{withNoConfig}, + expected: expectDefaultEndpoint(ctx, t, expectedEndpointRegion), + }, + + // Package name endpoint on Config + + "package name endpoint config": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides aws service envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withAwsEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides service config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withServiceEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + // Service endpoint in AWS envvar + + "service aws envvar": { + with: []setupFunc{ + withAwsEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base envvar": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides service config file": { + with: []setupFunc{ + withAwsEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base config file": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + // Base endpoint in envvar + + "base endpoint envvar": { + with: []setupFunc{ + withBaseEnvVar, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides service config file": { + with: []setupFunc{ + withBaseEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides base config file": { + with: []setupFunc{ + withBaseEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + // Service endpoint in config file + + "service config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + "service config file overrides base config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + withBaseEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + // Base endpoint in config file + + "base endpoint config file": { + with: []setupFunc{ + withBaseEndpointInConfigFile, + }, + expected: expectBaseConfigFileEndpoint(), + }, + + // Use FIPS endpoint on Config + + "use fips config": { + with: []setupFunc{ + withUseFIPSInConfig, + }, + expected: expectDefaultFIPSEndpoint(ctx, t, expectedEndpointRegion), + }, + + "use fips config with package name endpoint config": { + with: []setupFunc{ + withUseFIPSInConfig, + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + } + + for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv + t.Run(name, func(t *testing.T) { + testEndpointCase(ctx, t, providerRegion, testcase, callService) + }) + } +} + +func defaultEndpoint(ctx context.Context, region string) (url.URL, error) { + r := arcregionswitch.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, arcregionswitch.EndpointParameters{ + Region: aws.String(region), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func defaultFIPSEndpoint(ctx context.Context, region string) (url.URL, error) { + r := arcregionswitch.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, arcregionswitch.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { + t.Helper() + + client := meta.ARCRegionSwitchClient(ctx) + + var result apiCallParams + + input := arcregionswitch.ListPlansInput{} + _, err := client.ListPlans(ctx, &input, + func(opts *arcregionswitch.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) { + // no-op +} + +func withPackageNameEndpointInConfig(setup *caseSetup) { + if _, ok := setup.config[names.AttrEndpoints]; !ok { + setup.config[names.AttrEndpoints] = []any{ + map[string]any{}, + } + } + endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) + endpoints[packageName] = packageNameConfigEndpoint +} + +func withAwsEnvVar(setup *caseSetup) { + setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint +} + +func withBaseEnvVar(setup *caseSetup) { + setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint +} + +func withServiceEndpointInConfigFile(setup *caseSetup) { + setup.configFile.serviceUrl = serviceConfigFileEndpoint +} + +func withBaseEndpointInConfigFile(setup *caseSetup) { + setup.configFile.baseUrl = baseConfigFileEndpoint +} + +func withUseFIPSInConfig(setup *caseSetup) { + setup.config["use_fips_endpoint"] = true +} + +func expectDefaultEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer default endpoint: %s", err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectDefaultFIPSEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultFIPSEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) + } + + hostname := endpoint.Hostname() + _, err = net.LookupHost(hostname) + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + return expectDefaultEndpoint(ctx, t, region) + } else if err != nil { + t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectPackageNameConfigEndpoint() caseExpectations { + return caseExpectations{ + endpoint: packageNameConfigEndpoint, + region: expectedCallRegion, + } +} + +func expectAwsEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: awsServiceEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectServiceConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: serviceConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func testEndpointCase(ctx context.Context, t *testing.T, region string, testcase endpointTestCase, callF callFunc) { + t.Helper() + + setup := caseSetup{ + config: map[string]any{}, + environmentVariables: map[string]string{}, + } + + for _, f := range testcase.with { + f(&setup) + } + + config := map[string]any{ + names.AttrAccessKey: servicemocks.MockStaticAccessKey, + names.AttrSecretKey: servicemocks.MockStaticSecretKey, + names.AttrRegion: region, + names.AttrSkipCredentialsValidation: true, + names.AttrSkipRequestingAccountID: true, + } + + maps.Copy(config, setup.config) + + if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { + config[names.AttrProfile] = "default" + tempDir := t.TempDir() + writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) + } + + for k, v := range setup.environmentVariables { + t.Setenv(k, v) + } + + p, err := sdkv2.NewProvider(ctx) + if err != nil { + t.Fatal(err) + } + + p.TerraformVersion = "1.0.0" + + expectedDiags := testcase.expected.diags + diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) + + if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { + t.Errorf("unexpected diagnostics difference: %s", diff) + } + + if diags.HasError() { + return + } + + meta := p.Meta().(*conns.AWSClient) + + callParams := callF(ctx, t, meta) + + if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { + t.Errorf("expected endpoint %q, got %q", e, a) + } + + if e, a := testcase.expected.region, callParams.region; e != a { + t.Errorf("expected region %q, got %q", e, a) + } +} + +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 = errors.New("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 any) 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 + + buf.WriteString(` +[default] +aws_access_key_id = DefaultSharedCredentialsAccessKey +aws_secret_access_key = DefaultSharedCredentialsSecretKey +`) + if config.baseUrl != "" { + fmt.Fprintf(&buf, "endpoint_url = %s\n", config.baseUrl) + } + + if config.serviceUrl != "" { + fmt.Fprintf(&buf, ` +services = endpoint-test + +[services endpoint-test] +%[1]s = + endpoint_url = %[2]s +`, configParam, serviceConfigFileEndpoint) + } + + return buf.String() +} + +func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { + t.Helper() + + file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) + if err != nil { + t.Fatalf("creating shared configuration file: %s", err) + } + + _, err = file.WriteString(content) + if err != nil { + t.Fatalf(" writing shared configuration file: %s", err) + } + + if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { + (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} + } else { + (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) + } + + return file.Name() +} diff --git a/internal/service/arcregionswitch/service_package_gen.go b/internal/service/arcregionswitch/service_package_gen.go new file mode 100644 index 000000000000..4531c3ae82a9 --- /dev/null +++ b/internal/service/arcregionswitch/service_package_gen.go @@ -0,0 +1,88 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package arcregionswitch + +import ( + "context" + + "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/arcregionswitch" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" + "github.com/hashicorp/terraform-provider-aws/internal/vcr" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type servicePackage struct{} + +func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.ServicePackageFrameworkDataSource { + return []*inttypes.ServicePackageFrameworkDataSource{} +} + +func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.ServicePackageFrameworkResource { + return []*inttypes.ServicePackageFrameworkResource{} +} + +func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { + return []*inttypes.ServicePackageSDKDataSource{} +} + +func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePackageSDKResource { + return []*inttypes.ServicePackageSDKResource{} +} + +func (p *servicePackage) ServicePackageName() string { + return names.ARCRegionSwitch +} + +// 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) (*arcregionswitch.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) + optFns := []func(*arcregionswitch.Options){ + arcregionswitch.WithEndpointResolverV2(newEndpointResolverV2()), + withBaseEndpoint(config[names.AttrEndpoint].(string)), + func(o *arcregionswitch.Options) { + if region := config[names.AttrRegion].(string); o.Region != region { + tflog.Info(ctx, "overriding provider-configured AWS API region", map[string]any{ + "service": p.ServicePackageName(), + "original_region": o.Region, + "override_region": region, + }) + o.Region = region + } + }, + func(o *arcregionswitch.Options) { + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + }, + withExtraOptions(ctx, p, config), + } + + return arcregionswitch.NewFromConfig(cfg, optFns...), nil +} + +// withExtraOptions returns a functional option that allows this service package to specify extra API client options. +// This option is always called after any generated options. +func withExtraOptions(ctx context.Context, sp conns.ServicePackage, config map[string]any) func(*arcregionswitch.Options) { + if v, ok := sp.(interface { + withExtraOptions(context.Context, map[string]any) []func(*arcregionswitch.Options) + }); ok { + optFns := v.withExtraOptions(ctx, config) + + return func(o *arcregionswitch.Options) { + for _, optFn := range optFns { + optFn(o) + } + } + } + + return func(*arcregionswitch.Options) {} +} + +func ServicePackage(ctx context.Context) conns.ServicePackage { + return &servicePackage{} +} diff --git a/internal/sweep/service_packages_gen_test.go b/internal/sweep/service_packages_gen_test.go index 95e985bfbe2a..3588ac486220 100644 --- a/internal/sweep/service_packages_gen_test.go +++ b/internal/sweep/service_packages_gen_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/service/apprunner" "github.com/hashicorp/terraform-provider-aws/internal/service/appstream" "github.com/hashicorp/terraform-provider-aws/internal/service/appsync" + "github.com/hashicorp/terraform-provider-aws/internal/service/arcregionswitch" "github.com/hashicorp/terraform-provider-aws/internal/service/athena" "github.com/hashicorp/terraform-provider-aws/internal/service/auditmanager" "github.com/hashicorp/terraform-provider-aws/internal/service/autoscaling" @@ -284,6 +285,7 @@ func servicePackages(ctx context.Context) []conns.ServicePackage { apprunner.ServicePackage(ctx), appstream.ServicePackage(ctx), appsync.ServicePackage(ctx), + arcregionswitch.ServicePackage(ctx), athena.ServicePackage(ctx), auditmanager.ServicePackage(ctx), autoscaling.ServicePackage(ctx), diff --git a/names/consts_gen.go b/names/consts_gen.go index bdb4e6242568..193e6c5b896f 100644 --- a/names/consts_gen.go +++ b/names/consts_gen.go @@ -7,6 +7,7 @@ const ( AMP = "amp" APIGateway = "apigateway" APIGatewayV2 = "apigatewayv2" + ARCRegionSwitch = "arcregionswitch" AccessAnalyzer = "accessanalyzer" Account = "account" Amplify = "amplify" @@ -265,6 +266,7 @@ const ( AMPServiceID = "amp" APIGatewayServiceID = "API Gateway" APIGatewayV2ServiceID = "ApiGatewayV2" + ARCRegionSwitchServiceID = "ARC Region Switch" AccessAnalyzerServiceID = "AccessAnalyzer" AccountServiceID = "Account" AmplifyServiceID = "Amplify" diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt index 36c1480daafd..d385a9fe488c 100644 --- a/website/allowed-subcategories.txt +++ b/website/allowed-subcategories.txt @@ -17,6 +17,7 @@ AppStream 2.0 AppSync Application Auto Scaling Application Migration (Mgn) +Application Resilience Controller Region Switch Application Signals Athena Audit Manager diff --git a/website/docs/guides/custom-service-endpoints.html.markdown b/website/docs/guides/custom-service-endpoints.html.markdown index 0c39dbc8bbe1..a82e567d64fb 100644 --- a/website/docs/guides/custom-service-endpoints.html.markdown +++ b/website/docs/guides/custom-service-endpoints.html.markdown @@ -102,6 +102,7 @@ provider "aws" { |App Runner|`apprunner`|`AWS_ENDPOINT_URL_APPRUNNER`|`apprunner`| |AppStream 2.0|`appstream`|`AWS_ENDPOINT_URL_APPSTREAM`|`appstream`| |AppSync|`appsync`|`AWS_ENDPOINT_URL_APPSYNC`|`appsync`| +|Application Resilience Controller Region Switch|`arcregionswitch`|`AWS_ENDPOINT_URL_ARC_REGION_SWITCH`|`arc_region_switch`| |Athena|`athena`|`AWS_ENDPOINT_URL_ATHENA`|`athena`| |Audit Manager|`auditmanager`|`AWS_ENDPOINT_URL_AUDITMANAGER`|`auditmanager`| |Auto Scaling|`autoscaling`|`AWS_ENDPOINT_URL_AUTO_SCALING`|`auto_scaling`| From 2a9405dbaf4ca144ac1a804bd746fe9dd1f4624a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:32:12 -0400 Subject: [PATCH 0789/2115] Run 'make clean-tidy'. --- go.mod | 2 +- go.sum | 2 ++ tools/tfsdk2fw/go.mod | 1 + tools/tfsdk2fw/go.sum | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 64d11e6f1f08..84010ba4217d 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 diff --git a/go.sum b/go.sum index edfd1790c74f..38d4b891aed7 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 h1:s7IEsxvCUpXQooiVP+bzy1EVe2NzIPAxapw7IwKlrMk= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2/go.mod h1:AjZwYae4FbhYe/fTebJMK/duQI8Y/+KM/tAqKR6xCqk= github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index b1768a8dd081..751278286365 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -47,6 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 // indirect + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 // indirect github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 // indirect github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 // indirect github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 013db2d9513c..a629d040f14f 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -81,6 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 h1:s7IEsxvCUpXQooiVP+bzy1EVe2NzIPAxapw7IwKlrMk= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2/go.mod h1:AjZwYae4FbhYe/fTebJMK/duQI8Y/+KM/tAqKR6xCqk= github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= From 9124fbbbffee9469bdb988c8b1e1b962f8459894 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:39:11 -0400 Subject: [PATCH 0790/2115] arcregionswitch: Generate tagging code. --- internal/service/arcregionswitch/generate.go | 1 + internal/service/arcregionswitch/tags_gen.go | 128 +++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 internal/service/arcregionswitch/tags_gen.go diff --git a/internal/service/arcregionswitch/generate.go b/internal/service/arcregionswitch/generate.go index 8c23dfdb1838..9ac3d36da9fd 100644 --- a/internal/service/arcregionswitch/generate.go +++ b/internal/service/arcregionswitch/generate.go @@ -2,6 +2,7 @@ // SPDX-License-Identifier: MPL-2.0 //go:generate go run ../../generate/servicepackage/main.go +//go:generate go run ../../generate/tags/main.go -ServiceTagsMap -KVTValues -ListTags -ListTagsInIDElem=Arn -ListTagsOutTagsElem=ResourceTags -UpdateTags -TagInIDElem=Arn -UntagInTagsElem=ResourceTagKeys // ONLY generate directives and package declaration! Do not add anything else to this file. package arcregionswitch diff --git a/internal/service/arcregionswitch/tags_gen.go b/internal/service/arcregionswitch/tags_gen.go new file mode 100644 index 000000000000..37dd2649a3b0 --- /dev/null +++ b/internal/service/arcregionswitch/tags_gen.go @@ -0,0 +1,128 @@ +// Code generated by internal/generate/tags/main.go; DO NOT EDIT. +package arcregionswitch + +import ( + "context" + + "github.com/YakDriver/smarterr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/arcregionswitch" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/logging" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/types/option" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// listTags lists arcregionswitch 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 *arcregionswitch.Client, identifier string, optFns ...func(*arcregionswitch.Options)) (tftags.KeyValueTags, error) { + input := arcregionswitch.ListTagsForResourceInput{ + Arn: aws.String(identifier), + } + + output, err := conn.ListTagsForResource(ctx, &input, optFns...) + + if err != nil { + return tftags.New(ctx, nil), smarterr.NewError(err) + } + + return keyValueTags(ctx, output.ResourceTags), nil +} + +// ListTags lists arcregionswitch 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).ARCRegionSwitchClient(ctx), identifier) + + if err != nil { + return smarterr.NewError(err) + } + + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(tags) + } + + return nil +} + +// map[string]string handling + +// svcTags returns arcregionswitch service tags. +func svcTags(tags tftags.KeyValueTags) map[string]string { + return tags.Map() +} + +// keyValueTags creates tftags.KeyValueTags from arcregionswitch service tags. +func keyValueTags(ctx context.Context, tags map[string]string) tftags.KeyValueTags { + return tftags.New(ctx, tags) +} + +// getTagsIn returns arcregionswitch service tags from Context. +// nil is returned if there are no input tags. +func getTagsIn(ctx context.Context) map[string]string { + if inContext, ok := tftags.FromContext(ctx); ok { + if tags := svcTags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { + return tags + } + } + + return nil +} + +// setTagsOut sets arcregionswitch service tags in Context. +func setTagsOut(ctx context.Context, tags map[string]string) { + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(keyValueTags(ctx, tags)) + } +} + +// updateTags updates arcregionswitch 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 *arcregionswitch.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*arcregionswitch.Options)) error { + oldTags := tftags.New(ctx, oldTagsMap) + newTags := tftags.New(ctx, newTagsMap) + + ctx = tflog.SetField(ctx, logging.KeyResourceId, identifier) + + removedTags := oldTags.Removed(newTags) + removedTags = removedTags.IgnoreSystem(names.ARCRegionSwitch) + if len(removedTags) > 0 { + input := arcregionswitch.UntagResourceInput{ + Arn: aws.String(identifier), + ResourceTagKeys: removedTags.Keys(), + } + + _, err := conn.UntagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + updatedTags := oldTags.Updated(newTags) + updatedTags = updatedTags.IgnoreSystem(names.ARCRegionSwitch) + if len(updatedTags) > 0 { + input := arcregionswitch.TagResourceInput{ + Arn: aws.String(identifier), + Tags: svcTags(updatedTags), + } + + _, err := conn.TagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + return nil +} + +// UpdateTags updates arcregionswitch 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).ARCRegionSwitchClient(ctx), identifier, oldTags, newTags) +} From 41a75550da0dddfe564f90b11afc677e6f2f32e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 10:48:24 -0400 Subject: [PATCH 0791/2115] Add 'TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 27 +++++----- ...ser_access_logging_settings_association.go | 32 +++++------- ...ccess_logging_settings_association_test.go | 52 ++----------------- 3 files changed, 32 insertions(+), 79 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 4857e104bf6d..1086a6f1b826 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -5,19 +5,20 @@ package workspacesweb // Exports for use in tests only. var ( - ResourceBrowserSettings = newBrowserSettingsResource - ResourceBrowserSettingsAssociation = newBrowserSettingsAssociationResource - ResourceDataProtectionSettings = newDataProtectionSettingsResource - ResourceDataProtectionSettingsAssociation = newDataProtectionSettingsAssociationResource - ResourceIdentityProvider = newIdentityProviderResource - ResourceIPAccessSettings = newIPAccessSettingsResource - ResourceIPAccessSettingsAssociation = newIPAccessSettingsAssociationResource - ResourceNetworkSettings = newNetworkSettingsResource - ResourceNetworkSettingsAssociation = newNetworkSettingsAssociationResource - ResourcePortal = newPortalResource - ResourceTrustStore = newTrustStoreResource - ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource - ResourceUserSettings = newUserSettingsResource + ResourceBrowserSettings = newBrowserSettingsResource + ResourceBrowserSettingsAssociation = newBrowserSettingsAssociationResource + ResourceDataProtectionSettings = newDataProtectionSettingsResource + ResourceDataProtectionSettingsAssociation = newDataProtectionSettingsAssociationResource + ResourceIdentityProvider = newIdentityProviderResource + ResourceIPAccessSettings = newIPAccessSettingsResource + ResourceIPAccessSettingsAssociation = newIPAccessSettingsAssociationResource + ResourceNetworkSettings = newNetworkSettingsResource + ResourceNetworkSettingsAssociation = newNetworkSettingsAssociationResource + ResourcePortal = newPortalResource + ResourceTrustStore = newTrustStoreResource + ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource + ResourceUserAccessLoggingSettingsAssociation = newUserAccessLoggingSettingsAssociationResource + ResourceUserSettings = newUserSettingsResource FindBrowserSettingsByARN = findBrowserSettingsByARN FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN diff --git a/internal/service/workspacesweb/user_access_logging_settings_association.go b/internal/service/workspacesweb/user_access_logging_settings_association.go index eb965664f381..ac37bbe162e5 100644 --- a/internal/service/workspacesweb/user_access_logging_settings_association.go +++ b/internal/service/workspacesweb/user_access_logging_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newUserAccessLoggingSettingsAssociationResource(_ context.Context) (resourc return &userAccessLoggingSettingsAssociationResource{}, nil } -const ( - ResNameUserAccessLoggingSettingsAssociation = "User Access Logging Settings Association" -) - type userAccessLoggingSettingsAssociationResource struct { framework.ResourceWithModel[userAccessLoggingSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *userAccessLoggingSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ - "user_access_logging_settings_arn": schema.StringAttribute{ - Required: true, + "portal_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, - "portal_arn": schema.StringAttribute{ - Required: true, + "user_access_logging_settings_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *userAccessLoggingSettingsAssociationResource) Create(ctx context.Contex _, err := conn.AssociateUserAccessLoggingSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameUserAccessLoggingSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb User Access Logging Settings Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *userAccessLoggingSettingsAssociationResource) Read(ctx context.Context, } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameUserAccessLoggingSettingsAssociation, data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb User Access Logging Settings Association (%s)", data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *userAccessLoggingSettingsAssociationResource) Read(ctx context.Context, response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *userAccessLoggingSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *userAccessLoggingSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data userAccessLoggingSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *userAccessLoggingSettingsAssociationResource) Delete(ctx context.Contex } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameUserAccessLoggingSettingsAssociation, data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb User Access Logging Settings Association (%s)", data.UserAccessLoggingSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *userAccessLoggingSettingsAssociationResource) ImportState(ctx context.C type userAccessLoggingSettingsAssociationResourceModel struct { framework.WithRegionModel - UserAccessLoggingSettingsARN types.String `tfsdk:"user_access_logging_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` + UserAccessLoggingSettingsARN fwtypes.ARN `tfsdk:"user_access_logging_settings_arn"` } diff --git a/internal/service/workspacesweb/user_access_logging_settings_association_test.go b/internal/service/workspacesweb/user_access_logging_settings_association_test.go index 901f1d39870d..8fd7d7ad9c30 100644 --- a/internal/service/workspacesweb/user_access_logging_settings_association_test.go +++ b/internal/service/workspacesweb/user_access_logging_settings_association_test.go @@ -70,13 +70,10 @@ func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_basic(t *testing.T }) } -func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var userAccessLoggingSettings1, userAccessLoggingSettings2 awstypes.UserAccessLoggingSettings + var userAccessLoggingSettings awstypes.UserAccessLoggingSettings resourceName := "aws_workspacesweb_user_access_logging_settings_association.test" - userAccessLoggingSettingsResourceName1 := "aws_workspacesweb_user_access_logging_settings.test" - userAccessLoggingSettingsResourceName2 := "aws_workspacesweb_user_access_logging_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resource.ParallelTest(t, resource.TestCase{ @@ -92,18 +89,10 @@ func TestAccWorkSpacesWebUserAccessLoggingSettingsAssociation_update(t *testing. { Config: testAccUserAccessLoggingSettingsAssociationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings1), - resource.TestCheckResourceAttrPair(resourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName1, "user_access_logging_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccUserAccessLoggingSettingsAssociationConfig_updated(rName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings2), - resource.TestCheckResourceAttrPair(resourceName, "user_access_logging_settings_arn", userAccessLoggingSettingsResourceName2, "user_access_logging_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckUserAccessLoggingSettingsAssociationExists(ctx, resourceName, &userAccessLoggingSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceUserAccessLoggingSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -198,34 +187,3 @@ resource "aws_workspacesweb_user_access_logging_settings_association" "test" { } `, rName) } - -func testAccUserAccessLoggingSettingsAssociationConfig_updated(rName string) string { - return fmt.Sprintf(` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_kinesis_stream" "test" { - name = "amazon-workspaces-web-%[1]s" - shard_count = 1 -} - -resource "aws_kinesis_stream" "test2" { - name = "amazon-workspaces-web-%[1]s-2" - shard_count = 1 -} - -resource "aws_workspacesweb_user_access_logging_settings" "test" { - kinesis_stream_arn = aws_kinesis_stream.test.arn -} - -resource "aws_workspacesweb_user_access_logging_settings" "test2" { - kinesis_stream_arn = aws_kinesis_stream.test2.arn -} - -resource "aws_workspacesweb_user_access_logging_settings_association" "test" { - user_access_logging_settings_arn = aws_workspacesweb_user_access_logging_settings.test2.user_access_logging_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -`, rName) -} From b172ab23a879609a6a1db1045831a54d398d304e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:11:50 -0400 Subject: [PATCH 0792/2115] tfresource.RetryWhen: Use 'internal/retry'. --- internal/tfresource/retry.go | 38 ++++-------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index c33972ac99d5..366015939405 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -23,40 +23,12 @@ var ErrFoundResource = retry.ErrFoundResource // The error argument can be `nil`. // If the error is retryable, returns a bool value of `true` and an error (not necessarily the error passed as the argument). // If the error is not retryable, returns a bool value of `false` and either no error (success state) or an error (not necessarily the error passed as the argument). -type Retryable = retryable +type Retryable func(error) (bool, error) // RetryWhen retries the function `f` when the error it returns satisfies `retryable`. // `f` is retried until `timeout` expires. -func RetryWhen(ctx context.Context, timeout time.Duration, f func() (any, error), retryable Retryable) (any, error) { - var output any - - err := Retry(ctx, timeout, func() *sdkretry.RetryError { - var err error - var again bool - - output, err = f() - again, err = retryable(err) - - if again { - return sdkretry.RetryableError(err) - } - - if err != nil { - return sdkretry.NonRetryableError(err) - } - - return nil - }) - - if TimedOut(err) { - output, err = f() - } - - if err != nil { - return nil, err - } - - return output, nil +func RetryWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable Retryable) (T, error) { + return retryWhen(ctx, timeout, f, retryable) } // RetryGWhen is the generic version of RetryWhen which obviates the need for a type @@ -314,9 +286,7 @@ func Retry(ctx context.Context, timeout time.Duration, f sdkretry.RetryFunc, opt return resultErr } -type retryable func(error) (bool, error) - -func retryWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable retryable, opts ...backoff.Option) (T, error) { +func retryWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable Retryable, opts ...backoff.Option) (T, error) { return retry.Op(f).If(func(_ T, err error) (bool, error) { return retryable(err) })(ctx, timeout, opts...) From 6f99f224660f13e8b7f2af7fed868855edbc752c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:36 -0400 Subject: [PATCH 0793/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - appautoscaling. --- internal/service/appautoscaling/target.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appautoscaling/target.go b/internal/service/appautoscaling/target.go index 5d2a0866638b..9397a39eb71f 100644 --- a/internal/service/appautoscaling/target.go +++ b/internal/service/appautoscaling/target.go @@ -295,7 +295,7 @@ func resourceTargetImport(ctx context.Context, d *schema.ResourceData, meta any) func registerScalableTarget(ctx context.Context, conn *applicationautoscaling.Client, input *applicationautoscaling.RegisterScalableTargetInput) error { _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RegisterScalableTarget(ctx, input) }, func(err error) (bool, error) { From 1eb4e9b653976747e37ca846a3bbc4038adcae5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:37 -0400 Subject: [PATCH 0794/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - appstream. --- internal/service/appstream/fleet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index 5e961f67b7bf..e7277b2ccb14 100644 --- a/internal/service/appstream/fleet.go +++ b/internal/service/appstream/fleet.go @@ -293,7 +293,7 @@ func resourceFleetCreate(ctx context.Context, d *schema.ResourceData, meta any) timeout = 15 * time.Minute ) outputRaw, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateFleet(ctx, &input) }, func(err error) (bool, error) { From d095253f8da37d3691007d9d0e7282fdc782ff4c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:38 -0400 Subject: [PATCH 0795/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - autoscaling. --- internal/service/autoscaling/group.go | 2 +- internal/service/autoscaling/launch_configuration.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/autoscaling/group.go b/internal/service/autoscaling/group.go index 0ba41dc95d42..a78555b9fb23 100644 --- a/internal/service/autoscaling/group.go +++ b/internal/service/autoscaling/group.go @@ -4155,7 +4155,7 @@ func startInstanceRefresh(ctx context.Context, conn *autoscaling.Client, input * name := aws.ToString(input.AutoScalingGroupName) _, err := tfresource.RetryWhen(ctx, instanceRefreshStartedTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.StartInstanceRefresh(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/autoscaling/launch_configuration.go b/internal/service/autoscaling/launch_configuration.go index e3d66c4e7e53..370b7b8630fc 100644 --- a/internal/service/autoscaling/launch_configuration.go +++ b/internal/service/autoscaling/launch_configuration.go @@ -404,7 +404,7 @@ func resourceLaunchConfigurationCreate(ctx context.Context, d *schema.ResourceDa // IAM profiles can take ~10 seconds to propagate in AWS: // http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#launch-instance-with-role-console _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return autoscalingconn.CreateLaunchConfiguration(ctx, &input) }, func(err error) (bool, error) { From 1e74dc0aa1a9c8a9a39bd941af3258a8b99d19fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:38 -0400 Subject: [PATCH 0796/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - backup. --- internal/service/backup/selection.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/backup/selection.go b/internal/service/backup/selection.go index 8ead195c4908..add34fd5efd9 100644 --- a/internal/service/backup/selection.go +++ b/internal/service/backup/selection.go @@ -207,7 +207,7 @@ func resourceSelectionCreate(ctx context.Context, d *schema.ResourceData, meta a // Retry for IAM eventual consistency. outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateBackupSelection(ctx, input) }, func(err error) (bool, error) { From 8c6fb292b2084f4dc8cec535721a21bf2605f4f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:40 -0400 Subject: [PATCH 0797/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - cloudformation. --- internal/service/cloudformation/stack_instances.go | 2 +- internal/service/cloudformation/stack_set.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/cloudformation/stack_instances.go b/internal/service/cloudformation/stack_instances.go index e23004895088..9bd50d3cde3c 100644 --- a/internal/service/cloudformation/stack_instances.go +++ b/internal/service/cloudformation/stack_instances.go @@ -298,7 +298,7 @@ func resourceStackInstancesCreate(ctx context.Context, d *schema.ResourceData, m } _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { input.OperationId = aws.String(sdkid.UniqueId()) output, err := conn.CreateStackInstances(ctx, input) diff --git a/internal/service/cloudformation/stack_set.go b/internal/service/cloudformation/stack_set.go index ae092dbd7cd0..391fee00123d 100644 --- a/internal/service/cloudformation/stack_set.go +++ b/internal/service/cloudformation/stack_set.go @@ -271,7 +271,7 @@ func resourceStackSetCreate(ctx context.Context, d *schema.ResourceData, meta an } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { _, err := conn.CreateStackSet(ctx, input) if err != nil { From aebe9e9d87c39d91cb7ea6852ff37d839edfb8b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:41 -0400 Subject: [PATCH 0798/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - cloudtrail. --- internal/service/cloudtrail/trail.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/cloudtrail/trail.go b/internal/service/cloudtrail/trail.go index 83011b861f92..1c6218e801c4 100644 --- a/internal/service/cloudtrail/trail.go +++ b/internal/service/cloudtrail/trail.go @@ -312,7 +312,7 @@ func resourceTrailCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateTrail(ctx, input) }, func(err error) (bool, error) { @@ -500,7 +500,7 @@ func resourceTrailUpdate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateTrail(ctx, input) }, func(err error) (bool, error) { From bbea147a616f3cf9563c434e1c324dbd1797b679 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:43 -0400 Subject: [PATCH 0799/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - cognitoidp. --- internal/service/cognitoidp/user_pool.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/cognitoidp/user_pool.go b/internal/service/cognitoidp/user_pool.go index ce23053178f8..73aa71eca73b 100644 --- a/internal/service/cognitoidp/user_pool.go +++ b/internal/service/cognitoidp/user_pool.go @@ -859,7 +859,7 @@ func resourceUserPoolCreate(ctx context.Context, d *schema.ResourceData, meta an input.UserPoolTier = v } - outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, func() (any, error) { + outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (any, error) { return conn.CreateUserPool(ctx, input) }, userPoolErrorRetryable) @@ -897,7 +897,7 @@ func resourceUserPoolCreate(ctx context.Context, d *schema.ResourceData, meta an input.WebAuthnConfiguration = expandWebAuthnConfigurationConfigType(webAuthnConfig) } - _, err := tfresource.RetryWhen(ctx, propagationTimeout, func() (any, error) { + _, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (any, error) { return conn.SetUserPoolMfaConfig(ctx, input) }, userPoolErrorRetryable) @@ -1045,7 +1045,7 @@ func resourceUserPoolUpdate(ctx context.Context, d *schema.ResourceData, meta an } } - _, err := tfresource.RetryWhen(ctx, propagationTimeout, func() (any, error) { + _, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (any, error) { return conn.SetUserPoolMfaConfig(ctx, input) }, userPoolErrorRetryable) @@ -1226,7 +1226,7 @@ func resourceUserPoolUpdate(ctx context.Context, d *schema.ResourceData, meta an } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateUserPool(ctx, input) }, func(err error) (bool, error) { From c152503a285d11c6ae86b38a617aa80fe4b25806 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:44 -0400 Subject: [PATCH 0800/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - datasync. --- internal/service/datasync/location_s3.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/datasync/location_s3.go b/internal/service/datasync/location_s3.go index fcf6a22d47f9..e12f1f4593f7 100644 --- a/internal/service/datasync/location_s3.go +++ b/internal/service/datasync/location_s3.go @@ -127,7 +127,7 @@ func resourceLocationS3Create(ctx context.Context, d *schema.ResourceData, meta } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateLocationS3(ctx, input) }, func(err error) (bool, error) { From c3831500e431e66d64431683e891b81e910927f5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:45 -0400 Subject: [PATCH 0801/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - deploy. --- internal/service/deploy/deployment_group.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/deploy/deployment_group.go b/internal/service/deploy/deployment_group.go index 6720318a0d11..97fe8f328fd1 100644 --- a/internal/service/deploy/deployment_group.go +++ b/internal/service/deploy/deployment_group.go @@ -524,7 +524,7 @@ func resourceDeploymentGroupCreate(ctx context.Context, d *schema.ResourceData, } outputRaw, err := tfresource.RetryWhen(ctx, 5*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateDeploymentGroup(ctx, input) }, func(err error) (bool, error) { @@ -718,7 +718,7 @@ func resourceDeploymentGroupUpdate(ctx context.Context, d *schema.ResourceData, } _, err := tfresource.RetryWhen(ctx, 5*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateDeploymentGroup(ctx, input) }, func(err error) (bool, error) { From 7459cee4851a9fe714a1e41642b476af9cbc3b74 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:46 -0400 Subject: [PATCH 0802/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - docdb. --- internal/service/docdb/cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/docdb/cluster.go b/internal/service/docdb/cluster.go index a044fed304d4..b672d280ece3 100644 --- a/internal/service/docdb/cluster.go +++ b/internal/service/docdb/cluster.go @@ -868,7 +868,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any timeout = 5 * time.Minute ) _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, &input) }, func(err error) (bool, error) { @@ -943,7 +943,7 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any log.Printf("[DEBUG] Deleting DocumentDB Cluster: %s", d.Id()) _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutDelete), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteDBCluster(ctx, &input) }, func(err error) (bool, error) { From 0097858202536bc897a18eda5298059b0c5b6d0a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:46 -0400 Subject: [PATCH 0803/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - dynamodb. --- internal/service/dynamodb/table.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 2537b5bb95c8..b221d4ef9c06 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -618,7 +618,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) input.SSESpecificationOverride = expandEncryptAtRestOptions(v.([]any)) } - _, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (any, error) { + _, err := tfresource.RetryWhen(ctx, createTableTimeout, func(ctx context.Context) (any, error) { return conn.RestoreTableToPointInTime(ctx, input) }, func(err error) (bool, error) { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { @@ -686,7 +686,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) input.TableCreationParameters = tcp - importTableOutput, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (any, error) { + importTableOutput, err := tfresource.RetryWhen(ctx, createTableTimeout, func(ctx context.Context) (any, error) { return conn.ImportTable(ctx, input) }, func(err error) (bool, error) { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { @@ -777,7 +777,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta any) input.TableClass = awstypes.TableClass(v.(string)) } - _, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (any, error) { + _, err := tfresource.RetryWhen(ctx, createTableTimeout, func(ctx context.Context) (any, error) { return conn.CreateTable(ctx, input) }, func(err error) (bool, error) { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { @@ -1982,7 +1982,7 @@ func deleteTable(ctx context.Context, conn *dynamodb.Client, tableName string) e TableName: aws.String(tableName), } - _, err := tfresource.RetryWhen(ctx, deleteTableTimeout, func() (any, error) { + _, err := tfresource.RetryWhen(ctx, deleteTableTimeout, func(ctx context.Context) (any, error) { return conn.DeleteTable(ctx, input) }, func(err error) (bool, error) { // Subscriber limit exceeded: Only 10 tables can be created, updated, or deleted simultaneously From b2383d37bf701e9e903addc974950f8d4eb789af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:46 -0400 Subject: [PATCH 0804/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - ec2. --- internal/service/ec2/ec2_eip.go | 2 +- internal/service/ec2/ec2_eip_association.go | 2 +- internal/service/ec2/ec2_spot_instance_request.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/ec2/ec2_eip.go b/internal/service/ec2/ec2_eip.go index f4d3b3c7e1c8..c6ed1aacff8f 100644 --- a/internal/service/ec2/ec2_eip.go +++ b/internal/service/ec2/ec2_eip.go @@ -381,7 +381,7 @@ func associateEIP(ctx context.Context, conn *ec2.Client, allocationID, instanceI } _, err = tfresource.RetryWhen(ctx, ec2PropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return findEIPByAssociationID(ctx, conn, aws.ToString(output.AssociationId)) }, func(err error) (bool, error) { diff --git a/internal/service/ec2/ec2_eip_association.go b/internal/service/ec2/ec2_eip_association.go index 3347dc4cfc77..b5b3b5d08cdb 100644 --- a/internal/service/ec2/ec2_eip_association.go +++ b/internal/service/ec2/ec2_eip_association.go @@ -118,7 +118,7 @@ func resourceEIPAssociationCreate(ctx context.Context, d *schema.ResourceData, m d.SetId(aws.ToString(output.AssociationId)) _, err = tfresource.RetryWhen(ctx, ec2PropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return findEIPByAssociationID(ctx, conn, d.Id()) }, func(err error) (bool, error) { diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index a5c46825b3ac..4e403ca60749 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -211,7 +211,7 @@ func resourceSpotInstanceRequestCreate(ctx context.Context, d *schema.ResourceDa } outputRaw, err := tfresource.RetryWhen(ctx, iamPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RequestSpotInstances(ctx, &input) }, func(err error) (bool, error) { From 75b299da1a0ac4f078a0ae87e3d7e7b2dfaf9338 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:47 -0400 Subject: [PATCH 0805/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - ecrpublic. --- internal/service/ecrpublic/repository_policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecrpublic/repository_policy.go b/internal/service/ecrpublic/repository_policy.go index bfd2ee56e557..27a24e7f9944 100644 --- a/internal/service/ecrpublic/repository_policy.go +++ b/internal/service/ecrpublic/repository_policy.go @@ -81,7 +81,7 @@ func resourceRepositoryPolicyPut(ctx context.Context, d *schema.ResourceData, me } outputRaw, err := tfresource.RetryWhen(ctx, policyPutTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.SetRepositoryPolicy(ctx, input) }, func(err error) (bool, error) { From d0ad1b959e1c61df4c9a71d2f9e3c4662ea946ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:47 -0400 Subject: [PATCH 0806/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - ecs. --- internal/service/ecs/cluster_capacity_providers.go | 2 +- internal/service/ecs/service.go | 6 +++--- internal/service/ecs/task_set.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/ecs/cluster_capacity_providers.go b/internal/service/ecs/cluster_capacity_providers.go index a330ed0a5feb..c2fec8cac0b7 100644 --- a/internal/service/ecs/cluster_capacity_providers.go +++ b/internal/service/ecs/cluster_capacity_providers.go @@ -168,7 +168,7 @@ func retryClusterCapacityProvidersPut(ctx context.Context, conn *ecs.Client, inp timeout = 10 * time.Minute ) _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.PutClusterCapacityProviders(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index a4812019b7c8..35d95683b6d8 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1772,7 +1772,7 @@ func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any ) operationTime := time.Now().UTC() _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateService(ctx, &input) }, func(err error) (bool, error) { @@ -1843,7 +1843,7 @@ func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta any log.Printf("[DEBUG] Deleting ECS Service: %s", d.Id()) _, err = tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutDelete), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteService(ctx, &ecs.DeleteServiceInput{ Cluster: aws.String(cluster), Force: aws.Bool(forceDelete), @@ -1913,7 +1913,7 @@ func retryServiceCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create timeout = propagationTimeout + serviceCreateTimeout ) outputRaw, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateService(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/ecs/task_set.go b/internal/service/ecs/task_set.go index df28b21ccc56..99b8fd071b80 100644 --- a/internal/service/ecs/task_set.go +++ b/internal/service/ecs/task_set.go @@ -501,7 +501,7 @@ func retryTaskSetCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create timeout = propagationTimeout + taskSetCreateTimeout ) outputRaw, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateTaskSet(ctx, input) }, func(err error) (bool, error) { From facd96f80b02776fd0b1b751b28337b38b1f1722 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:47 -0400 Subject: [PATCH 0807/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - eks. --- internal/service/eks/addon.go | 2 +- internal/service/eks/cluster.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/eks/addon.go b/internal/service/eks/addon.go index 92f8c8484856..f48bfde08529 100644 --- a/internal/service/eks/addon.go +++ b/internal/service/eks/addon.go @@ -168,7 +168,7 @@ func resourceAddonCreate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateAddon(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index bd87d57b49eb..f7e1c6754fbb 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -563,7 +563,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta any } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateCluster(ctx, &input) }, func(err error) (bool, error) { From b644d4cf0be6ebcef507ee8d302e96c25999cbe1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:47 -0400 Subject: [PATCH 0808/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - elasticsearch. --- internal/service/elasticsearch/domain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticsearch/domain.go b/internal/service/elasticsearch/domain.go index 3e6afac48bfd..010e1dc5da85 100644 --- a/internal/service/elasticsearch/domain.go +++ b/internal/service/elasticsearch/domain.go @@ -653,7 +653,7 @@ func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateElasticsearchDomain(ctx, &input) }, func(err error) (bool, error) { From 41d8364ea7fa5b5074cbe5dd05f7cb6c583ca056 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:48 -0400 Subject: [PATCH 0809/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - elb. --- internal/service/elb/load_balancer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elb/load_balancer.go b/internal/service/elb/load_balancer.go index ccbe81e8b8c4..f3ab56515621 100644 --- a/internal/service/elb/load_balancer.go +++ b/internal/service/elb/load_balancer.go @@ -469,7 +469,7 @@ func resourceLoadBalancerUpdate(ctx context.Context, d *schema.ResourceData, met // Occasionally AWS will error with a 'duplicate listener', without any // other listeners on the ELB. Retry here to eliminate that. _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutUpdate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateLoadBalancerListeners(ctx, input) }, func(err error) (bool, error) { From 109b2ff6d52e93b1b8ffc1dc3dcfe88b990e046d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:48 -0400 Subject: [PATCH 0810/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - emr. --- internal/service/emr/cluster.go | 2 +- internal/service/emr/studio.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/emr/cluster.go b/internal/service/emr/cluster.go index 5912a100ba8e..b91bfe119dc2 100644 --- a/internal/service/emr/cluster.go +++ b/internal/service/emr/cluster.go @@ -1016,7 +1016,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta any } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RunJobFlow(ctx, &input) }, func(err error) (bool, error) { diff --git a/internal/service/emr/studio.go b/internal/service/emr/studio.go index 0d1140c9abb3..7205532a7a98 100644 --- a/internal/service/emr/studio.go +++ b/internal/service/emr/studio.go @@ -160,7 +160,7 @@ func resourceStudioCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateStudio(ctx, input) }, func(err error) (bool, error) { From 566bc1adc8f5877d895e322fbbedbf6dc9441866 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:49 -0400 Subject: [PATCH 0811/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - firehose. --- internal/service/firehose/delivery_stream.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/firehose/delivery_stream.go b/internal/service/firehose/delivery_stream.go index 0443e77dd5ea..bdddc5c784b1 100644 --- a/internal/service/firehose/delivery_stream.go +++ b/internal/service/firehose/delivery_stream.go @@ -1540,7 +1540,7 @@ func resourceDeliveryStreamCreate(ctx context.Context, d *schema.ResourceData, m } } - _, err := retryDeliveryStreamOp(ctx, func() (any, error) { + _, err := retryDeliveryStreamOp(ctx, func(ctx context.Context) (any, error) { return conn.CreateDeliveryStream(ctx, input) }) @@ -1736,7 +1736,7 @@ func resourceDeliveryStreamUpdate(ctx context.Context, d *schema.ResourceData, m } } - _, err := retryDeliveryStreamOp(ctx, func() (any, error) { + _, err := retryDeliveryStreamOp(ctx, func(ctx context.Context) (any, error) { return conn.UpdateDestination(ctx, input) }) @@ -1808,7 +1808,7 @@ func resourceDeliveryStreamDelete(ctx context.Context, d *schema.ResourceData, m return diags } -func retryDeliveryStreamOp(ctx context.Context, f func() (any, error)) (any, error) { +func retryDeliveryStreamOp(ctx context.Context, f func(context.Context) (any, error)) (any, error) { return tfresource.RetryWhen(ctx, propagationTimeout, f, func(err error) (bool, error) { From eb5dfd174b4029283eac4353144699c50dbaa860 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:49 -0400 Subject: [PATCH 0812/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - gamelift. --- internal/service/gamelift/build.go | 2 +- internal/service/gamelift/script.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/gamelift/build.go b/internal/service/gamelift/build.go index dacd4da3a329..18d8a2869f25 100644 --- a/internal/service/gamelift/build.go +++ b/internal/service/gamelift/build.go @@ -113,7 +113,7 @@ func resourceBuildCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateBuild(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/gamelift/script.go b/internal/service/gamelift/script.go index c6d3480d7c80..6548d9c3a63c 100644 --- a/internal/service/gamelift/script.go +++ b/internal/service/gamelift/script.go @@ -125,7 +125,7 @@ func resourceScriptCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateScript(ctx, input) }, func(err error) (bool, error) { From dba99f26698c756574511bf28109eb059f22b441 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:51 -0400 Subject: [PATCH 0813/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - iam. --- internal/service/iam/instance_profile.go | 2 +- internal/service/iam/role.go | 4 ++-- internal/service/iam/user.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/iam/instance_profile.go b/internal/service/iam/instance_profile.go index 89f4d4753009..9f62591e4a6a 100644 --- a/internal/service/iam/instance_profile.go +++ b/internal/service/iam/instance_profile.go @@ -274,7 +274,7 @@ func instanceProfileAddRole(ctx context.Context, conn *iam.Client, profileName, } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.AddRoleToInstanceProfile(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/iam/role.go b/internal/service/iam/role.go index 6dc2e073ffb7..66887151464a 100644 --- a/internal/service/iam/role.go +++ b/internal/service/iam/role.go @@ -375,7 +375,7 @@ func resourceRoleUpdate(ctx context.Context, d *schema.ResourceData, meta any) d } _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateAssumeRolePolicy(ctx, input) }, func(err error) (bool, error) { @@ -609,7 +609,7 @@ func deleteRoleInstanceProfiles(ctx context.Context, conn *iam.Client, roleName func retryCreateRole(ctx context.Context, conn *iam.Client, input *iam.CreateRoleInput) (*iam.CreateRoleOutput, error) { outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateRole(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/iam/user.go b/internal/service/iam/user.go index 5347db8c3119..cfbff910ab25 100644 --- a/internal/service/iam/user.go +++ b/internal/service/iam/user.go @@ -617,7 +617,7 @@ func userTags(ctx context.Context, conn *iam.Client, identifier string, optFns . func retryCreateUser(ctx context.Context, conn *iam.Client, input *iam.CreateUserInput) (*iam.CreateUserOutput, error) { outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateUser(ctx, input) }, func(err error) (bool, error) { From ae6037a9ea64b93f31ca49989b89464cdad8be00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:51 -0400 Subject: [PATCH 0814/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - imagebuilder. --- internal/service/imagebuilder/infrastructure_configuration.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/imagebuilder/infrastructure_configuration.go b/internal/service/imagebuilder/infrastructure_configuration.go index 2297d8d576fa..4e1425ad2700 100644 --- a/internal/service/imagebuilder/infrastructure_configuration.go +++ b/internal/service/imagebuilder/infrastructure_configuration.go @@ -246,7 +246,7 @@ func resourceInfrastructureConfigurationCreate(ctx context.Context, d *schema.Re } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateInfrastructureConfiguration(ctx, input) }, func(err error) (bool, error) { @@ -391,7 +391,7 @@ func resourceInfrastructureConfigurationUpdate(ctx context.Context, d *schema.Re } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateInfrastructureConfiguration(ctx, input) }, func(err error) (bool, error) { From 3932798d23041abe0e8cb197ad98f386f1763b18 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:52 -0400 Subject: [PATCH 0815/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - kendra. --- internal/service/kendra/data_source.go | 4 ++-- internal/service/kendra/faq.go | 2 +- internal/service/kendra/index.go | 4 ++-- internal/service/kendra/query_suggestions_block_list.go | 4 ++-- internal/service/kendra/thesaurus.go | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index fa0b8aa4f5db..64c720767db8 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -648,7 +648,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateDataSource(ctx, input) }, func(err error) (bool, error) { @@ -792,7 +792,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta log.Printf("[DEBUG] Updating Kendra Data Source (%s): %#v", d.Id(), input) _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateDataSource(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/kendra/faq.go b/internal/service/kendra/faq.go index 508b0d059d1a..d24e200ca6ff 100644 --- a/internal/service/kendra/faq.go +++ b/internal/service/kendra/faq.go @@ -177,7 +177,7 @@ func resourceFaqCreate(ctx context.Context, d *schema.ResourceData, meta any) di } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateFaq(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go index 89b1b34b9e72..2019438356b7 100644 --- a/internal/service/kendra/index.go +++ b/internal/service/kendra/index.go @@ -417,7 +417,7 @@ func resourceIndexCreate(ctx context.Context, d *schema.ResourceData, meta any) } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateIndex(ctx, input) }, func(err error) (bool, error) { @@ -567,7 +567,7 @@ func resourceIndexUpdate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateIndex(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/kendra/query_suggestions_block_list.go b/internal/service/kendra/query_suggestions_block_list.go index 8d9dab71ec89..2b2604b5d640 100644 --- a/internal/service/kendra/query_suggestions_block_list.go +++ b/internal/service/kendra/query_suggestions_block_list.go @@ -120,7 +120,7 @@ func resourceQuerySuggestionsBlockListCreate(ctx context.Context, d *schema.Reso } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateQuerySuggestionsBlockList(ctx, in) }, func(err error) (bool, error) { @@ -235,7 +235,7 @@ func resourceQuerySuggestionsBlockListUpdate(ctx context.Context, d *schema.Reso log.Printf("[DEBUG] Updating Kendra QuerySuggestionsBlockList (%s): %#v", d.Id(), input) _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateQuerySuggestionsBlockList(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/kendra/thesaurus.go b/internal/service/kendra/thesaurus.go index de18fdcfbaa6..8399a6f60a9c 100644 --- a/internal/service/kendra/thesaurus.go +++ b/internal/service/kendra/thesaurus.go @@ -120,7 +120,7 @@ func resourceThesaurusCreate(ctx context.Context, d *schema.ResourceData, meta a } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateThesaurus(ctx, input) }, func(err error) (bool, error) { @@ -236,7 +236,7 @@ func resourceThesaurusUpdate(ctx context.Context, d *schema.ResourceData, meta a log.Printf("[DEBUG] Updating Kendra Thesaurus (%s): %#v", d.Id(), input) _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateThesaurus(ctx, input) }, func(err error) (bool, error) { From d1ec472e17e9d858df86e27008470b584a5e62c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:53 -0400 Subject: [PATCH 0816/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - kinesisanalyticsv2. --- internal/service/kinesisanalyticsv2/application.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/kinesisanalyticsv2/application.go b/internal/service/kinesisanalyticsv2/application.go index a079d00c1495..bcb729276be4 100644 --- a/internal/service/kinesisanalyticsv2/application.go +++ b/internal/service/kinesisanalyticsv2/application.go @@ -1740,7 +1740,7 @@ func waitApplicationOperationSucceeded(ctx context.Context, conn *kinesisanalyti func waitIAMPropagation[T any](ctx context.Context, f func() (*T, error)) (*T, error) { outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return f() }, func(err error) (bool, error) { From 17c058dcc0dd42eafe8ddac400d99ab956cdf279 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:53 -0400 Subject: [PATCH 0817/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - lambda. --- internal/service/lambda/event_source_mapping.go | 2 +- internal/service/lambda/function.go | 4 ++-- internal/service/lambda/function_event_invoke_config.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/lambda/event_source_mapping.go b/internal/service/lambda/event_source_mapping.go index a95491e38856..47abd4561fb5 100644 --- a/internal/service/lambda/event_source_mapping.go +++ b/internal/service/lambda/event_source_mapping.go @@ -848,7 +848,7 @@ type eventSourceMappingCU interface { func retryEventSourceMapping[T eventSourceMappingCU](ctx context.Context, f func() (*T, error)) (*T, error) { outputRaw, err := tfresource.RetryWhen(ctx, lambdaPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return f() }, func(err error) (bool, error) { diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 468c1a3fb89c..74422a7b53de 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1403,7 +1403,7 @@ type functionCU interface { func retryFunctionOp[T functionCU](ctx context.Context, f func() (*T, error)) (*T, error) { output, err := tfresource.RetryWhen(ctx, lambdaPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return f() }, func(err error) (bool, error) { @@ -1435,7 +1435,7 @@ func retryFunctionOp[T functionCU](ctx context.Context, f func() (*T, error)) (* functionExtraThrottlingTimeout = 9 * time.Minute ) output, err = tfresource.RetryWhen(ctx, functionExtraThrottlingTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return f() }, func(err error) (bool, error) { diff --git a/internal/service/lambda/function_event_invoke_config.go b/internal/service/lambda/function_event_invoke_config.go index a0b7e44fcac5..3f27c391a99b 100644 --- a/internal/service/lambda/function_event_invoke_config.go +++ b/internal/service/lambda/function_event_invoke_config.go @@ -128,7 +128,7 @@ func resourceFunctionEventInvokeConfigCreate(ctx context.Context, d *schema.Reso // Retry for destination validation eventual consistency errors. _, err := tfresource.RetryWhen(ctx, iamPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.PutFunctionEventInvokeConfig(ctx, input) }, func(err error) (bool, error) { @@ -212,7 +212,7 @@ func resourceFunctionEventInvokeConfigUpdate(ctx context.Context, d *schema.Reso // Retry for destination validation eventual consistency errors. _, err = tfresource.RetryWhen(ctx, iamPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.PutFunctionEventInvokeConfig(ctx, input) }, func(err error) (bool, error) { From 49781ac01120f20ebc7199ece35b9cb8aaa4c91d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:54 -0400 Subject: [PATCH 0818/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - logs. --- internal/service/logs/subscription_filter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/logs/subscription_filter.go b/internal/service/logs/subscription_filter.go index d4632c453cc9..8485d130201a 100644 --- a/internal/service/logs/subscription_filter.go +++ b/internal/service/logs/subscription_filter.go @@ -105,7 +105,7 @@ func resourceSubscriptionFilterPut(ctx context.Context, d *schema.ResourceData, timeout = 5 * time.Minute ) _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.PutSubscriptionFilter(ctx, input) }, func(err error) (bool, error) { From 323225ac7ab38fca55e5e0dfdfbf151ae446eee0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:55 -0400 Subject: [PATCH 0819/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - medialive. --- internal/service/medialive/input.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/medialive/input.go b/internal/service/medialive/input.go index b1d02739b701..60fbc02fbe50 100644 --- a/internal/service/medialive/input.go +++ b/internal/service/medialive/input.go @@ -226,7 +226,7 @@ func resourceInputCreate(ctx context.Context, d *schema.ResourceData, meta any) // IAM propagation outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateInput(ctx, in) }, func(err error) (bool, error) { @@ -323,7 +323,7 @@ func resourceInputUpdate(ctx context.Context, d *schema.ResourceData, meta any) } rawOutput, err := tfresource.RetryWhen(ctx, 2*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateInput(ctx, in) }, func(err error) (bool, error) { From d29ca6536f115f824ad1e829896eda6ffd20f8c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:56 -0400 Subject: [PATCH 0820/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - neptune. --- internal/service/neptune/cluster.go | 2 +- internal/service/neptune/global_cluster.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/neptune/cluster.go b/internal/service/neptune/cluster.go index aa151de68710..0e6ef2e0d1f3 100644 --- a/internal/service/neptune/cluster.go +++ b/internal/service/neptune/cluster.go @@ -711,7 +711,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any } _, err := tfresource.RetryWhen(ctx, 5*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/neptune/global_cluster.go b/internal/service/neptune/global_cluster.go index 9e3b811ced43..17d530046eaf 100644 --- a/internal/service/neptune/global_cluster.go +++ b/internal/service/neptune/global_cluster.go @@ -313,7 +313,7 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, conn *neptune.C GlobalClusterIdentifier: aws.String(globalClusterID), } _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyGlobalCluster(ctx, input) }, func(err error) (bool, error) { @@ -397,7 +397,7 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, conn *neptune.C EngineVersion: aws.String(engineVersion), } _, err = tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, input, optFn) }, func(err error) (bool, error) { @@ -448,7 +448,7 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, conn *neptune.C EngineVersion: aws.String(engineVersion), } _, err = tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, input, optFn) }, func(err error) (bool, error) { From 9d90d4e5253138d8af3532719b1830ba15f583d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:57 -0400 Subject: [PATCH 0821/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - networkmanager. --- internal/service/networkmanager/connect_attachment.go | 2 +- internal/service/networkmanager/connect_peer.go | 2 +- internal/service/networkmanager/customer_gateway_association.go | 2 +- internal/service/networkmanager/global_network.go | 2 +- internal/service/networkmanager/site.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/networkmanager/connect_attachment.go b/internal/service/networkmanager/connect_attachment.go index 6f19263e524a..73183a8796cb 100644 --- a/internal/service/networkmanager/connect_attachment.go +++ b/internal/service/networkmanager/connect_attachment.go @@ -152,7 +152,7 @@ func resourceConnectAttachmentCreate(ctx context.Context, d *schema.ResourceData } outputRaw, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutCreate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateConnectAttachment(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/networkmanager/connect_peer.go b/internal/service/networkmanager/connect_peer.go index a70833bbb619..35c9be5dd2cb 100644 --- a/internal/service/networkmanager/connect_peer.go +++ b/internal/service/networkmanager/connect_peer.go @@ -217,7 +217,7 @@ func resourceConnectPeerCreate(ctx context.Context, d *schema.ResourceData, meta } outputRaw, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutCreate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateConnectPeer(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/networkmanager/customer_gateway_association.go b/internal/service/networkmanager/customer_gateway_association.go index b1885b013f9c..2647260fc194 100644 --- a/internal/service/networkmanager/customer_gateway_association.go +++ b/internal/service/networkmanager/customer_gateway_association.go @@ -86,7 +86,7 @@ func resourceCustomerGatewayAssociationCreate(ctx context.Context, d *schema.Res log.Printf("[DEBUG] Creating Network Manager Customer Gateway Association: %#v", input) _, err := tfresource.RetryWhen(ctx, customerGatewayAssociationResourceNotFoundExceptionTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.AssociateCustomerGateway(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/networkmanager/global_network.go b/internal/service/networkmanager/global_network.go index 4afbf61bc39f..0da65835881f 100644 --- a/internal/service/networkmanager/global_network.go +++ b/internal/service/networkmanager/global_network.go @@ -160,7 +160,7 @@ func resourceGlobalNetworkDelete(ctx context.Context, d *schema.ResourceData, me log.Printf("[DEBUG] Deleting Network Manager Global Network: %s", d.Id()) _, err := tfresource.RetryWhen(ctx, globalNetworkValidationExceptionTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteGlobalNetwork(ctx, &networkmanager.DeleteGlobalNetworkInput{ GlobalNetworkId: aws.String(d.Id()), }) diff --git a/internal/service/networkmanager/site.go b/internal/service/networkmanager/site.go index 95a1f2451351..48a36374df70 100644 --- a/internal/service/networkmanager/site.go +++ b/internal/service/networkmanager/site.go @@ -222,7 +222,7 @@ func resourceSiteDelete(ctx context.Context, d *schema.ResourceData, meta any) d log.Printf("[DEBUG] Deleting Network Manager Site: %s", d.Id()) _, err := tfresource.RetryWhen(ctx, siteValidationExceptionTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteSite(ctx, &networkmanager.DeleteSiteInput{ GlobalNetworkId: aws.String(globalNetworkID), SiteId: aws.String(d.Id()), From 7889d608718cf2c0a039cf9c197b2d81f075ff1e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:16:58 -0400 Subject: [PATCH 0822/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - opensearch. --- internal/service/opensearch/domain.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/opensearch/domain.go b/internal/service/opensearch/domain.go index a980e4df5a9b..f60de1838c7a 100644 --- a/internal/service/opensearch/domain.go +++ b/internal/service/opensearch/domain.go @@ -826,7 +826,7 @@ func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, meta any) // IAM Roles can take some time to propagate if set in AccessPolicies and created in the same terraform outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateDomain(ctx, &input) }, domainErrorRetryable, @@ -849,7 +849,7 @@ func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateDomainConfig(ctx, &input) }, domainErrorRetryable, @@ -1167,7 +1167,7 @@ func resourceDomainUpdate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateDomainConfig(ctx, &input) }, domainErrorRetryable, From 8b56bf6af29f3f17434ecbe1b1bc5772391b5700 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:00 -0400 Subject: [PATCH 0823/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - quicksight. --- internal/service/quicksight/data_source.go | 4 ++-- internal/service/quicksight/vpc_connection.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/quicksight/data_source.go b/internal/service/quicksight/data_source.go index 3778965d4d57..7df8bfdaaae3 100644 --- a/internal/service/quicksight/data_source.go +++ b/internal/service/quicksight/data_source.go @@ -126,7 +126,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateDataSource(ctx, input) }, func(err error) (bool, error) { @@ -239,7 +239,7 @@ func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateDataSource(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go index c5dab0a81ce0..11e7610ea0eb 100644 --- a/internal/service/quicksight/vpc_connection.go +++ b/internal/service/quicksight/vpc_connection.go @@ -421,7 +421,7 @@ func findVPCConnection(ctx context.Context, conn *quicksight.Client, input *quic func retryVPCConnectionCreate(ctx context.Context, conn *quicksight.Client, in *quicksight.CreateVPCConnectionInput) (*quicksight.CreateVPCConnectionOutput, error) { outputRaw, err := tfresource.RetryWhen(ctx, iamPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateVPCConnection(ctx, in) }, func(err error) (bool, error) { From ad72b37e378bd62a48a51e323dbfeaa1018d39ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:00 -0400 Subject: [PATCH 0824/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - rds. --- internal/service/rds/blue_green.go | 2 +- internal/service/rds/cluster.go | 8 ++++---- internal/service/rds/global_cluster.go | 4 ++-- internal/service/rds/instance.go | 14 +++++++------- internal/service/rds/instance_test.go | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/service/rds/blue_green.go b/internal/service/rds/blue_green.go index 275f6cf19e66..049ffd5e5ff3 100644 --- a/internal/service/rds/blue_green.go +++ b/internal/service/rds/blue_green.go @@ -68,7 +68,7 @@ func (o *blueGreenOrchestrator) Switchover(ctx context.Context, identifier strin BlueGreenDeploymentIdentifier: aws.String(identifier), } _, err := tfresource.RetryWhen(ctx, 10*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return o.conn.SwitchoverBlueGreenDeployment(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index 7063c0ceba26..b340e72143b0 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -980,7 +980,7 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta any } _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RestoreDBClusterFromS3(ctx, input) }, func(err error) (bool, error) { @@ -1781,7 +1781,7 @@ func resourceClusterUpdate(ctx context.Context, d *schema.ResourceData, meta any timeout = 5 * time.Minute ) _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, input) }, func(err error) (bool, error) { @@ -1905,14 +1905,14 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any timeout = 2 * time.Minute ) _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteDBCluster(ctx, input) }, func(err error) (bool, error) { if tfawserr.ErrMessageContains(err, errCodeInvalidParameterCombination, "disable deletion pro") { if v, ok := d.GetOk(names.AttrDeletionProtection); (!ok || !v.(bool)) && d.Get(names.AttrApplyImmediately).(bool) { _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutDelete), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, &rds.ModifyDBClusterInput{ ApplyImmediately: aws.Bool(true), DBClusterIdentifier: aws.String(d.Id()), diff --git a/internal/service/rds/global_cluster.go b/internal/service/rds/global_cluster.go index 3d9cd336aeb8..ffc9957fea55 100644 --- a/internal/service/rds/global_cluster.go +++ b/internal/service/rds/global_cluster.go @@ -582,7 +582,7 @@ func globalClusterUpgradeMajorEngineVersion(ctx context.Context, conn *rds.Clien } _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyGlobalCluster(ctx, input) }, func(err error) (bool, error) { @@ -679,7 +679,7 @@ func globalClusterUpgradeMinorEngineVersion(ctx context.Context, conn *rds.Clien log.Printf("[INFO] Performing RDS Global Cluster (%s) Cluster (%s) minor version (%s) upgrade", globalClusterID, clusterID, engineVersion) _, err = tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBCluster(ctx, input, optFn) }, func(err error) (bool, error) { diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index dc5347e37a55..971352a519da 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -1159,7 +1159,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta an } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RestoreDBInstanceFromS3(ctx, input) }, func(err error) (bool, error) { @@ -1414,7 +1414,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta an } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RestoreDBInstanceFromDBSnapshot(ctx, input) }, func(err error) (bool, error) { @@ -1630,7 +1630,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta an } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.RestoreDBInstanceToPointInTime(ctx, input) }, func(err error) (bool, error) { @@ -1850,7 +1850,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta an } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateDBInstance(ctx, input) }, func(err error) (bool, error) { @@ -2265,7 +2265,7 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, meta an timeout = 5 * time.Minute ) _, err = tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteDBInstance(ctx, input) }, func(err error) (bool, error) { @@ -2370,7 +2370,7 @@ func resourceInstanceDelete(ctx context.Context, d *schema.ResourceData, meta an if tfawserr.ErrMessageContains(err, errCodeInvalidParameterCombination, "disable deletion pro") { if v, ok := d.GetOk(names.AttrDeletionProtection); (!ok || !v.(bool)) && d.Get(names.AttrApplyImmediately).(bool) { _, ierr := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutUpdate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBInstance(ctx, &rds.ModifyDBInstanceInput{ ApplyImmediately: aws.Bool(true), DBInstanceIdentifier: aws.String(d.Get(names.AttrIdentifier).(string)), @@ -2705,7 +2705,7 @@ func dbInstancePopulateModify(input *rds.ModifyDBInstanceInput, d *schema.Resour func dbInstanceModify(ctx context.Context, conn *rds.Client, resourceID string, input *rds.ModifyDBInstanceInput, timeout time.Duration) error { _, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.ModifyDBInstance(ctx, input) }, func(err error) (bool, error) { diff --git a/internal/service/rds/instance_test.go b/internal/service/rds/instance_test.go index a4966d38e087..f6f189647488 100644 --- a/internal/service/rds/instance_test.go +++ b/internal/service/rds/instance_test.go @@ -7093,7 +7093,7 @@ func TestAccRDSInstance_BlueGreenDeployment_outOfBand(t *testing.T) { SkipFinalSnapshot: aws.Bool(true), } _, err = tfresource.RetryWhen(ctx, 5*time.Minute, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.DeleteDBInstance(ctx, deleteInput) }, func(err error) (bool, error) { From 99d07458b7175523577c51f38f0209d9d3beb1d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:00 -0400 Subject: [PATCH 0825/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - redshift. --- internal/service/redshift/scheduled_action.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/redshift/scheduled_action.go b/internal/service/redshift/scheduled_action.go index 87f2bc9a8c94..1577a2f2c20c 100644 --- a/internal/service/redshift/scheduled_action.go +++ b/internal/service/redshift/scheduled_action.go @@ -184,7 +184,7 @@ func resourceScheduledActionCreate(ctx context.Context, d *schema.ResourceData, log.Printf("[DEBUG] Creating Redshift Scheduled Action: %#v", input) outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateScheduledAction(ctx, input) }, func(err error) (bool, error) { From a028e4cb11dc88bfe5898084daa1d003e329620d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:01 -0400 Subject: [PATCH 0826/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - redshiftserverless. --- internal/service/redshiftserverless/workgroup.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/redshiftserverless/workgroup.go b/internal/service/redshiftserverless/workgroup.go index c5da4b973bee..8e19c57ea6e7 100644 --- a/internal/service/redshiftserverless/workgroup.go +++ b/internal/service/redshiftserverless/workgroup.go @@ -545,7 +545,7 @@ func updateWorkgroup(ctx context.Context, conn *redshiftserverless.Client, input retryTimeout = 20 * time.Minute ) _, err := tfresource.RetryWhen(ctx, retryTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateWorkgroup(ctx, input) }, func(err error) (bool, error) { if errs.IsAErrorMessageContains[*awstypes.ConflictException](err, "operation running") { From b0d538be671df09485b2e1237024b00db830f206 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:03 -0400 Subject: [PATCH 0827/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - s3. --- internal/service/s3/bucket.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/s3/bucket.go b/internal/service/s3/bucket.go index 05351829e78c..f9f031052d0d 100644 --- a/internal/service/s3/bucket.go +++ b/internal/service/s3/bucket.go @@ -1483,7 +1483,7 @@ func resourceBucketUpdate(ctx context.Context, d *schema.ResourceData, meta any) } _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutUpdate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.PutBucketReplication(ctx, input) }, func(err error) (bool, error) { From 8efe541d0cbf9f96f875da8a72bfbb06e62d6448 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:03 -0400 Subject: [PATCH 0828/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - scheduler. --- internal/service/scheduler/retry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/scheduler/retry.go b/internal/service/scheduler/retry.go index 4694b4da7e1f..2f1493ab0d64 100644 --- a/internal/service/scheduler/retry.go +++ b/internal/service/scheduler/retry.go @@ -20,7 +20,7 @@ func retryWhenIAMNotPropagated[T any](ctx context.Context, f func() (T, error)) v, err := tfresource.RetryWhen( ctx, iamPropagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return f() }, func(err error) (bool, error) { From d52bb6a6dde314985c83139f418a331d13496281 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:04 -0400 Subject: [PATCH 0829/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - secretsmanager. --- internal/service/secretsmanager/secret.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 70e53cbf1709..9359447b925c 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -174,7 +174,7 @@ func resourceSecretCreate(ctx context.Context, d *schema.ResourceData, meta any) // Retry for secret recreation after deletion. outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateSecret(ctx, input) }, func(err error) (bool, error) { From 7fdab4cd94c4aca870c31908f08d81c85663bcc9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:05 -0400 Subject: [PATCH 0830/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - ses. --- internal/service/ses/receipt_rule.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ses/receipt_rule.go b/internal/service/ses/receipt_rule.go index a26cdcd01b63..0b563d070b74 100644 --- a/internal/service/ses/receipt_rule.go +++ b/internal/service/ses/receipt_rule.go @@ -296,7 +296,7 @@ func resourceReceiptRuleCreate(ctx context.Context, d *schema.ResourceData, meta } _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutCreate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateReceiptRule(ctx, input) }, func(err error) (bool, error) { @@ -498,7 +498,7 @@ func resourceReceiptRuleUpdate(ctx context.Context, d *schema.ResourceData, meta } _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutUpdate), - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateReceiptRule(ctx, input) }, func(err error) (bool, error) { From 0a64329b5ca4d5283916dc39e9f69566039cb2dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:05 -0400 Subject: [PATCH 0831/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - sesv2. --- internal/service/sesv2/configuration_set_event_destination.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/sesv2/configuration_set_event_destination.go b/internal/service/sesv2/configuration_set_event_destination.go index da7beecf99f5..b737268b4818 100644 --- a/internal/service/sesv2/configuration_set_event_destination.go +++ b/internal/service/sesv2/configuration_set_event_destination.go @@ -223,7 +223,7 @@ func resourceConfigurationSetEventDestinationCreate(ctx context.Context, d *sche configurationSetEventDestinationID := configurationSetEventDestinationCreateResourceID(d.Get("configuration_set_name").(string), d.Get("event_destination_name").(string)) out, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateConfigurationSetEventDestination(ctx, in) }, func(err error) (bool, error) { @@ -297,7 +297,7 @@ func resourceConfigurationSetEventDestinationUpdate(ctx context.Context, d *sche log.Printf("[DEBUG] Updating SESV2 ConfigurationSetEventDestination (%s): %#v", d.Id(), in) _, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.UpdateConfigurationSetEventDestination(ctx, in) }, func(err error) (bool, error) { From 7b2424f8dce460232c8ed81800e996dec20338fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:05 -0400 Subject: [PATCH 0832/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - signer. --- internal/service/signer/signing_profile_permission.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/signer/signing_profile_permission.go b/internal/service/signer/signing_profile_permission.go index f3c65d8eff9e..18d237cd5533 100644 --- a/internal/service/signer/signing_profile_permission.go +++ b/internal/service/signer/signing_profile_permission.go @@ -121,7 +121,7 @@ func resourceSigningProfilePermissionCreate(ctx context.Context, d *schema.Resou } _, err = tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.AddProfilePermission(ctx, input) }, func(err error) (bool, error) { From ef200708c7469d5e2e0748c240d35fda0eb5715e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:06 -0400 Subject: [PATCH 0833/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - ssm. --- internal/service/ssm/parameter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go index 9dfb3a891729..a53c1a11d480 100644 --- a/internal/service/ssm/parameter.go +++ b/internal/service/ssm/parameter.go @@ -268,7 +268,7 @@ func resourceParameterRead(ctx context.Context, d *schema.ResourceData, meta any timeout = 2 * time.Minute ) outputRaw, err := tfresource.RetryWhen(ctx, timeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return findParameterByName(ctx, conn, d.Id(), true) }, func(err error) (bool, error) { From eabeb5c536111fe19c8633ed62ccc9cae140f526 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:07 -0400 Subject: [PATCH 0834/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - synthetics. --- internal/service/synthetics/canary.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index b4b3913c4aa7..1fc04d59b8e6 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -336,7 +336,7 @@ func resourceCanaryCreate(ctx context.Context, d *schema.ResourceData, meta any) iamwaiterStopTime := time.Now().Add(propagationTimeout) _, err = tfresource.RetryWhen(ctx, propagationTimeout+canaryCreatedTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return retryCreateCanary(ctx, conn, d, input) }, func(err error) (bool, error) { From 339a86a166bfea07d1c122ec8fe434a31136f003 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:17:08 -0400 Subject: [PATCH 0835/2115] Add 'context.Context' arg to function called by 'tfresource.RetryWhen' - transcribe. --- internal/service/transcribe/language_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/transcribe/language_model.go b/internal/service/transcribe/language_model.go index f7cd556e3ffb..feb01d3eea8f 100644 --- a/internal/service/transcribe/language_model.go +++ b/internal/service/transcribe/language_model.go @@ -122,7 +122,7 @@ func resourceLanguageModelCreate(ctx context.Context, d *schema.ResourceData, me } outputRaw, err := tfresource.RetryWhen(ctx, propagationTimeout, - func() (any, error) { + func(ctx context.Context) (any, error) { return conn.CreateLanguageModel(ctx, in) }, func(err error) (bool, error) { From 48293026e778ecd384d403ba36272c62f04505ac Mon Sep 17 00:00:00 2001 From: Kishan Gajjar Date: Mon, 25 Aug 2025 10:09:36 -0400 Subject: [PATCH 0836/2115] changes to rollback goroutine wait pattern --- internal/service/ecs/service.go | 143 +++++++++++++++----------------- 1 file changed, 68 insertions(+), 75 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index b8a998cbd054..38b0488f69c5 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -12,6 +12,7 @@ import ( "slices" "strconv" "strings" + "sync" "time" "github.com/YakDriver/regexache" @@ -2113,7 +2114,11 @@ func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNa } } -func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, primaryDeploymentArn **string, operationTime time.Time, primaryTaskSet **awstypes.Deployment, isNewECSDeployment *bool) retry.StateRefreshFunc { +func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, sigintConfig *rollbackState, operationTime time.Time) retry.StateRefreshFunc { + var primaryTaskSet *awstypes.Deployment + var primaryDeploymentArn *string + var isNewPrimaryDeployment bool + return func() (any, string, error) { outputRaw, serviceStatus, err := statusService(ctx, conn, serviceName, clusterNameOrARN)() if err != nil { @@ -2126,36 +2131,41 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa output := outputRaw.(*awstypes.Service) - if *primaryTaskSet == nil { - *primaryTaskSet = findPrimaryTaskSet(output.Deployments) - - var isNewPrimaryDeployment bool + if primaryTaskSet == nil { + primaryTaskSet = findPrimaryTaskSet(output.Deployments) - if *primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { + if primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() isNewPrimaryDeployment = createdAtUTC.After(operationTime) } - *isNewECSDeployment = output.DeploymentController != nil && - output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && - isNewPrimaryDeployment } + isNewECSDeployment := output.DeploymentController != nil && + output.DeploymentController.Type == awstypes.DeploymentControllerTypeEcs && + isNewPrimaryDeployment + // For new deployments with ECS deployment controller, check the deployment status - if *isNewECSDeployment { - if *primaryDeploymentArn == nil { + if isNewECSDeployment { + if primaryDeploymentArn == nil { serviceArn := aws.ToString(output.ServiceArn) var err error - *primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, *primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) + primaryDeploymentArn, err = findPrimaryDeploymentARN(ctx, conn, primaryTaskSet, serviceArn, clusterNameOrARN, operationTime) if err != nil { return nil, "", err } - if *primaryDeploymentArn == nil { + if primaryDeploymentArn == nil { return output, serviceStatusPending, nil } } - deploymentStatus, err := findDeploymentStatus(ctx, conn, **primaryDeploymentArn) + if sigintConfig.rollbackRequested && !sigintConfig.rollbackRoutineStarted { + sigintConfig.waitGroup.Add(1) + go rollbackRoutine(ctx, conn, sigintConfig, primaryDeploymentArn) + sigintConfig.rollbackRoutineStarted = true + } + + deploymentStatus, err := findDeploymentStatus(ctx, conn, *primaryDeploymentArn) if err != nil { return nil, "", err } @@ -2246,19 +2256,34 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } } -func waitForCancellation(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn **string, operationTime time.Time) { - <-ctx.Done() - log.Printf("[INFO] Detected cancellation. Initiating rollback for deployment.") - newCtx := context.Background() - err := rollbackBlueGreenDeployment(newCtx, conn, clusterName, serviceName, *primaryDeploymentArn, operationTime) - if err != nil { - log.Printf("[ERROR] Failed to rollback deployment: %s", err) - } else { - log.Printf("[INFO] Blue/green deployment cancelled and rolled back successfully.") +type rollbackState struct { + rollbackRequested bool + rollbackRoutineStarted bool + rollbackRoutineStopped chan struct{} + waitGroup sync.WaitGroup +} + +func rollbackRoutine(ctx context.Context, conn *ecs.Client, rollbackState *rollbackState, primaryDeploymentArn *string) { + defer rollbackState.waitGroup.Done() + + select { + case <-ctx.Done(): + log.Printf("[INFO] SIGINT detected. Initiating rollback for deployment: %s", *primaryDeploymentArn) + cancelContext, cancelFunc := context.WithTimeout(context.Background(), (1 * time.Hour)) // Maximum time before SIGKILL + defer cancelFunc() + + if err := rollbackBlueGreenDeployment(cancelContext, conn, primaryDeploymentArn); err != nil { + log.Printf("[ERROR] Failed to rollback deployment: %s. Err: %s", *primaryDeploymentArn, err) + } else { + log.Printf("[INFO] Blue/green deployment: %s rolled back successfully.", *primaryDeploymentArn) + } + + case <-rollbackState.rollbackRoutineStopped: + return } } -func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterName, serviceName string, primaryDeploymentArn *string, operationTime time.Time) error { +func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, primaryDeploymentArn *string) error { // Check if deployment is already in terminal state, meaning rollback is not needed deploymentStatus, err := findDeploymentStatus(ctx, conn, *primaryDeploymentArn) if err != nil { @@ -2280,21 +2305,20 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, clusterN return err } - err = waitForDeploymentTerminalStatus(ctx, conn, *primaryDeploymentArn) - if err != nil { - return err - } - - return nil + return waitForDeploymentTerminalStatus(ctx, conn, *primaryDeploymentArn) } func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, primaryDeploymentArn string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{string(awstypes.ServiceDeploymentStatusInProgress), string(awstypes.ServiceDeploymentStatusPending)}, - Target: deploymentTerminalStates, - Refresh: func() (interface{}, string, error) { + Pending: []string{ + string(awstypes.ServiceDeploymentStatusPending), + string(awstypes.ServiceDeploymentStatusInProgress), + string(awstypes.ServiceDeploymentStatusRollbackRequested), + string(awstypes.ServiceDeploymentStatusRollbackInProgress), + }, + Target: deploymentTerminalStates, + Refresh: func() (any, string, error) { status, err := findDeploymentStatus(ctx, conn, primaryDeploymentArn) - return nil, status, err }, Timeout: 1 * time.Hour, // Maximum time before SIGKILL @@ -2306,27 +2330,26 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, prim // waitServiceStable waits for an ECS Service to reach the status "ACTIVE" and have all desired tasks running. // Does not return tags. -func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { - deployment := &deploymentState{ - primaryDeploymentArn: new(*string), +func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { //nolint:unparam + sigintConfig := &rollbackState{ + rollbackRequested: sigintCancellation, + rollbackRoutineStarted: false, + rollbackRoutineStopped: make(chan struct{}), + waitGroup: sync.WaitGroup{}, } - cancellation := &cancellationState{} - stateConf := &retry.StateChangeConf{ Pending: []string{serviceStatusInactive, serviceStatusDraining, serviceStatusPending}, Target: []string{serviceStatusStable}, - Refresh: func() (any, string, error) { - return refreshStatusAndHandleCancellation(ctx, conn, serviceName, clusterNameOrARN, operationTime, sigintCancellation, deployment, cancellation) - }, + Refresh: statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, sigintConfig, operationTime), Timeout: timeout, } outputRaw, err := stateConf.WaitForStateContext(ctx) - if cancellation.goroutineStarted { - cancellation.cancelFunc() - <-cancellation.done + if sigintConfig.rollbackRoutineStarted { + close(sigintConfig.rollbackRoutineStopped) + sigintConfig.waitGroup.Wait() } if output, ok := outputRaw.(*awstypes.Service); ok { @@ -2336,36 +2359,6 @@ func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clust return nil, err } -type deploymentState struct { - primaryDeploymentArn **string - primaryTaskSet *awstypes.Deployment - isNewECSDeployment bool -} - -type cancellationState struct { - cancelFunc context.CancelFunc - cancelCtx context.Context - done chan struct{} - goroutineStarted bool -} - -func refreshStatusAndHandleCancellation(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, deployment *deploymentState, cancellation *cancellationState) (any, string, error) { - result, status, err := statusServiceWaitForStable(ctx, conn, serviceName, clusterNameOrARN, deployment.primaryDeploymentArn, operationTime, &deployment.primaryTaskSet, &deployment.isNewECSDeployment)() - - // Create context and start goroutine only when needed - if sigintCancellation && !cancellation.goroutineStarted && *deployment.primaryDeploymentArn != nil { - cancellation.cancelCtx, cancellation.cancelFunc = context.WithCancel(ctx) - cancellation.done = make(chan struct{}) - go func() { - defer close(cancellation.done) - waitForCancellation(cancellation.cancelCtx, conn, clusterNameOrARN, serviceName, deployment.primaryDeploymentArn, operationTime) - }() - cancellation.goroutineStarted = true - } - - return result, status, err -} - // Does not return tags. func waitServiceActive(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, timeout time.Duration) (*awstypes.Service, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ From 285872d602100567be787b58ac4437e39e6b16e0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:25:27 -0400 Subject: [PATCH 0837/2115] Replace use of 'tfresource.RetryGWhen' with 'tfresource.RetryWhen'. --- internal/service/apigateway/account.go | 4 ++-- internal/service/bedrock/inference_profile.go | 2 +- internal/service/bedrockagent/agent.go | 2 +- internal/service/cloudformation/stack_set_instance.go | 2 +- internal/service/quicksight/account_settings.go | 2 +- internal/tfresource/retry.go | 7 ------- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/internal/service/apigateway/account.go b/internal/service/apigateway/account.go index 6472ac6cf36a..8777942cdec9 100644 --- a/internal/service/apigateway/account.go +++ b/internal/service/apigateway/account.go @@ -96,7 +96,7 @@ func (r *accountResource) Create(ctx context.Context, request resource.CreateReq } } - output, err := tfresource.RetryGWhen(ctx, propagationTimeout, + output, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (*apigateway.UpdateAccountOutput, error) { return conn.UpdateAccount(ctx, &input) }, @@ -187,7 +187,7 @@ func (r *accountResource) Update(ctx context.Context, request resource.UpdateReq } } - output, err := tfresource.RetryGWhen(ctx, propagationTimeout, + output, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (*apigateway.UpdateAccountOutput, error) { return conn.UpdateAccount(ctx, &input) }, diff --git a/internal/service/bedrock/inference_profile.go b/internal/service/bedrock/inference_profile.go index 623216bfd46c..7fefa863ee2d 100644 --- a/internal/service/bedrock/inference_profile.go +++ b/internal/service/bedrock/inference_profile.go @@ -161,7 +161,7 @@ func (r *inferenceProfileResource) Create(ctx context.Context, req resource.Crea input.Tags = getTagsIn(ctx) - out, err := tfresource.RetryGWhen(ctx, 2*time.Minute, func(ctx context.Context) (*bedrock.CreateInferenceProfileOutput, error) { + out, err := tfresource.RetryWhen(ctx, 2*time.Minute, func(ctx context.Context) (*bedrock.CreateInferenceProfileOutput, error) { return conn.CreateInferenceProfile(ctx, &input) }, func(err error) (bool, error) { if errs.IsA[*awstypes.ConflictException](err) { diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go index 411183222a0d..74b643004d15 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -514,7 +514,7 @@ func prepareSupervisorToReleaseCollaborator(ctx context.Context, conn *bedrockag } func updateAgentWithRetry(ctx context.Context, conn *bedrockagent.Client, input bedrockagent.UpdateAgentInput, timeout time.Duration) (*bedrockagent.UpdateAgentOutput, error) { - return tfresource.RetryGWhen(ctx, timeout, + return tfresource.RetryWhen(ctx, timeout, func(ctx context.Context) (*bedrockagent.UpdateAgentOutput, error) { return conn.UpdateAgent(ctx, &input) }, diff --git a/internal/service/cloudformation/stack_set_instance.go b/internal/service/cloudformation/stack_set_instance.go index 8b955746d1dc..167260240dc1 100644 --- a/internal/service/cloudformation/stack_set_instance.go +++ b/internal/service/cloudformation/stack_set_instance.go @@ -291,7 +291,7 @@ func resourceStackSetInstanceCreate(ctx context.Context, d *schema.ResourceData, return create.AppendDiagError(diags, names.CloudFormation, create.ErrActionFlatteningResourceId, ResNameStackSetInstance, id, err) } - output, err := tfresource.RetryGWhen(ctx, propagationTimeout, + output, err := tfresource.RetryWhen(ctx, propagationTimeout, func(ctx context.Context) (*cloudformation.CreateStackInstancesOutput, error) { input.OperationId = aws.String(sdkid.UniqueId()) diff --git a/internal/service/quicksight/account_settings.go b/internal/service/quicksight/account_settings.go index c036722e803e..1a26edfc96cb 100644 --- a/internal/service/quicksight/account_settings.go +++ b/internal/service/quicksight/account_settings.go @@ -165,7 +165,7 @@ func (r *accountSettingsResource) ImportState(ctx context.Context, request resou } func updateAccountSettings(ctx context.Context, conn *quicksight.Client, input *quicksight.UpdateAccountSettingsInput, timeout time.Duration) (*awstypes.AccountSettings, error) { - return tfresource.RetryGWhen(ctx, timeout, + return tfresource.RetryWhen(ctx, timeout, func(ctx context.Context) (*awstypes.AccountSettings, error) { _, err := conn.UpdateAccountSettings(ctx, input) diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index 366015939405..1fd14c7139ae 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -31,13 +31,6 @@ func RetryWhen[T any](ctx context.Context, timeout time.Duration, f func(context return retryWhen(ctx, timeout, f, retryable) } -// RetryGWhen is the generic version of RetryWhen which obviates the need for a type -// assertion after the call. It retries the function `f` when the error it returns -// satisfies `retryable`. `f` is retried until `timeout` expires. -func RetryGWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable Retryable) (T, error) { - return retryWhen(ctx, timeout, f, retryable) -} - // RetryWhenAWSErrCodeEquals retries the specified function when it returns one of the specified AWS error codes. func RetryWhenAWSErrCodeEquals[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), codes ...string) (T, error) { // nosemgrep:ci.aws-in-func-name return retryWhen(ctx, timeout, f, func(err error) (bool, error) { From 1d4d83bb038e8af23979823830d813000afaa8a7 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 11:27:44 -0400 Subject: [PATCH 0838/2115] internal/generate/identitytests: allow optional attributes to be set in tests This change introduces a new argument to the `@IdentityAttribute` annotation, `testNotNull`. This can be set to `true` when an optional identity attribute is expected to be non-null in the generated test configuration. This is necessary to support testing of resources with multiple optional identity attributes where at least one is required. --- internal/generate/identitytests/main.go | 14 ++++++++++++-- .../identitytests/resource_test.go.gtpl | 18 +++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/internal/generate/identitytests/main.go b/internal/generate/identitytests/main.go index 5901dfa570db..aa8c634e626e 100644 --- a/internal/generate/identitytests/main.go +++ b/internal/generate/identitytests/main.go @@ -456,8 +456,9 @@ func (r ResourceDatum) IdentityAttributes() []identityAttribute { } type identityAttribute struct { - name string - Optional bool + name string + Optional bool + TestNotNull bool } func (i identityAttribute) Name() string { @@ -643,6 +644,15 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) { } } + if attr, ok := args.Keyword["testNotNull"]; ok { + if b, err := strconv.ParseBool(attr); err != nil { + v.errs = append(v.errs, fmt.Errorf("invalid optional value: %q at %s. Should be boolean value.", attr, fmt.Sprintf("%s.%s", v.packageName, v.functionName))) + continue + } else { + identityAttribute.TestNotNull = b + } + } + d.identityAttributes = append(d.identityAttributes, identityAttribute) case "SingletonIdentity": diff --git a/internal/generate/identitytests/resource_test.go.gtpl b/internal/generate/identitytests/resource_test.go.gtpl index fb83b34f113f..575f620d2970 100644 --- a/internal/generate/identitytests/resource_test.go.gtpl +++ b/internal/generate/identitytests/resource_test.go.gtpl @@ -303,7 +303,7 @@ func {{ template "testname" . }}_Identity_Basic(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -422,7 +422,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrAccountID: tfknownvalue.AccountID(), names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -600,7 +600,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -659,7 +659,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -717,7 +717,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -848,7 +848,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -937,7 +937,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -1027,7 +1027,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} @@ -1084,7 +1084,7 @@ func {{ template "testname" . }}_Identity_RegionOverride(t *testing.T) { names.AttrRegion: knownvalue.StringExact(acctest.Region()), {{ end -}} {{ range .IdentityAttributes -}} - {{ .Name }}: {{ if .Optional }}knownvalue.Null(){{ else }}knownvalue.NotNull(){{ end }}, + {{ .Name }}: {{ if or (not .Optional) .TestNotNull }}knownvalue.NotNull(){{ else }}knownvalue.Null(){{ end }}, {{ end }} }), {{ range .IdentityAttributes -}} From a695b98b9b6868775898542c88cc88419742c9cb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:48:06 -0400 Subject: [PATCH 0839/2115] ARC region switch control plane endpoint only in us-east-1. --- .../service_endpoints_gen_test.go | 2 +- .../arcregionswitch/service_package_gen.go | 14 +++++ names/data/names_data.hcl | 61 ++++++++++--------- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/internal/service/arcregionswitch/service_endpoints_gen_test.go b/internal/service/arcregionswitch/service_endpoints_gen_test.go index fcf4a710c592..f5e74756c47d 100644 --- a/internal/service/arcregionswitch/service_endpoints_gen_test.go +++ b/internal/service/arcregionswitch/service_endpoints_gen_test.go @@ -78,7 +78,7 @@ const ( ) const ( - expectedCallRegion = "us-west-2" //lintignore:AWSAT003 + expectedCallRegion = "us-east-1" //lintignore:AWSAT003 ) func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv diff --git a/internal/service/arcregionswitch/service_package_gen.go b/internal/service/arcregionswitch/service_package_gen.go index 4531c3ae82a9..7be113b379e4 100644 --- a/internal/service/arcregionswitch/service_package_gen.go +++ b/internal/service/arcregionswitch/service_package_gen.go @@ -8,6 +8,7 @@ import ( "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/arcregionswitch" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -59,6 +60,19 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) } }, + func(o *arcregionswitch.Options) { + switch partition := config["partition"].(string); partition { + case endpoints.AwsPartitionID: + if region := endpoints.UsEast1RegionID; o.Region != region { + tflog.Info(ctx, "overriding effective AWS API region", map[string]any{ + "service": p.ServicePackageName(), + "original_region": o.Region, + "override_region": region, + }) + o.Region = region + } + } + }, withExtraOptions(ctx, p, config), } diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 216e78a77fb9..31d87594b3d3 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -548,35 +548,6 @@ service "applicationsignals" { brand = "Amazon" } -service "arcregionswitch" { - cli_v2_command { - aws_cli_v2_command = "arc-region-switch" - aws_cli_v2_command_no_dashes = "arcregionswitch" - } - - sdk { - id = "ARC Region Switch" - arn_namespace = "arcregionswitch" - } - - names { - provider_name_upper = "ARCRegionSwitch" - human_friendly = "Application Resilience Controller Region Switch" - } - - endpoint_info { - endpoint_api_call = "ListPlans" - } - - resource_prefix { - correct = "aws_arcregionswitch_" - } - - provider_package_correct = "arcregionswitch" - doc_prefix = ["arcregionswitch_"] - brand = "AWS" -} - service "discovery" { go_packages { v1_package = "applicationdiscoveryservice" @@ -677,6 +648,38 @@ service "appsync" { brand = "AWS" } +service "arcregionswitch" { + cli_v2_command { + aws_cli_v2_command = "arc-region-switch" + aws_cli_v2_command_no_dashes = "arcregionswitch" + } + + sdk { + id = "ARC Region Switch" + arn_namespace = "arcregionswitch" + } + + names { + provider_name_upper = "ARCRegionSwitch" + human_friendly = "Application Resilience Controller Region Switch" + } + + endpoint_info { + endpoint_api_call = "ListPlans" + endpoint_region_overrides = { + "aws" = "us-east-1" + } + } + + resource_prefix { + correct = "aws_arcregionswitch_" + } + + provider_package_correct = "arcregionswitch" + doc_prefix = ["arcregionswitch_"] + brand = "AWS" +} + service "athena" { sdk { id = "Athena" From ab5d0d774c9a05572dcf1af0c00df960ea2434f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 11:52:36 -0400 Subject: [PATCH 0840/2115] Fix arcregionswitch service endpoint tests. --- .../generate/serviceendpointtests/main.go | 21 +- .../service_endpoints_gen_test.go | 602 ------------------ 2 files changed, 11 insertions(+), 612 deletions(-) delete mode 100644 internal/service/arcregionswitch/service_endpoints_gen_test.go diff --git a/internal/generate/serviceendpointtests/main.go b/internal/generate/serviceendpointtests/main.go index 2dcf4ca43e90..8bd315c17075 100644 --- a/internal/generate/serviceendpointtests/main.go +++ b/internal/generate/serviceendpointtests/main.go @@ -35,16 +35,17 @@ func main() { packageName := l.ProviderPackage() switch packageName { - case "cloudfrontkeyvaluestore", // Endpoint includes account ID - "codecatalyst", // Bearer auth token needs special handling - "location", // Resolver modifies URL - "mwaa", // Resolver modifies URL - "neptunegraph", // EndpointParameters has an additional parameter, ApiType - "paymentcryptography", // Resolver modifies URL - "route53profiles", // Resolver modifies URL - "s3control", // Resolver modifies URL - "simpledb", // AWS SDK for Go v1 - "timestreamwrite": // Uses endpoint discovery + case "arcregionswitch", // Resolver modifies URL + "cloudfrontkeyvaluestore", // Endpoint includes account ID + "codecatalyst", // Bearer auth token needs special handling + "location", // Resolver modifies URL + "mwaa", // Resolver modifies URL + "neptunegraph", // EndpointParameters has an additional parameter, ApiType + "paymentcryptography", // Resolver modifies URL + "route53profiles", // Resolver modifies URL + "s3control", // Resolver modifies URL + "simpledb", // AWS SDK for Go v1 + "timestreamwrite": // Uses endpoint discovery continue } diff --git a/internal/service/arcregionswitch/service_endpoints_gen_test.go b/internal/service/arcregionswitch/service_endpoints_gen_test.go deleted file mode 100644 index f5e74756c47d..000000000000 --- a/internal/service/arcregionswitch/service_endpoints_gen_test.go +++ /dev/null @@ -1,602 +0,0 @@ -// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. - -package arcregionswitch_test - -import ( - "context" - "errors" - "fmt" - "maps" - "net" - "net/url" - "os" - "path/filepath" - "reflect" - "strings" - "testing" - - "github.com/aws/aws-sdk-go-v2/aws" - awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" - "github.com/aws/aws-sdk-go-v2/service/arcregionswitch" - "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" - terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - "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/provider/sdkv2" - "github.com/hashicorp/terraform-provider-aws/names" -) - -type endpointTestCase struct { - with []setupFunc - expected caseExpectations -} - -type caseSetup struct { - config map[string]any - configFile configFile - environmentVariables map[string]string -} - -type configFile struct { - baseUrl string - serviceUrl string -} - -type caseExpectations struct { - diags diag.Diagnostics - endpoint string - region string -} - -type apiCallParams struct { - endpoint string - region string -} - -type setupFunc func(setup *caseSetup) - -type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams - -const ( - packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" - awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" - baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" - serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" - baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" -) - -const ( - packageName = "arcregionswitch" - awsEnvVar = "AWS_ENDPOINT_URL_ARC_REGION_SWITCH" - baseEnvVar = "AWS_ENDPOINT_URL" - configParam = "arc_region_switch" -) - -const ( - expectedCallRegion = "us-east-1" //lintignore:AWSAT003 -) - -func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv - ctx := t.Context() - const providerRegion = "us-west-2" //lintignore:AWSAT003 - const expectedEndpointRegion = providerRegion - - testcases := map[string]endpointTestCase{ - "no config": { - with: []setupFunc{withNoConfig}, - expected: expectDefaultEndpoint(ctx, t, expectedEndpointRegion), - }, - - // Package name endpoint on Config - - "package name endpoint config": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides aws service envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withAwsEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base envvar": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEnvVar, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides service config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withServiceEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - "package name endpoint config overrides base config file": { - with: []setupFunc{ - withPackageNameEndpointInConfig, - withBaseEndpointInConfigFile, - }, - expected: expectPackageNameConfigEndpoint(), - }, - - // Service endpoint in AWS envvar - - "service aws envvar": { - with: []setupFunc{ - withAwsEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base envvar": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEnvVar, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides service config file": { - with: []setupFunc{ - withAwsEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - "service aws envvar overrides base config file": { - with: []setupFunc{ - withAwsEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectAwsEnvVarEndpoint(), - }, - - // Base endpoint in envvar - - "base endpoint envvar": { - with: []setupFunc{ - withBaseEnvVar, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides service config file": { - with: []setupFunc{ - withBaseEnvVar, - withServiceEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - "base endpoint envvar overrides base config file": { - with: []setupFunc{ - withBaseEnvVar, - withBaseEndpointInConfigFile, - }, - expected: expectBaseEnvVarEndpoint(), - }, - - // Service endpoint in config file - - "service config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - "service config file overrides base config file": { - with: []setupFunc{ - withServiceEndpointInConfigFile, - withBaseEndpointInConfigFile, - }, - expected: expectServiceConfigFileEndpoint(), - }, - - // Base endpoint in config file - - "base endpoint config file": { - with: []setupFunc{ - withBaseEndpointInConfigFile, - }, - expected: expectBaseConfigFileEndpoint(), - }, - - // Use FIPS endpoint on Config - - "use fips config": { - with: []setupFunc{ - withUseFIPSInConfig, - }, - expected: expectDefaultFIPSEndpoint(ctx, t, expectedEndpointRegion), - }, - - "use fips config with package name endpoint config": { - with: []setupFunc{ - withUseFIPSInConfig, - withPackageNameEndpointInConfig, - }, - expected: expectPackageNameConfigEndpoint(), - }, - } - - for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv - t.Run(name, func(t *testing.T) { - testEndpointCase(ctx, t, providerRegion, testcase, callService) - }) - } -} - -func defaultEndpoint(ctx context.Context, region string) (url.URL, error) { - r := arcregionswitch.NewDefaultEndpointResolverV2() - - ep, err := r.ResolveEndpoint(ctx, arcregionswitch.EndpointParameters{ - Region: aws.String(region), - }) - if err != nil { - return url.URL{}, err - } - - if ep.URI.Path == "" { - ep.URI.Path = "/" - } - - return ep.URI, nil -} - -func defaultFIPSEndpoint(ctx context.Context, region string) (url.URL, error) { - r := arcregionswitch.NewDefaultEndpointResolverV2() - - ep, err := r.ResolveEndpoint(ctx, arcregionswitch.EndpointParameters{ - Region: aws.String(region), - UseFIPS: aws.Bool(true), - }) - if err != nil { - return url.URL{}, err - } - - if ep.URI.Path == "" { - ep.URI.Path = "/" - } - - return ep.URI, nil -} - -func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { - t.Helper() - - client := meta.ARCRegionSwitchClient(ctx) - - var result apiCallParams - - input := arcregionswitch.ListPlansInput{} - _, err := client.ListPlans(ctx, &input, - func(opts *arcregionswitch.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) { - // no-op -} - -func withPackageNameEndpointInConfig(setup *caseSetup) { - if _, ok := setup.config[names.AttrEndpoints]; !ok { - setup.config[names.AttrEndpoints] = []any{ - map[string]any{}, - } - } - endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) - endpoints[packageName] = packageNameConfigEndpoint -} - -func withAwsEnvVar(setup *caseSetup) { - setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint -} - -func withBaseEnvVar(setup *caseSetup) { - setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint -} - -func withServiceEndpointInConfigFile(setup *caseSetup) { - setup.configFile.serviceUrl = serviceConfigFileEndpoint -} - -func withBaseEndpointInConfigFile(setup *caseSetup) { - setup.configFile.baseUrl = baseConfigFileEndpoint -} - -func withUseFIPSInConfig(setup *caseSetup) { - setup.config["use_fips_endpoint"] = true -} - -func expectDefaultEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultEndpoint(ctx, region) - if err != nil { - t.Fatalf("resolving accessanalyzer default endpoint: %s", err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectDefaultFIPSEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { - t.Helper() - - endpoint, err := defaultFIPSEndpoint(ctx, region) - if err != nil { - t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) - } - - hostname := endpoint.Hostname() - _, err = net.LookupHost(hostname) - if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { - return expectDefaultEndpoint(ctx, t, region) - } else if err != nil { - t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) - } - - return caseExpectations{ - endpoint: endpoint.String(), - region: expectedCallRegion, - } -} - -func expectPackageNameConfigEndpoint() caseExpectations { - return caseExpectations{ - endpoint: packageNameConfigEndpoint, - region: expectedCallRegion, - } -} - -func expectAwsEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: awsServiceEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseEnvVarEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseEnvvarEndpoint, - region: expectedCallRegion, - } -} - -func expectServiceConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: serviceConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func expectBaseConfigFileEndpoint() caseExpectations { - return caseExpectations{ - endpoint: baseConfigFileEndpoint, - region: expectedCallRegion, - } -} - -func testEndpointCase(ctx context.Context, t *testing.T, region string, testcase endpointTestCase, callF callFunc) { - t.Helper() - - setup := caseSetup{ - config: map[string]any{}, - environmentVariables: map[string]string{}, - } - - for _, f := range testcase.with { - f(&setup) - } - - config := map[string]any{ - names.AttrAccessKey: servicemocks.MockStaticAccessKey, - names.AttrSecretKey: servicemocks.MockStaticSecretKey, - names.AttrRegion: region, - names.AttrSkipCredentialsValidation: true, - names.AttrSkipRequestingAccountID: true, - } - - maps.Copy(config, setup.config) - - if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { - config[names.AttrProfile] = "default" - tempDir := t.TempDir() - writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) - } - - for k, v := range setup.environmentVariables { - t.Setenv(k, v) - } - - p, err := sdkv2.NewProvider(ctx) - if err != nil { - t.Fatal(err) - } - - p.TerraformVersion = "1.0.0" - - expectedDiags := testcase.expected.diags - diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) - - if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { - t.Errorf("unexpected diagnostics difference: %s", diff) - } - - if diags.HasError() { - return - } - - meta := p.Meta().(*conns.AWSClient) - - callParams := callF(ctx, t, meta) - - if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { - t.Errorf("expected endpoint %q, got %q", e, a) - } - - if e, a := testcase.expected.region, callParams.region; e != a { - t.Errorf("expected region %q, got %q", e, a) - } -} - -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 = errors.New("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 any) 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 - - buf.WriteString(` -[default] -aws_access_key_id = DefaultSharedCredentialsAccessKey -aws_secret_access_key = DefaultSharedCredentialsSecretKey -`) - if config.baseUrl != "" { - fmt.Fprintf(&buf, "endpoint_url = %s\n", config.baseUrl) - } - - if config.serviceUrl != "" { - fmt.Fprintf(&buf, ` -services = endpoint-test - -[services endpoint-test] -%[1]s = - endpoint_url = %[2]s -`, configParam, serviceConfigFileEndpoint) - } - - return buf.String() -} - -func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { - t.Helper() - - file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) - if err != nil { - t.Fatalf("creating shared configuration file: %s", err) - } - - _, err = file.WriteString(content) - if err != nil { - t.Fatalf(" writing shared configuration file: %s", err) - } - - if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { - (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} - } else { - (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) - } - - return file.Name() -} From bc7aca53694ae731a1e0641357f9c957a786e086 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 12:16:38 -0400 Subject: [PATCH 0841/2115] Add CHANGELOG entry. --- .changelog/38336.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/38336.txt diff --git a/.changelog/38336.txt b/.changelog/38336.txt new file mode 100644 index 000000000000..dbed8d77bea3 --- /dev/null +++ b/.changelog/38336.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_spot_instance_request: Change `network_interface.network_card_index` to Computed +``` \ No newline at end of file From 6a7ba6525c1c80dfb93dc7e917a1f6e2742d801f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 12:33:12 -0400 Subject: [PATCH 0842/2115] r/aws_spot_instance_request: Change `network_interface.network_card_index` to Computed. --- internal/service/ec2/ec2_instance.go | 23 +++---- .../service/ec2/ec2_spot_instance_request.go | 6 +- .../ec2/ec2_spot_instance_request_test.go | 64 +++---------------- 3 files changed, 24 insertions(+), 69 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index b8d82a085f69..344323000e26 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -609,6 +609,7 @@ func resourceInstance() *schema.Resource { Required: true, ForceNew: true, }, + // Note: Changes to `network_interface.network_card_index` should be mirrored in `aws_spot_instance_request` "network_card_index": { Type: schema.TypeInt, Optional: true, @@ -1333,10 +1334,10 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta any) // Otherwise, assume the network device was attached via an outside resource. for _, index := range configuredDeviceIndexes { if index == int(aws.ToInt32(iNi.Attachment.DeviceIndex)) { + ni[names.AttrDeleteOnTermination] = aws.ToBool(iNi.Attachment.DeleteOnTermination) ni["device_index"] = aws.ToInt32(iNi.Attachment.DeviceIndex) ni["network_card_index"] = aws.ToInt32(iNi.Attachment.NetworkCardIndex) ni[names.AttrNetworkInterfaceID] = aws.ToString(iNi.NetworkInterfaceId) - ni[names.AttrDeleteOnTermination] = aws.ToBool(iNi.Attachment.DeleteOnTermination) } } // Don't add empty network interfaces to schema @@ -2680,18 +2681,18 @@ func buildNetworkInterfaceOpts(d *schema.ResourceData, groups []string, nInterfa networkInterfaces = append(networkInterfaces, ni) } else if nInterfaces != nil && nInterfaces.(*schema.Set).Len() > 0 { // If we have manually specified network interfaces, build and attach those here. - vL := nInterfaces.(*schema.Set).List() - for _, v := range vL { - ini := v.(map[string]any) - ni := awstypes.InstanceNetworkInterfaceSpecification{ - DeviceIndex: aws.Int32(int32(ini["device_index"].(int))), - NetworkInterfaceId: aws.String(ini[names.AttrNetworkInterfaceID].(string)), - DeleteOnTermination: aws.Bool(ini[names.AttrDeleteOnTermination].(bool)), + tfList := nInterfaces.(*schema.Set).List() + for _, tfMapRaw := range tfList { + tfMap := tfMapRaw.(map[string]any) + apiObject := awstypes.InstanceNetworkInterfaceSpecification{ + DeleteOnTermination: aws.Bool(tfMap[names.AttrDeleteOnTermination].(bool)), + DeviceIndex: aws.Int32(int32(tfMap["device_index"].(int))), + NetworkInterfaceId: aws.String(tfMap[names.AttrNetworkInterfaceID].(string)), } - if nci, ok := ini["network_card_index"]; ok { - ni.NetworkCardIndex = aws.Int32(int32(nci.(int))) + if v, ok := tfMap["network_card_index"]; ok && v != 0 { + apiObject.NetworkCardIndex = aws.Int32(int32(v.(int))) } - networkInterfaces = append(networkInterfaces, ni) + networkInterfaces = append(networkInterfaces, apiObject) } } else { v := primaryNetworkInterface.([]any) diff --git a/internal/service/ec2/ec2_spot_instance_request.go b/internal/service/ec2/ec2_spot_instance_request.go index dc1aa1e19231..e53efaceae3c 100644 --- a/internal/service/ec2/ec2_spot_instance_request.go +++ b/internal/service/ec2/ec2_spot_instance_request.go @@ -85,6 +85,10 @@ func resourceSpotInstanceRequest() *schema.Resource { Optional: true, ForceNew: true, } + s["network_interface"].Elem.(*schema.Resource).Schema["network_card_index"] = &schema.Schema{ + Type: schema.TypeInt, + Computed: true, + } s["primary_network_interface"] = &schema.Schema{ Type: schema.TypeList, Computed: true, @@ -151,8 +155,6 @@ func resourceSpotInstanceRequest() *schema.Resource { Default: false, } - delete(s["network_interface"].Elem.(*schema.Resource).Schema, "network_card_index") - return s }(), } diff --git a/internal/service/ec2/ec2_spot_instance_request_test.go b/internal/service/ec2/ec2_spot_instance_request_test.go index f3ce37909153..b69e4d6b76f4 100644 --- a/internal/service/ec2/ec2_spot_instance_request_test.go +++ b/internal/service/ec2/ec2_spot_instance_request_test.go @@ -384,9 +384,9 @@ func TestAccEC2SpotInstanceRequest_primaryNetworkInterface(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSpotInstanceRequestExists(ctx, resourceName, &sir), testAccCheckSpotInstanceRequest_InstanceAttributes(ctx, &sir, rName), - resource.TestCheckResourceAttr(resourceName, "network_interface.#", acctest.Ct1), + resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "network_interface.*", map[string]string{ - "device_index": acctest.Ct0, + "device_index": "0", }), ), }, @@ -906,34 +906,16 @@ resource "aws_ec2_tag" "test" { func testAccSpotInstanceRequestConfig_vpc(rName string) string { return acctest.ConfigCompose( - acctest.ConfigAvailableAZsNoOptIn(), + acctest.ConfigVPCWithSubnets(rName, 1), acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` -resource "aws_vpc" "test" { - cidr_block = "10.1.0.0/16" - - tags = { - Name = %[1]q - } -} - -resource "aws_subnet" "test" { - availability_zone = data.aws_availability_zones.available.names[0] - cidr_block = "10.1.1.0/24" - vpc_id = aws_vpc.test.id - - tags = { - Name = %[1]q - } -} - resource "aws_spot_instance_request" "test" { ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id instance_type = data.aws_ec2_instance_type_offering.available.instance_type spot_price = "0.05" wait_for_fulfillment = true - subnet_id = aws_subnet.test.id + subnet_id = aws_subnet.test[0].id tags = { Name = %[1]q @@ -1007,7 +989,7 @@ resource "aws_ec2_tag" "test" { func testAccSpotInstanceRequestConfig_primaryNetworkInterface(rName string) string { return acctest.ConfigCompose( - acctest.ConfigAvailableAZsNoOptIn(), + acctest.ConfigVPCWithSubnets(rName, 1), acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` @@ -1016,30 +998,11 @@ resource "aws_spot_instance_request" "test" { instance_type = data.aws_ec2_instance_type_offering.available.instance_type spot_price = "0.05" wait_for_fulfillment = true + network_interface { network_interface_id = aws_network_interface.test.id - device_index = 0 - } - - tags = { - Name = %[1]q - } -} - -resource "aws_vpc" "test" { - cidr_block = "10.0.0.0/16" - enable_dns_hostnames = true - - tags = { - Name = %[1]q + device_index = 0 } -} - -resource "aws_subnet" "test" { - availability_zone = data.aws_availability_zones.available.names[0] - vpc_id = aws_vpc.test.id - cidr_block = "10.0.0.0/24" - map_public_ip_on_launch = true tags = { Name = %[1]q @@ -1047,18 +1010,7 @@ resource "aws_subnet" "test" { } resource "aws_network_interface" "test" { - subnet_id = aws_subnet.test.id - private_ips = [ "10.0.0.100" ] - security_groups = [ aws_security_group.test.id ] - - tags = { - Name = %[1]q - } -} - -resource "aws_security_group" "test" { - name = %[1]q - vpc_id = aws_vpc.test.id + subnet_id = aws_subnet.test[0].id tags = { Name = %[1]q From 981f635f6917ef4257ba39f2a4161104b370c455 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:45:03 +0900 Subject: [PATCH 0843/2115] Add `domain_version` and `service_role` arguments --- internal/service/datazone/domain.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/internal/service/datazone/domain.go b/internal/service/datazone/domain.go index 2164c654423f..491388fdd100 100644 --- a/internal/service/datazone/domain.go +++ b/internal/service/datazone/domain.go @@ -64,6 +64,15 @@ func (r *domainResource) Schema(ctx context.Context, request resource.SchemaRequ CustomType: fwtypes.ARNType, Required: true, }, + "domain_version": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.DomainVersion](), + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + stringplanmodifier.RequiresReplace(), + }, + }, names.AttrID: framework.IDAttribute(), "kms_key_identifier": schema.StringAttribute{ CustomType: fwtypes.ARNType, @@ -81,6 +90,10 @@ func (r *domainResource) Schema(ctx context.Context, request resource.SchemaRequ stringplanmodifier.UseStateForUnknown(), }, }, + names.AttrServiceRole: schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Optional: true, + }, "skip_deletion_check": schema.BoolAttribute{ Optional: true, PlanModifiers: []planmodifier.Bool{ @@ -165,6 +178,7 @@ func (r *domainResource) Create(ctx context.Context, request resource.CreateRequ data.ARN = fwflex.StringToFramework(ctx, output.Arn) data.ID = fwflex.StringToFramework(ctx, output.Id) data.PortalURL = fwflex.StringToFramework(ctx, output.PortalUrl) + data.DomainVersion = fwtypes.StringEnumValue[awstypes.DomainVersion](output.DomainVersion) if _, err := waitDomainCreated(ctx, conn, data.ID.ValueString(), r.CreateTimeout(ctx, data.Timeouts)); err != nil { response.State.SetAttribute(ctx, path.Root(names.AttrID), data.ID) // Set 'id' so as to taint the resource. @@ -366,10 +380,12 @@ type domainResourceModel struct { ARN types.String `tfsdk:"arn"` Description types.String `tfsdk:"description"` DomainExecutionRole fwtypes.ARN `tfsdk:"domain_execution_role"` + DomainVersion fwtypes.StringEnum[awstypes.DomainVersion] `tfsdk:"domain_version"` ID types.String `tfsdk:"id"` KMSKeyIdentifier fwtypes.ARN `tfsdk:"kms_key_identifier"` Name types.String `tfsdk:"name"` PortalURL types.String `tfsdk:"portal_url"` + ServiceRole fwtypes.ARN `tfsdk:"service_role"` SkipDeletionCheck types.Bool `tfsdk:"skip_deletion_check"` SingleSignOn fwtypes.ListNestedObjectValueOf[singleSignOnModel] `tfsdk:"single_sign_on"` Tags tftags.Map `tfsdk:"tags"` From 10860b37615fd6c8c4af83e33156b4e6dd247d47 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 10:47:45 -0400 Subject: [PATCH 0844/2115] Add parameterized resource identity to `aws_ecr_repository` ```console % make testacc PKG=ecr TESTS=TestAccECRRepository_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ecr/... -v -count 1 -parallel 20 -run='TestAccECRRepository_' -timeout 360m -vet=off 2025/08/26 10:44:23 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 10:44:23 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccECRRepository_immutabilityWithExclusion_crossValidation (3.55s) --- PASS: TestAccECRRepository_immutabilityWithExclusion_validation (5.55s) --- PASS: TestAccECRRepository_disappears (24.62s) --- PASS: TestAccECRRepository_immutability (28.21s) --- PASS: TestAccECRRepository_basic (29.05s) --- PASS: TestAccECRRepository_Identity_RegionOverride (37.29s) --- PASS: TestAccECRRepository_mutabilityWithExclusion (39.34s) --- PASS: TestAccECRRepository_Identity_Basic (39.82s) --- PASS: TestAccECRRepository_immutabilityWithExclusion (41.40s) --- PASS: TestAccECRRepository_Encryption_aes256 (48.07s) --- PASS: TestAccECRRepository_Encryption_kms (49.81s) --- PASS: TestAccECRRepository_tags (50.58s) --- PASS: TestAccECRRepository_Identity_ExistingResource (50.68s) --- PASS: TestAccECRRepository_Image_scanning (57.34s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ecr 63.831s ``` --- internal/service/ecr/generate.go | 1 + internal/service/ecr/repository.go | 8 +- .../ecr/repository_identity_gen_test.go | 256 ++++++++++++++++++ internal/service/ecr/service_package_gen.go | 6 +- .../ecr/testdata/Repository/basic/main_gen.tf | 12 + .../Repository/basic_v6.10.0/main_gen.tf | 22 ++ .../Repository/region_override/main_gen.tf | 20 ++ .../ecr/testdata/tmpl/repository_tags.gtpl | 5 + 8 files changed, 325 insertions(+), 5 deletions(-) create mode 100644 internal/service/ecr/repository_identity_gen_test.go create mode 100644 internal/service/ecr/testdata/Repository/basic/main_gen.tf create mode 100644 internal/service/ecr/testdata/Repository/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ecr/testdata/Repository/region_override/main_gen.tf create mode 100644 internal/service/ecr/testdata/tmpl/repository_tags.gtpl diff --git a/internal/service/ecr/generate.go b/internal/service/ecr/generate.go index c56b40a0d164..9000de50d094 100644 --- a/internal/service/ecr/generate.go +++ b/internal/service/ecr/generate.go @@ -3,6 +3,7 @@ //go:generate go run ../../generate/tags/main.go -ListTags -ServiceTagsSlice -UpdateTags -CreateTags //go:generate go run ../../generate/servicepackage/main.go +//go:generate go run ../../generate/identitytests/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. package ecr diff --git a/internal/service/ecr/repository.go b/internal/service/ecr/repository.go index c06422e47c57..c113b7d3cb6c 100644 --- a/internal/service/ecr/repository.go +++ b/internal/service/ecr/repository.go @@ -31,6 +31,10 @@ import ( // @SDKResource("aws_ecr_repository", name="Repository") // @Tags(identifierAttribute="arn") +// @IdentityAttribute("name") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ecr/types;types.Repository") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(idAttrDuplicates="name") func resourceRepository() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRepositoryCreate, @@ -38,10 +42,6 @@ func resourceRepository() *schema.Resource { UpdateWithoutTimeout: resourceRepositoryUpdate, DeleteWithoutTimeout: resourceRepositoryDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Timeouts: &schema.ResourceTimeout{ Delete: schema.DefaultTimeout(20 * time.Minute), }, diff --git a/internal/service/ecr/repository_identity_gen_test.go b/internal/service/ecr/repository_identity_gen_test.go new file mode 100644 index 000000000000..e2d1e3d1a48c --- /dev/null +++ b/internal/service/ecr/repository_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ecr_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ecr/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccECRRepository_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Repository + resourceName := "aws_ecr_repository.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckRepositoryDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRepositoryExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrName), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccECRRepository_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_repository.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrName), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccECRRepository_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Repository + resourceName := "aws_ecr_repository.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckRepositoryDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRepositoryExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Repository/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + }, + }) +} diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 113ff163929a..342d3e6a0ca0 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -129,7 +129,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrName), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceRepositoryCreationTemplate, diff --git a/internal/service/ecr/testdata/Repository/basic/main_gen.tf b/internal/service/ecr/testdata/Repository/basic/main_gen.tf new file mode 100644 index 000000000000..8b530cd09415 --- /dev/null +++ b/internal/service/ecr/testdata/Repository/basic/main_gen.tf @@ -0,0 +1,12 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ecr/testdata/Repository/basic_v6.10.0/main_gen.tf b/internal/service/ecr/testdata/Repository/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..cbf3a5d763e7 --- /dev/null +++ b/internal/service/ecr/testdata/Repository/basic_v6.10.0/main_gen.tf @@ -0,0 +1,22 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ecr/testdata/Repository/region_override/main_gen.tf b/internal/service/ecr/testdata/Repository/region_override/main_gen.tf new file mode 100644 index 000000000000..a209c69fb26c --- /dev/null +++ b/internal/service/ecr/testdata/Repository/region_override/main_gen.tf @@ -0,0 +1,20 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository" "test" { + region = var.region + + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ecr/testdata/tmpl/repository_tags.gtpl b/internal/service/ecr/testdata/tmpl/repository_tags.gtpl new file mode 100644 index 000000000000..8738fa04b864 --- /dev/null +++ b/internal/service/ecr/testdata/tmpl/repository_tags.gtpl @@ -0,0 +1,5 @@ +resource "aws_ecr_repository" "test" { +{{- template "region" }} + name = var.rName +{{- template "tags" }} +} From ed11c70db50f943ca19d142717ec2ff27a9e79ed Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 11:07:52 -0400 Subject: [PATCH 0845/2115] Add parameterized resource identity to `aws_ecr_lifecycle_policy` ```console % make testacc PKG=ecr TESTS=TestAccECRLifecyclePolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ecr/... -v -count 1 -parallel 20 -run='TestAccECRLifecyclePolicy_' -timeout 360m -vet=off 2025/08/26 11:05:34 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 11:05:34 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccECRLifecyclePolicy_disappears (20.12s) --- PASS: TestAccECRLifecyclePolicy_basic (22.52s) --- PASS: TestAccECRLifecyclePolicy_detectDiff (28.04s) --- PASS: TestAccECRLifecyclePolicy_Identity_RegionOverride (28.10s) --- PASS: TestAccECRLifecyclePolicy_ignoreEquivalent (28.48s) --- PASS: TestAccECRLifecyclePolicy_detectTagPatternListDiff (29.72s) --- PASS: TestAccECRLifecyclePolicy_Identity_Basic (31.52s) --- PASS: TestAccECRLifecyclePolicy_Identity_ExistingResource (44.77s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ecr 51.201s ``` --- internal/service/ecr/lifecycle_policy.go | 7 +- .../ecr/lifecycle_policy_identity_gen_test.go | 253 ++++++++++++++++++ internal/service/ecr/service_package_gen.go | 4 + .../LifecyclePolicy/basic/main_gen.tf | 36 +++ .../LifecyclePolicy/basic_v6.10.0/main_gen.tf | 46 ++++ .../region_override/main_gen.tf | 46 ++++ .../testdata/tmpl/lifecycle_policy_basic.gtpl | 29 ++ 7 files changed, 417 insertions(+), 4 deletions(-) create mode 100644 internal/service/ecr/lifecycle_policy_identity_gen_test.go create mode 100644 internal/service/ecr/testdata/LifecyclePolicy/basic/main_gen.tf create mode 100644 internal/service/ecr/testdata/LifecyclePolicy/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ecr/testdata/LifecyclePolicy/region_override/main_gen.tf create mode 100644 internal/service/ecr/testdata/tmpl/lifecycle_policy_basic.gtpl diff --git a/internal/service/ecr/lifecycle_policy.go b/internal/service/ecr/lifecycle_policy.go index 4e5bde6f5f77..4105a3ca4cfa 100644 --- a/internal/service/ecr/lifecycle_policy.go +++ b/internal/service/ecr/lifecycle_policy.go @@ -28,16 +28,15 @@ import ( ) // @SDKResource("aws_ecr_lifecycle_policy", name="Lifecycle Policy") +// @IdentityAttribute("repository") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(idAttrDuplicates="repository") func resourceLifecyclePolicy() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceLifecyclePolicyCreate, ReadWithoutTimeout: resourceLifecyclePolicyRead, DeleteWithoutTimeout: resourceLifecyclePolicyDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrPolicy: { Type: schema.TypeString, diff --git a/internal/service/ecr/lifecycle_policy_identity_gen_test.go b/internal/service/ecr/lifecycle_policy_identity_gen_test.go new file mode 100644 index 000000000000..69b0e43d8213 --- /dev/null +++ b/internal/service/ecr/lifecycle_policy_identity_gen_test.go @@ -0,0 +1,253 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ecr_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccECRLifecyclePolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLifecyclePolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("repository"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccECRLifecyclePolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("repository"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccECRLifecyclePolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_lifecycle_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckLifecyclePolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLifecyclePolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/LifecyclePolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + }, + }) +} diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 342d3e6a0ca0..656e80f12268 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -97,6 +97,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_ecr_lifecycle_policy", Name: "Lifecycle Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity("repository"), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourcePullThroughCacheRule, diff --git a/internal/service/ecr/testdata/LifecyclePolicy/basic/main_gen.tf b/internal/service/ecr/testdata/LifecyclePolicy/basic/main_gen.tf new file mode 100644 index 000000000000..9fe56751c5ab --- /dev/null +++ b/internal/service/ecr/testdata/LifecyclePolicy/basic/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_lifecycle_policy" "test" { + repository = aws_ecr_repository.test.name + + policy = < Date: Tue, 26 Aug 2025 12:44:14 -0400 Subject: [PATCH 0846/2115] Add parameterized resource identity to `aws_ecr_repository_policy` ```console % make testacc PKG=ecr TESTS=TestAccECRRepositoryPolicy_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ecr/... -v -count 1 -parallel 20 -run='TestAccECRRepositoryPolicy_' -timeout 360m -vet=off 2025/08/26 11:25:25 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 11:25:25 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccECRRepositoryPolicy_Disappears_repository (17.38s) --- PASS: TestAccECRRepositoryPolicy_disappears (17.60s) --- PASS: TestAccECRRepositoryPolicy_Identity_RegionOverride (25.94s) --- PASS: TestAccECRRepositoryPolicy_IAM_basic (27.04s) --- PASS: TestAccECRRepositoryPolicy_basic (28.99s) --- PASS: TestAccECRRepositoryPolicy_Identity_Basic (29.44s) --- PASS: TestAccECRRepositoryPolicy_Identity_ExistingResource (43.55s) --- PASS: TestAccECRRepositoryPolicy_IAM_principalOrder (46.63s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ecr 53.116s ``` --- internal/service/ecr/repository_policy.go | 9 +- .../repository_policy_identity_gen_test.go | 253 ++++++++++++++++++ internal/service/ecr/service_package_gen.go | 6 +- .../RepositoryPolicy/basic/main_gen.tf | 26 ++ .../basic_v6.10.0/main_gen.tf | 36 +++ .../region_override/main_gen.tf | 36 +++ .../tmpl/repository_policy_basic.gtpl | 19 ++ 7 files changed, 379 insertions(+), 6 deletions(-) create mode 100644 internal/service/ecr/repository_policy_identity_gen_test.go create mode 100644 internal/service/ecr/testdata/RepositoryPolicy/basic/main_gen.tf create mode 100644 internal/service/ecr/testdata/RepositoryPolicy/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ecr/testdata/RepositoryPolicy/region_override/main_gen.tf create mode 100644 internal/service/ecr/testdata/tmpl/repository_policy_basic.gtpl diff --git a/internal/service/ecr/repository_policy.go b/internal/service/ecr/repository_policy.go index a8a1cbdd1f09..8358c243cb71 100644 --- a/internal/service/ecr/repository_policy.go +++ b/internal/service/ecr/repository_policy.go @@ -23,7 +23,10 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -// @SDKResource("aws_ecr_repository_policy", name="Repsitory Policy") +// @SDKResource("aws_ecr_repository_policy", name="Repository Policy") +// @IdentityAttribute("repository") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(idAttrDuplicates="repository") func resourceRepositoryPolicy() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRepositoryPolicyPut, @@ -31,10 +34,6 @@ func resourceRepositoryPolicy() *schema.Resource { UpdateWithoutTimeout: resourceRepositoryPolicyPut, DeleteWithoutTimeout: resourceRepositoryPolicyDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrPolicy: sdkv2.IAMPolicyDocumentSchemaRequired(), "registry_id": { diff --git a/internal/service/ecr/repository_policy_identity_gen_test.go b/internal/service/ecr/repository_policy_identity_gen_test.go new file mode 100644 index 000000000000..36740758b4d6 --- /dev/null +++ b/internal/service/ecr/repository_policy_identity_gen_test.go @@ -0,0 +1,253 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ecr_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccECRRepositoryPolicy_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_repository_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRepositoryPolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("repository"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccECRRepositoryPolicy_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_repository_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("repository"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("repository"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccECRRepositoryPolicy_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ecr_repository_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), + CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRepositoryPolicyExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/RepositoryPolicy/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "repository": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("repository")), + }, + }, + }, + }) +} diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index 656e80f12268..bc3955871bf5 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -148,8 +148,12 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa { Factory: resourceRepositoryPolicy, TypeName: "aws_ecr_repository_policy", - Name: "Repsitory Policy", + Name: "Repository Policy", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity("repository"), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, } } diff --git a/internal/service/ecr/testdata/RepositoryPolicy/basic/main_gen.tf b/internal/service/ecr/testdata/RepositoryPolicy/basic/main_gen.tf new file mode 100644 index 000000000000..6d6804cef238 --- /dev/null +++ b/internal/service/ecr/testdata/RepositoryPolicy/basic/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository_policy" "test" { + repository = aws_ecr_repository.test.name + + policy = jsonencode({ + Version = "2008-10-17" + Statement = [{ + Sid = var.rName + Effect = "Allow" + Principal = "*" + Action = "ecr:ListImages" + }] + }) +} + +resource "aws_ecr_repository" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ecr/testdata/RepositoryPolicy/basic_v6.10.0/main_gen.tf b/internal/service/ecr/testdata/RepositoryPolicy/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..d92cc86b26ed --- /dev/null +++ b/internal/service/ecr/testdata/RepositoryPolicy/basic_v6.10.0/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository_policy" "test" { + repository = aws_ecr_repository.test.name + + policy = jsonencode({ + Version = "2008-10-17" + Statement = [{ + Sid = var.rName + Effect = "Allow" + Principal = "*" + Action = "ecr:ListImages" + }] + }) +} + +resource "aws_ecr_repository" "test" { + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ecr/testdata/RepositoryPolicy/region_override/main_gen.tf b/internal/service/ecr/testdata/RepositoryPolicy/region_override/main_gen.tf new file mode 100644 index 000000000000..ba3d2775a738 --- /dev/null +++ b/internal/service/ecr/testdata/RepositoryPolicy/region_override/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ecr_repository_policy" "test" { + region = var.region + + repository = aws_ecr_repository.test.name + + policy = jsonencode({ + Version = "2008-10-17" + Statement = [{ + Sid = var.rName + Effect = "Allow" + Principal = "*" + Action = "ecr:ListImages" + }] + }) +} + +resource "aws_ecr_repository" "test" { + region = var.region + + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ecr/testdata/tmpl/repository_policy_basic.gtpl b/internal/service/ecr/testdata/tmpl/repository_policy_basic.gtpl new file mode 100644 index 000000000000..22fd85eb8635 --- /dev/null +++ b/internal/service/ecr/testdata/tmpl/repository_policy_basic.gtpl @@ -0,0 +1,19 @@ +resource "aws_ecr_repository_policy" "test" { +{{- template "region" }} + repository = aws_ecr_repository.test.name + + policy = jsonencode({ + Version = "2008-10-17" + Statement = [{ + Sid = var.rName + Effect = "Allow" + Principal = "*" + Action = "ecr:ListImages" + }] + }) +} + +resource "aws_ecr_repository" "test" { +{{- template "region" }} + name = var.rName +} From aa79f99c3cf1e9c6b556e9b603f80996b3f4fac5 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 12:49:48 -0400 Subject: [PATCH 0847/2115] r/aws_ecr(doc): add import by identity documentation --- .../docs/r/ecr_lifecycle_policy.html.markdown | 26 +++++++++++++++++++ website/docs/r/ecr_repository.html.markdown | 26 +++++++++++++++++++ .../r/ecr_repository_policy.html.markdown | 26 +++++++++++++++++++ 3 files changed, 78 insertions(+) diff --git a/website/docs/r/ecr_lifecycle_policy.html.markdown b/website/docs/r/ecr_lifecycle_policy.html.markdown index 360b6d424809..70b550592db1 100644 --- a/website/docs/r/ecr_lifecycle_policy.html.markdown +++ b/website/docs/r/ecr_lifecycle_policy.html.markdown @@ -97,6 +97,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_lifecycle_policy.example + identity = { + repository = "tf-example" + } +} + +resource "aws_ecr_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Lifecycle Policy using the name of the repository. For example: ```terraform diff --git a/website/docs/r/ecr_repository.html.markdown b/website/docs/r/ecr_repository.html.markdown index 17d44a8be012..d2f527fa08fb 100644 --- a/website/docs/r/ecr_repository.html.markdown +++ b/website/docs/r/ecr_repository.html.markdown @@ -84,6 +84,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository.service + identity = { + name = "test-service" + } +} + +resource "aws_ecr_repository" "service" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repositories using the `name`. For example: ```terraform diff --git a/website/docs/r/ecr_repository_policy.html.markdown b/website/docs/r/ecr_repository_policy.html.markdown index 7450fd70047c..0026e49106fd 100644 --- a/website/docs/r/ecr_repository_policy.html.markdown +++ b/website/docs/r/ecr_repository_policy.html.markdown @@ -71,6 +71,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository_policy.example + identity = { + repository = "example" + } +} + +resource "aws_ecr_repository_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repository Policy using the repository name. For example: ```terraform From efdb3b91a1a2e3b5487f5779c5607b7544090b24 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:50:27 +0900 Subject: [PATCH 0848/2115] Add an acceptance test for V2 domain --- internal/service/datazone/domain_test.go | 122 +++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/internal/service/datazone/domain_test.go b/internal/service/datazone/domain_test.go index 3d584fee744a..5b3ef25eca15 100644 --- a/internal/service/datazone/domain_test.go +++ b/internal/service/datazone/domain_test.go @@ -230,6 +230,44 @@ func TestAccDataZoneDomain_tags(t *testing.T) { }) } +func TestAccDataZoneDomain_domainVersionV2(t *testing.T) { + ctx := acctest.Context(t) + var domain datazone.GetDomainOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_datazone_domain.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.DataZoneServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDomainDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDomainConfig_domainVersionV2(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckDomainExists(ctx, resourceName, &domain), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttrSet(resourceName, "portal_url"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrID), + acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "datazone", "domain/{id}"), + resource.TestCheckResourceAttr(resourceName, "domain_version", "V2"), + resource.TestCheckResourceAttrPair(resourceName, "domain_execution_role", "aws_iam_role.domain_execution", names.AttrARN), + resource.TestCheckResourceAttrPair(resourceName, names.AttrServiceRole, "aws_iam_role.domain_service", names.AttrARN), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{names.AttrApplyImmediately, "user", "skip_deletion_check"}, + }, + }, + }) +} + func testAccCheckDomainDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).DataZoneClient(ctx) @@ -427,3 +465,87 @@ resource "aws_datazone_domain" "test" { `, rName, tagKey, tagValue, tagKey2, tagValue2), ) } + +func testAccDomainConfig_domainVersionV2(rName string) string { + return fmt.Sprintf(` +data "aws_caller_identity" "current" {} + +# IAM role for Domain Execution +data "aws_iam_policy_document" "assume_role_domain_execution" { + statement { + actions = [ + "sts:AssumeRole", + "sts:TagSession", + "sts:SetContext" + ] + principals { + type = "Service" + identifiers = ["datazone.amazonaws.com"] + } + condition { + test = "StringEquals" + values = [data.aws_caller_identity.current.account_id] + variable = "aws:SourceAccount" + } + condition { + test = "ForAllValues:StringLike" + values = ["datazone*"] + variable = "aws:TagKeys" + } + } +} + +resource "aws_iam_role" "domain_execution" { + assume_role_policy = data.aws_iam_policy_document.assume_role_domain_execution.json + name = "%[1]s-domain-execution-role" +} + +data "aws_iam_policy" "domain_execution_role" { + name = "SageMakerStudioDomainExecutionRolePolicy" +} + +resource "aws_iam_role_policy_attachment" "domain_execution" { + policy_arn = data.aws_iam_policy.domain_execution_role.arn + role = aws_iam_role.domain_execution.name +} + +# IAM role for Domain Service +data "aws_iam_policy_document" "assume_role_domain_service" { + statement { + actions = ["sts:AssumeRole"] + + principals { + type = "Service" + identifiers = ["datazone.amazonaws.com"] + } + condition { + test = "StringEquals" + values = [data.aws_caller_identity.current.account_id] + variable = "aws:SourceAccount" + } + } +} + +resource "aws_iam_role" "domain_service" { + assume_role_policy = data.aws_iam_policy_document.assume_role_domain_service.json + name = "%[1]s-domain-service-role" +} + +data "aws_iam_policy" "domain_service_role" { + name = "SageMakerStudioDomainServiceRolePolicy" +} + +resource "aws_iam_role_policy_attachment" "domain_service" { + policy_arn = data.aws_iam_policy.domain_service_role.arn + role = aws_iam_role.domain_service.name +} + +# DataZone Domain V2 +resource "aws_datazone_domain" "test" { + name = %[1]q + domain_execution_role = aws_iam_role.domain_execution.arn + domain_version = "V2" + service_role = aws_iam_role.domain_service.arn +} +`, rName) +} From db141e7daac3338cfb8e3fa69252a2142744489c Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:50:47 +0900 Subject: [PATCH 0849/2115] Add checks to the basic test --- internal/service/datazone/domain_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/service/datazone/domain_test.go b/internal/service/datazone/domain_test.go index 5b3ef25eca15..265e336bbe48 100644 --- a/internal/service/datazone/domain_test.go +++ b/internal/service/datazone/domain_test.go @@ -42,6 +42,8 @@ func TestAccDataZoneDomain_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "portal_url"), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), acctest.CheckResourceAttrRegionalARNFormat(ctx, resourceName, names.AttrARN, "datazone", "domain/{id}"), + resource.TestCheckResourceAttr(resourceName, "domain_version", "V1"), + resource.TestCheckNoResourceAttr(resourceName, names.AttrServiceRole), ), }, { From c0a6b56632a48a5b8c54b39bc2713df415461aa1 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:51:32 +0900 Subject: [PATCH 0850/2115] Add description about `domain_version` and `service_role` --- website/docs/r/datazone_domain.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/datazone_domain.html.markdown b/website/docs/r/datazone_domain.html.markdown index 1f22ee998d47..a19c5da0af59 100644 --- a/website/docs/r/datazone_domain.html.markdown +++ b/website/docs/r/datazone_domain.html.markdown @@ -75,7 +75,9 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `description` - (Optional) Description of the Domain. +* `domain_version` - (Optional) Version of the Domain. Valid values are `V1` and `V2`. Defaults to `V1`. * `kms_key_identifier` - (Optional) ARN of the KMS key used to encrypt the Amazon DataZone domain, metadata and reporting data. +* `service_role` - (Optional) ARN of the service role used by DataZone. Required when `domain_version` is set to `V2`. * `single_sign_on` - (Optional) Single sign on options, used to [enable AWS IAM Identity Center](https://docs.aws.amazon.com/datazone/latest/userguide/enable-IAM-identity-center-for-datazone.html) for DataZone. * `skip_deletion_check` - (Optional) Whether to skip the deletion check for the Domain. From 1b8eec1c9081b2457461e988438c6349f3505122 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:52:11 +0900 Subject: [PATCH 0851/2115] Add an example for V2 domain --- website/docs/r/datazone_domain.html.markdown | 84 ++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/website/docs/r/datazone_domain.html.markdown b/website/docs/r/datazone_domain.html.markdown index a19c5da0af59..579a7fc7e8a5 100644 --- a/website/docs/r/datazone_domain.html.markdown +++ b/website/docs/r/datazone_domain.html.markdown @@ -64,6 +64,90 @@ resource "aws_datazone_domain" "example" { } ``` +### V2 Domain + +```terraform +data "aws_caller_identity" "current" {} + +# IAM role for Domain Execution +data "aws_iam_policy_document" "assume_role_domain_execution" { + statement { + actions = [ + "sts:AssumeRole", + "sts:TagSession", + "sts:SetContext" + ] + principals { + type = "Service" + identifiers = ["datazone.amazonaws.com"] + } + condition { + test = "StringEquals" + values = [data.aws_caller_identity.current.account_id] + variable = "aws:SourceAccount" + } + condition { + test = "ForAllValues:StringLike" + values = ["datazone*"] + variable = "aws:TagKeys" + } + } +} + +resource "aws_iam_role" "domain_execution" { + assume_role_policy = data.aws_iam_policy_document.assume_role_domain_execution.json + name = "example-domain-execution-role" +} + +data "aws_iam_policy" "domain_execution_role" { + name = "SageMakerStudioDomainExecutionRolePolicy" +} + +resource "aws_iam_role_policy_attachment" "domain_execution" { + policy_arn = data.aws_iam_policy.domain_execution_role.arn + role = aws_iam_role.domain_execution.name +} + +# IAM role for Domain Service +data "aws_iam_policy_document" "assume_role_domain_service" { + statement { + actions = ["sts:AssumeRole"] + + principals { + type = "Service" + identifiers = ["datazone.amazonaws.com"] + } + condition { + test = "StringEquals" + values = [data.aws_caller_identity.current.account_id] + variable = "aws:SourceAccount" + } + } +} + +resource "aws_iam_role" "domain_service" { + assume_role_policy = data.aws_iam_policy_document.assume_role_domain_service.json + name = "example-domain-service-role" +} + +data "aws_iam_policy" "domain_service_role" { + name = "SageMakerStudioDomainServiceRolePolicy" +} + +resource "aws_iam_role_policy_attachment" "domain_service" { + policy_arn = data.aws_iam_policy.domain_service_role.arn + role = aws_iam_role.domain_service.name +} + +# DataZone Domain V2 +resource "aws_datazone_domain" "example" { + name = "example-domain" + domain_execution_role = aws_iam_role.domain_execution.arn + domain_version = "V2" + service_role = aws_iam_role.domain_service.arn +} +``` + ## Argument Reference The following arguments are required: From e2bb1a9dc11b5a9c7acac2ab689eea3e3db27b13 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 01:52:25 +0900 Subject: [PATCH 0852/2115] Rewrite the existing example to replace duplicated `inline_policy` --- website/docs/r/datazone_domain.html.markdown | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/website/docs/r/datazone_domain.html.markdown b/website/docs/r/datazone_domain.html.markdown index 579a7fc7e8a5..a0ddac37bc99 100644 --- a/website/docs/r/datazone_domain.html.markdown +++ b/website/docs/r/datazone_domain.html.markdown @@ -36,26 +36,26 @@ resource "aws_iam_role" "domain_execution_role" { }, ] }) +} - inline_policy { - name = "domain_execution_policy" - policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - # Consider scoping down - Action = [ - "datazone:*", - "ram:*", - "sso:*", - "kms:*", - ] - Effect = "Allow" - Resource = "*" - }, - ] - }) - } +resource "aws_iam_role_policy" "domain_execution_role" { + role = aws_iam_role.domain_execution_role.name + policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + # Consider scoping down + Action = [ + "datazone:*", + "ram:*", + "sso:*", + "kms:*", + ] + Effect = "Allow" + Resource = "*" + }, + ] + }) } resource "aws_datazone_domain" "example" { From 3eced424f742f79723fadb65c7e91c6ffb6291e2 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 02:05:26 +0900 Subject: [PATCH 0853/2115] add changelog --- .changelog/44042.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44042.txt diff --git a/.changelog/44042.txt b/.changelog/44042.txt new file mode 100644 index 000000000000..cbf0829c09e1 --- /dev/null +++ b/.changelog/44042.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_datazone_domain: Add `domain_version` and `service_role` arguments to support V2 domains +``` From 3be9f336472c3a22c06a366565565d2d4ccc72a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 13:07:24 -0400 Subject: [PATCH 0854/2115] Fix 'TestAccEC2SpotInstanceRequest_primaryNetworkInterface'. --- internal/service/ec2/ec2_spot_instance_request_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/ec2/ec2_spot_instance_request_test.go b/internal/service/ec2/ec2_spot_instance_request_test.go index b69e4d6b76f4..ea4afe49d8a2 100644 --- a/internal/service/ec2/ec2_spot_instance_request_test.go +++ b/internal/service/ec2/ec2_spot_instance_request_test.go @@ -383,7 +383,6 @@ func TestAccEC2SpotInstanceRequest_primaryNetworkInterface(t *testing.T) { Config: testAccSpotInstanceRequestConfig_primaryNetworkInterface(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSpotInstanceRequestExists(ctx, resourceName, &sir), - testAccCheckSpotInstanceRequest_InstanceAttributes(ctx, &sir, rName), resource.TestCheckResourceAttr(resourceName, "network_interface.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "network_interface.*", map[string]string{ "device_index": "0", From e49577d84ea1a546da6d14747063b47416d73b87 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 17:09:49 +0000 Subject: [PATCH 0855/2115] Update CHANGELOG.md for #44037 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85b9c14182fb..ab5b859ff224 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ FEATURES: +* **New Resource:** `aws_timestreaminfluxdb_db_cluster` ([#42382](https://github.com/hashicorp/terraform-provider-aws/issues/42382)) * **New Resource:** `aws_workspacesweb_browser_settings_association` ([#43735](https://github.com/hashicorp/terraform-provider-aws/issues/43735)) * **New Resource:** `aws_workspacesweb_data_protection_settings_association` ([#43773](https://github.com/hashicorp/terraform-provider-aws/issues/43773)) * **New Resource:** `aws_workspacesweb_identity_provider` ([#43729](https://github.com/hashicorp/terraform-provider-aws/issues/43729)) @@ -9,6 +10,7 @@ FEATURES: * **New Resource:** `aws_workspacesweb_network_settings_association` ([#43775](https://github.com/hashicorp/terraform-provider-aws/issues/43775)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) +* **New Resource:** `aws_workspacesweb_user_access_logging_settings_association` ([#43776](https://github.com/hashicorp/terraform-provider-aws/issues/43776)) ENHANCEMENTS: @@ -51,6 +53,7 @@ BUG FIXES: * resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) * resource/aws_nat_gateway: Fix inconsistent final plan for `secondary_private_ip_addresses` ([#43708](https://github.com/hashicorp/terraform-provider-aws/issues/43708)) +* resource/aws_timestreaminfluxdb_db_instance: Fix tag-only update errors ([#42382](https://github.com/hashicorp/terraform-provider-aws/issues/42382)) * resource/aws_wafv2_web_acl: Add missing flattening of `name` in `response_inspection.header` blocks for `AWSManagedRulesATPRuleSet` and `AWSManagedRulesACFPRuleSet` to avoid persistent plan diffs ([#44032](https://github.com/hashicorp/terraform-provider-aws/issues/44032)) ## 6.10.0 (August 21, 2025) From 3b3eb32d02eb5a06b063418ffff038be55cef1a1 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 25 Aug 2025 15:54:39 -0400 Subject: [PATCH 0856/2115] Add parameterized resource identity to `aws_s3_bucket_acl` ```console % make testacc PKG=s3 TESTS=TestAccS3BucketACL_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketACL_' -timeout 360m -vet=off 2025/08/26 11:29:38 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 11:29:38 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketACL_directoryBucket (13.51s) --- PASS: TestAccS3BucketACL_disappears (25.17s) --- PASS: TestAccS3BucketACL_basic (30.48s) --- PASS: TestAccS3BucketACL_Identity_RegionOverride (35.76s) --- PASS: TestAccS3BucketACL_migrate_aclNoChange (36.72s) --- PASS: TestAccS3BucketACL_migrate_grantsWithChange (39.24s) --- PASS: TestAccS3BucketACL_migrate_aclWithChange (39.41s) --- PASS: TestAccS3BucketACL_Identity_Basic (43.00s) --- PASS: TestAccS3BucketACL_grantToACL (44.50s) --- PASS: TestAccS3BucketACL_ACLToGrant (44.75s) --- PASS: TestAccS3BucketACL_updateACL (44.80s) --- PASS: TestAccS3BucketACL_updateGrant (48.17s) --- PASS: TestAccS3BucketACL_Identity_ExistingResource (55.57s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 62.253s ``` --- .changelog/44043.txt | 3 + internal/service/s3/bucket_acl.go | 84 ++++-- .../s3/bucket_acl_identity_gen_test.go | 268 ++++++++++++++++++ internal/service/s3/bucket_acl_test.go | 103 +++++-- internal/service/s3/exports_test.go | 6 +- internal/service/s3/service_package_gen.go | 11 + .../s3/testdata/BucketACL/basic/main_gen.tf | 26 ++ .../BucketACL/basic_v6.10.0/main_gen.tf | 36 +++ .../BucketACL/region_override/main_gen.tf | 38 +++ .../s3/testdata/tmpl/bucket_acl_basic.gtpl | 20 ++ 10 files changed, 542 insertions(+), 53 deletions(-) create mode 100644 .changelog/44043.txt create mode 100644 internal/service/s3/bucket_acl_identity_gen_test.go create mode 100644 internal/service/s3/testdata/BucketACL/basic/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketACL/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/s3/testdata/BucketACL/region_override/main_gen.tf create mode 100644 internal/service/s3/testdata/tmpl/bucket_acl_basic.gtpl diff --git a/.changelog/44043.txt b/.changelog/44043.txt new file mode 100644 index 000000000000..83d5cfffa5e0 --- /dev/null +++ b/.changelog/44043.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_s3_bucket_acl: Add resource identity support +``` diff --git a/internal/service/s3/bucket_acl.go b/internal/service/s3/bucket_acl.go index 553a44d6df12..bf89a5fec002 100644 --- a/internal/service/s3/bucket_acl.go +++ b/internal/service/s3/bucket_acl.go @@ -24,13 +24,21 @@ import ( "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" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) -const BucketACLSeparator = "," - // @SDKResource("aws_s3_bucket_acl", name="Bucket ACL") +// @IdentityAttribute("bucket") +// @IdentityAttribute("expected_bucket_owner", optional="true") +// @IdentityAttribute("acl", optional="true", testNotNull="true") +// @MutableIdentity +// @ImportIDHandler("bucketACLImportID") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(checkDestroyNoop=true) +// @Testing(importIgnore="access_control_policy.0.grant.0.grantee.0.display_name;access_control_policy.0.owner.0.display_name") +// @Testing(plannableImportAction="NoOp") func resourceBucketACL() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceBucketACLCreate, @@ -38,10 +46,6 @@ func resourceBucketACL() *schema.Resource { UpdateWithoutTimeout: resourceBucketACLUpdate, DeleteWithoutTimeout: schema.NoopContext, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ "access_control_policy": { Type: schema.TypeList, @@ -184,7 +188,7 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta a return sdkdiag.AppendErrorf(diags, "creating S3 Bucket (%s) ACL: %s", bucket, err) } - d.SetId(BucketACLCreateResourceID(bucket, expectedBucketOwner, acl)) + d.SetId(createBucketACLResourceID(bucket, expectedBucketOwner, acl)) _, err = tfresource.RetryWhenNotFound(ctx, bucketPropagationTimeout, func(ctx context.Context) (any, error) { return findBucketACL(ctx, conn, bucket, expectedBucketOwner) @@ -201,7 +205,7 @@ func resourceBucketACLRead(ctx context.Context, d *schema.ResourceData, meta any var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3Client(ctx) - bucket, expectedBucketOwner, acl, err := BucketACLParseResourceID(d.Id()) + bucket, expectedBucketOwner, acl, err := parseBucketACLResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -236,7 +240,7 @@ func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, meta a var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3Client(ctx) - bucket, expectedBucketOwner, acl, err := BucketACLParseResourceID(d.Id()) + bucket, expectedBucketOwner, acl, err := parseBucketACLResourceID(d.Id()) if err != nil { return sdkdiag.AppendFromErr(diags, err) } @@ -269,7 +273,7 @@ func resourceBucketACLUpdate(ctx context.Context, d *schema.ResourceData, meta a if d.HasChange("acl") { // Set new ACL value back in resource ID - d.SetId(BucketACLCreateResourceID(bucket, expectedBucketOwner, acl)) + d.SetId(createBucketACLResourceID(bucket, expectedBucketOwner, acl)) } return append(diags, resourceBucketACLRead(ctx, d, meta)...) @@ -487,26 +491,28 @@ func flattenOwner(owner *types.Owner) []any { return []any{m} } -// BucketACLCreateResourceID is a method for creating an ID string +const bucketACLSeparator = "," + +// createBucketACLResourceID is a method for creating an ID string // with the bucket name and optional accountID and/or ACL. -func BucketACLCreateResourceID(bucket, expectedBucketOwner, acl string) string { +func createBucketACLResourceID(bucket, expectedBucketOwner, acl string) string { if expectedBucketOwner == "" { if acl == "" { return bucket } - return strings.Join([]string{bucket, acl}, BucketACLSeparator) + return strings.Join([]string{bucket, acl}, bucketACLSeparator) } if acl == "" { - return strings.Join([]string{bucket, expectedBucketOwner}, BucketACLSeparator) + return strings.Join([]string{bucket, expectedBucketOwner}, bucketACLSeparator) } - return strings.Join([]string{bucket, expectedBucketOwner, acl}, BucketACLSeparator) + return strings.Join([]string{bucket, expectedBucketOwner, acl}, bucketACLSeparator) } -// BucketACLParseResourceID is a method for parsing the ID string +// parseBucketACLResourceID is a method for parsing the ID string // for the bucket name, accountID, and ACL if provided. -func BucketACLParseResourceID(id string) (string, string, string, error) { +func parseBucketACLResourceID(id string) (string, string, string, error) { // For only bucket name in the ID e.g. my-bucket or My_Bucket // ~> On or after 3/1/2018: Bucket names can consist of only lowercase letters, numbers, dots, and hyphens; Max 63 characters // ~> Before 3/1/2018: Bucket names could consist of uppercase letters and underscores if in us-east-1; Max 255 characters @@ -528,33 +534,63 @@ func BucketACLParseResourceID(id string) (string, string, string, error) { // Bucket and Account ID ONLY if bucketAndOwnerRegex.MatchString(id) { - parts := strings.Split(id, BucketACLSeparator) + parts := strings.Split(id, bucketACLSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%sEXPECTED_BUCKET_OWNER", id, BucketACLSeparator) + return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%sEXPECTED_BUCKET_OWNER", id, bucketACLSeparator) } return parts[0], parts[1], "", nil } // Bucket and ACL ONLY if bucketAndAclRegex.MatchString(id) { - parts := strings.Split(id, BucketACLSeparator) + parts := strings.Split(id, bucketACLSeparator) if len(parts) != 2 || parts[0] == "" || parts[1] == "" { - return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%sACL", id, BucketACLSeparator) + return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%sACL", id, bucketACLSeparator) } return parts[0], "", parts[1], nil } // Bucket, Account ID, and ACL if bucketOwnerAclRegex.MatchString(id) { - parts := strings.Split(id, BucketACLSeparator) + parts := strings.Split(id, bucketACLSeparator) if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" { - return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%[2]sEXPECTED_BUCKET_OWNER%[2]sACL", id, BucketACLSeparator) + return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET%[2]sEXPECTED_BUCKET_OWNER%[2]sACL", id, bucketACLSeparator) } return parts[0], parts[1], parts[2], nil } return "", "", "", fmt.Errorf("unexpected format for ID (%s), expected BUCKET or BUCKET%[2]sEXPECTED_BUCKET_OWNER or BUCKET%[2]sACL "+ - "or BUCKET%[2]sEXPECTED_BUCKET_OWNER%[2]sACL", id, BucketACLSeparator) + "or BUCKET%[2]sEXPECTED_BUCKET_OWNER%[2]sACL", id, bucketACLSeparator) +} + +var _ inttypes.SDKv2ImportID = bucketACLImportID{} + +type bucketACLImportID struct{} + +func (bucketACLImportID) Create(d *schema.ResourceData) string { + bucket := d.Get(names.AttrBucket).(string) + expectedBucketOwner := d.Get(names.AttrExpectedBucketOwner).(string) + acl := d.Get("acl").(string) + return createBucketACLResourceID(bucket, expectedBucketOwner, acl) +} + +func (bucketACLImportID) Parse(id string) (string, map[string]string, error) { + bucket, expectedBucketOwner, acl, err := parseBucketACLResourceID(id) + if err != nil { + return id, nil, err + } + + results := map[string]string{ + names.AttrBucket: bucket, + } + if expectedBucketOwner != "" { + results[names.AttrExpectedBucketOwner] = expectedBucketOwner + } + if acl != "" { + results["acl"] = acl + } + + return id, results, nil } // These should be defined in the AWS SDK for Go. There is an issue, https://github.com/aws/aws-sdk-go/issues/2683. diff --git a/internal/service/s3/bucket_acl_identity_gen_test.go b/internal/service/s3/bucket_acl_identity_gen_test.go new file mode 100644 index 000000000000..fd7af4d50567 --- /dev/null +++ b/internal/service/s3/bucket_acl_identity_gen_test.go @@ -0,0 +1,268 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package s3_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccS3BucketACL_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_acl.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketACLExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + "acl": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.owner.0.display_name", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("acl"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("acl"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccS3BucketACL_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_acl.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + "acl": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.owner.0.display_name", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("acl"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrBucket), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrExpectedBucketOwner), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("acl"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccS3BucketACL_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_s3_bucket_acl.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBucketACLExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/BucketACL/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrBucket: knownvalue.NotNull(), + names.AttrExpectedBucketOwner: knownvalue.Null(), + "acl": knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrBucket)), + }, + }, + }, + }) +} diff --git a/internal/service/s3/bucket_acl_test.go b/internal/service/s3/bucket_acl_test.go index a021c76a9f79..4790bb8a6ffe 100644 --- a/internal/service/s3/bucket_acl_test.go +++ b/internal/service/s3/bucket_acl_test.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestBucketACLParseResourceID(t *testing.T) { +func TestParseBucketACLResourceID(t *testing.T) { t.Parallel() testCases := []struct { @@ -58,168 +58,168 @@ func TestBucketACLParseResourceID(t *testing.T) { }, { TestName: "valid ID with bucket", - InputID: tfs3.BucketACLCreateResourceID("example", "", ""), + InputID: tfs3.CreateBucketACLResourceID("example", "", ""), ExpectedACL: "", ExpectedBucket: "example", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket that has hyphens", - InputID: tfs3.BucketACLCreateResourceID("my-example-bucket", "", ""), + InputID: tfs3.CreateBucketACLResourceID("my-example-bucket", "", ""), ExpectedACL: "", ExpectedBucket: "my-example-bucket", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket that has dot and hyphens", - InputID: tfs3.BucketACLCreateResourceID("my-example.bucket", "", ""), + InputID: tfs3.CreateBucketACLResourceID("my-example.bucket", "", ""), ExpectedACL: "", ExpectedBucket: "my-example.bucket", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket that has dots, hyphen, and numbers", - InputID: tfs3.BucketACLCreateResourceID("my-example.bucket.4000", "", ""), + InputID: tfs3.CreateBucketACLResourceID("my-example.bucket.4000", "", ""), ExpectedACL: "", ExpectedBucket: "my-example.bucket.4000", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket and acl", - InputID: tfs3.BucketACLCreateResourceID("example", "", string(types.BucketCannedACLPrivate)), + InputID: tfs3.CreateBucketACLResourceID("example", "", string(types.BucketCannedACLPrivate)), ExpectedACL: string(types.BucketCannedACLPrivate), ExpectedBucket: "example", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket and acl that has hyphens", - InputID: tfs3.BucketACLCreateResourceID("example", "", string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("example", "", string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "example", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket that has dot, hyphen, and number and acl that has hyphens", - InputID: tfs3.BucketACLCreateResourceID("my-example.bucket.4000", "", string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("my-example.bucket.4000", "", string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "my-example.bucket.4000", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket and bucket owner", - InputID: tfs3.BucketACLCreateResourceID("example", acctest.Ct12Digit, ""), + InputID: tfs3.CreateBucketACLResourceID("example", acctest.Ct12Digit, ""), ExpectedACL: "", ExpectedBucket: "example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket that has dot, hyphen, and number and bucket owner", - InputID: tfs3.BucketACLCreateResourceID("my-example.bucket.4000", acctest.Ct12Digit, ""), + InputID: tfs3.CreateBucketACLResourceID("my-example.bucket.4000", acctest.Ct12Digit, ""), ExpectedACL: "", ExpectedBucket: "my-example.bucket.4000", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket, bucket owner, and acl", - InputID: tfs3.BucketACLCreateResourceID("example", acctest.Ct12Digit, string(types.BucketCannedACLPrivate)), + InputID: tfs3.CreateBucketACLResourceID("example", acctest.Ct12Digit, string(types.BucketCannedACLPrivate)), ExpectedACL: string(types.BucketCannedACLPrivate), ExpectedBucket: "example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket, bucket owner, and acl that has hyphens", - InputID: tfs3.BucketACLCreateResourceID("example", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("example", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket that has dot, hyphen, and numbers, bucket owner, and acl that has hyphens", - InputID: tfs3.BucketACLCreateResourceID("my-example.bucket.4000", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("my-example.bucket.4000", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "my-example.bucket.4000", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket (pre-2018, us-east-1)", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("Example", "", ""), + InputID: tfs3.CreateBucketACLResourceID("Example", "", ""), ExpectedACL: "", ExpectedBucket: "Example", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscores", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example_Bucket", "", ""), + InputID: tfs3.CreateBucketACLResourceID("My_Example_Bucket", "", ""), ExpectedACL: "", ExpectedBucket: "My_Example_Bucket", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscore, dot, and hyphens", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example-Bucket.local", "", ""), + InputID: tfs3.CreateBucketACLResourceID("My_Example-Bucket.local", "", ""), ExpectedACL: "", ExpectedBucket: "My_Example-Bucket.local", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscore, dots, hyphen, and numbers", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example-Bucket.4000", "", ""), + InputID: tfs3.CreateBucketACLResourceID("My_Example-Bucket.4000", "", ""), ExpectedACL: "", ExpectedBucket: "My_Example-Bucket.4000", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) and acl", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("Example", "", string(types.BucketCannedACLPrivate)), + InputID: tfs3.CreateBucketACLResourceID("Example", "", string(types.BucketCannedACLPrivate)), ExpectedACL: string(types.BucketCannedACLPrivate), ExpectedBucket: "Example", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) and acl that has underscores", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example_Bucket", "", string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("My_Example_Bucket", "", string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "My_Example_Bucket", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscore, dot, hyphen, and number and acl that has hyphens", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example-Bucket.4000", "", string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("My_Example-Bucket.4000", "", string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "My_Example-Bucket.4000", ExpectedBucketOwner: "", }, { TestName: "valid ID with bucket (pre-2018, us-east-1) and bucket owner", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("Example", acctest.Ct12Digit, ""), + InputID: tfs3.CreateBucketACLResourceID("Example", acctest.Ct12Digit, ""), ExpectedACL: "", ExpectedBucket: "Example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscore, dot, hyphen, and number and bucket owner", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example-Bucket.4000", acctest.Ct12Digit, ""), + InputID: tfs3.CreateBucketACLResourceID("My_Example-Bucket.4000", acctest.Ct12Digit, ""), ExpectedACL: "", ExpectedBucket: "My_Example-Bucket.4000", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket (pre-2018, us-east-1), bucket owner, and acl", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("Example", acctest.Ct12Digit, string(types.BucketCannedACLPrivate)), + InputID: tfs3.CreateBucketACLResourceID("Example", acctest.Ct12Digit, string(types.BucketCannedACLPrivate)), ExpectedACL: string(types.BucketCannedACLPrivate), ExpectedBucket: "Example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket (pre-2018, us-east-1), bucket owner, and acl that has hyphens", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("Example", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("Example", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "Example", ExpectedBucketOwner: acctest.Ct12Digit, }, { TestName: "valid ID with bucket (pre-2018, us-east-1) that has underscore, dot, hyphen, and numbers, bucket owner, and acl that has hyphens", //lintignore:AWSAT003 - InputID: tfs3.BucketACLCreateResourceID("My_Example-bucket.4000", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), + InputID: tfs3.CreateBucketACLResourceID("My_Example-bucket.4000", acctest.Ct12Digit, string(types.BucketCannedACLPublicReadWrite)), ExpectedACL: string(types.BucketCannedACLPublicReadWrite), ExpectedBucket: "My_Example-bucket.4000", ExpectedBucketOwner: acctest.Ct12Digit, @@ -230,7 +230,7 @@ func TestBucketACLParseResourceID(t *testing.T) { t.Run(testCase.TestName, func(t *testing.T) { t.Parallel() - gotBucket, gotExpectedBucketOwner, gotAcl, err := tfs3.BucketACLParseResourceID(testCase.InputID) + gotBucket, gotExpectedBucketOwner, gotAcl, err := tfs3.ParseBucketACLResourceID(testCase.InputID) if err == nil && testCase.ExpectError { t.Fatalf("expected error") @@ -286,6 +286,12 @@ func TestAccS3BucketACL_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + }, }, }, }) @@ -452,6 +458,13 @@ func TestAccS3BucketACL_updateACL(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.grant.1.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + }, }, }, }) @@ -494,6 +507,16 @@ func TestAccS3BucketACL_updateGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.grant.1.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + // Set order is not guaranteed on import. Permissions may be swapped. + "access_control_policy.0.grant.0.permission", + "access_control_policy.0.grant.1.permission", + }, }, { Config: testAccBucketACLConfig_grantsUpdate(bucketName), @@ -524,6 +547,16 @@ func TestAccS3BucketACL_updateGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.grant.1.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + // Set order is not guaranteed on import. Permissions may be swapped. + "access_control_policy.0.grant.0.permission", + "access_control_policy.0.grant.1.permission", + }, }, }, }) @@ -574,6 +607,16 @@ func TestAccS3BucketACL_ACLToGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.grant.1.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + // Set order is not guaranteed on import. Permissions may be swapped. + "access_control_policy.0.grant.0.permission", + "access_control_policy.0.grant.1.permission", + }, }, }, }) @@ -617,6 +660,12 @@ func TestAccS3BucketACL_grantToACL(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, + // DisplayName is eventually consistent for the ACL grantee and owner. + // Ignore verification to prevent flaky test results. + ImportStateVerifyIgnore: []string{ + "access_control_policy.0.grant.0.grantee.0.display_name", + "access_control_policy.0.owner.0.display_name", + }, }, }, }) @@ -647,7 +696,7 @@ func testAccCheckBucketACLExists(ctx context.Context, n string) resource.TestChe return fmt.Errorf("Not found: %s", n) } - bucket, expectedBucketOwner, _, err := tfs3.BucketACLParseResourceID(rs.Primary.ID) + bucket, expectedBucketOwner, _, err := tfs3.ParseBucketACLResourceID(rs.Primary.ID) if err != nil { return err } diff --git a/internal/service/s3/exports_test.go b/internal/service/s3/exports_test.go index f10b7f9077de..f1b79813503a 100644 --- a/internal/service/s3/exports_test.go +++ b/internal/service/s3/exports_test.go @@ -74,8 +74,10 @@ var ( NewObjectARN = newObjectARN ParseObjectARN = parseObjectARN - CreateResourceID = createResourceID - ParseResourceID = parseResourceID + CreateResourceID = createResourceID + ParseResourceID = parseResourceID + CreateBucketACLResourceID = createBucketACLResourceID + ParseBucketACLResourceID = parseBucketACLResourceID DirectoryBucketNameRegex = directoryBucketNameRegex diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index a49ade6914a5..c16616c62848 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -140,6 +140,17 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_s3_bucket_acl", Name: "Bucket ACL", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute(names.AttrBucket, true), + inttypes.StringIdentityAttribute(names.AttrExpectedBucketOwner, false), + inttypes.StringIdentityAttribute("acl", false), + }, + inttypes.WithMutableIdentity(), + ), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: bucketACLImportID{}, + }, }, { Factory: resourceBucketAnalyticsConfiguration, diff --git a/internal/service/s3/testdata/BucketACL/basic/main_gen.tf b/internal/service/s3/testdata/BucketACL/basic/main_gen.tf new file mode 100644 index 000000000000..1cf3bd2328cb --- /dev/null +++ b/internal/service/s3/testdata/BucketACL/basic/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_acl" "test" { + depends_on = [aws_s3_bucket_ownership_controls.test] + + bucket = aws_s3_bucket.test.bucket + acl = "private" +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/BucketACL/basic_v6.10.0/main_gen.tf b/internal/service/s3/testdata/BucketACL/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..fc741cc89731 --- /dev/null +++ b/internal/service/s3/testdata/BucketACL/basic_v6.10.0/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_acl" "test" { + depends_on = [aws_s3_bucket_ownership_controls.test] + + bucket = aws_s3_bucket.test.bucket + acl = "private" +} + +resource "aws_s3_bucket" "test" { + bucket = var.rName +} + +resource "aws_s3_bucket_ownership_controls" "test" { + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/s3/testdata/BucketACL/region_override/main_gen.tf b/internal/service/s3/testdata/BucketACL/region_override/main_gen.tf new file mode 100644 index 000000000000..37f09f22fbd8 --- /dev/null +++ b/internal/service/s3/testdata/BucketACL/region_override/main_gen.tf @@ -0,0 +1,38 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_s3_bucket_acl" "test" { + region = var.region + + depends_on = [aws_s3_bucket_ownership_controls.test] + + bucket = aws_s3_bucket.test.bucket + acl = "private" +} + +resource "aws_s3_bucket" "test" { + region = var.region + + bucket = var.rName +} + +resource "aws_s3_bucket_ownership_controls" "test" { + region = var.region + + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/s3/testdata/tmpl/bucket_acl_basic.gtpl b/internal/service/s3/testdata/tmpl/bucket_acl_basic.gtpl new file mode 100644 index 000000000000..1296061057c4 --- /dev/null +++ b/internal/service/s3/testdata/tmpl/bucket_acl_basic.gtpl @@ -0,0 +1,20 @@ +resource "aws_s3_bucket_acl" "test" { +{{- template "region" }} + depends_on = [aws_s3_bucket_ownership_controls.test] + + bucket = aws_s3_bucket.test.bucket + acl = "private" +} + +resource "aws_s3_bucket" "test" { +{{- template "region" }} + bucket = var.rName +} + +resource "aws_s3_bucket_ownership_controls" "test" { +{{- template "region" }} + bucket = aws_s3_bucket.test.bucket + rule { + object_ownership = "BucketOwnerPreferred" + } +} From cb6b0c4e8e3e4acbff4bfab72294b16439f6d7ae Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 13:14:25 -0400 Subject: [PATCH 0857/2115] chore: changelog --- .changelog/44041.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changelog/44041.txt diff --git a/.changelog/44041.txt b/.changelog/44041.txt new file mode 100644 index 000000000000..e8982db26e93 --- /dev/null +++ b/.changelog/44041.txt @@ -0,0 +1,9 @@ +```release-note:enhancement +resource/aws_ecr_repository: Add resource identity support +``` +```release-note:enhancement +resource/aws_ecr_repository_policy: Add resource identity support +``` +```release-note:enhancement +resource/aws_ecr_lifecycle_policy: Add resource identity support +``` From 980cb7b551ef86cc39648cdd1602b572e45d023e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 13:09:39 -0400 Subject: [PATCH 0858/2115] Fix 'TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachment'. --- internal/service/ec2/ec2_instance_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index c30324af9a8a..0437d6f0ed4d 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -3475,9 +3475,10 @@ func TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachme statecheck.ExpectKnownValue(eniSecondaryResourceName, tfjsonpath.New("attachment"), knownvalue.SetExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ - "attachment_id": knownvalue.NotNull(), - "device_index": knownvalue.Int64Exact(1), - "instance": knownvalue.NotNull(), + "attachment_id": knownvalue.NotNull(), + "device_index": knownvalue.Int64Exact(1), + "instance": knownvalue.NotNull(), + "network_card_index": knownvalue.Int64Exact(0), }), })), statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), eniSecondaryResourceName, tfjsonpath.New("attachment").AtSliceIndex(0).AtMapKey("instance"), compare.ValuesSame()), From 2807193bf52099678ee19bd8f9f95b8a56408990 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 14:17:21 -0400 Subject: [PATCH 0859/2115] Add 'TestAccWorkSpacesWebUserSettingsAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 1 + .../user_settings_association.go | 32 +++++------- .../user_settings_association_test.go | 50 ++----------------- 3 files changed, 19 insertions(+), 64 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 1086a6f1b826..607e287fdfc6 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -19,6 +19,7 @@ var ( ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserAccessLoggingSettingsAssociation = newUserAccessLoggingSettingsAssociationResource ResourceUserSettings = newUserSettingsResource + ResourceUserSettingsAssociation = newUserSettingsAssociationResource FindBrowserSettingsByARN = findBrowserSettingsByARN FindDataProtectionSettingsByARN = findDataProtectionSettingsByARN diff --git a/internal/service/workspacesweb/user_settings_association.go b/internal/service/workspacesweb/user_settings_association.go index f4b2d2d93816..80676655ffe7 100644 --- a/internal/service/workspacesweb/user_settings_association.go +++ b/internal/service/workspacesweb/user_settings_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newUserSettingsAssociationResource(_ context.Context) (resource.ResourceWit return &userSettingsAssociationResource{}, nil } -const ( - ResNameUserSettingsAssociation = "User Settings Association" -) - type userSettingsAssociationResource struct { framework.ResourceWithModel[userSettingsAssociationResourceModel] + framework.WithNoUpdate } func (r *userSettingsAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ - "user_settings_arn": schema.StringAttribute{ - Required: true, + "portal_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, - "portal_arn": schema.StringAttribute{ - Required: true, + "user_settings_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *userSettingsAssociationResource) Create(ctx context.Context, request re _, err := conn.AssociateUserSettings(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameUserSettingsAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb User Settings Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *userSettingsAssociationResource) Read(ctx context.Context, request reso } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameUserSettingsAssociation, data.UserSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb User Settings Association (%s)", data.UserSettingsARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *userSettingsAssociationResource) Read(ctx context.Context, request reso response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *userSettingsAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *userSettingsAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data userSettingsAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *userSettingsAssociationResource) Delete(ctx context.Context, request re } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameUserSettingsAssociation, data.UserSettingsARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb User Settings Association (%s)", data.UserSettingsARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *userSettingsAssociationResource) ImportState(ctx context.Context, reque type userSettingsAssociationResourceModel struct { framework.WithRegionModel - UserSettingsARN types.String `tfsdk:"user_settings_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` + UserSettingsARN fwtypes.ARN `tfsdk:"user_settings_arn"` } diff --git a/internal/service/workspacesweb/user_settings_association_test.go b/internal/service/workspacesweb/user_settings_association_test.go index 4686b3b3c28d..075e0a8de316 100644 --- a/internal/service/workspacesweb/user_settings_association_test.go +++ b/internal/service/workspacesweb/user_settings_association_test.go @@ -68,13 +68,10 @@ func TestAccWorkSpacesWebUserSettingsAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebUserSettingsAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebUserSettingsAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var userSettings1, userSettings2 awstypes.UserSettings + var userSettings awstypes.UserSettings resourceName := "aws_workspacesweb_user_settings_association.test" - userSettingsResourceName1 := "aws_workspacesweb_user_settings.test" - userSettingsResourceName2 := "aws_workspacesweb_user_settings.test2" - portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -89,18 +86,10 @@ func TestAccWorkSpacesWebUserSettingsAssociation_update(t *testing.T) { { Config: testAccUserSettingsAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings1), - resource.TestCheckResourceAttrPair(resourceName, "user_settings_arn", userSettingsResourceName1, "user_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccUserSettingsAssociationConfig_updated(), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings2), - resource.TestCheckResourceAttrPair(resourceName, "user_settings_arn", userSettingsResourceName2, "user_settings_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckUserSettingsAssociationExists(ctx, resourceName, &userSettings), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceUserSettingsAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -194,32 +183,3 @@ resource "aws_workspacesweb_user_settings_association" "test" { } ` } - -func testAccUserSettingsAssociationConfig_updated() string { - return ` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_user_settings" "test" { - copy_allowed = "Enabled" - download_allowed = "Enabled" - paste_allowed = "Enabled" - print_allowed = "Enabled" - upload_allowed = "Enabled" -} - -resource "aws_workspacesweb_user_settings" "test2" { - copy_allowed = "Disabled" - download_allowed = "Disabled" - paste_allowed = "Disabled" - print_allowed = "Disabled" - upload_allowed = "Disabled" -} - -resource "aws_workspacesweb_user_settings_association" "test" { - user_settings_arn = aws_workspacesweb_user_settings.test2.user_settings_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -` -} From 5c11d0f840f105fc53e3854218dafa2809bfad0e Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Tue, 26 Aug 2025 20:19:17 +0200 Subject: [PATCH 0860/2115] feat: add verification_status attribute to aws_sesv2_email_identity --- internal/service/sesv2/email_identity.go | 5 +++++ internal/service/sesv2/email_identity_data_source.go | 5 +++++ internal/service/sesv2/email_identity_data_source_test.go | 1 + internal/service/sesv2/email_identity_test.go | 2 ++ website/docs/d/sesv2_email_identity.html.markdown | 1 + website/docs/r/sesv2_email_identity.html.markdown | 1 + 6 files changed, 15 insertions(+) diff --git a/internal/service/sesv2/email_identity.go b/internal/service/sesv2/email_identity.go index fddaecc4d192..4b8a135890ab 100644 --- a/internal/service/sesv2/email_identity.go +++ b/internal/service/sesv2/email_identity.go @@ -115,6 +115,10 @@ func resourceEmailIdentity() *schema.Resource { }, names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), + "verification_status": { + Type: schema.TypeString, + Computed: true, + }, "verified_for_sending_status": { Type: schema.TypeBool, Computed: true, @@ -191,6 +195,7 @@ func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta } d.Set("identity_type", string(out.IdentityType)) + d.Set("verification_status", string(out.VerificationStatus)) d.Set("verified_for_sending_status", out.VerifiedForSendingStatus) return diags diff --git a/internal/service/sesv2/email_identity_data_source.go b/internal/service/sesv2/email_identity_data_source.go index 119f29bfc67b..0f8c51c60dd6 100644 --- a/internal/service/sesv2/email_identity_data_source.go +++ b/internal/service/sesv2/email_identity_data_source.go @@ -80,6 +80,10 @@ func dataSourceEmailIdentity() *schema.Resource { Computed: true, }, names.AttrTags: tftags.TagsSchemaComputed(), + "verification_status": { + Type: schema.TypeString, + Computed: true, + }, "verified_for_sending_status": { Type: schema.TypeBool, Computed: true, @@ -121,6 +125,7 @@ func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, me } d.Set("identity_type", string(out.IdentityType)) + d.Set("verification_status", string(out.VerificationStatus)) d.Set("verified_for_sending_status", out.VerifiedForSendingStatus) return diags diff --git a/internal/service/sesv2/email_identity_data_source_test.go b/internal/service/sesv2/email_identity_data_source_test.go index 61d9d1465993..d34e5994573a 100644 --- a/internal/service/sesv2/email_identity_data_source_test.go +++ b/internal/service/sesv2/email_identity_data_source_test.go @@ -39,6 +39,7 @@ func TestAccSESV2EmailIdentityDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "dkim_signing_attributes.0.status", dataSourceName, "dkim_signing_attributes.0.status"), resource.TestCheckResourceAttrPair(resourceName, "dkim_signing_attributes.0.tokens.#", dataSourceName, "dkim_signing_attributes.0.tokens.#"), resource.TestCheckResourceAttrPair(resourceName, "identity_type", dataSourceName, "identity_type"), + resource.TestCheckResourceAttrPair(resourceName, "verification_status", dataSourceName, "verification_status"), resource.TestCheckResourceAttrPair(resourceName, "verified_for_sending_status", dataSourceName, "verified_for_sending_status"), ), }, diff --git a/internal/service/sesv2/email_identity_test.go b/internal/service/sesv2/email_identity_test.go index 495b84386a45..51f647b3655f 100644 --- a/internal/service/sesv2/email_identity_test.go +++ b/internal/service/sesv2/email_identity_test.go @@ -46,6 +46,7 @@ func TestAccSESV2EmailIdentity_basic_emailAddress(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.status", "NOT_STARTED"), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.tokens.#", "0"), resource.TestCheckResourceAttr(resourceName, "identity_type", "EMAIL_ADDRESS"), + resource.TestCheckResourceAttr(resourceName, "verification_status", "PENDING"), resource.TestCheckResourceAttr(resourceName, "verified_for_sending_status", acctest.CtFalse), ), }, @@ -83,6 +84,7 @@ func TestAccSESV2EmailIdentity_basic_domain(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.status", "PENDING"), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.tokens.#", "3"), resource.TestCheckResourceAttr(resourceName, "identity_type", "DOMAIN"), + resource.TestCheckResourceAttr(resourceName, "verification_status", "PENDING"), resource.TestCheckResourceAttr(resourceName, "verified_for_sending_status", acctest.CtFalse), ), }, diff --git a/website/docs/d/sesv2_email_identity.html.markdown b/website/docs/d/sesv2_email_identity.html.markdown index c751b2992a88..61a995bbe7db 100644 --- a/website/docs/d/sesv2_email_identity.html.markdown +++ b/website/docs/d/sesv2_email_identity.html.markdown @@ -41,4 +41,5 @@ This data source exports the following attributes in addition to the arguments a * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identity_type` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags` - Key-value mapping of resource tags. +* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verified_for_sending_status` - Specifies whether or not the identity is verified. diff --git a/website/docs/r/sesv2_email_identity.html.markdown b/website/docs/r/sesv2_email_identity.html.markdown index 02f4adeb463c..234d6c88e3a5 100644 --- a/website/docs/r/sesv2_email_identity.html.markdown +++ b/website/docs/r/sesv2_email_identity.html.markdown @@ -92,6 +92,7 @@ This resource exports the following attributes in addition to the arguments abov * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identity_type` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verified_for_sending_status` - Specifies whether or not the identity is verified. ## Import From 42a109dfffadd06287a65a3e5856b207ca1764d0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 14:36:09 -0400 Subject: [PATCH 0861/2115] Update internal/service/ec2/ec2_spot_instance_request_test.go --- internal/service/ec2/ec2_spot_instance_request_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ec2/ec2_spot_instance_request_test.go b/internal/service/ec2/ec2_spot_instance_request_test.go index ea4afe49d8a2..9048a6c9d03d 100644 --- a/internal/service/ec2/ec2_spot_instance_request_test.go +++ b/internal/service/ec2/ec2_spot_instance_request_test.go @@ -993,10 +993,10 @@ func testAccSpotInstanceRequestConfig_primaryNetworkInterface(rName string) stri acctest.AvailableEC2InstanceTypeForRegion("t3.micro", "t2.micro"), fmt.Sprintf(` resource "aws_spot_instance_request" "test" { - ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id - instance_type = data.aws_ec2_instance_type_offering.available.instance_type - spot_price = "0.05" - wait_for_fulfillment = true + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-x86_64.id + instance_type = data.aws_ec2_instance_type_offering.available.instance_type + spot_price = "0.05" + wait_for_fulfillment = true network_interface { network_interface_id = aws_network_interface.test.id From fe2f1a03d41c6627af906dfd93f3eeb8b1505a84 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 14:49:00 -0400 Subject: [PATCH 0862/2115] Nudge CI. From e955c2fdc6288a5904615b6b192f0ed9504dcf02 Mon Sep 17 00:00:00 2001 From: David Glaser Date: Tue, 26 Aug 2025 18:56:07 +0000 Subject: [PATCH 0863/2115] Skip sigintRollback acceptance test --- internal/service/ecs/service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 101ff6fdda92..0ed01ae1828d 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1086,7 +1086,7 @@ func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues resourceName := "aws_ecs_service.test" - resource.Test(t, resource.TestCase{ + resource.Skip(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, From cbae8c3cea0e7487cf1233b0653e981862c8f104 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:08:52 -0400 Subject: [PATCH 0864/2115] Add CHANGELOG entries. --- .changelog/43986.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/43986.txt diff --git a/.changelog/43986.txt b/.changelog/43986.txt new file mode 100644 index 000000000000..17bbd9efb5c1 --- /dev/null +++ b/.changelog/43986.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_ecs_service: Add `sigint_cancellation` argument +``` + +```release-note:enhancement +resource/aws_ecs_service: Change `deployment_configuration` to Optional and Computed +``` \ No newline at end of file From 5102bc1c54b979d52aa20f413002cbf6f80dda49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:11:30 -0400 Subject: [PATCH 0865/2115] Alphabetize. --- internal/service/ecs/service.go | 39 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 38b0488f69c5..72f9b08d82cd 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -620,12 +620,6 @@ func resourceService() *schema.Resource { MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "strategy": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateDiagFunc: enum.Validate[awstypes.DeploymentStrategy](), - }, "bake_time_in_minutes": { Type: nullable.TypeNullableInt, Optional: true, @@ -642,11 +636,6 @@ func resourceService() *schema.Resource { Required: true, ValidateFunc: verify.ValidARN, }, - names.AttrRoleARN: { - Type: schema.TypeString, - Required: true, - ValidateFunc: verify.ValidARN, - }, "lifecycle_stages": { Type: schema.TypeList, Required: true, @@ -655,9 +644,20 @@ func resourceService() *schema.Resource { ValidateDiagFunc: enum.Validate[awstypes.DeploymentLifecycleHookStage](), }, }, + names.AttrRoleARN: { + Type: schema.TypeString, + Required: true, + ValidateFunc: verify.ValidARN, + }, }, }, }, + "strategy": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.DeploymentStrategy](), + }, }, }, }, @@ -1101,12 +1101,12 @@ func resourceService() *schema.Resource { }, }, }, - names.AttrTags: tftags.TagsSchema(), - names.AttrTagsAll: tftags.TagsSchemaComputed(), "sigint_cancellation": { Type: schema.TypeBool, Optional: true, }, + names.AttrTags: tftags.TagsSchema(), + names.AttrTagsAll: tftags.TagsSchemaComputed(), "task_definition": { Type: schema.TypeString, Optional: true, @@ -1510,11 +1510,10 @@ func resourceServiceRead(ctx context.Context, d *schema.ResourceData, meta any) d.Set("deployment_circuit_breaker", nil) } - if err := d.Set("deployment_configuration", flattenDeploymentConfiguration(ctx, service.DeploymentConfiguration)); err != nil { + if err := d.Set("deployment_configuration", flattenDeploymentConfiguration(service.DeploymentConfiguration)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_configuration: %s", err) } } - if err := d.Set("deployment_controller", flattenDeploymentController(service.DeploymentController)); err != nil { return sdkdiag.AppendErrorf(diags, "setting deployment_controller: %s", err) } @@ -2544,17 +2543,13 @@ func flattenDeploymentCircuitBreaker(apiObject *awstypes.DeploymentCircuitBreake return tfMap } -func flattenDeploymentConfiguration(ctx context.Context, apiObject *awstypes.DeploymentConfiguration) []any { +func flattenDeploymentConfiguration(apiObject *awstypes.DeploymentConfiguration) []any { if apiObject == nil { return nil } tfMap := map[string]any{} - if v := apiObject.Strategy; v != "" { - tfMap["strategy"] = string(v) - } - if v := apiObject.BakeTimeInMinutes; v != nil { tfMap["bake_time_in_minutes"] = strconv.Itoa(int(*v)) } @@ -2563,6 +2558,10 @@ func flattenDeploymentConfiguration(ctx context.Context, apiObject *awstypes.Dep tfMap["lifecycle_hook"] = flattenLifecycleHooks(v) } + if v := apiObject.Strategy; v != "" { + tfMap["strategy"] = v + } + if len(tfMap) == 0 { return nil } From f63fd71d69fb470584dfc2e915da8e07d1b02d15 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 19:11:47 +0000 Subject: [PATCH 0866/2115] Update CHANGELOG.md for #44043 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5b859ff224..05cd4bf86a62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ ENHANCEMENTS: * data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) +* resource/aws_ecr_lifecycle_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) +* resource/aws_ecr_repository: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) +* resource/aws_ecr_repository_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) @@ -30,6 +33,7 @@ ENHANCEMENTS: * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_route_table: Add resource identity support ([#43990](https://github.com/hashicorp/terraform-provider-aws/issues/43990)) +* resource/aws_s3_bucket_acl: Add resource identity support ([#44043](https://github.com/hashicorp/terraform-provider-aws/issues/44043)) * resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_logging: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3_bucket_notification: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) From bb35a9ec5fa1604ccc5d2ff8cc2c6da6c27ef79a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:13:44 -0400 Subject: [PATCH 0867/2115] Use 'acctest.Skip'. --- internal/service/ecs/service_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 0ed01ae1828d..9752c17ef333 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1081,12 +1081,14 @@ func TestAccECSService_BlueGreenDeployment_outOfBandRemoval(t *testing.T) { } func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { + acctest.Skip(t, "SIGINT handling can't reliably be tested in CI") + ctx := acctest.Context(t) var service awstypes.Service rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues resourceName := "aws_ecs_service.test" - resource.Skip(t, resource.TestCase{ + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, From 35f4d8137709b004983890390e4a4a89d2f39cd3 Mon Sep 17 00:00:00 2001 From: David Glaser Date: Tue, 26 Aug 2025 18:56:07 +0000 Subject: [PATCH 0868/2115] Skip sigintRollback acceptance test --- internal/service/ecs/service_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 101ff6fdda92..6d87b57df0b3 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1081,6 +1081,7 @@ func TestAccECSService_BlueGreenDeployment_outOfBandRemoval(t *testing.T) { } func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { + acctest.Skip(t, "Skipping SIGINT rollback test, as it fails when ran alongside other acceptance tests. Remove this line to test SIGINT rollback.") ctx := acctest.Context(t) var service awstypes.Service rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)[:16] // Use shorter name to avoid target group name length issues From b26ad44bfe1386362f9a3799bbdafc40d3821dbb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:17:42 -0400 Subject: [PATCH 0869/2115] Fix semgrep 'ci.semgrep.aws.prefer-pointer-conversion-int-conversion-int64-pointer'. --- internal/service/ecs/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 72f9b08d82cd..0e15afc92f89 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -2551,7 +2551,7 @@ func flattenDeploymentConfiguration(apiObject *awstypes.DeploymentConfiguration) tfMap := map[string]any{} if v := apiObject.BakeTimeInMinutes; v != nil { - tfMap["bake_time_in_minutes"] = strconv.Itoa(int(*v)) + tfMap["bake_time_in_minutes"] = flex.Int32ToStringValue(v) } if v := apiObject.LifecycleHooks; len(v) > 0 { From 81bd262b4e57d79ac7aa5c324174518d9a998e96 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 26 Aug 2025 19:19:54 +0000 Subject: [PATCH 0870/2115] Update CHANGELOG.md for #44040 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05cd4bf86a62..65c15f80d588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ FEATURES: * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) * **New Resource:** `aws_workspacesweb_user_access_logging_settings_association` ([#43776](https://github.com/hashicorp/terraform-provider-aws/issues/43776)) +* **New Resource:** `aws_workspacesweb_user_settings_association` ([#43777](https://github.com/hashicorp/terraform-provider-aws/issues/43777)) ENHANCEMENTS: From 4dfe8d8b3277d5ce5ffa87db14ccccfde0254cfe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:20:23 -0400 Subject: [PATCH 0871/2115] Fix semgrep 'ci.typed-enum-conversion'. --- internal/service/ecs/service.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 0e15afc92f89..9b7b5e64a941 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -2090,12 +2090,12 @@ const ( serviceStatusStable = "tfSTABLE" ) -var deploymentTerminalStates = []string{ - string(awstypes.ServiceDeploymentStatusSuccessful), - string(awstypes.ServiceDeploymentStatusStopped), - string(awstypes.ServiceDeploymentStatusRollbackFailed), - string(awstypes.ServiceDeploymentStatusRollbackSuccessful), -} +var deploymentTerminalStates = enum.Slice( + awstypes.ServiceDeploymentStatusSuccessful, + awstypes.ServiceDeploymentStatusStopped, + awstypes.ServiceDeploymentStatusRollbackFailed, + awstypes.ServiceDeploymentStatusRollbackSuccessful, +) func statusService(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string) retry.StateRefreshFunc { return func() (any, string, error) { @@ -2309,12 +2309,12 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, primaryD func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, primaryDeploymentArn string) error { stateConf := &retry.StateChangeConf{ - Pending: []string{ - string(awstypes.ServiceDeploymentStatusPending), - string(awstypes.ServiceDeploymentStatusInProgress), - string(awstypes.ServiceDeploymentStatusRollbackRequested), - string(awstypes.ServiceDeploymentStatusRollbackInProgress), - }, + Pending: enum.Slice( + awstypes.ServiceDeploymentStatusPending, + awstypes.ServiceDeploymentStatusInProgress, + awstypes.ServiceDeploymentStatusRollbackRequested, + awstypes.ServiceDeploymentStatusRollbackInProgress, + ), Target: deploymentTerminalStates, Refresh: func() (any, string, error) { status, err := findDeploymentStatus(ctx, conn, primaryDeploymentArn) From 5a0f1c3579e514fa155ce8af56766abf67e54e05 Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Tue, 26 Aug 2025 21:23:54 +0200 Subject: [PATCH 0872/2115] chore: add changelog --- .changelog/43903.txt | 7 +++++++ website/docs/r/sesv2_email_identity.html.markdown | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changelog/43903.txt diff --git a/.changelog/43903.txt b/.changelog/43903.txt new file mode 100644 index 000000000000..245531c47e21 --- /dev/null +++ b/.changelog/43903.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +data-source/aws_sesv2_email_identity: Add `verification_status` attribute +``` + +```release-note:enhancement +resource/aws_sesv2_email_identity: Add `verification_status` attribute +``` \ No newline at end of file diff --git a/website/docs/r/sesv2_email_identity.html.markdown b/website/docs/r/sesv2_email_identity.html.markdown index 234d6c88e3a5..290d565509f2 100644 --- a/website/docs/r/sesv2_email_identity.html.markdown +++ b/website/docs/r/sesv2_email_identity.html.markdown @@ -92,7 +92,7 @@ This resource exports the following attributes in addition to the arguments abov * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identity_type` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). -* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. +* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verified_for_sending_status` - Specifies whether or not the identity is verified. ## Import From be4b43eb5d0618ab4d8c8880d0c998dec86885cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:24:41 -0400 Subject: [PATCH 0873/2115] Fix semgrep 'ci.calling-fmt.Print-and-variants'. --- .../service/ecs/test-fixtures/sigint_helper.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/service/ecs/test-fixtures/sigint_helper.go b/internal/service/ecs/test-fixtures/sigint_helper.go index e0d7279177f2..0fcb50443996 100644 --- a/internal/service/ecs/test-fixtures/sigint_helper.go +++ b/internal/service/ecs/test-fixtures/sigint_helper.go @@ -4,22 +4,23 @@ import ( "fmt" "os" "os/exec" - "regexp" "strconv" "strings" "syscall" "time" + + "github.com/YakDriver/regexache" ) func main() { if len(os.Args) < 2 { - fmt.Println("Usage: go run sigint_helper.go ") + fmt.Println("Usage: go run sigint_helper.go ") // nosemgrep:ci.calling-fmt.Print-and-variants os.Exit(1) } delay, err := strconv.Atoi(os.Args[1]) if err != nil { - fmt.Printf("Invalid delay: %v\n", err) + fmt.Printf("Invalid delay: %v\n", err) // nosemgrep:ci.calling-fmt.Print-and-variants os.Exit(1) } @@ -29,12 +30,12 @@ func main() { cmd := exec.Command("ps", "aux") output, err := cmd.Output() if err != nil { - fmt.Printf("Error running ps: %v\n", err) + fmt.Printf("Error running ps: %v\n", err) // nosemgrep:ci.calling-fmt.Print-and-variants os.Exit(1) } lines := strings.Split(string(output), "\n") - re := regexp.MustCompile(`/opt/homebrew/bin/terraform apply.*-auto-approve`) + re := regexache.MustCompile(`/opt/homebrew/bin/terraform apply.*-auto-approve`) for _, line := range lines { if re.MatchString(line) && !strings.Contains(line, "sigint_helper") { @@ -45,12 +46,12 @@ func main() { continue } - fmt.Printf("Sending SIGINT to PID %d: %s\n", pid, line) + fmt.Printf("Sending SIGINT to PID %d: %s\n", pid, line) // nosemgrep:ci.calling-fmt.Print-and-variants syscall.Kill(pid, syscall.SIGINT) return } } } - fmt.Println("No matching terraform process found") + fmt.Println("No matching terraform process found") // nosemgrep:ci.calling-fmt.Print-and-variants } From 83156c9125ad884b69900929478435064a3f4e11 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:26:47 -0400 Subject: [PATCH 0874/2115] Fix golangci-lint 'errcheck'. --- internal/service/ecs/service_test.go | 2 +- internal/service/ecs/test-fixtures/sigint_helper.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 9752c17ef333..c9caf0677bff 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1105,7 +1105,7 @@ func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { Config: testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName, false), PreConfig: func() { go func() { - exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() + _ = exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() }() }, ExpectError: regexache.MustCompile("execution halted|context canceled"), diff --git a/internal/service/ecs/test-fixtures/sigint_helper.go b/internal/service/ecs/test-fixtures/sigint_helper.go index 0fcb50443996..b234a8852726 100644 --- a/internal/service/ecs/test-fixtures/sigint_helper.go +++ b/internal/service/ecs/test-fixtures/sigint_helper.go @@ -47,7 +47,7 @@ func main() { } fmt.Printf("Sending SIGINT to PID %d: %s\n", pid, line) // nosemgrep:ci.calling-fmt.Print-and-variants - syscall.Kill(pid, syscall.SIGINT) + _ = syscall.Kill(pid, syscall.SIGINT) return } } From c05ab4d4f57a66f08ca06c79eeb3b302eb9668f9 Mon Sep 17 00:00:00 2001 From: Kishan Gajjar Date: Tue, 26 Aug 2025 15:24:25 -0400 Subject: [PATCH 0875/2115] Incorporate PR feedback --- internal/service/ecs/service.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 38b0488f69c5..a63039a8449d 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1103,7 +1103,7 @@ func resourceService() *schema.Resource { }, names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), - "sigint_cancellation": { + "sigint_rollback": { Type: schema.TypeBool, Optional: true, }, @@ -1438,7 +1438,7 @@ func resourceServiceCreate(ctx context.Context, d *schema.ResourceData, meta any d.Set(names.AttrARN, output.Service.ServiceArn) if d.Get("wait_for_steady_state").(bool) { - if _, err := waitServiceStable(ctx, conn, d.Id(), d.Get("cluster").(string), operationTime, d.Get("sigint_cancellation").(bool), d.Timeout(schema.TimeoutCreate)); err != nil { + if _, err := waitServiceStable(ctx, conn, d.Id(), d.Get("cluster").(string), operationTime, d.Get("sigint_rollback").(bool), d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for ECS Service (%s) create: %s", d.Id(), err) } } else if _, err := waitServiceActive(ctx, conn, d.Id(), d.Get("cluster").(string), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -1805,7 +1805,7 @@ func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any } if d.Get("wait_for_steady_state").(bool) { - if _, err := waitServiceStable(ctx, conn, d.Id(), cluster, operationTime, d.Get("sigint_cancellation").(bool), d.Timeout(schema.TimeoutUpdate)); err != nil { + if _, err := waitServiceStable(ctx, conn, d.Id(), cluster, operationTime, d.Get("sigint_rollback").(bool), d.Timeout(schema.TimeoutUpdate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for ECS Service (%s) update: %s", d.Id(), err) } } else if _, err := waitServiceActive(ctx, conn, d.Id(), cluster, d.Timeout(schema.TimeoutUpdate)); err != nil { @@ -2159,7 +2159,7 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa } } - if sigintConfig.rollbackRequested && !sigintConfig.rollbackRoutineStarted { + if sigintConfig.rollbackConfigured && !sigintConfig.rollbackRoutineStarted { sigintConfig.waitGroup.Add(1) go rollbackRoutine(ctx, conn, sigintConfig, primaryDeploymentArn) sigintConfig.rollbackRoutineStarted = true @@ -2257,7 +2257,7 @@ func findDeploymentStatus(ctx context.Context, conn *ecs.Client, deploymentArn s } type rollbackState struct { - rollbackRequested bool + rollbackConfigured bool rollbackRoutineStarted bool rollbackRoutineStopped chan struct{} waitGroup sync.WaitGroup @@ -2272,10 +2272,10 @@ func rollbackRoutine(ctx context.Context, conn *ecs.Client, rollbackState *rollb cancelContext, cancelFunc := context.WithTimeout(context.Background(), (1 * time.Hour)) // Maximum time before SIGKILL defer cancelFunc() - if err := rollbackBlueGreenDeployment(cancelContext, conn, primaryDeploymentArn); err != nil { + if err := rollbackDeployment(cancelContext, conn, primaryDeploymentArn); err != nil { log.Printf("[ERROR] Failed to rollback deployment: %s. Err: %s", *primaryDeploymentArn, err) } else { - log.Printf("[INFO] Blue/green deployment: %s rolled back successfully.", *primaryDeploymentArn) + log.Printf("[INFO] Deployment: %s rolled back successfully.", *primaryDeploymentArn) } case <-rollbackState.rollbackRoutineStopped: @@ -2283,7 +2283,7 @@ func rollbackRoutine(ctx context.Context, conn *ecs.Client, rollbackState *rollb } } -func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, primaryDeploymentArn *string) error { +func rollbackDeployment(ctx context.Context, conn *ecs.Client, primaryDeploymentArn *string) error { // Check if deployment is already in terminal state, meaning rollback is not needed deploymentStatus, err := findDeploymentStatus(ctx, conn, *primaryDeploymentArn) if err != nil { @@ -2293,7 +2293,7 @@ func rollbackBlueGreenDeployment(ctx context.Context, conn *ecs.Client, primaryD return nil } - log.Printf("[INFO] Rolling back blue/green deployment. This may take a few minutes...") + log.Printf("[INFO] Rolling back deployment %s. This may take a few minutes...", *primaryDeploymentArn) input := &ecs.StopServiceDeploymentInput{ ServiceDeploymentArn: primaryDeploymentArn, @@ -2332,7 +2332,7 @@ func waitForDeploymentTerminalStatus(ctx context.Context, conn *ecs.Client, prim // Does not return tags. func waitServiceStable(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string, operationTime time.Time, sigintCancellation bool, timeout time.Duration) (*awstypes.Service, error) { //nolint:unparam sigintConfig := &rollbackState{ - rollbackRequested: sigintCancellation, + rollbackConfigured: sigintCancellation, rollbackRoutineStarted: false, rollbackRoutineStopped: make(chan struct{}), waitGroup: sync.WaitGroup{}, From 3cb072ac13a6dd426d0781729e6253b89755b93f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:33:04 -0400 Subject: [PATCH 0876/2115] Fix golangci-lint 'contextcheck'. --- internal/service/ecs/service.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 9b7b5e64a941..b0ecb08d0cfe 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -2268,10 +2268,10 @@ func rollbackRoutine(ctx context.Context, conn *ecs.Client, rollbackState *rollb select { case <-ctx.Done(): log.Printf("[INFO] SIGINT detected. Initiating rollback for deployment: %s", *primaryDeploymentArn) - cancelContext, cancelFunc := context.WithTimeout(context.Background(), (1 * time.Hour)) // Maximum time before SIGKILL - defer cancelFunc() + ctx, cancel := context.WithTimeout(context.Background(), (1 * time.Hour)) // Maximum time before SIGKILL + defer cancel() - if err := rollbackBlueGreenDeployment(cancelContext, conn, primaryDeploymentArn); err != nil { + if err := rollbackBlueGreenDeployment(ctx, conn, primaryDeploymentArn); err != nil { //nolint:contextcheck // Original Context has been cancelled log.Printf("[ERROR] Failed to rollback deployment: %s. Err: %s", *primaryDeploymentArn, err) } else { log.Printf("[INFO] Blue/green deployment: %s rolled back successfully.", *primaryDeploymentArn) From ffdeb1e4bfffc01b597503aa7c1ce2a768ce419d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:33:36 -0400 Subject: [PATCH 0877/2115] 'testAccCheckServiceRemoveDeploymentConfiguration' is unused. --- internal/service/ecs/service_test.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index c9caf0677bff..2308fa51e519 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -2767,21 +2767,6 @@ func testAccCheckServiceDisableServiceConnect(ctx context.Context, service *awst } } -func testAccCheckServiceRemoveDeploymentConfiguration(ctx context.Context, service *awstypes.Service) resource.TestCheckFunc { - return func(s *terraform.State) error { - conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) - - input := &ecs.UpdateServiceInput{ - Cluster: service.ClusterArn, - Service: service.ServiceName, - DeploymentConfiguration: &awstypes.DeploymentConfiguration{}, - } - - _, err := conn.UpdateService(ctx, input) - return err - } -} - func testAccCheckServiceRemoveBlueGreenDeploymentConfigurations(ctx context.Context, service *awstypes.Service) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) From 580e6fb86550d465a1876306192515f59e627528 Mon Sep 17 00:00:00 2001 From: djglaser Date: Tue, 26 Aug 2025 15:33:39 -0400 Subject: [PATCH 0878/2115] Change sigint schema name in acceptance test config --- internal/service/ecs/service_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 6d87b57df0b3..012d840e88b9 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -3739,7 +3739,7 @@ resource "aws_ecs_service" "test" { } } - sigint_cancellation = true + sigint_rollback = true wait_for_steady_state = true depends_on = [ From b2e60605b02f3b4b3b707ad1f9756634e2735493 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 15 Aug 2025 10:59:05 -0400 Subject: [PATCH 0879/2115] Add parameterized resource identity to `aws_route` Adds parameterized resource identity to the `aws_route` resource. --- .changelog/43910.txt | 3 + internal/service/ec2/service_package_gen.go | 10 + .../ec2/testdata/Route/basic/main_gen.tf | 26 ++ .../testdata/Route/basic_v6.8.0/main_gen.tf | 36 +++ .../Route/region_override/main_gen.tf | 40 +++ .../ec2/testdata/tmpl/vpc_route_basic.gtpl | 21 ++ internal/service/ec2/vpc_route.go | 87 ++++-- .../ec2/vpc_route_identity_gen_test.go | 272 ++++++++++++++++++ 8 files changed, 470 insertions(+), 25 deletions(-) create mode 100644 .changelog/43910.txt create mode 100644 internal/service/ec2/testdata/Route/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/Route/region_override/main_gen.tf create mode 100644 internal/service/ec2/testdata/tmpl/vpc_route_basic.gtpl create mode 100644 internal/service/ec2/vpc_route_identity_gen_test.go diff --git a/.changelog/43910.txt b/.changelog/43910.txt new file mode 100644 index 000000000000..d8963d4b4c67 --- /dev/null +++ b/.changelog/43910.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_route: Add resource identity support +``` diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index 9abecc066055..b540b4d34265 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -1404,6 +1404,16 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_route", Name: "Route", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("route_table_id", true), + inttypes.StringIdentityAttribute("destination_ipv6_cidr_block", false), + inttypes.StringIdentityAttribute("destination_cidr_block", false), + inttypes.StringIdentityAttribute("destination_prefix_list_id", false), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: routeImportID{}, + }, }, { Factory: resourceRouteTable, diff --git a/internal/service/ec2/testdata/Route/basic/main_gen.tf b/internal/service/ec2/testdata/Route/basic/main_gen.tf new file mode 100644 index 000000000000..45e128db766e --- /dev/null +++ b/internal/service/ec2/testdata/Route/basic/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route" "test" { + route_table_id = aws_route_table.test.id + destination_cidr_block = "10.3.0.0/16" + gateway_id = aws_internet_gateway.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" +} + +resource "aws_internet_gateway" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_route_table" "test" { + vpc_id = aws_vpc.test.id +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf b/internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf new file mode 100644 index 000000000000..ff929a8aaf88 --- /dev/null +++ b/internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route" "test" { + route_table_id = aws_route_table.test.id + destination_cidr_block = "10.3.0.0/16" + gateway_id = aws_internet_gateway.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.1.0.0/16" +} + +resource "aws_internet_gateway" "test" { + vpc_id = aws_vpc.test.id +} + +resource "aws_route_table" "test" { + vpc_id = aws_vpc.test.id +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.8.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/Route/region_override/main_gen.tf b/internal/service/ec2/testdata/Route/region_override/main_gen.tf new file mode 100644 index 000000000000..ed4bd6c2488f --- /dev/null +++ b/internal/service/ec2/testdata/Route/region_override/main_gen.tf @@ -0,0 +1,40 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route" "test" { + region = var.region + + route_table_id = aws_route_table.test.id + destination_cidr_block = "10.3.0.0/16" + gateway_id = aws_internet_gateway.test.id +} + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.1.0.0/16" +} + +resource "aws_internet_gateway" "test" { + region = var.region + + vpc_id = aws_vpc.test.id +} + +resource "aws_route_table" "test" { + region = var.region + + vpc_id = aws_vpc.test.id +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/tmpl/vpc_route_basic.gtpl b/internal/service/ec2/testdata/tmpl/vpc_route_basic.gtpl new file mode 100644 index 000000000000..673e7be52995 --- /dev/null +++ b/internal/service/ec2/testdata/tmpl/vpc_route_basic.gtpl @@ -0,0 +1,21 @@ +resource "aws_route" "test" { +{{- template "region" }} + route_table_id = aws_route_table.test.id + destination_cidr_block = "10.3.0.0/16" + gateway_id = aws_internet_gateway.test.id +} + +resource "aws_vpc" "test" { +{{- template "region" }} + cidr_block = "10.1.0.0/16" +} + +resource "aws_internet_gateway" "test" { +{{- template "region" }} + vpc_id = aws_vpc.test.id +} + +resource "aws_route_table" "test" { +{{- template "region" }} + vpc_id = aws_vpc.test.id +} diff --git a/internal/service/ec2/vpc_route.go b/internal/service/ec2/vpc_route.go index 60e7859a7037..c8128c406454 100644 --- a/internal/service/ec2/vpc_route.go +++ b/internal/service/ec2/vpc_route.go @@ -19,6 +19,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -49,6 +50,13 @@ var routeValidTargets = []string{ } // @SDKResource("aws_route", name="Route") +// @IdentityAttribute("route_table_id") +// @IdentityAttribute("destination_ipv6_cidr_block", optional="true") +// @IdentityAttribute("destination_cidr_block", optional="true") +// @IdentityAttribute("destination_prefix_list_id", optional="true") +// @ImportIDHandler("routeImportID") +// @Testing(preIdentityVersion="6.8.0") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;types.Route") func resourceRoute() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRouteCreate, @@ -56,10 +64,6 @@ func resourceRoute() *schema.Resource { UpdateWithoutTimeout: resourceRouteUpdate, DeleteWithoutTimeout: resourceRouteDelete, - Importer: &schema.ResourceImporter{ - StateContext: resourceRouteImport, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(5 * time.Minute), Update: schema.DefaultTimeout(2 * time.Minute), @@ -483,27 +487,27 @@ func resourceRouteDelete(ctx context.Context, d *schema.ResourceData, meta any) return diags } -func resourceRouteImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - idParts := strings.Split(d.Id(), "_") - if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("unexpected format of ID (%q), expected ROUTETABLEID_DESTINATION", d.Id()) - } - - routeTableID := idParts[0] - destination := idParts[1] - d.Set("route_table_id", routeTableID) - if strings.Contains(destination, ":") { - d.Set(routeDestinationIPv6CIDRBlock, destination) - } else if strings.Contains(destination, ".") { - d.Set(routeDestinationCIDRBlock, destination) - } else { - d.Set(routeDestinationPrefixListID, destination) - } - - d.SetId(routeCreateID(routeTableID, destination)) - - return []*schema.ResourceData{d}, nil -} +// func resourceRouteImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { +// idParts := strings.Split(d.Id(), "_") +// if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { +// return nil, fmt.Errorf("unexpected format of ID (%q), expected ROUTETABLEID_DESTINATION", d.Id()) +// } +// +// routeTableID := idParts[0] +// destination := idParts[1] +// d.Set("route_table_id", routeTableID) +// if strings.Contains(destination, ":") { +// d.Set(routeDestinationIPv6CIDRBlock, destination) +// } else if strings.Contains(destination, ".") { +// d.Set(routeDestinationCIDRBlock, destination) +// } else { +// d.Set(routeDestinationPrefixListID, destination) +// } +// +// d.SetId(routeCreateID(routeTableID, destination)) +// +// return []*schema.ResourceData{d}, nil +// } // routeDestinationAttribute returns the attribute key and value of the route's destination. func routeDestinationAttribute(d *schema.ResourceData) (string, string, error) { @@ -527,3 +531,36 @@ func routeTargetAttribute(d *schema.ResourceData) (string, string, error) { return "", "", fmt.Errorf("route target attribute not specified") } + +var _ inttypes.SDKv2ImportID = routeImportID{} + +type routeImportID struct{} + +func (routeImportID) Create(d *schema.ResourceData) string { + // TODO: can we implement any error handling here? + _, destination, _ := routeDestinationAttribute(d) + routeTableID := d.Get("route_table_id").(string) + return routeCreateID(routeTableID, destination) +} + +func (routeImportID) Parse(id string) (string, map[string]string, error) { + parts := strings.Split(id, "_") + if len(parts) != 2 || parts[0] == "" || parts[1] == "" { + return "", nil, fmt.Errorf("unexpected format of ID (%q), expected ROUTETABLEID_DESTINATION", id) + } + + routeTableID := parts[0] + destination := parts[1] + result := map[string]string{ + "route_table_id": routeTableID, + } + if strings.Contains(destination, ":") { + result[routeDestinationIPv6CIDRBlock] = destination + } else if strings.Contains(destination, ".") { + result[routeDestinationCIDRBlock] = destination + } else { + result[routeDestinationPrefixListID] = destination + } + + return id, result, nil +} diff --git a/internal/service/ec2/vpc_route_identity_gen_test.go b/internal/service/ec2/vpc_route_identity_gen_test.go new file mode 100644 index 000000000000..91a8fd820d3f --- /dev/null +++ b/internal/service/ec2/vpc_route_identity_gen_test.go @@ -0,0 +1,272 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCRoute_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Route + resourceName := "aws_route.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckRouteDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRouteExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "route_table_id": knownvalue.NotNull(), + "destination_ipv6_cidr_block": knownvalue.Null(), + "destination_cidr_block": knownvalue.Null(), + "destination_prefix_list_id": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_route.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "route_table_id": knownvalue.NotNull(), + "destination_ipv6_cidr_block": knownvalue.Null(), + "destination_cidr_block": knownvalue.Null(), + "destination_prefix_list_id": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.8.0 +func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.Route + resourceName := "aws_route.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckRouteDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Route/basic_v6.8.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRouteExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "route_table_id": knownvalue.NotNull(), + "destination_ipv6_cidr_block": knownvalue.Null(), + "destination_cidr_block": knownvalue.Null(), + "destination_prefix_list_id": knownvalue.Null(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), + }, + }, + }, + }) +} From 4ef046c2494223fcbcddc9bfcf57172e8bafa4db Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 13:44:56 -0400 Subject: [PATCH 0880/2115] Add parameterized resource identity to `aws_route53_resolver_rule` ```console % make testacc PKG=route53resolver TESTS=TestAccRoute53ResolverRule_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/route53resolver/... -v -count 1 -parallel 20 -run='TestAccRoute53ResolverRule_' -timeout 360m -vet=off 2025/08/26 13:33:33 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 13:33:34 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccRoute53ResolverRule_disappears (25.70s) --- PASS: TestAccRoute53ResolverRule_trailingDotDomainName (29.77s) --- PASS: TestAccRoute53ResolverRule_justDotDomainName (30.65s) --- PASS: TestAccRoute53ResolverRule_basic (31.06s) --- PASS: TestAccRoute53ResolverRule_Identity_RegionOverride (36.37s) --- PASS: TestAccRoute53ResolverRule_Identity_Basic (39.02s) --- PASS: TestAccRoute53ResolverRule_updateName (39.38s) --- PASS: TestAccRoute53ResolverRule_tags (49.02s) --- PASS: TestAccRoute53ResolverRule_Identity_ExistingResource (51.98s) --- PASS: TestAccRoute53ResolverRule_forward_ipv6 (285.37s) --- PASS: TestAccRoute53ResolverRule_forwardMultiProtocol (289.11s) --- PASS: TestAccRoute53ResolverRule_forward (291.60s) --- PASS: TestAccRoute53ResolverRule_forwardEndpointRecreate (461.17s) --- PASS: TestAccRoute53ResolverRule_forwardEndpointRecreate_ipv6 (473.30s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/route53resolver 480.063s ``` --- internal/service/route53resolver/generate.go | 1 + internal/service/route53resolver/rule.go | 8 +- .../route53resolver/rule_identity_gen_test.go | 250 ++++++++++++++++++ .../route53resolver/service_package_gen.go | 6 +- .../testdata/Rule/basic/main_gen.tf | 13 + .../testdata/Rule/basic_v6.10.0/main_gen.tf | 23 ++ .../testdata/Rule/region_override/main_gen.tf | 21 ++ .../testdata/tmpl/rule_tags.gtpl | 6 + 8 files changed, 323 insertions(+), 5 deletions(-) create mode 100644 internal/service/route53resolver/rule_identity_gen_test.go create mode 100644 internal/service/route53resolver/testdata/Rule/basic/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/Rule/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/Rule/region_override/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/tmpl/rule_tags.gtpl diff --git a/internal/service/route53resolver/generate.go b/internal/service/route53resolver/generate.go index 04fa4f003ec1..d41ae512e734 100644 --- a/internal/service/route53resolver/generate.go +++ b/internal/service/route53resolver/generate.go @@ -3,6 +3,7 @@ //go:generate go run ../../generate/tags/main.go -ListTags -ListTagsOpPaginated -ServiceTagsSlice -UpdateTags //go:generate go run ../../generate/servicepackage/main.go +//go:generate go run ../../generate/identitytests/main.go // ONLY generate directives and package declaration! Do not add anything else to this file. package route53resolver diff --git a/internal/service/route53resolver/rule.go b/internal/service/route53resolver/rule.go index 831e697d6bab..70f9aad0c317 100644 --- a/internal/service/route53resolver/rule.go +++ b/internal/service/route53resolver/rule.go @@ -29,6 +29,10 @@ import ( // @SDKResource("aws_route53_resolver_rule", name="Rule") // @Tags(identifierAttribute="arn") +// @IdentityAttribute("id") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/route53resolver/types;awstypes.ResolverRule") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(generator="github.com/hashicorp/terraform-provider-aws/internal/acctest;acctest.RandomDomainName()") func resourceRule() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRuleCreate, @@ -36,10 +40,6 @@ func resourceRule() *schema.Resource { UpdateWithoutTimeout: resourceRuleUpdate, DeleteWithoutTimeout: resourceRuleDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/route53resolver/rule_identity_gen_test.go b/internal/service/route53resolver/rule_identity_gen_test.go new file mode 100644 index 000000000000..1a9ae0e6f396 --- /dev/null +++ b/internal/service/route53resolver/rule_identity_gen_test.go @@ -0,0 +1,250 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package route53resolver_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccRoute53ResolverRule_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.ResolverRule + resourceName := "aws_route53_resolver_rule.test" + rName := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: testAccCheckRuleDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccRoute53ResolverRule_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_route53_resolver_rule.test" + rName := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccRoute53ResolverRule_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.ResolverRule + resourceName := "aws_route53_resolver_rule.test" + rName := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: testAccCheckRuleDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Rule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index 6ae05262c92d..7c1f6565d4ac 100644 --- a/internal/service/route53resolver/service_package_gen.go +++ b/internal/service/route53resolver/service_package_gen.go @@ -169,7 +169,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceRuleAssociation, diff --git a/internal/service/route53resolver/testdata/Rule/basic/main_gen.tf b/internal/service/route53resolver/testdata/Rule/basic/main_gen.tf new file mode 100644 index 000000000000..cce87910b73b --- /dev/null +++ b/internal/service/route53resolver/testdata/Rule/basic/main_gen.tf @@ -0,0 +1,13 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule" "test" { + domain_name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/route53resolver/testdata/Rule/basic_v6.10.0/main_gen.tf b/internal/service/route53resolver/testdata/Rule/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..1edbe975583e --- /dev/null +++ b/internal/service/route53resolver/testdata/Rule/basic_v6.10.0/main_gen.tf @@ -0,0 +1,23 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule" "test" { + domain_name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/route53resolver/testdata/Rule/region_override/main_gen.tf b/internal/service/route53resolver/testdata/Rule/region_override/main_gen.tf new file mode 100644 index 000000000000..d08d5d2696e9 --- /dev/null +++ b/internal/service/route53resolver/testdata/Rule/region_override/main_gen.tf @@ -0,0 +1,21 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule" "test" { + region = var.region + + domain_name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/route53resolver/testdata/tmpl/rule_tags.gtpl b/internal/service/route53resolver/testdata/tmpl/rule_tags.gtpl new file mode 100644 index 000000000000..cdde86441707 --- /dev/null +++ b/internal/service/route53resolver/testdata/tmpl/rule_tags.gtpl @@ -0,0 +1,6 @@ +resource "aws_route53_resolver_rule" "test" { +{{- template "region" }} + domain_name = var.rName + rule_type = "SYSTEM" +{{- template "tags" }} +} From 5abe3f0e535bd3a8103978db6f7a5e8b1ed536c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:48:36 -0400 Subject: [PATCH 0881/2115] Add copyright header. --- internal/service/ecs/test-fixtures/sigint_helper.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/ecs/test-fixtures/sigint_helper.go b/internal/service/ecs/test-fixtures/sigint_helper.go index b234a8852726..d68f8e0b802e 100644 --- a/internal/service/ecs/test-fixtures/sigint_helper.go +++ b/internal/service/ecs/test-fixtures/sigint_helper.go @@ -1,3 +1,6 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + package main import ( From f9a45ff1bc95c1578849e5aa0d5932935b5196aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 15:49:36 -0400 Subject: [PATCH 0882/2115] Fix terrafmt errors. --- website/docs/r/ecs_service.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 5a1482d060e0..2adad8d330f2 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -106,8 +106,9 @@ resource "aws_ecs_service" "example" { ```terraform resource "aws_ecs_service" "example" { - name = "example" - cluster = aws_ecs_cluster.example.id + name = "example" + cluster = aws_ecs_cluster.example.id + # ... other configurations ... deployment_configuration { From 295827d950daedbf489ddc3c70663fe65283e445 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 16:01:48 -0400 Subject: [PATCH 0883/2115] Minimize diffs. --- internal/service/ecs/service.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index af1cbc383e1c..45525a12f340 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1799,6 +1799,7 @@ func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta any return false, err }, ) + if err != nil { return sdkdiag.AppendErrorf(diags, "updating ECS Service (%s): %s", d.Id(), err) } @@ -1846,6 +1847,7 @@ func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta any } _, err := conn.UpdateService(ctx, input) + if err != nil { return sdkdiag.AppendErrorf(diags, "draining ECS Service (%s): %s", d.Id(), err) } @@ -1872,6 +1874,7 @@ func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta any return false, err }, ) + if err != nil { return sdkdiag.AppendErrorf(diags, "deleting ECS Service (%s): %s", d.Id(), err) } @@ -1945,6 +1948,7 @@ func retryServiceCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create return false, err }, ) + if err != nil { return nil, err } @@ -1954,6 +1958,7 @@ func retryServiceCreate(ctx context.Context, conn *ecs.Client, input *ecs.Create func findService(ctx context.Context, conn *ecs.Client, input *ecs.DescribeServicesInput) (*awstypes.Service, error) { output, err := findServices(ctx, conn, input) + if err != nil { return nil, err } @@ -2120,6 +2125,7 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa return func() (any, string, error) { outputRaw, serviceStatus, err := statusService(ctx, conn, serviceName, clusterNameOrARN)() + if err != nil { return nil, "", err } @@ -2133,8 +2139,8 @@ func statusServiceWaitForStable(ctx context.Context, conn *ecs.Client, serviceNa if primaryTaskSet == nil { primaryTaskSet = findPrimaryTaskSet(output.Deployments) - if primaryTaskSet != nil && (*primaryTaskSet).CreatedAt != nil { - createdAtUTC := (*primaryTaskSet).CreatedAt.UTC() + if primaryTaskSet != nil && primaryTaskSet.CreatedAt != nil { + createdAtUTC := primaryTaskSet.CreatedAt.UTC() isNewPrimaryDeployment = createdAtUTC.After(operationTime) } } From 8c0b5c34ab3749e0bf7287dc8916ce1bd036780e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 26 Aug 2025 16:12:07 -0400 Subject: [PATCH 0884/2115] Fix providerlint 'XR007: avoid os/exec.Command'. --- internal/service/ecs/service_test.go | 2 +- internal/service/ecs/test-fixtures/sigint_helper.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 6294ed95c283..093b7a90c8e7 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1105,7 +1105,7 @@ func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { Config: testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName, false), PreConfig: func() { go func() { - _ = exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() + _ = exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() //lintignore:XR007 }() }, ExpectError: regexache.MustCompile("execution halted|context canceled"), diff --git a/internal/service/ecs/test-fixtures/sigint_helper.go b/internal/service/ecs/test-fixtures/sigint_helper.go index d68f8e0b802e..b4d42bb56d20 100644 --- a/internal/service/ecs/test-fixtures/sigint_helper.go +++ b/internal/service/ecs/test-fixtures/sigint_helper.go @@ -30,7 +30,7 @@ func main() { time.Sleep(time.Duration(delay) * time.Second) // Find terraform process doing apply - cmd := exec.Command("ps", "aux") + cmd := exec.Command("ps", "aux") //lintignore:XR007 output, err := cmd.Output() if err != nil { fmt.Printf("Error running ps: %v\n", err) // nosemgrep:ci.calling-fmt.Print-and-variants From 8e0b2a8d6d411cf817db7415d6c3ae63668cc3cb Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 16:27:15 -0400 Subject: [PATCH 0885/2115] Add parameterized resource identity to `aws_route53_resolver_rule_association` ```console % make testacc PKG=route53resolver TESTS=TestAccRoute53ResolverRuleAssociation_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/route53resolver/... -v -count 1 -parallel 20 -run='TestAccRoute53ResolverRuleAssociation_' -timeout 360m -vet=off 2025/08/26 15:45:42 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 15:45:42 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccRoute53ResolverRuleAssociation_Disappears_vpc (179.51s) --- PASS: TestAccRoute53ResolverRuleAssociation_Identity_Basic (181.52s) --- PASS: TestAccRoute53ResolverRuleAssociation_basic (182.13s) --- PASS: TestAccRoute53ResolverRuleAssociation_disappears (189.93s) --- PASS: TestAccRoute53ResolverRuleAssociation_Identity_ExistingResource (207.61s) --- PASS: TestAccRoute53ResolverRuleAssociation_Identity_RegionOverride (215.88s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/route53resolver 222.364s ``` --- .../route53resolver/rule_association.go | 8 +- .../rule_association_identity_gen_test.go | 264 ++++++++++++++++++ .../route53resolver/service_package_gen.go | 4 + .../RuleAssociation/basic/main_gen.tf | 31 ++ .../RuleAssociation/basic_v6.10.0/main_gen.tf | 41 +++ .../region_override/main_gen.tf | 43 +++ .../testdata/tmpl/rule_association_basic.gtpl | 20 ++ 7 files changed, 407 insertions(+), 4 deletions(-) create mode 100644 internal/service/route53resolver/rule_association_identity_gen_test.go create mode 100644 internal/service/route53resolver/testdata/RuleAssociation/basic/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/RuleAssociation/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/RuleAssociation/region_override/main_gen.tf create mode 100644 internal/service/route53resolver/testdata/tmpl/rule_association_basic.gtpl diff --git a/internal/service/route53resolver/rule_association.go b/internal/service/route53resolver/rule_association.go index c0b46da6a611..553f2439b493 100644 --- a/internal/service/route53resolver/rule_association.go +++ b/internal/service/route53resolver/rule_association.go @@ -25,16 +25,16 @@ import ( ) // @SDKResource("aws_route53_resolver_rule_association", name="Rule Association") +// @IdentityAttribute("id") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/route53resolver/types;awstypes.ResolverRuleAssociation") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(domainTfVar="domain") func resourceRuleAssociation() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRuleAssociationCreate, ReadWithoutTimeout: resourceRuleAssociationRead, DeleteWithoutTimeout: resourceRuleAssociationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(10 * time.Minute), Delete: schema.DefaultTimeout(10 * time.Minute), diff --git a/internal/service/route53resolver/rule_association_identity_gen_test.go b/internal/service/route53resolver/rule_association_identity_gen_test.go new file mode 100644 index 000000000000..2829639f75e5 --- /dev/null +++ b/internal/service/route53resolver/rule_association_identity_gen_test.go @@ -0,0 +1,264 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package route53resolver_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/route53resolver/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccRoute53ResolverRuleAssociation_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.ResolverRuleAssociation + resourceName := "aws_route53_resolver_rule_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + domain := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: testAccCheckRuleAssociationDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRuleAssociationExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccRoute53ResolverRuleAssociation_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_route53_resolver_rule_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + domain := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccRoute53ResolverRuleAssociation_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.ResolverRuleAssociation + resourceName := "aws_route53_resolver_rule_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + domain := acctest.RandomDomainName() + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.Route53ResolverServiceID), + CheckDestroy: testAccCheckRuleAssociationDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckRuleAssociationExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/RuleAssociation/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "domain": config.StringVariable(domain), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index 7c1f6565d4ac..6935005face6 100644 --- a/internal/service/route53resolver/service_package_gen.go +++ b/internal/service/route53resolver/service_package_gen.go @@ -180,6 +180,10 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_route53_resolver_rule_association", Name: "Rule Association", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, } } diff --git a/internal/service/route53resolver/testdata/RuleAssociation/basic/main_gen.tf b/internal/service/route53resolver/testdata/RuleAssociation/basic/main_gen.tf new file mode 100644 index 000000000000..1a3c58e94c57 --- /dev/null +++ b/internal/service/route53resolver/testdata/RuleAssociation/basic/main_gen.tf @@ -0,0 +1,31 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule_association" "test" { + name = var.rName + resolver_rule_id = aws_route53_resolver_rule.test.id + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.6.0.0/16" + enable_dns_hostnames = true + enable_dns_support = true +} + +resource "aws_route53_resolver_rule" "test" { + domain_name = var.domain + name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +variable "domain" { + type = string + nullable = false +} + diff --git a/internal/service/route53resolver/testdata/RuleAssociation/basic_v6.10.0/main_gen.tf b/internal/service/route53resolver/testdata/RuleAssociation/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..879c27c75c16 --- /dev/null +++ b/internal/service/route53resolver/testdata/RuleAssociation/basic_v6.10.0/main_gen.tf @@ -0,0 +1,41 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule_association" "test" { + name = var.rName + resolver_rule_id = aws_route53_resolver_rule.test.id + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + cidr_block = "10.6.0.0/16" + enable_dns_hostnames = true + enable_dns_support = true +} + +resource "aws_route53_resolver_rule" "test" { + domain_name = var.domain + name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +variable "domain" { + type = string + nullable = false +} + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/route53resolver/testdata/RuleAssociation/region_override/main_gen.tf b/internal/service/route53resolver/testdata/RuleAssociation/region_override/main_gen.tf new file mode 100644 index 000000000000..0428ef236c4b --- /dev/null +++ b/internal/service/route53resolver/testdata/RuleAssociation/region_override/main_gen.tf @@ -0,0 +1,43 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_route53_resolver_rule_association" "test" { + region = var.region + + name = var.rName + resolver_rule_id = aws_route53_resolver_rule.test.id + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.6.0.0/16" + enable_dns_hostnames = true + enable_dns_support = true +} + +resource "aws_route53_resolver_rule" "test" { + region = var.region + + domain_name = var.domain + name = var.rName + rule_type = "SYSTEM" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +variable "domain" { + type = string + nullable = false +} + + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/route53resolver/testdata/tmpl/rule_association_basic.gtpl b/internal/service/route53resolver/testdata/tmpl/rule_association_basic.gtpl new file mode 100644 index 000000000000..31600c9aca0a --- /dev/null +++ b/internal/service/route53resolver/testdata/tmpl/rule_association_basic.gtpl @@ -0,0 +1,20 @@ +resource "aws_route53_resolver_rule_association" "test" { +{{- template "region" }} + name = var.rName + resolver_rule_id = aws_route53_resolver_rule.test.id + vpc_id = aws_vpc.test.id +} + +resource "aws_vpc" "test" { +{{- template "region" }} + cidr_block = "10.6.0.0/16" + enable_dns_hostnames = true + enable_dns_support = true +} + +resource "aws_route53_resolver_rule" "test" { +{{- template "region" }} + domain_name = var.domain + name = var.rName + rule_type = "SYSTEM" +} From 45789c093e15a25328bd318f2908bb534f4c3ed0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 16:51:55 -0400 Subject: [PATCH 0886/2115] r/aws_route53resolver(doc): add identity-based import sections --- .../r/route53_resolver_rule.html.markdown | 30 +++++++++++++++++-- ...53_resolver_rule_association.html.markdown | 26 ++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/website/docs/r/route53_resolver_rule.html.markdown b/website/docs/r/route53_resolver_rule.html.markdown index 1cec8dc1ebeb..d84f7a463212 100644 --- a/website/docs/r/route53_resolver_rule.html.markdown +++ b/website/docs/r/route53_resolver_rule.html.markdown @@ -93,11 +93,37 @@ Values are `NOT_SHARED`, `SHARED_BY_ME` or `SHARED_WITH_ME` ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule.example + identity = { + id = "rslvr-rr-0123456789abcdef0" + } +} + +resource "aws_route53_resolver_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rules using the `id`. For example: ```terraform import { - to = aws_route53_resolver_rule.sys + to = aws_route53_resolver_rule.example id = "rslvr-rr-0123456789abcdef0" } ``` @@ -105,5 +131,5 @@ import { Using `terraform import`, import Route53 Resolver rules using the `id`. For example: ```console -% terraform import aws_route53_resolver_rule.sys rslvr-rr-0123456789abcdef0 +% terraform import aws_route53_resolver_rule.example rslvr-rr-0123456789abcdef0 ``` diff --git a/website/docs/r/route53_resolver_rule_association.html.markdown b/website/docs/r/route53_resolver_rule_association.html.markdown index 70849bc6bc6a..8030615f3ebe 100644 --- a/website/docs/r/route53_resolver_rule_association.html.markdown +++ b/website/docs/r/route53_resolver_rule_association.html.markdown @@ -36,6 +36,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule_association.example + identity = { + id = "rslvr-rrassoc-97242eaf88example" + } +} + +resource "aws_route53_resolver_rule_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule association. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rule associations using the `id`. For example: ```terraform From a4b266464ff47a31062c90398db51304f9aeb9df Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 26 Aug 2025 16:55:05 -0400 Subject: [PATCH 0887/2115] chore: changelog --- .changelog/44048.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changelog/44048.txt diff --git a/.changelog/44048.txt b/.changelog/44048.txt new file mode 100644 index 000000000000..673c62d9964e --- /dev/null +++ b/.changelog/44048.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +resource/aws_route53_resolver_rule: Add resource identity support +``` +```release-note:enhancement +resource/aws_route53_resolver_rule_association: Add resource identity support +``` From 556ee185b59dc887151911eef2f17d80e4b888ef Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 07:40:09 +0900 Subject: [PATCH 0888/2115] Set performance_insights_kms_key_id when updating database_insights_mode --- internal/service/rds/instance.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index 971352a519da..ab53ccc5d2b6 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -2489,6 +2489,9 @@ func dbInstancePopulateModify(input *rds.ModifyDBInstanceInput, d *schema.Resour if d.HasChange("database_insights_mode") { input.DatabaseInsightsMode = types.DatabaseInsightsMode(d.Get("database_insights_mode").(string)) input.EnablePerformanceInsights = aws.Bool(d.Get("performance_insights_enabled").(bool)) + if v, ok := d.Get("performance_insights_kms_key_id").(string); ok && v != "" { + input.PerformanceInsightsKMSKeyId = aws.String(v) + } input.PerformanceInsightsRetentionPeriod = aws.Int32(int32(d.Get("performance_insights_retention_period").(int))) } From 8ad8697d026df1c37dd6ae5eeac97385372ea481 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 07:40:53 +0900 Subject: [PATCH 0889/2115] Add a test to update database_insights_mode when custome KMS key is used --- internal/service/rds/instance_test.go | 131 ++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/internal/service/rds/instance_test.go b/internal/service/rds/instance_test.go index f6f189647488..4baada4cf577 100644 --- a/internal/service/rds/instance_test.go +++ b/internal/service/rds/instance_test.go @@ -5571,6 +5571,88 @@ func TestAccRDSInstance_PerformanceInsights_kmsKeyID(t *testing.T) { }) } +func TestAccRDSInstance_PerformanceInsights_kmsKeyID_UpdateMode(t *testing.T) { + ctx := acctest.Context(t) + + // All RDS Instance tests should skip for testing.Short() except the 20 shortest running tests. + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var dbInstance types.DBInstance + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + kmsKeyResourceName := "aws_kms_key.test" + resourceName := "aws_db_instance.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPerformanceInsightsDefaultVersionPreCheck(ctx, t, tfrds.InstanceEngineMySQL) + }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_11_0), + }, + CheckDestroy: testAccCheckClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccInstanceConfig_performanceInsightsKMSKeyIDUpdateMode(rName, string(types.DatabaseInsightsModeStandard)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + resource.TestCheckResourceAttr(resourceName, "database_insights_mode", string(types.DatabaseInsightsModeStandard)), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + names.AttrApplyImmediately, + names.AttrPassword, + "skip_final_snapshot", + names.AttrFinalSnapshotIdentifier, + }, + }, + { + Config: testAccInstanceConfig_performanceInsightsKMSKeyIDUpdateMode(rName, string(types.DatabaseInsightsModeAdvanced)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + resource.TestCheckResourceAttr(resourceName, "database_insights_mode", string(types.DatabaseInsightsModeAdvanced)), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), + ), + }, + { + Config: testAccInstanceConfig_performanceInsightsKMSKeyIDUpdateMode(rName, string(types.DatabaseInsightsModeStandard)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), + resource.TestCheckResourceAttr(resourceName, "database_insights_mode", string(types.DatabaseInsightsModeStandard)), + resource.TestCheckResourceAttr(resourceName, "performance_insights_enabled", acctest.CtTrue), + resource.TestCheckResourceAttrPair(resourceName, "performance_insights_kms_key_id", kmsKeyResourceName, names.AttrARN), + ), + }, + }, + }) +} + func TestAccRDSInstance_PerformanceInsights_retentionPeriod(t *testing.T) { ctx := acctest.Context(t) @@ -13492,6 +13574,55 @@ resource "aws_db_instance" "test" { `, tfrds.InstanceEngineMySQL, mainInstanceClasses, rName)) } +func testAccInstanceConfig_performanceInsightsKMSKeyIDUpdateMode(rName, mode string) string { + var retentionPeriod int + switch mode { + case string(types.DatabaseInsightsModeStandard): + retentionPeriod = 7 + case string(types.DatabaseInsightsModeAdvanced): + retentionPeriod = 465 + } + return acctest.ConfigCompose( + acctest.ConfigRandomPassword(), + fmt.Sprintf(` +resource "aws_kms_key" "test" { + deletion_window_in_days = 7 + enable_key_rotation = true +} + +data "aws_rds_engine_version" "default" { + engine = %[1]q +} + +data "aws_rds_orderable_db_instance" "test" { + engine = data.aws_rds_engine_version.default.engine + engine_version = data.aws_rds_engine_version.default.version + license_model = "general-public-license" + storage_type = "standard" + supports_performance_insights = true + preferred_instance_classes = [%[2]s] +} + +resource "aws_db_instance" "test" { + allocated_storage = 5 + backup_retention_period = 0 + database_insights_mode = %[4]q + db_name = "mydb" + engine = data.aws_rds_engine_version.default.engine + engine_version = data.aws_rds_engine_version.default.version + identifier = %[3]q + instance_class = data.aws_rds_orderable_db_instance.test.instance_class + password_wo = ephemeral.aws_secretsmanager_random_password.test.random_password + password_wo_version = 1 + performance_insights_enabled = true + performance_insights_kms_key_id = aws_kms_key.test.arn + performance_insights_retention_period = %[5]d + skip_final_snapshot = true + username = "foo" +} +`, tfrds.InstanceEngineMySQL, mainInstanceClasses, rName, mode, retentionPeriod)) +} + func testAccInstanceConfig_performanceInsightsRetentionPeriod(rName string, performanceInsightsRetentionPeriod int) string { return acctest.ConfigCompose( acctest.ConfigRandomPassword(), From 4781e8fb34eae7d07c674211a9b8bee99c89e41b Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 27 Aug 2025 08:24:13 +0900 Subject: [PATCH 0890/2115] add changelog --- .changelog/44050.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44050.txt diff --git a/.changelog/44050.txt b/.changelog/44050.txt new file mode 100644 index 000000000000..f1f2d37ab9b3 --- /dev/null +++ b/.changelog/44050.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_db_instance: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key +``` From c63db471033fe587576abaa5df92b8adcb83003e Mon Sep 17 00:00:00 2001 From: Beru Date: Wed, 27 Aug 2025 11:19:26 +0200 Subject: [PATCH 0891/2115] Update sqs_queue.html.markdown Fix max_message_size maximum value allowed --- website/docs/r/sqs_queue.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/sqs_queue.html.markdown b/website/docs/r/sqs_queue.html.markdown index 3ed744e70025..c147586af4b9 100644 --- a/website/docs/r/sqs_queue.html.markdown +++ b/website/docs/r/sqs_queue.html.markdown @@ -112,7 +112,7 @@ This resource supports the following arguments: * `fifo_throughput_limit` - (Optional) Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. Valid values are `perQueue` (default) and `perMessageGroupId`. * `kms_data_key_reuse_period_seconds` - (Optional) Length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). The default is 300 (5 minutes). * `kms_master_key_id` - (Optional) ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. For more information, see [Key Terms](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-sse-key-terms). -* `max_message_size` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 262144 bytes (256 KiB). The default for this attribute is 262144 (256 KiB). +* `max_message_size` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 1048576 bytes (1024 KiB). The default for this attribute is 262144 (256 KiB). * `message_retention_seconds` - (Optional) Number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4 days). * `name` - (Optional) Name of the queue. Queue names must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens, and must be between 1 and 80 characters long. For a FIFO (first-in-first-out) queue, the name must end with the `.fifo` suffix. If omitted, Terraform will assign a random, unique name. Conflicts with `name_prefix`. * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. From c447256001309d5ca1e8d05af766fdf634b0e3f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 08:32:33 -0400 Subject: [PATCH 0892/2115] Add 'TestAccWorkSpacesWebTrustStoreAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 1 + .../workspacesweb/trust_store_association.go | 32 +++++-------- .../trust_store_association_test.go | 48 ++----------------- 3 files changed, 19 insertions(+), 62 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 607e287fdfc6..6a4c7b4224b2 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -16,6 +16,7 @@ var ( ResourceNetworkSettingsAssociation = newNetworkSettingsAssociationResource ResourcePortal = newPortalResource ResourceTrustStore = newTrustStoreResource + ResourceTrustStoreAssociation = newTrustStoreAssociationResource ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource ResourceUserAccessLoggingSettingsAssociation = newUserAccessLoggingSettingsAssociationResource ResourceUserSettings = newUserSettingsResource diff --git a/internal/service/workspacesweb/trust_store_association.go b/internal/service/workspacesweb/trust_store_association.go index a801ab0d69b0..fda6773b7890 100644 --- a/internal/service/workspacesweb/trust_store_association.go +++ b/internal/service/workspacesweb/trust_store_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newTrustStoreAssociationResource(_ context.Context) (resource.ResourceWithC return &trustStoreAssociationResource{}, nil } -const ( - ResNameTrustStoreAssociation = "Trust Store Association" -) - type trustStoreAssociationResource struct { framework.ResourceWithModel[trustStoreAssociationResourceModel] + framework.WithNoUpdate } func (r *trustStoreAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ - "trust_store_arn": schema.StringAttribute{ - Required: true, + "portal_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, - "portal_arn": schema.StringAttribute{ - Required: true, + "trust_store_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *trustStoreAssociationResource) Create(ctx context.Context, request reso _, err := conn.AssociateTrustStore(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameTrustStoreAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb Trust Store Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *trustStoreAssociationResource) Read(ctx context.Context, request resour } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameTrustStoreAssociation, data.TrustStoreARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Trust Store Association (%s)", data.TrustStoreARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *trustStoreAssociationResource) Read(ctx context.Context, request resour response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *trustStoreAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *trustStoreAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data trustStoreAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *trustStoreAssociationResource) Delete(ctx context.Context, request reso } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameTrustStoreAssociation, data.TrustStoreARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Trust Store Association (%s)", data.TrustStoreARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *trustStoreAssociationResource) ImportState(ctx context.Context, request type trustStoreAssociationResourceModel struct { framework.WithRegionModel - TrustStoreARN types.String `tfsdk:"trust_store_arn"` - PortalARN types.String `tfsdk:"portal_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` + TrustStoreARN fwtypes.ARN `tfsdk:"trust_store_arn"` } diff --git a/internal/service/workspacesweb/trust_store_association_test.go b/internal/service/workspacesweb/trust_store_association_test.go index a37a19438fc2..3e7d63309863 100644 --- a/internal/service/workspacesweb/trust_store_association_test.go +++ b/internal/service/workspacesweb/trust_store_association_test.go @@ -68,13 +68,10 @@ func TestAccWorkSpacesWebTrustStoreAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebTrustStoreAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebTrustStoreAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var trustStore1, trustStore2 awstypes.TrustStore + var trustStore awstypes.TrustStore resourceName := "aws_workspacesweb_trust_store_association.test" - trustStoreResourceName1 := "aws_workspacesweb_trust_store.test" - trustStoreResourceName2 := "aws_workspacesweb_trust_store.test2" - portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -89,18 +86,10 @@ func TestAccWorkSpacesWebTrustStoreAssociation_update(t *testing.T) { { Config: testAccTrustStoreAssociationConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore1), - resource.TestCheckResourceAttrPair(resourceName, "trust_store_arn", trustStoreResourceName1, "trust_store_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccTrustStoreAssociationConfig_updated(), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore2), - resource.TestCheckResourceAttrPair(resourceName, "trust_store_arn", trustStoreResourceName2, "trust_store_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckTrustStoreAssociationExists(ctx, resourceName, &trustStore), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceTrustStoreAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -240,30 +229,3 @@ resource "aws_workspacesweb_trust_store_association" "test" { } `) } - -func testAccTrustStoreAssociationConfig_updated() string { - return acctest.ConfigCompose( - testAccTrustStoreAssociationConfig_acmBase(), - ` -resource "aws_workspacesweb_portal" "test" { - display_name = "test" -} - -resource "aws_workspacesweb_trust_store" "test" { - certificate { - body = aws_acmpca_certificate.test1.certificate - } -} - -resource "aws_workspacesweb_trust_store" "test2" { - certificate { - body = aws_acmpca_certificate.test2.certificate - } -} - -resource "aws_workspacesweb_trust_store_association" "test" { - trust_store_arn = aws_workspacesweb_trust_store.test2.trust_store_arn - portal_arn = aws_workspacesweb_portal.test.portal_arn -} -`) -} From 507686acb976a501a440ecff9a8eb2a894923044 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 08:38:58 -0400 Subject: [PATCH 0893/2115] Correct CHANGELOG entry file name. --- .changelog/{43903.txt => 44045.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{43903.txt => 44045.txt} (100%) diff --git a/.changelog/43903.txt b/.changelog/44045.txt similarity index 100% rename from .changelog/43903.txt rename to .changelog/44045.txt From 86457d0f4dafbfe14887b88f096423dd2ce96406 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 08:42:12 -0400 Subject: [PATCH 0894/2115] aws_sesv2_email_identity: No need for 'string()' conversions. --- internal/service/sesv2/email_identity.go | 14 ++++++-------- .../service/sesv2/email_identity_data_source.go | 11 +++++------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/internal/service/sesv2/email_identity.go b/internal/service/sesv2/email_identity.go index 4b8a135890ab..0e964b7a62ae 100644 --- a/internal/service/sesv2/email_identity.go +++ b/internal/service/sesv2/email_identity.go @@ -6,7 +6,6 @@ package sesv2 import ( "context" "errors" - "fmt" "log" "time" @@ -164,7 +163,8 @@ func resourceEmailIdentityCreate(ctx context.Context, d *schema.ResourceData, me func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).SESV2Client(ctx) + c := meta.(*conns.AWSClient) + conn := c.SESV2Client(ctx) out, err := findEmailIdentityByID(ctx, conn, d.Id()) @@ -178,10 +178,9 @@ func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, resNameEmailIdentity, d.Id(), err) } - d.Set(names.AttrARN, emailIdentityARN(ctx, meta.(*conns.AWSClient), d.Id())) + d.Set(names.AttrARN, emailIdentityARN(ctx, c, d.Id())) d.Set("configuration_set_name", out.ConfigurationSetName) d.Set("email_identity", d.Id()) - if out.DkimAttributes != nil { tfMap := flattenDKIMAttributes(out.DkimAttributes) tfMap["domain_signing_private_key"] = d.Get("dkim_signing_attributes.0.domain_signing_private_key").(string) @@ -193,9 +192,8 @@ func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta } else { d.Set("dkim_signing_attributes", nil) } - - d.Set("identity_type", string(out.IdentityType)) - d.Set("verification_status", string(out.VerificationStatus)) + d.Set("identity_type", out.IdentityType) + d.Set("verification_status", out.VerificationStatus) d.Set("verified_for_sending_status", out.VerifiedForSendingStatus) return diags @@ -355,5 +353,5 @@ func flattenDKIMAttributes(apiObject *types.DkimAttributes) map[string]any { } func emailIdentityARN(ctx context.Context, c *conns.AWSClient, emailIdentityName string) string { - return c.RegionalARN(ctx, "ses", fmt.Sprintf("identity/%s", emailIdentityName)) + return c.RegionalARN(ctx, "ses", "identity/"+emailIdentityName) } diff --git a/internal/service/sesv2/email_identity_data_source.go b/internal/service/sesv2/email_identity_data_source.go index 0f8c51c60dd6..3bee9e58135c 100644 --- a/internal/service/sesv2/email_identity_data_source.go +++ b/internal/service/sesv2/email_identity_data_source.go @@ -98,7 +98,8 @@ const ( func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics - conn := meta.(*conns.AWSClient).SESV2Client(ctx) + c := meta.(*conns.AWSClient) + conn := c.SESV2Client(ctx) name := d.Get("email_identity").(string) @@ -108,10 +109,9 @@ func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, me } d.SetId(name) - d.Set(names.AttrARN, emailIdentityARN(ctx, meta.(*conns.AWSClient), name)) + d.Set(names.AttrARN, emailIdentityARN(ctx, c, name)) d.Set("configuration_set_name", out.ConfigurationSetName) d.Set("email_identity", name) - if out.DkimAttributes != nil { tfMap := flattenDKIMAttributes(out.DkimAttributes) tfMap["domain_signing_private_key"] = d.Get("dkim_signing_attributes.0.domain_signing_private_key").(string) @@ -123,9 +123,8 @@ func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, me } else { d.Set("dkim_signing_attributes", nil) } - - d.Set("identity_type", string(out.IdentityType)) - d.Set("verification_status", string(out.VerificationStatus)) + d.Set("identity_type", out.IdentityType) + d.Set("verification_status", out.VerificationStatus) d.Set("verified_for_sending_status", out.VerifiedForSendingStatus) return diags From ce4be6817a034ec081320bb248d7d4e6f9898a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Aug 2025 13:04:15 +0000 Subject: [PATCH 0895/2115] Bump the aws-sdk-go-v2 group across 1 directory with 44 updates Bumps the aws-sdk-go-v2 group with 43 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.31.3` | | [github.com/aws/aws-sdk-go-v2/feature/s3/manager](https://github.com/aws/aws-sdk-go-v2) | `1.19.0` | `1.19.1` | | [github.com/aws/aws-sdk-go-v2/service/appconfig](https://github.com/aws/aws-sdk-go-v2) | `1.41.2` | `1.42.0` | | [github.com/aws/aws-sdk-go-v2/service/appmesh](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/apprunner](https://github.com/aws/aws-sdk-go-v2) | `1.37.2` | `1.38.0` | | [github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol](https://github.com/aws/aws-sdk-go-v2) | `1.3.2` | `1.4.0` | | [github.com/aws/aws-sdk-go-v2/service/cleanrooms](https://github.com/aws/aws-sdk-go-v2) | `1.30.2` | `1.31.0` | | [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) | `1.48.2` | `1.49.0` | | [github.com/aws/aws-sdk-go-v2/service/codecommit](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/codestarconnections](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/datasync](https://github.com/aws/aws-sdk-go-v2) | `1.53.2` | `1.54.0` | | [github.com/aws/aws-sdk-go-v2/service/dlm](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/drs](https://github.com/aws/aws-sdk-go-v2) | `1.34.2` | `1.35.0` | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.246.0` | `1.247.0` | | [github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk](https://github.com/aws/aws-sdk-go-v2) | `1.33.0` | `1.33.1` | | [github.com/aws/aws-sdk-go-v2/service/elastictranscoder](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/evs](https://github.com/aws/aws-sdk-go-v2) | `1.3.2` | `1.4.0` | | [github.com/aws/aws-sdk-go-v2/service/finspace](https://github.com/aws/aws-sdk-go-v2) | `1.32.2` | `1.33.0` | | [github.com/aws/aws-sdk-go-v2/service/gamelift](https://github.com/aws/aws-sdk-go-v2) | `1.45.2` | `1.46.0` | | [github.com/aws/aws-sdk-go-v2/service/glacier](https://github.com/aws/aws-sdk-go-v2) | `1.30.2` | `1.31.0` | | [github.com/aws/aws-sdk-go-v2/service/globalaccelerator](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/greengrass](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/identitystore](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/imagebuilder](https://github.com/aws/aws-sdk-go-v2) | `1.45.2` | `1.46.0` | | [github.com/aws/aws-sdk-go-v2/service/kafka](https://github.com/aws/aws-sdk-go-v2) | `1.42.2` | `1.43.0` | | [github.com/aws/aws-sdk-go-v2/service/m2](https://github.com/aws/aws-sdk-go-v2) | `1.24.2` | `1.25.0` | | [github.com/aws/aws-sdk-go-v2/service/mq](https://github.com/aws/aws-sdk-go-v2) | `1.32.2` | `1.33.0` | | [github.com/aws/aws-sdk-go-v2/service/pinpoint](https://github.com/aws/aws-sdk-go-v2) | `1.38.2` | `1.39.0` | | [github.com/aws/aws-sdk-go-v2/service/polly](https://github.com/aws/aws-sdk-go-v2) | `1.52.2` | `1.53.0` | | [github.com/aws/aws-sdk-go-v2/service/ram](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/rbin](https://github.com/aws/aws-sdk-go-v2) | `1.25.2` | `1.26.0` | | [github.com/aws/aws-sdk-go-v2/service/resourceexplorer2](https://github.com/aws/aws-sdk-go-v2) | `1.20.2` | `1.21.0` | | [github.com/aws/aws-sdk-go-v2/service/route53](https://github.com/aws/aws-sdk-go-v2) | `1.56.2` | `1.57.0` | | [github.com/aws/aws-sdk-go-v2/service/secretsmanager](https://github.com/aws/aws-sdk-go-v2) | `1.38.2` | `1.39.0` | | [github.com/aws/aws-sdk-go-v2/service/securityhub](https://github.com/aws/aws-sdk-go-v2) | `1.62.2` | `1.63.0` | | [github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry](https://github.com/aws/aws-sdk-go-v2) | `1.34.2` | `1.35.0` | | [github.com/aws/aws-sdk-go-v2/service/signer](https://github.com/aws/aws-sdk-go-v2) | `1.30.2` | `1.31.0` | | [github.com/aws/aws-sdk-go-v2/service/ssm](https://github.com/aws/aws-sdk-go-v2) | `1.63.2` | `1.64.0` | | [github.com/aws/aws-sdk-go-v2/service/ssmsap](https://github.com/aws/aws-sdk-go-v2) | `1.23.2` | `1.24.0` | | [github.com/aws/aws-sdk-go-v2/service/transfer](https://github.com/aws/aws-sdk-go-v2) | `1.64.2` | `1.65.0` | | [github.com/aws/aws-sdk-go-v2/service/verifiedpermissions](https://github.com/aws/aws-sdk-go-v2) | `1.28.0` | `1.28.1` | | [github.com/aws/aws-sdk-go-v2/service/wafregional](https://github.com/aws/aws-sdk-go-v2) | `1.29.2` | `1.30.0` | | [github.com/aws/aws-sdk-go-v2/service/workspaces](https://github.com/aws/aws-sdk-go-v2) | `1.62.2` | `1.63.0` | Updates `github.com/aws/aws-sdk-go-v2/config` from 1.31.2 to 1.31.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...config/v1.31.3) Updates `github.com/aws/aws-sdk-go-v2/credentials` from 1.18.6 to 1.18.7 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/config/v1.18.7/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.18.6...config/v1.18.7) Updates `github.com/aws/aws-sdk-go-v2/feature/s3/manager` from 1.19.0 to 1.19.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.19.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.19.0...v1.19.1) Updates `github.com/aws/aws-sdk-go-v2/service/appconfig` from 1.41.2 to 1.42.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/kms/v1.41.2...service/s3/v1.42.0) Updates `github.com/aws/aws-sdk-go-v2/service/appmesh` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/apprunner` from 1.37.2 to 1.38.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.37.2...v1.38.0) Updates `github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol` from 1.3.2 to 1.4.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.4.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.3.2...v1.4.0) Updates `github.com/aws/aws-sdk-go-v2/service/cleanrooms` from 1.30.2 to 1.31.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.30.2...v1.31.0) Updates `github.com/aws/aws-sdk-go-v2/service/cloudwatch` from 1.48.2 to 1.49.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/eks/v1.48.2...service/s3/v1.49.0) Updates `github.com/aws/aws-sdk-go-v2/service/codecommit` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/codestarconnections` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/datasync` from 1.53.2 to 1.54.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.53.2...service/s3/v1.54.0) Updates `github.com/aws/aws-sdk-go-v2/service/dlm` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/drs` from 1.34.2 to 1.35.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/pi/v1.34.2...v1.35.0) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.246.0 to 1.247.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.246.0...service/ec2/v1.247.0) Updates `github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk` from 1.33.0 to 1.33.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.33.1/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.33.0...service/s3/v1.33.1) Updates `github.com/aws/aws-sdk-go-v2/service/elastictranscoder` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/evs` from 1.3.2 to 1.4.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.4.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.3.2...v1.4.0) Updates `github.com/aws/aws-sdk-go-v2/service/finspace` from 1.32.2 to 1.33.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.32.2...v1.33.0) Updates `github.com/aws/aws-sdk-go-v2/service/gamelift` from 1.45.2 to 1.46.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.45.2...service/s3/v1.46.0) Updates `github.com/aws/aws-sdk-go-v2/service/glacier` from 1.30.2 to 1.31.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.30.2...v1.31.0) Updates `github.com/aws/aws-sdk-go-v2/service/globalaccelerator` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/greengrass` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/identitystore` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/imagebuilder` from 1.45.2 to 1.46.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.45.2...service/s3/v1.46.0) Updates `github.com/aws/aws-sdk-go-v2/service/kafka` from 1.42.2 to 1.43.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.42.2...service/s3/v1.43.0) Updates `github.com/aws/aws-sdk-go-v2/service/m2` from 1.24.2 to 1.25.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/pi/v1.24.2...v1.25.0) Updates `github.com/aws/aws-sdk-go-v2/service/mq` from 1.32.2 to 1.33.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.32.2...v1.33.0) Updates `github.com/aws/aws-sdk-go-v2/service/pinpoint` from 1.38.2 to 1.39.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.2...service/s3/v1.39.0) Updates `github.com/aws/aws-sdk-go-v2/service/polly` from 1.52.2 to 1.53.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.52.2...service/s3/v1.53.0) Updates `github.com/aws/aws-sdk-go-v2/service/ram` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/rbin` from 1.25.2 to 1.26.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.25.2...v1.26.0) Updates `github.com/aws/aws-sdk-go-v2/service/resourceexplorer2` from 1.20.2 to 1.21.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.20.2...v1.21.0) Updates `github.com/aws/aws-sdk-go-v2/service/route53` from 1.56.2 to 1.57.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.56.2...service/s3/v1.57.0) Updates `github.com/aws/aws-sdk-go-v2/service/secretsmanager` from 1.38.2 to 1.39.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.38.2...service/s3/v1.39.0) Updates `github.com/aws/aws-sdk-go-v2/service/securityhub` from 1.62.2 to 1.63.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/iot/v1.62.2...service/s3/v1.63.0) Updates `github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry` from 1.34.2 to 1.35.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/pi/v1.34.2...v1.35.0) Updates `github.com/aws/aws-sdk-go-v2/service/signer` from 1.30.2 to 1.31.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.30.2...v1.31.0) Updates `github.com/aws/aws-sdk-go-v2/service/ssm` from 1.63.2 to 1.64.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.63.2...service/s3/v1.64.0) Updates `github.com/aws/aws-sdk-go-v2/service/ssmsap` from 1.23.2 to 1.24.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.23.2...v1.24.0) Updates `github.com/aws/aws-sdk-go-v2/service/transfer` from 1.64.2 to 1.65.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/iot/v1.64.2...service/s3/v1.65.0) Updates `github.com/aws/aws-sdk-go-v2/service/verifiedpermissions` from 1.28.0 to 1.28.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.28.0...config/v1.28.1) Updates `github.com/aws/aws-sdk-go-v2/service/wafregional` from 1.29.2 to 1.30.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.29.2...v1.30.0) Updates `github.com/aws/aws-sdk-go-v2/service/workspaces` from 1.62.2 to 1.63.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/iot/v1.62.2...service/s3/v1.63.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-version: 1.18.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-version: 1.19.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appconfig dependency-version: 1.42.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appmesh dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apprunner dependency-version: 1.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.31.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.49.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecommit dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarconnections dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datasync dependency-version: 1.54.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dlm dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/drs dependency-version: 1.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.247.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elastictranscoder dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evs dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/finspace dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/gamelift dependency-version: 1.46.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glacier dependency-version: 1.31.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/globalaccelerator dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/greengrass dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/identitystore dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/imagebuilder dependency-version: 1.46.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafka dependency-version: 1.43.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/m2 dependency-version: 1.25.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mq dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpoint dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/polly dependency-version: 1.53.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ram dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rbin dependency-version: 1.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53 dependency-version: 1.57.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/secretsmanager dependency-version: 1.39.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securityhub dependency-version: 1.63.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry dependency-version: 1.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/signer dependency-version: 1.31.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-version: 1.64.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmsap dependency-version: 1.24.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transfer dependency-version: 1.65.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/verifiedpermissions dependency-version: 1.28.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafregional dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspaces dependency-version: 1.63.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 90 ++++++++++++++--------------- go.sum | 180 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/go.mod b/go.mod index 84010ba4217d..400f0eabe696 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.38.1 - github.com/aws/aws-sdk-go-v2/config v1.31.2 - github.com/aws/aws-sdk-go-v2/credentials v1.18.6 + github.com/aws/aws-sdk-go-v2/config v1.31.3 + github.com/aws/aws-sdk-go-v2/credentials v1.18.7 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 github.com/aws/aws-sdk-go-v2/service/account v1.28.0 github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 @@ -24,15 +24,15 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 @@ -45,14 +45,14 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 @@ -61,18 +61,18 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 @@ -98,47 +98,47 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 - github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 + github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 - github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 + github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 @@ -164,7 +164,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 github.com/aws/aws-sdk-go-v2/service/location v1.49.0 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 - github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 + github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 @@ -194,27 +194,27 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 - github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 + github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 - github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 + github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 @@ -229,26 +229,26 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 - github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 + github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 @@ -260,14 +260,14 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 github.com/aws/smithy-go v1.22.5 @@ -332,7 +332,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index 38d4b891aed7..ae5c66427812 100644 --- a/go.sum +++ b/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.2 h1:NOaSZpVGEH2Np/c1toSeW0jooNl+9ALmsUTZ8YvkJR0= -github.com/aws/aws-sdk-go-v2/config v1.31.2/go.mod h1:17ft42Yb2lF6OigqSYiDAiUcX4RIkEMY6XxEMJsrAes= -github.com/aws/aws-sdk-go-v2/credentials v1.18.6 h1:AmmvNEYrru7sYNJnp3pf57lGbiarX4T9qU/6AZ9SucU= -github.com/aws/aws-sdk-go-v2/credentials v1.18.6/go.mod h1:/jdQkh1iVPa01xndfECInp1v1Wnp70v3K4MvtlLGVEc= +github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco= +github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE= +github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 h1:2FFgK3oFA8PTNBjprLFfcmkgg7U9YuSimBvR64RUmiA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0/go.mod h1:xdxj6nC1aU/jAO80RIlIj3fU40MOSqutEA9N2XFct04= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 h1:Y22iPkFuD50T1CUCEYvuwQ6J4DIU8UTaJ+xdrWh+8bM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1/go.mod h1:vOcQ8bXt6DJAUoCPjCbgTKMBxB6A7r/KAgnVBDTwX5E= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 h1:jVt1N2UmQ06UZuscbrzWRTFA/m2Crh4ApadexWRFz/s= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= @@ -73,10 +73,10 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmi github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 h1:C2pxVJYYZV9il2q/aiSIqAxZD9Bx87LdIlTV0qYpvZI= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x9s28FTv0JL0RS7CeOAdq4= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 h1:V7640rWP57y1mjb10+87nNL9Ze1fvEJS18ooXTdCKvY= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 h1:L3izPS7rBuHqDOwEEGvGv+O/fb8voHIzvJ/akJu+yc4= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= @@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JP github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 h1:WFubVKYq70Ne31wd+7eQZUr58+DciQPlVgaK91W9+0g= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= @@ -115,8 +115,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUV github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 h1:N3a+aGEaQMCXhV9LEr6T29UDAIvb/KSeFDBRT032wBs= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 h1:Lot4mazcohqDr0drjUEtEWinsC5mKf6DmXGBPWhTVHI= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 h1:39sQgVlfCQkWC6Q+lKa1sVJuyLouiHIek3lyZz7hsCo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 h1:NGZdm/BXIgwvbzeCluVSVFbU9qx2F+iALjImedMPDNw= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 h1:iPTQ5NjhoytlH19V3PwZblv2jahmlF4pJhTIMjegt7c= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2ML github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 h1:Oidrc/y5Z/mINZxfRqBZlPmiyGSMydyDnLtFBC8Hq7M= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= @@ -207,20 +207,20 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 h1:t1veMJe9LGKOacXlLec6dWbZCal0f83kN1Wx765iADM= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 h1:VOAVEcczfBuMSluazeM0RafskmOXN9qMxqNEYQ9lUMA= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.0/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 h1:n/uCxI68tuO8NTrSCqlLQAMtWAH37RLhMw/3iugFanM= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 h1:q7dZHbsKFK/D33fvyguFqM/u73jmQIWV1N0RySQFC9s= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= @@ -233,16 +233,16 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCx github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 h1:SLtaxZ8O78lWxAdYNAe3hbcKjCghuAS/oBlfP2w4tOg= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8fltzI3o5gsZ71mqqfHhePHvQjrpsFM= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 h1:XcTNx1ZZbaM3Ewu1SykBHRbVT+rjkIwQQzVNpv8trRE= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= @@ -253,10 +253,10 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasW github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC1TkdrH4Z43QVHk= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 h1:/oDkJA8YdhnRgqprvTckf5pq/S4Q5s1Q2ncaYO8nYYE= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.0/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 h1:GWXI9ACb/6Uxpnw07vmGunxOYHpuGyVoEPXxXUrVmbA= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= @@ -265,18 +265,18 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0p github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 h1:Tq2dmRDBSaIX57tWZmywS/oGhA5qPmMXT+fjDsaYTao= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 h1:M187RWd+IlIHahRG6BbUoA1uzpZd+nfkNvzWYIr4Ir4= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 h1:0qsiL2PNHz2bd+LuGktAjhGvifTa2DeGz937vid01Hg= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 h1:I46jnzRDWnaOVUZT20uBt27NoosOGhzBS4ycpso6Vog= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 h1:Zb1GwGp+4nFy4EkuLUuka6z75tGD2ET0yviKbT86cvU= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= @@ -285,10 +285,10 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPt github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 h1:FRn5UEas0vIL+fGbQcnB3KRl0QIjR+IRv8h5x8xjODY= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 h1:x5av5LUNElLagRlvdz1ChpE6i6LRT+zXB4ImccUm4gY= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 h1:ajhW+XmobT1N3BlF+G+pfQwcl3vEd8ZQy7MgSE2zUqo= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= @@ -313,8 +313,8 @@ github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rOOwKLSc5jvNdU1iang= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 h1:5h6T7kFcUyuMBh3Y6r2XFirXKWt45QFwxUfQ/JcIeqU= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= @@ -349,8 +349,8 @@ github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3X github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 h1:UeZXAjCMx4IRxP8btLxRDyqBCyRw1DGUSv+I172whzk= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPu github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.2/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 h1:hB8zQpr04jlJmX8Tl7oZUN9usM0nf44v6WzMPpGmSco= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.0/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= @@ -409,14 +409,14 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7j github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 h1:tVYv2JaS+YQ0Ie1m0x5jTnTTSQi7gjDXO1OtagSbX/M= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 h1:4Dc9NfSNZDXGqoO50gkIyvKeT1f1z4pJzgG+iqSx3IY= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.0/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= @@ -425,10 +425,10 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dF github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 h1:3uVgEYqBqB9b04qtrOMSx0xNqf526y0t8FyY3/SayLI= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.0/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 h1:dltSjMAdChaG99UsPPR9ZLHKcqGQ5s+Pa7wJwbwH6hE= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= @@ -441,16 +441,16 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/x github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 h1:OLy4jmGWvP+bekj4eQOtm2IXvpTCotHuH3C8RuYWx/c= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 h1:3ZBD+LlCS2jVrB/9xL/r9PFrTP3/pntZS3tHI+E1cLg= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= @@ -479,18 +479,18 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvB github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 h1:BvsTLbavBCIWhGav8Rm/vPPyyhDwkOMSi0pkGaohCag= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCCSKm0gUruc8BFzFwjvmeLZBE= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 h1:4cI0izhZpHNep5CkZdcME1kSvFGSb38hd8DoOftIiho= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 h1:DErOaGhYl9qslEpKfFuxbbBbYW+7z9/QDc+b1dveMQ4= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 h1:EkqxGKo3NQOpecZ1SZKLwRei42br3w/Wqc8Z2LvrR6E= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= @@ -503,28 +503,28 @@ github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUq github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 h1:60l+XFlsbkrgnuZQkkpjw/L1sl4awDpp227WBUo1/Ho= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.0/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 h1:P0B6+TCK7bHi+MQPnakYOVrYENtEpVkaoVGeNCWjOV4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFMC+vZiPGjTmZaeaVY+w= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 h1:EZbUtGXQ3xUjZs6m7V5LKfoCRn7p2LNIWwqV/ZaKU5k= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= @@ -543,22 +543,22 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNC github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 h1:hJAu7BQ9tNUaiME0dIX0mEBCUa9Wsn58oUbJJEp8Kww= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 h1:C6xQ3U3A4YymEVb8ej10BqG1+T0v5gY02sCvjM2dGmE= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 h1:+DeH9hYak2OKQjaMRR05hxqOwPveRjLt7UTRjb6NwzU= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 h1:3Txm4Y5izmDf3F6NW29jNfW1hj4aLJZUgUXFyE1t1Wc= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= From ddff74e61afc7275bd166cafd7e936b8943e0f80 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 09:12:05 -0400 Subject: [PATCH 0896/2115] chore: make clean-tidy --- tools/tfsdk2fw/go.mod | 90 ++++++++++----------- tools/tfsdk2fw/go.sum | 180 +++++++++++++++++++++--------------------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 751278286365..b2042c4a5174 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -20,10 +20,10 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.7 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect @@ -36,15 +36,15 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 // indirect github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 // indirect github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 // indirect @@ -57,14 +57,14 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 // indirect github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 // indirect github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 // indirect github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 // indirect github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 // indirect @@ -73,18 +73,18 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 // indirect github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 // indirect github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 // indirect @@ -102,7 +102,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 // indirect github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 // indirect @@ -110,47 +110,47 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 // indirect github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 // indirect github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 // indirect github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 // indirect github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 // indirect github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 // indirect github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect @@ -163,7 +163,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 // indirect github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 // indirect github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 // indirect github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 // indirect github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 // indirect github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 // indirect @@ -181,7 +181,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 // indirect github.com/aws/aws-sdk-go-v2/service/location v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 // indirect @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 // indirect github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 // indirect @@ -211,27 +211,27 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 // indirect github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 // indirect github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 // indirect github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 // indirect @@ -246,29 +246,29 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 // indirect github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 // indirect github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 // indirect github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 // indirect github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 // indirect github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 // indirect github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 // indirect @@ -278,14 +278,14 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 // indirect github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 // indirect github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 // indirect github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 // indirect github.com/aws/smithy-go v1.22.5 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index a629d040f14f..47e7734f7745 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.2 h1:NOaSZpVGEH2Np/c1toSeW0jooNl+9ALmsUTZ8YvkJR0= -github.com/aws/aws-sdk-go-v2/config v1.31.2/go.mod h1:17ft42Yb2lF6OigqSYiDAiUcX4RIkEMY6XxEMJsrAes= -github.com/aws/aws-sdk-go-v2/credentials v1.18.6 h1:AmmvNEYrru7sYNJnp3pf57lGbiarX4T9qU/6AZ9SucU= -github.com/aws/aws-sdk-go-v2/credentials v1.18.6/go.mod h1:/jdQkh1iVPa01xndfECInp1v1Wnp70v3K4MvtlLGVEc= +github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco= +github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE= +github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0 h1:2FFgK3oFA8PTNBjprLFfcmkgg7U9YuSimBvR64RUmiA= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.0/go.mod h1:xdxj6nC1aU/jAO80RIlIj3fU40MOSqutEA9N2XFct04= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 h1:Y22iPkFuD50T1CUCEYvuwQ6J4DIU8UTaJ+xdrWh+8bM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1/go.mod h1:vOcQ8bXt6DJAUoCPjCbgTKMBxB6A7r/KAgnVBDTwX5E= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2 h1:iaH26PGF8JtlmOQ954lkrwJ5/BXett8oRxjbHSbtMMM= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.41.2/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 h1:jVt1N2UmQ06UZuscbrzWRTFA/m2Crh4ApadexWRFz/s= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= @@ -73,10 +73,10 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmi github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2 h1:C2pxVJYYZV9il2q/aiSIqAxZD9Bx87LdIlTV0qYpvZI= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.33.2/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2 h1:/vhKowjyoHnhCdAzgYZv2x9s28FTv0JL0RS7CeOAdq4= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.37.2/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 h1:V7640rWP57y1mjb10+87nNL9Ze1fvEJS18ooXTdCKvY= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 h1:L3izPS7rBuHqDOwEEGvGv+O/fb8voHIzvJ/akJu+yc4= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= @@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JP github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2 h1:vJVc6b8Q+Yy8fDjR3NpGP18FxACn67pcYw88ReJMZWA= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.3.2/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 h1:WFubVKYq70Ne31wd+7eQZUr58+DciQPlVgaK91W9+0g= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= @@ -115,8 +115,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUV github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2 h1:/7VgHOeX9S8j3SjGNJm/RgqdwbELQGa7Ma0bNIYmhls= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.30.2/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 h1:N3a+aGEaQMCXhV9LEr6T29UDAIvb/KSeFDBRT032wBs= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2 h1:atHUCJrccmrIHQu0ZS3FkVIh7Yc87eIdMgmTXII28h8= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.48.2/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 h1:Lot4mazcohqDr0drjUEtEWinsC5mKf6DmXGBPWhTVHI= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2 h1:39sQgVlfCQkWC6Q+lKa1sVJuyLouiHIek3lyZz7hsCo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.31.2/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 h1:NGZdm/BXIgwvbzeCluVSVFbU9qx2F+iALjImedMPDNw= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2 h1:joOfyRaebSPIb7BHy1e8mGrkVXZmP7gSX/1nn1OOz90= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.33.2/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 h1:iPTQ5NjhoytlH19V3PwZblv2jahmlF4pJhTIMjegt7c= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2ML github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2 h1:T/ol0KyLHD+fnniwT4cCNo+DwK0dzF0+m6ws7RRQ788= -github.com/aws/aws-sdk-go-v2/service/datasync v1.53.2/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 h1:Oidrc/y5Z/mINZxfRqBZlPmiyGSMydyDnLtFBC8Hq7M= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= @@ -207,20 +207,20 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2 h1:Vcjr3brqbsJ89z3kMXGPjwTFMDf6em49gCSpQgQWDS8= -github.com/aws/aws-sdk-go-v2/service/dlm v1.33.2/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 h1:t1veMJe9LGKOacXlLec6dWbZCal0f83kN1Wx765iADM= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.2 h1:SIclpNT6D0HzBjTeE/i9MCB6gq4mvWNotkSZ9HWUb34= -github.com/aws/aws-sdk-go-v2/service/drs v1.34.2/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 h1:VOAVEcczfBuMSluazeM0RafskmOXN9qMxqNEYQ9lUMA= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.0/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0 h1:n/uCxI68tuO8NTrSCqlLQAMtWAH37RLhMw/3iugFanM= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.246.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 h1:q7dZHbsKFK/D33fvyguFqM/u73jmQIWV1N0RySQFC9s= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= @@ -233,16 +233,16 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCx github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0 h1:NmM8PAn/yPvtce1yQNnTz0p1ZAhyoj5IjXb5gqnM2RU= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.0/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 h1:SLtaxZ8O78lWxAdYNAe3hbcKjCghuAS/oBlfP2w4tOg= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2 h1:ayiXSFo95xgj8fltzI3o5gsZ71mqqfHhePHvQjrpsFM= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.31.2/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 h1:XcTNx1ZZbaM3Ewu1SykBHRbVT+rjkIwQQzVNpv8trRE= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= @@ -253,10 +253,10 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasW github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.2 h1:/hDlQQXYo2GGSxMeQFO/42uzhF1uC1TkdrH4Z43QVHk= -github.com/aws/aws-sdk-go-v2/service/evs v1.3.2/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2 h1:GYnx1Ado6C01W49lWT8wCpJ+21mlFEigaSUgxQVV4rY= -github.com/aws/aws-sdk-go-v2/service/finspace v1.32.2/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 h1:/oDkJA8YdhnRgqprvTckf5pq/S4Q5s1Q2ncaYO8nYYE= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.0/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 h1:GWXI9ACb/6Uxpnw07vmGunxOYHpuGyVoEPXxXUrVmbA= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= @@ -265,18 +265,18 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0p github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2 h1:d8OFBKn38mw+b0QXI5Hl2lvPbM63Gf2/ggY/odrNf6I= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.45.2/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2 h1:gRd3S9J69+afAR5GD8bfTFfF1B5usllYvrULibUs53o= -github.com/aws/aws-sdk-go-v2/service/glacier v1.30.2/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2 h1:Tq2dmRDBSaIX57tWZmywS/oGhA5qPmMXT+fjDsaYTao= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.33.2/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 h1:M187RWd+IlIHahRG6BbUoA1uzpZd+nfkNvzWYIr4Ir4= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 h1:0qsiL2PNHz2bd+LuGktAjhGvifTa2DeGz937vid01Hg= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 h1:I46jnzRDWnaOVUZT20uBt27NoosOGhzBS4ycpso6Vog= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2 h1:bw5lXiaBtlWcCD6SIfuZywAO8WD2o8Mq+0RFugRPpFk= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.31.2/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 h1:Zb1GwGp+4nFy4EkuLUuka6z75tGD2ET0yviKbT86cvU= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= @@ -285,10 +285,10 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPt github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2 h1:svsEgkOoqipX7rm1u4Nv+BwhY2562+UN3ltA23p2R3w= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.31.2/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2 h1:FRn5UEas0vIL+fGbQcnB3KRl0QIjR+IRv8h5x8xjODY= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.45.2/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 h1:x5av5LUNElLagRlvdz1ChpE6i6LRT+zXB4ImccUm4gY= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 h1:ajhW+XmobT1N3BlF+G+pfQwcl3vEd8ZQy7MgSE2zUqo= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= @@ -313,8 +313,8 @@ github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2 h1:ej9/b17LRaw6M6b1FQOxx6d4rOOwKLSc5jvNdU1iang= -github.com/aws/aws-sdk-go-v2/service/kafka v1.42.2/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 h1:5h6T7kFcUyuMBh3Y6r2XFirXKWt45QFwxUfQ/JcIeqU= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= @@ -349,8 +349,8 @@ github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3X github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2 h1:CPmxIHCoqPG+EEq+MjddwFsTuj9E2NKjNz2YdeWZfBg= -github.com/aws/aws-sdk-go-v2/service/m2 v1.24.2/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 h1:UeZXAjCMx4IRxP8btLxRDyqBCyRw1DGUSv+I172whzk= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPu github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.2 h1:r0Zn67NRUIN23QjxChi3oYALaSRjBw0Uj/7NuyNSRyU= -github.com/aws/aws-sdk-go-v2/service/mq v1.32.2/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 h1:hB8zQpr04jlJmX8Tl7oZUN9usM0nf44v6WzMPpGmSco= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.0/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= @@ -409,14 +409,14 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7j github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2 h1:2jESr6QyBr25xMHkrwlgPrQuhTRVSnRVaAIW7JLk0iE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.38.2/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 h1:tVYv2JaS+YQ0Ie1m0x5jTnTTSQi7gjDXO1OtagSbX/M= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.2 h1:TR6TY9dQ9JxInZ1mtVfokEY4pXOJb/gRJPQuhURjKCg= -github.com/aws/aws-sdk-go-v2/service/polly v1.52.2/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 h1:4Dc9NfSNZDXGqoO50gkIyvKeT1f1z4pJzgG+iqSx3IY= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.0/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= @@ -425,10 +425,10 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dF github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.2 h1:S7B2EdnOrC4WTWXUq0q2rr8GuTOZk9V60OxWWzCalMU= -github.com/aws/aws-sdk-go-v2/service/ram v1.33.2/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2 h1:sh8q9BXedHuNtG1rgeXoF97bPBO0Xb+NJd9xVp8vSaU= -github.com/aws/aws-sdk-go-v2/service/rbin v1.25.2/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 h1:3uVgEYqBqB9b04qtrOMSx0xNqf526y0t8FyY3/SayLI= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.0/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 h1:dltSjMAdChaG99UsPPR9ZLHKcqGQ5s+Pa7wJwbwH6hE= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= @@ -441,16 +441,16 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/x github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2 h1:t/ZScW8CS5u3yOxiTssFVw8vNE1mad0JfKIrA06t/ps= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.20.2/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 h1:OLy4jmGWvP+bekj4eQOtm2IXvpTCotHuH3C8RuYWx/c= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 h1:6QKyfbweIsjt1kvE8rw+LeDxmCt1uvI8ywRe2cYOpQo= -github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 h1:3ZBD+LlCS2jVrB/9xL/r9PFrTP3/pntZS3tHI+E1cLg= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= @@ -479,18 +479,18 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvB github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2 h1:BvsTLbavBCIWhGav8Rm/vPPyyhDwkOMSi0pkGaohCag= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.38.2/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2 h1:VbsekM08dcE3PI86LVCCSKm0gUruc8BFzFwjvmeLZBE= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.62.2/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 h1:4cI0izhZpHNep5CkZdcME1kSvFGSb38hd8DoOftIiho= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 h1:DErOaGhYl9qslEpKfFuxbbBbYW+7z9/QDc+b1dveMQ4= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2 h1:SSFUMsbYFA7p7CeXijAgr+6UyRPN4cKJXcfUMJe3X5Q= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.34.2/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 h1:EkqxGKo3NQOpecZ1SZKLwRei42br3w/Wqc8Z2LvrR6E= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= @@ -503,28 +503,28 @@ github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUq github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.2 h1:XqU8xMi76TSn9GxBAfcz4mLAfWOg1zDyVjQ6khFVTpw= -github.com/aws/aws-sdk-go-v2/service/signer v1.30.2/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 h1:60l+XFlsbkrgnuZQkkpjw/L1sl4awDpp227WBUo1/Ho= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.0/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2 h1:ciD+LnRj2i9+TwNdbk24Rz1eTrrzVS82FaEZK8B7zyk= -github.com/aws/aws-sdk-go-v2/service/ssm v1.63.2/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 h1:P0B6+TCK7bHi+MQPnakYOVrYENtEpVkaoVGeNCWjOV4= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2 h1:t+tiotNIGdbjl9hnO7AtGErFMC+vZiPGjTmZaeaVY+w= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.23.2/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 h1:EZbUtGXQ3xUjZs6m7V5LKfoCRn7p2LNIWwqV/ZaKU5k= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2 h1:pd9G9HQaM6UZAZh19pYOkpKSQkyQQ9ftnl/LttQOcGI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.2/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= @@ -543,22 +543,22 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNC github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2 h1:k7NVo8zQe1iB7ea8QzJlb01cmYKrOTSmO1kGh5YLqdc= -github.com/aws/aws-sdk-go-v2/service/transfer v1.64.2/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0 h1:DCP2A6SdFazzQvv400n9cSz279KCM0vj9/slKl0MmXU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.0/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 h1:hJAu7BQ9tNUaiME0dIX0mEBCUa9Wsn58oUbJJEp8Kww= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 h1:C6xQ3U3A4YymEVb8ej10BqG1+T0v5gY02sCvjM2dGmE= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2 h1:sLZ+mHXUZbIwBgij7msmv5ATrz7s3xfiGc80F8d5iiA= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.29.2/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 h1:+DeH9hYak2OKQjaMRR05hxqOwPveRjLt7UTRjb6NwzU= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2 h1:iZMIjPDgG7sYuNLMFSG3A2B5qNU2gj8QQ5kSuRBlD4Q= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.62.2/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 h1:3Txm4Y5izmDf3F6NW29jNfW1hj4aLJZUgUXFyE1t1Wc= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= From fc9e2bc94864ffb36281ef636a927e15e17f2c72 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 09:38:50 -0400 Subject: [PATCH 0897/2115] fixup: add `testNotNull` annotation Identity tests still failing as the configured `id` attribute is missing the expected `_` separator. Additional investigation required. ```console % make testacc PKG=vpc TESTS=TestAccVPCRoute_Identity_Basic make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCRoute_Identity_Basic' -timeout 360m -vet=off 2025/08/26 16:59:57 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/26 16:59:57 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccVPCRoute_Identity_Basic === PAUSE TestAccVPCRoute_Identity_Basic === CONT TestAccVPCRoute_Identity_Basic vpc_route_identity_gen_test.go:30: Step 2/4 error running import: exit status 1 Error: unexpected format of ID ("r-rtb-0e1c77d84ed2e0b022218071545"), expected ROUTETABLEID_DESTINATION --- FAIL: TestAccVPCRoute_Identity_Basic (20.94s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/ec2 27.950s FAIL make: *** [testacc] Error 1 ``` --- internal/service/ec2/service_package_gen.go | 2 +- internal/service/ec2/vpc_route.go | 27 +++---------------- .../ec2/vpc_route_identity_gen_test.go | 14 +++++----- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index b540b4d34265..88217c66c5a8 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -1406,8 +1406,8 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Region: unique.Make(inttypes.ResourceRegionDefault()), Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ inttypes.StringIdentityAttribute("route_table_id", true), - inttypes.StringIdentityAttribute("destination_ipv6_cidr_block", false), inttypes.StringIdentityAttribute("destination_cidr_block", false), + inttypes.StringIdentityAttribute("destination_ipv6_cidr_block", false), inttypes.StringIdentityAttribute("destination_prefix_list_id", false), }), Import: inttypes.SDKv2Import{ diff --git a/internal/service/ec2/vpc_route.go b/internal/service/ec2/vpc_route.go index c8128c406454..58a12c5fd0a3 100644 --- a/internal/service/ec2/vpc_route.go +++ b/internal/service/ec2/vpc_route.go @@ -51,8 +51,8 @@ var routeValidTargets = []string{ // @SDKResource("aws_route", name="Route") // @IdentityAttribute("route_table_id") +// @IdentityAttribute("destination_cidr_block", optional="true", testNotNull="true") // @IdentityAttribute("destination_ipv6_cidr_block", optional="true") -// @IdentityAttribute("destination_cidr_block", optional="true") // @IdentityAttribute("destination_prefix_list_id", optional="true") // @ImportIDHandler("routeImportID") // @Testing(preIdentityVersion="6.8.0") @@ -487,28 +487,6 @@ func resourceRouteDelete(ctx context.Context, d *schema.ResourceData, meta any) return diags } -// func resourceRouteImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { -// idParts := strings.Split(d.Id(), "_") -// if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { -// return nil, fmt.Errorf("unexpected format of ID (%q), expected ROUTETABLEID_DESTINATION", d.Id()) -// } -// -// routeTableID := idParts[0] -// destination := idParts[1] -// d.Set("route_table_id", routeTableID) -// if strings.Contains(destination, ":") { -// d.Set(routeDestinationIPv6CIDRBlock, destination) -// } else if strings.Contains(destination, ".") { -// d.Set(routeDestinationCIDRBlock, destination) -// } else { -// d.Set(routeDestinationPrefixListID, destination) -// } -// -// d.SetId(routeCreateID(routeTableID, destination)) -// -// return []*schema.ResourceData{d}, nil -// } - // routeDestinationAttribute returns the attribute key and value of the route's destination. func routeDestinationAttribute(d *schema.ResourceData) (string, string, error) { for _, key := range routeValidDestinations { @@ -540,7 +518,8 @@ func (routeImportID) Create(d *schema.ResourceData) string { // TODO: can we implement any error handling here? _, destination, _ := routeDestinationAttribute(d) routeTableID := d.Get("route_table_id").(string) - return routeCreateID(routeTableID, destination) + // TODO: fix magic separator + return fmt.Sprintf("%s_%s", routeTableID, destination) } func (routeImportID) Parse(id string) (string, map[string]string, error) { diff --git a/internal/service/ec2/vpc_route_identity_gen_test.go b/internal/service/ec2/vpc_route_identity_gen_test.go index 91a8fd820d3f..a06c2e362058 100644 --- a/internal/service/ec2/vpc_route_identity_gen_test.go +++ b/internal/service/ec2/vpc_route_identity_gen_test.go @@ -51,8 +51,8 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { names.AttrAccountID: tfknownvalue.AccountID(), names.AttrRegion: knownvalue.StringExact(acctest.Region()), "route_table_id": knownvalue.NotNull(), + "destination_cidr_block": knownvalue.NotNull(), "destination_ipv6_cidr_block": knownvalue.Null(), - "destination_cidr_block": knownvalue.Null(), "destination_prefix_list_id": knownvalue.Null(), }), statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), @@ -83,8 +83,8 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), - plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), }, @@ -103,8 +103,8 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), - plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), }, @@ -142,8 +142,8 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { names.AttrAccountID: tfknownvalue.AccountID(), names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), "route_table_id": knownvalue.NotNull(), + "destination_cidr_block": knownvalue.NotNull(), "destination_ipv6_cidr_block": knownvalue.Null(), - "destination_cidr_block": knownvalue.Null(), "destination_prefix_list_id": knownvalue.Null(), }), statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), @@ -178,8 +178,8 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), - plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), }, @@ -199,8 +199,8 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), - plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_cidr_block"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_ipv6_cidr_block"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("destination_prefix_list_id"), knownvalue.NotNull()), plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), }, @@ -260,8 +260,8 @@ func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { names.AttrAccountID: tfknownvalue.AccountID(), names.AttrRegion: knownvalue.StringExact(acctest.Region()), "route_table_id": knownvalue.NotNull(), + "destination_cidr_block": knownvalue.NotNull(), "destination_ipv6_cidr_block": knownvalue.Null(), - "destination_cidr_block": knownvalue.Null(), "destination_prefix_list_id": knownvalue.Null(), }), statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("route_table_id")), From bf53b09c479c2b0c3ef164951837b2904fe9ba31 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 27 Aug 2025 14:10:01 +0000 Subject: [PATCH 0898/2115] Update CHANGELOG.md for #44053 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c15f80d588..7fbfc0027335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,14 @@ FEATURES: * **New Resource:** `aws_workspacesweb_network_settings_association` ([#43775](https://github.com/hashicorp/terraform-provider-aws/issues/43775)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) +* **New Resource:** `aws_workspacesweb_trust_store_association` ([#43778](https://github.com/hashicorp/terraform-provider-aws/issues/43778)) * **New Resource:** `aws_workspacesweb_user_access_logging_settings_association` ([#43776](https://github.com/hashicorp/terraform-provider-aws/issues/43776)) * **New Resource:** `aws_workspacesweb_user_settings_association` ([#43777](https://github.com/hashicorp/terraform-provider-aws/issues/43777)) ENHANCEMENTS: * data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* data-source/aws_sesv2_email_identity: Add `verification_status` attribute ([#44045](https://github.com/hashicorp/terraform-provider-aws/issues/44045)) * data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) @@ -23,6 +25,7 @@ ENHANCEMENTS: * resource/aws_ecr_repository: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_ecr_repository_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) +* resource/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed ([#42636](https://github.com/hashicorp/terraform-provider-aws/issues/42636)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) * resource/aws_iot_thing_principal_attachment: Add `thing_principal_type` argument ([#43916](https://github.com/hashicorp/terraform-provider-aws/issues/43916)) * resource/aws_kms_alias: Add resource identity support ([#44025](https://github.com/hashicorp/terraform-provider-aws/issues/44025)) @@ -46,6 +49,7 @@ ENHANCEMENTS: * resource/aws_s3_bucket_website_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) * resource/aws_s3tables_table_bucket: Add `force_destroy` argument ([#43922](https://github.com/hashicorp/terraform-provider-aws/issues/43922)) * resource/aws_secretsmanager_secret_version: Add resource identity support ([#44031](https://github.com/hashicorp/terraform-provider-aws/issues/44031)) +* resource/aws_sesv2_email_identity: Add `verification_status` attribute ([#44045](https://github.com/hashicorp/terraform-provider-aws/issues/44045)) * resource/aws_signer_signing_profile: Add `signing_parameters` argument ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * resource/aws_synthetics_canary: Add `vpc_config.ipv6_allowed_for_dual_stack` argument ([#43989](https://github.com/hashicorp/terraform-provider-aws/issues/43989)) * resource/aws_vpc_ipam: Add `metered_account` argument ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) @@ -54,10 +58,12 @@ BUG FIXES: * data-source/aws_glue_catalog_table: Add `partition_keys.parameters` attribute ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_cognito_user_pool: Fixed to accept an empty `email_mfa_configuration` block ([#43926](https://github.com/hashicorp/terraform-provider-aws/issues/43926)) +* resource/aws_db_instance: Fixes the behavior when modifying `database_insights_mode` when using custom KMS key ([#44050](https://github.com/hashicorp/terraform-provider-aws/issues/44050)) * resource/aws_dx_hosted_connection: Fix `DescribeHostedConnections failed for connection dxcon-xxxx doesn't exist` by pointing to the correct connection ID when doing the describe. ([#43499](https://github.com/hashicorp/terraform-provider-aws/issues/43499)) * resource/aws_glue_catalog_table: Add `partition_keys.parameters` argument, fixing `Invalid address to set: []string{"partition_keys", "0", "parameters"}` errors ([#26702](https://github.com/hashicorp/terraform-provider-aws/issues/26702)) * resource/aws_imagebuilder_image_recipe: Increase upper limit of `block_device_mapping.ebs.iops` from `10000` to `100000` ([#43981](https://github.com/hashicorp/terraform-provider-aws/issues/43981)) * resource/aws_nat_gateway: Fix inconsistent final plan for `secondary_private_ip_addresses` ([#43708](https://github.com/hashicorp/terraform-provider-aws/issues/43708)) +* resource/aws_spot_instance_request: Change `network_interface.network_card_index` to Computed ([#38336](https://github.com/hashicorp/terraform-provider-aws/issues/38336)) * resource/aws_timestreaminfluxdb_db_instance: Fix tag-only update errors ([#42382](https://github.com/hashicorp/terraform-provider-aws/issues/42382)) * resource/aws_wafv2_web_acl: Add missing flattening of `name` in `response_inspection.header` blocks for `AWSManagedRulesATPRuleSet` and `AWSManagedRulesACFPRuleSet` to avoid persistent plan diffs ([#44032](https://github.com/hashicorp/terraform-provider-aws/issues/44032)) From 0f57d85a1ce5db47286874885a74903dc95f1872 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 27 Aug 2025 14:26:59 +0000 Subject: [PATCH 0899/2115] Update CHANGELOG.md for #44048 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fbfc0027335..730ab56286e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ ENHANCEMENTS: * resource/aws_mwaa_environment: Add `worker_replacement_strategy` argument ([#43946](https://github.com/hashicorp/terraform-provider-aws/issues/43946)) * resource/aws_network_interface: Add `attachment.network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) +* resource/aws_route53_resolver_rule: Add resource identity support ([#44048](https://github.com/hashicorp/terraform-provider-aws/issues/44048)) +* resource/aws_route53_resolver_rule_association: Add resource identity support ([#44048](https://github.com/hashicorp/terraform-provider-aws/issues/44048)) * resource/aws_route_table: Add resource identity support ([#43990](https://github.com/hashicorp/terraform-provider-aws/issues/43990)) * resource/aws_s3_bucket_acl: Add resource identity support ([#44043](https://github.com/hashicorp/terraform-provider-aws/issues/44043)) * resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) From efbefccfd74b38daf9302d071873439f0eaf5ffc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 11:25:11 -0400 Subject: [PATCH 0900/2115] Add 'ExpandFrameworkStringyValueSet'. --- internal/framework/flex/set.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/framework/flex/set.go b/internal/framework/flex/set.go index 0b48b2d0fa16..42adc132579f 100644 --- a/internal/framework/flex/set.go +++ b/internal/framework/flex/set.go @@ -14,7 +14,11 @@ import ( ) func ExpandFrameworkStringValueSet(ctx context.Context, v basetypes.SetValuable) inttypes.Set[string] { - var output []string + return ExpandFrameworkStringyValueSet[string](ctx, v) +} + +func ExpandFrameworkStringyValueSet[E ~string](ctx context.Context, v basetypes.SetValuable) inttypes.Set[E] { + var output []E must(Expand(ctx, v, &output)) From eafab56c1f9b8891049c44371150cd42395704ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 11:36:00 -0400 Subject: [PATCH 0901/2115] Add 'FlattenFrameworkStringyValueSetOfStringEnum'. --- internal/framework/flex/set.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/framework/flex/set.go b/internal/framework/flex/set.go index 42adc132579f..85c43cae9f08 100644 --- a/internal/framework/flex/set.go +++ b/internal/framework/flex/set.go @@ -9,6 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" + "github.com/hashicorp/terraform-provider-aws/internal/enum" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" ) @@ -45,6 +46,10 @@ func FlattenFrameworkStringValueSetOfString(ctx context.Context, vs []string) fw return fwtypes.SetValueOf[basetypes.StringValue]{SetValue: FlattenFrameworkStringValueSet(ctx, vs)} } +func FlattenFrameworkStringyValueSetOfStringEnum[T enum.Valueser[T]](ctx context.Context, vs []T) fwtypes.SetOfStringEnum[T] { + return fwtypes.SetValueOf[fwtypes.StringEnum[T]]{SetValue: FlattenFrameworkStringValueSet(ctx, vs)} +} + // FlattenFrameworkStringValueSetLegacy is the Plugin Framework variant of FlattenStringValueSet. // A nil slice is converted to an empty (non-null) Set. func FlattenFrameworkStringValueSetLegacy[T ~string](_ context.Context, vs []T) types.Set { From b4f99132e0aab18bd4f7525011321ee4f1c3546a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 11:49:35 -0400 Subject: [PATCH 0902/2115] r/aws_workspacesweb_session_logger: Tidy up. --- .../service/workspacesweb/session_logger.go | 128 ++++++++++-------- .../workspacesweb/session_logger_test.go | 120 +--------------- ...workspacesweb_session_logger.html.markdown | 4 +- 3 files changed, 83 insertions(+), 169 deletions(-) diff --git a/internal/service/workspacesweb/session_logger.go b/internal/service/workspacesweb/session_logger.go index 1fcd373edd0b..3f572b73a1f5 100644 --- a/internal/service/workspacesweb/session_logger.go +++ b/internal/service/workspacesweb/session_logger.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/workspacesweb" awstypes "github.com/aws/aws-sdk-go-v2/service/workspacesweb/types" "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" - "github.com/hashicorp/terraform-plugin-framework/attr" + "github.com/hashicorp/terraform-plugin-framework-validators/setvalidator" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -76,16 +76,6 @@ func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.Sch names.AttrDisplayName: schema.StringAttribute{ Optional: true, }, - "event_filter": schema.ListAttribute{ - CustomType: fwtypes.NewListNestedObjectTypeOf[eventFilterModel](ctx), - Required: true, - PlanModifiers: []planmodifier.List{ - listplanmodifier.UseStateForUnknown(), - }, - Validators: []validator.List{ - listvalidator.SizeAtMost(1), - }, - }, "session_logger_arn": schema.StringAttribute{ Computed: true, PlanModifiers: []planmodifier.String{ @@ -96,12 +86,51 @@ func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.Sch names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), }, Blocks: map[string]schema.Block{ + "event_filter": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[eventFilterModel](ctx), + Validators: []validator.List{ + listvalidator.IsRequired(), + listvalidator.SizeAtLeast(1), + listvalidator.SizeAtMost(1), + }, + NestedObject: schema.NestedBlockObject{ + Attributes: map[string]schema.Attribute{ + "include": schema.SetAttribute{ + CustomType: fwtypes.SetOfStringEnumType[awstypes.Event](), + Validators: []validator.Set{ + setvalidator.ExactlyOneOf( + path.MatchRelative().AtParent().AtName("all"), + path.MatchRelative().AtParent().AtName("include"), + ), + }, + Optional: true, + }, + }, + Blocks: map[string]schema.Block{ + "all": schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[eventFilterAllModel](ctx), + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, + NestedObject: schema.NestedBlockObject{}, + }, + }, + }, + }, "log_configuration": schema.ListNestedBlock{ CustomType: fwtypes.NewListNestedObjectTypeOf[logConfigurationModel](ctx), + Validators: []validator.List{ + listvalidator.IsRequired(), + listvalidator.SizeAtLeast(1), + listvalidator.SizeAtMost(1), + }, NestedObject: schema.NestedBlockObject{ Blocks: map[string]schema.Block{ "s3": schema.ListNestedBlock{ CustomType: fwtypes.NewListNestedObjectTypeOf[s3LogConfigurationModel](ctx), + Validators: []validator.List{ + listvalidator.SizeAtMost(1), + }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ names.AttrBucket: schema.StringAttribute{ @@ -112,13 +141,15 @@ func (r *sessionLoggerResource) Schema(ctx context.Context, request resource.Sch Computed: true, }, "folder_structure": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.StringEnumType[awstypes.FolderStructure](), + Required: true, }, "key_prefix": schema.StringAttribute{ Optional: true, }, "log_file_format": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.StringEnumType[awstypes.LogFileFormat](), + Required: true, }, }, }, @@ -140,7 +171,6 @@ func (r *sessionLoggerResource) Create(ctx context.Context, request resource.Cre conn := r.Meta().WorkSpacesWebClient(ctx) var input workspacesweb.CreateSessionLoggerInput - response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) if response.Diagnostics.HasError() { return @@ -161,6 +191,7 @@ func (r *sessionLoggerResource) Create(ctx context.Context, request resource.Cre // Get the session logger details to populate other fields sessionLogger, err := findSessionLoggerByARN(ctx, conn, data.SessionLoggerARN.ValueString()) + if err != nil { response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Session Logger (%s)", data.SessionLoggerARN.ValueString()), err.Error()) return @@ -184,6 +215,7 @@ func (r *sessionLoggerResource) Read(ctx context.Context, request resource.ReadR conn := r.Meta().WorkSpacesWebClient(ctx) output, err := findSessionLoggerByARN(ctx, conn, data.SessionLoggerARN.ValueString()) + if tfresource.NotFound(err) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) response.State.RemoveResource(ctx) @@ -205,7 +237,6 @@ func (r *sessionLoggerResource) Read(ctx context.Context, request resource.ReadR func (r *sessionLoggerResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { var old, new sessionLoggerResourceModel - response.Diagnostics.Append(request.State.Get(ctx, &old)...) if response.Diagnostics.HasError() { return @@ -214,10 +245,9 @@ func (r *sessionLoggerResource) Update(ctx context.Context, request resource.Upd if response.Diagnostics.HasError() { return } + if !new.DisplayName.Equal(old.DisplayName) || !new.EventFilter.Equal(old.EventFilter) || - !new.CustomerManagedKey.Equal(old.CustomerManagedKey) || - !new.AdditionalEncryptionContext.Equal(old.AdditionalEncryptionContext) || !new.LogConfiguration.Equal(old.LogConfiguration) { conn := r.Meta().WorkSpacesWebClient(ctx) @@ -227,17 +257,12 @@ func (r *sessionLoggerResource) Update(ctx context.Context, request resource.Upd return } - output, err := conn.UpdateSessionLogger(ctx, &input) + _, err := conn.UpdateSessionLogger(ctx, &input) + if err != nil { response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Session Logger (%s)", old.SessionLoggerARN.ValueString()), err.Error()) return } - - // Use new as base and flatten the response into it - response.Diagnostics.Append(fwflex.Flatten(ctx, output.SessionLogger, &new)...) - if response.Diagnostics.HasError() { - return - } } response.Diagnostics.Append(response.State.Set(ctx, new)...) @@ -313,10 +338,12 @@ type logConfigurationModel struct { } type eventFilterModel struct { - All types.Object `tfsdk:"all"` - Include fwtypes.SetOfString `tfsdk:"include"` + All fwtypes.ListNestedObjectValueOf[eventFilterAllModel] `tfsdk:"all"` + Include fwtypes.SetOfStringEnum[awstypes.Event] `tfsdk:"include"` } +type eventFilterAllModel struct{} + var ( _ fwflex.Expander = eventFilterModel{} _ fwflex.Flattener = &eventFilterModel{} @@ -324,46 +351,39 @@ var ( func (m eventFilterModel) Expand(ctx context.Context) (any, diag.Diagnostics) { var diags diag.Diagnostics + var v awstypes.EventFilter - if !m.All.IsNull() { - return &awstypes.EventFilterMemberAll{Value: awstypes.Unit{}}, nil + switch { + case !m.All.IsNull(): + v = &awstypes.EventFilterMemberAll{Value: awstypes.Unit{}} + case !m.Include.IsNull(): + v = &awstypes.EventFilterMemberInclude{Value: fwflex.ExpandFrameworkStringyValueSet[awstypes.Event](ctx, m.Include)} } - if !m.Include.IsNull() { - var events []awstypes.Event - for _, event := range m.Include.Elements() { - events = append(events, awstypes.Event(event.(types.String).ValueString())) - } - return &awstypes.EventFilterMemberInclude{Value: events}, nil - } - return nil, diags + + return v, diags } func (m *eventFilterModel) Flatten(ctx context.Context, v any) diag.Diagnostics { var diags diag.Diagnostics - switch val := v.(type) { + switch t := v.(type) { case awstypes.EventFilterMemberAll: - m.All = types.ObjectValueMust(map[string]attr.Type{}, map[string]attr.Value{}) - m.Include = fwtypes.NewSetValueOfNull[types.String](ctx) - case awstypes.EventFilterMemberInclude: - m.All = types.ObjectNull(map[string]attr.Type{}) - var events []string - for _, event := range val.Value { - events = append(events, string(event)) + var data eventFilterAllModel + diags.Append(fwflex.Flatten(ctx, t.Value, &data)...) + if diags.HasError() { + return diags } - var elements []attr.Value - for _, event := range events { - elements = append(elements, types.StringValue(event)) - } - m.Include, _ = fwtypes.NewSetValueOf[types.String](ctx, elements) + m.All = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &data) + case awstypes.EventFilterMemberInclude: + m.Include = fwflex.FlattenFrameworkStringyValueSetOfStringEnum(ctx, t.Value) } return diags } type s3LogConfigurationModel struct { - Bucket types.String `tfsdk:"bucket"` - BucketOwner types.String `tfsdk:"bucket_owner"` - FolderStructure types.String `tfsdk:"folder_structure"` - KeyPrefix types.String `tfsdk:"key_prefix"` - LogFileFormat types.String `tfsdk:"log_file_format"` + Bucket types.String `tfsdk:"bucket"` + BucketOwner types.String `tfsdk:"bucket_owner"` + FolderStructure fwtypes.StringEnum[awstypes.FolderStructure] `tfsdk:"folder_structure"` + KeyPrefix types.String `tfsdk:"key_prefix"` + LogFileFormat fwtypes.StringEnum[awstypes.LogFileFormat] `tfsdk:"log_file_format"` } diff --git a/internal/service/workspacesweb/session_logger_test.go b/internal/service/workspacesweb/session_logger_test.go index 3a04ee63a68d..30b3b5b63974 100644 --- a/internal/service/workspacesweb/session_logger_test.go +++ b/internal/service/workspacesweb/session_logger_test.go @@ -46,7 +46,7 @@ func TestAccWorkSpacesWebSessionLogger_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "log_configuration.0.s3.0.bucket", "aws_s3_bucket.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), - resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.%", "0"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.#", "1"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "session_logger_arn", "workspaces-web", regexache.MustCompile(`sessionLogger/.+$`)), ), }, @@ -119,7 +119,7 @@ func TestAccWorkSpacesWebSessionLogger_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), - resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.%", "0"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.#", "0"), ), }, { @@ -139,7 +139,7 @@ func TestAccWorkSpacesWebSessionLogger_update(t *testing.T) { }) } -func TestAccWorkSpacesWebSessionLogger_customerManagedKeyUpdate(t *testing.T) { +func TestAccWorkSpacesWebSessionLogger_customerManagedKey(t *testing.T) { ctx := acctest.Context(t) var sessionLogger awstypes.SessionLogger rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -163,19 +163,11 @@ func TestAccWorkSpacesWebSessionLogger_customerManagedKeyUpdate(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test", names.AttrARN), ), }, - { - Config: testAccSessionLoggerConfig_customerManagedKeyUpdated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), - resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), - resource.TestCheckResourceAttrPair(resourceName, "customer_managed_key", "aws_kms_key.test2", names.AttrARN), - ), - }, }, }) } -func TestAccWorkSpacesWebSessionLogger_additionalEncryptionContextUpdate(t *testing.T) { +func TestAccWorkSpacesWebSessionLogger_additionalEncryptionContext(t *testing.T) { ctx := acctest.Context(t) var sessionLogger awstypes.SessionLogger rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -200,16 +192,6 @@ func TestAccWorkSpacesWebSessionLogger_additionalEncryptionContextUpdate(t *test resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.test", names.AttrValue), ), }, - { - Config: testAccSessionLoggerConfig_additionalEncryptionContextUpdated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckSessionLoggerExists(ctx, resourceName, &sessionLogger), - resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), - resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.%", "2"), - resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.environment", "production"), - resource.TestCheckResourceAttr(resourceName, "additional_encryption_context.application", "workspaces"), - ), - }, }, }) } @@ -372,7 +354,7 @@ resource "aws_workspacesweb_session_logger" "test" { } event_filter { - all = {} + all {} } depends_on = [aws_s3_bucket_policy.allow_write_access] @@ -446,7 +428,7 @@ resource "aws_workspacesweb_session_logger" "test" { } event_filter { - all = {} + all {} } depends_on = [aws_s3_bucket_policy.allow_write_access] @@ -471,95 +453,7 @@ resource "aws_workspacesweb_session_logger" "test" { } event_filter { - all = {} - } - - depends_on = [aws_s3_bucket_policy.allow_write_access] -} -`, rName, folderStructureType, logFileFormat) -} - -func testAccSessionLoggerConfig_additionalEncryptionContextUpdated(rName, folderStructureType, logFileFormat string) string { - return testAccSessionLoggerConfig_s3Base(rName) + fmt.Sprintf(` -resource "aws_workspacesweb_session_logger" "test" { - display_name = %[1]q - additional_encryption_context = { - environment = "production" - application = "workspaces" - } - - log_configuration { - s3 { - bucket = aws_s3_bucket.test.id - folder_structure = %[2]q - log_file_format = %[3]q - } - } - - event_filter { - all = {} - } - - depends_on = [aws_s3_bucket_policy.allow_write_access] -} -`, rName, folderStructureType, logFileFormat) -} - -func testAccSessionLoggerConfig_customerManagedKeyUpdated(rName, folderStructureType, logFileFormat string) string { - return testAccSessionLoggerConfig_s3Base(rName) + ` -data "aws_partition" "current" {} - -data "aws_caller_identity" "current" {} - -data "aws_iam_policy_document" "kms_key_policy" { - statement { - principals { - type = "AWS" - identifiers = ["arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root"] - } - actions = ["kms:*"] - resources = ["*"] - } - - statement { - principals { - type = "Service" - identifiers = ["workspaces-web.amazonaws.com"] - } - actions = [ - "kms:Encrypt", - "kms:GenerateDataKey*", - "kms:ReEncrypt*", - "kms:Decrypt" - ] - resources = ["*"] - } -} - -resource "aws_kms_key" "test" { - description = "Test key for session logger" - policy = data.aws_iam_policy_document.kms_key_policy.json -} - -resource "aws_kms_key" "test2" { - description = "Test key 2 for session logger" - policy = data.aws_iam_policy_document.kms_key_policy.json -} -` + fmt.Sprintf(` -resource "aws_workspacesweb_session_logger" "test" { - display_name = %[1]q - customer_managed_key = aws_kms_key.test2.arn - - log_configuration { - s3 { - bucket = aws_s3_bucket.test.id - folder_structure = %[2]q - log_file_format = %[3]q - } - } - - event_filter { - all = {} + all {} } depends_on = [aws_s3_bucket_policy.allow_write_access] diff --git a/website/docs/r/workspacesweb_session_logger.html.markdown b/website/docs/r/workspacesweb_session_logger.html.markdown index 5d96c253c60c..b083572c2e9f 100644 --- a/website/docs/r/workspacesweb_session_logger.html.markdown +++ b/website/docs/r/workspacesweb_session_logger.html.markdown @@ -42,7 +42,7 @@ resource "aws_workspacesweb_session_logger" "example" { display_name = "example-session-logger" event_filter { - all = true + all {} } log_configuration { @@ -175,7 +175,7 @@ The following arguments are optional: Exactly one of the following must be specified: -* `all` - (Optional) Boolean that specifies to monitor all events. Set to `true` to monitor all events. +* `all` - (Optional) Block that specifies to monitor all events. Set to `{}` to monitor all events. * `include` - (Optional) List of specific events to monitor. Valid values include session events like `SessionStart`, `SessionEnd`, etc. ### S3 Configuration From 4fe33c2cd04503599d92ed2f4d08a2a25fa220ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 11:52:11 -0400 Subject: [PATCH 0903/2115] r/aws_workspacesweb_session_logger: Correct generated tagging tests. --- .../workspacesweb/testdata/SessionLogger/tags/main_gen.tf | 2 +- .../testdata/SessionLogger/tagsComputed1/main_gen.tf | 2 +- .../testdata/SessionLogger/tagsComputed2/main_gen.tf | 2 +- .../testdata/SessionLogger/tags_defaults/main_gen.tf | 2 +- .../testdata/SessionLogger/tags_ignore/main_gen.tf | 2 +- .../workspacesweb/testdata/tmpl/session_logger_tags.gtpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf index 889735224e83..c31d47baa011 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags/main_gen.tf @@ -5,7 +5,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf index 5290a91c84b5..332c93d689ea 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed1/main_gen.tf @@ -7,7 +7,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf index bab46be5841d..7d43ca5e7a23 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tagsComputed2/main_gen.tf @@ -7,7 +7,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf index b8cb124c9d35..3bb168b11271 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_defaults/main_gen.tf @@ -11,7 +11,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { diff --git a/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf index e6a0120853ed..91930b5d53f0 100644 --- a/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf +++ b/internal/service/workspacesweb/testdata/SessionLogger/tags_ignore/main_gen.tf @@ -14,7 +14,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { diff --git a/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl index 36e9a616631f..6a5a4bbf986a 100644 --- a/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl +++ b/internal/service/workspacesweb/testdata/tmpl/session_logger_tags.gtpl @@ -2,7 +2,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = var.rName event_filter { - all = {} + all {} } log_configuration { From c20940724396b80a850d7501bdecf244595d2791 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 12:04:31 -0400 Subject: [PATCH 0904/2115] r/aws_workspacesweb_session_logger: Set unknowns after Update. --- internal/service/workspacesweb/session_logger.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/service/workspacesweb/session_logger.go b/internal/service/workspacesweb/session_logger.go index 3f572b73a1f5..98f027165a5b 100644 --- a/internal/service/workspacesweb/session_logger.go +++ b/internal/service/workspacesweb/session_logger.go @@ -257,12 +257,19 @@ func (r *sessionLoggerResource) Update(ctx context.Context, request resource.Upd return } - _, err := conn.UpdateSessionLogger(ctx, &input) + output, err := conn.UpdateSessionLogger(ctx, &input) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("updating WorkSpacesWeb Session Logger (%s)", old.SessionLoggerARN.ValueString()), err.Error()) return } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output.SessionLogger, &new)...) + if response.Diagnostics.HasError() { + return + } + } else { + new.LogConfiguration = old.LogConfiguration } response.Diagnostics.Append(response.State.Set(ctx, new)...) From 92bd644617046740ad258478e0d7a1bef246b2f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 12:04:59 -0400 Subject: [PATCH 0905/2115] Fix 'TestAccWorkSpacesWebSessionLogger_update'. --- internal/service/workspacesweb/session_logger_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/service/workspacesweb/session_logger_test.go b/internal/service/workspacesweb/session_logger_test.go index 30b3b5b63974..024aca7bfeb5 100644 --- a/internal/service/workspacesweb/session_logger_test.go +++ b/internal/service/workspacesweb/session_logger_test.go @@ -119,7 +119,8 @@ func TestAccWorkSpacesWebSessionLogger_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDisplayName, rName), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureFlat)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJson)), - resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.#", "0"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.#", "1"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.include.#", "0"), ), }, { @@ -130,6 +131,7 @@ func TestAccWorkSpacesWebSessionLogger_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.folder_structure", string(awstypes.FolderStructureNestedByDate)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.log_file_format", string(awstypes.LogFileFormatJsonLines)), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.s3.0.key_prefix", "updated-logs/"), + resource.TestCheckResourceAttr(resourceName, "event_filter.0.all.#", "0"), resource.TestCheckResourceAttr(resourceName, "event_filter.0.include.#", "2"), resource.TestCheckTypeSetElemAttr(resourceName, "event_filter.0.include.*", string(awstypes.EventSessionStart)), resource.TestCheckTypeSetElemAttr(resourceName, "event_filter.0.include.*", string(awstypes.EventSessionEnd)), From 580045d6354bcd4c0dc471b02876cfd611277f26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 13:50:38 -0400 Subject: [PATCH 0906/2115] Add 'TestAccWorkSpacesWebSessionLoggerAssociation_disappears'. --- .../service/workspacesweb/exports_test.go | 1 + .../session_logger_association.go | 28 +++----- .../session_logger_association_test.go | 68 ++----------------- 3 files changed, 18 insertions(+), 79 deletions(-) diff --git a/internal/service/workspacesweb/exports_test.go b/internal/service/workspacesweb/exports_test.go index 877695a1cb01..e51c5e630f72 100644 --- a/internal/service/workspacesweb/exports_test.go +++ b/internal/service/workspacesweb/exports_test.go @@ -16,6 +16,7 @@ var ( ResourceNetworkSettingsAssociation = newNetworkSettingsAssociationResource ResourcePortal = newPortalResource ResourceSessionLogger = newSessionLoggerResource + ResourceSessionLoggerAssociation = newSessionLoggerAssociationResource ResourceTrustStore = newTrustStoreResource ResourceTrustStoreAssociation = newTrustStoreAssociationResource ResourceUserAccessLoggingSettings = newUserAccessLoggingSettingsResource diff --git a/internal/service/workspacesweb/session_logger_association.go b/internal/service/workspacesweb/session_logger_association.go index 1a8eacdb153f..ac09647b0bd7 100644 --- a/internal/service/workspacesweb/session_logger_association.go +++ b/internal/service/workspacesweb/session_logger_association.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" - "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" tfretry "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -31,25 +31,24 @@ func newSessionLoggerAssociationResource(_ context.Context) (resource.ResourceWi return &sessionLoggerAssociationResource{}, nil } -const ( - ResNameSessionLoggerAssociation = "Session Logger Association" -) - type sessionLoggerAssociationResource struct { framework.ResourceWithModel[sessionLoggerAssociationResourceModel] + framework.WithNoUpdate } func (r *sessionLoggerAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "portal_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, "session_logger_arn": schema.StringAttribute{ - Required: true, + CustomType: fwtypes.ARNType, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, @@ -75,7 +74,7 @@ func (r *sessionLoggerAssociationResource) Create(ctx context.Context, request r _, err := conn.AssociateSessionLogger(ctx, &input) if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("creating WorkSpacesWeb %s", ResNameSessionLoggerAssociation), err.Error()) + response.Diagnostics.AddError("creating WorkSpacesWeb Session Logger Association", err.Error()) return } @@ -100,7 +99,7 @@ func (r *sessionLoggerAssociationResource) Read(ctx context.Context, request res } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb %s (%s)", ResNameSessionLoggerAssociation, data.SessionLoggerARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("reading WorkSpacesWeb Session Logger Association (%s)", data.SessionLoggerARN.ValueString()), err.Error()) return } @@ -114,11 +113,6 @@ func (r *sessionLoggerAssociationResource) Read(ctx context.Context, request res response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *sessionLoggerAssociationResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { - // This resource requires replacement on update since there's no true update operation - response.Diagnostics.AddError("Update not supported", "This resource must be replaced to update") -} - func (r *sessionLoggerAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { var data sessionLoggerAssociationResourceModel response.Diagnostics.Append(request.State.Get(ctx, &data)...) @@ -139,7 +133,7 @@ func (r *sessionLoggerAssociationResource) Delete(ctx context.Context, request r } if err != nil { - response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb %s (%s)", ResNameSessionLoggerAssociation, data.SessionLoggerARN.ValueString()), err.Error()) + response.Diagnostics.AddError(fmt.Sprintf("deleting WorkSpacesWeb Session Logger Association (%s)", data.SessionLoggerARN.ValueString()), err.Error()) return } } @@ -165,6 +159,6 @@ func (r *sessionLoggerAssociationResource) ImportState(ctx context.Context, requ type sessionLoggerAssociationResourceModel struct { framework.WithRegionModel - PortalARN types.String `tfsdk:"portal_arn"` - SessionLoggerARN types.String `tfsdk:"session_logger_arn"` + PortalARN fwtypes.ARN `tfsdk:"portal_arn"` + SessionLoggerARN fwtypes.ARN `tfsdk:"session_logger_arn"` } diff --git a/internal/service/workspacesweb/session_logger_association_test.go b/internal/service/workspacesweb/session_logger_association_test.go index ad68ed5a5202..f34474e7a163 100644 --- a/internal/service/workspacesweb/session_logger_association_test.go +++ b/internal/service/workspacesweb/session_logger_association_test.go @@ -70,14 +70,11 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_basic(t *testing.T) { }) } -func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { +func TestAccWorkSpacesWebSessionLoggerAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) - var sessionLogger1, sessionLogger2 awstypes.SessionLogger + var sessionLogger awstypes.SessionLogger rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_workspacesweb_session_logger_association.test" - sessionLoggerResourceName1 := "aws_workspacesweb_session_logger.test" - sessionLoggerResourceName2 := "aws_workspacesweb_session_logger.test2" - portalResourceName := "aws_workspacesweb_portal.test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { @@ -92,18 +89,10 @@ func TestAccWorkSpacesWebSessionLoggerAssociation_update(t *testing.T) { { Config: testAccSessionLoggerAssociationConfig_basic(rName, rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger1), - resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName1, "session_logger_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), - ), - }, - { - Config: testAccSessionLoggerAssociationConfig_updated(rName, string(awstypes.FolderStructureFlat), string(awstypes.LogFileFormatJson)), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger2), - resource.TestCheckResourceAttrPair(resourceName, "session_logger_arn", sessionLoggerResourceName2, "session_logger_arn"), - resource.TestCheckResourceAttrPair(resourceName, "portal_arn", portalResourceName, "portal_arn"), + testAccCheckSessionLoggerAssociationExists(ctx, resourceName, &sessionLogger), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfworkspacesweb.ResourceSessionLoggerAssociation, resourceName), ), + ExpectNonEmptyPlan: true, }, }, }) @@ -219,7 +208,7 @@ resource "aws_workspacesweb_session_logger" "test" { display_name = %[1]q event_filter { - all = {} + all {} } log_configuration { @@ -239,48 +228,3 @@ resource "aws_workspacesweb_session_logger_association" "test" { } `, sessionLoggerName, folderStructureType, logFileFormat) } - -func testAccSessionLoggerAssociationConfig_updated(rName, folderStructureType, logFileFormat string) string { - return testAccSessionLoggerAssociationConfig_base(rName) + fmt.Sprintf(` -resource "aws_workspacesweb_session_logger" "test" { - display_name = %[1]q - - event_filter { - all = {} - } - - log_configuration { - s3 { - bucket = aws_s3_bucket.test.id - folder_structure = %[2]q - log_file_format = %[3]q - } - } - - depends_on = [aws_s3_bucket_policy.allow_write_access] -} - -resource "aws_workspacesweb_session_logger" "test2" { - display_name = "%[1]s-2" - - event_filter { - all = {} - } - - log_configuration { - s3 { - bucket = aws_s3_bucket.test.id - folder_structure = %[2]q - log_file_format = %[3]q - } - } - - depends_on = [aws_s3_bucket_policy.allow_write_access] -} - -resource "aws_workspacesweb_session_logger_association" "test" { - portal_arn = aws_workspacesweb_portal.test.portal_arn - session_logger_arn = aws_workspacesweb_session_logger.test2.session_logger_arn -} -`, rName, folderStructureType, logFileFormat) -} From 1039db41a619496107fa84c1344da1bb3bf54263 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:02:16 -0400 Subject: [PATCH 0907/2115] Add copyright header. --- .../service/servicecatalog/testdata/foo/product_template.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/servicecatalog/testdata/foo/product_template.yaml b/internal/service/servicecatalog/testdata/foo/product_template.yaml index cfcb21370405..e63f55771e3e 100644 --- a/internal/service/servicecatalog/testdata/foo/product_template.yaml +++ b/internal/service/servicecatalog/testdata/foo/product_template.yaml @@ -1,3 +1,6 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + AWSTemplateFormatVersion: '2010-09-09' Description: 'Test product template for taint reproduction' From d7d8d27c51e807bd902e4eac04b4727bead9f5c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:03:36 -0400 Subject: [PATCH 0908/2115] Run 'make fix-constants PKG=servicecatalog'. --- internal/service/servicecatalog/provisioned_product_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 819509c221cc..5d66ed93b181 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1025,7 +1025,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "false"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "none"), ), @@ -1075,7 +1075,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "false"), + resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_to_force_an_update"), ), From 848d84cbb34b6b8573f480784c82368c38704ef2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:06:42 -0400 Subject: [PATCH 0909/2115] Fix providerlint 'AWSAT005: avoid hardcoded ARN AWS partitions, use aws_partition data source'. --- internal/service/servicecatalog/provisioned_product_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 5d66ed93b181..b4a0716c869d 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1240,10 +1240,12 @@ resource "aws_iam_role" "launch_role" { }) } +data "aws_partition" "current" {} + # Attach admin policy to launch role (for demo purposes only) resource "aws_iam_role_policy_attachment" "launch_role" { role = aws_iam_role.launch_role.name - policy_arn = "arn:aws:iam::aws:policy/AdministratorAccess" + policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AdministratorAccess" } `, rName, useNewVersion, simulateFailure, extraParam)) } From c2be5c35bdf1183e069e5d023f23be6763da4bad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:07:26 -0400 Subject: [PATCH 0910/2115] Fix golangci-lint 'whitespace'. --- internal/service/servicecatalog/provisioned_product.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 534eabbd3787..1ea7178f2c56 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -640,7 +640,6 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat } err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) - } if errs.IsA[*awstypes.ResourceNotFoundException](err) { From 59e2323b167f58998d86b31ee7c8d3133f6d2218 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:08:54 -0400 Subject: [PATCH 0911/2115] Use 'testAccCheckProvisionedProductStatus'. --- internal/service/servicecatalog/provisioned_product_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index b4a0716c869d..3cf51a0ad6dd 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1021,6 +1021,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { Config: testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), + testAccCheckProvisionedProductStatus(ctx, resourceName, "AVAILABLE"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), From 8c2329921216d4336587665275bc492927594bfa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 14:10:03 -0400 Subject: [PATCH 0912/2115] Fix terrafmt errors. --- .../service/servicecatalog/provisioned_product_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 3cf51a0ad6dd..e84ec23061cc 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1158,10 +1158,10 @@ resource "aws_servicecatalog_provisioned_product" "test" { } resource "aws_servicecatalog_product" "test" { - description = %[1]q - name = %[1]q - owner = "ägare" - type = "CLOUD_FORMATION_TEMPLATE" + description = %[1]q + name = %[1]q + owner = "ägare" + type = "CLOUD_FORMATION_TEMPLATE" provisioning_artifact_parameters { name = "%[1]s - Initial" From 4b3d13a8b052a48374e09fe93bba41697e0586b2 Mon Sep 17 00:00:00 2001 From: Kishan Gajjar Date: Wed, 27 Aug 2025 15:42:15 -0400 Subject: [PATCH 0913/2115] Update Sigint doc --- website/docs/r/ecs_service.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 2adad8d330f2..3f8b8298073e 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -171,7 +171,7 @@ The following arguments are optional: * `scheduling_strategy` - (Optional) Scheduling strategy to use for the service. The valid values are `REPLICA` and `DAEMON`. Defaults to `REPLICA`. Note that [*Tasks using the Fargate launch type or the `CODE_DEPLOY` or `EXTERNAL` deployment controller types don't support the `DAEMON` scheduling strategy*](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html). * `service_connect_configuration` - (Optional) ECS Service Connect configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace. [See below](#service_connect_configuration). * `service_registries` - (Optional) Service discovery registries for the service. The maximum number of `service_registries` blocks is `1`. [See below](#service_registries). -* `sigint_rollback` - (Optional) Whether to enable graceful termination of Blue/Green deployments using SIGINT signals. When enabled, allows customers to safely cancel an in-progress Blue/Green deployment and automatically trigger a rollback to the previous stable state. Defaults to `false`. Only applicable when using `BLUE_GREEN` deployment strategy. +* `sigint_rollback` - (Optional) Whether to enable graceful termination of deployments using SIGINT signals. When enabled, allows customers to safely cancel an in-progress deployment and automatically trigger a rollback to the previous stable state. Defaults to `false`. Only applicable when using `ECS` deployment controller and requires `wait_for_steady_state = true`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `task_definition` - (Optional) Family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. Required unless using the `EXTERNAL` deployment controller. If a revision is not specified, the latest `ACTIVE` revision is used. * `triggers` - (Optional) Map of arbitrary keys and values that, when changed, will trigger an in-place update (redeployment). Useful with `plantimestamp()`. See example above. From 58f388046d7debd801105cd1a6d2cb595b0ce2ac Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 15:56:23 -0400 Subject: [PATCH 0914/2115] r/aws_route: fix identity test generation ```console % make testacc PKG=vpc TESTS=TestAccVPCRoute_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCRoute_' -timeout 360m -vet=off 2025/08/27 15:39:29 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/27 15:39:29 Initializing Terraform AWS Provider (SDKv2-style)... === NAME TestAccVPCRoute_ipv4ToCarrierGateway wavelength_carrier_gateway_test.go:198: skipping since no Wavelength Zones are available --- SKIP: TestAccVPCRoute_ipv4ToCarrierGateway (0.74s) === CONT TestAccVPCRoute_basic --- PASS: TestAccVPCRoute_localRouteImport (27.20s) === CONT TestAccVPCRoute_Disappears_routeTable --- PASS: TestAccVPCRoute_ipv4ToVPCPeeringConnection (30.07s) === CONT TestAccVPCRoute_localRouteCreateError --- PASS: TestAccVPCRoute_basic (31.51s) === CONT TestAccVPCRoute_disappears --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_unattached (34.15s) === CONT TestAccVPCRoute_conditionalCIDRBlock --- PASS: TestAccVPCRoute_ipv6ToVPCPeeringConnection (44.53s) === CONT TestAccVPCRoute_ipv6ToVPCEndpoint --- PASS: TestAccVPCRoute_Identity_Basic (46.27s) === CONT TestAccVPCRoute_IPv6Update_target --- PASS: TestAccVPCRoute_doesNotCrashWithVPCEndpoint (46.64s) === CONT TestAccVPCRoute_IPv4Update_target --- PASS: TestAccVPCRoute_IPv6ToNetworkInterface_unattached (46.65s) === CONT TestAccVPCRoute_prefixListToInternetGateway --- PASS: TestAccVPCRoute_Disappears_routeTable (22.88s) === CONT TestAccVPCRoute_Identity_ExistingResource --- PASS: TestAccVPCRoute_disappears (23.64s) === CONT TestAccVPCRoute_Identity_RegionOverride --- PASS: TestAccVPCRoute_localRouteCreateError (27.11s) === CONT TestAccVPCRoute_localRouteImportAndUpdate --- PASS: TestAccVPCRoute_ipv6ToEgressOnlyInternetGateway (57.95s) === CONT TestAccVPCRoute_prefixListToTransitGateway --- PASS: TestAccVPCRoute_prefixListToInternetGateway (33.31s) === CONT TestAccVPCRoute_prefixListToEgressOnlyInternetGateway --- PASS: TestAccVPCRoute_conditionalCIDRBlock (51.62s) === CONT TestAccVPCRoute_prefixListToLocalGateway vpc_route_test.go:2166: skipping since no Outposts found --- SKIP: TestAccVPCRoute_prefixListToLocalGateway (0.59s) === CONT TestAccVPCRoute_duplicate --- PASS: TestAccVPCRoute_Identity_RegionOverride (30.63s) === CONT TestAccVPCRoute_prefixListToCarrierGateway wavelength_carrier_gateway_test.go:198: skipping since no Wavelength Zones are available --- SKIP: TestAccVPCRoute_prefixListToCarrierGateway (0.25s) === CONT TestAccVPCRoute_PrefixListToNetworkInterface_attached --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_attached (92.36s) === CONT TestAccVPCRoute_prefixListToNatGateway --- PASS: TestAccVPCRoute_duplicate (12.42s) === CONT TestAccVPCRoute_prefixListToVPCPeeringConnection --- PASS: TestAccVPCRoute_ipv4ToInstance (101.55s) === CONT TestAccVPCRoute_ipv6ToInstance --- PASS: TestAccVPCRoute_Identity_ExistingResource (54.36s) === CONT TestAccVPCRoute_ipv6ToInternetGateway --- PASS: TestAccVPCRoute_ipv6ToVPNGateway (108.35s) === CONT TestAccVPCRoute_ipv6ToLocalGateway vpc_route_test.go:1066: skipping since no Outposts found --- SKIP: TestAccVPCRoute_ipv6ToLocalGateway (0.15s) === CONT TestAccVPCRoute_PrefixListToNetworkInterface_unattached --- PASS: TestAccVPCRoute_localRouteImportAndUpdate (52.04s) === CONT TestAccVPCRoute_prefixListToInstance --- PASS: TestAccVPCRoute_ipv4ToVPNGateway (109.48s) === CONT TestAccVPCRoute_ipv4ToLocalGateway vpc_route_test.go:1019: skipping since no Outposts found --- SKIP: TestAccVPCRoute_ipv4ToLocalGateway (0.17s) --- PASS: TestAccVPCRoute_prefixListToVPNGateway (110.05s) --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_twoAttachments (113.33s) --- PASS: TestAccVPCRoute_prefixListToEgressOnlyInternetGateway (38.75s) --- PASS: TestAccVPCRoute_prefixListToVPCPeeringConnection (29.25s) --- PASS: TestAccVPCRoute_ipv6ToInternetGateway (32.21s) --- PASS: TestAccVPCRoute_PrefixListToNetworkInterface_unattached (30.01s) --- PASS: TestAccVPCRoute_ipv6ToInstance (89.50s) --- PASS: TestAccVPCRoute_prefixListToInstance (89.78s) --- PASS: TestAccVPCRoute_PrefixListToNetworkInterface_attached (112.51s) --- PASS: TestAccVPCRoute_ipv4ToNatGateway (215.04s) --- PASS: TestAccVPCRoute_ipv6ToNatGateway (226.33s) --- PASS: TestAccVPCRoute_IPv6Update_target (218.73s) --- PASS: TestAccVPCRoute_prefixListToNatGateway (178.78s) --- PASS: TestAccVPCRoute_ipv6ToTransitGateway (382.52s) --- PASS: TestAccVPCRoute_ipv4ToTransitGateway (382.83s) --- PASS: TestAccVPCRoute_prefixListToTransitGateway (375.40s) --- PASS: TestAccVPCRoute_ipv6ToVPCEndpoint (404.25s) --- PASS: TestAccVPCRoute_ipv4ToVPCEndpoint (461.01s) --- PASS: TestAccVPCRoute_IPv4Update_target (574.28s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 627.587s ``` --- .../{basic_v6.8.0 => basic_v6.10.0}/main_gen.tf | 2 +- internal/service/ec2/vpc_route.go | 9 ++++----- .../service/ec2/vpc_route_identity_gen_test.go | 16 +++++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) rename internal/service/ec2/testdata/Route/{basic_v6.8.0 => basic_v6.10.0}/main_gen.tf (96%) diff --git a/internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf b/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf similarity index 96% rename from internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf rename to internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf index ff929a8aaf88..6ff59bd3cafb 100644 --- a/internal/service/ec2/testdata/Route/basic_v6.8.0/main_gen.tf +++ b/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf @@ -28,7 +28,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "6.8.0" + version = "6.10.0" } } } diff --git a/internal/service/ec2/vpc_route.go b/internal/service/ec2/vpc_route.go index 58a12c5fd0a3..43b4e9d80c2e 100644 --- a/internal/service/ec2/vpc_route.go +++ b/internal/service/ec2/vpc_route.go @@ -55,7 +55,8 @@ var routeValidTargets = []string{ // @IdentityAttribute("destination_ipv6_cidr_block", optional="true") // @IdentityAttribute("destination_prefix_list_id", optional="true") // @ImportIDHandler("routeImportID") -// @Testing(preIdentityVersion="6.8.0") +// @Testing(preIdentityVersion="6.10.0") +// @Testing(importStateIdFunc="testAccRouteImportStateIdFunc") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;types.Route") func resourceRoute() *schema.Resource { return &schema.Resource{ @@ -515,11 +516,9 @@ var _ inttypes.SDKv2ImportID = routeImportID{} type routeImportID struct{} func (routeImportID) Create(d *schema.ResourceData) string { - // TODO: can we implement any error handling here? _, destination, _ := routeDestinationAttribute(d) routeTableID := d.Get("route_table_id").(string) - // TODO: fix magic separator - return fmt.Sprintf("%s_%s", routeTableID, destination) + return routeCreateID(routeTableID, destination) } func (routeImportID) Parse(id string) (string, map[string]string, error) { @@ -541,5 +540,5 @@ func (routeImportID) Parse(id string) (string, map[string]string, error) { result[routeDestinationPrefixListID] = destination } - return id, result, nil + return routeCreateID(routeTableID, destination), result, nil } diff --git a/internal/service/ec2/vpc_route_identity_gen_test.go b/internal/service/ec2/vpc_route_identity_gen_test.go index a06c2e362058..679930c8496c 100644 --- a/internal/service/ec2/vpc_route_identity_gen_test.go +++ b/internal/service/ec2/vpc_route_identity_gen_test.go @@ -66,6 +66,7 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { acctest.CtRName: config.StringVariable(rName), }, ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccRouteImportStateIdFunc(resourceName), ResourceName: resourceName, ImportState: true, ImportStateVerify: true, @@ -77,9 +78,10 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), }, - ResourceName: resourceName, - ImportState: true, - ImportStateKind: resource.ImportBlockWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccRouteImportStateIdFunc(resourceName), ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), @@ -158,7 +160,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { "region": config.StringVariable(acctest.AlternateRegion()), }, ImportStateKind: resource.ImportCommandWithID, - ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccRouteImportStateIdFunc), ResourceName: resourceName, ImportState: true, ImportStateVerify: true, @@ -174,7 +176,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateKind: resource.ImportBlockWithID, - ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccRouteImportStateIdFunc), ImportPlanChecks: resource.ImportPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("route_table_id"), knownvalue.NotNull()), @@ -210,7 +212,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { }) } -// Resource Identity was added after v6.8.0 +// Resource Identity was added after v6.10.0 func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { ctx := acctest.Context(t) @@ -228,7 +230,7 @@ func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { Steps: []resource.TestStep{ // Step 1: Create pre-Identity { - ConfigDirectory: config.StaticDirectory("testdata/Route/basic_v6.8.0/"), + ConfigDirectory: config.StaticDirectory("testdata/Route/basic_v6.10.0/"), ConfigVariables: config.Variables{ acctest.CtRName: config.StringVariable(rName), }, From 7d00877bea92424c2a281fed08358febddd7288a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 16:03:50 -0400 Subject: [PATCH 0915/2115] Consolidate CHANGELOG entries. --- .changelog/41055.txt | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.changelog/41055.txt b/.changelog/41055.txt index 517174fd15b1..c38c5a698e65 100644 --- a/.changelog/41055.txt +++ b/.changelog/41055.txt @@ -1,35 +1,15 @@ ```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Added `default_policy` argument +resource/aws_dlm_lifecycle_policy: Add `default_policy` argument ``` ```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `copy_tags`,`create_interval`,`exclusions`,`extend_deletion`,`policy_language`,`resource_type` and `retain_interval` arguments to `policy_details` +resource/aws_dlm_lifecycle_policy: Add `copy_tags`, `create_interval`, `exclusions`, `extend_deletion`, `policy_language`, `resource_type` and `retain_interval` attributes to `policy_details` configuration block ``` ```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `scripts` argument to `create_rule` +resource/aws_dlm_lifecycle_policy: Add `policy_details.create_rule.scripts` argument ``` ```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `execute_operation_on_script_failure`, `execution_handler`, `execution_handler_service`, `execution_timeout`, `maximum_retry_count` and `stages` arguments to `scripts` +resource/aws_dlm_lifecycle_policy:Add `policy_details.schedule.archive_rule` argument ``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `exclude_boot_volumes`, `exclude_tags` and `exclude_volume_types` arguments to `exclusions` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `archive_rule` argument to `schedule` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `archive_retain_rule` argument to `archive_rule` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `retention_archive_tier` argument to `archive_retain_rule` -``` - -```release-note:enhancement -resource/aws_dlm_lifecycle_policy: Add `count`,`interval` and `interval_unit` arguments to `retention_archive_tier` -``` \ No newline at end of file From 2ede7899bfac4718ac0a278fb423e61f05fb39ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Aug 2025 16:09:18 -0400 Subject: [PATCH 0916/2115] r/aws_dlm_lifecycle_policy: Alphabetize attributes. --- internal/service/dlm/lifecycle_policy.go | 88 ++++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index 14ea55c3cbdc..da04b19946e1 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -52,16 +52,16 @@ func resourceLifecyclePolicy() *schema.Resource { validation.StringLenBetween(1, 500), ), }, - names.AttrExecutionRoleARN: { - Type: schema.TypeString, - Required: true, - ValidateFunc: verify.ValidARN, - }, "default_policy": { Type: schema.TypeString, Optional: true, ValidateDiagFunc: enum.Validate[awstypes.DefaultPolicyTypeValues](), }, + names.AttrExecutionRoleARN: { + Type: schema.TypeString, + Required: true, + ValidateFunc: verify.ValidARN, + }, "policy_details": { Type: schema.TypeList, Required: true, @@ -236,6 +236,45 @@ func resourceLifecyclePolicy() *schema.Resource { }, }, }, + names.AttrParameters: { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "exclude_boot_volume": { + Type: schema.TypeBool, + Optional: true, + }, + "no_reboot": { + Type: schema.TypeBool, + Optional: true, + }, + }, + }, + }, + "policy_language": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.PolicyLanguageValues](), + }, + "policy_type": { + Type: schema.TypeString, + Optional: true, + Default: awstypes.PolicyTypeValuesEbsSnapshotManagement, + ValidateDiagFunc: enum.Validate[awstypes.PolicyTypeValues](), + }, + "resource_locations": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateDiagFunc: enum.Validate[awstypes.ResourceLocationValues](), + }, + }, names.AttrResourceType: { Type: schema.TypeString, Optional: true, @@ -252,16 +291,6 @@ func resourceLifecyclePolicy() *schema.Resource { }, ConflictsWith: []string{"policy_details.0.resource_type", "default_policy"}, }, - "resource_locations": { - Type: schema.TypeList, - Optional: true, - Computed: true, - MaxItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeString, - ValidateDiagFunc: enum.Validate[awstypes.ResourceLocationValues](), - }, - }, "retain_interval": { Type: schema.TypeInt, Optional: true, @@ -278,35 +307,6 @@ func resourceLifecyclePolicy() *schema.Resource { return false }, }, - names.AttrParameters: { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "exclude_boot_volume": { - Type: schema.TypeBool, - Optional: true, - }, - "no_reboot": { - Type: schema.TypeBool, - Optional: true, - }, - }, - }, - }, - "policy_language": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateDiagFunc: enum.Validate[awstypes.PolicyLanguageValues](), - }, - "policy_type": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.PolicyTypeValuesEbsSnapshotManagement, - ValidateDiagFunc: enum.Validate[awstypes.PolicyTypeValues](), - }, names.AttrSchedule: { Type: schema.TypeList, Optional: true, From f142cc4df4575e0b6042eadaf8b78479029cb895 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 16:10:44 -0400 Subject: [PATCH 0917/2115] r/aws_route(doc): import by identity --- website/docs/r/route.html.markdown | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/website/docs/r/route.html.markdown b/website/docs/r/route.html.markdown index 3c9a3197f876..0957033792de 100644 --- a/website/docs/r/route.html.markdown +++ b/website/docs/r/route.html.markdown @@ -95,6 +95,44 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route.example + identity = { + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + + ### OR by IPv6 CIDR block + # destination_ipv6_cidr_block = "10.42.0.0/16" + + ### OR by prefix list ID + # destination_prefix_list_id = "pl-0570a1d2d725c16be" + } +} + +resource "aws_route" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `route_table_id` - (String) ID of the route table. + +#### Optional + +~> Exactly one of of `destination_cidr_block`, `destination_ipv6_cidr_block`, or `destination_prefix_list_id` is required. + +- `account_id` (String) AWS Account where this resource is managed. +- `destination_cidr_block` - (String) Destination IPv4 CIDR block. +- `destination_ipv6_cidr_block` - (String) Destination IPv6 CIDR block. +- `destination_prefix_list_id` - (String) Destination IPv6 CIDR block. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import individual routes using `ROUTETABLEID_DESTINATION`. Import [local routes](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html#RouteTables) using the VPC's IPv4 or IPv6 CIDR blocks. For example: Import a route in route table `rtb-656C65616E6F72` with an IPv4 destination CIDR of `10.42.0.0/16`: From 017521bf14b246e937331364f59fd16de007849e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 16:13:17 -0400 Subject: [PATCH 0918/2115] r/aws_route: remove unused rName variable from generated tests ```console % make testacc PKG=vpc TESTS=TestAccVPCRoute_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCRoute_' -timeout 360m -vet=off 2025/08/27 16:14:07 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/27 16:14:07 Initializing Terraform AWS Provider (SDKv2-style)... === NAME TestAccVPCRoute_ipv4ToCarrierGateway wavelength_carrier_gateway_test.go:198: skipping since no Wavelength Zones are available --- SKIP: TestAccVPCRoute_ipv4ToCarrierGateway (1.00s) === CONT TestAccVPCRoute_ipv6ToTransitGateway === NAME TestAccVPCRoute_prefixListToCarrierGateway wavelength_carrier_gateway_test.go:198: skipping since no Wavelength Zones are available --- SKIP: TestAccVPCRoute_prefixListToCarrierGateway (1.16s) === CONT TestAccVPCRoute_ipv6ToVPCPeeringConnection === NAME TestAccVPCRoute_prefixListToLocalGateway vpc_route_test.go:2166: skipping since no Outposts found --- SKIP: TestAccVPCRoute_prefixListToLocalGateway (1.51s) === CONT TestAccVPCRoute_ipv6ToInstance --- PASS: TestAccVPCRoute_duplicate (20.83s) === CONT TestAccVPCRoute_ipv6ToInternetGateway --- PASS: TestAccVPCRoute_localRouteImport (29.55s) === CONT TestAccVPCRoute_IPv6ToNetworkInterface_unattached --- PASS: TestAccVPCRoute_ipv4ToVPCPeeringConnection (31.99s) === CONT TestAccVPCRoute_basic --- PASS: TestAccVPCRoute_prefixListToInternetGateway (37.99s) === CONT TestAccVPCRoute_Disappears_routeTable --- PASS: TestAccVPCRoute_ipv6ToVPCPeeringConnection (41.40s) === CONT TestAccVPCRoute_disappears --- PASS: TestAccVPCRoute_Identity_Basic (44.02s) === CONT TestAccVPCRoute_Identity_ExistingResource --- PASS: TestAccVPCRoute_doesNotCrashWithVPCEndpoint (45.10s) === CONT TestAccVPCRoute_conditionalCIDRBlock --- PASS: TestAccVPCRoute_prefixListToEgressOnlyInternetGateway (47.44s) === CONT TestAccVPCRoute_localRouteCreateError --- PASS: TestAccVPCRoute_ipv6ToEgressOnlyInternetGateway (56.63s) === CONT TestAccVPCRoute_PrefixListToNetworkInterface_unattached --- PASS: TestAccVPCRoute_ipv6ToInternetGateway (36.31s) === CONT TestAccVPCRoute_IPv6Update_target --- PASS: TestAccVPCRoute_basic (25.64s) === CONT TestAccVPCRoute_prefixListToInstance --- PASS: TestAccVPCRoute_Disappears_routeTable (23.71s) === CONT TestAccVPCRoute_IPv4Update_target --- PASS: TestAccVPCRoute_localRouteImportAndUpdate (65.54s) === CONT TestAccVPCRoute_PrefixListToNetworkInterface_attached --- PASS: TestAccVPCRoute_disappears (25.63s) === CONT TestAccVPCRoute_IPv4ToNetworkInterface_attached --- PASS: TestAccVPCRoute_IPv6ToNetworkInterface_unattached (42.62s) === CONT TestAccVPCRoute_prefixListToNatGateway --- PASS: TestAccVPCRoute_localRouteCreateError (29.47s) === CONT TestAccVPCRoute_IPv4ToNetworkInterface_twoAttachments --- PASS: TestAccVPCRoute_PrefixListToNetworkInterface_unattached (37.27s) === CONT TestAccVPCRoute_prefixListToVPCPeeringConnection --- PASS: TestAccVPCRoute_conditionalCIDRBlock (51.45s) === CONT TestAccVPCRoute_ipv4ToInstance --- PASS: TestAccVPCRoute_ipv4ToVPNGateway (104.61s) === CONT TestAccVPCRoute_ipv6ToLocalGateway --- PASS: TestAccVPCRoute_prefixListToVPNGateway (104.89s) === CONT TestAccVPCRoute_Identity_RegionOverride --- PASS: TestAccVPCRoute_Identity_ExistingResource (60.91s) === CONT TestAccVPCRoute_ipv4ToLocalGateway vpc_route_test.go:1019: skipping since no Outposts found --- SKIP: TestAccVPCRoute_ipv4ToLocalGateway (0.20s) === CONT TestAccVPCRoute_ipv6ToVPCEndpoint === NAME TestAccVPCRoute_ipv6ToLocalGateway vpc_route_test.go:1066: skipping since no Outposts found --- SKIP: TestAccVPCRoute_ipv6ToLocalGateway (0.53s) === CONT TestAccVPCRoute_IPv4ToNetworkInterface_unattached --- PASS: TestAccVPCRoute_ipv6ToVPNGateway (122.64s) --- PASS: TestAccVPCRoute_prefixListToVPCPeeringConnection (34.75s) --- PASS: TestAccVPCRoute_ipv6ToInstance (131.66s) --- PASS: TestAccVPCRoute_prefixListToInstance (77.02s) --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_unattached (29.57s) --- PASS: TestAccVPCRoute_Identity_RegionOverride (33.35s) --- PASS: TestAccVPCRoute_PrefixListToNetworkInterface_attached (100.33s) --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_attached (128.58s) --- PASS: TestAccVPCRoute_ipv6ToNatGateway (198.11s) --- PASS: TestAccVPCRoute_IPv4ToNetworkInterface_twoAttachments (121.44s) --- PASS: TestAccVPCRoute_ipv4ToInstance (101.89s) --- PASS: TestAccVPCRoute_ipv4ToNatGateway (227.38s) --- PASS: TestAccVPCRoute_IPv6Update_target (207.40s) --- PASS: TestAccVPCRoute_prefixListToNatGateway (201.49s) --- PASS: TestAccVPCRoute_ipv4ToTransitGateway (427.06s) --- PASS: TestAccVPCRoute_ipv6ToTransitGateway (427.16s) --- PASS: TestAccVPCRoute_prefixListToTransitGateway (428.28s) --- PASS: TestAccVPCRoute_ipv4ToVPCEndpoint (456.30s) --- PASS: TestAccVPCRoute_ipv6ToVPCEndpoint (357.53s) --- PASS: TestAccVPCRoute_IPv4Update_target (568.99s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 637.557s ``` --- .../ec2/testdata/Route/basic/main_gen.tf | 5 --- .../testdata/Route/basic_v6.10.0/main_gen.tf | 5 --- .../Route/region_override/main_gen.tf | 5 --- internal/service/ec2/vpc_route.go | 1 + .../ec2/vpc_route_identity_gen_test.go | 44 +++++-------------- 5 files changed, 13 insertions(+), 47 deletions(-) diff --git a/internal/service/ec2/testdata/Route/basic/main_gen.tf b/internal/service/ec2/testdata/Route/basic/main_gen.tf index 45e128db766e..59feddab1f01 100644 --- a/internal/service/ec2/testdata/Route/basic/main_gen.tf +++ b/internal/service/ec2/testdata/Route/basic/main_gen.tf @@ -19,8 +19,3 @@ resource "aws_route_table" "test" { vpc_id = aws_vpc.test.id } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} diff --git a/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf b/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf index 6ff59bd3cafb..22f2106d9398 100644 --- a/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf +++ b/internal/service/ec2/testdata/Route/basic_v6.10.0/main_gen.tf @@ -19,11 +19,6 @@ resource "aws_route_table" "test" { vpc_id = aws_vpc.test.id } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} terraform { required_providers { aws = { diff --git a/internal/service/ec2/testdata/Route/region_override/main_gen.tf b/internal/service/ec2/testdata/Route/region_override/main_gen.tf index ed4bd6c2488f..0020eb1d3811 100644 --- a/internal/service/ec2/testdata/Route/region_override/main_gen.tf +++ b/internal/service/ec2/testdata/Route/region_override/main_gen.tf @@ -27,11 +27,6 @@ resource "aws_route_table" "test" { vpc_id = aws_vpc.test.id } -variable "rName" { - description = "Name for resource" - type = string - nullable = false -} variable "region" { description = "Region to deploy resource in" diff --git a/internal/service/ec2/vpc_route.go b/internal/service/ec2/vpc_route.go index 43b4e9d80c2e..80bc66660632 100644 --- a/internal/service/ec2/vpc_route.go +++ b/internal/service/ec2/vpc_route.go @@ -58,6 +58,7 @@ var routeValidTargets = []string{ // @Testing(preIdentityVersion="6.10.0") // @Testing(importStateIdFunc="testAccRouteImportStateIdFunc") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;types.Route") +// @Testing(generator=false) func resourceRoute() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceRouteCreate, diff --git a/internal/service/ec2/vpc_route_identity_gen_test.go b/internal/service/ec2/vpc_route_identity_gen_test.go index 679930c8496c..c088e8526ef8 100644 --- a/internal/service/ec2/vpc_route_identity_gen_test.go +++ b/internal/service/ec2/vpc_route_identity_gen_test.go @@ -7,7 +7,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/terraform-plugin-testing/config" - sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -25,7 +24,6 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { var v types.Route resourceName := "aws_route.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) acctest.ParallelTest(ctx, t, resource.TestCase{ TerraformVersionChecks: []tfversion.TerraformVersionCheck{ @@ -39,9 +37,7 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { // Step 1: Setup { ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigVariables: config.Variables{}, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRouteExists(ctx, resourceName, &v), ), @@ -61,10 +57,8 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { // Step 2: Import command { - ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{}, ImportStateKind: resource.ImportCommandWithID, ImportStateIdFunc: testAccRouteImportStateIdFunc(resourceName), ResourceName: resourceName, @@ -74,10 +68,8 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { // Step 3: Import block with Import ID { - ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), + ConfigVariables: config.Variables{}, ResourceName: resourceName, ImportState: true, ImportStateKind: resource.ImportBlockWithID, @@ -96,9 +88,7 @@ func TestAccVPCRoute_Identity_Basic(t *testing.T) { // Step 4: Import block with Resource Identity { ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigVariables: config.Variables{}, ResourceName: resourceName, ImportState: true, ImportStateKind: resource.ImportBlockWithResourceIdentity, @@ -120,7 +110,6 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_route.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) acctest.ParallelTest(ctx, t, resource.TestCase{ TerraformVersionChecks: []tfversion.TerraformVersionCheck{ @@ -135,8 +124,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - "region": config.StringVariable(acctest.AlternateRegion()), + "region": config.StringVariable(acctest.AlternateRegion()), }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), @@ -156,8 +144,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - "region": config.StringVariable(acctest.AlternateRegion()), + "region": config.StringVariable(acctest.AlternateRegion()), }, ImportStateKind: resource.ImportCommandWithID, ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccRouteImportStateIdFunc), @@ -170,8 +157,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - "region": config.StringVariable(acctest.AlternateRegion()), + "region": config.StringVariable(acctest.AlternateRegion()), }, ResourceName: resourceName, ImportState: true, @@ -192,8 +178,7 @@ func TestAccVPCRoute_Identity_RegionOverride(t *testing.T) { { ConfigDirectory: config.StaticDirectory("testdata/Route/region_override/"), ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - "region": config.StringVariable(acctest.AlternateRegion()), + "region": config.StringVariable(acctest.AlternateRegion()), }, ResourceName: resourceName, ImportState: true, @@ -218,7 +203,6 @@ func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { var v types.Route resourceName := "aws_route.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) acctest.ParallelTest(ctx, t, resource.TestCase{ TerraformVersionChecks: []tfversion.TerraformVersionCheck{ @@ -231,9 +215,7 @@ func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { // Step 1: Create pre-Identity { ConfigDirectory: config.StaticDirectory("testdata/Route/basic_v6.10.0/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigVariables: config.Variables{}, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRouteExists(ctx, resourceName, &v), ), @@ -246,9 +228,7 @@ func TestAccVPCRoute_Identity_ExistingResource(t *testing.T) { { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, ConfigDirectory: config.StaticDirectory("testdata/Route/basic/"), - ConfigVariables: config.Variables{ - acctest.CtRName: config.StringVariable(rName), - }, + ConfigVariables: config.Variables{}, ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), From cfa3086ef089cd06c572e0d65933e76ac1c7f87f Mon Sep 17 00:00:00 2001 From: Andrew Wilson Date: Thu, 28 Aug 2025 08:39:33 +1000 Subject: [PATCH 0919/2115] Fix typo in aws_batch_compute_environment docs --- website/docs/r/batch_compute_environment.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/batch_compute_environment.html.markdown b/website/docs/r/batch_compute_environment.html.markdown index fedf5c19fff8..8f2f49b9f334 100644 --- a/website/docs/r/batch_compute_environment.html.markdown +++ b/website/docs/r/batch_compute_environment.html.markdown @@ -248,7 +248,7 @@ This resource supports the following arguments: `update_policy` supports the following: * `job_execution_timeout_minutes` - (Required) Specifies the job timeout (in minutes) when the compute environment infrastructure is updated. -* `terminate_jobs_on_update` - (Required) Specifies whether jobs are automatically terminated when the computer environment infrastructure is updated. +* `terminate_jobs_on_update` - (Required) Specifies whether jobs are automatically terminated when the compute environment infrastructure is updated. ## Attribute Reference From d05f0f625d1535a09f3257deea120eef45fb5710 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:05:21 +0900 Subject: [PATCH 0920/2115] Add endpoint_ip_address_type --- internal/service/ec2/vpnclient_endpoint.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index c49ccbf292e6..2c791a50e076 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -186,6 +186,13 @@ func resourceClientVPNEndpoint() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "endpoint_ip_address_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateDiagFunc: enum.Validate[awstypes.EndpointIpAddressType](), + }, names.AttrSecurityGroupIDs: { Type: schema.TypeSet, MinItems: 1, @@ -293,6 +300,10 @@ func resourceClientVPNEndpointCreate(ctx context.Context, d *schema.ResourceData input.DnsServers = flex.ExpandStringValueList(v.([]any)) } + if v, ok := d.GetOk("endpoint_ip_address_type"); ok { + input.EndpointIpAddressType = awstypes.EndpointIpAddressType(v.(string)) + } + if v, ok := d.GetOk(names.AttrSecurityGroupIDs); ok { input.SecurityGroupIds = flex.ExpandStringValueSet(v.(*schema.Set)) } @@ -374,6 +385,7 @@ func resourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData, d.Set("disconnect_on_session_timeout", ep.DisconnectOnSessionTimeout) d.Set(names.AttrDNSName, ep.DnsName) d.Set("dns_servers", ep.DnsServers) + d.Set("endpoint_ip_address_type", ep.EndpointIpAddressType) d.Set(names.AttrSecurityGroupIDs, ep.SecurityGroupIds) if aws.ToString(ep.SelfServicePortalUrl) != "" { d.Set("self_service_portal", awstypes.SelfServicePortalEnabled) From fb9dfe949b0265cc68be65288de73b45b91b4b7c Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:05:54 +0900 Subject: [PATCH 0921/2115] Add traffic_ip_address_type --- internal/service/ec2/vpnclient_endpoint.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index 2c791a50e076..895ac955a2f0 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -229,6 +229,13 @@ func resourceClientVPNEndpoint() *schema.Resource { }, names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), + "traffic_ip_address_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateDiagFunc: enum.Validate[awstypes.TrafficIpAddressType](), + }, "transport_protocol": { Type: schema.TypeString, Optional: true, @@ -316,6 +323,10 @@ func resourceClientVPNEndpointCreate(ctx context.Context, d *schema.ResourceData input.SessionTimeoutHours = aws.Int32(int32(v.(int))) } + if v, ok := d.GetOk("traffic_ip_address_type"); ok { + input.TrafficIpAddressType = awstypes.TrafficIpAddressType(v.(string)) + } + if v, ok := d.GetOk(names.AttrVPCID); ok { input.VpcId = aws.String(v.(string)) } @@ -396,6 +407,7 @@ func resourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData, d.Set("server_certificate_arn", ep.ServerCertificateArn) d.Set("session_timeout_hours", ep.SessionTimeoutHours) d.Set("split_tunnel", ep.SplitTunnel) + d.Set("traffic_ip_address_type", ep.TrafficIpAddressType) d.Set("transport_protocol", ep.TransportProtocol) d.Set(names.AttrVPCID, ep.VpcId) d.Set("vpn_port", ep.VpnPort) From f61e1738eec8bdd486d73a7f8458562ade9388b9 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:06:16 +0900 Subject: [PATCH 0922/2115] Make client_cidr_block Optional --- internal/service/ec2/vpnclient_endpoint.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index 895ac955a2f0..679f48f35945 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -85,7 +85,7 @@ func resourceClientVPNEndpoint() *schema.Resource { }, "client_cidr_block": { Type: schema.TypeString, - Required: true, + Optional: true, ForceNew: true, ValidateFunc: validation.IsCIDR, }, @@ -266,7 +266,6 @@ func resourceClientVPNEndpointCreate(ctx context.Context, d *schema.ResourceData conn := meta.(*conns.AWSClient).EC2Client(ctx) input := &ec2.CreateClientVpnEndpointInput{ - ClientCidrBlock: aws.String(d.Get("client_cidr_block").(string)), ClientToken: aws.String(id.UniqueId()), ServerCertificateArn: aws.String(d.Get("server_certificate_arn").(string)), SplitTunnel: aws.Bool(d.Get("split_tunnel").(bool)), @@ -279,6 +278,10 @@ func resourceClientVPNEndpointCreate(ctx context.Context, d *schema.ResourceData input.AuthenticationOptions = expandClientVPNAuthenticationRequests(v.(*schema.Set).List()) } + if v, ok := d.GetOk("client_cidr_block"); ok { + input.ClientCidrBlock = aws.String(v.(string)) + } + if v, ok := d.GetOk("client_connect_options"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { input.ClientConnectOptions = expandClientConnectOptions(v.([]any)[0].(map[string]any)) } From b0aa84a50477022fc2db7ff47f53620bd61cd229 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:07:47 +0900 Subject: [PATCH 0923/2115] Add acctests for endpoint_ip_address_type and traffic_ip_address_type --- .../service/ec2/vpnclient_endpoint_test.go | 184 ++++++++++++++++++ internal/service/ec2/vpnclient_test.go | 2 + 2 files changed, 186 insertions(+) diff --git a/internal/service/ec2/vpnclient_endpoint_test.go b/internal/service/ec2/vpnclient_endpoint_test.go index 1cd7ca15434d..7c312ec2e2a8 100644 --- a/internal/service/ec2/vpnclient_endpoint_test.go +++ b/internal/service/ec2/vpnclient_endpoint_test.go @@ -12,6 +12,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -59,6 +60,7 @@ func testAccClientVPNEndpoint_basic(t *testing.T, semaphore tfsync.Semaphore) { resource.TestCheckResourceAttrSet(resourceName, "disconnect_on_session_timeout"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttr(resourceName, "dns_servers.#", "0"), + resource.TestCheckResourceAttr(resourceName, "endpoint_ip_address_type", string(awstypes.EndpointIpAddressTypeIpv4)), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, "self_service_portal", "disabled"), resource.TestCheckResourceAttr(resourceName, "self_service_portal_url", ""), @@ -67,6 +69,7 @@ func testAccClientVPNEndpoint_basic(t *testing.T, semaphore tfsync.Semaphore) { resource.TestCheckResourceAttr(resourceName, "split_tunnel", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), + resource.TestCheckResourceAttr(resourceName, "traffic_ip_address_type", string(awstypes.TrafficIpAddressTypeIpv4)), resource.TestCheckResourceAttr(resourceName, "transport_protocol", "udp"), resource.TestCheckResourceAttr(resourceName, names.AttrVPCID, ""), resource.TestCheckResourceAttr(resourceName, "vpn_port", "443"), @@ -740,6 +743,116 @@ func testAccClientVPNEndpoint_vpcSecurityGroups(t *testing.T, semaphore tfsync.S }) } +func testAccClientVPNEndpoint_endpointIpAddressType(t *testing.T, semaphore tfsync.Semaphore) { + ctx := acctest.Context(t) + var v awstypes.ClientVpnEndpoint + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_ec2_client_vpn_endpoint.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheckClientVPNSyncronize(t, semaphore) + acctest.PreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClientVPNEndpointDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClientVPNEndpointConfig_endpointIpAddressType(t, rName, string(awstypes.EndpointIpAddressTypeIpv6)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClientVPNEndpointExists(ctx, resourceName, &v), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), + resource.TestCheckResourceAttr(resourceName, "endpoint_ip_address_type", string(awstypes.EndpointIpAddressTypeIpv6)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccClientVPNEndpointConfig_endpointIpAddressType(t, rName, string(awstypes.EndpointIpAddressTypeDualStack)), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionDestroyBeforeCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClientVPNEndpointExists(ctx, resourceName, &v), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), + resource.TestCheckResourceAttr(resourceName, "endpoint_ip_address_type", string(awstypes.EndpointIpAddressTypeDualStack)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccClientVPNEndpoint_trafficIpAddressType(t *testing.T, semaphore tfsync.Semaphore) { + ctx := acctest.Context(t) + var v awstypes.ClientVpnEndpoint + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_ec2_client_vpn_endpoint.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + testAccPreCheckClientVPNSyncronize(t, semaphore) + acctest.PreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClientVPNEndpointDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClientVPNEndpointConfig_trafficIpAddressTypeIPv6(t, rName), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClientVPNEndpointExists(ctx, resourceName, &v), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), + resource.TestCheckResourceAttr(resourceName, "traffic_ip_address_type", string(awstypes.TrafficIpAddressTypeIpv6)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccClientVPNEndpointConfig_trafficIpAddressTypeDualStack(t, rName), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionDestroyBeforeCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckClientVPNEndpointExists(ctx, resourceName, &v), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), + resource.TestCheckResourceAttr(resourceName, "traffic_ip_address_type", string(awstypes.TrafficIpAddressTypeDualStack)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckClientVPNEndpointDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Client(ctx) @@ -1342,3 +1455,74 @@ resource "aws_ec2_client_vpn_endpoint" "test" { } `, rName, nSecurityGroups)) } + +func testAccClientVPNEndpointConfig_endpointIpAddressType(t *testing.T, rName, endpointIpAddressType string) string { + return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` +resource "aws_ec2_client_vpn_endpoint" "test" { + server_certificate_arn = aws_acm_certificate.test.arn + client_cidr_block = "10.0.0.0/16" + + authentication_options { + type = "certificate-authentication" + root_certificate_chain_arn = aws_acm_certificate.test.arn + } + + connection_log_options { + enabled = false + } + + endpoint_ip_address_type = %[2]q + + tags = { + Name = %[1]q + } +} +`, rName, endpointIpAddressType)) +} + +func testAccClientVPNEndpointConfig_trafficIpAddressTypeIPv6(t *testing.T, rName string) string { + return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` +resource "aws_ec2_client_vpn_endpoint" "test" { + server_certificate_arn = aws_acm_certificate.test.arn + + authentication_options { + type = "certificate-authentication" + root_certificate_chain_arn = aws_acm_certificate.test.arn + } + + connection_log_options { + enabled = false + } + + traffic_ip_address_type = "ipv6" + + tags = { + Name = %[1]q + } +} +`, rName)) +} + +func testAccClientVPNEndpointConfig_trafficIpAddressTypeDualStack(t *testing.T, rName string) string { + return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` +resource "aws_ec2_client_vpn_endpoint" "test" { + server_certificate_arn = aws_acm_certificate.test.arn + client_cidr_block = "10.0.0.0/16" + + authentication_options { + type = "certificate-authentication" + root_certificate_chain_arn = aws_acm_certificate.test.arn + } + + connection_log_options { + enabled = false + } + + traffic_ip_address_type = "dual-stack" + + tags = { + Name = %[1]q + } +} +`, rName)) +} diff --git a/internal/service/ec2/vpnclient_test.go b/internal/service/ec2/vpnclient_test.go index 536a9dc01913..44e3ad0f3491 100644 --- a/internal/service/ec2/vpnclient_test.go +++ b/internal/service/ec2/vpnclient_test.go @@ -37,6 +37,8 @@ func TestAccClientVPNEndpoint_serial(t *testing.T) { "selfServicePortal": testAccClientVPNEndpoint_selfServicePortal, "vpcNoSecurityGroups": testAccClientVPNEndpoint_vpcNoSecurityGroups, "vpcSecurityGroups": testAccClientVPNEndpoint_vpcSecurityGroups, + "endpointIpAddressType": testAccClientVPNEndpoint_endpointIpAddressType, + "trafficIpAddressType": testAccClientVPNEndpoint_trafficIpAddressType, "basicDataSource": testAccClientVPNEndpointDataSource_basic, }, "AuthorizationRule": { From 97bb8d15b51298edc7fee96201019003071528fc Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:08:29 +0900 Subject: [PATCH 0924/2115] Add endpoint_ip_address_type and traffic_ip_address_type for the data source --- internal/service/ec2/vpnclient_endpoint_data_source.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/service/ec2/vpnclient_endpoint_data_source.go b/internal/service/ec2/vpnclient_endpoint_data_source.go index 462888dce15e..4426b0fc7b5f 100644 --- a/internal/service/ec2/vpnclient_endpoint_data_source.go +++ b/internal/service/ec2/vpnclient_endpoint_data_source.go @@ -149,6 +149,10 @@ func dataSourceClientVPNEndpoint() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "endpoint_ip_address_type": { + Type: schema.TypeString, + Computed: true, + }, names.AttrFilter: customFiltersSchema(), names.AttrSecurityGroupIDs: { Type: schema.TypeList, @@ -176,6 +180,10 @@ func dataSourceClientVPNEndpoint() *schema.Resource { Computed: true, }, names.AttrTags: tftags.TagsSchemaComputed(), + "traffic_ip_address_type": { + Type: schema.TypeString, + Computed: true, + }, "transport_protocol": { Type: schema.TypeString, Computed: true, @@ -259,6 +267,7 @@ func dataSourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData d.Set(names.AttrDescription, ep.Description) d.Set(names.AttrDNSName, ep.DnsName) d.Set("dns_servers", ep.DnsServers) + d.Set("endpoint_ip_address_type", ep.EndpointIpAddressType) d.Set(names.AttrSecurityGroupIDs, ep.SecurityGroupIds) if aws.ToString(ep.SelfServicePortalUrl) != "" { d.Set("self_service_portal", awstypes.SelfServicePortalEnabled) @@ -270,6 +279,7 @@ func dataSourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData d.Set("session_timeout_hours", ep.SessionTimeoutHours) d.Set("split_tunnel", ep.SplitTunnel) d.Set("transport_protocol", ep.TransportProtocol) + d.Set("traffic_ip_address_type", ep.TrafficIpAddressType) d.Set(names.AttrVPCID, ep.VpcId) d.Set("vpn_port", ep.VpnPort) From 6bddc211c88ee1ad18fbda7a920319e38fcad9f6 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:09:10 +0900 Subject: [PATCH 0925/2115] Update the acctest for the data-source --- internal/service/ec2/vpnclient_endpoint_data_source_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/ec2/vpnclient_endpoint_data_source_test.go b/internal/service/ec2/vpnclient_endpoint_data_source_test.go index 2b3fb0d01e0a..e042caedd8d0 100644 --- a/internal/service/ec2/vpnclient_endpoint_data_source_test.go +++ b/internal/service/ec2/vpnclient_endpoint_data_source_test.go @@ -43,6 +43,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource1Name, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasource1Name, names.AttrDNSName, resourceName, names.AttrDNSName), resource.TestCheckResourceAttrPair(datasource1Name, "dns_servers.#", resourceName, "dns_servers.#"), + resource.TestCheckResourceAttrPair(datasource1Name, "endpoint_ip_address_type", resourceName, "endpoint_ip_address_type"), resource.TestCheckResourceAttrPair(datasource1Name, "security_group_ids.#", resourceName, "security_group_ids.#"), resource.TestCheckResourceAttrPair(datasource1Name, "self_service_portal", resourceName, "self_service_portal"), resource.TestCheckResourceAttrPair(datasource1Name, "self_service_portal_url", resourceName, "self_service_portal_url"), @@ -50,6 +51,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource1Name, "session_timeout_hours", resourceName, "session_timeout_hours"), resource.TestCheckResourceAttrPair(datasource1Name, "split_tunnel", resourceName, "split_tunnel"), resource.TestCheckResourceAttrPair(datasource1Name, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), + resource.TestCheckResourceAttrPair(datasource1Name, "traffic_ip_address_type", resourceName, "traffic_ip_address_type"), resource.TestCheckResourceAttrPair(datasource1Name, "transport_protocol", resourceName, "transport_protocol"), resource.TestCheckResourceAttrPair(datasource1Name, names.AttrVPCID, resourceName, names.AttrVPCID), resource.TestCheckResourceAttrPair(datasource1Name, "vpn_port", resourceName, "vpn_port"), @@ -64,6 +66,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource2Name, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasource2Name, names.AttrDNSName, resourceName, names.AttrDNSName), resource.TestCheckResourceAttrPair(datasource2Name, "dns_servers.#", resourceName, "dns_servers.#"), + resource.TestCheckResourceAttrPair(datasource2Name, "endpoint_ip_address_type", resourceName, "endpoint_ip_address_type"), resource.TestCheckResourceAttrPair(datasource2Name, "security_group_ids.#", resourceName, "security_group_ids.#"), resource.TestCheckResourceAttrPair(datasource2Name, "self_service_portal_url", resourceName, "self_service_portal_url"), resource.TestCheckResourceAttrPair(datasource2Name, "self_service_portal", resourceName, "self_service_portal"), @@ -71,6 +74,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource2Name, "session_timeout_hours", resourceName, "session_timeout_hours"), resource.TestCheckResourceAttrPair(datasource2Name, "split_tunnel", resourceName, "split_tunnel"), resource.TestCheckResourceAttrPair(datasource2Name, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), + resource.TestCheckResourceAttrPair(datasource2Name, "traffic_ip_address_type", resourceName, "traffic_ip_address_type"), resource.TestCheckResourceAttrPair(datasource2Name, "transport_protocol", resourceName, "transport_protocol"), resource.TestCheckResourceAttrPair(datasource2Name, names.AttrVPCID, resourceName, names.AttrVPCID), resource.TestCheckResourceAttrPair(datasource2Name, "vpn_port", resourceName, "vpn_port"), @@ -86,6 +90,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource3Name, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasource3Name, names.AttrDNSName, resourceName, names.AttrDNSName), resource.TestCheckResourceAttrPair(datasource3Name, "dns_servers.#", resourceName, "dns_servers.#"), + resource.TestCheckResourceAttrPair(datasource3Name, "endpoint_ip_address_type", resourceName, "endpoint_ip_address_type"), resource.TestCheckResourceAttrPair(datasource3Name, "security_group_ids.#", resourceName, "security_group_ids.#"), resource.TestCheckResourceAttrPair(datasource2Name, "self_service_portal_url", resourceName, "self_service_portal_url"), resource.TestCheckResourceAttrPair(datasource3Name, "self_service_portal", resourceName, "self_service_portal"), @@ -93,6 +98,7 @@ func testAccClientVPNEndpointDataSource_basic(t *testing.T, semaphore tfsync.Sem resource.TestCheckResourceAttrPair(datasource3Name, "session_timeout_hours", resourceName, "session_timeout_hours"), resource.TestCheckResourceAttrPair(datasource3Name, "split_tunnel", resourceName, "split_tunnel"), resource.TestCheckResourceAttrPair(datasource3Name, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), + resource.TestCheckResourceAttrPair(datasource3Name, "traffic_ip_address_type", resourceName, "traffic_ip_address_type"), resource.TestCheckResourceAttrPair(datasource3Name, "transport_protocol", resourceName, "transport_protocol"), resource.TestCheckResourceAttrPair(datasource3Name, names.AttrVPCID, resourceName, names.AttrVPCID), resource.TestCheckResourceAttrPair(datasource3Name, "vpn_port", resourceName, "vpn_port"), From 9449e745b79ef563a7d0957554bceca909dbdf48 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:09:54 +0900 Subject: [PATCH 0926/2115] Update the documentation for the resource --- website/docs/r/ec2_client_vpn_endpoint.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/r/ec2_client_vpn_endpoint.html.markdown b/website/docs/r/ec2_client_vpn_endpoint.html.markdown index da5f9d0a4149..aaae7b1bfbc5 100644 --- a/website/docs/r/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/r/ec2_client_vpn_endpoint.html.markdown @@ -38,7 +38,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `authentication_options` - (Required) Information about the authentication method to be used to authenticate clients. -* `client_cidr_block` - (Required) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. +* `client_cidr_block` - (Optional) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. When `traffic_ip_address_type` is set to `ipv6`, it must not be specified. Otherwise, it is required. * `client_connect_options` - (Optional) The options for managing connection authorization for new client connections. * `client_login_banner_options` - (Optional) Options for enabling a customizable text banner that will be displayed on AWS provided clients when a VPN session is established. * `client_route_enforcement_options` - (Optional) Options for enforce administrator defined routes on devices connected through the VPN. @@ -46,12 +46,14 @@ This resource supports the following arguments: * `description` - (Optional) A brief description of the Client VPN endpoint. * `disconnect_on_session_timeout` - (Optional) Indicates whether the client VPN session is disconnected after the maximum `session_timeout_hours` is reached. If `true`, users are prompted to reconnect client VPN. If `false`, client VPN attempts to reconnect automatically. The default value is `false`. * `dns_servers` - (Optional) Information about the DNS servers to be used for DNS resolution. A Client VPN endpoint can have up to two DNS servers. If no DNS server is specified, the DNS address of the connecting device is used. +* `endpoint_ip_address_type` - (Optional) IP address type for the Client VPN endpoint. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. * `security_group_ids` - (Optional) The IDs of one or more security groups to apply to the target network. You must also specify the ID of the VPC that contains the security groups. * `self_service_portal` - (Optional) Specify whether to enable the self-service portal for the Client VPN endpoint. Values can be `enabled` or `disabled`. Default value is `disabled`. * `server_certificate_arn` - (Required) The ARN of the ACM server certificate. * `session_timeout_hours` - (Optional) The maximum session duration is a trigger by which end-users are required to re-authenticate prior to establishing a VPN session. Default value is `24` - Valid values: `8 | 10 | 12 | 24` * `split_tunnel` - (Optional) Indicates whether split-tunnel is enabled on VPN endpoint. Default value is `false`. * `tags` - (Optional) A mapping of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `traffic_ip_address_type` - (Optional) IP address type for traffic within the Client VPN tunnel. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. When it is set to `ipv6`, `client_cidr_block` must not be specified. * `transport_protocol` - (Optional) The transport protocol to be used by the VPN session. Default value is `udp`. * `vpc_id` - (Optional) The ID of the VPC to associate with the Client VPN endpoint. If no security group IDs are specified in the request, the default security group for the VPC is applied. * `vpn_port` - (Optional) The port number for the Client VPN endpoint. Valid values are `443` and `1194`. Default value is `443`. From 372b8c76097e6b5d750d77ebcf78bd4ae56be880 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:10:09 +0900 Subject: [PATCH 0927/2115] Update the documentation for the data source --- website/docs/d/ec2_client_vpn_endpoint.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/d/ec2_client_vpn_endpoint.html.markdown b/website/docs/d/ec2_client_vpn_endpoint.html.markdown index 137f449b759d..41c5e318cb56 100644 --- a/website/docs/d/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/d/ec2_client_vpn_endpoint.html.markdown @@ -63,12 +63,14 @@ This data source exports the following attributes in addition to the arguments a * `description` - Brief description of the endpoint. * `dns_name` - DNS name to be used by clients when connecting to the Client VPN endpoint. * `dns_servers` - Information about the DNS servers to be used for DNS resolution. +* `endpoint_ip_address_type` - IP address type for the Client VPN endpoint. * `security_group_ids` - IDs of the security groups for the target network associated with the Client VPN endpoint. * `self_service_portal` - Whether the self-service portal for the Client VPN endpoint is enabled. * `self_service_portal_url` - The URL of the self-service portal. * `server_certificate_arn` - The ARN of the server certificate. * `session_timeout_hours` - The maximum VPN session duration time in hours. * `split_tunnel` - Whether split-tunnel is enabled in the AWS Client VPN endpoint. +* `traffic_ip_address_type` - IP address type for traffic within the Client VPN tunnel. * `transport_protocol` - Transport protocol used by the Client VPN endpoint. * `vpc_id` - ID of the VPC associated with the Client VPN endpoint. * `vpn_port` - Port number for the Client VPN endpoint. From ab71aa91e7bea61733b2e2d6fd1c27472e13cd89 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 08:57:56 +0900 Subject: [PATCH 0928/2115] follow CAPS rules --- .../service/ec2/vpnclient_endpoint_test.go | 20 +++++++++---------- internal/service/ec2/vpnclient_test.go | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/ec2/vpnclient_endpoint_test.go b/internal/service/ec2/vpnclient_endpoint_test.go index 7c312ec2e2a8..4002344b4ff6 100644 --- a/internal/service/ec2/vpnclient_endpoint_test.go +++ b/internal/service/ec2/vpnclient_endpoint_test.go @@ -743,7 +743,7 @@ func testAccClientVPNEndpoint_vpcSecurityGroups(t *testing.T, semaphore tfsync.S }) } -func testAccClientVPNEndpoint_endpointIpAddressType(t *testing.T, semaphore tfsync.Semaphore) { +func testAccClientVPNEndpoint_endpointIPAddressType(t *testing.T, semaphore tfsync.Semaphore) { ctx := acctest.Context(t) var v awstypes.ClientVpnEndpoint rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -759,7 +759,7 @@ func testAccClientVPNEndpoint_endpointIpAddressType(t *testing.T, semaphore tfsy CheckDestroy: testAccCheckClientVPNEndpointDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClientVPNEndpointConfig_endpointIpAddressType(t, rName, string(awstypes.EndpointIpAddressTypeIpv6)), + Config: testAccClientVPNEndpointConfig_endpointIPAddressType(t, rName, string(awstypes.EndpointIpAddressTypeIpv6)), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), @@ -777,7 +777,7 @@ func testAccClientVPNEndpoint_endpointIpAddressType(t *testing.T, semaphore tfsy ImportStateVerify: true, }, { - Config: testAccClientVPNEndpointConfig_endpointIpAddressType(t, rName, string(awstypes.EndpointIpAddressTypeDualStack)), + Config: testAccClientVPNEndpointConfig_endpointIPAddressType(t, rName, string(awstypes.EndpointIpAddressTypeDualStack)), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionDestroyBeforeCreate), @@ -798,7 +798,7 @@ func testAccClientVPNEndpoint_endpointIpAddressType(t *testing.T, semaphore tfsy }) } -func testAccClientVPNEndpoint_trafficIpAddressType(t *testing.T, semaphore tfsync.Semaphore) { +func testAccClientVPNEndpoint_trafficIPAddressType(t *testing.T, semaphore tfsync.Semaphore) { ctx := acctest.Context(t) var v awstypes.ClientVpnEndpoint rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -814,7 +814,7 @@ func testAccClientVPNEndpoint_trafficIpAddressType(t *testing.T, semaphore tfsyn CheckDestroy: testAccCheckClientVPNEndpointDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccClientVPNEndpointConfig_trafficIpAddressTypeIPv6(t, rName), + Config: testAccClientVPNEndpointConfig_trafficIPAddressTypeIPv6(t, rName), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), @@ -832,7 +832,7 @@ func testAccClientVPNEndpoint_trafficIpAddressType(t *testing.T, semaphore tfsyn ImportStateVerify: true, }, { - Config: testAccClientVPNEndpointConfig_trafficIpAddressTypeDualStack(t, rName), + Config: testAccClientVPNEndpointConfig_trafficIPAddressTypeDualStack(t, rName), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionDestroyBeforeCreate), @@ -1456,7 +1456,7 @@ resource "aws_ec2_client_vpn_endpoint" "test" { `, rName, nSecurityGroups)) } -func testAccClientVPNEndpointConfig_endpointIpAddressType(t *testing.T, rName, endpointIpAddressType string) string { +func testAccClientVPNEndpointConfig_endpointIPAddressType(t *testing.T, rName, endpointIPAddressType string) string { return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` resource "aws_ec2_client_vpn_endpoint" "test" { server_certificate_arn = aws_acm_certificate.test.arn @@ -1477,10 +1477,10 @@ resource "aws_ec2_client_vpn_endpoint" "test" { Name = %[1]q } } -`, rName, endpointIpAddressType)) +`, rName, endpointIPAddressType)) } -func testAccClientVPNEndpointConfig_trafficIpAddressTypeIPv6(t *testing.T, rName string) string { +func testAccClientVPNEndpointConfig_trafficIPAddressTypeIPv6(t *testing.T, rName string) string { return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` resource "aws_ec2_client_vpn_endpoint" "test" { server_certificate_arn = aws_acm_certificate.test.arn @@ -1503,7 +1503,7 @@ resource "aws_ec2_client_vpn_endpoint" "test" { `, rName)) } -func testAccClientVPNEndpointConfig_trafficIpAddressTypeDualStack(t *testing.T, rName string) string { +func testAccClientVPNEndpointConfig_trafficIPAddressTypeDualStack(t *testing.T, rName string) string { return acctest.ConfigCompose(testAccClientVPNEndpointConfig_acmCertificateBase(t, "test"), fmt.Sprintf(` resource "aws_ec2_client_vpn_endpoint" "test" { server_certificate_arn = aws_acm_certificate.test.arn diff --git a/internal/service/ec2/vpnclient_test.go b/internal/service/ec2/vpnclient_test.go index 44e3ad0f3491..e4c39ef664dd 100644 --- a/internal/service/ec2/vpnclient_test.go +++ b/internal/service/ec2/vpnclient_test.go @@ -37,8 +37,8 @@ func TestAccClientVPNEndpoint_serial(t *testing.T) { "selfServicePortal": testAccClientVPNEndpoint_selfServicePortal, "vpcNoSecurityGroups": testAccClientVPNEndpoint_vpcNoSecurityGroups, "vpcSecurityGroups": testAccClientVPNEndpoint_vpcSecurityGroups, - "endpointIpAddressType": testAccClientVPNEndpoint_endpointIpAddressType, - "trafficIpAddressType": testAccClientVPNEndpoint_trafficIpAddressType, + "endpointIpAddressType": testAccClientVPNEndpoint_endpointIPAddressType, + "trafficIpAddressType": testAccClientVPNEndpoint_trafficIPAddressType, "basicDataSource": testAccClientVPNEndpointDataSource_basic, }, "AuthorizationRule": { From 46cb2c9884dc9742180f2e5c546c323c46c43d7f Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 09:21:35 +0900 Subject: [PATCH 0929/2115] add changelog --- .changelog/44059.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/44059.txt diff --git a/.changelog/44059.txt b/.changelog/44059.txt new file mode 100644 index 000000000000..6ac65e2c338a --- /dev/null +++ b/.changelog/44059.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` arguments to support IPv6 connectivity in Client VPN +``` + +```release-note:enhancement +data-source/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` attributes +``` From f2e77c32348c9fe032178e5bf442489030483039 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Aug 2025 09:36:27 +0000 Subject: [PATCH 0930/2115] Bump the aws-sdk-go-v2 group across 1 directory with 259 updates --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-version: 1.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-version: 1.18.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-version: 1.18.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-version: 1.19.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/accessanalyzer dependency-version: 1.44.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/account dependency-version: 1.28.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acm dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acmpca dependency-version: 1.44.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amp dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amplify dependency-version: 1.36.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigateway dependency-version: 1.35.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigatewayv2 dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appconfig dependency-version: 1.42.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appfabric dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appflow dependency-version: 1.50.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appintegrations dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationautoscaling dependency-version: 1.39.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationinsights dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationsignals dependency-version: 1.15.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appmesh dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apprunner dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appstream dependency-version: 1.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appsync dependency-version: 1.51.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/arcregionswitch dependency-version: 1.2.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/athena dependency-version: 1.55.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/auditmanager dependency-version: 1.45.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-version: 1.58.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscalingplans dependency-version: 1.28.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/backup dependency-version: 1.47.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/batch dependency-version: 1.57.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bcmdataexports dependency-version: 1.11.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrock dependency-version: 1.45.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagent dependency-version: 1.50.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol dependency-version: 1.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/billing dependency-version: 1.7.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/budgets dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chatbot dependency-version: 1.14.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chime dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines dependency-version: 1.26.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkvoice dependency-version: 1.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloud9 dependency-version: 1.32.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudcontrol dependency-version: 1.28.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.65.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfront dependency-version: 1.53.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore dependency-version: 1.12.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudsearch dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudtrail dependency-version: 1.53.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeartifact dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codebuild dependency-version: 1.67.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecatalyst dependency-version: 1.20.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecommit dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeconnections dependency-version: 1.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codedeploy dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeguruprofiler dependency-version: 1.29.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codegurureviewer dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codepipeline dependency-version: 1.46.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarconnections dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarnotifications dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentity dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider dependency-version: 1.57.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/comprehend dependency-version: 1.40.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/computeoptimizer dependency-version: 1.47.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/configservice dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connect dependency-version: 1.137.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connectcases dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/controltower dependency-version: 1.26.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costandusagereportservice dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costexplorer dependency-version: 1.55.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costoptimizationhub dependency-version: 1.20.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/customerprofiles dependency-version: 1.52.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databasemigrationservice dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databrew dependency-version: 1.37.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dataexchange dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datapipeline dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datasync dependency-version: 1.54.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datazone dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dax dependency-version: 1.28.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/detective dependency-version: 1.37.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devicefarm dependency-version: 1.35.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devopsguru dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directconnect dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directoryservice dependency-version: 1.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dlm dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdb dependency-version: 1.46.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdbelastic dependency-version: 1.19.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/drs dependency-version: 1.35.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dsql dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dynamodb dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.247.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-version: 1.49.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecrpublic dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-version: 1.63.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/efs dependency-version: 1.40.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-version: 1.73.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticache dependency-version: 1.50.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 dependency-version: 1.50.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticsearchservice dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elastictranscoder dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emr dependency-version: 1.53.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrcontainers dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrserverless dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eventbridge dependency-version: 1.44.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evidently dependency-version: 1.28.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evs dependency-version: 1.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/finspace dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/firehose dependency-version: 1.41.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fis dependency-version: 1.36.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fms dependency-version: 1.43.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fsx dependency-version: 1.61.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/gamelift dependency-version: 1.46.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glacier dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/globalaccelerator dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glue dependency-version: 1.127.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/grafana dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/greengrass dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/groundstation dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/guardduty dependency-version: 1.63.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/healthlake dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-version: 1.47.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/identitystore dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/imagebuilder dependency-version: 1.46.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector dependency-version: 1.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector2 dependency-version: 1.44.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/internetmonitor dependency-version: 1.24.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/invoicing dependency-version: 1.6.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iot dependency-version: 1.69.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivs dependency-version: 1.47.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivschat dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafka dependency-version: 1.43.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafkaconnect dependency-version: 1.27.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kendra dependency-version: 1.60.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/keyspaces dependency-version: 1.23.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesis dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalytics dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisvideo dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kms dependency-version: 1.45.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lakeformation dependency-version: 1.45.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lambda dependency-version: 1.77.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/launchwizard dependency-version: 1.13.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 dependency-version: 1.56.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/licensemanager dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lightsail dependency-version: 1.48.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/location dependency-version: 1.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lookoutmetrics dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/m2 dependency-version: 1.25.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/macie2 dependency-version: 1.49.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconnect dependency-version: 1.44.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconvert dependency-version: 1.82.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/medialive dependency-version: 1.81.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackage dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagev2 dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagevod dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediastore dependency-version: 1.29.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/memorydb dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mgn dependency-version: 1.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mq dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mwaa dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptune dependency-version: 1.41.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptunegraph dependency-version: 1.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkfirewall dependency-version: 1.54.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmanager dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmonitor dependency-version: 1.12.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notifications dependency-version: 1.6.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notificationscontacts dependency-version: 1.5.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/oam dependency-version: 1.21.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/odb dependency-version: 1.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearch dependency-version: 1.51.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearchserverless dependency-version: 1.25.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/organizations dependency-version: 1.44.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/osis dependency-version: 1.18.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/outposts dependency-version: 1.56.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/paymentcryptography dependency-version: 1.23.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcaconnectorad dependency-version: 1.15.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcs dependency-version: 1.11.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpoint dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 dependency-version: 1.24.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pipes dependency-version: 1.22.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/polly dependency-version: 1.53.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pricing dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qbusiness dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qldb dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/quicksight dependency-version: 1.92.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ram dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rbin dependency-version: 1.26.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.103.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshift dependency-version: 1.58.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftdata dependency-version: 1.37.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftserverless dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rekognition dependency-version: 1.50.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resiliencehub dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 dependency-version: 1.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroups dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rolesanywhere dependency-version: 1.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53 dependency-version: 1.57.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53domains dependency-version: 1.32.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53profiles dependency-version: 1.9.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig dependency-version: 1.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness dependency-version: 1.26.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53resolver dependency-version: 1.40.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rum dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-version: 1.87.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3control dependency-version: 1.65.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3outposts dependency-version: 1.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3tables dependency-version: 1.10.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3vectors dependency-version: 1.4.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.213.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/scheduler dependency-version: 1.16.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/schemas dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/secretsmanager dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securityhub dependency-version: 1.63.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securitylake dependency-version: 1.24.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository dependency-version: 1.29.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalog dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry dependency-version: 1.35.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicediscovery dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicequotas dependency-version: 1.31.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ses dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sesv2 dependency-version: 1.52.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sfn dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/shield dependency-version: 1.34.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/signer dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sns dependency-version: 1.38.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sqs dependency-version: 1.42.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-version: 1.64.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmcontacts dependency-version: 1.30.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmincidents dependency-version: 1.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmquicksetup dependency-version: 1.8.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmsap dependency-version: 1.24.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sso dependency-version: 1.28.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssoadmin dependency-version: 1.35.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/storagegateway dependency-version: 1.42.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-version: 1.38.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/swf dependency-version: 1.31.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/synthetics dependency-version: 1.40.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/taxsettings dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb dependency-version: 1.16.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamquery dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamwrite dependency-version: 1.35.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transcribe dependency-version: 1.52.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transfer dependency-version: 1.65.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/verifiedpermissions dependency-version: 1.28.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/vpclattice dependency-version: 1.18.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/waf dependency-version: 1.29.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafregional dependency-version: 1.30.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafv2 dependency-version: 1.67.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wellarchitected dependency-version: 1.39.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspaces dependency-version: 1.63.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspacesweb dependency-version: 1.32.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/xray dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 540 ++++++++++++++-------------- go.sum | 1080 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 810 insertions(+), 810 deletions(-) diff --git a/go.mod b/go.mod index 400f0eabe696..0d87585ecf77 100644 --- a/go.mod +++ b/go.mod @@ -11,266 +11,266 @@ require ( github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 - github.com/aws/aws-sdk-go-v2 v1.38.1 - github.com/aws/aws-sdk-go-v2/config v1.31.3 - github.com/aws/aws-sdk-go-v2/credentials v1.18.7 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 - github.com/aws/aws-sdk-go-v2/service/account v1.28.0 - github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 - github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 - github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 - github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 - github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 - github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 - github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 - github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 - github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 - github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 - github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 - github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 - github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 - github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 - github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 - github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 - github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 - github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 - github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 - github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 - github.com/aws/aws-sdk-go-v2/service/location v1.49.0 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 - github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 - github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 - github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 - github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 - github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 - github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 - github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 - github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 - github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 - github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 - github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 - github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 - github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 - github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 - github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 - github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 - github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 - github.com/aws/smithy-go v1.22.5 + github.com/aws/aws-sdk-go-v2 v1.38.2 + github.com/aws/aws-sdk-go-v2/config v1.31.4 + github.com/aws/aws-sdk-go-v2/credentials v1.18.8 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 + github.com/aws/aws-sdk-go-v2/service/account v1.28.1 + github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 + github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 + github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 + github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 + github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 + github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 + github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 + github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 + github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 + github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 + github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 + github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 + github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 + github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 + github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 + github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 + github.com/aws/aws-sdk-go-v2/service/location v1.49.1 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 + github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 + github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 + github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 + github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 + github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 + github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 + github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 + github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 + github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 + github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 + github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 + github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 + github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 + github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 + github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 + github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 + github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 github.com/davecgh/go-spew v1.1.1 @@ -322,17 +322,17 @@ 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-v2/aws/protocol/eventstream v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index ae5c66427812..967884bde097 100644 --- a/go.sum +++ b/go.sum @@ -23,548 +23,548 @@ 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-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8= -github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco= -github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE= -github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 h1:Y22iPkFuD50T1CUCEYvuwQ6J4DIU8UTaJ+xdrWh+8bM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1/go.mod h1:vOcQ8bXt6DJAUoCPjCbgTKMBxB6A7r/KAgnVBDTwX5E= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA= +github.com/aws/aws-sdk-go-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJLMyM= +github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= +github.com/aws/aws-sdk-go-v2/config v1.31.4 h1:aY2IstXOfjdLtr1lDvxFBk5DpBnHgS5GS3jgR/0BmPw= +github.com/aws/aws-sdk-go-v2/config v1.31.4/go.mod h1:1IAykiegrTp6n+CbZoCpW6kks1I74fEDgl2BPQSkLSU= +github.com/aws/aws-sdk-go-v2/credentials v1.18.8 h1:0FfdP0I9gs/f1rwtEdkcEdsclTEkPB8o6zWUG2Z8+IM= +github.com/aws/aws-sdk-go-v2/credentials v1.18.8/go.mod h1:9UReQ1UmGooX93JKzHyr7PRF3F+p3r+PmRwR7+qHJYA= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 h1:eZAl6tdv3HrIHAxbpnDQByEOD84bmxyhLmgvUYJ8ggo= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2/go.mod h1:vV+YS0SWfpwbIGOUWbB5NWklaYKscfYrQRb9ggHptxs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5/go.mod h1:csQLMI+odbC0/J+UecSTztG70Dc4aTCOu4GyPNDNpVo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= -github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= -github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 h1:IEdXOosmvsQhyLWB6hbbAxkErPQijjscB7GsSAvh7II= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.0/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3XMA6l2E/6AjeZs7Os/+8Ts= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 h1:jVt1N2UmQ06UZuscbrzWRTFA/m2Crh4ApadexWRFz/s= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2/go.mod h1:j4ljfkDaFO0JGTmRrewZX2GrYRszvPfTCiSuFFEJSbg= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmiOAFI+ztwUa1q9Vr7u4MceyA0B4Rhg2E= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 h1:V7640rWP57y1mjb10+87nNL9Ze1fvEJS18ooXTdCKvY= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 h1:L3izPS7rBuHqDOwEEGvGv+O/fb8voHIzvJ/akJu+yc4= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 h1:s7IEsxvCUpXQooiVP+bzy1EVe2NzIPAxapw7IwKlrMk= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2/go.mod h1:AjZwYae4FbhYe/fTebJMK/duQI8Y/+KM/tAqKR6xCqk= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 h1:T33TM/94TrgmFOYk9wLp5u1v45S5rQPlA2QQ9PdeGLo= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.0/go.mod h1:PLB+glHatjJZVbRG5Gx0TodUaoLxdNy9pDmOTaEV2vg= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/VzguUMWd+B2gyuBDkmU= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JPu2nZdIky7iZbBcs61+M= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 h1:WFubVKYq70Ne31wd+7eQZUr58+DciQPlVgaK91W9+0g= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 h1:uBcuEbBOFpFd/nKHLfhop7iSG6aeQNBQFczwMqyaLU0= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUVXVVgmxFeXKGamIbNN0UDfpNov4JXMSplUo= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 h1:N3a+aGEaQMCXhV9LEr6T29UDAIvb/KSeFDBRT032wBs= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 h1:sujsuzoVNHNCiL4k5PLgo5O3fDTxqYFCjrUOPnuBB3w= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+RYVfhq5lcTZjyZPkpSe1S0o= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 h1:Lot4mazcohqDr0drjUEtEWinsC5mKf6DmXGBPWhTVHI= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 h1:NGZdm/BXIgwvbzeCluVSVFbU9qx2F+iALjImedMPDNw= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2/go.mod h1:ieLXOKII97L7fYQa7Xm+PsCGJBaskvWk+wGux22jRCc= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE5uGKGIIPGjyWnyofjbu7Bxb9LmHg= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 h1:iPTQ5NjhoytlH19V3PwZblv2jahmlF4pJhTIMjegt7c= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1/go.mod h1:+UxryRSMGMtqsvxdnws+VpNyFYWRkw4ZlM+5AC160XA= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 h1:4YiGEEgooJbSl88+t0NTqRUrjsjh0hcoLrUyrEj+qJQ= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0/go.mod h1:P52KZMWQ26jGqhCrkIqVvzDgh8HRhsLN28v+tRNOvZg= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 h1:CZYoQ2fFHANjml5Mn5pOE49Qt0I+hV609IQWMAEfvxM= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2/go.mod h1:6gViEWwaPejA9LOah/Mn31v1zfANfQovYWmp4w+rt1U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 h1:WmDAyFGFt6p8d/Xqh3ER37W3lxUxsQltQ+XjF7PDwJc= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0/go.mod h1:0/USfxsqE00FryTj9aacEC/ufCg+clmEIt1DlQvRW68= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQIHijjP5kmhn8u/jp0U/yU= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 h1:kEZC9UM7c+eIzVWPo9h8OP8hJhHwdafMcSazWEAIfVM= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 h1:y6jqRCfWqshbHuc8pnTYB0tb6KzkNcsXGG+HNXpxm4g= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0/go.mod h1:v7oA5ayEizyswwdsNlsXSNI69FSAf06tjLwXkKjGUhE= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 h1:TtvQtkarc56cSKeFWySb0xYHy8fQ6pVVeCIrpSaQMGA= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0/go.mod h1:ngNGhK4pbO2IoditdtA6uaC4VB+JKi+y4Z4+Pq8c8FU= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DASC0gnUiSauGfyqFdm/7vbcpS3Ka7J+cHmgew= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2MLkq48cxD5vMwr7Dexcrp0fiX4= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 h1:Oidrc/y5Z/mINZxfRqBZlPmiyGSMydyDnLtFBC8Hq7M= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.0/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2V4GZJwyG4fcl7EQwTfjCSI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 h1:OSs7LJgZ8hWx/TpCLbqdNvzUlgSyCQZ6u7yL0qrBYLI= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV3Cyo+BMcH1l7GwXI81vTonNho= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 h1:t1veMJe9LGKOacXlLec6dWbZCal0f83kN1Wx765iADM= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 h1:VOAVEcczfBuMSluazeM0RafskmOXN9qMxqNEYQ9lUMA= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.0/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 h1:q7dZHbsKFK/D33fvyguFqM/u73jmQIWV1N0RySQFC9s= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0/go.mod h1:l8epARFi0/1WoAdjQf4VAiwkyg8YNm+8Xffd5t/KxRo= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiACR05QOS0q58U8QY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCxf9TLQPxZuVvIdOI= -github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 h1:SLtaxZ8O78lWxAdYNAe3hbcKjCghuAS/oBlfP2w4tOg= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 h1:XcTNx1ZZbaM3Ewu1SykBHRbVT+rjkIwQQzVNpv8trRE= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 h1:/oDkJA8YdhnRgqprvTckf5pq/S4Q5s1Q2ncaYO8nYYE= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.0/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 h1:GWXI9ACb/6Uxpnw07vmGunxOYHpuGyVoEPXxXUrVmbA= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 h1:M187RWd+IlIHahRG6BbUoA1uzpZd+nfkNvzWYIr4Ir4= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 h1:0qsiL2PNHz2bd+LuGktAjhGvifTa2DeGz937vid01Hg= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 h1:I46jnzRDWnaOVUZT20uBt27NoosOGhzBS4ycpso6Vog= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 h1:Zb1GwGp+4nFy4EkuLUuka6z75tGD2ET0yviKbT86cvU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 h1:x5av5LUNElLagRlvdz1ChpE6i6LRT+zXB4ImccUm4gY= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 h1:ajhW+XmobT1N3BlF+G+pfQwcl3vEd8ZQy7MgSE2zUqo= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0/go.mod h1:jyjTKrkxcH3DSiy5Oc8Acgcw/Mk0xC0tgo77aPPJXN0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 h1:upi++G3fQCAUBXQe58TbjXmdVPwrqMnRQMThOAIz7KM= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4/go.mod h1:swb+GqWXTZMOyVV9rVePAUu5L80+X5a+Lui1RNOyUFo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 h1:JmmZEFvBaUH1m/38gJbdurfKXuWwsEwdNmob8wzKN9I= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2/go.mod h1:Xx0NjUVWuBTEbWsPKzlb5EGM7CXfNeZT/yYuDs0LU9I= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 h1:7pjtnLwOsSkXqUSUh0eM4FvtBrEAIIpZnpWMfYMInAQ= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2/go.mod h1:Mkxqo2gpKhOv6hzBwASIizK/jrMYRYC3jgxou79HPFs= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 h1:2cLDi8pUtPZpy4SxVl/8qGSOEXD1C9B6S9DbYdS+il0= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.2/go.mod h1:t+dAKgSxvyyBLYfX7uRjVWLmSfB9oHVYrnr7xYgB7nI= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3r/1s2/LGP3I56Z8= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 h1:5h6T7kFcUyuMBh3Y6r2XFirXKWt45QFwxUfQ/JcIeqU= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 h1:q8dGXGYG9TSEb61QelksWI4WN7VruNzmF3iOEX2zPoU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 h1:FaN3ONYHItF50pzc8mflJZ2Nw7mxaqsLjCOncSStCaw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2/go.mod h1:L8AA5x3ERX5vhzrxTsRoTJxtMk3VBtzUclRE01z9HP0= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiNWpiJ9DdB2mCAMzo= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 h1:xjBkvUA+R02IZrK8WlRwsC3kG9LkMWI5s443jpz7aUw= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 h1:+kECYDKEF2eV7w9JPH3Y0gKXTQ0aqTqFUkrdvaX4Hn8= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 h1:ob6Pfi0h6CNDpYIrWtQE5brfrly6eEzWzR+VHnljFUM= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= -github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= -github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 h1:UeZXAjCMx4IRxP8btLxRDyqBCyRw1DGUSv+I172whzk= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 h1:2RNLZ1Ymov3rRuPUAVXSC1xXo6BJ5hpWF6ad72FGBAQ= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 h1:ltB0n2pWVrQgtyMrl7zt+8glzVcCDR7XAbu4fGQzh+Y= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 h1:lOyLFvIq0NElKvCoZoxi6jkF10QXfa+uHwKIYnktu18= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 h1:hB8zQpr04jlJmX8Tl7oZUN9usM0nf44v6WzMPpGmSco= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.0/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2/go.mod h1:xq+4xu0T5W23GDTPj+olFc6wqBrTj8Mc2wSTvqMMLv4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 h1:k1ia1mxgufRVSzwAaen8l7/VbFnk5xu/6zJMYzSgMEg= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2/go.mod h1:9gwYWqGoNfNs0MHi6F1FadJ2aai+z9E2dkTFNBZlrLU= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OUisLz0OcVIsDKwX6zMvom3tBkGPk= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 h1:6n/+GvyaH5iBi2F5HAFvpuaPPQBTeHOltEBaP3T5/7Q= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 h1:3+EJm4Prbjq1P3VmCjfPKLxMQerl14sjfK/3g8/M6LA= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.0/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 h1:c1e4iCdEt9kNgBDJWX5C7SI2taE2IgaUe31RcrOO6Zc= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 h1:kOqT0HBrIn7nfX2X81VPnPqIj8kCyJFzW0EeiX9i644= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7jtQYFQY0kBkmdhzylDwAxA7bHVg= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 h1:tVYv2JaS+YQ0Ie1m0x5jTnTTSQi7gjDXO1OtagSbX/M= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 h1:4Dc9NfSNZDXGqoO50gkIyvKeT1f1z4pJzgG+iqSx3IY= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.0/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 h1:3uVgEYqBqB9b04qtrOMSx0xNqf526y0t8FyY3/SayLI= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.0/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 h1:dltSjMAdChaG99UsPPR9ZLHKcqGQ5s+Pa7wJwbwH6hE= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 h1:f4Bj2dvWHwg5W+G04vlI2TXKy5bGKyIhWB8e3uuQ4Yg= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 h1:OLy4jmGWvP+bekj4eQOtm2IXvpTCotHuH3C8RuYWx/c= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 h1:3ZBD+LlCS2jVrB/9xL/r9PFrTP3/pntZS3tHI+E1cLg= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZflpVAJzIAqt3xb3Es6xd/NksnH6XwK956lKUg= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 h1:55M6WukFPaLNGH/mKJhggsictC45iMOnRL0SfXCzsIM= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.1/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2/go.mod h1:PxKvSpaiyU4RF1vqdtgcjNz4UfzPhCmNEvuLEtbFdNk= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 h1:DK4wkPe5hqJ/lGenYmlzP+xEaTVufeWwlcwBYun0yrU= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0/go.mod h1:mPnKXr7MlpLhdPrDIp7A7wrn8KZczClUR3cCiOoiurw= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6EqsTDpmZqtOEwMkQ8q/co= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 h1:diWWTewadd8nspQ4cLgB8agJa+iGZKOB86xXSzoVWKo= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 h1:4cI0izhZpHNep5CkZdcME1kSvFGSb38hd8DoOftIiho= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 h1:DErOaGhYl9qslEpKfFuxbbBbYW+7z9/QDc+b1dveMQ4= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 h1:EkqxGKo3NQOpecZ1SZKLwRei42br3w/Wqc8Z2LvrR6E= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUqGjV/yeobJi7TQo0= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 h1:60l+XFlsbkrgnuZQkkpjw/L1sl4awDpp227WBUo1/Ho= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.0/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 h1:P0B6+TCK7bHi+MQPnakYOVrYENtEpVkaoVGeNCWjOV4= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 h1:EZbUtGXQ3xUjZs6m7V5LKfoCRn7p2LNIWwqV/ZaKU5k= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 h1:oIANsrxMomHQt31QfRhc2v8w2FT6DrUZO0jESwVZVzs= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 h1:pnnAt7y/R3PcSf6DB4b9b3dYPrbY0g/6q2r8ui8mUiA= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 h1:hJAu7BQ9tNUaiME0dIX0mEBCUa9Wsn58oUbJJEp8Kww= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 h1:C6xQ3U3A4YymEVb8ej10BqG1+T0v5gY02sCvjM2dGmE= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 h1:+DeH9hYak2OKQjaMRR05hxqOwPveRjLt7UTRjb6NwzU= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 h1:3Txm4Y5izmDf3F6NW29jNfW1hj4aLJZUgUXFyE1t1Wc= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= -github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= -github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 h1:ovHE1XM53pMGOwINf8Mas4FMl5XRRMAihNokV1YViZ8= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5/go.mod h1:Cmu/DOSYwcr0xYTFk7sA9NJ5HF3ND0EqNUBdoK16nPI= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 h1:ntf4V0+gKWtRv8D0to90E3g69618MInKW78fds20zbY= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1/go.mod h1:6TzoN4j7QtbeN62zbHHOEThTBqFDnUpNsdHE2SXuu0k= +github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= +github.com/aws/aws-sdk-go-v2/service/account v1.28.1/go.mod h1:UCcTaFy22BpCwjdiXGTCiVjtBZgtJb56eos4OI43B9g= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.1/go.mod h1:l7aVt1kcuhWwEBe3MR6A8ouigGf8SyyOFoZImL16cEI= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 h1:89ZRA0dGP/EX+fJnAfWDyAoWngnQJAbiza4S4yEwDMQ= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1/go.mod h1:VxrbU0yq1a6AdduW/yI5YrMbfACUXfJq2Gpj23JUJu8= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1/go.mod h1:FbIQEQbdcSAJ35ZSLM9+4pUAEVXe0RsCJKgzZiRy8wk= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1/go.mod h1:IX3LdIF1/2D00vH+eBQ5cbFXrK9HfPW8dTH6gzWThY8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 h1:gWaSM3wwoCGvXasjXGfY7WGi1tTXnUjVQRyd/JFUFsM= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 h1:s5C5EIq0NRrIW+0RnwLFfm77FR/+8O7t4DysALJ5kd8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1/go.mod h1:3etelpvZBQTN26rH5Cf/S82hU4DUi9XP9s4Lq1bAeRw= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3/go.mod h1:0nr7mHOJvPp6YPsl1foq6dtYCvLXOqA32PNh4rOvV6M= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.1/go.mod h1:uiwfDwJN9bdkTr0nBmjzZ5pE6j91gIkdZr5FL1gcH8s= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 h1:auDXR4zI6q2bVLjF4XRhKdN9JgAUqJAy2caw9XIz/M0= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.4/go.mod h1:tli8PsM6pY+zVBNO5TQmjpfH4EOUQmVmZMwdYrNS2dM= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3/go.mod h1:eVLsZruYbIlLNYiJmgLYrfUHojwUuicjZWtdqNNKNM0= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1/go.mod h1:/cPr0IPQv5WdY66EbW0Q6MhkEgsffgZm3yce+9p8bTk= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1/go.mod h1:zEodD2/kBZ3ZkvCQ+BI+ssglVf63iFaQFUTPJ+nHqp0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1/go.mod h1:A9jOizMWCC5jhr6LxEDUHX2E93F1yhHFLSXt675rYnM= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.2/go.mod h1:lsoYw+OFJmS8qAQ5dqJgVxdrD2bpwb/H745dIn0FYbs= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2/go.mod h1:MbAwOxXSx2BqyRO7lwjBif37kxuJXmKtH1evpqO2JrM= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1/go.mod h1:7FcgDxYbo1T+/PalhytMEKMamKlvO8ArdBL6faoA4MA= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 h1:rfnS0WZj9LUQ+EqMAfZiGKtquux/U7m4AbijAB+rLD4= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.0/go.mod h1:cCaE9m91FJAzxAxDtVuNkYUGi2b8BGT0BdxUpCAuSSE= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 h1:IUPXngqpjUMMNk4SInQHLcsRiD9Bs8ALoVdkWt8ocBk= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1/go.mod h1:LHkXcBjWxtd4d3oNXk2yYgutSJRm8RDXswU02q4zWrw= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 h1:qWViczom6aZ/mFKkjptIT55N8YqXS/OR2r5dS092TkI= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1/go.mod h1:/1a6OiHnno31OznAJQT7fyU0oUVKEWlfQkWIYzM8sjk= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 h1:wCV+L8MEgAARnNKCl5v31WvTH66jPar5ocQCyMPGkMo= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1/go.mod h1:TXpE7TkM6gbt/s2S/xndpv7jy3AP2jnlfBtNu0r4aYY= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1/go.mod h1:QJBeAX9imA8RWLG7/X2RJtTmSerdENe/hCGIjllPGHI= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1/go.mod h1:yfmvd1yoaZOPxwn97mnTnF6Jt/d8sThRqfs2RISPQi0= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1/go.mod h1:1Dyvs+9cfooiIHba3iRvM88OPUB2NH8soQgW8gGCXaE= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0/go.mod h1:ufwtLF0mNQW0gCLbgdaHFgVtzUHeZ4VKKgdCjrmKpIE= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3/go.mod h1:WIcsVbfKETtSzv7BMpVsAe10+8pkBBN8JGwJRGnZAQI= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 h1:4+AaZRANLgs9R94EMW9DYVIfLS7g3c0wHnzf+NHC9nc= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 h1:AgzRQqcYWrrDY5qYmIZh8VNN73JLcPgvj4vJk1AASEI= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1/go.mod h1:hB5a4Dd4Q59lQl+f7Q7DIbFWZuUdv60pZRfmKySYXy8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1/go.mod h1:eXa+YkefIF2/zXsnW7vtA+KOHqWdRByLbMyMlPf0qTE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1/go.mod h1:BA0tEb4cNsfecUnT72QtAiwVj4RDrhANkbMWgr8upt4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2/go.mod h1:u6UQOkyctJPBzjoo+DykqLZ0e4UJXJez67sFtGjRYmc= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1/go.mod h1:bpueKKPNQQyTsKgFet4PdAgl+XLSHBKUiZ0j+vQlk34= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 h1:OnxXO7FKZ8JcY1zF9xuFvAoM9BTKslm/bhQAkDje9xE= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.1/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1/go.mod h1:xbYZ9+N7gYc30vMR6IOb4Y5UHB3V6q2aaxe4SrVNXLc= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1/go.mod h1:yOFkixPF7VkKZKzkgEYx7UM7nqkhPWRNkV1AoWXEwqw= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2/go.mod h1:rpux7wx/IwrzFQeHZejTPAw5K+VjkZgqxwSVb4f8VUY= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1/go.mod h1:ujChJcb5Na2xzIwgJFkNO+B241PF3W599te3yD32e8Q= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 h1:LLUGJEURE5wqls4ncuyaSd1qTUa/vVtDh2n7+Jq5oHk= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0/go.mod h1:AszugMxR76tEt6QU7mbYM41h35MgeamN7HrXL08i098= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1/go.mod h1:LIVjAaMXcYxF2hlrfS67SbIC0r9xGyLQCY4WkeUAbLI= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1/go.mod h1:QRv7lhO6qNHRWOvW8tzqkPwwRRBamrtYtnHY+DVrZr8= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.1/go.mod h1:bROwP3K7obQzc1lytji0K6MDwavTNADoCXzIMBL4rV0= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.2/go.mod h1:3db0FYylodrSUD0M+aAK3qHW2vX09oOn4zpuA0RCJBM= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1/go.mod h1:6zhbFkB+HRZ0cSg9tAydoSbegTDErbaFtxUdNIknhsg= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1/go.mod h1:ZrN/blD6ifgST8JxHwLIXnVJ0y/IE4MyZTTkxKMf4jA= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1/go.mod h1:pq3d1zkOEUuWtIsrPhTeaa2NK4bycj1zimpeep4trrY= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0/go.mod h1:KkCYX9biRFzx8lAEgYyNSuQ3ljMK2ZOTnplMhHyCfhk= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1/go.mod h1:5WWwggaheKkEFmlCkClB7VnUgnRMVYrWSFJHQujEQ+4= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1/go.mod h1:6BdZwKA5lrUl5FoReQ000/D+OnVxfGxZyjwuWNKxiRo= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1/go.mod h1:jCU6Bb4RlCMdvgVZTmfrCSHAJ5wzNXdJKEgQfX6M1Kk= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 h1:HcrPUVElslX0M45ICJ2aEl0UMsJj/Y6RQNGcNJOgu2E= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 h1:tKqdrRKCkt/6SM9jaBsGnx2piN1L96e3eoRgVxaYeX8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 h1:tA0fwu2ZwJzVuNlyOpKaeS2pB4n9KyBKH6Apo+8s18s= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3/go.mod h1:Djd18W785OhsZRJcmWOBScRpJfrYtPYPl5e6ignT0lw= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 h1:E+nb7y5lRuNHsINV4nNFurH+U4BnJsa3SCPIZyUZxFo= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.2/go.mod h1:XkI+sL604XSxj0puip8ECW4ZI4BEksuJq77qVrk9FlI= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.0/go.mod h1:L3v6KI08dxAjEC16qpPb/uH7mMFlk5Ut7IVbFmB+2SQ= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0/go.mod h1:XJKCh9tr2gv4EiSbh7v4QOacRLLjgv91+DvuNuvwOxM= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2/go.mod h1:28fLKqJDUYtJyagwMg5mY4pjHeIqotYqj3Y7r1ZbF0I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1/go.mod h1:IOeGzMdHDJsRZefrjoGKP7OWctaKmfKbjHY8UsKuVZA= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1/go.mod h1:Azqh2nJoQmlG04590JiE0Mipn41CehcT2iOZNGJ+4Hc= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 h1:JZgIA6hS67zlCGKT4NqbPsLPASglwYBlONwvvxSwh14= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.3/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 h1:mOKjXzROoDn3753aPa5OY7tAnOzn52x+gtsHt/JI6PA= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.1/go.mod h1:mgvTMpQm1K4jL6cwHxzY3lwL4294bhszUdrFTb5OE/A= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 h1:8Sd86m15j8DsdRTWbbFFlDRZCmsd0tehmmxoUjBZe44= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.3/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 h1:g9hUSavNhjbvA762fJmOWUTsLQDZbAf2fct28B9iP6c= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.3/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1/go.mod h1:2JfwDlPZm27OCX8U2OI6/nfS8uycIULmcLuyihlA0Bc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 h1:TtGSyEgKZZfVrv9sA02Kt7BL4c7/4evV6jxr8bYLpck= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.1/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1/go.mod h1:P9G7ovQCb8ugsMqSk6NmPeD3rQiVYVNqCEcEPZGor/E= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 h1:hfAw0mYZEArJIH1chpOSDD9RL5cr8YdohaoglquVutQ= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1/go.mod h1:eTHLmeHFpGDOjgbL39/C4sZ4ahyb2ZGc1i3hr1Q9hMA= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1/go.mod h1:oIEe0OfHys9BGsobPKUYgBA0i9gOTChYe0mP1s10Hpg= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0/go.mod h1:Q1oshEWbDmk65i0xxjnUU9i9qJK3hypi7cnVvquvrDI= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 h1:gC3YW8AojITDXfI5avcKZst5iOg6v5aQEU4HIcxwAss= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5/go.mod h1:z5OdVolKifM0NpEel6wLkM/TQ0eodWB2dmDFoj3WCbw= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgYu9UCQnIMKaOhkVaFvLy1HneD6T4sS/DlKg= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 h1:h7Xf+ZDcRskzMpo5EuZAOGrVYhTzWmNCaOGDwBLhd38= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.0/go.mod h1:vSM41OX/dDgIxJcoKYW5LzM5bcfgLUt/CXD9+Qpfl70= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1/go.mod h1:303Kx6cdaSgREaHzfHfJl3WyB+t/vTOm5KbXMM8Dy4w= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0/go.mod h1:NRf1OmevrJxGBSwR17qZaR90/eeg/rwM+4YurDoJ4w8= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1/go.mod h1:y5EjKbwcgQItIkYzxfGnxtqE16Ygml/f3JTRk5408BA= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0/go.mod h1:jYoXOY9FSXfnfQ1wHoJJfYBKc8O6ZYy4BYq/2mRfJcc= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 h1:ojqDIdMimJVlkMt9TTcxyZ0jDyvavXtfQaiuhndSAv4= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2/go.mod h1:+y5C92Um6L/1Kfcddcz/KlP4w+cen23bY0cziHfx7zQ= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0/go.mod h1:FY33uQ6Wb6FMrBhant1hvI5eQEgfPxj4JOl8f+vmXrA= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.0/go.mod h1:le5DfWrncVIxOWL2Q0NnDqvhH8ULiGYgC9iS8BtwcZE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0/go.mod h1:QC+BX9N676IvQfSoU67bL8fnX4CnKwCJd4udK51ajQU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1/go.mod h1:YUfOkjyQ07oPsYHn7Jw1eY2HpNWvWLdChJY2BCF91AU= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1/go.mod h1:YJAd2LReCr50LXZC4yiZyfqtDXNFTspMk4b8XNN23mY= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0/go.mod h1:yC+FE+kUrFgWwlfCOcTNYtEcYnvAb4dxCAEjeEs7XyM= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1/go.mod h1:lKUKI2/ejaYnQgSqCdSpdbSc2D4pA5LpijkAknZFJDQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1/go.mod h1:cVju73Vwz9ixw1zaR0tdZGB+M3GCRn8BRgLFRJ8oE6c= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1/go.mod h1:HBXDArKSFmUoPiHIatSFZP7RCOuSO86D1skZZPP0eLI= +github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= +github.com/aws/aws-sdk-go-v2/service/location v1.49.1/go.mod h1:4wXR5FxUtCbxrR10BM5v0JU9tWRuAPbxM0t63rSP5s0= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1/go.mod h1:Dvovz10WP1Kh0UYpgiYIJX2kU173PioVcZ8iUu3UlAU= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1/go.mod h1:OVFTr1QPEKPMXJFJmq7lB6g2LNu0Ra1jlyWRTUwVDNk= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 h1:z4pOPvM9QIFDn0outkKgx/Q/wHEvkFpc8HM0ecldnME= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1/go.mod h1:9bIBfRe99bgmTSKGt5kOANZAsmiVsUqAxYLdXtdk0JY= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 h1:eGM7Zu4idZy/puH4GwaSgSEaWMc+sro0UMXPqaUPRf4= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1/go.mod h1:bDTXhc7i3wut4LoMd/3Y/dm6yuHPSZ/l0JKTxAoWJs0= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1/go.mod h1:oQKjFr3ftWy/qU2ilMx4Nl2qz+y9b9pFuD35WgYFDdY= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1/go.mod h1:LO7nmXTfTGV1eKso1xizKh8h4WnC6FpHmCu1KDx+1qU= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 h1:nHVIvgHWzu0gIhYF06eRbFVzgvpMW96wrniWanoyxxo= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1/go.mod h1:/mNoNDYQukzDORZEk5w7BIvBtaQJxkl0exo7qMpVmhg= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 h1:U4vORFpANJt9am19Hi9PnMb7140ECSv4431rQf1dr/0= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1/go.mod h1:69XqFSlzFjBTMeJO1P+qv1kwNRN6nRBQnaUI5uuoBDQ= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1/go.mod h1:Ulo4NRLCKAt7Py+XVaO1SlaZAxCQ4f3N2SxhpqdeHT0= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1/go.mod h1:K7LVOq+IYECTdoQw3gwabdstLSTwYM2ysghvYx7OOn0= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 h1:3zfMUIyOkz9zAyBsrO+nKKGkiOamHvNYMFx6NzHJNIU= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1/go.mod h1:zaOIb+NMBSJtbPRIOhG4hfuyFskU0/CWyPIjZWHY4tc= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 h1:u49AKqJDtDHHQH/DWcy02Q8CtYovszGuTo/AsTKA8wA= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0/go.mod h1:9WVDrtazLGKgkmMp+7OrIEapwBesTX96szFSZUHw86I= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.1/go.mod h1:k/EsVXGxs6dcuBioJb3LWwmX7LcXPHLbweDoc6dl24g= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1/go.mod h1:IeLxEAtclnYwPUZLAhUCDPUQ97yiRs7goua3YtOaa1M= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 h1:k1WZJIid8seg7q1oRhkYxxB5HJ/Q1qTK98ML4JZ7aNw= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1/go.mod h1:S4lAC9xGXy7hk/ddmxFsUdYrqCgaqiHRsz2JFlBSXZ8= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 h1:g42YyO07tFnNMnjOwbYpchfZzSvVGf6K+HtXmjwqBKI= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.3/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 h1:0WkIrO7jV0NlP1a9QY+CK2lUsKLPPJSkQgSr/ryZPyE= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 h1:sjca1ctN+ICI2uerjFTYGawESq6OM+cPafMyTld0p9I= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.3/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 h1:wlkJ4GMBARImCR72Jqv+GOQZR9kk8eInpW0+7vpKmF0= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 h1:RYxQtAqIMzqSI3jwa79tO8u5QM3dEA6gsFs1N6vYbCk= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 h1:HpNLkXkBgbXByi+MB6xKT1P+iPRIJ30sXSfGL63kxiA= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1/go.mod h1:6nhxriPrOjTLhbRSGbM4ugEsshpL3AW7BcgH0UtgccM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 h1:C9tZ0LkMleWzfJKCZW6mUxBUxvw/nE8Y4+yFjPsC+Ns= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 h1:sPUzA4sJ65A7Gz51z9F19Bf1Kcq65YqkE5qInbk+NtI= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.4/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 h1:DQ2IGVPAGd61eSFjGYmrSOEEpXawUVbkv8hjA4sNI0U= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1/go.mod h1:1bQU4WjW5s2zT399sz1+EjmKgIZLhg+NwmhMV+o/iKM= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1/go.mod h1:aJ6F7uUk+H11VAVhjWXjwAVRROj9CPtk6Id6S6AQQ2U= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1/go.mod h1:bNnnRzp7DygLKwBv0Dh5C3wLhBvQUHVbz8HkNsetr6U= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 h1:/TvOR24L0/rdGKxlt9FjrXn4Pb6onrphD9Q8L+38Xvk= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2/go.mod h1:Tza7auk1JM98mceIqrBpBVgf63OMuZdvFIbUQGwdu0E= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1/go.mod h1:GD95a1fjPrxIec85QlXqKiL9VRiHkDJbe/1xCE64xKQ= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 h1:HNAbIp6VXmtKR+JuDmywGcRc3kYoIGT9y4a2Zg9bSTQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2/go.mod h1:6VSEglrPCTx7gi7Z7l/CtqSgbnFr1N6UJ6+Ik+vjuEo= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3/go.mod h1:noqWDtfKyO38kGEjpcvCeLA/fzf28s5GqEhZzMh0l0Q= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1/go.mod h1:Fm0fdHHqfDHVUjpygYpkib/3TABtK3xF1MFF4r8vquU= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0/go.mod h1:064xhAX/Q21mzYpqYRdZBZHOh8zLAlIVDlupW0QUYZ4= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 h1:4Tsena1ElxsXIho5WDVHsuf46H4VqY+9mCEbR22CR3w= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1/go.mod h1:hDr+R5WjCdv4Jeb96TCEaEAIVC6Fq2v3Ob8Otk3yofQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 h1:7IlIL8quV8GFdm1BH7ZU0ta5IG1ZDAQkoEO32W2Sdog= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1/go.mod h1:LdSgvzxjUIEYqDySJ1MZMHrpnXr82G1wUgbCUn1hj2I= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 h1:NCrZaCcXEeBlILIPXZPhCYvj48eaTwECX3NonrgGWBc= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1/go.mod h1:h6VMaXtdphpPOWC205h7KR2dth0h6Hr8FwdDIntf3W4= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1/go.mod h1:ISXBwTLGsBEdPKnc8hgwLMMLKAoDOBY/Gk1pAcVxegk= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 h1:owlFsGzDBOxj8Bh20Po0Go4BBj+voxAenaXmR0qwbf4= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 h1:3YlE78IQ/CESvF5iEpDHE+hxoRTA0owzJ4PA2lx9KeY= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.3/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 h1:ahBxdOF8x//FK0EIMmGz7Pa7UFLEFu9BzVWBA1ab9zo= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.1/go.mod h1:k4FmZKhGje2cMSq7iJn68WuvjQlWCleuXBQrlaX92ro= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 h1:au83o40oc/0gTH1wLdkvlR+5w3H7kotDEVM/yqxDgFk= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.1/go.mod h1:kTLokjuxZ3M4FFxoyoIVifyutxQR3hxM8ebhWU29LRE= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 h1:BNdYPzlgwyFLZqeFundNKnPDB+TVVfaqZJoz0q6dURk= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.0/go.mod h1:3nf7APIrKwA04hwtT8PLvCaHO5k08M5YA03ZTJjz77o= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2/go.mod h1:nTr1GkJF+JsCWURFDQSqGqBLJvJUCpBaTCBmZJ4rXuE= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 h1:CMchvzv5LVZun2EgjAM/yVT0W/SmtgeTWCYMDHfMx+8= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 h1:tuAGiLIZnQvXgKWrwacO3AMVNC7AeUGKw/iOGGcMCp0= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 h1:z6lajFT/qGlLRB/I8V5CCklqSuWZKUkdwRAn9leIkiQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.3/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1/go.mod h1:HPzXfFgrLd02lYpcFYdDz5xZs94LOb+lWlvbAGaeMsk= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 h1:OYdiS6+2u+UZOvLPTfhanYJVtaf8oEYblaaaZURkgQo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.3/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 h1:DcwQUm+emSJi83WoYqoGxQ9A+AhgmZGMwmh2Ry6hslU= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1/go.mod h1:E9fVjmRExKItXS3Z7D84qP3PcmzEJGNLH3Zg4GO13gg= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1/go.mod h1:v5bHGripgR3DInv3X4lG4AjS/k/ljgb3MNJdqNOu93g= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 h1:QxshrLtaSXmJY4YtCd5NreSBQYpQLzH0YLiPyDXMTHU= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.3/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1/go.mod h1:BZWeUmYp1Vra+wmpCeuBjpmbfWU2oBi5jZukBDh8IVU= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1/go.mod h1:yiLut9L99R3spfqmkcGZcp2z0fwNXCUXivALQ9qDqPc= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 h1:GqUJvEWTgVn5HQLJgergz8HJTeMu3qov4rvarzWUcMs= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.3/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= +github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= From f15d91e6f1969e897b02218101ba87ecbc0a758f Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 09:10:07 -0400 Subject: [PATCH 0931/2115] r/aws_route(doc): fix tflint finding --- website/docs/r/route.html.markdown | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/r/route.html.markdown b/website/docs/r/route.html.markdown index 0957033792de..25eaf0958d4b 100644 --- a/website/docs/r/route.html.markdown +++ b/website/docs/r/route.html.markdown @@ -113,7 +113,9 @@ import { } resource "aws_route" "example" { - ### Configuration omitted for brevity ### + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + vpc_peering_connection_id = "pcx-45ff3dc1" } ``` From 8b865ca3d2d322a1f42011dd5460124526c696f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 09:33:15 -0400 Subject: [PATCH 0932/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 540 ++++++++++----------- tools/tfsdk2fw/go.sum | 1080 ++++++++++++++++++++--------------------- 2 files changed, 810 insertions(+), 810 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index b2042c4a5174..26fa20cdff89 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -18,277 +18,277 @@ 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-v2 v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.7 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect + github.com/aws/aws-sdk-go-v2 v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.8 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 // indirect - github.com/aws/smithy-go v1.22.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 // indirect + github.com/aws/smithy-go v1.23.0 // indirect github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cedar-policy/cedar-go v1.2.6 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 47e7734f7745..dcaeaf333101 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -23,548 +23,548 @@ 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-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8= -github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg= -github.com/aws/aws-sdk-go-v2/config v1.31.3 h1:RIb3yr/+PZ18YYNe6MDiG/3jVoJrPmdoCARwNkMGvco= -github.com/aws/aws-sdk-go-v2/config v1.31.3/go.mod h1:jjgx1n7x0FAKl6TnakqrpkHWWKcX3xfWtdnIJs5K9CE= -github.com/aws/aws-sdk-go-v2/credentials v1.18.7 h1:zqg4OMrKj+t5HlswDApgvAHjxKtlduKS7KicXB+7RLg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.7/go.mod h1:/4M5OidTskkgkv+nCIfC9/tbiQ/c8qTox9QcUDV0cgc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4 h1:lpdMwTzmuDLkgW7086jE94HweHCqG+uOJwHf3LZs7T0= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.4/go.mod h1:9xzb8/SV62W6gHQGC/8rrvgNXU6ZoYM3sAIJCIrXJxY= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1 h1:Y22iPkFuD50T1CUCEYvuwQ6J4DIU8UTaJ+xdrWh+8bM= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.1/go.mod h1:vOcQ8bXt6DJAUoCPjCbgTKMBxB6A7r/KAgnVBDTwX5E= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA= +github.com/aws/aws-sdk-go-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJLMyM= +github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= +github.com/aws/aws-sdk-go-v2/config v1.31.4 h1:aY2IstXOfjdLtr1lDvxFBk5DpBnHgS5GS3jgR/0BmPw= +github.com/aws/aws-sdk-go-v2/config v1.31.4/go.mod h1:1IAykiegrTp6n+CbZoCpW6kks1I74fEDgl2BPQSkLSU= +github.com/aws/aws-sdk-go-v2/credentials v1.18.8 h1:0FfdP0I9gs/f1rwtEdkcEdsclTEkPB8o6zWUG2Z8+IM= +github.com/aws/aws-sdk-go-v2/credentials v1.18.8/go.mod h1:9UReQ1UmGooX93JKzHyr7PRF3F+p3r+PmRwR7+qHJYA= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 h1:eZAl6tdv3HrIHAxbpnDQByEOD84bmxyhLmgvUYJ8ggo= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2/go.mod h1:vV+YS0SWfpwbIGOUWbB5NWklaYKscfYrQRb9ggHptxs= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5/go.mod h1:csQLMI+odbC0/J+UecSTztG70Dc4aTCOu4GyPNDNpVo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4 h1:BE/MNQ86yzTINrfxPPFS86QCBNQeLKY2A0KhDh47+wI= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.4/go.mod h1:SPBBhkJxjcrzJBc+qY85e83MQ2q3qdra8fghhkkyrJg= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0 h1:zn+bl7t9Yei6wsYHpBPXNK1Sx/B73FlaAapMopWxRng= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.0/go.mod h1:/jMQIP91Vrawh1iml6QGcoTnlKuH0oncMIRTTXvLlm4= -github.com/aws/aws-sdk-go-v2/service/account v1.28.0 h1:fSL4wRzoVoKdtfhU2IbGlUB/4UdkfDWMGgoEiqzM4Ng= -github.com/aws/aws-sdk-go-v2/service/account v1.28.0/go.mod h1:1I8oqDslz6VidXFzrOhabhTn7cYGs9wkigdErHjYzPA= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.0 h1:IEdXOosmvsQhyLWB6hbbAxkErPQijjscB7GsSAvh7II= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.0/go.mod h1:inwt4yADG+Fng+ZmrErI3pUgNJnf56lEq20p/co94q4= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2 h1:ul+C/zNrvHkog6p3lPv4afa/BFLHCkcvanLYnUCIGWM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.43.2/go.mod h1:c/cyV2NFDRrBmJvzGfEGKH4UMmO1CU2voA7AXM8zI28= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.0 h1:dk6M1iskdFxYESMRniviNvADstMMDOA5MyLcRW3uk5Q= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.0/go.mod h1:dZDmmbM/ucJoiR5mA+tgTS/3PvuaMEPW/la0dMwuFd4= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2 h1:NxyaR0ypK6vO04OTQVYzGdxQjlUow0LovrnmZcAM4uw= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.2/go.mod h1:chGuAkzR69VySldPgGxRh/xbx5OEh2muyfMoarN5Jic= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0 h1:G+hNuI0r+sJOx7xC4kJh3XMA6l2E/6AjeZs7Os/+8Ts= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.0/go.mod h1:+MyhM888//jV3o1UG4vt38MdjqAcUicXvHHw/JfcRik= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0 h1:/hN/xkajYsY/GDZ2l6C27JnnI/FgcFI7VsiVL9RIbbQ= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.0/go.mod h1:4U8RYnlnrhq3UaJx/O2pD2rvBPNmLSNFl1iVgK4dh/k= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0 h1:jVt1N2UmQ06UZuscbrzWRTFA/m2Crh4ApadexWRFz/s= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.0/go.mod h1:O9WOMP/XNby7vIbKYqHvTOx8lk+b5kuYQhhxwa73zj4= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0 h1:t0u2olvhcwXp3B153duexA+F/Q/3k2y8cdLpP7s80h4= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.0/go.mod h1:sCECyKOsuM6o8Rh1D1w6i1xX4ajJbWu68489jovemYE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0 h1:6dkTGzQpahsfhdy9vTOyXDhTEwUzfNG/5Kon6fQJQb8= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.0/go.mod h1:SPPVSBDED8CTUUcyInWVnNugtfrMZyBatI8PuQg8dDI= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0 h1:VqZ7HhDDQveoIU9skAM7BJwex80otay5AeqatP9QJdA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.0/go.mod h1:QUWJdq7I9w1oSiL3QohXhAkYFWr8C3Fac+L9vSKlO4A= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2 h1:PGx6nFzJnOZ/b5kCiOWWzB6VOizhHxB5qwZtmD+H8TA= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.2/go.mod h1:j4ljfkDaFO0JGTmRrewZX2GrYRszvPfTCiSuFFEJSbg= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2 h1:eqjYt5OPdEmiOAFI+ztwUa1q9Vr7u4MceyA0B4Rhg2E= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.33.2/go.mod h1:uiu8DReGuhxeN2OE/WsbcUc54EklpM2FilqADR/4UIM= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2 h1:uxp6cgkskmSvOGoVOFNuFwAf2/in/pLuVkdsADkqOT0= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.2/go.mod h1:iSbZJd4pwJPplq6k/xNtMyMoT1XMEkx6ZjlQLUkI9x8= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0 h1:V7640rWP57y1mjb10+87nNL9Ze1fvEJS18ooXTdCKvY= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.0/go.mod h1:5/48gcyu99fgZR/0BmcQE5RSNCZ1veDvT32oyPt5gyE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0 h1:L3izPS7rBuHqDOwEEGvGv+O/fb8voHIzvJ/akJu+yc4= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.0/go.mod h1:frWyDpb1df0WCFQrMWz3EJMwSWHHd1ekv/MxB7xIgPg= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0 h1:XdiGPHlQH4B/VjPHPuGYw41Vb4ma9vkDkI69+qjjCcY= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.0/go.mod h1:SP3mWaJGsyt8hGu4BFaqg66A2PkmGXPnlXevt+q3+LA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0 h1:lz001MwT3vYqae5aRsejfljXQbWk3n45V1CQtL+O3vA= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.0/go.mod h1:Xxj9W0PN2szi6de+AIuoPIfWr1FnrdAa9T12ublYGzE= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2 h1:s7IEsxvCUpXQooiVP+bzy1EVe2NzIPAxapw7IwKlrMk= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.2/go.mod h1:AjZwYae4FbhYe/fTebJMK/duQI8Y/+KM/tAqKR6xCqk= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.0 h1:FJ6QnwEEqH120NX63qAULogdVKROkdgqlUjQTdvMg+w= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.0/go.mod h1:x2bnQj3tqR1cfnoov84GK85mvyzEjms4jVf9nuJ/3us= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0 h1:qmdgSkUY7y0w96r6X4l7xzHd6T2ERHjOjsqzBOqZQ8Y= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.0/go.mod h1:ZqWv+JlNDuAcxi4nCWFdcyAWqpPzBqscFHQrbzhO6KU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0 h1:T33TM/94TrgmFOYk9wLp5u1v45S5rQPlA2QQ9PdeGLo= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.0/go.mod h1:z7VO2DDtk3h+bWw18erk2swrCEeDBCajYtpsXpTo7R4= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2 h1:ufuAGl391qoD6MeIf+Lp0SSlrS4JhE4rQOKSIYvgBBI= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.2/go.mod h1:F0/nJMe229xiLZZhESxm3vEN5nWx9ys03w8K3fZ36A4= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.0 h1:ZEmY4tZaX8A97DE6AA6s998Ol89OhfE+7gKb2xj66QU= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.0/go.mod h1:PLB+glHatjJZVbRG5Gx0TodUaoLxdNy9pDmOTaEV2vg= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.3 h1:DgJwxzpPmLlGz+xWgRd59GJ/VzguUMWd+B2gyuBDkmU= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.3/go.mod h1:8HSDoIVSGFpg91seiTijJ+TSX8reB3HFeYmuhwlDaz0= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2 h1:D/CFq3QEav5rsqJ0uSdUMz1y5U637f3SdkaLNFO3Qp8= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.2/go.mod h1:o6krBVx1+NfHdCCJxSVEXL/yXDHRFj+IeU/IjSoHXDw= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0 h1:BiyJLlLB9CCBvom0qpmgN1JPu2nZdIky7iZbBcs61+M= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.0/go.mod h1:7eyPWCiNSJ+9ezIvdTYKZL7wvScp36yMEFqanOReb8g= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0 h1:aozn3IBAb77/k+BqZkdkKI2zh6N/3akBrrO8Z9GDYf0= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.0/go.mod h1:zWrbWL4GMWvUN2xngEM3xgOnJZ4VCSnAtDMfK9ZA2zg= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0 h1:WFubVKYq70Ne31wd+7eQZUr58+DciQPlVgaK91W9+0g= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.0/go.mod h1:60vamutAadGrCujcL/8Si3ZQnw5IRvPxUlgtGpQHf7U= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.1 h1:kpiz33liy/8a6e2eS5wyL1HuR0LDYQL2GXxXISQd7Dg= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.1/go.mod h1:RQcbtG5s12CLyWuvUoOMj679t55B2Hbb+iR51p9XLlE= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1 h1:8uhrVeEIbfIKULWg3FMtm4CImKmWdW5XgKky5WG/HXo= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.1/go.mod h1:jETpws2Z0viihQ1QpV2gBdZHBXfKy87nWlWXI+LoK08= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0 h1:uBcuEbBOFpFd/nKHLfhop7iSG6aeQNBQFczwMqyaLU0= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.0/go.mod h1:VA1YLVg5THyDV7z4/F0vkTr7AgIjfcYsK3hQNpRgLHM= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.2 h1:AMT9X0NsyaWtvu9QeGmzLb0Qz8EByxD+t0zQlHORbzk= -github.com/aws/aws-sdk-go-v2/service/chime v1.39.2/go.mod h1:SB18hKKXucfJaFmDpUL5FDgqlUK7lJFoS8IDc80j4Bs= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0 h1:Lsh6juIUVXVVgmxFeXKGamIbNN0UDfpNov4JXMSplUo= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.0/go.mod h1:XFwhf1UrJQpNXJod+xPWnQtMEATz0bbndiJJePgq6ZU= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2 h1:+cYqrVJfDL1AwsQzLuy3xhn/A1SN9xwU84hvsgcxHYc= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.25.2/go.mod h1:sxHBlaRKlHitRMRVGHJ6eoSA0hkoLC3IDlPiPvG3ubI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0 h1:N3a+aGEaQMCXhV9LEr6T29UDAIvb/KSeFDBRT032wBs= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.0/go.mod h1:39BI0TqYRcztvs9zlyybDn8Da0eqQgnv0Ky8th8+x7g= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2 h1:cag/sc7VTuiHvhclIkiMcb5QKE9kyDvHC2DzEMEwv7o= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.2/go.mod h1:IHroZIK9rbm7vrPtlvZ5XPEMRc4RpCmgjQ6oREk7jkc= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0 h1:JGORv/MVni/7i55lWqRra5FjSSxVJHokbae+orjzMlo= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.0/go.mod h1:ALepJgv+1L7yAYEoqO1XoGFsG0ncHh9NS8Sea3KXMIY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0 h1:sujsuzoVNHNCiL4k5PLgo5O3fDTxqYFCjrUOPnuBB3w= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.0/go.mod h1:J14kHsEQ16zYUK6AQyDQZjC1n+NUn2L7Dpx0zMd/vZs= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0 h1:fdPi8+XO2X3h+Z5fTArTVeThFOqf+8LBu+dxjXDx9dc= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.0/go.mod h1:zs9f9z7VhQZJ2TMUqYYst0uZTc7VTDzmoDcHf0VrmPs= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2 h1:A6ZFNYLs6B+jlLOpgWPy6Z1pxJfVcgSjDB538+tG9+Q= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.2/go.mod h1:oJ8RT5Jg5srgh7u0qKfyh09aoueF4M5Xo2YN8964tLM= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2 h1:ad9vCB0lwVYLrcc/OnfRUjwommgpG+LZWE0Icf3mNdQ= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.2/go.mod h1:zHBmn1v9FsxrsaI1eeE9IJELz1pjKBrlBckNMJdmq4Y= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0 h1:Ny9xy0BuN0QA8Auv+Go+RYVfhq5lcTZjyZPkpSe1S0o= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.0/go.mod h1:73GD4nH/H3Z2bmV70ilJupYw1s9mDU5TBMQErD1qoGA= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0 h1:WMgigsEPtSgsVe+jBMqCuAF2u0j/CnSjCm3I6Ar7nFo= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.0/go.mod h1:1QQJFpFapuZD93JdP+VNezwfQt88oyxqW6bdCC5xmbo= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0 h1:Lot4mazcohqDr0drjUEtEWinsC5mKf6DmXGBPWhTVHI= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.0/go.mod h1:FKdYhkBnAYwHwgYOlU8lYLecUSJx27fN8LPoqISa48c= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0 h1:MFvplof6F2vBGxtYtWspgrLro9xe3yFuGSmElBbZmwE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.0/go.mod h1:0GB2dl4sDw+wVpOd3MUqIzLW2TkEii/2gAAtQfcfBII= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0 h1:1C+Yz7k49GvoPUwrdr+OpEDxwnhbq3DzmwSpQK0onqo= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.0/go.mod h1:sZ1FARidDjzrsOQZB5yYJPzeWv/yMaa6OLr+c3xYDSM= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2 h1:j4Kdtu1TJ2spvfqiHkkfar4MImZvEJ5PWG8Ea1H70Y0= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.66.2/go.mod h1:kbXg1I8INQeqPaKLMloYJ1QgNGOVs75bc467F+Hh8OQ= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2 h1:EeypeYj92WzEBiFhIYa2+DAOXwVepJYJYLqVGNT3Y0w= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.2/go.mod h1:NJR1rtTNOXVXj+V/Y/ecy3+gS6uIoC0eMw32rInT1SQ= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0 h1:NGZdm/BXIgwvbzeCluVSVFbU9qx2F+iALjImedMPDNw= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.0/go.mod h1:8w6Hkj7q6CCUkPFzvrdHc/hu9gFa2pZor1W7rYiewTU= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2 h1:7DY9FkwrM6LIHFw6+nlzUpmzJeLuWZy20ITLtnDqXg4= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.9.2/go.mod h1:iqMASCjcOgF2RZydLfEckr555PwYbKPnxrrad6a5/Qc= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2 h1:zq8Dfao7/EA3rJ9tzEVUaF7trrzcorF/ffckZuP/Vog= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.2/go.mod h1:ieLXOKII97L7fYQa7Xm+PsCGJBaskvWk+wGux22jRCc= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2 h1:YPDmVXOf16StYoE5uGKGIIPGjyWnyofjbu7Bxb9LmHg= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.28.2/go.mod h1:tEhSvKiotgyNSUWz8oUZewdc37aHXPLtam91eaZJI+U= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2 h1:vDfKwfuO26BQq0C7N7s/7t5FybD8SC/GzXEPTmnEe1s= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.2/go.mod h1:KqUaPMj4EhVSvaFcMkAzXbr6ZJnQOE4BK/CQs2gYIqQ= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0 h1:tcTxaD0qsmEreIgo9FPBqk0Suty161lS/auHhACM9nM= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.0/go.mod h1:COQ8GogzIExcHzRZ3NLqbgOxdXwKm5kTt9dCCjwRUrM= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0 h1:iPTQ5NjhoytlH19V3PwZblv2jahmlF4pJhTIMjegt7c= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.0/go.mod h1:8V0oKUj3C++fczKqXQzcVCOijijLb2KNgvgchD5jCNQ= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0 h1:fd/+mX6tZYq3iN+dwknp1i6t/Dd0IL04OtALhjigjwM= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.0/go.mod h1:IdnvvXP0+Up5FNwT1bd+DBt5r4//PuJ4PkhrJt90n74= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0 h1:f5hiiWSz4D9mBGvSl5fzKK9tclZKYtr28LwORCTAAYY= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.0/go.mod h1:9d2YO2Q6XGgXnscDS0JyN2AGRJD0UKIoln6N5+qYc54= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1 h1:gKFnV8HEJomx4XFOVBXRUA5hphkhpnUjqJsYPCc9K8Q= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.1/go.mod h1:+UxryRSMGMtqsvxdnws+VpNyFYWRkw4ZlM+5AC160XA= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0 h1:4YiGEEgooJbSl88+t0NTqRUrjsjh0hcoLrUyrEj+qJQ= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.0/go.mod h1:P52KZMWQ26jGqhCrkIqVvzDgh8HRhsLN28v+tRNOvZg= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2 h1:CZYoQ2fFHANjml5Mn5pOE49Qt0I+hV609IQWMAEfvxM= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.46.2/go.mod h1:6gViEWwaPejA9LOah/Mn31v1zfANfQovYWmp4w+rt1U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0 h1:WmDAyFGFt6p8d/Xqh3ER37W3lxUxsQltQ+XjF7PDwJc= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.0/go.mod h1:0/USfxsqE00FryTj9aacEC/ufCg+clmEIt1DlQvRW68= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.0 h1:1qPJRdMbthJX1T3A72NeVQIHijjP5kmhn8u/jp0U/yU= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.0/go.mod h1:vDRwf8QDQessdK3nEOPoTbnPheHcKGKgs0TaM2DQhm8= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0 h1:05l/O0716dIHadH6UriaDt1gojUGOIKurRrdHbmOjdY= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.0/go.mod h1:EQTmjlRwDlfwdkmMxYyrdvSxhWlBBvE37pBzYh+x764= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0 h1:kEZC9UM7c+eIzVWPo9h8OP8hJhHwdafMcSazWEAIfVM= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.0/go.mod h1:87beVRCwWGm+cgHzr6aFzeA790g78M4AZHvmoVLthvI= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0 h1:y6jqRCfWqshbHuc8pnTYB0tb6KzkNcsXGG+HNXpxm4g= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.0/go.mod h1:RRQk0P2eftZb+aEcfZ5xKPAyCydZA/pDk6sU66oNDtE= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1 h1:yEZfnwOa8/8YCIIEWExve49egfeh8FtpA9hOaornXuY= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.1/go.mod h1:f/ER3zNaUahkZhyOVN/kP9NFJtK3So2VS7CqEToN/j8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0 h1:PgBVlruO6dLudgXg8OHIOWg5GB9On2TvLwKqfqgao/A= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.0/go.mod h1:v7oA5ayEizyswwdsNlsXSNI69FSAf06tjLwXkKjGUhE= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0 h1:TtvQtkarc56cSKeFWySb0xYHy8fQ6pVVeCIrpSaQMGA= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.0/go.mod h1:ngNGhK4pbO2IoditdtA6uaC4VB+JKi+y4Z4+Pq8c8FU= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0 h1:dqnn6DASC0gnUiSauGfyqFdm/7vbcpS3Ka7J+cHmgew= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.0/go.mod h1:CyeVOGjOkEHI6anDVR1UN4J7qc0rWqufrXWY561T644= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2 h1:W9h5AWTppYQDs0ytVoPzXUCfj7a0A1zRvaQK5QJ9R3A= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.2/go.mod h1:F12lhoxd/zYw4INU6/TCRmg9QS9DR1a9YikLzWS38io= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0 h1:RMhz5ZKD3YqRSesP2MLkq48cxD5vMwr7Dexcrp0fiX4= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.0/go.mod h1:P1t9Wj0jAOMH47dFvDz1JZ6nDJAkqbAyCNoPRIX643Y= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2 h1:7FipSihnq8zRp5EsEwhUETYVOPcAInCwG7wncvTxgOI= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.29.2/go.mod h1:XHYACRJKDaDjhxphyELOKt54bXEULqjLl3EF78Joiqs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0 h1:Oidrc/y5Z/mINZxfRqBZlPmiyGSMydyDnLtFBC8Hq7M= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.0/go.mod h1:R7rissc17PZwNAiJTvni0EiZ0B1DTV3D1fr6qo8O8Sc= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0 h1:lQz1vJHPiDNjb8Vz17Wn35U51cUWWU5W0IIljilFQuY= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.0/go.mod h1:MCDKctvgd/HonCcURMcEqWYAdw6qWes8TNkH9LG5ZTM= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.0 h1:2YoZw3Vd37b0u8/PFsDyt2VjRknazLvyPEvHgzaZG90= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.0/go.mod h1:dFuX+MfC9wVKpQr68ywJPRC7k03HgBLcr36tbXmj6xM= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.1 h1:+nhV8PSvhQ0cuGDtB22kHmnx+g8Ho5xS3Sg0MyC2kRQ= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.1/go.mod h1:rS19ynaircWOd53SHYSMBIQCFlg8fvPj+X7KLAv3QZ0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0 h1:IjIa4ahP3UUX0oJ/JZ3z2V4GZJwyG4fcl7EQwTfjCSI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.0/go.mod h1:fDAKb0N6stPTevFWZ+SC6ILpQVOIiybiABlHYdyT6xY= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0 h1:OSs7LJgZ8hWx/TpCLbqdNvzUlgSyCQZ6u7yL0qrBYLI= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.0/go.mod h1:8CMlDyJp9rwQbBl9hIv6Lg/Hu3dFRhWcKuxfoJV45N8= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0 h1:XKj7bQmOnMzK/rwIOV3Cyo+BMcH1l7GwXI81vTonNho= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.0/go.mod h1:X5zkfXEoXXbYckyJjBGe8Ezp5iaITQLN19ciEckd/G8= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0 h1:OsV3+shTUnCpqS+RpkXhdmmX3un6eHwFi3vhG0qMnk4= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.36.0/go.mod h1:T9S++cwXU9it+1h+q2bULPYn7NG5C8PhRgPvalRFCew= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0 h1:t1veMJe9LGKOacXlLec6dWbZCal0f83kN1Wx765iADM= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.0/go.mod h1:fJC4u09UijSINw4dv0vKHE5A95MRxRjnouICnimKEUw= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0 h1:Nvuiw4+5MjVDE6PrRhFlFceHkg/xO0evtP91fy+qgRI= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.0/go.mod h1:MAyvSqzGVg202M1BvwLIIn5IqOF1aC2tSPWa8K06m5g= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0 h1:oxT0l1QJvlj8LcXMdoTu/5dFV0oUV+NDeWuaZfgwWo4= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.0/go.mod h1:SGjUbxVXXYxbbN3cJ2P0juPsPEOQNeQtL5g8u4DNJxE= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.0 h1:VOAVEcczfBuMSluazeM0RafskmOXN9qMxqNEYQ9lUMA= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.0/go.mod h1:w0iz0PSsGo4oe/TeM4h2/JS5NMmy72qgeT3r9Nm/fjw= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2 h1:y+FSv263O/IKtsestIqfLXbt5TiMnSA+3EjJF7GcKE4= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.2/go.mod h1:Fy4WJgMxgW32D20NHUPexehZOMs6MJbPUW7IYcOy2Q0= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1 h1:0RqS5X7EodJzOenoY4V3LUSp9PirELO2ZOpOZbMldco= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.1/go.mod h1:VRp/OeQolnQD9GfNgdSf3kU5vbg708PF6oPHh2bq3hc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0 h1:q7dZHbsKFK/D33fvyguFqM/u73jmQIWV1N0RySQFC9s= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.0/go.mod h1:D8Wb993SJuFQ10Lp95Vod8VTpYjJz4v0LeW4rEI471c= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2 h1:aFmDHNrMqJb7Um0wusnZ8lqDcYTf0+RXxSvmCuelBiM= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.2/go.mod h1:Knlx5anjbiHqbCdnOabD+soFqsJIx2RdKf5R9SoBuUg= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0 h1:mMBom+aekGLzk3uiKLaFUCY+Ev4zygqqAAU60Y+3kr4= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.0/go.mod h1:l8epARFi0/1WoAdjQf4VAiwkyg8YNm+8Xffd5t/KxRo= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2 h1:ILeD7+EykGz140WmRPEI+BqiWLiACR05QOS0q58U8QY= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.2/go.mod h1:PmZhcDbcUDDY6VMOK7QnJchY46UChDg1/j9OxVPsGXI= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.1 h1:grCvggIToLtguxSuaBfCmKSBEmkE8CTiUwUNyHSMYkI= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.1/go.mod h1:kDbK3q9QRlXnAvte6HnftSIFNnvYnHnK1QMprDaZexQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.72.0 h1:q62woCtqvz4PBss4qSt3FpM80NCxf9TLQPxZuVvIdOI= -github.com/aws/aws-sdk-go-v2/service/eks v1.72.0/go.mod h1:ROhcontVJDIaR0dUrg2+EdGzJtdSzq+PnM06gNV5zK8= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2 h1:X1aJbgDRNs5LSDEciEuUPB78YPkKRoHhoxdanHjVe18= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.49.2/go.mod h1:EV/4tMPdOwDGDBmbwPjOPV6Al6uVITshpyMm0gS4+6w= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1 h1:SLtaxZ8O78lWxAdYNAe3hbcKjCghuAS/oBlfP2w4tOg= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.1/go.mod h1:VrBces9VmuIhnq89BpOluQDcZjGTStFweWOqhekS3w0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0 h1:1Ene7r6v8NQdgc2KzqBO7ip/uBb2awfTf6K4XS6yVlg= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.0/go.mod h1:Tdj16jxblwZwdRKwqRvTEgrPM8yG5aLBkT6VNUwAZ3U= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0 h1:Izk3Yw7XXSl3YsXcsfzY3tbaeh5sxiV/Rxc9YlLcmYs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.0/go.mod h1:g8wrIE3I6tNQ9j/w+8aCkd/1kJGsvBuT7oh74prjdaI= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0 h1:Gn1uLezb3iJ7iqs60zo8CzIkfqejnW334rLZ7ce31/k= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.0/go.mod h1:m1Hi5ThSNGoroNLKeubbAGigaJuAgX9pzH3Sgkty8Po= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0 h1:XcTNx1ZZbaM3Ewu1SykBHRbVT+rjkIwQQzVNpv8trRE= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.0/go.mod h1:Rnse81lLKPJB1AUNXsYjNvJLQBVq2E8kxbsWmdZitTY= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.2 h1:Rr180WzsRhUv7ZYfkXVJ97jC8jOXcf3op/RIwSalWkQ= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.2/go.mod h1:o2EMc1egptpuRa1ZMOphJweHGoE9tS9e/19xNgYNBLc= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0 h1:gr8/e+y7p+JScVIxYJ4wW4vexyjiZo/zXGfCP3RMZjE= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.0/go.mod h1:ov+aK5zc5J/yPtdeIa63xTVKx9S6A973ty5ppGWTsRE= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0 h1:viY2MrAsIF5sYeao8LXlYnYA4EQG0ibZLPLNfwdAQfo= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.0/go.mod h1:zxlgFHspEVTSuqIrGGUSNxAGqom1bVXii1HzIM+6RT8= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2 h1:bJel1AiZqZ3od/nUjasWddTUXCePWRDflVJ0aCqTEo0= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.2/go.mod h1:dyqzEdapinPXsOjvp8cHgGejFd7aUBqUGaPgvg2pprk= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2 h1:lQVAlXkNPkHu8njqwGb/H/G69/EdZHcP+kIBI18Z+Ow= -github.com/aws/aws-sdk-go-v2/service/evidently v1.27.2/go.mod h1:GMcspyej2s2XZp4jQT71v/XmaKDpYRweh46WKjCi01c= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.0 h1:/oDkJA8YdhnRgqprvTckf5pq/S4Q5s1Q2ncaYO8nYYE= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.0/go.mod h1:kyrZljsoVqRILegUtPXcnEvf9Q1I1zOAuGd2/rk3jQw= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0 h1:GWXI9ACb/6Uxpnw07vmGunxOYHpuGyVoEPXxXUrVmbA= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.0/go.mod h1:IrcJ955azs9EYM9X8lHlH20/7Z28y+ayD6D6oMA513U= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0 h1:C1IZApkqEKvr0UrbV9DUE6Mf2ik3jMHqrCbh40fDkKk= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.0/go.mod h1:/xBP9KA5lWBH5T5Za9iSRkKBDUh3fSwyY2vS5T69m9k= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.2 h1:esO4k/0wib61yrR9yOAKtA3Ud5YgyTFNWtbdIWLWcQk= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.2/go.mod h1:0+XvmdUZFYaTITgQqUBgTrShwCd2zjFFn1JZyJvOcLQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.2 h1:XJGR6XFNmTkbWhJnQaB+kHTAtC0pPi6tyQr0kQ1hvds= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.2/go.mod h1:oaD+0EvW4+70qW3gDQ8B/6fhejASdFTzX7shH7nbWBY= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0 h1:4BR1hdotSc16kNqoz6ZsTMBrrJDmsPDtvh5pjH6EebE= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.0/go.mod h1:dhXtQ2bFU5nBz8muqZ6xibPxkXqpKT09S13q2ke8a70= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0 h1:M187RWd+IlIHahRG6BbUoA1uzpZd+nfkNvzWYIr4Ir4= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.0/go.mod h1:YYNSR0v0H6s0qzGKVnWtbb8DqXEc73cdTn8K62BQTmM= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0 h1:0qsiL2PNHz2bd+LuGktAjhGvifTa2DeGz937vid01Hg= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.0/go.mod h1:a20dlQPh2qMb2Y0S2iWC/cBwi9lVtQzR5bjA0iVN3CE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0 h1:I46jnzRDWnaOVUZT20uBt27NoosOGhzBS4ycpso6Vog= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.0/go.mod h1:XRFqOKWuVeFyusqqLkgkp6qi74R34W0tLeJP0eQgalI= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.0 h1:HNs45K1LTLna4r+4/uL/zqUl9askSJjahN/iXGgcM58= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.0/go.mod h1:WCF4hSGHKRkDxSpPlPbGMb//gp0reqtv6cimOlhwCj4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0 h1:vw6meC3IPpzsGkem3XN8mGG9a1p3a5Q+suQNF4o0Ybg= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.0/go.mod h1:hJbm/jbW3hpO0A7yVA7hPOF8Kxar2C2o+cuLu/AJfRQ= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0 h1:Zb1GwGp+4nFy4EkuLUuka6z75tGD2ET0yviKbT86cvU= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.0/go.mod h1:7VYCjjCkvefcuwTzp4kYoqBwr0FwUALBOibHfnfxtKw= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0 h1:9M07wzsmu7dJ1sGju7dgA5be2A/V7o9MjU98Owc4oQs= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.0/go.mod h1:+otS32yn9vMACKxeuk/vdqIiixQwRhAJun2+MJ6Xki0= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0 h1:llNib4H8hWhAkQnYXqq3Z9sqj2UKYwQRPPQQXuMbMLs= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.0/go.mod h1:+m68X/YheLL0yF0NtNHrxY7tK4tGakC1gxkfS59rLKo= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0 h1:r4eLQRXdSac53Ctv9xdPtsfvZARLJAeckkZanjTa1WY= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.0/go.mod h1:hFXU4lZpL6qYYkhK+VlL8nvFWW1mW9glVTN1ibgzO1k= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.1 h1:8qIz2VOP22KhWlMhh2nZOlvQjXHcZ1jIYy/LmP1r0go= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.1/go.mod h1:t7ahGe9ZaK9mmtYhCMjVA6euun4iNzaeDnJyONTBlms= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0 h1:x5av5LUNElLagRlvdz1ChpE6i6LRT+zXB4ImccUm4gY= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.0/go.mod h1:7nTWvkBYL6yEq5Ry7wZJZc30SHok1L4mztc+ZXKRqcU= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0 h1:ajhW+XmobT1N3BlF+G+pfQwcl3vEd8ZQy7MgSE2zUqo= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.0/go.mod h1:maFfzxM0pEPjgJsX9+Df1U+lSCLqFFtvTjL74tVXvkI= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2 h1:Eu/poJZB5+sOBhRs5ajo+zF0o6UveRYuRb91z2cWMa4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.29.2/go.mod h1:Yop7jD4eiNKwOXogMeB086bCfnImpHRDH8LvJXKz+O4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0 h1:WBfBxGn9rYq1Fe/y+8x47x1zcQ2w2TRDZ1QGkwCuY5w= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.0/go.mod h1:jyjTKrkxcH3DSiy5Oc8Acgcw/Mk0xC0tgo77aPPJXN0= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4 h1:Beh9oVgtQnBgR4sKKzkUBRQpf1GnL4wt0l4s8h2VCJ0= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.4/go.mod h1:b17At0o8inygF+c6FOD3rNyYZufPw62o9XJbSfQPgbo= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4 h1:upi++G3fQCAUBXQe58TbjXmdVPwrqMnRQMThOAIz7KM= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.4/go.mod h1:swb+GqWXTZMOyVV9rVePAUu5L80+X5a+Lui1RNOyUFo= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4 h1:HVSeukL40rHclNcUqVcBwE1YoZhOkoLeBfhUqR3tjIU= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.4/go.mod h1:DnbBOv4FlIXHj2/xmrUQYtawRFC9L9ZmQPz+DBc6X5I= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2 h1:JmmZEFvBaUH1m/38gJbdurfKXuWwsEwdNmob8wzKN9I= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.2/go.mod h1:Xx0NjUVWuBTEbWsPKzlb5EGM7CXfNeZT/yYuDs0LU9I= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2 h1:7pjtnLwOsSkXqUSUh0eM4FvtBrEAIIpZnpWMfYMInAQ= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.2/go.mod h1:Mkxqo2gpKhOv6hzBwASIizK/jrMYRYC3jgxou79HPFs= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.2 h1:2cLDi8pUtPZpy4SxVl/8qGSOEXD1C9B6S9DbYdS+il0= -github.com/aws/aws-sdk-go-v2/service/iot v1.68.2/go.mod h1:t+dAKgSxvyyBLYfX7uRjVWLmSfB9oHVYrnr7xYgB7nI= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0 h1:v9thqBogLxnkYGDgDgecgwqONsj3r/1s2/LGP3I56Z8= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.0/go.mod h1:TquECNcZl417iFWMwwkbxvK6LYn2iWou0gddj9cMVHA= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2 h1:qpwKJQj2pOQicP1tRqp/Fc3VSF+RstM7TiYwMcGQUlo= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.20.2/go.mod h1:R6UkvJCM0zB22m00O0jNxyehlWFwp6ABy5wDyV3IYnI= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0 h1:5h6T7kFcUyuMBh3Y6r2XFirXKWt45QFwxUfQ/JcIeqU= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.0/go.mod h1:cr4qUDfJkgZqFYH755JcO9mYzMF83kkeaWI+Ttsr0d4= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2 h1:5AmBBuadDNz4e97VdUxz3tNvi3WAW5Ni4uPPTGSmamM= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.26.2/go.mod h1:pkdfnMXOhJG/wRHl+L+2c8X8P6pxSWoA+TkaBjiQfW8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0 h1:00WS+fbf1VIZefeWaVQBU0JfBj8j/cwfOw2tTx0SmZs= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.0/go.mod h1:c+bvqdOYwP+o4ioeCeyhNuVb+2tDkfj5KwoeS2K5w+0= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0 h1:q8dGXGYG9TSEb61QelksWI4WN7VruNzmF3iOEX2zPoU= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.0/go.mod h1:qHrVvohvEerg6TJN1GPMHftLmq3WEUdNUqMtEMpYbg8= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1 h1:ajQ3nzyXFJeVCXwV/U7Yd3ize4Pewyg9e+3dcxPW5EQ= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.1/go.mod h1:OVYdxu+rKzsE0kk8ivNT/QSN64Y7EIVfVFDw/u3/RvY= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0 h1:FaN3ONYHItF50pzc8mflJZ2Nw7mxaqsLjCOncSStCaw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.0/go.mod h1:tzwEJJ+GEiW8S1lVe+y11xGxhTbGirji7Q/MiHF6Eac= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1 h1:H+eWu+AUXA57sZwSwx2eg3Q0PD2YDSEUoOVHnYPJ3zw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.1/go.mod h1:NtBjk4DIImrEUO5Hfeogv834+sIV7dO+GjcjdtAgzJI= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2 h1:39lKMHVs3b7TsOTJ5OsulWDlSGzXTF2rmdHPL7s0wAI= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.31.2/go.mod h1:L8AA5x3ERX5vhzrxTsRoTJxtMk3VBtzUclRE01z9HP0= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.2 h1:yTtMSIGWk8KzPDX2pS9k7wNCPKiNWpiJ9DdB2mCAMzo= -github.com/aws/aws-sdk-go-v2/service/kms v1.44.2/go.mod h1:zgkQ8ige7qtxldA4cGtiXdbql3dBo4TfsP6uQyHwq0E= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2 h1:w11mPNSh7gjeJ5UWzE4RTnv1TXnYgoO3y+RvFGdHRuk= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.44.2/go.mod h1:NU0x8Aw0TyBIMEQWmsWq7yBsSCMsAzQILq60OS6Bqxk= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0 h1:xjBkvUA+R02IZrK8WlRwsC3kG9LkMWI5s443jpz7aUw= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.0/go.mod h1:9x/lRk5gSifCG5RVQd1bL4vcrpkqF1HP2skh55YrLJ0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0 h1:kxNWr2mwGMJY95aS1adyB6bcgIGye5QtRMlscQG8t+Q= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.0/go.mod h1:qQo0+U+A4qYLkrqlaIfxodrVNWbKicZs7PqzLr2KOzI= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2 h1:wgM7kNoVIdk5RECLS3rXPEkAoNiyZ+S7FtU4HFLwltw= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.32.2/go.mod h1:314LGYRgbPlc8LVDsmKXZfA53nK0tUD8ULOFCgBwAp0= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0 h1:+kECYDKEF2eV7w9JPH3Y0gKXTQ0aqTqFUkrdvaX4Hn8= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.0/go.mod h1:FKba+RqhU5bwTjZNm21bCi9b6XYIAQdMdHv29cGD0Tk= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0 h1:ob6Pfi0h6CNDpYIrWtQE5brfrly6eEzWzR+VHnljFUM= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.0/go.mod h1:WFJVuGn6RURjy+lER9g2PpAvBD1ETW617/WcN+toJOs= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0 h1:4PX5L9+JVpyw5//da3vmUumVg2Fkdny5O7a9CddC0ZE= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.0/go.mod h1:XzTgKgTMAYNwERpk93CfXW6svBscsroo07Hi2aFx8a4= -github.com/aws/aws-sdk-go-v2/service/location v1.49.0 h1:uI/I2o3TXB9CxfwlVthFD3XVt0TAhX5/7FBrUU/IKx4= -github.com/aws/aws-sdk-go-v2/service/location v1.49.0/go.mod h1:teGrbvA8Mc8jhkAeLhMSddNhWJKvoOMLsU2PaAuIbwc= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0 h1:FoePGUEi6stu3fXDtCFpCzMYhlsXgECiLJNxUkxOABk= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.0/go.mod h1:SzOiIgsXGU3EFXfntWuxXRvXsgw0iObxZTJWWrSm8Rw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0 h1:UeZXAjCMx4IRxP8btLxRDyqBCyRw1DGUSv+I172whzk= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.0/go.mod h1:WQKG1RYF8SY15A4CI/N6GtG9yc8L0rqQvNFTXy0KkT4= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0 h1:E5743EuCy/Ww97NwggauRTevQnk80uOPgv3jbqieg8U= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.0/go.mod h1:/kwtn/yLAnbRc97nCDZdQYFWlNu3zBqx/ZS+1NZqWwg= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0 h1:nYyPz+c502rCVkv0aad7OruKANpF/FuyON6JVZjhXB0= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.0/go.mod h1:cvlJhoW38zSRV5n/HZCpjiBgkdIY/DrdYcnrQtIqUUM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0 h1:2RNLZ1Ymov3rRuPUAVXSC1xXo6BJ5hpWF6ad72FGBAQ= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.0/go.mod h1:pqjPMDyVOlCL3OZm+Z6h7eUUAzBsTFZRo5m5w/zCZFk= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0 h1:5Md+VUsWD//Em/Umk8E6TxyzHdOLsoC/kN6KMfNHhuU= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.0/go.mod h1:csuMOugUvZ1D3zqdZk3Bzi6yWLZAc16w3yrKrVJ/Cls= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0 h1:jNJbZiRr+2mh7ZU1H1GRaRB2gIhDweb58K1fOZvB3QU= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.0/go.mod h1:x2E6lP619oE6wmm3oUsqtSRjjESVZXjkY6uDjzDWOO4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0 h1:yGC3w02PCk0dIKw1Id4iA4GBt+j4q0nSbntqMpaLdl4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.0/go.mod h1:oKDqEHBV/D5hXXQzM1CGzauHXtCctHi+4aOMrSKN9Sc= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0 h1:ltB0n2pWVrQgtyMrl7zt+8glzVcCDR7XAbu4fGQzh+Y= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.0/go.mod h1:wdNPlMRj6EXOKq7RXqdbEEOG+vKmkhU3K6woQBPlNHc= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0 h1:lOyLFvIq0NElKvCoZoxi6jkF10QXfa+uHwKIYnktu18= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.0/go.mod h1:Ao6O1eiKPho0oC8wltxV4N8AloCQHrbkoLKLZhj1Ufo= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0 h1:n2oXaBlhvBCtP4ZYZPfUkPuCfjV36yPEmkls/M3iUq0= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.0/go.mod h1:zUtFL1G/9QeINU6DXpor8Aem+AMqxyHD4KFPpf2Dctg= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2 h1:7dXyoc0r5SRqWJm/Xr3wsnSMx4Atl3khZOYUD/v78HI= -github.com/aws/aws-sdk-go-v2/service/mgn v1.36.2/go.mod h1:iUafRDoNxSNdgOohlZ6ub1z78T5xzpP7PDTL03g6R1A= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.0 h1:hB8zQpr04jlJmX8Tl7oZUN9usM0nf44v6WzMPpGmSco= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.0/go.mod h1:mOjOnhmYUalvanp+aTy/7io7WkHB37vWmrX3vUE+5G0= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0 h1:OtmD4BBfHrsMpB28PKH/5qgF9/SgGMLpxFkYgbAOW2M= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.0/go.mod h1:IWyn1QPKgrMomuJ+piU/l4dJKxZrSt2vP+weigUSSzA= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2 h1:st680WQ7lM4Z9awYey2ajzOX6aMg1w0Q7enhoWPzSRE= -github.com/aws/aws-sdk-go-v2/service/neptune v1.40.2/go.mod h1:xq+4xu0T5W23GDTPj+olFc6wqBrTj8Mc2wSTvqMMLv4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2 h1:k1ia1mxgufRVSzwAaen8l7/VbFnk5xu/6zJMYzSgMEg= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.20.2/go.mod h1:9gwYWqGoNfNs0MHi6F1FadJ2aai+z9E2dkTFNBZlrLU= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2 h1:mPodsMsmJXyrj7OUisLz0OcVIsDKwX6zMvom3tBkGPk= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.2/go.mod h1:Z4Dw8sP7jGgqnum0tx0qZeOnPOA0Dk7+IaFcmXTlSjs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1 h1:nXmAaIprMfKrNBpRAy3c1hfsyIyoabyMwoDfqiBJ2mc= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.1/go.mod h1:rnq3/bkxBuQx84em9dtPU8qGcfEZjKsxSV3GoPM3NGs= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0 h1:6n/+GvyaH5iBi2F5HAFvpuaPPQBTeHOltEBaP3T5/7Q= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.0/go.mod h1:lswihuRl/WMpIGA8g02Qmxl70NXh+ASQsgUaczVNwDg= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2 h1:OsQJLGyeM6KPHkx+z2OL+iGTO8Oh8A+WOJCQ2cVphgw= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.2/go.mod h1:CSOJzTLXo7jA98k+MrlFgF4FlYYXfn93BdhtvYsp13M= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2 h1:8mqEpXOU89W/fve//O1K2EiiiYcWsd3uUtToH7UzZcw= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.2/go.mod h1:WcBZ3y3zBGBVGaTJuhjzyt3uULaeJBiqk5UWGIcQFS8= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.2 h1:6BNeUaNmrnm1ln+jUAA3EwvTW92em5/VNj2g4X1KIb4= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.2/go.mod h1:MCiX37HaKQEZ9bQLJ1v2DcC3K4V7gIJO3hlwMDgRkWY= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.0 h1:3+EJm4Prbjq1P3VmCjfPKLxMQerl14sjfK/3g8/M6LA= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.0/go.mod h1:Yxlq9uHN7dDqXBcIjYZeJawThW6HvrJJgjfVA/vNnXU= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2 h1:/0LS43ha38xcEgBZ4+zFVXgTtzua8W32Q1XLqJ//efc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.2/go.mod h1:3+YSoHdHAX/8a0IDtmd4+/zxaQXdMv9eCKvPiBilhwg= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0 h1:c1e4iCdEt9kNgBDJWX5C7SI2taE2IgaUe31RcrOO6Zc= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.0/go.mod h1:Wn53Bhl1rFtu/zlLlGrp+RePY86JgPdomg9Z8pRo1mE= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0 h1:ffSYYAIj7NP+UoDtOgO/23K39v7PpIxu5Mc7mUIi39s= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.0/go.mod h1:LCkuZm6/csV0m4ZnpXwapK5QoTAYA+gqtkUi7pmHuDE= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.2 h1:Ysz7Q3wVlDNP197b2b0tU/BFt+Hf/x1/6BcfEu65AIk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.2/go.mod h1:msvEac/zTDAwtU30HRFO3OK1b02A9qDs113gdUhlAfs= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0 h1:kOqT0HBrIn7nfX2X81VPnPqIj8kCyJFzW0EeiX9i644= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.0/go.mod h1:YSMVOwGc+mgGnlYYA+SPM3jDngBaPDWFFQhoDiobxkU= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0 h1:2Q55YYHqitmezF6oNwhszb7feV0iH3pOqmN1519pK8c= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.0/go.mod h1:D965E7cTpFVf5Jt9O5/QlMqnEJOz69UDT/9q2Rkmf8o= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0 h1:XU2x1cN+5gksh0r7jtQYFQY0kBkmdhzylDwAxA7bHVg= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.0/go.mod h1:XpKmAxXi9iKPMMULORJVN6fUzwzSHoQ6VCWmk4ypZQ4= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2 h1:F7v8ORYq38EXz369JoeiGbRdehi5tsDqEUuRdxzVA2Q= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.2/go.mod h1:0YpYDAw7FTVae7YFJalT/MvCor9grmcHN3N/5gw7ZaY= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0 h1:tVYv2JaS+YQ0Ie1m0x5jTnTTSQi7gjDXO1OtagSbX/M= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.0/go.mod h1:RzZVKaRSEaZ/JI3S5/plodbKIeCwhdEqFnIfSzt4XMQ= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1 h1:S8inCUo6gcwZl67OcaFt7h5YyY+zLWYTw52GS2GdQzE= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.1/go.mod h1:TpwxdjB8Xa9mk3tjli4WFV/dlUqHfdTaSW8fyL6QGDo= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2 h1:Nmrss7CvTizCpQXGPJmmiRmIs1en4IQA9mSeb9WJogM= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.2/go.mod h1:UfWR1rbStpa9iOB7raz6/iXvAQCKn/FPZn7pLVD2GOQ= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.0 h1:4Dc9NfSNZDXGqoO50gkIyvKeT1f1z4pJzgG+iqSx3IY= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.0/go.mod h1:JFBdgPcah4dMSjWOZapnEfjlnJwROtYHLMMyju9PsXo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0 h1:rW6e5DwXgm4O0tejWNiEQjPlsK/bL0CA6P6jBz1lKBo= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.0/go.mod h1:PbRvDiU0Y6Qu23LsG5Ni0rxLaVgRRepSB805IJ/tCQY= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0 h1:K/ZCujuyar3ocr+8nIauIl/HKzIRxvxjBhehT7r4YAI= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.0/go.mod h1:yO5rn0pXmoktYxpNPl/Ar1FJVUkb7BruDj4Gm05zJJo= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0 h1:cPqbFivJWYiOohYcvYZMfWeA0dFa8NjQHcGa3PRbf8Y= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.0/go.mod h1:4gxoAJyeiub9qbFhxtjNVlEl3wv7JawsEcjEnoWw3CQ= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2 h1:PyElt0JcGXEvHd/xF7lV456sW35L1sug7AIQ9rH2s2k= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.2/go.mod h1:cfKX5EGhek+xZgwWdtJRcoEeMCvzVNTJfRSJ701f/XY= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.0 h1:3uVgEYqBqB9b04qtrOMSx0xNqf526y0t8FyY3/SayLI= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.0/go.mod h1:3dSTfDjCmvdAMxZ14CoMMHqqRf2SwpZbOxxnhrmkoeA= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0 h1:dltSjMAdChaG99UsPPR9ZLHKcqGQ5s+Pa7wJwbwH6hE= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.0/go.mod h1:5FtLwGQINxbOP1YcT/bStOnWhFgAcm+nvIqdh5Oxx7M= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.3 h1:UNJEw1Z4Q7mWv1nB5C4bvgY+iZ1S1t1JmC8WSJ43Yuk= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.3/go.mod h1:/2VugFM40wGawuHZoR6Nu4owBMkjQJI71q9V/Gj0jKk= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2 h1:pbEANxUe6Zu4UAWUb3XyjJWXPq04QjOSoiOJzIPm2qQ= -github.com/aws/aws-sdk-go-v2/service/redshift v1.57.2/go.mod h1:xh68dhLFtSXrCWjIBQPr0uoBnxrpZudyv/oZihLJKR8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0 h1:78R+I9VxvxpPQgxGjyAS7w77TLk3szUciM5tC/ahSbc= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.0/go.mod h1:d9AQJ0hfu2gMYJ70eKplIiRZpfewVM8T8NCTo9wfDHs= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0 h1:f4Bj2dvWHwg5W+G04vlI2TXKy5bGKyIhWB8e3uuQ4Yg= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.0/go.mod h1:vfao5FvfLhWLwxid9FaQUJKfplmhXSiBF6agoCMYr4c= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2 h1:/NBPfx837bGo/Scker/xtrvBJyUfMNdMDhOIJVghWTY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.2/go.mod h1:MNnuF9h0/AG+DaXdNZGFv7GlPiEfFtU9nN5Zn/H9zoM= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0 h1:kr/UOZHsRp56qGlA8IGJv3fDNVnhGoqtX9eVKNx0w94= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.0/go.mod h1:THQa8TeoS6tH2uj03qWxRKby1irbNWLvjtHX22jO5MA= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0 h1:OLy4jmGWvP+bekj4eQOtm2IXvpTCotHuH3C8RuYWx/c= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.0/go.mod h1:q1uENEzJpx7UuV1z7dJ+3SKOeNGPRmC5Z0FRcaA/vk8= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0 h1:VB5KbqES3mJVn5mVF4wLxFdJ4mZStbhCdoz5CeX8kGs= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.0/go.mod h1:9TG436FzxDMlojpIkiPn5wpFi3tgo2BBDtNBltuugzY= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0 h1:gEYEoCtTxgK/9PLsOsN8HF6M10dmCIcbe8vFNYGFZso= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.0/go.mod h1:XsHmCp83S8Lj80JlmWJWNOv3KGxSQRvgQy4miY10z3M= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0 h1:lsV/IEkgM/O/3mL9wu1pKyzwEmYq6Q6D4OBdM9t7Loo= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.0/go.mod h1:L61KDM+8S/XSlaWuAwtXUpb0IuB6ufocucP1w1WjPTA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0 h1:3ZBD+LlCS2jVrB/9xL/r9PFrTP3/pntZS3tHI+E1cLg= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.0/go.mod h1:Ro0zSeA7hRAhX04QgnUAc8MvvQO74wg/S15wzA/mxgo= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2 h1:v5VCsDpCyoyacNZWLoMBW/h1iyHzge38oEiskATmfZA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.2/go.mod h1:C3QKSnGfSjA9GSxb1u5wjOeIavPr98oGawUwjSyBQ1U= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0 h1:/R9c03qqsfpivl2V2eYSmNPkM3ctnEYFFvFyfhdwvlw= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.0/go.mod h1:2iJzzMqNYL+zOnIkGT+kSlzvrdQzFp8J3N2ZyOsWOtg= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1 h1:bW2/mKWuYLAN/dHh4DHJ1S9bOhKVyw+VdoSMPeAC3XA= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.1/go.mod h1:1i8cDJrfEtWcNXkY4nLrj0PvJNvVads5Azs41iuce5E= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0 h1:1U8GJZflpVAJzIAqt3xb3Es6xd/NksnH6XwK956lKUg= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.0/go.mod h1:4ICDzkGsDZlp3KOQgL9DMBsbOqV+QdNPRLPYzuUOPuw= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0 h1:LFgBVlSxdzxCB20TX7DDFd6k4XxpbHA+6OkBIVoX/R8= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.0/go.mod h1:pDJJMmrH74uye4TxxqiuDLHmo5/lPE2otqHX4xHjDZ0= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.1 h1:55M6WukFPaLNGH/mKJhggsictC45iMOnRL0SfXCzsIM= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.1/go.mod h1:YR3uuCt/tYaozpm0WaqXVN8jBS7IF6zLVxZmDBktE38= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1 h1:2n6Pd67eJwAb/5KCX62/8RTU0aFAAW7V5XIGSghiHrw= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.1/go.mod h1:w5PC+6GHLkvMJKasYGVloB3TduOtROEMqm15HSuIbw4= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2 h1:XpyX45Ag3cJu795dHn60EmZRo3Yi3xT98qHMLXl77fE= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.2/go.mod h1:PxKvSpaiyU4RF1vqdtgcjNz4UfzPhCmNEvuLEtbFdNk= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0 h1:DK4wkPe5hqJ/lGenYmlzP+xEaTVufeWwlcwBYun0yrU= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.0/go.mod h1:mPnKXr7MlpLhdPrDIp7A7wrn8KZczClUR3cCiOoiurw= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2 h1:IDp4r2l1lFk12OK1Niukn6EqsTDpmZqtOEwMkQ8q/co= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.9.2/go.mod h1:XOJSYdqGjz/L7Dha5dHqm+ZG7oIdkGoeEp2eScHtz/U= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2 h1:nGJzrq2JfBgT1Ru7/jOPUpg54u8MOT6S71mP4qhZABY= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.2/go.mod h1:0M072Ve2pvosl+0f2mWjzTcrV6C2yOHUMc7hr7a//BI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0 h1:diWWTewadd8nspQ4cLgB8agJa+iGZKOB86xXSzoVWKo= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.212.0/go.mod h1:UkOhLOT0LpKv6DPhWkdGH/TH7GbbeHBXmv+knru3BlE= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2 h1:CwZDwbd/axAuxDrK6Z1KvBe8YohzoUp7IF0kTz040sw= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.2/go.mod h1:O7Fry/sveGPVVJ6YKP5vlBO2tmT5Mwar4t6SC7ozhrQ= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2 h1:TnXQwGPXzUdgQStIei7GHKpTsH6AaBcQfWNznfQiYi0= -github.com/aws/aws-sdk-go-v2/service/schemas v1.32.2/go.mod h1:JH3iIfv0Z4hLuIos/ZaOIZA1s1oVHYvhQSOAMPMtyv4= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0 h1:4cI0izhZpHNep5CkZdcME1kSvFGSb38hd8DoOftIiho= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.0/go.mod h1:KwGTe+BJ29tKBIkVuZgDzlw70aS4BZxLJVqAjwnhfRQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0 h1:DErOaGhYl9qslEpKfFuxbbBbYW+7z9/QDc+b1dveMQ4= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.0/go.mod h1:TXIiA7aabd6PftZh204/dZzIq4pbxsnC2KhTfDG2gdo= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0 h1:/2BnZ4jY3t8cDGOAq+N6t6068mOpFZjVfa+P5EkRg/A= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.0/go.mod h1:22jRd+rsaXAqFG3Z4Q1/S5IDu6LlfsK9x+0Q34j5800= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0 h1:jHJJV2lS/pML47UFKuDizWSF+Sus6Wu+iHlL9HLasSQ= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.0/go.mod h1:LKUgVxs3NSGLFX+KxawGOIqj+TnzKmMrBBhyG9F/B70= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0 h1:QjE65yfmohS+lD5/46KWr28+GV7sGDOU26NwKAQQdsw= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.0/go.mod h1:URhjvFxHYs0mZrw4xDFeE0v4UxADHoS8zz1FuamMLo4= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0 h1:EkqxGKo3NQOpecZ1SZKLwRei42br3w/Wqc8Z2LvrR6E= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.0/go.mod h1:jMcEnv9iTw/A/IIAidSLKSN6awp3SLwow5/doKh2X6I= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3 h1:M3DyWHClr67A6UalxmpBkGvKgU2W54m5giBbTb9A+Tc= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.3/go.mod h1:/ZwaUAo11yCI+/RlsS9qenibv8nlhojmhGJZwswFyGg= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2 h1:J34R2j3SkWWOMRb+t4GaKuepsQLHPFLur5sRST9U5yU= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.2/go.mod h1:MEx1peuCjUonZxzADhoEOdVNvzYrh/sY8UKqcaTLepA= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.2 h1:+0pRP/Xlqa0QECshq6OiqPSUOqJkC9S2sEy1eoVRXd0= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.2/go.mod h1:XX+31QQhutM0Evba8l/wKwxVgImn/5PhY2tZq55ZjSw= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1 h1:RkQkgl3Fqs7tbppVtXrIIgk8BnwC1jtGqm4mc/PhbKc= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.1/go.mod h1:zFli9wbLf4pACrhJB6OVq9v0V3DeZLUdO69SXd3peN8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0 h1:+6/uhxpTyEteQaQZ0hUYOTH1hgUqGjV/yeobJi7TQo0= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.0/go.mod h1:q8f8cFyuSj7kxJSrj9TTt/SA8AiJwvZOm1zWPejr4QY= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.0 h1:l2tLCeTx/pgiS/UpkdKz9A44AhMm/V7JbBOgIABLQh4= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.0/go.mod h1:s0LNyit6ckFaz0L9RMLPbyBBwb5eqg0FkDLCO1/SPf8= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.0 h1:60l+XFlsbkrgnuZQkkpjw/L1sl4awDpp227WBUo1/Ho= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.0/go.mod h1:BFxV9NEOMyQvtn1XOnXH0xMBUupXUJL1cE8Jul8p48U= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.2 h1:dXu0MVrJRbidEuUPb7tY3IT896K//tF2RHZmARts9QY= -github.com/aws/aws-sdk-go-v2/service/sns v1.37.2/go.mod h1:LI2j0ARb4J453bpa8PTEYUmMjbUp7RwPzP30KoeIIA8= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1 h1:+Q2+GPKzeuADQRrtoLe3ZPo1vdRf5S0Qkl1ycLId4vY= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.1/go.mod h1:0k5UwPsBKX/vDEEP8T5YDW/cBjiOw6BwRsRtA3BMNoM= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0 h1:P0B6+TCK7bHi+MQPnakYOVrYENtEpVkaoVGeNCWjOV4= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.0/go.mod h1:NMCzIcmGKoLNNkZ3/8SZzmp1+jvcU32vyUk5j7BwWI4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2 h1:IOhcCZDpadt3BTX/qhYDOaZgXcmK7YIFj3Pg7PFW0j4= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.2/go.mod h1:FDU0ZJvkh3I7hKDUEW8k6q1WLlVPYnM5MF1E2MdtJ4Q= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2 h1:XJ4GWRhEFLFtzmAS7l2SIdI1gRKP6jnabT/K/FXAgOM= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.2/go.mod h1:UXHGCHTqOmCu2T//Qbw3u4qSeuEozE3K9fqxxzIX7bA= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0 h1:2gFECQdVbuJ7E5NBtO7v3BZ8g/zF588aJMeYf1dAeVc= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.0/go.mod h1:IxtFguD3owLOZyGaYo16+FJ8DdMlp+PboL4wRpuIxUI= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0 h1:EZbUtGXQ3xUjZs6m7V5LKfoCRn7p2LNIWwqV/ZaKU5k= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.0/go.mod h1:U/7caU4UHGtr1ydVQN+c/+japiE23xhvM6xgilbkjNA= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.2 h1:ve9dYBB8CfJGTFqcQ3ZLAAb/KXWgYlgu/2R2TZL2Ko0= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.2/go.mod h1:n9bTZFZcBa9hGGqVz3i/a6+NG0zmZgtkB9qVVFDqPA8= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0 h1:9JM+wCJiSJvnpg334FGSaTb+HeAxhXkPiJOqIaBT934= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.0/go.mod h1:AITCRVCV4VLJiO2j5ICp6I4JJ0DXvCjhQph2pQlRs5s= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0 h1:Bnr+fXrlrPEoR1MAFrHVsge3M/WoK4n23VNhRM7TPHI= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.0/go.mod h1:eknndR9rU8UpE/OmFpqU78V1EcXPKFTTm5l/buZYgvM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0 h1:QQYIRrzRh/s/nGQ7qNZWzyysFDRibjI9eaWuVKUoH+s= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.0/go.mod h1:eLKGNbyhr03/EjXBf8h8+A0ptESOudz4s11Tj7tsj6M= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.0 h1:iV1Ko4Em/lkJIsoKyGfc0nQySi+v0Udxr6Igq+y9JZc= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.0/go.mod h1:bEPcjW7IbolPfK67G1nilqWyoxYMSPrDiIQ3RdIdKgo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.2 h1:jgRzXcbHvw/Ze9rt06hkHbqSgmobUud37bxpt5qdxvo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.2/go.mod h1:ufP6MotuXWemaHwOwz98voSCM+iqDtS8j97tW+M9i4U= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0 h1:ZFRqmD3iWix0UY2G4KG3oiEG/sp1F18/9ZBqLN5c9IY= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.0/go.mod h1:+SMWdDNK6CJecrT3F9hx+QZU2emF7yOs3HGK6JOCZ6o= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0 h1:oIANsrxMomHQt31QfRhc2v8w2FT6DrUZO0jESwVZVzs= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.0/go.mod h1:z4PU+o1osjc0nRmv9d7Tmq+E6D6JtPlihRj1bGTSo2A= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0 h1:pnnAt7y/R3PcSf6DB4b9b3dYPrbY0g/6q2r8ui8mUiA= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.0/go.mod h1:szGnmvw4yB8eTlgGu9IYOwl+1FT0RueOtqi+uD+f9cg= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2 h1:0+0u7jX8hMjloY4/7QFhFVf2Cw3jElmOmiI+ziGPACk= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.2/go.mod h1:Qaf777xpASz7eI6f9+VmhsNp4vnMQ9TTHbj6teZZ5r8= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2 h1:+vjjxoU/9pFROaNCHIPVqXOzQPv+oLvajQulDwhEIUM= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.34.2/go.mod h1:fTzidQZZk89bskE9aojTNXexb2cm+r3FadcSYGWHIVw= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0 h1:QXfta1Shg4ed4/soTTES7eAj4RjGVZeeWAeHl5b8mqM= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.0/go.mod h1:Fls9NfCpIqwTcCP+EJ0pnbhbzRGxL//cD6bEOh+9yyE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0 h1:hJAu7BQ9tNUaiME0dIX0mEBCUa9Wsn58oUbJJEp8Kww= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.0/go.mod h1:GGilK6sOAVsXAKuCJfU6r/9GHIPiDBuWryTBhT6ZzZU= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1 h1:C6xQ3U3A4YymEVb8ej10BqG1+T0v5gY02sCvjM2dGmE= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.1/go.mod h1:Pcsh+8IVh75n0aXDVgWbzT783N1mIlZgB+PWAHInLqQ= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2 h1:pDHIGkuiIiuRECDfZd/kYPk0lb+g4WfFY7iYGktg614= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.17.2/go.mod h1:ab9jlwNaL3dnaq1UfxMcJBdQLB9Mwnh7L1npPmyrjWs= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.2 h1:JA/kZ6cIHffVok0zl7RPEdETiLZD/UBrp2iIZanYaoY= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.2/go.mod h1:V/p4V7WeQDV3LhiUyNS7fFCbkzkfHEvbQhB4zr5zX6c= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0 h1:+DeH9hYak2OKQjaMRR05hxqOwPveRjLt7UTRjb6NwzU= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.0/go.mod h1:ZTsSjBcDzwt75CnLBizI3P0QXxvavkrybour2f4Sqhw= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0 h1:TR/WC0j4s4h+kSfA+sE5FUkImWce+78y+aYQ3lTbmHA= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.0/go.mod h1:7O8zNBEOTE3xamo4lNF33k4TybmC9avy21mtiaZZ7u0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0 h1:bHtZVfmaGxY25cTHKm+02iFkS8hb3A1jVicdR1eod8k= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.0/go.mod h1:0nqwMeOJ+7ckNEFYrnQ9qAiYJvBPi6rwul/LojTSHP0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0 h1:3Txm4Y5izmDf3F6NW29jNfW1hj4aLJZUgUXFyE1t1Wc= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.0/go.mod h1:J/fomEtTSSPsrYEPwXbIrHZV9fBnWRJItIgFvYxnZHM= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0 h1:fAN12u/fXuh/jc5PxDvH1usYORPFCujHHQ29vJj4Gws= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.0/go.mod h1:ipE2i2dq86oafxcurCXJh/WO/8n+9D3SMgccqxZ4v6w= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.2 h1:0WBj6XOaUTDXC43TB851O1lRyVktCzldRCWE9PZCcas= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.2/go.mod h1:J8WfNZmkkwLsBgEPD8z6T/yPIcEyaiNCwlqsrXcLJ9Q= -github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw= -github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 h1:ovHE1XM53pMGOwINf8Mas4FMl5XRRMAihNokV1YViZ8= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5/go.mod h1:Cmu/DOSYwcr0xYTFk7sA9NJ5HF3ND0EqNUBdoK16nPI= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 h1:ntf4V0+gKWtRv8D0to90E3g69618MInKW78fds20zbY= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1/go.mod h1:6TzoN4j7QtbeN62zbHHOEThTBqFDnUpNsdHE2SXuu0k= +github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= +github.com/aws/aws-sdk-go-v2/service/account v1.28.1/go.mod h1:UCcTaFy22BpCwjdiXGTCiVjtBZgtJb56eos4OI43B9g= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.1/go.mod h1:l7aVt1kcuhWwEBe3MR6A8ouigGf8SyyOFoZImL16cEI= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 h1:89ZRA0dGP/EX+fJnAfWDyAoWngnQJAbiza4S4yEwDMQ= +github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1/go.mod h1:VxrbU0yq1a6AdduW/yI5YrMbfACUXfJq2Gpj23JUJu8= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1/go.mod h1:FbIQEQbdcSAJ35ZSLM9+4pUAEVXe0RsCJKgzZiRy8wk= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1/go.mod h1:IX3LdIF1/2D00vH+eBQ5cbFXrK9HfPW8dTH6gzWThY8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 h1:gWaSM3wwoCGvXasjXGfY7WGi1tTXnUjVQRyd/JFUFsM= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 h1:s5C5EIq0NRrIW+0RnwLFfm77FR/+8O7t4DysALJ5kd8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1/go.mod h1:3etelpvZBQTN26rH5Cf/S82hU4DUi9XP9s4Lq1bAeRw= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3/go.mod h1:0nr7mHOJvPp6YPsl1foq6dtYCvLXOqA32PNh4rOvV6M= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.1/go.mod h1:uiwfDwJN9bdkTr0nBmjzZ5pE6j91gIkdZr5FL1gcH8s= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 h1:auDXR4zI6q2bVLjF4XRhKdN9JgAUqJAy2caw9XIz/M0= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.4/go.mod h1:tli8PsM6pY+zVBNO5TQmjpfH4EOUQmVmZMwdYrNS2dM= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3/go.mod h1:eVLsZruYbIlLNYiJmgLYrfUHojwUuicjZWtdqNNKNM0= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1/go.mod h1:/cPr0IPQv5WdY66EbW0Q6MhkEgsffgZm3yce+9p8bTk= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1/go.mod h1:zEodD2/kBZ3ZkvCQ+BI+ssglVf63iFaQFUTPJ+nHqp0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1/go.mod h1:A9jOizMWCC5jhr6LxEDUHX2E93F1yhHFLSXt675rYnM= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.2/go.mod h1:lsoYw+OFJmS8qAQ5dqJgVxdrD2bpwb/H745dIn0FYbs= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2/go.mod h1:MbAwOxXSx2BqyRO7lwjBif37kxuJXmKtH1evpqO2JrM= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1/go.mod h1:7FcgDxYbo1T+/PalhytMEKMamKlvO8ArdBL6faoA4MA= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 h1:rfnS0WZj9LUQ+EqMAfZiGKtquux/U7m4AbijAB+rLD4= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.0/go.mod h1:cCaE9m91FJAzxAxDtVuNkYUGi2b8BGT0BdxUpCAuSSE= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 h1:IUPXngqpjUMMNk4SInQHLcsRiD9Bs8ALoVdkWt8ocBk= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1/go.mod h1:LHkXcBjWxtd4d3oNXk2yYgutSJRm8RDXswU02q4zWrw= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 h1:qWViczom6aZ/mFKkjptIT55N8YqXS/OR2r5dS092TkI= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1/go.mod h1:/1a6OiHnno31OznAJQT7fyU0oUVKEWlfQkWIYzM8sjk= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 h1:wCV+L8MEgAARnNKCl5v31WvTH66jPar5ocQCyMPGkMo= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1/go.mod h1:TXpE7TkM6gbt/s2S/xndpv7jy3AP2jnlfBtNu0r4aYY= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1/go.mod h1:QJBeAX9imA8RWLG7/X2RJtTmSerdENe/hCGIjllPGHI= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1/go.mod h1:yfmvd1yoaZOPxwn97mnTnF6Jt/d8sThRqfs2RISPQi0= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1/go.mod h1:1Dyvs+9cfooiIHba3iRvM88OPUB2NH8soQgW8gGCXaE= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0/go.mod h1:ufwtLF0mNQW0gCLbgdaHFgVtzUHeZ4VKKgdCjrmKpIE= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3/go.mod h1:WIcsVbfKETtSzv7BMpVsAe10+8pkBBN8JGwJRGnZAQI= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 h1:4+AaZRANLgs9R94EMW9DYVIfLS7g3c0wHnzf+NHC9nc= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 h1:AgzRQqcYWrrDY5qYmIZh8VNN73JLcPgvj4vJk1AASEI= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1/go.mod h1:hB5a4Dd4Q59lQl+f7Q7DIbFWZuUdv60pZRfmKySYXy8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1/go.mod h1:eXa+YkefIF2/zXsnW7vtA+KOHqWdRByLbMyMlPf0qTE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1/go.mod h1:BA0tEb4cNsfecUnT72QtAiwVj4RDrhANkbMWgr8upt4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2/go.mod h1:u6UQOkyctJPBzjoo+DykqLZ0e4UJXJez67sFtGjRYmc= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1/go.mod h1:bpueKKPNQQyTsKgFet4PdAgl+XLSHBKUiZ0j+vQlk34= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 h1:OnxXO7FKZ8JcY1zF9xuFvAoM9BTKslm/bhQAkDje9xE= +github.com/aws/aws-sdk-go-v2/service/connect v1.137.1/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1/go.mod h1:xbYZ9+N7gYc30vMR6IOb4Y5UHB3V6q2aaxe4SrVNXLc= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1/go.mod h1:yOFkixPF7VkKZKzkgEYx7UM7nqkhPWRNkV1AoWXEwqw= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2/go.mod h1:rpux7wx/IwrzFQeHZejTPAw5K+VjkZgqxwSVb4f8VUY= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1/go.mod h1:ujChJcb5Na2xzIwgJFkNO+B241PF3W599te3yD32e8Q= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 h1:LLUGJEURE5wqls4ncuyaSd1qTUa/vVtDh2n7+Jq5oHk= +github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0/go.mod h1:AszugMxR76tEt6QU7mbYM41h35MgeamN7HrXL08i098= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1/go.mod h1:LIVjAaMXcYxF2hlrfS67SbIC0r9xGyLQCY4WkeUAbLI= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1/go.mod h1:QRv7lhO6qNHRWOvW8tzqkPwwRRBamrtYtnHY+DVrZr8= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.1/go.mod h1:bROwP3K7obQzc1lytji0K6MDwavTNADoCXzIMBL4rV0= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.2/go.mod h1:3db0FYylodrSUD0M+aAK3qHW2vX09oOn4zpuA0RCJBM= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1/go.mod h1:6zhbFkB+HRZ0cSg9tAydoSbegTDErbaFtxUdNIknhsg= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1/go.mod h1:ZrN/blD6ifgST8JxHwLIXnVJ0y/IE4MyZTTkxKMf4jA= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1/go.mod h1:pq3d1zkOEUuWtIsrPhTeaa2NK4bycj1zimpeep4trrY= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0/go.mod h1:KkCYX9biRFzx8lAEgYyNSuQ3ljMK2ZOTnplMhHyCfhk= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1/go.mod h1:5WWwggaheKkEFmlCkClB7VnUgnRMVYrWSFJHQujEQ+4= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1/go.mod h1:6BdZwKA5lrUl5FoReQ000/D+OnVxfGxZyjwuWNKxiRo= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1/go.mod h1:jCU6Bb4RlCMdvgVZTmfrCSHAJ5wzNXdJKEgQfX6M1Kk= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 h1:HcrPUVElslX0M45ICJ2aEl0UMsJj/Y6RQNGcNJOgu2E= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 h1:tKqdrRKCkt/6SM9jaBsGnx2piN1L96e3eoRgVxaYeX8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 h1:tA0fwu2ZwJzVuNlyOpKaeS2pB4n9KyBKH6Apo+8s18s= +github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3/go.mod h1:Djd18W785OhsZRJcmWOBScRpJfrYtPYPl5e6ignT0lw= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 h1:E+nb7y5lRuNHsINV4nNFurH+U4BnJsa3SCPIZyUZxFo= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.2/go.mod h1:XkI+sL604XSxj0puip8ECW4ZI4BEksuJq77qVrk9FlI= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.0/go.mod h1:L3v6KI08dxAjEC16qpPb/uH7mMFlk5Ut7IVbFmB+2SQ= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0/go.mod h1:XJKCh9tr2gv4EiSbh7v4QOacRLLjgv91+DvuNuvwOxM= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2/go.mod h1:28fLKqJDUYtJyagwMg5mY4pjHeIqotYqj3Y7r1ZbF0I= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1/go.mod h1:IOeGzMdHDJsRZefrjoGKP7OWctaKmfKbjHY8UsKuVZA= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1/go.mod h1:Azqh2nJoQmlG04590JiE0Mipn41CehcT2iOZNGJ+4Hc= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 h1:JZgIA6hS67zlCGKT4NqbPsLPASglwYBlONwvvxSwh14= +github.com/aws/aws-sdk-go-v2/service/emr v1.53.3/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 h1:mOKjXzROoDn3753aPa5OY7tAnOzn52x+gtsHt/JI6PA= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.1/go.mod h1:mgvTMpQm1K4jL6cwHxzY3lwL4294bhszUdrFTb5OE/A= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 h1:8Sd86m15j8DsdRTWbbFFlDRZCmsd0tehmmxoUjBZe44= +github.com/aws/aws-sdk-go-v2/service/fis v1.36.3/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 h1:g9hUSavNhjbvA762fJmOWUTsLQDZbAf2fct28B9iP6c= +github.com/aws/aws-sdk-go-v2/service/fms v1.43.3/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1/go.mod h1:2JfwDlPZm27OCX8U2OI6/nfS8uycIULmcLuyihlA0Bc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 h1:TtGSyEgKZZfVrv9sA02Kt7BL4c7/4evV6jxr8bYLpck= +github.com/aws/aws-sdk-go-v2/service/glue v1.127.1/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1/go.mod h1:P9G7ovQCb8ugsMqSk6NmPeD3rQiVYVNqCEcEPZGor/E= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 h1:hfAw0mYZEArJIH1chpOSDD9RL5cr8YdohaoglquVutQ= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1/go.mod h1:eTHLmeHFpGDOjgbL39/C4sZ4ahyb2ZGc1i3hr1Q9hMA= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1/go.mod h1:oIEe0OfHys9BGsobPKUYgBA0i9gOTChYe0mP1s10Hpg= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0/go.mod h1:Q1oshEWbDmk65i0xxjnUU9i9qJK3hypi7cnVvquvrDI= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 h1:gC3YW8AojITDXfI5avcKZst5iOg6v5aQEU4HIcxwAss= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5/go.mod h1:z5OdVolKifM0NpEel6wLkM/TQ0eodWB2dmDFoj3WCbw= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgYu9UCQnIMKaOhkVaFvLy1HneD6T4sS/DlKg= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 h1:h7Xf+ZDcRskzMpo5EuZAOGrVYhTzWmNCaOGDwBLhd38= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.0/go.mod h1:vSM41OX/dDgIxJcoKYW5LzM5bcfgLUt/CXD9+Qpfl70= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1/go.mod h1:303Kx6cdaSgREaHzfHfJl3WyB+t/vTOm5KbXMM8Dy4w= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0/go.mod h1:NRf1OmevrJxGBSwR17qZaR90/eeg/rwM+4YurDoJ4w8= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1/go.mod h1:y5EjKbwcgQItIkYzxfGnxtqE16Ygml/f3JTRk5408BA= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0/go.mod h1:jYoXOY9FSXfnfQ1wHoJJfYBKc8O6ZYy4BYq/2mRfJcc= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 h1:ojqDIdMimJVlkMt9TTcxyZ0jDyvavXtfQaiuhndSAv4= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2/go.mod h1:+y5C92Um6L/1Kfcddcz/KlP4w+cen23bY0cziHfx7zQ= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0/go.mod h1:FY33uQ6Wb6FMrBhant1hvI5eQEgfPxj4JOl8f+vmXrA= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.0/go.mod h1:le5DfWrncVIxOWL2Q0NnDqvhH8ULiGYgC9iS8BtwcZE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0/go.mod h1:QC+BX9N676IvQfSoU67bL8fnX4CnKwCJd4udK51ajQU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1/go.mod h1:YUfOkjyQ07oPsYHn7Jw1eY2HpNWvWLdChJY2BCF91AU= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1/go.mod h1:YJAd2LReCr50LXZC4yiZyfqtDXNFTspMk4b8XNN23mY= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0/go.mod h1:yC+FE+kUrFgWwlfCOcTNYtEcYnvAb4dxCAEjeEs7XyM= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1/go.mod h1:lKUKI2/ejaYnQgSqCdSpdbSc2D4pA5LpijkAknZFJDQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1/go.mod h1:cVju73Vwz9ixw1zaR0tdZGB+M3GCRn8BRgLFRJ8oE6c= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1/go.mod h1:HBXDArKSFmUoPiHIatSFZP7RCOuSO86D1skZZPP0eLI= +github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= +github.com/aws/aws-sdk-go-v2/service/location v1.49.1/go.mod h1:4wXR5FxUtCbxrR10BM5v0JU9tWRuAPbxM0t63rSP5s0= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1/go.mod h1:Dvovz10WP1Kh0UYpgiYIJX2kU173PioVcZ8iUu3UlAU= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1/go.mod h1:OVFTr1QPEKPMXJFJmq7lB6g2LNu0Ra1jlyWRTUwVDNk= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 h1:z4pOPvM9QIFDn0outkKgx/Q/wHEvkFpc8HM0ecldnME= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1/go.mod h1:9bIBfRe99bgmTSKGt5kOANZAsmiVsUqAxYLdXtdk0JY= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 h1:eGM7Zu4idZy/puH4GwaSgSEaWMc+sro0UMXPqaUPRf4= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1/go.mod h1:bDTXhc7i3wut4LoMd/3Y/dm6yuHPSZ/l0JKTxAoWJs0= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1/go.mod h1:oQKjFr3ftWy/qU2ilMx4Nl2qz+y9b9pFuD35WgYFDdY= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1/go.mod h1:LO7nmXTfTGV1eKso1xizKh8h4WnC6FpHmCu1KDx+1qU= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 h1:nHVIvgHWzu0gIhYF06eRbFVzgvpMW96wrniWanoyxxo= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1/go.mod h1:/mNoNDYQukzDORZEk5w7BIvBtaQJxkl0exo7qMpVmhg= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 h1:U4vORFpANJt9am19Hi9PnMb7140ECSv4431rQf1dr/0= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1/go.mod h1:69XqFSlzFjBTMeJO1P+qv1kwNRN6nRBQnaUI5uuoBDQ= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1/go.mod h1:Ulo4NRLCKAt7Py+XVaO1SlaZAxCQ4f3N2SxhpqdeHT0= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1/go.mod h1:K7LVOq+IYECTdoQw3gwabdstLSTwYM2ysghvYx7OOn0= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 h1:3zfMUIyOkz9zAyBsrO+nKKGkiOamHvNYMFx6NzHJNIU= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1/go.mod h1:zaOIb+NMBSJtbPRIOhG4hfuyFskU0/CWyPIjZWHY4tc= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 h1:u49AKqJDtDHHQH/DWcy02Q8CtYovszGuTo/AsTKA8wA= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0/go.mod h1:9WVDrtazLGKgkmMp+7OrIEapwBesTX96szFSZUHw86I= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.1/go.mod h1:k/EsVXGxs6dcuBioJb3LWwmX7LcXPHLbweDoc6dl24g= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1/go.mod h1:IeLxEAtclnYwPUZLAhUCDPUQ97yiRs7goua3YtOaa1M= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 h1:k1WZJIid8seg7q1oRhkYxxB5HJ/Q1qTK98ML4JZ7aNw= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1/go.mod h1:S4lAC9xGXy7hk/ddmxFsUdYrqCgaqiHRsz2JFlBSXZ8= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 h1:g42YyO07tFnNMnjOwbYpchfZzSvVGf6K+HtXmjwqBKI= +github.com/aws/aws-sdk-go-v2/service/oam v1.21.3/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 h1:0WkIrO7jV0NlP1a9QY+CK2lUsKLPPJSkQgSr/ryZPyE= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 h1:sjca1ctN+ICI2uerjFTYGawESq6OM+cPafMyTld0p9I= +github.com/aws/aws-sdk-go-v2/service/osis v1.18.3/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 h1:wlkJ4GMBARImCR72Jqv+GOQZR9kk8eInpW0+7vpKmF0= +github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 h1:RYxQtAqIMzqSI3jwa79tO8u5QM3dEA6gsFs1N6vYbCk= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 h1:HpNLkXkBgbXByi+MB6xKT1P+iPRIJ30sXSfGL63kxiA= +github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1/go.mod h1:6nhxriPrOjTLhbRSGbM4ugEsshpL3AW7BcgH0UtgccM= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 h1:C9tZ0LkMleWzfJKCZW6mUxBUxvw/nE8Y4+yFjPsC+Ns= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 h1:sPUzA4sJ65A7Gz51z9F19Bf1Kcq65YqkE5qInbk+NtI= +github.com/aws/aws-sdk-go-v2/service/rds v1.103.4/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 h1:DQ2IGVPAGd61eSFjGYmrSOEEpXawUVbkv8hjA4sNI0U= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1/go.mod h1:1bQU4WjW5s2zT399sz1+EjmKgIZLhg+NwmhMV+o/iKM= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1/go.mod h1:aJ6F7uUk+H11VAVhjWXjwAVRROj9CPtk6Id6S6AQQ2U= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1/go.mod h1:bNnnRzp7DygLKwBv0Dh5C3wLhBvQUHVbz8HkNsetr6U= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 h1:/TvOR24L0/rdGKxlt9FjrXn4Pb6onrphD9Q8L+38Xvk= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2/go.mod h1:Tza7auk1JM98mceIqrBpBVgf63OMuZdvFIbUQGwdu0E= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1/go.mod h1:GD95a1fjPrxIec85QlXqKiL9VRiHkDJbe/1xCE64xKQ= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 h1:HNAbIp6VXmtKR+JuDmywGcRc3kYoIGT9y4a2Zg9bSTQ= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2/go.mod h1:6VSEglrPCTx7gi7Z7l/CtqSgbnFr1N6UJ6+Ik+vjuEo= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3/go.mod h1:noqWDtfKyO38kGEjpcvCeLA/fzf28s5GqEhZzMh0l0Q= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1/go.mod h1:Fm0fdHHqfDHVUjpygYpkib/3TABtK3xF1MFF4r8vquU= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0/go.mod h1:064xhAX/Q21mzYpqYRdZBZHOh8zLAlIVDlupW0QUYZ4= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 h1:4Tsena1ElxsXIho5WDVHsuf46H4VqY+9mCEbR22CR3w= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1/go.mod h1:hDr+R5WjCdv4Jeb96TCEaEAIVC6Fq2v3Ob8Otk3yofQ= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 h1:7IlIL8quV8GFdm1BH7ZU0ta5IG1ZDAQkoEO32W2Sdog= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1/go.mod h1:LdSgvzxjUIEYqDySJ1MZMHrpnXr82G1wUgbCUn1hj2I= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 h1:NCrZaCcXEeBlILIPXZPhCYvj48eaTwECX3NonrgGWBc= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1/go.mod h1:h6VMaXtdphpPOWC205h7KR2dth0h6Hr8FwdDIntf3W4= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1/go.mod h1:ISXBwTLGsBEdPKnc8hgwLMMLKAoDOBY/Gk1pAcVxegk= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 h1:owlFsGzDBOxj8Bh20Po0Go4BBj+voxAenaXmR0qwbf4= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 h1:3YlE78IQ/CESvF5iEpDHE+hxoRTA0owzJ4PA2lx9KeY= +github.com/aws/aws-sdk-go-v2/service/ses v1.33.3/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 h1:ahBxdOF8x//FK0EIMmGz7Pa7UFLEFu9BzVWBA1ab9zo= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.1/go.mod h1:k4FmZKhGje2cMSq7iJn68WuvjQlWCleuXBQrlaX92ro= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 h1:au83o40oc/0gTH1wLdkvlR+5w3H7kotDEVM/yqxDgFk= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.1/go.mod h1:kTLokjuxZ3M4FFxoyoIVifyutxQR3hxM8ebhWU29LRE= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 h1:BNdYPzlgwyFLZqeFundNKnPDB+TVVfaqZJoz0q6dURk= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.0/go.mod h1:3nf7APIrKwA04hwtT8PLvCaHO5k08M5YA03ZTJjz77o= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2/go.mod h1:nTr1GkJF+JsCWURFDQSqGqBLJvJUCpBaTCBmZJ4rXuE= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 h1:CMchvzv5LVZun2EgjAM/yVT0W/SmtgeTWCYMDHfMx+8= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 h1:tuAGiLIZnQvXgKWrwacO3AMVNC7AeUGKw/iOGGcMCp0= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 h1:z6lajFT/qGlLRB/I8V5CCklqSuWZKUkdwRAn9leIkiQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.28.3/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1/go.mod h1:HPzXfFgrLd02lYpcFYdDz5xZs94LOb+lWlvbAGaeMsk= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 h1:OYdiS6+2u+UZOvLPTfhanYJVtaf8oEYblaaaZURkgQo= +github.com/aws/aws-sdk-go-v2/service/swf v1.31.3/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 h1:DcwQUm+emSJi83WoYqoGxQ9A+AhgmZGMwmh2Ry6hslU= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1/go.mod h1:E9fVjmRExKItXS3Z7D84qP3PcmzEJGNLH3Zg4GO13gg= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1/go.mod h1:v5bHGripgR3DInv3X4lG4AjS/k/ljgb3MNJdqNOu93g= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 h1:QxshrLtaSXmJY4YtCd5NreSBQYpQLzH0YLiPyDXMTHU= +github.com/aws/aws-sdk-go-v2/service/waf v1.29.3/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1/go.mod h1:BZWeUmYp1Vra+wmpCeuBjpmbfWU2oBi5jZukBDh8IVU= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1/go.mod h1:yiLut9L99R3spfqmkcGZcp2z0fwNXCUXivALQ9qDqPc= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 h1:GqUJvEWTgVn5HQLJgergz8HJTeMu3qov4rvarzWUcMs= +github.com/aws/aws-sdk-go-v2/service/xray v1.34.3/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= +github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= From 68357d75b40e2787e043e9038169be33980378f2 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 28 Aug 2025 14:00:57 +0000 Subject: [PATCH 0933/2115] Update CHANGELOG.md for #44061 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 730ab56286e1..26ab7acf70a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ FEATURES: * **New Resource:** `aws_workspacesweb_ip_access_settings_association` ([#43774](https://github.com/hashicorp/terraform-provider-aws/issues/43774)) * **New Resource:** `aws_workspacesweb_network_settings_association` ([#43775](https://github.com/hashicorp/terraform-provider-aws/issues/43775)) * **New Resource:** `aws_workspacesweb_portal` ([#43444](https://github.com/hashicorp/terraform-provider-aws/issues/43444)) +* **New Resource:** `aws_workspacesweb_session_logger` ([#43863](https://github.com/hashicorp/terraform-provider-aws/issues/43863)) +* **New Resource:** `aws_workspacesweb_session_logger_association` ([#43866](https://github.com/hashicorp/terraform-provider-aws/issues/43866)) * **New Resource:** `aws_workspacesweb_trust_store` ([#43408](https://github.com/hashicorp/terraform-provider-aws/issues/43408)) * **New Resource:** `aws_workspacesweb_trust_store_association` ([#43778](https://github.com/hashicorp/terraform-provider-aws/issues/43778)) * **New Resource:** `aws_workspacesweb_user_access_logging_settings_association` ([#43776](https://github.com/hashicorp/terraform-provider-aws/issues/43776)) @@ -20,10 +22,13 @@ ENHANCEMENTS: * data-source/aws_sesv2_email_identity: Add `verification_status` attribute ([#44045](https://github.com/hashicorp/terraform-provider-aws/issues/44045)) * data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) +* resource/aws_datazone_domain: Add `domain_version` and `service_role` arguments to support V2 domains ([#44042](https://github.com/hashicorp/terraform-provider-aws/issues/44042)) * resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) * resource/aws_ecr_lifecycle_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_ecr_repository: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_ecr_repository_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) +* resource/aws_ecs_service: Add `sigint_rollback` argument ([#43986](https://github.com/hashicorp/terraform-provider-aws/issues/43986)) +* resource/aws_ecs_service: Change `deployment_configuration` to Optional and Computed ([#43986](https://github.com/hashicorp/terraform-provider-aws/issues/43986)) * resource/aws_eks_cluster: Allow `remote_network_config` to be updated in-place, enabling support for EKS hybrid nodes on existing clusters ([#42928](https://github.com/hashicorp/terraform-provider-aws/issues/42928)) * resource/aws_elasticache_global_replication_group: Change `engine` to Optional and Computed ([#42636](https://github.com/hashicorp/terraform-provider-aws/issues/42636)) * resource/aws_inspector2_filter: Support `code_repository_project_name`, `code_repository_provider_type`, `ecr_image_in_use_count`, and `ecr_image_last_in_use_at` in `filter_criteria` ([#43950](https://github.com/hashicorp/terraform-provider-aws/issues/43950)) From a2440417537d4b2bba1abf3565009b34850710dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 10:05:49 -0400 Subject: [PATCH 0934/2115] r/aws_dlm_lifecycle_policy: Tidy up. --- internal/service/dlm/lifecycle_policy.go | 1036 +++++++++++----------- 1 file changed, 523 insertions(+), 513 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy.go b/internal/service/dlm/lifecycle_policy.go index da04b19946e1..7569e65071b3 100644 --- a/internal/service/dlm/lifecycle_policy.go +++ b/internal/service/dlm/lifecycle_policy.go @@ -669,7 +669,6 @@ const ( ) func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { - const createRetryTimeout = 2 * time.Minute var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) @@ -685,7 +684,10 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, input.DefaultPolicy = awstypes.DefaultPolicyTypeValues(v.(string)) } - out, err := tfresource.RetryWhenIsA[any, *awstypes.InvalidRequestException](ctx, createRetryTimeout, func(ctx context.Context) (any, error) { + const ( + timeout = 2 * time.Minute + ) + output, err := tfresource.RetryWhenIsA[*dlm.CreateLifecyclePolicyOutput, *awstypes.InvalidRequestException](ctx, timeout, func(ctx context.Context) (*dlm.CreateLifecyclePolicyOutput, error) { return conn.CreateLifecyclePolicy(ctx, &input) }) @@ -693,7 +695,7 @@ func resourceLifecyclePolicyCreate(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "creating DLM Lifecycle Policy: %s", err) } - d.SetId(aws.ToString(out.(*dlm.CreateLifecyclePolicyOutput).PolicyId)) + d.SetId(aws.ToString(output.PolicyId)) return append(diags, resourceLifecyclePolicyRead(ctx, d, meta)...) } @@ -702,8 +704,7 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DLMClient(ctx) - log.Printf("[INFO] Reading DLM lifecycle policy: %s", d.Id()) - out, err := findLifecyclePolicyByID(ctx, conn, d.Id()) + output, err := findLifecyclePolicyByID(ctx, conn, d.Id()) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] DLM Lifecycle Policy (%s) not found, removing from state", d.Id()) @@ -715,18 +716,18 @@ func resourceLifecyclePolicyRead(ctx context.Context, d *schema.ResourceData, me return sdkdiag.AppendErrorf(diags, "reading DLM Lifecycle Policy (%s): %s", d.Id(), err) } - d.Set(names.AttrARN, out.Policy.PolicyArn) - d.Set(names.AttrDescription, out.Policy.Description) - d.Set(names.AttrExecutionRoleARN, out.Policy.ExecutionRoleArn) - d.Set(names.AttrState, out.Policy.State) - if aws.ToBool(out.Policy.DefaultPolicy) { + d.Set(names.AttrARN, output.Policy.PolicyArn) + if aws.ToBool(output.Policy.DefaultPolicy) { d.Set("default_policy", d.Get("default_policy")) } - if err := d.Set("policy_details", flattenPolicyDetails(out.Policy.PolicyDetails)); err != nil { + d.Set(names.AttrDescription, output.Policy.Description) + d.Set(names.AttrExecutionRoleARN, output.Policy.ExecutionRoleArn) + if err := d.Set("policy_details", flattenPolicyDetails(output.Policy.PolicyDetails)); err != nil { return sdkdiag.AppendErrorf(diags, "setting policy details %s", err) } + d.Set(names.AttrState, output.Policy.State) - setTagsOut(ctx, out.Policy.Tags) + setTagsOut(ctx, output.Policy.Tags) return diags } @@ -746,15 +747,15 @@ func resourceLifecyclePolicyUpdate(ctx context.Context, d *schema.ResourceData, if d.HasChange(names.AttrExecutionRoleARN) { input.ExecutionRoleArn = aws.String(d.Get(names.AttrExecutionRoleARN).(string)) } - if d.HasChange(names.AttrState) { - input.State = awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)) - } if d.HasChange("policy_details") { input.PolicyDetails = expandPolicyDetails(d.Get("policy_details").([]any), d.Get("default_policy").(string)) } + if d.HasChange(names.AttrState) { + input.State = awstypes.SettablePolicyStateValues(d.Get(names.AttrState).(string)) + } - log.Printf("[INFO] Updating lifecycle policy %s", d.Id()) _, err := conn.UpdateLifecyclePolicy(ctx, &input) + if err != nil { return sdkdiag.AppendErrorf(diags, "updating DLM Lifecycle Policy (%s): %s", d.Id(), err) } @@ -785,16 +786,19 @@ func resourceLifecyclePolicyDelete(ctx context.Context, d *schema.ResourceData, } func findLifecyclePolicyByID(ctx context.Context, conn *dlm.Client, id string) (*dlm.GetLifecyclePolicyOutput, error) { - input := &dlm.GetLifecyclePolicyInput{ + input := dlm.GetLifecyclePolicyInput{ PolicyId: aws.String(id), } + return findLifecyclePolicy(ctx, conn, &input) +} + +func findLifecyclePolicy(ctx context.Context, conn *dlm.Client, input *dlm.GetLifecyclePolicyInput) (*dlm.GetLifecyclePolicyOutput, error) { output, err := conn.GetLifecyclePolicy(ctx, input) if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ - LastRequest: input, - LastError: err, + LastError: err, } } @@ -809,865 +813,871 @@ func findLifecyclePolicyByID(ctx context.Context, conn *dlm.Client, id string) ( return output, nil } -func expandPolicyDetails(cfg []any, defaultPolicyValue string) *awstypes.PolicyDetails { - if len(cfg) == 0 || cfg[0] == nil { +func expandPolicyDetails(tfList []any, defaultPolicyValue string) *awstypes.PolicyDetails { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - policyType := m["policy_type"].(string) - policyDetails := &awstypes.PolicyDetails{ - PolicyType: awstypes.PolicyTypeValues(policyType), + tfMap := tfList[0].(map[string]any) + policyType := awstypes.PolicyTypeValues(tfMap["policy_type"].(string)) + apiObject := &awstypes.PolicyDetails{ + PolicyType: policyType, } + if defaultPolicyValue != "" { - if v, ok := m["copy_tags"].(bool); ok { - policyDetails.CopyTags = aws.Bool(v) + if v, ok := tfMap["copy_tags"].(bool); ok { + apiObject.CopyTags = aws.Bool(v) } - if v, ok := m["create_interval"].(int); ok { - policyDetails.CreateInterval = aws.Int32(int32(v)) + if v, ok := tfMap["create_interval"].(int); ok { + apiObject.CreateInterval = aws.Int32(int32(v)) } - if v, ok := m["exclusions"].([]any); ok && len(v) > 0 { - policyDetails.Exclusions = expandExclusions(v) + if v, ok := tfMap["exclusions"].([]any); ok && len(v) > 0 { + apiObject.Exclusions = expandExclusions(v) } - if v, ok := m["extend_deletion"].(bool); ok { - policyDetails.ExtendDeletion = aws.Bool(v) + if v, ok := tfMap["extend_deletion"].(bool); ok { + apiObject.ExtendDeletion = aws.Bool(v) } - if v, ok := m[names.AttrResourceType].(string); ok { - policyDetails.ResourceType = awstypes.ResourceTypeValues(v) + if v, ok := tfMap[names.AttrResourceType].(string); ok { + apiObject.ResourceType = awstypes.ResourceTypeValues(v) } - if v, ok := m["retain_interval"].(int); ok { - policyDetails.RetainInterval = aws.Int32(int32(v)) + if v, ok := tfMap["retain_interval"].(int); ok { + apiObject.RetainInterval = aws.Int32(int32(v)) } } - if v, ok := m["policy_language"].(string); ok { - policyDetails.PolicyLanguage = awstypes.PolicyLanguageValues(v) + + if v, ok := tfMap[names.AttrAction].([]any); ok && len(v) > 0 { + apiObject.Actions = expandActions(v) } - if v, ok := m["resource_types"].([]any); ok && len(v) > 0 { - policyDetails.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) + if v, ok := tfMap["event_source"].([]any); ok && len(v) > 0 { + apiObject.EventSource = expandEventSource(v) } - if v, ok := m["resource_locations"].([]any); ok && len(v) > 0 { - policyDetails.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) + if v, ok := tfMap[names.AttrParameters].([]any); ok && len(v) > 0 { + apiObject.Parameters = expandParameters(v, policyType) } - if v, ok := m[names.AttrSchedule].([]any); ok && len(v) > 0 { - policyDetails.Schedules = expandSchedules(v) + if v, ok := tfMap["policy_language"].(string); ok { + apiObject.PolicyLanguage = awstypes.PolicyLanguageValues(v) } - if v, ok := m[names.AttrAction].([]any); ok && len(v) > 0 { - policyDetails.Actions = expandActions(v) + if v, ok := tfMap["resource_types"].([]any); ok && len(v) > 0 { + apiObject.ResourceTypes = flex.ExpandStringyValueList[awstypes.ResourceTypeValues](v) } - if v, ok := m["event_source"].([]any); ok && len(v) > 0 { - policyDetails.EventSource = expandEventSource(v) + if v, ok := tfMap["resource_locations"].([]any); ok && len(v) > 0 { + apiObject.ResourceLocations = flex.ExpandStringyValueList[awstypes.ResourceLocationValues](v) } - if v, ok := m["target_tags"].(map[string]any); ok && len(v) > 0 { - policyDetails.TargetTags = expandTags(v) + if v, ok := tfMap[names.AttrSchedule].([]any); ok && len(v) > 0 { + apiObject.Schedules = expandSchedules(v) } - if v, ok := m[names.AttrParameters].([]any); ok && len(v) > 0 { - policyDetails.Parameters = expandParameters(v, policyType) + if v, ok := tfMap["target_tags"].(map[string]any); ok && len(v) > 0 { + apiObject.TargetTags = expandTags(v) } - return policyDetails + return apiObject } -func flattenPolicyDetails(policyDetails *awstypes.PolicyDetails) []map[string]any { - result := make(map[string]any) - result["resource_types"] = flex.FlattenStringyValueList(policyDetails.ResourceTypes) - result["resource_locations"] = flex.FlattenStringyValueList(policyDetails.ResourceLocations) - result[names.AttrAction] = flattenActions(policyDetails.Actions) - result["event_source"] = flattenEventSource(policyDetails.EventSource) - result["exclusions"] = flattenExclusions(policyDetails.Exclusions) - result[names.AttrSchedule] = flattenSchedules(policyDetails.Schedules) - result["target_tags"] = flattenTags(policyDetails.TargetTags) - result["policy_type"] = string(policyDetails.PolicyType) - result["policy_language"] = string(policyDetails.PolicyLanguage) - result["create_interval"] = aws.ToInt32(policyDetails.CreateInterval) - result["retain_interval"] = aws.ToInt32(policyDetails.RetainInterval) - result["copy_tags"] = aws.ToBool(policyDetails.CopyTags) - result["extend_deletion"] = aws.ToBool(policyDetails.ExtendDeletion) - result[names.AttrResourceType] = string(policyDetails.ResourceType) - - if policyDetails.Parameters != nil { - result[names.AttrParameters] = flattenParameters(policyDetails.Parameters) - } - - return []map[string]any{result} +func flattenPolicyDetails(apiObject *awstypes.PolicyDetails) []any { + tfMap := make(map[string]any) + tfMap[names.AttrAction] = flattenActions(apiObject.Actions) + tfMap["copy_tags"] = aws.ToBool(apiObject.CopyTags) + tfMap["create_interval"] = aws.ToInt32(apiObject.CreateInterval) + tfMap["event_source"] = flattenEventSource(apiObject.EventSource) + tfMap["exclusions"] = flattenExclusions(apiObject.Exclusions) + tfMap["extend_deletion"] = aws.ToBool(apiObject.ExtendDeletion) + if apiObject.Parameters != nil { + tfMap[names.AttrParameters] = flattenParameters(apiObject.Parameters) + } + tfMap["policy_language"] = apiObject.PolicyLanguage + tfMap["policy_type"] = apiObject.PolicyType + tfMap[names.AttrResourceType] = apiObject.ResourceType + tfMap["resource_types"] = apiObject.ResourceTypes + tfMap["resource_locations"] = apiObject.ResourceLocations + tfMap["retain_interval"] = aws.ToInt32(apiObject.RetainInterval) + tfMap[names.AttrSchedule] = flattenSchedules(apiObject.Schedules) + tfMap["target_tags"] = flattenTags(apiObject.TargetTags) + + return []any{tfMap} } -func expandSchedules(cfg []any) []awstypes.Schedule { - schedules := make([]awstypes.Schedule, len(cfg)) - for i, c := range cfg { - schedule := awstypes.Schedule{} - m := c.(map[string]any) - if v, ok := m["archive_rule"].([]any); ok && len(v) > 0 { - schedule.ArchiveRule = expandArchiveRule(v) +func expandSchedules(tfList []any) []awstypes.Schedule { + apiObjects := make([]awstypes.Schedule, len(tfList)) + + for i, tfMapRaw := range tfList { + apiObject := awstypes.Schedule{} + tfMap := tfMapRaw.(map[string]any) + + if v, ok := tfMap["archive_rule"].([]any); ok && len(v) > 0 { + apiObject.ArchiveRule = expandArchiveRule(v) } - if v, ok := m["copy_tags"]; ok { - schedule.CopyTags = aws.Bool(v.(bool)) + if v, ok := tfMap["copy_tags"]; ok { + apiObject.CopyTags = aws.Bool(v.(bool)) } - if v, ok := m["create_rule"]; ok { - schedule.CreateRule = expandCreateRule(v.([]any)) + if v, ok := tfMap["create_rule"]; ok { + apiObject.CreateRule = expandCreateRule(v.([]any)) } - if v, ok := m["cross_region_copy_rule"].(*schema.Set); ok && v.Len() > 0 { - schedule.CrossRegionCopyRules = expandCrossRegionCopyRules(v.List()) + if v, ok := tfMap["cross_region_copy_rule"].(*schema.Set); ok && v.Len() > 0 { + apiObject.CrossRegionCopyRules = expandCrossRegionCopyRules(v.List()) } - if v, ok := m[names.AttrName]; ok { - schedule.Name = aws.String(v.(string)) + if v, ok := tfMap["deprecate_rule"]; ok { + apiObject.DeprecateRule = expandDeprecateRule(v.([]any)) } - if v, ok := m["deprecate_rule"]; ok { - schedule.DeprecateRule = expandDeprecateRule(v.([]any)) + if v, ok := tfMap["fast_restore_rule"]; ok { + apiObject.FastRestoreRule = expandFastRestoreRule(v.([]any)) } - if v, ok := m["fast_restore_rule"]; ok { - schedule.FastRestoreRule = expandFastRestoreRule(v.([]any)) + if v, ok := tfMap[names.AttrName]; ok { + apiObject.Name = aws.String(v.(string)) } - if v, ok := m["share_rule"]; ok { - schedule.ShareRules = expandShareRule(v.([]any)) + if v, ok := tfMap["retain_rule"]; ok { + apiObject.RetainRule = expandRetainRule(v.([]any)) } - if v, ok := m["retain_rule"]; ok { - schedule.RetainRule = expandRetainRule(v.([]any)) + if v, ok := tfMap["share_rule"]; ok { + apiObject.ShareRules = expandShareRule(v.([]any)) } - if v, ok := m["tags_to_add"]; ok { - schedule.TagsToAdd = expandTags(v.(map[string]any)) + if v, ok := tfMap["tags_to_add"]; ok { + apiObject.TagsToAdd = expandTags(v.(map[string]any)) } - if v, ok := m["variable_tags"]; ok { - schedule.VariableTags = expandTags(v.(map[string]any)) + if v, ok := tfMap["variable_tags"]; ok { + apiObject.VariableTags = expandTags(v.(map[string]any)) } - schedules[i] = schedule + apiObjects[i] = apiObject } - return schedules + return apiObjects } -func flattenSchedules(schedules []awstypes.Schedule) []map[string]any { - result := make([]map[string]any, len(schedules)) - for i, s := range schedules { - m := make(map[string]any) - m["archive_rule"] = flattenArchiveRule(s.ArchiveRule) - m["copy_tags"] = aws.ToBool(s.CopyTags) - m["create_rule"] = flattenCreateRule(s.CreateRule) - m["cross_region_copy_rule"] = flattenCrossRegionCopyRules(s.CrossRegionCopyRules) - m[names.AttrName] = aws.ToString(s.Name) - m["retain_rule"] = flattenRetainRule(s.RetainRule) - m["tags_to_add"] = flattenTags(s.TagsToAdd) - m["variable_tags"] = flattenTags(s.VariableTags) - - if s.DeprecateRule != nil { - m["deprecate_rule"] = flattenDeprecateRule(s.DeprecateRule) +func flattenSchedules(apiObjects []awstypes.Schedule) []any { + tfList := make([]any, len(apiObjects)) + + for i, apiObject := range apiObjects { + tfMap := make(map[string]any) + tfMap["archive_rule"] = flattenArchiveRule(apiObject.ArchiveRule) + tfMap["copy_tags"] = aws.ToBool(apiObject.CopyTags) + tfMap["create_rule"] = flattenCreateRule(apiObject.CreateRule) + tfMap["cross_region_copy_rule"] = flattenCrossRegionCopyRules(apiObject.CrossRegionCopyRules) + if apiObject.DeprecateRule != nil { + tfMap["deprecate_rule"] = flattenDeprecateRule(apiObject.DeprecateRule) } - - if s.FastRestoreRule != nil { - m["fast_restore_rule"] = flattenFastRestoreRule(s.FastRestoreRule) + if apiObject.FastRestoreRule != nil { + tfMap["fast_restore_rule"] = flattenFastRestoreRule(apiObject.FastRestoreRule) } - - if s.ShareRules != nil { - m["share_rule"] = flattenShareRule(s.ShareRules) + tfMap[names.AttrName] = aws.ToString(apiObject.Name) + tfMap["retain_rule"] = flattenRetainRule(apiObject.RetainRule) + if apiObject.ShareRules != nil { + tfMap["share_rule"] = flattenShareRule(apiObject.ShareRules) } + tfMap["tags_to_add"] = flattenTags(apiObject.TagsToAdd) + tfMap["variable_tags"] = flattenTags(apiObject.VariableTags) - result[i] = m + tfList[i] = tfMap } - return result + return tfList } -func expandActions(cfg []any) []awstypes.Action { - actions := make([]awstypes.Action, len(cfg)) - for i, c := range cfg { - action := awstypes.Action{} - m := c.(map[string]any) - if v, ok := m["cross_region_copy"].(*schema.Set); ok { - action.CrossRegionCopy = expandActionCrossRegionCopyRules(v.List()) +func expandActions(tfList []any) []awstypes.Action { + apiObjects := make([]awstypes.Action, len(tfList)) + + for i, tfMapRaw := range tfList { + apiObject := awstypes.Action{} + tfMap := tfMapRaw.(map[string]any) + + if v, ok := tfMap["cross_region_copy"].(*schema.Set); ok { + apiObject.CrossRegionCopy = expandActionCrossRegionCopyRules(v.List()) } - if v, ok := m[names.AttrName]; ok { - action.Name = aws.String(v.(string)) + if v, ok := tfMap[names.AttrName]; ok { + apiObject.Name = aws.String(v.(string)) } - actions[i] = action + apiObjects[i] = apiObject } - return actions + return apiObjects } -func flattenActions(actions []awstypes.Action) []map[string]any { - result := make([]map[string]any, len(actions)) - for i, s := range actions { - m := make(map[string]any) - - m[names.AttrName] = aws.ToString(s.Name) +func flattenActions(apiObjects []awstypes.Action) []any { + tfList := make([]any, len(apiObjects)) - if s.CrossRegionCopy != nil { - m["cross_region_copy"] = flattenActionCrossRegionCopyRules(s.CrossRegionCopy) + for i, apiObject := range apiObjects { + tfMap := make(map[string]any) + if apiObject.CrossRegionCopy != nil { + tfMap["cross_region_copy"] = flattenActionCrossRegionCopyRules(apiObject.CrossRegionCopy) } + tfMap[names.AttrName] = aws.ToString(apiObject.Name) - result[i] = m + tfList[i] = tfMap } - return result + return tfList } -func expandActionCrossRegionCopyRules(l []any) []awstypes.CrossRegionCopyAction { - if len(l) == 0 || l[0] == nil { +func expandActionCrossRegionCopyRules(tfList []any) []awstypes.CrossRegionCopyAction { + if len(tfList) == 0 || tfList[0] == nil { return nil } - var rules []awstypes.CrossRegionCopyAction - - for _, tfMapRaw := range l { - m, ok := tfMapRaw.(map[string]any) + var apiObjects []awstypes.CrossRegionCopyAction + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]any) if !ok { continue } - rule := awstypes.CrossRegionCopyAction{} - if v, ok := m[names.AttrEncryptionConfiguration].([]any); ok { - rule.EncryptionConfiguration = expandActionCrossRegionCopyRuleEncryptionConfiguration(v) + apiObject := awstypes.CrossRegionCopyAction{} + if v, ok := tfMap[names.AttrEncryptionConfiguration].([]any); ok { + apiObject.EncryptionConfiguration = expandActionCrossRegionCopyRuleEncryptionConfiguration(v) } - if v, ok := m["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { - rule.RetainRule = expandCrossRegionCopyRuleRetainRule(v) + if v, ok := tfMap["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.RetainRule = expandCrossRegionCopyRuleRetainRule(v) } - if v, ok := m[names.AttrTarget].(string); ok && v != "" { - rule.Target = aws.String(v) + if v, ok := tfMap[names.AttrTarget].(string); ok && v != "" { + apiObject.Target = aws.String(v) } - rules = append(rules, rule) + apiObjects = append(apiObjects, apiObject) } - return rules + return apiObjects } -func flattenActionCrossRegionCopyRules(rules []awstypes.CrossRegionCopyAction) []any { - if len(rules) == 0 { +func flattenActionCrossRegionCopyRules(apiObjects []awstypes.CrossRegionCopyAction) []any { + if len(apiObjects) == 0 { return []any{} } - var result []any + var tfList []any - for _, rule := range rules { - m := map[string]any{ - names.AttrEncryptionConfiguration: flattenActionCrossRegionCopyRuleEncryptionConfiguration(rule.EncryptionConfiguration), - "retain_rule": flattenCrossRegionCopyRuleRetainRule(rule.RetainRule), - names.AttrTarget: aws.ToString(rule.Target), + for _, apiObject := range apiObjects { + tfMap := map[string]any{ + names.AttrEncryptionConfiguration: flattenActionCrossRegionCopyRuleEncryptionConfiguration(apiObject.EncryptionConfiguration), + "retain_rule": flattenCrossRegionCopyRuleRetainRule(apiObject.RetainRule), + names.AttrTarget: aws.ToString(apiObject.Target), } - result = append(result, m) + tfList = append(tfList, tfMap) } - return result + return tfList } -func expandActionCrossRegionCopyRuleEncryptionConfiguration(l []any) *awstypes.EncryptionConfiguration { - if len(l) == 0 || l[0] == nil { +func expandActionCrossRegionCopyRuleEncryptionConfiguration(tfList []any) *awstypes.EncryptionConfiguration { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) - config := &awstypes.EncryptionConfiguration{ - Encrypted: aws.Bool(m[names.AttrEncrypted].(bool)), + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.EncryptionConfiguration{ + Encrypted: aws.Bool(tfMap[names.AttrEncrypted].(bool)), } - if v, ok := m["cmk_arn"].(string); ok && v != "" { - config.CmkArn = aws.String(v) + if v, ok := tfMap["cmk_arn"].(string); ok && v != "" { + apiObject.CmkArn = aws.String(v) } - return config + + return apiObject } -func flattenActionCrossRegionCopyRuleEncryptionConfiguration(rule *awstypes.EncryptionConfiguration) []any { - if rule == nil { +func flattenActionCrossRegionCopyRuleEncryptionConfiguration(apiObject *awstypes.EncryptionConfiguration) []any { + if apiObject == nil { return []any{} } - m := map[string]any{ - names.AttrEncrypted: aws.ToBool(rule.Encrypted), - "cmk_arn": aws.ToString(rule.CmkArn), + tfMap := map[string]any{ + "cmk_arn": aws.ToString(apiObject.CmkArn), + names.AttrEncrypted: aws.ToBool(apiObject.Encrypted), } - return []any{m} + return []any{tfMap} } -func expandEventSource(l []any) *awstypes.EventSource { - if len(l) == 0 || l[0] == nil { +func expandEventSource(tfList []any) *awstypes.EventSource { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) - config := &awstypes.EventSource{ - Type: awstypes.EventSourceValues(m[names.AttrType].(string)), + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.EventSource{ + Type: awstypes.EventSourceValues(tfMap[names.AttrType].(string)), } - if v, ok := m[names.AttrParameters].([]any); ok && len(v) > 0 { - config.Parameters = expandEventSourceParameters(v) + if v, ok := tfMap[names.AttrParameters].([]any); ok && len(v) > 0 { + apiObject.Parameters = expandEventSourceParameters(v) } - return config + return apiObject } -func flattenEventSource(rule *awstypes.EventSource) []any { - if rule == nil { +func flattenEventSource(apiObject *awstypes.EventSource) []any { + if apiObject == nil { return []any{} } - m := map[string]any{ - names.AttrParameters: flattenEventSourceParameters(rule.Parameters), - names.AttrType: string(rule.Type), + tfMap := map[string]any{ + names.AttrParameters: flattenEventSourceParameters(apiObject.Parameters), + names.AttrType: apiObject.Type, } - return []any{m} + return []any{tfMap} } -func expandEventSourceParameters(l []any) *awstypes.EventParameters { - if len(l) == 0 || l[0] == nil { +func expandEventSourceParameters(tfList []any) *awstypes.EventParameters { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) - config := &awstypes.EventParameters{ - DescriptionRegex: aws.String(m["description_regex"].(string)), - EventType: awstypes.EventTypeValues(m["event_type"].(string)), - SnapshotOwner: flex.ExpandStringValueSet(m["snapshot_owner"].(*schema.Set)), + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.EventParameters{ + DescriptionRegex: aws.String(tfMap["description_regex"].(string)), + EventType: awstypes.EventTypeValues(tfMap["event_type"].(string)), + SnapshotOwner: flex.ExpandStringValueSet(tfMap["snapshot_owner"].(*schema.Set)), } - return config + return apiObject } -func flattenEventSourceParameters(rule *awstypes.EventParameters) []any { - if rule == nil { +func flattenEventSourceParameters(apiObject *awstypes.EventParameters) []any { + if apiObject == nil { return []any{} } - m := map[string]any{ - "description_regex": aws.ToString(rule.DescriptionRegex), - "event_type": string(rule.EventType), - "snapshot_owner": flex.FlattenStringValueSet(rule.SnapshotOwner), + tfMap := map[string]any{ + "description_regex": aws.ToString(apiObject.DescriptionRegex), + "event_type": apiObject.EventType, + "snapshot_owner": apiObject.SnapshotOwner, } - return []any{m} + return []any{tfMap} } -func expandCrossRegionCopyRules(l []any) []awstypes.CrossRegionCopyRule { - if len(l) == 0 || l[0] == nil { +func expandCrossRegionCopyRules(tfList []any) []awstypes.CrossRegionCopyRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - var rules []awstypes.CrossRegionCopyRule - - for _, tfMapRaw := range l { - m, ok := tfMapRaw.(map[string]any) + var apiObjects []awstypes.CrossRegionCopyRule + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]any) if !ok { continue } - rule := awstypes.CrossRegionCopyRule{} + apiObject := awstypes.CrossRegionCopyRule{} - if v, ok := m["cmk_arn"].(string); ok && v != "" { - rule.CmkArn = aws.String(v) + if v, ok := tfMap["cmk_arn"].(string); ok && v != "" { + apiObject.CmkArn = aws.String(v) } - if v, ok := m["copy_tags"].(bool); ok { - rule.CopyTags = aws.Bool(v) + if v, ok := tfMap["copy_tags"].(bool); ok { + apiObject.CopyTags = aws.Bool(v) } - if v, ok := m["deprecate_rule"].([]any); ok && len(v) > 0 && v[0] != nil { - rule.DeprecateRule = expandCrossRegionCopyRuleDeprecateRule(v) + if v, ok := tfMap["deprecate_rule"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.DeprecateRule = expandCrossRegionCopyRuleDeprecateRule(v) } - if v, ok := m[names.AttrEncrypted].(bool); ok { - rule.Encrypted = aws.Bool(v) + if v, ok := tfMap[names.AttrEncrypted].(bool); ok { + apiObject.Encrypted = aws.Bool(v) } - if v, ok := m["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { - rule.RetainRule = expandCrossRegionCopyRuleRetainRule(v) + if v, ok := tfMap["retain_rule"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.RetainRule = expandCrossRegionCopyRuleRetainRule(v) } - if v, ok := m[names.AttrTarget].(string); ok && v != "" { - rule.Target = aws.String(v) + if v, ok := tfMap[names.AttrTarget].(string); ok && v != "" { + apiObject.Target = aws.String(v) } - rules = append(rules, rule) + apiObjects = append(apiObjects, apiObject) } - return rules + return apiObjects } -func flattenCrossRegionCopyRules(rules []awstypes.CrossRegionCopyRule) []any { - if len(rules) == 0 { +func flattenCrossRegionCopyRules(apiObjects []awstypes.CrossRegionCopyRule) []any { + if len(apiObjects) == 0 { return []any{} } - var result []any + var tfList []any - for _, rule := range rules { - m := map[string]any{ - "cmk_arn": aws.ToString(rule.CmkArn), - "copy_tags": aws.ToBool(rule.CopyTags), - "deprecate_rule": flattenCrossRegionCopyRuleDeprecateRule(rule.DeprecateRule), - names.AttrEncrypted: aws.ToBool(rule.Encrypted), - "retain_rule": flattenCrossRegionCopyRuleRetainRule(rule.RetainRule), - names.AttrTarget: aws.ToString(rule.Target), + for _, apiObject := range apiObjects { + tfMap := map[string]any{ + "cmk_arn": aws.ToString(apiObject.CmkArn), + "copy_tags": aws.ToBool(apiObject.CopyTags), + "deprecate_rule": flattenCrossRegionCopyRuleDeprecateRule(apiObject.DeprecateRule), + names.AttrEncrypted: aws.ToBool(apiObject.Encrypted), + "retain_rule": flattenCrossRegionCopyRuleRetainRule(apiObject.RetainRule), + names.AttrTarget: aws.ToString(apiObject.Target), } - result = append(result, m) + tfList = append(tfList, tfMap) } - return result + return tfList } -func expandCrossRegionCopyRuleDeprecateRule(l []any) *awstypes.CrossRegionCopyDeprecateRule { - if len(l) == 0 || l[0] == nil { +func expandCrossRegionCopyRuleDeprecateRule(tfList []any) *awstypes.CrossRegionCopyDeprecateRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) + tfMap := tfList[0].(map[string]any) return &awstypes.CrossRegionCopyDeprecateRule{ - Interval: aws.Int32(int32(m[names.AttrInterval].(int))), - IntervalUnit: awstypes.RetentionIntervalUnitValues(m["interval_unit"].(string)), + Interval: aws.Int32(int32(tfMap[names.AttrInterval].(int))), + IntervalUnit: awstypes.RetentionIntervalUnitValues(tfMap["interval_unit"].(string)), } } -func expandCrossRegionCopyRuleRetainRule(l []any) *awstypes.CrossRegionCopyRetainRule { - if len(l) == 0 || l[0] == nil { +func expandCrossRegionCopyRuleRetainRule(tfList []any) *awstypes.CrossRegionCopyRetainRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) + tfMap := tfList[0].(map[string]any) return &awstypes.CrossRegionCopyRetainRule{ - Interval: aws.Int32(int32(m[names.AttrInterval].(int))), - IntervalUnit: awstypes.RetentionIntervalUnitValues(m["interval_unit"].(string)), + Interval: aws.Int32(int32(tfMap[names.AttrInterval].(int))), + IntervalUnit: awstypes.RetentionIntervalUnitValues(tfMap["interval_unit"].(string)), } } -func flattenCrossRegionCopyRuleDeprecateRule(rule *awstypes.CrossRegionCopyDeprecateRule) []any { - if rule == nil { +func flattenCrossRegionCopyRuleDeprecateRule(apiObject *awstypes.CrossRegionCopyDeprecateRule) []any { + if apiObject == nil { return []any{} } - m := map[string]any{ - names.AttrInterval: int(aws.ToInt32(rule.Interval)), - "interval_unit": string(rule.IntervalUnit), + tfMap := map[string]any{ + names.AttrInterval: aws.ToInt32(apiObject.Interval), + "interval_unit": apiObject.IntervalUnit, } - return []any{m} + return []any{tfMap} } -func flattenCrossRegionCopyRuleRetainRule(rule *awstypes.CrossRegionCopyRetainRule) []any { - if rule == nil { +func flattenCrossRegionCopyRuleRetainRule(apiObject *awstypes.CrossRegionCopyRetainRule) []any { + if apiObject == nil { return []any{} } - m := map[string]any{ - names.AttrInterval: int(aws.ToInt32(rule.Interval)), - "interval_unit": string(rule.IntervalUnit), + tfMap := map[string]any{ + names.AttrInterval: aws.ToInt32(apiObject.Interval), + "interval_unit": apiObject.IntervalUnit, } - return []any{m} + return []any{tfMap} } -func expandCreateRule(cfg []any) *awstypes.CreateRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandCreateRule(tfList []any) *awstypes.CreateRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - c := cfg[0].(map[string]any) - createRule := &awstypes.CreateRule{} - - if v, ok := c["times"].([]any); ok && len(v) > 0 { - createRule.Times = flex.ExpandStringValueList(v) - } - if v, ok := c[names.AttrInterval].(int); ok && v > 0 { - createRule.Interval = aws.Int32(int32(v)) - } + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.CreateRule{} - if v, ok := c[names.AttrLocation].(string); ok && v != "" { - createRule.Location = awstypes.LocationValues(v) + if v, ok := tfMap[names.AttrInterval].(int); ok && v > 0 { + apiObject.Interval = aws.Int32(int32(v)) } - - if v, ok := c["interval_unit"].(string); ok && v != "" { - createRule.IntervalUnit = awstypes.IntervalUnitValues(v) + if v, ok := tfMap["interval_unit"].(string); ok && v != "" { + apiObject.IntervalUnit = awstypes.IntervalUnitValues(v) } else { - createRule.IntervalUnit = awstypes.IntervalUnitValuesHours + apiObject.IntervalUnit = awstypes.IntervalUnitValuesHours } - - if v, ok := c["cron_expression"].(string); ok && v != "" { - createRule.CronExpression = aws.String(v) - createRule.IntervalUnit = "" // sets interval unit to empty string so that all fields related to interval are ignored + if v, ok := tfMap[names.AttrLocation].(string); ok && v != "" { + apiObject.Location = awstypes.LocationValues(v) } - if v, ok := c["scripts"]; ok { - createRule.Scripts = expandScripts(v.([]any)) + if v, ok := tfMap["scripts"]; ok { + apiObject.Scripts = expandScripts(v.([]any)) } - return createRule -} - -func flattenCreateRule(createRule *awstypes.CreateRule) []map[string]any { - if createRule == nil { - return []map[string]any{} + if v, ok := tfMap["times"].([]any); ok && len(v) > 0 { + apiObject.Times = flex.ExpandStringValueList(v) } - result := make(map[string]any) - result["times"] = flex.FlattenStringValueList(createRule.Times) - - if createRule.Interval != nil { - result[names.AttrInterval] = aws.ToInt32(createRule.Interval) + if v, ok := tfMap["cron_expression"].(string); ok && v != "" { + apiObject.CronExpression = aws.String(v) + apiObject.IntervalUnit = "" // sets interval unit to empty string so that all fields related to interval are ignored } - result["interval_unit"] = string(createRule.IntervalUnit) - - result[names.AttrLocation] = string(createRule.Location) + return apiObject +} - if createRule.CronExpression != nil { - result["cron_expression"] = aws.ToString(createRule.CronExpression) +func flattenCreateRule(apiObject *awstypes.CreateRule) []any { + if apiObject == nil { + return []any{} } - if createRule.Scripts != nil { - result["scripts"] = flattenScripts(createRule.Scripts) + tfMap := make(map[string]any) + if apiObject.CronExpression != nil { + tfMap["cron_expression"] = aws.ToString(apiObject.CronExpression) + } + if apiObject.Interval != nil { + tfMap[names.AttrInterval] = aws.ToInt32(apiObject.Interval) } - return []map[string]any{result} + tfMap["interval_unit"] = apiObject.IntervalUnit + tfMap[names.AttrLocation] = apiObject.Location + if apiObject.Scripts != nil { + tfMap["scripts"] = flattenScripts(apiObject.Scripts) + } + tfMap["times"] = apiObject.Times + + return []any{tfMap} } -func expandRetainRule(cfg []any) *awstypes.RetainRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandRetainRule(tfList []any) *awstypes.RetainRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - rule := &awstypes.RetainRule{} - if v, ok := m["count"].(int); ok && v > 0 { - rule.Count = aws.Int32(int32(v)) - } + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.RetainRule{} - if v, ok := m[names.AttrInterval].(int); ok && v > 0 { - rule.Interval = aws.Int32(int32(v)) + if v, ok := tfMap["count"].(int); ok && v > 0 { + apiObject.Count = aws.Int32(int32(v)) } - - if v, ok := m["interval_unit"].(string); ok && v != "" { - rule.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) + if v, ok := tfMap[names.AttrInterval].(int); ok && v > 0 { + apiObject.Interval = aws.Int32(int32(v)) + } + if v, ok := tfMap["interval_unit"].(string); ok && v != "" { + apiObject.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) } - return rule + return apiObject } -func flattenRetainRule(retainRule *awstypes.RetainRule) []map[string]any { - result := make(map[string]any) - result["count"] = aws.ToInt32(retainRule.Count) - result["interval_unit"] = string(retainRule.IntervalUnit) - result[names.AttrInterval] = aws.ToInt32(retainRule.Interval) +func flattenRetainRule(apiObject *awstypes.RetainRule) []any { + tfMap := make(map[string]any) + tfMap["count"] = aws.ToInt32(apiObject.Count) + tfMap[names.AttrInterval] = aws.ToInt32(apiObject.Interval) + tfMap["interval_unit"] = apiObject.IntervalUnit - return []map[string]any{result} + return []any{tfMap} } -func expandDeprecateRule(cfg []any) *awstypes.DeprecateRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandDeprecateRule(tfList []any) *awstypes.DeprecateRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - rule := &awstypes.DeprecateRule{} - if v, ok := m["count"].(int); ok && v > 0 { - rule.Count = aws.Int32(int32(v)) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.DeprecateRule{} + + if v, ok := tfMap["count"].(int); ok && v > 0 { + apiObject.Count = aws.Int32(int32(v)) } - if v, ok := m[names.AttrInterval].(int); ok && v > 0 { - rule.Interval = aws.Int32(int32(v)) + if v, ok := tfMap[names.AttrInterval].(int); ok && v > 0 { + apiObject.Interval = aws.Int32(int32(v)) } - if v, ok := m["interval_unit"].(string); ok && v != "" { - rule.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) + if v, ok := tfMap["interval_unit"].(string); ok && v != "" { + apiObject.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) } - return rule + return apiObject } -func flattenDeprecateRule(rule *awstypes.DeprecateRule) []map[string]any { - result := make(map[string]any) - result["count"] = aws.ToInt32(rule.Count) - result["interval_unit"] = string(rule.IntervalUnit) - result[names.AttrInterval] = aws.ToInt32(rule.Interval) +func flattenDeprecateRule(apiObject *awstypes.DeprecateRule) []any { + tfMap := make(map[string]any) + tfMap["count"] = aws.ToInt32(apiObject.Count) + tfMap[names.AttrInterval] = aws.ToInt32(apiObject.Interval) + tfMap["interval_unit"] = apiObject.IntervalUnit - return []map[string]any{result} + return []any{tfMap} } -func expandFastRestoreRule(cfg []any) *awstypes.FastRestoreRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandFastRestoreRule(tfList []any) *awstypes.FastRestoreRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - rule := &awstypes.FastRestoreRule{ - AvailabilityZones: flex.ExpandStringValueSet(m[names.AttrAvailabilityZones].(*schema.Set)), + + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.FastRestoreRule{ + AvailabilityZones: flex.ExpandStringValueSet(tfMap[names.AttrAvailabilityZones].(*schema.Set)), } - if v, ok := m["count"].(int); ok && v > 0 { - rule.Count = aws.Int32(int32(v)) + if v, ok := tfMap["count"].(int); ok && v > 0 { + apiObject.Count = aws.Int32(int32(v)) } - if v, ok := m[names.AttrInterval].(int); ok && v > 0 { - rule.Interval = aws.Int32(int32(v)) + if v, ok := tfMap[names.AttrInterval].(int); ok && v > 0 { + apiObject.Interval = aws.Int32(int32(v)) } - if v, ok := m["interval_unit"].(string); ok && v != "" { - rule.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) + if v, ok := tfMap["interval_unit"].(string); ok && v != "" { + apiObject.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) } - return rule + return apiObject } -func flattenFastRestoreRule(rule *awstypes.FastRestoreRule) []map[string]any { - result := make(map[string]any) - result["count"] = aws.ToInt32(rule.Count) - result["interval_unit"] = string(rule.IntervalUnit) - result[names.AttrInterval] = aws.ToInt32(rule.Interval) - result[names.AttrAvailabilityZones] = flex.FlattenStringValueSet(rule.AvailabilityZones) +func flattenFastRestoreRule(apiObject *awstypes.FastRestoreRule) []any { + tfMap := make(map[string]any) + tfMap[names.AttrAvailabilityZones] = apiObject.AvailabilityZones + tfMap["count"] = aws.ToInt32(apiObject.Count) + tfMap[names.AttrInterval] = aws.ToInt32(apiObject.Interval) + tfMap["interval_unit"] = apiObject.IntervalUnit - return []map[string]any{result} + return []any{tfMap} } -func expandShareRule(cfg []any) []awstypes.ShareRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandShareRule(tfList []any) []awstypes.ShareRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - rules := make([]awstypes.ShareRule, 0) + apiObjects := make([]awstypes.ShareRule, 0) - for _, shareRule := range cfg { - m := shareRule.(map[string]any) + for _, tfMapRaw := range tfList { + tfMap := tfMapRaw.(map[string]any) - rule := awstypes.ShareRule{ - TargetAccounts: flex.ExpandStringValueSet(m["target_accounts"].(*schema.Set)), + apiObject := awstypes.ShareRule{ + TargetAccounts: flex.ExpandStringValueSet(tfMap["target_accounts"].(*schema.Set)), } - if v, ok := m["unshare_interval"].(int); ok && v > 0 { - rule.UnshareInterval = aws.Int32(int32(v)) + if v, ok := tfMap["unshare_interval"].(int); ok && v > 0 { + apiObject.UnshareInterval = aws.Int32(int32(v)) } - if v, ok := m["unshare_interval_unit"].(string); ok && v != "" { - rule.UnshareIntervalUnit = awstypes.RetentionIntervalUnitValues(v) + if v, ok := tfMap["unshare_interval_unit"].(string); ok && v != "" { + apiObject.UnshareIntervalUnit = awstypes.RetentionIntervalUnitValues(v) } - rules = append(rules, rule) + apiObjects = append(apiObjects, apiObject) } - return rules + return apiObjects } -func flattenShareRule(rules []awstypes.ShareRule) []map[string]any { - values := make([]map[string]any, 0) - - for _, v := range rules { - rule := make(map[string]any) +func flattenShareRule(apiObjects []awstypes.ShareRule) []any { + tfList := make([]any, 0) - if v.TargetAccounts != nil { - rule["target_accounts"] = flex.FlattenStringValueSet(v.TargetAccounts) + for _, apiObject := range apiObjects { + tfMap := make(map[string]any) + if apiObject.TargetAccounts != nil { + tfMap["target_accounts"] = apiObject.TargetAccounts } - - rule["unshare_interval_unit"] = string(v.UnshareIntervalUnit) - - if v.UnshareInterval != nil { - rule["unshare_interval"] = aws.ToInt32(v.UnshareInterval) + if apiObject.UnshareInterval != nil { + tfMap["unshare_interval"] = aws.ToInt32(apiObject.UnshareInterval) } + tfMap["unshare_interval_unit"] = apiObject.UnshareIntervalUnit - values = append(values, rule) + tfList = append(tfList, tfMap) } - return values + return tfList } -func expandTags(m map[string]any) []awstypes.Tag { - var result []awstypes.Tag - for k, v := range m { - result = append(result, awstypes.Tag{ +func expandTags(tfMap map[string]any) []awstypes.Tag { + var apiObjects []awstypes.Tag + + for k, v := range tfMap { + apiObjects = append(apiObjects, awstypes.Tag{ Key: aws.String(k), Value: aws.String(v.(string)), }) } - return result + return apiObjects } -func flattenTags(tags []awstypes.Tag) map[string]string { - result := make(map[string]string) - for _, t := range tags { - result[aws.ToString(t.Key)] = aws.ToString(t.Value) +func flattenTags(apiObjects []awstypes.Tag) map[string]string { + tfMap := make(map[string]string) + + for _, apiObject := range apiObjects { + tfMap[aws.ToString(apiObject.Key)] = aws.ToString(apiObject.Value) } - return result + return tfMap } -func expandParameters(cfg []any, policyType string) *awstypes.Parameters { - if len(cfg) == 0 || cfg[0] == nil { +func expandParameters(tfList []any, policyType awstypes.PolicyTypeValues) *awstypes.Parameters { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - parameters := &awstypes.Parameters{} - if v, ok := m["exclude_boot_volume"].(bool); ok && policyType == string(awstypes.PolicyTypeValuesEbsSnapshotManagement) { - parameters.ExcludeBootVolume = aws.Bool(v) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.Parameters{} + + if v, ok := tfMap["exclude_boot_volume"].(bool); ok && policyType == awstypes.PolicyTypeValuesEbsSnapshotManagement { + apiObject.ExcludeBootVolume = aws.Bool(v) } - if v, ok := m["no_reboot"].(bool); ok && policyType == string(awstypes.PolicyTypeValuesImageManagement) { - parameters.NoReboot = aws.Bool(v) + if v, ok := tfMap["no_reboot"].(bool); ok && policyType == awstypes.PolicyTypeValuesImageManagement { + apiObject.NoReboot = aws.Bool(v) } - return parameters + return apiObject } -func flattenParameters(parameters *awstypes.Parameters) []map[string]any { - result := make(map[string]any) - if parameters.ExcludeBootVolume != nil { - result["exclude_boot_volume"] = aws.ToBool(parameters.ExcludeBootVolume) +func flattenParameters(apiObject *awstypes.Parameters) []any { + tfMap := make(map[string]any) + if apiObject.ExcludeBootVolume != nil { + tfMap["exclude_boot_volume"] = aws.ToBool(apiObject.ExcludeBootVolume) } - - if parameters.NoReboot != nil { - result["no_reboot"] = aws.ToBool(parameters.NoReboot) + if apiObject.NoReboot != nil { + tfMap["no_reboot"] = aws.ToBool(apiObject.NoReboot) } - return []map[string]any{result} + return []any{tfMap} } -func expandScripts(cfg []any) []awstypes.Script { - scripts := make([]awstypes.Script, len(cfg)) - for i, c := range cfg { - m := c.(map[string]any) - script := awstypes.Script{} - if v, ok := m["execute_operation_on_script_failure"].(bool); ok { - script.ExecuteOperationOnScriptFailure = aws.Bool(v) +func expandScripts(tfList []any) []awstypes.Script { + apiObjects := make([]awstypes.Script, len(tfList)) + + for i, tfMapRaw := range tfList { + tfMap := tfMapRaw.(map[string]any) + apiObject := awstypes.Script{} + + if v, ok := tfMap["execute_operation_on_script_failure"].(bool); ok { + apiObject.ExecuteOperationOnScriptFailure = aws.Bool(v) } - if v, ok := m["execution_handler"].(string); ok { - script.ExecutionHandler = aws.String(v) + if v, ok := tfMap["execution_handler"].(string); ok { + apiObject.ExecutionHandler = aws.String(v) } - if v, ok := m["execution_handler_service"].(string); ok && v != "" { - script.ExecutionHandlerService = awstypes.ExecutionHandlerServiceValues(v) + if v, ok := tfMap["execution_handler_service"].(string); ok && v != "" { + apiObject.ExecutionHandlerService = awstypes.ExecutionHandlerServiceValues(v) } - if v, ok := m["execution_timeout"].(int); ok && v > 0 { - script.ExecutionTimeout = aws.Int32(int32(v)) + if v, ok := tfMap["execution_timeout"].(int); ok && v > 0 { + apiObject.ExecutionTimeout = aws.Int32(int32(v)) } - if v, ok := m["maximum_retry_count"].(int); ok && v > 0 { - script.MaximumRetryCount = aws.Int32(int32(v)) + if v, ok := tfMap["maximum_retry_count"].(int); ok && v > 0 { + apiObject.MaximumRetryCount = aws.Int32(int32(v)) } - if v, ok := m["stages"].([]any); ok && len(v) > 0 { - script.Stages = flex.ExpandStringyValueList[awstypes.StageValues](v) + if v, ok := tfMap["stages"].([]any); ok && len(v) > 0 { + apiObject.Stages = flex.ExpandStringyValueList[awstypes.StageValues](v) } - scripts[i] = script + + apiObjects[i] = apiObject } - return scripts + return apiObjects } -func flattenScripts(scripts []awstypes.Script) []map[string]any { - result := make([]map[string]any, len(scripts)) - for i, s := range scripts { - m := make(map[string]any) - m["execute_operation_on_script_failure"] = aws.ToBool(s.ExecuteOperationOnScriptFailure) - m["execution_handler"] = aws.ToString(s.ExecutionHandler) - m["execution_handler_service"] = string(s.ExecutionHandlerService) - m["execution_timeout"] = aws.ToInt32(s.ExecutionTimeout) - m["maximum_retry_count"] = aws.ToInt32(s.MaximumRetryCount) - m["stages"] = flex.FlattenStringyValueList(s.Stages) +func flattenScripts(apiObjects []awstypes.Script) []any { + tfList := make([]any, len(apiObjects)) - result[i] = m + for i, apiObject := range apiObjects { + tfMap := make(map[string]any) + tfMap["execute_operation_on_script_failure"] = aws.ToBool(apiObject.ExecuteOperationOnScriptFailure) + tfMap["execution_handler"] = aws.ToString(apiObject.ExecutionHandler) + tfMap["execution_handler_service"] = apiObject.ExecutionHandlerService + tfMap["execution_timeout"] = aws.ToInt32(apiObject.ExecutionTimeout) + tfMap["maximum_retry_count"] = aws.ToInt32(apiObject.MaximumRetryCount) + tfMap["stages"] = apiObject.Stages + + tfList[i] = tfMap } - return result + return tfList } -func expandArchiveRule(v []any) *awstypes.ArchiveRule { - if len(v) == 0 || v[0] == nil { +func expandArchiveRule(tfList []any) *awstypes.ArchiveRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := v[0].(map[string]any) + + tfMap := tfList[0].(map[string]any) + return &awstypes.ArchiveRule{ - RetainRule: expandArchiveRetainRule(m["archive_retain_rule"].([]any)), + RetainRule: expandArchiveRetainRule(tfMap["archive_retain_rule"].([]any)), } } -func flattenArchiveRule(rule *awstypes.ArchiveRule) []map[string]any { - if rule == nil { - return []map[string]any{} +func flattenArchiveRule(apiObject *awstypes.ArchiveRule) []any { + if apiObject == nil { + return []any{} } - result := make(map[string]any) - result["archive_retain_rule"] = flattenArchiveRetainRule(rule.RetainRule) + tfMap := make(map[string]any) + tfMap["archive_retain_rule"] = flattenArchiveRetainRule(apiObject.RetainRule) - return []map[string]any{result} + return []any{tfMap} } -func expandArchiveRetainRule(cfg []any) *awstypes.ArchiveRetainRule { - if len(cfg) == 0 || cfg[0] == nil { +func expandArchiveRetainRule(tfList []any) *awstypes.ArchiveRetainRule { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) + + tfMap := tfList[0].(map[string]any) + return &awstypes.ArchiveRetainRule{ - RetentionArchiveTier: expandRetentionArchiveTier(m["retention_archive_tier"].([]any)), + RetentionArchiveTier: expandRetentionArchiveTier(tfMap["retention_archive_tier"].([]any)), } } -func flattenArchiveRetainRule(rule *awstypes.ArchiveRetainRule) []map[string]any { - if rule == nil { - return []map[string]any{} +func flattenArchiveRetainRule(apiObject *awstypes.ArchiveRetainRule) []any { + if apiObject == nil { + return []any{} } - result := make(map[string]any) - result["retention_archive_tier"] = flattenRetentionArchiveTier(rule.RetentionArchiveTier) + tfMap := make(map[string]any) + tfMap["retention_archive_tier"] = flattenRetentionArchiveTier(apiObject.RetentionArchiveTier) - return []map[string]any{result} + return []any{tfMap} } -func expandRetentionArchiveTier(cfg []any) *awstypes.RetentionArchiveTier { - if len(cfg) == 0 || cfg[0] == nil { +func expandRetentionArchiveTier(tfList []any) *awstypes.RetentionArchiveTier { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - retention_archive_tier := &awstypes.RetentionArchiveTier{} - if v, ok := m["count"].(int); ok && v > 0 { - retention_archive_tier.Count = aws.Int32(int32(v)) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.RetentionArchiveTier{} + + if v, ok := tfMap["count"].(int); ok && v > 0 { + apiObject.Count = aws.Int32(int32(v)) } - if v, ok := m[names.AttrInterval].(int); ok && v > 0 { - retention_archive_tier.Interval = aws.Int32(int32(v)) + if v, ok := tfMap[names.AttrInterval].(int); ok && v > 0 { + apiObject.Interval = aws.Int32(int32(v)) } - if v, ok := m["interval_unit"].(string); ok && v != "" { - retention_archive_tier.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) + if v, ok := tfMap["interval_unit"].(string); ok && v != "" { + apiObject.IntervalUnit = awstypes.RetentionIntervalUnitValues(v) } - return retention_archive_tier + return apiObject } -func flattenRetentionArchiveTier(tier *awstypes.RetentionArchiveTier) []map[string]any { - if tier == nil { - return []map[string]any{} +func flattenRetentionArchiveTier(apiObject *awstypes.RetentionArchiveTier) []any { + if apiObject == nil { + return []any{} } - result := make(map[string]any) - result["count"] = aws.ToInt32(tier.Count) - result[names.AttrInterval] = aws.ToInt32(tier.Interval) - result["interval_unit"] = string(tier.IntervalUnit) + tfMap := make(map[string]any) + tfMap["count"] = aws.ToInt32(apiObject.Count) + tfMap[names.AttrInterval] = aws.ToInt32(apiObject.Interval) + tfMap["interval_unit"] = apiObject.IntervalUnit - return []map[string]any{result} + return []any{tfMap} } -func expandExclusions(cfg []any) *awstypes.Exclusions { - if len(cfg) == 0 || cfg[0] == nil { +func expandExclusions(tfList []any) *awstypes.Exclusions { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := cfg[0].(map[string]any) - exclusions := &awstypes.Exclusions{} - if v, ok := m["exclude_boot_volumes"].(bool); ok { - exclusions.ExcludeBootVolumes = aws.Bool(v) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.Exclusions{} + + if v, ok := tfMap["exclude_boot_volumes"].(bool); ok { + apiObject.ExcludeBootVolumes = aws.Bool(v) } - if v, ok := m["exclude_tags"].(map[string]any); ok { - exclusions.ExcludeTags = expandTags(v) + if v, ok := tfMap["exclude_tags"].(map[string]any); ok { + apiObject.ExcludeTags = expandTags(v) } - if v, ok := m["exclude_volume_types"].([]any); ok && len(v) > 0 { - exclusions.ExcludeVolumeTypes = flex.ExpandStringValueList(v) + if v, ok := tfMap["exclude_volume_types"].([]any); ok && len(v) > 0 { + apiObject.ExcludeVolumeTypes = flex.ExpandStringValueList(v) } - return exclusions + return apiObject } -func flattenExclusions(exclusions *awstypes.Exclusions) []map[string]any { - if exclusions == nil { - return []map[string]any{} +func flattenExclusions(apiObject *awstypes.Exclusions) []any { + if apiObject == nil { + return []any{} } - result := make(map[string]any) - result["exclude_boot_volumes"] = aws.ToBool(exclusions.ExcludeBootVolumes) - result["exclude_tags"] = flattenTags(exclusions.ExcludeTags) - result["exclude_volume_types"] = flex.FlattenStringValueList(exclusions.ExcludeVolumeTypes) + tfMap := make(map[string]any) + tfMap["exclude_boot_volumes"] = aws.ToBool(apiObject.ExcludeBootVolumes) + tfMap["exclude_tags"] = flattenTags(apiObject.ExcludeTags) + tfMap["exclude_volume_types"] = apiObject.ExcludeVolumeTypes - return []map[string]any{result} + return []any{tfMap} } From bc6d1bac6740186eea5d8435b8dcfcf0f343b0e7 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 23:19:28 +0900 Subject: [PATCH 0935/2115] Update the changelog to add description on `client_cidr_block` --- .changelog/44059.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.changelog/44059.txt b/.changelog/44059.txt index 6ac65e2c338a..70f81686af99 100644 --- a/.changelog/44059.txt +++ b/.changelog/44059.txt @@ -2,6 +2,10 @@ resource/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` arguments to support IPv6 connectivity in Client VPN ``` +```release-note:enhancement +resource/aws_ec2_client_vpn_endpoint: Make `client_cidr_block` optional +``` + ```release-note:enhancement data-source/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` attributes ``` From 7f9945c96478d844a34c8590fda3a42f9eba8969 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 28 Aug 2025 23:24:50 +0900 Subject: [PATCH 0936/2115] Update `client_alias` argument description to require exactly one alias --- website/docs/r/ecs_service.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 3f8b8298073e..f53d2975a845 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -342,7 +342,7 @@ For more information, see [Task Networking](https://docs.aws.amazon.com/AmazonEC `service` supports the following: -* `client_alias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. The maximum number of client aliases that you can have in this list is 1. [See below](#client_alias). +* `client_alias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. For each service block where enabled is true, exactly one `client_alias` with one `port` should be specified. [See below](#client_alias). * `discovery_name` - (Optional) Name of the new AWS Cloud Map service that Amazon ECS creates for this Amazon ECS service. * `ingress_port_override` - (Optional) Port number for the Service Connect proxy to listen on. * `port_name` - (Required) Name of one of the `portMappings` from all the containers in the task definition of this Amazon ECS service. From 289b4ed88f23b571cd51a755242fb338c8ce4660 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 11:09:28 -0400 Subject: [PATCH 0937/2115] Fix terrafmt errors. --- internal/service/dlm/lifecycle_policy_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index c4502ad2aaab..d22ef6b0b95a 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -1563,7 +1563,7 @@ resource "aws_dlm_lifecycle_policy" "test" { execution_role_arn = aws_iam_role.test.arn policy_details { - policy_type = "IMAGE_MANAGEMENT" + policy_type = "IMAGE_MANAGEMENT" resource_types = ["INSTANCE"] schedule { @@ -1579,7 +1579,7 @@ resource "aws_dlm_lifecycle_policy" "test" { cross_region_copy_rule { target_region = %[2]q - encrypted = false + encrypted = false retain_rule { interval = 15 interval_unit = "DAYS" From ce6455de5ef488628c57b7a22a94644e644604ff Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 28 Aug 2025 15:16:59 +0000 Subject: [PATCH 0938/2115] Update CHANGELOG.md for #43910 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ab7acf70a0..bd388d124504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,12 +18,19 @@ FEATURES: ENHANCEMENTS: +* data-source/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` attributes ([#44059](https://github.com/hashicorp/terraform-provider-aws/issues/44059)) * data-source/aws_network_interface: Add `attachment.network_card_index` attribute ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * data-source/aws_sesv2_email_identity: Add `verification_status` attribute ([#44045](https://github.com/hashicorp/terraform-provider-aws/issues/44045)) * data-source/aws_signer_signing_profile: Add `signing_material` and `signing_parameters` attributes ([#43921](https://github.com/hashicorp/terraform-provider-aws/issues/43921)) * data-source/aws_vpc_ipam: Add `metered_account` attribute ([#43967](https://github.com/hashicorp/terraform-provider-aws/issues/43967)) * resource/aws_datazone_domain: Add `domain_version` and `service_role` arguments to support V2 domains ([#44042](https://github.com/hashicorp/terraform-provider-aws/issues/44042)) +* resource/aws_dlm_lifecycle_policy: Add `copy_tags`, `create_interval`, `exclusions`, `extend_deletion`, `policy_language`, `resource_type` and `retain_interval` attributes to `policy_details` configuration block ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) +* resource/aws_dlm_lifecycle_policy: Add `default_policy` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) +* resource/aws_dlm_lifecycle_policy: Add `policy_details.create_rule.scripts` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) +* resource/aws_dlm_lifecycle_policy:Add `policy_details.schedule.archive_rule` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) * resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) +* resource/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` arguments to support IPv6 connectivity in Client VPN ([#44059](https://github.com/hashicorp/terraform-provider-aws/issues/44059)) +* resource/aws_ec2_client_vpn_endpoint: Make `client_cidr_block` optional ([#44059](https://github.com/hashicorp/terraform-provider-aws/issues/44059)) * resource/aws_ecr_lifecycle_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_ecr_repository: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) * resource/aws_ecr_repository_policy: Add resource identity support ([#44041](https://github.com/hashicorp/terraform-provider-aws/issues/44041)) @@ -43,6 +50,7 @@ ENHANCEMENTS: * resource/aws_network_interface_attachment: Add `network_card_index` argument ([#42188](https://github.com/hashicorp/terraform-provider-aws/issues/42188)) * resource/aws_route53_resolver_rule: Add resource identity support ([#44048](https://github.com/hashicorp/terraform-provider-aws/issues/44048)) * resource/aws_route53_resolver_rule_association: Add resource identity support ([#44048](https://github.com/hashicorp/terraform-provider-aws/issues/44048)) +* resource/aws_route: Add resource identity support ([#43910](https://github.com/hashicorp/terraform-provider-aws/issues/43910)) * resource/aws_route_table: Add resource identity support ([#43990](https://github.com/hashicorp/terraform-provider-aws/issues/43990)) * resource/aws_s3_bucket_acl: Add resource identity support ([#44043](https://github.com/hashicorp/terraform-provider-aws/issues/44043)) * resource/aws_s3_bucket_cors_configuration: Add resource identity support ([#43976](https://github.com/hashicorp/terraform-provider-aws/issues/43976)) From f1ad8bc4c0aba5f02e79adb5d5a306be4216a8e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 11:24:18 -0400 Subject: [PATCH 0939/2115] Fix terrafmt errors. --- internal/service/dlm/lifecycle_policy_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index d22ef6b0b95a..d607de0527d5 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -1578,8 +1578,8 @@ resource "aws_dlm_lifecycle_policy" "test" { } cross_region_copy_rule { - target_region = %[2]q - encrypted = false + target_region = %[2]q + encrypted = false retain_rule { interval = 15 interval_unit = "DAYS" From c0ac3d3be3efffdeca59286e8014336337862824 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 11:56:16 -0400 Subject: [PATCH 0940/2115] Run 'make fix-constants PKG=dlm'. --- internal/service/dlm/lifecycle_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index d607de0527d5..3446857a1306 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -678,7 +678,7 @@ func TestAccDLMLifecyclePolicy_crossRegionCopyRuleImageManagement(t *testing.T) checkLifecyclePolicyExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "policy_details.0.policy_type", "IMAGE_MANAGEMENT"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.#", "1"), - resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.encrypted", "false"), + resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.encrypted", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.retain_rule.0.interval", "15"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.retain_rule.0.interval_unit", "DAYS"), resource.TestCheckResourceAttr(resourceName, "policy_details.0.schedule.0.cross_region_copy_rule.0.target_region", acctest.AlternateRegion()), From f45aaa60ccc396307913af5ef5b4027c32d15c33 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 12:01:42 -0400 Subject: [PATCH 0941/2115] Prepare for v6.11.0 release. --- CHANGELOG.md | 2 +- version/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd388d124504..d3faa1b9c5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 6.11.0 (Unreleased) +## 6.11.0 (August 28, 2025) FEATURES: diff --git a/version/VERSION b/version/VERSION index 83c2b6325bd0..ceda194c2432 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.10.1 \ No newline at end of file +6.11.0 \ No newline at end of file From a212011a43f308b00418049630eed9bb9521d4d9 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 28 Aug 2025 16:40:35 +0000 Subject: [PATCH 0942/2115] Update CHANGELOG.md for #44067 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3faa1b9c5cb..a44cde75062a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ ENHANCEMENTS: * resource/aws_dlm_lifecycle_policy: Add `copy_tags`, `create_interval`, `exclusions`, `extend_deletion`, `policy_language`, `resource_type` and `retain_interval` attributes to `policy_details` configuration block ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) * resource/aws_dlm_lifecycle_policy: Add `default_policy` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) * resource/aws_dlm_lifecycle_policy: Add `policy_details.create_rule.scripts` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) +* resource/aws_dlm_lifecycle_policy: Add `policy_details.schedule.cross_region_copy_rule.target_region` argument ([#33796](https://github.com/hashicorp/terraform-provider-aws/issues/33796)) +* resource/aws_dlm_lifecycle_policy: Make `policy_details.schedule.cross_region_copy_rule.target` optional ([#33796](https://github.com/hashicorp/terraform-provider-aws/issues/33796)) * resource/aws_dlm_lifecycle_policy:Add `policy_details.schedule.archive_rule` argument ([#41055](https://github.com/hashicorp/terraform-provider-aws/issues/41055)) * resource/aws_dynamodb_contributor_insights: Add `mode` argument in support of [CloudWatch contributor insights modes](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ([#43914](https://github.com/hashicorp/terraform-provider-aws/issues/43914)) * resource/aws_ec2_client_vpn_endpoint: Add `endpoint_ip_address_type` and `traffic_ip_address_type` arguments to support IPv6 connectivity in Client VPN ([#44059](https://github.com/hashicorp/terraform-provider-aws/issues/44059)) From 458733ad54de89ed5ab4bced9f3bee36b5c76bf2 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:38:16 -0400 Subject: [PATCH 0943/2115] Bumped product version to 6.11.1. --- version/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/VERSION b/version/VERSION index ceda194c2432..c68232647cc1 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.11.0 \ No newline at end of file +6.11.1 \ No newline at end of file From 7ab271a90bf8f6330ab9a0043c2444132b2677fa Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 28 Aug 2025 17:39:41 +0000 Subject: [PATCH 0944/2115] Add changelog entry for v6.12.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a44cde75062a..9bf1ab3f2d7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 6.12.0 (Unreleased) + ## 6.11.0 (August 28, 2025) FEATURES: From c21a1b0d531a821948c0474e66ead09fe977d120 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 12:17:09 -0400 Subject: [PATCH 0945/2115] Add 'findProvisionedProduct' and 'findRecord'. --- .../service/servicecatalog/exports_test.go | 7 +- .../servicecatalog/provisioned_product.go | 354 +++++++++++++----- .../provisioned_product_test.go | 26 +- internal/service/servicecatalog/status.go | 33 -- internal/service/servicecatalog/wait.go | 95 ----- 5 files changed, 272 insertions(+), 243 deletions(-) diff --git a/internal/service/servicecatalog/exports_test.go b/internal/service/servicecatalog/exports_test.go index fe83cfeeba24..420e157fed30 100644 --- a/internal/service/servicecatalog/exports_test.go +++ b/internal/service/servicecatalog/exports_test.go @@ -18,9 +18,10 @@ var ( ResourceTagOption = resourceTagOption ResourceTagOptionResourceAssociation = resourceTagOptionResourceAssociation - FindPortfolioByID = findPortfolioByID - FindPortfolioShare = findPortfolioShare - FindPrincipalPortfolioAssociation = findPrincipalPortfolioAssociation + FindPortfolioByID = findPortfolioByID + FindPortfolioShare = findPortfolioShare + FindPrincipalPortfolioAssociation = findPrincipalPortfolioAssociation + FindProvisionedProductByTwoPartKey = findProvisionedProductByTwoPartKey BudgetResourceAssociationParseID = budgetResourceAssociationParseID ProductPortfolioAssociationParseID = productPortfolioAssociationParseID diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 1ea7178f2c56..a7f3b85ca233 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -19,6 +19,7 @@ import ( "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" @@ -44,10 +45,9 @@ func resourceProvisionedProduct() *schema.Resource { }, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(ProvisionedProductReadyTimeout), - Read: schema.DefaultTimeout(ProvisionedProductReadTimeout), - Update: schema.DefaultTimeout(ProvisionedProductUpdateTimeout), - Delete: schema.DefaultTimeout(ProvisionedProductDeleteTimeout), + Create: schema.DefaultTimeout(30 * time.Minute), + Update: schema.DefaultTimeout(30 * time.Minute), + Delete: schema.DefaultTimeout(30 * time.Minute), }, Schema: map[string]*schema.Schema{ @@ -281,9 +281,10 @@ func resourceProvisionedProductCreate(ctx context.Context, d *schema.ResourceDat var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx) - input := &servicecatalog.ProvisionProductInput{ + name := d.Get(names.AttrName).(string) + input := servicecatalog.ProvisionProductInput{ ProvisionToken: aws.String(id.UniqueId()), - ProvisionedProductName: aws.String(d.Get(names.AttrName).(string)), + ProvisionedProductName: aws.String(name), Tags: getTagsIn(ctx), } @@ -327,42 +328,25 @@ func resourceProvisionedProductCreate(ctx context.Context, d *schema.ResourceDat input.ProvisioningPreferences = expandProvisioningPreferences(v.([]any)[0].(map[string]any)) } - var output *servicecatalog.ProvisionProductOutput - - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { - var err error - - output, err = conn.ProvisionProduct(ctx, input) - - if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) - } - - if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return retry.RetryableError(err) - } - - if err != nil { - return retry.NonRetryableError(err) - } + output, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutCreate), + func(ctx context.Context) (*servicecatalog.ProvisionProductOutput, error) { + return conn.ProvisionProduct(ctx, &input) + }, + func(err error) (bool, error) { + if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { + return true, err + } - return nil - }) + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return true, err + } - if tfresource.TimedOut(err) { - output, err = conn.ProvisionProduct(ctx, input) - } + return false, err + }, + ) if err != nil { - return sdkdiag.AppendErrorf(diags, "provisioning Service Catalog Product: %s", err) - } - - if output == nil { - return sdkdiag.AppendErrorf(diags, "provisioning Service Catalog Product: empty response") - } - - if output.RecordDetail == nil { - return sdkdiag.AppendErrorf(diags, "provisioning Service Catalog Product: no product view detail or summary") + return sdkdiag.AppendErrorf(diags, "provisioning Service Catalog Product (%s): %s", name, err) } d.SetId(aws.ToString(output.RecordDetail.ProvisionedProductId)) @@ -386,43 +370,30 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // DescribeRecord is available in the data source aws_servicecatalog_record. acceptLanguage := acceptLanguageEnglish - if v, ok := d.GetOk("accept_language"); ok { acceptLanguage = v.(string) } - input := &servicecatalog.DescribeProvisionedProductInput{ - Id: aws.String(d.Id()), - AcceptLanguage: aws.String(acceptLanguage), - } - - output, err := conn.DescribeProvisionedProduct(ctx, input) + outputDPP, err := findProvisionedProductByTwoPartKey(ctx, conn, d.Id(), acceptLanguage) - if !d.IsNewResource() && errs.IsA[*awstypes.ResourceNotFoundException](err) { + if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Service Catalog Provisioned Product (%s) not found, removing from state", d.Id()) d.SetId("") return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s): %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - if output == nil || output.ProvisionedProductDetail == nil { - return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s): empty response", d.Id()) - } - - detail := output.ProvisionedProductDetail - + detail := outputDPP.ProvisionedProductDetail d.Set(names.AttrARN, detail.Arn) - d.Set("cloudwatch_dashboard_names", flattenCloudWatchDashboards(output.CloudWatchDashboards)) - + d.Set("cloudwatch_dashboard_names", flattenCloudWatchDashboards(outputDPP.CloudWatchDashboards)) if detail.CreatedTime != nil { d.Set(names.AttrCreatedTime, detail.CreatedTime.Format(time.RFC3339)) } else { d.Set(names.AttrCreatedTime, nil) } - d.Set("last_provisioning_record_id", detail.LastProvisioningRecordId) d.Set("last_record_id", detail.LastRecordId) d.Set("last_successful_provisioning_record_id", detail.LastSuccessfulProvisioningRecordId) @@ -449,35 +420,23 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // recordIdToUse = detail.LastProvisioningRecordId // } - recordInput := &servicecatalog.DescribeRecordInput{ - Id: detail.LastProvisioningRecordId, - // Id: recordIdToUse, - AcceptLanguage: aws.String(acceptLanguage), - } - - recordOutput, err := conn.DescribeRecord(ctx, recordInput) + recordIdToUse := aws.ToString(detail.LastProvisioningRecordId) + outputDR, err := findRecordByTwoPartKey(ctx, conn, recordIdToUse, acceptLanguage) - if !d.IsNewResource() && errs.IsA[*awstypes.ResourceNotFoundException](err) { - log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) - // log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), aws.ToString(recordIdToUse)) + if !d.IsNewResource() && tfresource.NotFound(err) { + log.Printf("[WARN] Service Catalog Provisioned Product (%s) Record (%s) not found, unable to set tags", d.Id(), recordIdToUse) return diags } if err != nil { - return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(detail.LastProvisioningRecordId), err) - // return sdkdiag.AppendErrorf(diags, "describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(recordIdToUse), err) - } - - if recordOutput == nil || recordOutput.RecordDetail == nil { - return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(detail.LastProvisioningRecordId)) - // return sdkdiag.AppendErrorf(diags, "getting Service Catalog Provisioned Product (%s) Record (%s): empty response", d.Id(), aws.ToString(recordIdToUse)) + return sdkdiag.AppendErrorf(diags, "reading Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), recordIdToUse, err) } // To enable debugging of potential v, log as a warning // instead of exiting prematurely with an error, e.g. // v can be present after update to a new version failed and the stack // rolled back to the current version. - if v := recordOutput.RecordDetail.RecordErrors; len(v) > 0 { + if v := outputDR.RecordDetail.RecordErrors; len(v) > 0 { var errs []error for _, err := range v { @@ -487,13 +446,13 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, log.Printf("[WARN] Errors found when describing Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), aws.ToString(detail.LastProvisioningRecordId), errors.Join(errs...)) } - if err := d.Set("outputs", flattenRecordOutputs(recordOutput.RecordOutputs)); err != nil { + if err := d.Set("outputs", flattenRecordOutputs(outputDR.RecordOutputs)); err != nil { return sdkdiag.AppendErrorf(diags, "setting outputs: %s", err) } - d.Set("path_id", recordOutput.RecordDetail.PathId) + d.Set("path_id", outputDR.RecordDetail.PathId) - setTagsOut(ctx, svcTags(recordKeyValueTags(ctx, recordOutput.RecordDetail.RecordTags))) + setTagsOut(ctx, svcTags(recordKeyValueTags(ctx, outputDR.RecordDetail.RecordTags))) return diags } @@ -502,9 +461,9 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx) - input := &servicecatalog.UpdateProvisionedProductInput{ - UpdateToken: aws.String(id.UniqueId()), + input := servicecatalog.UpdateProvisionedProductInput{ ProvisionedProductId: aws.String(d.Id()), + UpdateToken: aws.String(id.UniqueId()), } if v, ok := d.GetOk("accept_language"); ok { @@ -546,23 +505,18 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat // to provisioned AWS objects during update if the tags don't change. input.Tags = getTagsIn(ctx) - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { - _, err := conn.UpdateProvisionedProduct(ctx, input) - - if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) - } - - if err != nil { - return retry.NonRetryableError(err) - } - - return nil - }) + _, err := tfresource.RetryWhen(ctx, d.Timeout(schema.TimeoutUpdate), + func(ctx context.Context) (any, error) { + return conn.UpdateProvisionedProduct(ctx, &input) + }, + func(err error) (bool, error) { + if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { + return true, err + } - if tfresource.TimedOut(err) { - _, err = conn.UpdateProvisionedProduct(ctx, input) - } + return false, err + }, + ) if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Provisioned Product (%s): %s", d.Id(), err) @@ -626,7 +580,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) - if failureErr, ok := errs.As[*ProvisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { + if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { input.IgnoreErrors = true _, err = conn.TerminateProvisionedProduct(ctx, &input) @@ -647,12 +601,218 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat } if err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) to be terminated: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) terminate: %s", d.Id(), err) } return diags } +func findProvisionedProductByTwoPartKey(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string) (*servicecatalog.DescribeProvisionedProductOutput, error) { + input := servicecatalog.DescribeProvisionedProductInput{ + Id: aws.String(id), + } + if acceptLanguage != "" { + input.AcceptLanguage = aws.String(acceptLanguage) + } + + return findProvisionedProduct(ctx, conn, &input) +} + +func findProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, input *servicecatalog.DescribeProvisionedProductInput) (*servicecatalog.DescribeProvisionedProductOutput, error) { + output, err := conn.DescribeProvisionedProduct(ctx, input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.ProvisionedProductDetail == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output, nil +} + +func findRecordByTwoPartKey(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string) (*servicecatalog.DescribeRecordOutput, error) { + input := servicecatalog.DescribeRecordInput{ + Id: aws.String(id), + } + if acceptLanguage != "" { + input.AcceptLanguage = aws.String(acceptLanguage) + } + + return findRecord(ctx, conn, &input) +} + +func findRecord(ctx context.Context, conn *servicecatalog.Client, input *servicecatalog.DescribeRecordInput) (*servicecatalog.DescribeRecordOutput, error) { + var output *servicecatalog.DescribeRecordOutput + + for { + page, err := conn.DescribeRecord(ctx, input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if page == nil { + break + } + + if output == nil { + output = page + } else { + output.RecordOutputs = append(output.RecordOutputs, page.RecordOutputs...) + } + + nextPageToken := aws.ToString(page.NextPageToken) + if nextPageToken == "" { + break + } + input.PageToken = aws.String(nextPageToken) + } + + if output == nil || output.RecordDetail == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output, nil +} + +func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string) retry.StateRefreshFunc { + return func() (any, string, error) { + input := &servicecatalog.DescribeProvisionedProductInput{} + + if acceptLanguage != "" { + input.AcceptLanguage = aws.String(acceptLanguage) + } + + // one or the other but not both + if id != "" { + input.Id = aws.String(id) + } else if name != "" { + input.Name = aws.String(name) + } + + output, err := conn.DescribeProvisionedProduct(ctx, input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + if output == nil || output.ProvisionedProductDetail == nil { + return nil, "", nil + } + + return output, string(output.ProvisionedProductDetail.Status), err + } +} + +func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.ProvisionedProductStatusUnderChange, awstypes.ProvisionedProductStatusPlanInProgress), + Target: enum.Slice(awstypes.ProvisionedProductStatusAvailable), + Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), + Timeout: timeout, + ContinuousTargetOccurence: continuousTargetOccurrence, + NotFoundChecks: notFoundChecks, + MinTimeout: minTimeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { + if detail := output.ProvisionedProductDetail; detail != nil { + var foo *retry.UnexpectedStateError + if errors.As(err, &foo) { + // The statuses `ERROR` and `TAINTED` are equivalent: the application of the requested change has failed. + // The difference is that, in the case of `TAINTED`, there is a previous version to roll back to. + status := string(detail.Status) + if status == string(awstypes.ProvisionedProductStatusError) || status == string(awstypes.ProvisionedProductStatusTainted) { + // Create a custom error type that signals state refresh is needed + return output, &provisionedProductFailureError{ + StatusMessage: aws.ToString(detail.StatusMessage), + Status: status, + NeedsRefresh: true, + } + } + } + } + return output, err + } + + return nil, err +} + +func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) error { + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice( + awstypes.ProvisionedProductStatusAvailable, + awstypes.ProvisionedProductStatusUnderChange, + ), + Target: []string{}, + Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), + Timeout: timeout, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { + if detail := output.ProvisionedProductDetail; detail != nil { + var foo *retry.UnexpectedStateError + if errors.As(err, &foo) { + // If the status is `TAINTED`, we can retry with `IgnoreErrors` + status := string(detail.Status) + if status == string(awstypes.ProvisionedProductStatusTainted) { + // Create a custom error type that signals state refresh is needed + return &provisionedProductFailureError{ + StatusMessage: aws.ToString(detail.StatusMessage), + Status: status, + NeedsRefresh: true, + } + } + } + } + return err + } + + return err +} + +// provisionedProductFailureError represents a provisioned product operation failure +// that requires state refresh to recover from inconsistent state. +type provisionedProductFailureError struct { + StatusMessage string + Status string + NeedsRefresh bool +} + +func (e *provisionedProductFailureError) Error() string { + return e.StatusMessage +} + +// IsStateInconsistent returns true if this error indicates state inconsistency +// that requires a refresh to recover. +func (e *provisionedProductFailureError) IsStateInconsistent() bool { + return e.NeedsRefresh +} + func expandProvisioningParameter(tfMap map[string]any) awstypes.ProvisioningParameter { apiObject := awstypes.ProvisioningParameter{} diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index e84ec23061cc..e50c37778ef9 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -19,8 +19,8 @@ import ( "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" tfservicecatalog "github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -467,13 +467,9 @@ func testAccCheckProvisionedProductDestroy(ctx context.Context) resource.TestChe continue } - input := &servicecatalog.DescribeProvisionedProductInput{ - Id: aws.String(rs.Primary.ID), - AcceptLanguage: aws.String(rs.Primary.Attributes["accept_language"]), - } - _, err := conn.DescribeProvisionedProduct(ctx, input) + _, err := tfservicecatalog.FindProvisionedProductByTwoPartKey(ctx, conn, rs.Primary.ID, rs.Primary.Attributes["accept_language"]) - if errs.IsA[*awstypes.ResourceNotFoundException](err) { + if tfresource.NotFound(err) { continue } @@ -481,29 +477,29 @@ func testAccCheckProvisionedProductDestroy(ctx context.Context) resource.TestChe return err } - return fmt.Errorf("Service Catalog Provisioned Product (%s) still exists", rs.Primary.ID) + return fmt.Errorf("Service Catalog Provisioned Product %s still exists", rs.Primary.ID) } return nil } } -func testAccCheckProvisionedProductExists(ctx context.Context, resourceName string, pprod *awstypes.ProvisionedProductDetail) resource.TestCheckFunc { +func testAccCheckProvisionedProductExists(ctx context.Context, n string, v *awstypes.ProvisionedProductDetail) 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("resource not found: %s", resourceName) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).ServiceCatalogClient(ctx) - out, err := tfservicecatalog.WaitProvisionedProductReady(ctx, conn, tfservicecatalog.AcceptLanguageEnglish, rs.Primary.ID, "", tfservicecatalog.ProvisionedProductReadyTimeout) + output, err := tfservicecatalog.FindProvisionedProductByTwoPartKey(ctx, conn, rs.Primary.ID, rs.Primary.Attributes["accept_language"]) + if err != nil { - return fmt.Errorf("describing Service Catalog Provisioned Product (%s): %w", rs.Primary.ID, err) + return err } - *pprod = *out.ProvisionedProductDetail + *v = *output.ProvisionedProductDetail return nil } diff --git a/internal/service/servicecatalog/status.go b/internal/service/servicecatalog/status.go index 08543cedd860..b4ea55caf1fc 100644 --- a/internal/service/servicecatalog/status.go +++ b/internal/service/servicecatalog/status.go @@ -321,39 +321,6 @@ func statusLaunchPaths(ctx context.Context, conn *servicecatalog.Client, acceptL } } -func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string) retry.StateRefreshFunc { - return func() (any, string, error) { - input := &servicecatalog.DescribeProvisionedProductInput{} - - if acceptLanguage != "" { - input.AcceptLanguage = aws.String(acceptLanguage) - } - - // one or the other but not both - if id != "" { - input.Id = aws.String(id) - } else if name != "" { - input.Name = aws.String(name) - } - - output, err := conn.DescribeProvisionedProduct(ctx, input) - - if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - if output == nil || output.ProvisionedProductDetail == nil { - return nil, "", nil - } - - return output, string(output.ProvisionedProductDetail.Status), err - } -} - func statusPortfolioConstraints(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, portfolioID, productID string) retry.StateRefreshFunc { return func() (any, string, error) { input := &servicecatalog.ListConstraintsForPortfolioInput{ diff --git a/internal/service/servicecatalog/wait.go b/internal/service/servicecatalog/wait.go index 4795fe778a8b..4e433f892193 100644 --- a/internal/service/servicecatalog/wait.go +++ b/internal/service/servicecatalog/wait.go @@ -5,10 +5,8 @@ package servicecatalog import ( "context" - "errors" "time" - "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" @@ -42,10 +40,6 @@ const ( ProductReadTimeout = 10 * time.Minute ProductReadyTimeout = 5 * time.Minute ProductUpdateTimeout = 5 * time.Minute - ProvisionedProductDeleteTimeout = 30 * time.Minute - ProvisionedProductReadTimeout = 10 * time.Minute - ProvisionedProductReadyTimeout = 30 * time.Minute - ProvisionedProductUpdateTimeout = 30 * time.Minute ProvisioningArtifactDeleteTimeout = 3 * time.Minute ProvisioningArtifactReadTimeout = 10 * time.Minute ProvisioningArtifactReadyTimeout = 3 * time.Minute @@ -75,24 +69,6 @@ const ( organizationAccessStatusError = "ERROR" ) -// ProvisionedProductFailureError represents a provisioned product operation failure -// that requires state refresh to recover from inconsistent state. -type ProvisionedProductFailureError struct { - StatusMessage string - Status string - NeedsRefresh bool -} - -func (e *ProvisionedProductFailureError) Error() string { - return e.StatusMessage -} - -// IsStateInconsistent returns true if this error indicates state inconsistency -// that requires a refresh to recover. -func (e *ProvisionedProductFailureError) IsStateInconsistent() bool { - return e.NeedsRefresh -} - func waitProductReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, productID string, timeout time.Duration) (*servicecatalog.DescribeProductAsAdminOutput, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.StatusCreating, statusNotFound, statusUnavailable), @@ -482,77 +458,6 @@ func waitLaunchPathsReady(ctx context.Context, conn *servicecatalog.Client, acce return nil, err } -func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { - stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.ProvisionedProductStatusUnderChange, awstypes.ProvisionedProductStatusPlanInProgress), - Target: enum.Slice(awstypes.ProvisionedProductStatusAvailable), - Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), - Timeout: timeout, - ContinuousTargetOccurence: continuousTargetOccurrence, - NotFoundChecks: notFoundChecks, - MinTimeout: minTimeout, - } - - outputRaw, err := stateConf.WaitForStateContext(ctx) - - if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { - if detail := output.ProvisionedProductDetail; detail != nil { - var foo *retry.UnexpectedStateError - if errors.As(err, &foo) { - // The statuses `ERROR` and `TAINTED` are equivalent: the application of the requested change has failed. - // The difference is that, in the case of `TAINTED`, there is a previous version to roll back to. - status := string(detail.Status) - if status == string(awstypes.ProvisionedProductStatusError) || status == string(awstypes.ProvisionedProductStatusTainted) { - // Create a custom error type that signals state refresh is needed - return output, &ProvisionedProductFailureError{ - StatusMessage: aws.ToString(detail.StatusMessage), - Status: status, - NeedsRefresh: true, - } - } - } - } - return output, err - } - - return nil, err -} - -func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) error { - stateConf := &retry.StateChangeConf{ - Pending: enum.Slice( - awstypes.ProvisionedProductStatusAvailable, - awstypes.ProvisionedProductStatusUnderChange, - ), - Target: []string{}, - Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), - Timeout: timeout, - } - - outputRaw, err := stateConf.WaitForStateContext(ctx) - - if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { - if detail := output.ProvisionedProductDetail; detail != nil { - var foo *retry.UnexpectedStateError - if errors.As(err, &foo) { - // If the status is `TAINTED`, we can retry with `IgnoreErrors` - status := string(detail.Status) - if status == string(awstypes.ProvisionedProductStatusTainted) { - // Create a custom error type that signals state refresh is needed - return &ProvisionedProductFailureError{ - StatusMessage: aws.ToString(detail.StatusMessage), - Status: status, - NeedsRefresh: true, - } - } - } - } - return err - } - - return err -} - func waitPortfolioConstraintsReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, portfolioID, productID string, timeout time.Duration) ([]awstypes.ConstraintDetail, error) { stateConf := &retry.StateChangeConf{ Pending: []string{statusNotFound}, From 69fd52878eb14ae0fb39c77a62273b58d5aa1500 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 14:24:26 -0400 Subject: [PATCH 0946/2115] statusProvisionedProduct: Use 'findProvisionedProductByTwoPartKey'. --- .../service/servicecatalog/exports_test.go | 1 - .../servicecatalog/provisioned_product.go | 39 ++++++------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/internal/service/servicecatalog/exports_test.go b/internal/service/servicecatalog/exports_test.go index 420e157fed30..f7b830ca5ef5 100644 --- a/internal/service/servicecatalog/exports_test.go +++ b/internal/service/servicecatalog/exports_test.go @@ -37,7 +37,6 @@ var ( WaitOrganizationsAccessStable = waitOrganizationsAccessStable WaitProductPortfolioAssociationDeleted = waitProductPortfolioAssociationDeleted WaitProductPortfolioAssociationReady = waitProductPortfolioAssociationReady - WaitProvisionedProductReady = waitProvisionedProductReady WaitTagOptionResourceAssociationDeleted = waitTagOptionResourceAssociationDeleted WaitTagOptionResourceAssociationReady = waitTagOptionResourceAssociationReady diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index a7f3b85ca233..f760b86241ef 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -351,7 +351,7 @@ func resourceProvisionedProductCreate(ctx context.Context, d *schema.ResourceDat d.SetId(aws.ToString(output.RecordDetail.ProvisionedProductId)) - if _, err := waitProvisionedProductReady(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutCreate)); err != nil { + if _, err := waitProvisionedProductReady(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) create: %s", d.Id(), err) } @@ -522,7 +522,7 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat return sdkdiag.AppendErrorf(diags, "updating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - if _, err := waitProvisionedProductReady(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutUpdate)); err != nil { + if _, err := waitProvisionedProductReady(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutUpdate)); err != nil { // // Check if this is a state inconsistency error // var failureErr *ProvisionedProductFailureError // if errors.As(err, &failureErr) && failureErr.IsStateInconsistent() { @@ -578,7 +578,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) + err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { input.IgnoreErrors = true @@ -593,7 +593,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - err = waitProvisionedProductTerminated(ctx, conn, d.Get("accept_language").(string), d.Id(), "", d.Timeout(schema.TimeoutDelete)) + err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { @@ -691,24 +691,11 @@ func findRecord(ctx context.Context, conn *servicecatalog.Client, input *service return output, nil } -func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string) retry.StateRefreshFunc { +func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string) retry.StateRefreshFunc { return func() (any, string, error) { - input := &servicecatalog.DescribeProvisionedProductInput{} + output, err := findProvisionedProductByTwoPartKey(ctx, conn, id, acceptLanguage) - if acceptLanguage != "" { - input.AcceptLanguage = aws.String(acceptLanguage) - } - - // one or the other but not both - if id != "" { - input.Id = aws.String(id) - } else if name != "" { - input.Name = aws.String(name) - } - - output, err := conn.DescribeProvisionedProduct(ctx, input) - - if errs.IsA[*awstypes.ResourceNotFoundException](err) { + if tfresource.NotFound(err) { return nil, "", nil } @@ -716,19 +703,15 @@ func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, return nil, "", err } - if output == nil || output.ProvisionedProductDetail == nil { - return nil, "", nil - } - return output, string(output.ProvisionedProductDetail.Status), err } } -func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { +func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.ProvisionedProductStatusUnderChange, awstypes.ProvisionedProductStatusPlanInProgress), Target: enum.Slice(awstypes.ProvisionedProductStatusAvailable), - Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), + Refresh: statusProvisionedProduct(ctx, conn, id, acceptLanguage), Timeout: timeout, ContinuousTargetOccurence: continuousTargetOccurrence, NotFoundChecks: notFoundChecks, @@ -760,14 +743,14 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien return nil, err } -func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, acceptLanguage, id, name string, timeout time.Duration) error { +func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) error { stateConf := &retry.StateChangeConf{ Pending: enum.Slice( awstypes.ProvisionedProductStatusAvailable, awstypes.ProvisionedProductStatusUnderChange, ), Target: []string{}, - Refresh: statusProvisionedProduct(ctx, conn, acceptLanguage, id, name), + Refresh: statusProvisionedProduct(ctx, conn, id, acceptLanguage), Timeout: timeout, } From eee6cb8e8ef4497605bbaad447fad4d6fadf1de7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 14:33:05 -0400 Subject: [PATCH 0947/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccServiceCatalogProvisionedProduct_basic' PKG=servicecatalog make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run=TestAccServiceCatalogProvisionedProduct_basic -timeout 360m -vet=off 2025/08/28 14:25:42 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 14:25:42 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccServiceCatalogProvisionedProduct_basic === PAUSE TestAccServiceCatalogProvisionedProduct_basic === CONT TestAccServiceCatalogProvisionedProduct_basic --- PASS: TestAccServiceCatalogProvisionedProduct_basic (91.58s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog 97.019s From a999fe983be2c4b0d83b03a7d92dff26a8fd2a43 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 14:33:58 -0400 Subject: [PATCH 0948/2115] Tidy up 'provisionedProductFailureError.Status'. --- .../service/servicecatalog/provisioned_product.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index f760b86241ef..3efe1405e2b3 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -722,12 +722,10 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { if detail := output.ProvisionedProductDetail; detail != nil { - var foo *retry.UnexpectedStateError - if errors.As(err, &foo) { + if errs.IsA[*retry.UnexpectedStateError](err) { // The statuses `ERROR` and `TAINTED` are equivalent: the application of the requested change has failed. // The difference is that, in the case of `TAINTED`, there is a previous version to roll back to. - status := string(detail.Status) - if status == string(awstypes.ProvisionedProductStatusError) || status == string(awstypes.ProvisionedProductStatusTainted) { + if status := detail.Status; status == awstypes.ProvisionedProductStatusError || status == awstypes.ProvisionedProductStatusTainted { // Create a custom error type that signals state refresh is needed return output, &provisionedProductFailureError{ StatusMessage: aws.ToString(detail.StatusMessage), @@ -758,11 +756,9 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. if output, ok := outputRaw.(*servicecatalog.DescribeProvisionedProductOutput); ok { if detail := output.ProvisionedProductDetail; detail != nil { - var foo *retry.UnexpectedStateError - if errors.As(err, &foo) { + if errs.IsA[*retry.UnexpectedStateError](err) { // If the status is `TAINTED`, we can retry with `IgnoreErrors` - status := string(detail.Status) - if status == string(awstypes.ProvisionedProductStatusTainted) { + if status := detail.Status; status == awstypes.ProvisionedProductStatusTainted { // Create a custom error type that signals state refresh is needed return &provisionedProductFailureError{ StatusMessage: aws.ToString(detail.StatusMessage), @@ -782,7 +778,7 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. // that requires state refresh to recover from inconsistent state. type provisionedProductFailureError struct { StatusMessage string - Status string + Status awstypes.ProvisionedProductStatus NeedsRefresh bool } From 34342d148b9f2093c68d1c5b0d0ad4fe3a21cfc5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 14:49:07 -0400 Subject: [PATCH 0949/2115] Fix golangci-lint 'unparam'. --- .../service/servicecatalog/provisioned_product.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 3efe1405e2b3..337bac260b18 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -578,7 +578,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) + _, err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { input.IgnoreErrors = true @@ -593,7 +593,7 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } - err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) + _, err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { @@ -707,7 +707,7 @@ func statusProvisionedProduct(ctx context.Context, conn *servicecatalog.Client, } } -func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { +func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.ProvisionedProductStatusUnderChange, awstypes.ProvisionedProductStatusPlanInProgress), Target: enum.Slice(awstypes.ProvisionedProductStatusAvailable), @@ -741,7 +741,7 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien return nil, err } -func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) error { +func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog.Client, id, acceptLanguage string, timeout time.Duration) (*servicecatalog.DescribeProvisionedProductOutput, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ Pending: enum.Slice( awstypes.ProvisionedProductStatusAvailable, @@ -760,7 +760,7 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. // If the status is `TAINTED`, we can retry with `IgnoreErrors` if status := detail.Status; status == awstypes.ProvisionedProductStatusTainted { // Create a custom error type that signals state refresh is needed - return &provisionedProductFailureError{ + return output, &provisionedProductFailureError{ StatusMessage: aws.ToString(detail.StatusMessage), Status: status, NeedsRefresh: true, @@ -768,10 +768,10 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. } } } - return err + return output, err } - return err + return nil, err } // provisionedProductFailureError represents a provisioned product operation failure From affd61aa5468d3ba3d5ae2e46a1ca3355bf8837d Mon Sep 17 00:00:00 2001 From: Brandon Metcalf Date: Thu, 28 Aug 2025 14:16:02 -0500 Subject: [PATCH 0950/2115] Fixes namespaceNameValidator and addresses https://github.com/hashicorp/terraform-provider-aws/issues/43688 --- internal/service/s3tables/namespace.go | 2 +- internal/service/s3tables/validate.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/service/s3tables/namespace.go b/internal/service/s3tables/namespace.go index 4f539b6f317f..a60852c04279 100644 --- a/internal/service/s3tables/namespace.go +++ b/internal/service/s3tables/namespace.go @@ -245,7 +245,7 @@ type namespaceResourceModel struct { var namespaceNameValidator = []validator.String{ stringvalidator.LengthBetween(1, 255), - stringMustContainLowerCaseLettersNumbersUnderscores, + stringMustContainLowerCaseLettersNumbersHyphensUnderscores, stringMustStartWithLetterOrNumber, stringMustEndWithLetterOrNumber, } diff --git a/internal/service/s3tables/validate.go b/internal/service/s3tables/validate.go index be3a4af9db0d..fcef802a9b39 100644 --- a/internal/service/s3tables/validate.go +++ b/internal/service/s3tables/validate.go @@ -9,8 +9,9 @@ import ( ) var ( - stringMustContainLowerCaseLettersNumbersHypens = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase letters, numbers, or hyphens") - stringMustContainLowerCaseLettersNumbersUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z_]+$`), "must contain only lowercase letters, numbers, or underscores") + stringMustContainLowerCaseLettersNumbersHypens = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase letters, numbers, or hyphens") + stringMustContainLowerCaseLettersNumbersUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z_]+$`), "must contain only lowercase letters, numbers, or underscores") + stringMustContainLowerCaseLettersNumbersHyphensUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-_]+$`), "must contain only lowercase letters, numbers, hyphens or underscores") stringMustStartWithLetterOrNumber = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z]`), "must start with a letter or number") stringMustEndWithLetterOrNumber = stringvalidator.RegexMatches(regexache.MustCompile(`[0-9a-z]$`), "must end with a letter or number") From 4e91f182800bdfa076b00d13aa005628cd94c672 Mon Sep 17 00:00:00 2001 From: Brandon Metcalf Date: Thu, 28 Aug 2025 14:23:41 -0500 Subject: [PATCH 0951/2115] changelog entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bf1ab3f2d7d..0dfef4af5086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 6.12.0 (Unreleased) +BUG FIXES: + +* resource/aws_s3tables_table_policy: Fix namespaceNameValidator to allow hyphens ([#43688](https://github.com/hashicorp/terraform-provider-aws/issues/43688)) + ## 6.11.0 (August 28, 2025) FEATURES: From cc17decdbb528aa6aef05ff7e525b668fd5f3cf7 Mon Sep 17 00:00:00 2001 From: Brandon Metcalf Date: Thu, 28 Aug 2025 14:26:54 -0500 Subject: [PATCH 0952/2115] changelog fix --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dfef4af5086..9bf1ab3f2d7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,5 @@ ## 6.12.0 (Unreleased) -BUG FIXES: - -* resource/aws_s3tables_table_policy: Fix namespaceNameValidator to allow hyphens ([#43688](https://github.com/hashicorp/terraform-provider-aws/issues/43688)) - ## 6.11.0 (August 28, 2025) FEATURES: From 1da326fe32e3cdb224185babedb9f94a29fe57f7 Mon Sep 17 00:00:00 2001 From: Brandon Metcalf Date: Thu, 28 Aug 2025 14:28:51 -0500 Subject: [PATCH 0953/2115] changelog fix --- .changelog/43688.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43688.txt diff --git a/.changelog/43688.txt b/.changelog/43688.txt new file mode 100644 index 000000000000..7282476e3811 --- /dev/null +++ b/.changelog/43688.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_s3tables_table_policy: Fix namespaceNameValidator to allow hyphens +``` From 984fa6ae4b1a0b1788eedc932542b54e5cae2a34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Aug 2025 19:42:19 +0000 Subject: [PATCH 0954/2115] Bump github.com/ulikunitz/xz from 0.5.12 to 0.5.14 in /.ci/tools Bumps [github.com/ulikunitz/xz](https://github.com/ulikunitz/xz) from 0.5.12 to 0.5.14. - [Commits](https://github.com/ulikunitz/xz/compare/v0.5.12...v0.5.14) --- updated-dependencies: - dependency-name: github.com/ulikunitz/xz dependency-version: 0.5.14 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .ci/tools/go.mod | 2 +- .ci/tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod index 7426da7dd1b0..d5f015fdc226 100644 --- a/.ci/tools/go.mod +++ b/.ci/tools/go.mod @@ -336,7 +336,7 @@ require ( github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect github.com/transparency-dev/merkle v0.0.2 // indirect - github.com/ulikunitz/xz v0.5.12 // indirect + github.com/ulikunitz/xz v0.5.14 // indirect github.com/ultraware/funlen v0.2.0 // indirect github.com/ultraware/whitespace v0.2.0 // indirect github.com/uudashr/gocognit v1.2.0 // indirect diff --git a/.ci/tools/go.sum b/.ci/tools/go.sum index 2c7c57cb0a05..221fae86f11a 100644 --- a/.ci/tools/go.sum +++ b/.ci/tools/go.sum @@ -1905,8 +1905,8 @@ github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4= github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= -github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg= +github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI= github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA= github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g= From a55e613c3bc1f5c5623ba0439e14fec5a11f3848 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Wed, 27 Aug 2025 16:27:05 -0400 Subject: [PATCH 0955/2115] Add parameterized resource identity to `aws_ssm_document` ```console % make testacc PKG=ssm TESTS=TestAccSSMDocument_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMDocument_' -timeout 360m -vet=off 2025/08/27 16:22:25 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/27 16:22:25 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMDocument_disappears (29.70s) === CONT TestAccSSMDocument_update --- PASS: TestAccSSMDocument_session (38.41s) === CONT TestAccSSMDocument_Permission_public --- PASS: TestAccSSMDocument_Permission_private (38.93s) === CONT TestAccSSMDocument_basic --- PASS: TestAccSSMDocument_tags_DefaultTags_nullNonOverlappingResourceTag (40.71s) === CONT TestAccSSMDocument_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccSSMDocument_params (51.87s) === CONT TestAccSSMDocument_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccSSMDocument_automation (52.13s) === CONT TestAccSSMDocument_Permission_change --- PASS: TestAccSSMDocument_tags_DefaultTags_nullOverlappingResourceTag (59.54s) === CONT TestAccSSMDocument_tags_null --- PASS: TestAccSSMDocument_tags_DefaultTags_emptyResourceTag (60.01s) === CONT TestAccSSMDocument_tags_EmptyTag_OnCreate --- PASS: TestAccSSMDocument_name (61.72s) === CONT TestAccSSMDocument_Permission_batching --- PASS: TestAccSSMDocument_tags_DefaultTags_emptyProviderOnlyTag (62.10s) === CONT TestAccSSMDocument_versionName --- PASS: TestAccSSMDocument_DocumentFormat_yaml (66.50s) === CONT TestAccSSMDocument_Target_type --- PASS: TestAccSSMDocument_Identity_Basic (66.74s) === CONT TestAccSSMDocument_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccSSMDocument_Permission_public (48.52s) === CONT TestAccSSMDocument_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccSSMDocument_tags_ComputedTag_OnCreate (87.55s) === CONT TestAccSSMDocument_tags_AddOnUpdate --- PASS: TestAccSSMDocument_tags_EmptyMap (95.68s) === CONT TestAccSSMDocument_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccSSMDocument_basic (57.51s) === CONT TestAccSSMDocument_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccSSMDocument_Identity_ExistingResource (96.86s) === CONT TestAccSSMDocument_tags_DefaultTags_overlapping --- PASS: TestAccSSMDocument_package (103.60s) === CONT TestAccSSMDocument_SchemaVersion_1 --- PASS: TestAccSSMDocument_update (86.87s) === CONT TestAccSSMDocument_tags_DefaultTags_nonOverlapping --- PASS: TestAccSSMDocument_Permission_batching (60.80s) === CONT TestAccSSMDocument_Identity_RegionOverride --- PASS: TestAccSSMDocument_tags_IgnoreTags_Overlap_ResourceTag (125.38s) --- PASS: TestAccSSMDocument_tags_ComputedTag_OnUpdate_Add (127.74s) --- PASS: TestAccSSMDocument_tags_null (83.86s) --- PASS: TestAccSSMDocument_tags_EmptyTag_OnUpdate_Replace (95.01s) --- PASS: TestAccSSMDocument_versionName (85.01s) --- PASS: TestAccSSMDocument_Target_type (80.62s) --- PASS: TestAccSSMDocument_tags_EmptyTag_OnCreate (97.19s) --- PASS: TestAccSSMDocument_Permission_change (108.58s) --- PASS: TestAccSSMDocument_tags_DefaultTags_updateToResourceOnly (68.27s) --- PASS: TestAccSSMDocument_tags_AddOnUpdate (77.72s) --- PASS: TestAccSSMDocument_SchemaVersion_1 (62.24s) --- PASS: TestAccSSMDocument_tags_ComputedTag_OnUpdate_Replace (79.29s) --- PASS: TestAccSSMDocument_tags_EmptyTag_OnUpdate_Add (125.87s) --- PASS: TestAccSSMDocument_tags_DefaultTags_updateToProviderOnly (71.56s) --- PASS: TestAccSSMDocument_tags_IgnoreTags_Overlap_DefaultTag (100.59s) --- PASS: TestAccSSMDocument_Identity_RegionOverride (47.45s) --- PASS: TestAccSSMDocument_tags (171.62s) --- PASS: TestAccSSMDocument_tags_DefaultTags_providerOnly (176.44s) --- PASS: TestAccSSMDocument_tags_DefaultTags_overlapping (89.17s) --- PASS: TestAccSSMDocument_tags_DefaultTags_nonOverlapping (74.32s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 197.569s ``` --- internal/service/ssm/document.go | 6 +- .../service/ssm/document_identity_gen_test.go | 248 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 6 +- .../ssm/testdata/Document/basic/main_gen.tf | 33 +++ .../Document/basic_v6.10.0/main_gen.tf | 43 +++ .../Document/region_override/main_gen.tf | 41 +++ .../ssm/testdata/tmpl/document_tags.gtpl | 1 + 7 files changed, 373 insertions(+), 5 deletions(-) create mode 100644 internal/service/ssm/document_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/Document/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/Document/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/Document/region_override/main_gen.tf diff --git a/internal/service/ssm/document.go b/internal/service/ssm/document.go index f5b1bb64e99a..7b99acdfe439 100644 --- a/internal/service/ssm/document.go +++ b/internal/service/ssm/document.go @@ -39,6 +39,8 @@ const ( // @SDKResource("aws_ssm_document", name="Document") // @Tags(identifierAttribute="id", resourceType="Document") +// @IdentityAttribute("name") +// @Testing(preIdentityVersion="v6.10.0") func resourceDocument() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceDocumentCreate, @@ -46,10 +48,6 @@ func resourceDocument() *schema.Resource { UpdateWithoutTimeout: resourceDocumentUpdate, DeleteWithoutTimeout: resourceDocumentDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ssm/document_identity_gen_test.go b/internal/service/ssm/document_identity_gen_test.go new file mode 100644 index 000000000000..99cda4e294a0 --- /dev/null +++ b/internal/service/ssm/document_identity_gen_test.go @@ -0,0 +1,248 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMDocument_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_document.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckDocumentDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Document/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDocumentExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Document/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Document/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Document/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMDocument_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_document.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Document/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Document/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Document/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Document/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrName), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMDocument_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_document.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckDocumentDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Document/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckDocumentExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Document/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrName: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrName)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 4c2b529f2d39..93db7c1d61d1 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -118,7 +118,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa IdentifierAttribute: names.AttrID, ResourceType: "Document", }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrName), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceMaintenanceWindow, diff --git a/internal/service/ssm/testdata/Document/basic/main_gen.tf b/internal/service/ssm/testdata/Document/basic/main_gen.tf new file mode 100644 index 000000000000..54fe3b1b6fd6 --- /dev/null +++ b/internal/service/ssm/testdata/Document/basic/main_gen.tf @@ -0,0 +1,33 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_document" "test" { + document_type = "Command" + name = var.rName + + content = < Date: Wed, 27 Aug 2025 16:58:23 -0400 Subject: [PATCH 0956/2115] Add parameterized resource identity to `aws_ssm_association` ```console % make testacc PKG=ssm TESTS=TestAccSSMAssociation_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMAssociation_' -timeout 360m -vet=off 2025/08/27 16:39:46 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/27 16:39:46 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMAssociation_withOutputLocation_waitForSuccessTimeout (34.69s) === CONT TestAccSSMAssociation_withParameters --- PASS: TestAccSSMAssociation_tags_DefaultTags_nullNonOverlappingResourceTag (41.29s) === CONT TestAccSSMAssociation_withOutputLocation --- PASS: TestAccSSMAssociation_syncCompliance (50.07s) === CONT TestAccSSMAssociation_withOutputLocation_s3Region --- PASS: TestAccSSMAssociation_tags_ComputedTag_OnCreate (50.27s) === CONT TestAccSSMAssociation_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccSSMAssociation_rateControl (58.15s) === CONT TestAccSSMAssociation_tags_DefaultTags_emptyResourceTag --- PASS: TestAccSSMAssociation_tags_DefaultTags_nullOverlappingResourceTag (60.92s) === CONT TestAccSSMAssociation_basic --- PASS: TestAccSSMAssociation_tags_DefaultTags_emptyProviderOnlyTag (61.03s) === CONT TestAccSSMAssociation_disappears --- PASS: TestAccSSMAssociation_Identity_Basic (62.85s) === CONT TestAccSSMAssociation_withScheduleExpression --- PASS: TestAccSSMAssociation_withAssociationNameAndScheduleExpression (62.89s) === CONT TestAccSSMAssociation_withComplianceSeverity --- PASS: TestAccSSMAssociation_tags_EmptyTag_OnUpdate_Replace (69.30s) === CONT TestAccSSMAssociation_withAutomationTargetParamName --- PASS: TestAccSSMAssociation_tags_ComputedTag_OnUpdate_Replace (78.70s) === CONT TestAccSSMAssociation_withDocumentVersion --- PASS: TestAccSSMAssociation_Identity_ExistingResource (80.19s) === CONT TestAccSSMAssociation_Identity_RegionOverride --- PASS: TestAccSSMAssociation_tags_AddOnUpdate (83.27s) === CONT TestAccSSMAssociation_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccSSMAssociation_withAssociationName (84.01s) === CONT TestAccSSMAssociation_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccSSMAssociation_withTargets (85.56s) === CONT TestAccSSMAssociation_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccSSMAssociation_tags_ComputedTag_OnUpdate_Add (90.17s) === CONT TestAccSSMAssociation_tags_EmptyTag_OnCreate --- PASS: TestAccSSMAssociation_withParameters (65.38s) === CONT TestAccSSMAssociation_tags_EmptyMap --- PASS: TestAccSSMAssociation_tags_DefaultTags_emptyResourceTag (43.66s) === CONT TestAccSSMAssociation_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccSSMAssociation_disappears_document (110.39s) === CONT TestAccSSMAssociation_applyOnlyAtCronInterval --- PASS: TestAccSSMAssociation_withDocumentVersion (36.87s) === CONT TestAccSSMAssociation_tags_null --- PASS: TestAccSSMAssociation_tags_DefaultTags_updateToResourceOnly (73.53s) === CONT TestAccSSMAssociation_tags_DefaultTags_overlapping --- PASS: TestAccSSMAssociation_withScheduleExpression (61.39s) --- PASS: TestAccSSMAssociation_withComplianceSeverity (64.13s) --- PASS: TestAccSSMAssociation_withOutputLocation (98.36s) --- PASS: TestAccSSMAssociation_Identity_RegionOverride (60.20s) --- PASS: TestAccSSMAssociation_withAutomationTargetParamName (75.07s) --- PASS: TestAccSSMAssociation_tags_DefaultTags_nonOverlapping (145.95s) --- PASS: TestAccSSMAssociation_withOutputLocation_s3Region (98.06s) --- PASS: TestAccSSMAssociation_tags (154.17s) --- PASS: TestAccSSMAssociation_tags_DefaultTags_providerOnly (157.61s) --- PASS: TestAccSSMAssociation_tags_EmptyMap (57.97s) --- PASS: TestAccSSMAssociation_tags_EmptyTag_OnCreate (68.82s) --- PASS: TestAccSSMAssociation_applyOnlyAtCronInterval (52.09s) --- PASS: TestAccSSMAssociation_tags_IgnoreTags_Overlap_DefaultTag (77.20s) --- PASS: TestAccSSMAssociation_tags_DefaultTags_updateToProviderOnly (62.01s) --- PASS: TestAccSSMAssociation_tags_null (49.43s) --- PASS: TestAccSSMAssociation_basic (105.96s) --- PASS: TestAccSSMAssociation_disappears (107.12s) --- PASS: TestAccSSMAssociation_tags_IgnoreTags_Overlap_ResourceTag (86.29s) --- PASS: TestAccSSMAssociation_tags_EmptyTag_OnUpdate_Add (85.66s) --- PASS: TestAccSSMAssociation_tags_DefaultTags_overlapping (65.42s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 195.736s ``` --- internal/service/ssm/association.go | 7 +- .../ssm/association_identity_gen_test.go | 253 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 6 +- .../testdata/Association/basic/main_gen.tf | 43 +++ .../Association/basic_v6.10.0/main_gen.tf | 53 ++++ .../Association/region_override/main_gen.tf | 53 ++++ .../ssm/testdata/Association/tags/main_gen.tf | 1 - .../Association/tagsComputed1/main_gen.tf | 1 - .../Association/tagsComputed2/main_gen.tf | 1 - .../Association/tags_defaults/main_gen.tf | 1 - .../Association/tags_ignore/main_gen.tf | 1 - .../ssm/testdata/tmpl/association_tags.gtpl | 3 +- 12 files changed, 412 insertions(+), 11 deletions(-) create mode 100644 internal/service/ssm/association_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/Association/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/Association/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/Association/region_override/main_gen.tf diff --git a/internal/service/ssm/association.go b/internal/service/ssm/association.go index 01eb2f7b3f8e..dc56a89a5acc 100644 --- a/internal/service/ssm/association.go +++ b/internal/service/ssm/association.go @@ -31,6 +31,9 @@ import ( // @SDKResource("aws_ssm_association", name="Association") // @Tags(identifierAttribute="id", resourceType="Association") +// @IdentityAttribute("association_id") +// @Testing(idAttrDuplicates="association_id") +// @Testing(preIdentityVersion="v6.10.0") func resourceAssociation() *schema.Resource { //lintignore:R011 return &schema.Resource{ @@ -39,10 +42,6 @@ func resourceAssociation() *schema.Resource { UpdateWithoutTimeout: resourceAssociationUpdate, DeleteWithoutTimeout: resourceAssociationDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - MigrateState: associationMigrateState, SchemaVersion: 1, diff --git a/internal/service/ssm/association_identity_gen_test.go b/internal/service/ssm/association_identity_gen_test.go new file mode 100644 index 000000000000..faea4f1baf70 --- /dev/null +++ b/internal/service/ssm/association_identity_gen_test.go @@ -0,0 +1,253 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMAssociation_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckAssociationDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Association/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAssociationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrAssociationID), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrAssociationID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrAssociationID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Association/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Association/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrAssociationID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Association/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrAssociationID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMAssociation_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Association/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New(names.AttrAssociationID), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrAssociationID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrAssociationID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Association/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Association/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrAssociationID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Association/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrAssociationID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMAssociation_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_association.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckAssociationDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Association/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckAssociationExists(ctx, resourceName), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Association/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrAssociationID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrAssociationID)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 93db7c1d61d1..4699455b1dca 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -102,7 +102,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa IdentifierAttribute: names.AttrID, ResourceType: "Association", }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrAssociationID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceDefaultPatchBaseline, diff --git a/internal/service/ssm/testdata/Association/basic/main_gen.tf b/internal/service/ssm/testdata/Association/basic/main_gen.tf new file mode 100644 index 000000000000..76597c7b91c3 --- /dev/null +++ b/internal/service/ssm/testdata/Association/basic/main_gen.tf @@ -0,0 +1,43 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_association" "test" { + name = aws_ssm_document.test.name + schedule_expression = "cron(0 16 ? * WED *)" + + targets { + key = "tag:Name" + values = ["acceptanceTest"] + } +} + +resource "aws_ssm_document" "test" { + name = var.rName + document_type = "Command" + + content = < Date: Thu, 28 Aug 2025 09:50:10 -0400 Subject: [PATCH 0957/2115] Add parameterized resource identity to `aws_ssm_patch_baseline` ```console % make testacc PKG=ssm TESTS=TestAccSSMPatchBaseline_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMPatchBaseline_' -timeout 360m -vet=off 2025/08/28 09:50:27 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 09:50:27 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMPatchBaseline_disappears (50.55s) === CONT TestAccSSMPatchBaseline_tags_DefaultTags_providerOnly --- PASS: TestAccSSMPatchBaseline_approveAfterDays (50.69s) === CONT TestAccSSMPatchBaseline_tags_ComputedTag_OnUpdate_Add --- PASS: TestAccSSMPatchBaseline_rejectPatchesAction (65.06s) === CONT TestAccSSMPatchBaseline_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_emptyProviderOnlyTag (76.09s) === CONT TestAccSSMPatchBaseline_tags_EmptyMap --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_nullOverlappingResourceTag (76.92s) === CONT TestAccSSMPatchBaseline_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_emptyResourceTag (77.56s) === CONT TestAccSSMPatchBaseline_tags_EmptyTag_OnCreate --- PASS: TestAccSSMPatchBaseline_approvedPatchesNonSec (78.22s) === CONT TestAccSSMPatchBaseline_tags_AddOnUpdate --- PASS: TestAccSSMPatchBaseline_availableSecurityUpdatesComplianceStatus (105.52s) === CONT TestAccSSMPatchBaseline_tags --- PASS: TestAccSSMPatchBaseline_sources (110.47s) === CONT TestAccSSMPatchBaseline_tags_null --- PASS: TestAccSSMPatchBaseline_operatingSystem (116.11s) === CONT TestAccSSMPatchBaseline_Identity_ExistingResource --- PASS: TestAccSSMPatchBaseline_Identity_Basic (123.01s) === CONT TestAccSSMPatchBaseline_tags_ComputedTag_OnCreate --- PASS: TestAccSSMPatchBaseline_approveUntilDateParam (123.30s) === CONT TestAccSSMPatchBaseline_Identity_RegionOverride --- PASS: TestAccSSMPatchBaseline_basic (127.37s) === CONT TestAccSSMPatchBaseline_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccSSMPatchBaseline_approvalRuleEmpty (127.61s) === CONT TestAccSSMPatchBaseline_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccSSMPatchBaseline_tags_EmptyTag_OnUpdate_Replace (127.88s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_updateToResourceOnly (132.93s) --- PASS: TestAccSSMPatchBaseline_tags_IgnoreTags_Overlap_DefaultTag (170.48s) --- PASS: TestAccSSMPatchBaseline_tags_ComputedTag_OnUpdate_Add (135.10s) --- PASS: TestAccSSMPatchBaseline_tags_IgnoreTags_Overlap_ResourceTag (195.71s) --- PASS: TestAccSSMPatchBaseline_tags_EmptyMap (120.03s) --- PASS: TestAccSSMPatchBaseline_tags_ComputedTag_OnCreate (74.07s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_nullNonOverlappingResourceTag (71.57s) --- PASS: TestAccSSMPatchBaseline_tags_ComputedTag_OnUpdate_Replace (135.20s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_nonOverlapping (202.03s) --- PASS: TestAccSSMPatchBaseline_tags_AddOnUpdate (125.84s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_overlapping (204.71s) --- PASS: TestAccSSMPatchBaseline_tags_null (95.14s) --- PASS: TestAccSSMPatchBaseline_Identity_RegionOverride (84.33s) --- PASS: TestAccSSMPatchBaseline_tags_EmptyTag_OnCreate (130.35s) --- PASS: TestAccSSMPatchBaseline_Identity_ExistingResource (93.49s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_updateToProviderOnly (85.72s) --- PASS: TestAccSSMPatchBaseline_tags_EmptyTag_OnUpdate_Add (140.89s) --- PASS: TestAccSSMPatchBaseline_tags_DefaultTags_providerOnly (180.72s) --- PASS: TestAccSSMPatchBaseline_tags (133.39s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 245.731s ``` --- internal/service/ssm/patch_baseline.go | 6 +- .../ssm/patch_baseline_identity_gen_test.go | 251 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 6 +- .../testdata/PatchBaseline/basic/main_gen.tf | 15 ++ .../PatchBaseline/basic_v6.10.0/main_gen.tf | 25 ++ .../PatchBaseline/region_override/main_gen.tf | 23 ++ .../testdata/tmpl/patch_baseline_tags.gtpl | 1 + 7 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 internal/service/ssm/patch_baseline_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/PatchBaseline/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/PatchBaseline/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/PatchBaseline/region_override/main_gen.tf diff --git a/internal/service/ssm/patch_baseline.go b/internal/service/ssm/patch_baseline.go index 8a26e49a7ffe..32cf34ebca58 100644 --- a/internal/service/ssm/patch_baseline.go +++ b/internal/service/ssm/patch_baseline.go @@ -32,7 +32,9 @@ import ( // @SDKResource("aws_ssm_patch_baseline", name="Patch Baseline") // @Tags(identifierAttribute="id", resourceType="PatchBaseline") +// @IdentityAttribute("id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ssm;ssm.GetPatchBaselineOutput") +// @Testing(preIdentityVersion="v6.10.0") func resourcePatchBaseline() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourcePatchBaselineCreate, @@ -40,10 +42,6 @@ func resourcePatchBaseline() *schema.Resource { UpdateWithoutTimeout: resourcePatchBaselineUpdate, DeleteWithoutTimeout: resourcePatchBaselineDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ "approval_rule": { Type: schema.TypeList, diff --git a/internal/service/ssm/patch_baseline_identity_gen_test.go b/internal/service/ssm/patch_baseline_identity_gen_test.go new file mode 100644 index 000000000000..4b8ded329e76 --- /dev/null +++ b/internal/service/ssm/patch_baseline_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMPatchBaseline_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetPatchBaselineOutput + resourceName := "aws_ssm_patch_baseline.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckPatchBaselineDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPatchBaselineExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMPatchBaseline_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_patch_baseline.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMPatchBaseline_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetPatchBaselineOutput + resourceName := "aws_ssm_patch_baseline.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckPatchBaselineDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPatchBaselineExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/PatchBaseline/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 4699455b1dca..3e4f95625e0f 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -172,7 +172,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa IdentifierAttribute: names.AttrID, ResourceType: "PatchBaseline", }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourcePatchGroup, diff --git a/internal/service/ssm/testdata/PatchBaseline/basic/main_gen.tf b/internal/service/ssm/testdata/PatchBaseline/basic/main_gen.tf new file mode 100644 index 000000000000..6b55fb2842fe --- /dev/null +++ b/internal/service/ssm/testdata/PatchBaseline/basic/main_gen.tf @@ -0,0 +1,15 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_patch_baseline" "test" { + name = var.rName + description = "Baseline containing all updates approved for production systems" + approved_patches = ["KB123456"] + approved_patches_compliance_level = "CRITICAL" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/PatchBaseline/basic_v6.10.0/main_gen.tf b/internal/service/ssm/testdata/PatchBaseline/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..6943ac651e3b --- /dev/null +++ b/internal/service/ssm/testdata/PatchBaseline/basic_v6.10.0/main_gen.tf @@ -0,0 +1,25 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_patch_baseline" "test" { + name = var.rName + description = "Baseline containing all updates approved for production systems" + approved_patches = ["KB123456"] + approved_patches_compliance_level = "CRITICAL" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ssm/testdata/PatchBaseline/region_override/main_gen.tf b/internal/service/ssm/testdata/PatchBaseline/region_override/main_gen.tf new file mode 100644 index 000000000000..a264cc8dcecd --- /dev/null +++ b/internal/service/ssm/testdata/PatchBaseline/region_override/main_gen.tf @@ -0,0 +1,23 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_patch_baseline" "test" { + region = var.region + + name = var.rName + description = "Baseline containing all updates approved for production systems" + approved_patches = ["KB123456"] + approved_patches_compliance_level = "CRITICAL" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/tmpl/patch_baseline_tags.gtpl b/internal/service/ssm/testdata/tmpl/patch_baseline_tags.gtpl index ef5a5d6aaca1..0d60ed36228b 100644 --- a/internal/service/ssm/testdata/tmpl/patch_baseline_tags.gtpl +++ b/internal/service/ssm/testdata/tmpl/patch_baseline_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_ssm_patch_baseline" "test" { +{{- template "region" }} name = var.rName description = "Baseline containing all updates approved for production systems" approved_patches = ["KB123456"] From aae9ad2e3a37f308363716af643c35c9afbbc015 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 10:52:20 -0400 Subject: [PATCH 0958/2115] Add parameterized resource identity to `aws_ssm_maintenance_window` ```console % make testacc PKG=ssm TESTS=TestAccSSMMaintenanceWindow_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMMaintenanceWindow_' -timeout 360m -vet=off 2025/08/28 10:47:26 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 10:47:26 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_nullNonOverlappingResourceTag (50.82s) === CONT TestAccSSMMaintenanceWindow_scheduleOffset --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_emptyResourceTag (53.82s) === CONT TestAccSSMMaintenanceWindow_scheduleTimezone --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_emptyProviderOnlyTag (56.56s) === CONT TestAccSSMMaintenanceWindow_schedule --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_nullOverlappingResourceTag (56.95s) === CONT TestAccSSMMaintenanceWindow_endDate --- PASS: TestAccSSMMaintenanceWindow_multipleUpdates (59.81s) === CONT TestAccSSMMaintenanceWindow_enabled --- PASS: TestAccSSMMaintenanceWindow_Identity_RegionOverride (65.63s) === CONT TestAccSSMMaintenanceWindow_duration --- PASS: TestAccSSMMaintenanceWindow_Identity_Basic (74.07s) === CONT TestAccSSMMaintenanceWindow_cutoff --- PASS: TestAccSSMMaintenanceWindow_tags_EmptyMap (74.64s) === CONT TestAccSSMMaintenanceWindow_tags_AddOnUpdate --- PASS: TestAccSSMMaintenanceWindow_tags_null (77.98s) === CONT TestAccSSMMaintenanceWindow_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_updateToResourceOnly (80.72s) === CONT TestAccSSMMaintenanceWindow_disappears --- PASS: TestAccSSMMaintenanceWindow_Identity_ExistingResource (86.36s) === CONT TestAccSSMMaintenanceWindow_description --- PASS: TestAccSSMMaintenanceWindow_tags_EmptyTag_OnUpdate_Replace (86.49s) === CONT TestAccSSMMaintenanceWindow_basic --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_updateToProviderOnly (88.69s) === CONT TestAccSSMMaintenanceWindow_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccSSMMaintenanceWindow_tags_EmptyTag_OnCreate (97.04s) === CONT TestAccSSMMaintenanceWindow_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccSSMMaintenanceWindow_startDate (99.49s) === CONT TestAccSSMMaintenanceWindow_tags_ComputedTag_OnUpdate_Add --- PASS: TestAccSSMMaintenanceWindow_disappears (35.49s) === CONT TestAccSSMMaintenanceWindow_tags_ComputedTag_OnCreate --- PASS: TestAccSSMMaintenanceWindow_scheduleOffset (73.25s) --- PASS: TestAccSSMMaintenanceWindow_tags_EmptyTag_OnUpdate_Add (126.40s) --- PASS: TestAccSSMMaintenanceWindow_schedule (70.10s) --- PASS: TestAccSSMMaintenanceWindow_enabled (71.07s) --- PASS: TestAccSSMMaintenanceWindow_basic (46.03s) --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_nonOverlapping (132.63s) --- PASS: TestAccSSMMaintenanceWindow_duration (68.72s) --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_overlapping (135.82s) --- PASS: TestAccSSMMaintenanceWindow_cutoff (64.98s) --- PASS: TestAccSSMMaintenanceWindow_scheduleTimezone (89.58s) --- PASS: TestAccSSMMaintenanceWindow_tags_AddOnUpdate (69.72s) --- PASS: TestAccSSMMaintenanceWindow_endDate (88.42s) --- PASS: TestAccSSMMaintenanceWindow_description (60.69s) --- PASS: TestAccSSMMaintenanceWindow_tags_ComputedTag_OnCreate (34.79s) --- PASS: TestAccSSMMaintenanceWindow_tags_ComputedTag_OnUpdate_Replace (64.04s) --- PASS: TestAccSSMMaintenanceWindow_tags (154.05s) --- PASS: TestAccSSMMaintenanceWindow_tags_DefaultTags_providerOnly (155.27s) --- PASS: TestAccSSMMaintenanceWindow_tags_ComputedTag_OnUpdate_Add (56.74s) --- PASS: TestAccSSMMaintenanceWindow_tags_IgnoreTags_Overlap_ResourceTag (82.12s) --- PASS: TestAccSSMMaintenanceWindow_tags_IgnoreTags_Overlap_DefaultTag (63.40s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 166.998s ``` --- internal/service/ssm/maintenance_window.go | 6 +- .../maintenance_window_identity_gen_test.go | 251 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 6 +- .../MaintenanceWindow/basic/main_gen.tf | 15 ++ .../basic_v6.10.0/main_gen.tf | 25 ++ .../region_override/main_gen.tf | 23 ++ .../tmpl/maintenance_window_tags.gtpl | 1 + 7 files changed, 322 insertions(+), 5 deletions(-) create mode 100644 internal/service/ssm/maintenance_window_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/MaintenanceWindow/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindow/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindow/region_override/main_gen.tf diff --git a/internal/service/ssm/maintenance_window.go b/internal/service/ssm/maintenance_window.go index b9bd7c3fa0cf..679610efa740 100644 --- a/internal/service/ssm/maintenance_window.go +++ b/internal/service/ssm/maintenance_window.go @@ -24,7 +24,9 @@ import ( // @SDKResource("aws_ssm_maintenance_window", name="Maintenance Window") // @Tags(identifierAttribute="id", resourceType="MaintenanceWindow") +// @IdentityAttribute("id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ssm;ssm.GetMaintenanceWindowOutput") +// @Testing(preIdentityVersion="v6.10.0") func resourceMaintenanceWindow() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceMaintenanceWindowCreate, @@ -32,10 +34,6 @@ func resourceMaintenanceWindow() *schema.Resource { UpdateWithoutTimeout: resourceMaintenanceWindowUpdate, DeleteWithoutTimeout: resourceMaintenanceWindowDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ "allow_unassociated_targets": { Type: schema.TypeBool, diff --git a/internal/service/ssm/maintenance_window_identity_gen_test.go b/internal/service/ssm/maintenance_window_identity_gen_test.go new file mode 100644 index 000000000000..c8ff5c320816 --- /dev/null +++ b/internal/service/ssm/maintenance_window_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMMaintenanceWindow_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetMaintenanceWindowOutput + resourceName := "aws_ssm_maintenance_window.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMMaintenanceWindow_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_maintenance_window.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMMaintenanceWindow_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetMaintenanceWindowOutput + resourceName := "aws_ssm_maintenance_window.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindow/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 3e4f95625e0f..03cec2bb769b 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -136,7 +136,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa IdentifierAttribute: names.AttrID, ResourceType: "MaintenanceWindow", }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceMaintenanceWindowTarget, diff --git a/internal/service/ssm/testdata/MaintenanceWindow/basic/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindow/basic/main_gen.tf new file mode 100644 index 000000000000..58de2cdfb345 --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindow/basic/main_gen.tf @@ -0,0 +1,15 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window" "test" { + name = var.rName + cutoff = 1 + duration = 3 + schedule = "cron(0 16 ? * TUE *)" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/MaintenanceWindow/basic_v6.10.0/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindow/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..fe33e6186011 --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindow/basic_v6.10.0/main_gen.tf @@ -0,0 +1,25 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window" "test" { + name = var.rName + cutoff = 1 + duration = 3 + schedule = "cron(0 16 ? * TUE *)" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ssm/testdata/MaintenanceWindow/region_override/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindow/region_override/main_gen.tf new file mode 100644 index 000000000000..39992a84741a --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindow/region_override/main_gen.tf @@ -0,0 +1,23 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window" "test" { + region = var.region + + name = var.rName + cutoff = 1 + duration = 3 + schedule = "cron(0 16 ? * TUE *)" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/tmpl/maintenance_window_tags.gtpl b/internal/service/ssm/testdata/tmpl/maintenance_window_tags.gtpl index fcce990b00a9..8410d59f9e39 100644 --- a/internal/service/ssm/testdata/tmpl/maintenance_window_tags.gtpl +++ b/internal/service/ssm/testdata/tmpl/maintenance_window_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_ssm_maintenance_window" "test" { +{{- template "region" }} name = var.rName cutoff = 1 duration = 3 From f060ef84cba494a660ef6a5e0aa05eafcdc94371 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 14:40:07 -0400 Subject: [PATCH 0959/2115] Add parameterized resource identity to `aws_ssm_maintenance_window_target` ```console % make testacc PKG=ssm TESTS=TestAccSSMMaintenanceWindowTarget_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMMaintenanceWindowTarget_' -timeout 360m -vet=off 2025/08/28 14:14:50 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 14:14:50 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMMaintenanceWindowTarget_validation (4.39s) --- PASS: TestAccSSMMaintenanceWindowTarget_Disappears_window (21.04s) --- PASS: TestAccSSMMaintenanceWindowTarget_disappears (21.20s) --- PASS: TestAccSSMMaintenanceWindowTarget_resourceGroup (22.88s) --- PASS: TestAccSSMMaintenanceWindowTarget_noNameOrDescription (23.96s) --- PASS: TestAccSSMMaintenanceWindowTarget_basic (23.98s) --- PASS: TestAccSSMMaintenanceWindowTarget_Identity_RegionOverride (28.63s) --- PASS: TestAccSSMMaintenanceWindowTarget_Identity_Basic (32.15s) --- PASS: TestAccSSMMaintenanceWindowTarget_update (35.95s) --- PASS: TestAccSSMMaintenanceWindowTarget_Identity_ExistingResource (44.83s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 51.533s ``` --- .../service/ssm/maintenance_window_target.go | 42 ++- ...tenance_window_target_identity_gen_test.go | 263 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 8 + .../MaintenanceWindowTarget/basic/main_gen.tf | 32 +++ .../basic_v6.10.0/main_gen.tf | 42 +++ .../region_override/main_gen.tf | 42 +++ .../tmpl/maintenance_window_target_basic.gtpl | 25 ++ 7 files changed, 442 insertions(+), 12 deletions(-) create mode 100644 internal/service/ssm/maintenance_window_target_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTarget/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTarget/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTarget/region_override/main_gen.tf create mode 100644 internal/service/ssm/testdata/tmpl/maintenance_window_target_basic.gtpl diff --git a/internal/service/ssm/maintenance_window_target.go b/internal/service/ssm/maintenance_window_target.go index 2e95f5f9214c..157812ad2042 100644 --- a/internal/service/ssm/maintenance_window_target.go +++ b/internal/service/ssm/maintenance_window_target.go @@ -22,10 +22,17 @@ import ( "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" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/names" ) // @SDKResource("aws_ssm_maintenance_window_target", name="Maintenance Window Target") +// @IdentityAttribute("window_id") +// @IdentityAttribute("id") +// @ImportIDHandler("maintenanceWindowTargetImportID") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ssm/types;types.MaintenanceWindowTarget") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(importStateIdFunc="testAccMaintenanceWindowTargetImportStateIdFunc") func resourceMaintenanceWindowTarget() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceMaintenanceWindowTargetCreate, @@ -33,18 +40,6 @@ func resourceMaintenanceWindowTarget() *schema.Resource { UpdateWithoutTimeout: resourceMaintenanceWindowTargetUpdate, DeleteWithoutTimeout: resourceMaintenanceWindowTargetDelete, - Importer: &schema.ResourceImporter{ - StateContext: func(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - idParts := strings.Split(d.Id(), "/") - if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("unexpected format of ID (%s), expected WINDOW_ID/WINDOW_TARGET_ID", d.Id()) - } - d.Set("window_id", idParts[0]) - d.SetId(idParts[1]) - return []*schema.ResourceData{d}, nil - }, - }, - Schema: map[string]*schema.Schema{ names.AttrDescription: { Type: schema.TypeString, @@ -262,3 +257,26 @@ func findMaintenanceWindowTargets(ctx context.Context, conn *ssm.Client, input * return output, nil } + +var _ inttypes.SDKv2ImportID = maintenanceWindowTargetImportID{} + +type maintenanceWindowTargetImportID struct{} + +func (maintenanceWindowTargetImportID) Create(d *schema.ResourceData) string { + return d.Id() +} + +func (maintenanceWindowTargetImportID) Parse(id string) (string, map[string]string, error) { + parts := strings.SplitN(id, "/", 2) + if len(parts) != 2 { + return id, nil, fmt.Errorf("maintenance_window_target id must be of the form /") + } + + windowID := parts[0] + targetID := parts[1] + + result := map[string]string{ + "window_id": windowID, + } + return targetID, result, nil +} diff --git a/internal/service/ssm/maintenance_window_target_identity_gen_test.go b/internal/service/ssm/maintenance_window_target_identity_gen_test.go new file mode 100644 index 000000000000..1e05bf2acf9a --- /dev/null +++ b/internal/service/ssm/maintenance_window_target_identity_gen_test.go @@ -0,0 +1,263 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ssm/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMMaintenanceWindowTarget_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.MaintenanceWindowTarget + resourceName := "aws_ssm_maintenance_window_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowTargetDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowTargetExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccMaintenanceWindowTargetImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccMaintenanceWindowTargetImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMMaintenanceWindowTarget_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_maintenance_window_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccMaintenanceWindowTargetImportStateIdFunc), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccMaintenanceWindowTargetImportStateIdFunc), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMMaintenanceWindowTarget_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.MaintenanceWindowTarget + resourceName := "aws_ssm_maintenance_window_target.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowTargetDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowTargetExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTarget/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 03cec2bb769b..929aa268687b 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -147,6 +147,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_ssm_maintenance_window_target", Name: "Maintenance Window Target", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("window_id", true), + inttypes.StringIdentityAttribute(names.AttrID, true), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: maintenanceWindowTargetImportID{}, + }, }, { Factory: resourceMaintenanceWindowTask, diff --git a/internal/service/ssm/testdata/MaintenanceWindowTarget/basic/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTarget/basic/main_gen.tf new file mode 100644 index 000000000000..91b248aea8f5 --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTarget/basic/main_gen.tf @@ -0,0 +1,32 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_target" "test" { + name = var.rName + description = "This resource is for test purpose only" + window_id = aws_ssm_maintenance_window.test.id + resource_type = "INSTANCE" + + targets { + key = "tag:Name" + values = ["acceptance_test"] + } + + targets { + key = "tag:Name2" + values = ["acceptance_test", "acceptance_test2"] + } +} + +resource "aws_ssm_maintenance_window" "test" { + name = var.rName + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/MaintenanceWindowTarget/basic_v6.10.0/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTarget/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..fa5c30c0401c --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTarget/basic_v6.10.0/main_gen.tf @@ -0,0 +1,42 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_target" "test" { + name = var.rName + description = "This resource is for test purpose only" + window_id = aws_ssm_maintenance_window.test.id + resource_type = "INSTANCE" + + targets { + key = "tag:Name" + values = ["acceptance_test"] + } + + targets { + key = "tag:Name2" + values = ["acceptance_test", "acceptance_test2"] + } +} + +resource "aws_ssm_maintenance_window" "test" { + name = var.rName + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ssm/testdata/MaintenanceWindowTarget/region_override/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTarget/region_override/main_gen.tf new file mode 100644 index 000000000000..c827fc89e63d --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTarget/region_override/main_gen.tf @@ -0,0 +1,42 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_target" "test" { + region = var.region + + name = var.rName + description = "This resource is for test purpose only" + window_id = aws_ssm_maintenance_window.test.id + resource_type = "INSTANCE" + + targets { + key = "tag:Name" + values = ["acceptance_test"] + } + + targets { + key = "tag:Name2" + values = ["acceptance_test", "acceptance_test2"] + } +} + +resource "aws_ssm_maintenance_window" "test" { + region = var.region + + name = var.rName + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/tmpl/maintenance_window_target_basic.gtpl b/internal/service/ssm/testdata/tmpl/maintenance_window_target_basic.gtpl new file mode 100644 index 000000000000..fa9cfdf5d3b7 --- /dev/null +++ b/internal/service/ssm/testdata/tmpl/maintenance_window_target_basic.gtpl @@ -0,0 +1,25 @@ +resource "aws_ssm_maintenance_window_target" "test" { +{{- template "region" }} + name = var.rName + description = "This resource is for test purpose only" + window_id = aws_ssm_maintenance_window.test.id + resource_type = "INSTANCE" + + targets { + key = "tag:Name" + values = ["acceptance_test"] + } + + targets { + key = "tag:Name2" + values = ["acceptance_test", "acceptance_test2"] + } +} + +resource "aws_ssm_maintenance_window" "test" { +{{- template "region" }} + name = var.rName + schedule = "cron(0 16 ? * TUE *)" + duration = 3 + cutoff = 1 +} From 02a0eaf4a52a1fa254ad84253b1ec1383acc2325 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 15:39:52 -0400 Subject: [PATCH 0960/2115] Add parameterized resource identity to `aws_ssm_maintenance_window_task` ```console % make testacc PKG=ssm TESTS=TestAccSSMMaintenanceWindowTask_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ssm/... -v -count 1 -parallel 20 -run='TestAccSSMMaintenanceWindowTask_' -timeout 360m -vet=off 2025/08/28 15:40:23 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 15:40:23 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSSMMaintenanceWindowTask_disappears (31.44s) --- PASS: TestAccSSMMaintenanceWindowTask_emptyNotification (32.72s) --- PASS: TestAccSSMMaintenanceWindowTask_noRole (33.04s) --- PASS: TestAccSSMMaintenanceWindowTask_taskInvocationStepFunctionParameters (34.80s) --- PASS: TestAccSSMMaintenanceWindowTask_noTarget (34.92s) --- PASS: TestAccSSMMaintenanceWindowTask_Identity_RegionOverride (44.41s) --- PASS: TestAccSSMMaintenanceWindowTask_Identity_Basic (48.66s) --- PASS: TestAccSSMMaintenanceWindowTask_description (50.24s) --- PASS: TestAccSSMMaintenanceWindowTask_updateForcesNewResource (50.46s) --- PASS: TestAccSSMMaintenanceWindowTask_cutoff (51.08s) --- PASS: TestAccSSMMaintenanceWindowTask_taskInvocationAutomationParameters (51.35s) --- PASS: TestAccSSMMaintenanceWindowTask_basic (52.07s) --- PASS: TestAccSSMMaintenanceWindowTask_taskInvocationLambdaParameters (52.68s) --- PASS: TestAccSSMMaintenanceWindowTask_taskInvocationRunCommandParameters (53.79s) --- PASS: TestAccSSMMaintenanceWindowTask_Identity_ExistingResource (57.33s) --- PASS: TestAccSSMMaintenanceWindowTask_taskInvocationRunCommandParametersCloudWatch (59.85s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ssm 66.597s ``` --- .../service/ssm/maintenance_window_task.go | 49 ++-- ...intenance_window_task_identity_gen_test.go | 263 ++++++++++++++++++ internal/service/ssm/service_package_gen.go | 8 + .../MaintenanceWindowTask/basic/main_gen.tf | 82 ++++++ .../basic_v6.10.0/main_gen.tf | 92 ++++++ .../region_override/main_gen.tf | 94 +++++++ .../tmpl/maintenance_window_task_basic.gtpl | 76 +++++ 7 files changed, 645 insertions(+), 19 deletions(-) create mode 100644 internal/service/ssm/maintenance_window_task_identity_gen_test.go create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTask/basic/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTask/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ssm/testdata/MaintenanceWindowTask/region_override/main_gen.tf create mode 100644 internal/service/ssm/testdata/tmpl/maintenance_window_task_basic.gtpl diff --git a/internal/service/ssm/maintenance_window_task.go b/internal/service/ssm/maintenance_window_task.go index ee54f9b8d545..5438f26aaca2 100644 --- a/internal/service/ssm/maintenance_window_task.go +++ b/internal/service/ssm/maintenance_window_task.go @@ -26,11 +26,18 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/flex" tfmaps "github.com/hashicorp/terraform-provider-aws/internal/maps" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" ) // @SDKResource("aws_ssm_maintenance_window_task", name="Maintenance Window Task") +// @IdentityAttribute("window_id") +// @IdentityAttribute("id") +// @ImportIDHandler("maintenanceWindowTaskImportID") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ssm;ssm.GetMaintenanceWindowTaskOutput") +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(importStateIdFunc="testAccMaintenanceWindowTaskImportStateIdFunc") func resourceMaintenanceWindowTask() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceMaintenanceWindowTaskCreate, @@ -38,10 +45,6 @@ func resourceMaintenanceWindowTask() *schema.Resource { UpdateWithoutTimeout: resourceMaintenanceWindowTaskUpdate, DeleteWithoutTimeout: resourceMaintenanceWindowTaskDelete, - Importer: &schema.ResourceImporter{ - StateContext: resourceMaintenanceWindowTaskImport, - }, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, @@ -504,21 +507,6 @@ func resourceMaintenanceWindowTaskDelete(ctx context.Context, d *schema.Resource return diags } -func resourceMaintenanceWindowTaskImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - idParts := strings.SplitN(d.Id(), "/", 2) - if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { - return nil, fmt.Errorf("unexpected format of ID (%q), expected /", d.Id()) - } - - windowID := idParts[0] - windowTaskID := idParts[1] - - d.Set("window_id", windowID) - d.SetId(windowTaskID) - - return []*schema.ResourceData{d}, nil -} - func findMaintenanceWindowTaskByTwoPartKey(ctx context.Context, conn *ssm.Client, windowID, windowTaskID string) (*ssm.GetMaintenanceWindowTaskOutput, error) { input := &ssm.GetMaintenanceWindowTaskInput{ WindowId: aws.String(windowID), @@ -869,3 +857,26 @@ func flattenTaskInvocationCommonParameters(apiObject map[string][]string) []any return tfList } + +var _ inttypes.SDKv2ImportID = maintenanceWindowTaskImportID{} + +type maintenanceWindowTaskImportID struct{} + +func (maintenanceWindowTaskImportID) Create(d *schema.ResourceData) string { + return d.Id() +} + +func (maintenanceWindowTaskImportID) Parse(id string) (string, map[string]string, error) { + parts := strings.SplitN(id, "/", 2) + if len(parts) != 2 { + return id, nil, fmt.Errorf("maintenance_window_task id must be of the form /") + } + + windowID := parts[0] + taskID := parts[1] + + result := map[string]string{ + "window_id": windowID, + } + return taskID, result, nil +} diff --git a/internal/service/ssm/maintenance_window_task_identity_gen_test.go b/internal/service/ssm/maintenance_window_task_identity_gen_test.go new file mode 100644 index 000000000000..5454e53baaa7 --- /dev/null +++ b/internal/service/ssm/maintenance_window_task_identity_gen_test.go @@ -0,0 +1,263 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ssm_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ssm" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccSSMMaintenanceWindowTask_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetMaintenanceWindowTaskOutput + resourceName := "aws_ssm_maintenance_window_task.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowTaskDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowTaskExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: testAccMaintenanceWindowTaskImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: testAccMaintenanceWindowTaskImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccSSMMaintenanceWindowTask_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_ssm_maintenance_window_task.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccMaintenanceWindowTaskImportStateIdFunc), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFuncAdapter(resourceName, testAccMaintenanceWindowTaskImportStateIdFunc), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("window_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccSSMMaintenanceWindowTask_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v ssm.GetMaintenanceWindowTaskOutput + resourceName := "aws_ssm_maintenance_window_task.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SSMServiceID), + CheckDestroy: testAccCheckMaintenanceWindowTaskDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic_v6.10.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckMaintenanceWindowTaskExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/MaintenanceWindowTask/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + "window_id": knownvalue.NotNull(), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New("window_id")), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index 929aa268687b..cebf64854ba4 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -161,6 +161,14 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa TypeName: "aws_ssm_maintenance_window_task", Name: "Maintenance Window Task", Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalParameterizedIdentity([]inttypes.IdentityAttribute{ + inttypes.StringIdentityAttribute("window_id", true), + inttypes.StringIdentityAttribute(names.AttrID, true), + }), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + ImportID: maintenanceWindowTaskImportID{}, + }, }, { Factory: resourceParameter, diff --git a/internal/service/ssm/testdata/MaintenanceWindowTask/basic/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTask/basic/main_gen.tf new file mode 100644 index 000000000000..64a9fab468a6 --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTask/basic/main_gen.tf @@ -0,0 +1,82 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_task" "test" { + window_id = aws_ssm_maintenance_window.test.id + task_type = "RUN_COMMAND" + task_arn = "AWS-RunShellScript" + priority = 1 + service_role_arn = aws_iam_role.test.arn + max_concurrency = "2" + max_errors = "1" + + targets { + key = "WindowTargetIds" + values = [aws_ssm_maintenance_window_target.test.id] + } + + task_invocation_parameters { + run_command_parameters { + parameter { + name = "commands" + values = ["pwd"] + } + } + } +} + +resource "aws_ssm_maintenance_window" "test" { + cutoff = 1 + duration = 3 + name = var.rName + schedule = "cron(0 16 ? * TUE *)" +} + +resource "aws_ssm_maintenance_window_target" "test" { + name = var.rName + resource_type = "INSTANCE" + window_id = aws_ssm_maintenance_window.test.id + + targets { + key = "tag:Name" + values = ["tf-acc-test"] + } +} + +resource "aws_iam_role" "test" { + name = var.rName + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Action = "sts:AssumeRole" + Principal = { + Service = "events.amazonaws.com" + } + Effect = "Allow" + Sid = "" + } + ] + }) +} + +resource "aws_iam_role_policy" "test" { + name = var.rName + role = aws_iam_role.test.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = { + Effect = "Allow" + Action = "ssm:*" + Resource = "*" + } + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/MaintenanceWindowTask/basic_v6.10.0/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTask/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..34f978539e62 --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTask/basic_v6.10.0/main_gen.tf @@ -0,0 +1,92 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_task" "test" { + window_id = aws_ssm_maintenance_window.test.id + task_type = "RUN_COMMAND" + task_arn = "AWS-RunShellScript" + priority = 1 + service_role_arn = aws_iam_role.test.arn + max_concurrency = "2" + max_errors = "1" + + targets { + key = "WindowTargetIds" + values = [aws_ssm_maintenance_window_target.test.id] + } + + task_invocation_parameters { + run_command_parameters { + parameter { + name = "commands" + values = ["pwd"] + } + } + } +} + +resource "aws_ssm_maintenance_window" "test" { + cutoff = 1 + duration = 3 + name = var.rName + schedule = "cron(0 16 ? * TUE *)" +} + +resource "aws_ssm_maintenance_window_target" "test" { + name = var.rName + resource_type = "INSTANCE" + window_id = aws_ssm_maintenance_window.test.id + + targets { + key = "tag:Name" + values = ["tf-acc-test"] + } +} + +resource "aws_iam_role" "test" { + name = var.rName + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Action = "sts:AssumeRole" + Principal = { + Service = "events.amazonaws.com" + } + Effect = "Allow" + Sid = "" + } + ] + }) +} + +resource "aws_iam_role_policy" "test" { + name = var.rName + role = aws_iam_role.test.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = { + Effect = "Allow" + Action = "ssm:*" + Resource = "*" + } + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ssm/testdata/MaintenanceWindowTask/region_override/main_gen.tf b/internal/service/ssm/testdata/MaintenanceWindowTask/region_override/main_gen.tf new file mode 100644 index 000000000000..613663df7b0a --- /dev/null +++ b/internal/service/ssm/testdata/MaintenanceWindowTask/region_override/main_gen.tf @@ -0,0 +1,94 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_ssm_maintenance_window_task" "test" { + region = var.region + + window_id = aws_ssm_maintenance_window.test.id + task_type = "RUN_COMMAND" + task_arn = "AWS-RunShellScript" + priority = 1 + service_role_arn = aws_iam_role.test.arn + max_concurrency = "2" + max_errors = "1" + + targets { + key = "WindowTargetIds" + values = [aws_ssm_maintenance_window_target.test.id] + } + + task_invocation_parameters { + run_command_parameters { + parameter { + name = "commands" + values = ["pwd"] + } + } + } +} + +resource "aws_ssm_maintenance_window" "test" { + region = var.region + + cutoff = 1 + duration = 3 + name = var.rName + schedule = "cron(0 16 ? * TUE *)" +} + +resource "aws_ssm_maintenance_window_target" "test" { + region = var.region + + name = var.rName + resource_type = "INSTANCE" + window_id = aws_ssm_maintenance_window.test.id + + targets { + key = "tag:Name" + values = ["tf-acc-test"] + } +} + +resource "aws_iam_role" "test" { + name = var.rName + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Action = "sts:AssumeRole" + Principal = { + Service = "events.amazonaws.com" + } + Effect = "Allow" + Sid = "" + } + ] + }) +} + +resource "aws_iam_role_policy" "test" { + name = var.rName + role = aws_iam_role.test.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = { + Effect = "Allow" + Action = "ssm:*" + Resource = "*" + } + }) +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ssm/testdata/tmpl/maintenance_window_task_basic.gtpl b/internal/service/ssm/testdata/tmpl/maintenance_window_task_basic.gtpl new file mode 100644 index 000000000000..5bbfb3a96bb1 --- /dev/null +++ b/internal/service/ssm/testdata/tmpl/maintenance_window_task_basic.gtpl @@ -0,0 +1,76 @@ +resource "aws_ssm_maintenance_window_task" "test" { +{{- template "region" }} + window_id = aws_ssm_maintenance_window.test.id + task_type = "RUN_COMMAND" + task_arn = "AWS-RunShellScript" + priority = 1 + service_role_arn = aws_iam_role.test.arn + max_concurrency = "2" + max_errors = "1" + + targets { + key = "WindowTargetIds" + values = [aws_ssm_maintenance_window_target.test.id] + } + + task_invocation_parameters { + run_command_parameters { + parameter { + name = "commands" + values = ["pwd"] + } + } + } +} + +resource "aws_ssm_maintenance_window" "test" { +{{- template "region" }} + cutoff = 1 + duration = 3 + name = var.rName + schedule = "cron(0 16 ? * TUE *)" +} + +resource "aws_ssm_maintenance_window_target" "test" { +{{- template "region" }} + name = var.rName + resource_type = "INSTANCE" + window_id = aws_ssm_maintenance_window.test.id + + targets { + key = "tag:Name" + values = ["tf-acc-test"] + } +} + +resource "aws_iam_role" "test" { + name = var.rName + + assume_role_policy = jsonencode({ + Version = "2012-10-17" + Statement = [ + { + Action = "sts:AssumeRole" + Principal = { + Service = "events.amazonaws.com" + } + Effect = "Allow" + Sid = "" + } + ] + }) +} + +resource "aws_iam_role_policy" "test" { + name = var.rName + role = aws_iam_role.test.name + + policy = jsonencode({ + Version = "2012-10-17" + Statement = { + Effect = "Allow" + Action = "ssm:*" + Resource = "*" + } + }) +} From ef2c3ac9f42ea85ab5491e638af11275763cd254 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 28 Aug 2025 16:30:46 -0400 Subject: [PATCH 0961/2115] ProvisionedProduct: Force state refresh if Update results in TAINTED state. --- .../servicecatalog/provisioned_product.go | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 337bac260b18..97ffd1475107 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -421,6 +421,10 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // } recordIdToUse := aws.ToString(detail.LastProvisioningRecordId) + if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { + recordIdToUse = aws.ToString(detail.LastSuccessfulProvisioningRecordId) + log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), recordIdToUse) + } outputDR, err := findRecordByTwoPartKey(ctx, conn, recordIdToUse, acceptLanguage) if !d.IsNewResource() && tfresource.NotFound(err) { @@ -523,24 +527,23 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat } if _, err := waitProvisionedProductReady(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutUpdate)); err != nil { - // // Check if this is a state inconsistency error - // var failureErr *ProvisionedProductFailureError - // if errors.As(err, &failureErr) && failureErr.IsStateInconsistent() { - // // Force a state refresh to get actual AWS values before returning error - // log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) - - // // Perform state refresh to get actual current values from AWS - // refreshDiags := resourceProvisionedProductRead(ctx, d, meta) - // if refreshDiags.HasError() { - // // If refresh fails, return both errors - // return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) - // } - - // // Return the original failure error after state is corrected - // return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) - // } - - // // For other errors, proceed as before + // Check if this is a state inconsistency error + if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { + // Force a state refresh to get actual AWS values before returning error + log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) + + // Perform state refresh to get actual current values from AWS + refreshDiags := resourceProvisionedProductRead(ctx, d, meta) + if refreshDiags.HasError() { + // If refresh fails, return both errors + return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) + } + + // Return the original failure error after state is corrected + return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) + } + + // For other errors, proceed as before return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } From e28172cff5ada931d9fa67d3628dcd8c8ba14322 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 16:29:54 -0400 Subject: [PATCH 0962/2115] r/aws_ssm(doc): add import by identity section --- website/docs/r/ssm_association.html.markdown | 30 +++++++++++++++-- website/docs/r/ssm_document.html.markdown | 26 +++++++++++++++ .../r/ssm_maintenance_window.html.markdown | 30 +++++++++++++++-- ...sm_maintenance_window_target.html.markdown | 28 ++++++++++++++++ .../ssm_maintenance_window_task.html.markdown | 32 +++++++++++++++++-- website/docs/r/ssm_parameter.html.markdown | 30 +++++++++++++++-- .../docs/r/ssm_patch_baseline.html.markdown | 26 +++++++++++++++ 7 files changed, 194 insertions(+), 8 deletions(-) diff --git a/website/docs/r/ssm_association.html.markdown b/website/docs/r/ssm_association.html.markdown index ac76897ab3ce..ba9d7cda965a 100644 --- a/website/docs/r/ssm_association.html.markdown +++ b/website/docs/r/ssm_association.html.markdown @@ -286,11 +286,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_association.example + identity = { + association_id = "10abcdef-0abc-1234-5678-90abcdef123456" + } +} + +resource "aws_ssm_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `association_id` - (String) ID of the SSM association. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM associations using the `association_id`. For example: ```terraform import { - to = aws_ssm_association.test-association + to = aws_ssm_association.example id = "10abcdef-0abc-1234-5678-90abcdef123456" } ``` @@ -298,5 +324,5 @@ import { Using `terraform import`, import SSM associations using the `association_id`. For example: ```console -% terraform import aws_ssm_association.test-association 10abcdef-0abc-1234-5678-90abcdef123456 +% terraform import aws_ssm_association.example 10abcdef-0abc-1234-5678-90abcdef123456 ``` diff --git a/website/docs/r/ssm_document.html.markdown b/website/docs/r/ssm_document.html.markdown index d0b6ecf61cd4..bdd2ec686630 100644 --- a/website/docs/r/ssm_document.html.markdown +++ b/website/docs/r/ssm_document.html.markdown @@ -132,6 +132,32 @@ The `parameter` configuration block provides the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_document.example + identity = { + name = "example" + } +} + +resource "aws_ssm_document" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the SSM document. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Documents using the name. For example: ```terraform diff --git a/website/docs/r/ssm_maintenance_window.html.markdown b/website/docs/r/ssm_maintenance_window.html.markdown index 06697e3fbd09..99ce381c2af6 100644 --- a/website/docs/r/ssm_maintenance_window.html.markdown +++ b/website/docs/r/ssm_maintenance_window.html.markdown @@ -48,11 +48,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window.example + identity = { + id = "mw-0123456789" + } +} + +resource "aws_ssm_maintenance_window" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the maintenance window. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Windows using the maintenance window `id`. For example: ```terraform import { - to = aws_ssm_maintenance_window.imported-window + to = aws_ssm_maintenance_window.example id = "mw-0123456789" } ``` @@ -60,5 +86,5 @@ import { Using `terraform import`, import SSM Maintenance Windows using the maintenance window `id`. For example: ```console -% terraform import aws_ssm_maintenance_window.imported-window mw-0123456789 +% terraform import aws_ssm_maintenance_window.example mw-0123456789 ``` diff --git a/website/docs/r/ssm_maintenance_window_target.html.markdown b/website/docs/r/ssm_maintenance_window_target.html.markdown index 988df4649728..db2ca8af7962 100644 --- a/website/docs/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/r/ssm_maintenance_window_target.html.markdown @@ -79,6 +79,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_target.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "23639a0b-ddbc-4bca-9e72-78d96EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `window_id` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window target. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Window targets using `WINDOW_ID/WINDOW_TARGET_ID`. For example: ```terraform diff --git a/website/docs/r/ssm_maintenance_window_task.html.markdown b/website/docs/r/ssm_maintenance_window_task.html.markdown index 5bce6e9c79ab..4a81183163ac 100644 --- a/website/docs/r/ssm_maintenance_window_task.html.markdown +++ b/website/docs/r/ssm_maintenance_window_task.html.markdown @@ -209,11 +209,39 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_task.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "4f7ca192-7e9a-40fe-9192-5cb15EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `window_id` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window task. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Maintenance Window Task using the `window_id` and `window_task_id` separated by `/`. For example: ```terraform import { - to = aws_ssm_maintenance_window_task.task + to = aws_ssm_maintenance_window_task.example id = "/" } ``` @@ -221,5 +249,5 @@ import { Using `terraform import`, import AWS Maintenance Window Task using the `window_id` and `window_task_id` separated by `/`. For example: ```console -% terraform import aws_ssm_maintenance_window_task.task / +% terraform import aws_ssm_maintenance_window_task.example / ``` diff --git a/website/docs/r/ssm_parameter.html.markdown b/website/docs/r/ssm_parameter.html.markdown index 788cc7dcb976..2cdb22aa4a43 100644 --- a/website/docs/r/ssm_parameter.html.markdown +++ b/website/docs/r/ssm_parameter.html.markdown @@ -92,11 +92,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_parameter.example + identity = { + name = "/my_path/my_paramname" + } +} + +resource "aws_ssm_parameter" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the parameter. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Parameters using the parameter store `name`. For example: ```terraform import { - to = aws_ssm_parameter.my_param + to = aws_ssm_parameter.example id = "/my_path/my_paramname" } ``` @@ -104,5 +130,5 @@ import { Using `terraform import`, import SSM Parameters using the parameter store `name`. For example: ```console -% terraform import aws_ssm_parameter.my_param /my_path/my_paramname +% terraform import aws_ssm_parameter.example /my_path/my_paramname ``` diff --git a/website/docs/r/ssm_patch_baseline.html.markdown b/website/docs/r/ssm_patch_baseline.html.markdown index 82033fe4bd6a..e2cc256485a0 100644 --- a/website/docs/r/ssm_patch_baseline.html.markdown +++ b/website/docs/r/ssm_patch_baseline.html.markdown @@ -207,6 +207,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_patch_baseline.example + identity = { + id = "pb-12345678" + } +} + +resource "aws_ssm_patch_baseline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the patch baseline. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Patch Baselines using their baseline ID. For example: ```terraform From 0b26b37a1a3348934e27ce724f7ffb996a54a978 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 28 Aug 2025 16:36:53 -0400 Subject: [PATCH 0963/2115] chore: changelog --- .changelog/44075.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .changelog/44075.txt diff --git a/.changelog/44075.txt b/.changelog/44075.txt new file mode 100644 index 000000000000..b6a46af8e657 --- /dev/null +++ b/.changelog/44075.txt @@ -0,0 +1,18 @@ +```release-note:enhancement +resource/aws_ssm_association: Add resource identity support +``` +```release-note:enhancement +resource/aws_ssm_document: Add resource identity support +``` +```release-note:enhancement +resource/aws_ssm_maintenance_window: Add resource identity support +``` +```release-note:enhancement +resource/aws_ssm_maintenance_window_target: Add resource identity support +``` +```release-note:enhancement +resource/aws_ssm_maintenance_window_task: Add resource identity support +``` +```release-note:enhancement +resource/aws_ssm_patch_baseline: Add resource identity support +``` From 151a36662c706477f8bee6d4843e00f5fcc030f2 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:10:28 +0900 Subject: [PATCH 0964/2115] Implement ip_address_type and ipv6_address arguments for the resource --- internal/service/efs/mount_target.go | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/internal/service/efs/mount_target.go b/internal/service/efs/mount_target.go index 2f44be00a39d..91ff2bdc3240 100644 --- a/internal/service/efs/mount_target.go +++ b/internal/service/efs/mount_target.go @@ -75,6 +75,20 @@ func resourceMountTarget() *schema.Resource { ForceNew: true, ValidateFunc: validation.IsIPv4Address, }, + names.AttrIPAddressType: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateDiagFunc: enum.Validate[awstypes.IpAddressType](), + }, + "ipv6_address": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateFunc: validation.IsIPv6Address, + }, "mount_target_dns_name": { Type: schema.TypeString, Computed: true, @@ -131,6 +145,14 @@ func resourceMountTargetCreate(ctx context.Context, d *schema.ResourceData, meta input.IpAddress = aws.String(v.(string)) } + if v, ok := d.GetOk(names.AttrIPAddressType); ok { + input.IpAddressType = awstypes.IpAddressType(v.(string)) + } + + if v, ok := d.GetOk("ipv6_address"); ok { + input.Ipv6Address = aws.String(v.(string)) + } + if v, ok := d.GetOk(names.AttrSecurityGroups); ok { input.SecurityGroups = flex.ExpandStringValueSet(v.(*schema.Set)) } @@ -180,6 +202,16 @@ func resourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta a d.Set("file_system_arn", fsARN) d.Set(names.AttrFileSystemID, fsID) d.Set(names.AttrIPAddress, mt.IpAddress) + if mt.IpAddress != nil && mt.Ipv6Address != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeDualStack) + } else if mt.IpAddress != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeIpv4Only) + } else if mt.Ipv6Address != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeIpv6Only) + } else { + d.Set(names.AttrIPAddressType, nil) + } + d.Set("ipv6_address", mt.Ipv6Address) d.Set("mount_target_dns_name", meta.(*conns.AWSClient).RegionalHostname(ctx, fmt.Sprintf("%s.%s.efs", aws.ToString(mt.AvailabilityZoneName), aws.ToString(mt.FileSystemId)))) d.Set(names.AttrNetworkInterfaceID, mt.NetworkInterfaceId) d.Set(names.AttrOwnerID, mt.OwnerId) From 06c6b68b25274366f49f91ce47001698b375a936 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:11:05 +0900 Subject: [PATCH 0965/2115] Add acctests for ip_address_type and ipv6_address arguments --- internal/service/efs/mount_target_test.go | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+) diff --git a/internal/service/efs/mount_target_test.go b/internal/service/efs/mount_target_test.go index 9aea3dbd8941..167e1412a789 100644 --- a/internal/service/efs/mount_target_test.go +++ b/internal/service/efs/mount_target_test.go @@ -42,6 +42,8 @@ func TestAccEFSMountTarget_basic(t *testing.T) { acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrDNSName, "efs", regexache.MustCompile(`fs-[^.]+`)), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "file_system_arn", "elasticfilesystem", regexache.MustCompile(`file-system/fs-.+`)), resource.TestMatchResourceAttr(resourceName, names.AttrIPAddress, regexache.MustCompile(`\d+\.\d+\.\d+\.\d+`)), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, string(awstypes.IpAddressTypeIpv4Only)), + resource.TestCheckResourceAttr(resourceName, "ipv6_address", ""), resource.TestCheckResourceAttrSet(resourceName, "mount_target_dns_name"), resource.TestCheckResourceAttrSet(resourceName, names.AttrNetworkInterfaceID), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), @@ -117,6 +119,126 @@ func TestAccEFSMountTarget_ipAddress(t *testing.T) { }) } +func TestAccEFSMountTarget_ipAddressTypeIPv6Only(t *testing.T) { + ctx := acctest.Context(t) + var mount awstypes.MountTargetDescription + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_efs_mount_target.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EFSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckMountTargetDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccMountTargetConfig_ipAddressTypeIPv6Only(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckMountTargetExists(ctx, resourceName, &mount), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddress, ""), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, string(awstypes.IpAddressTypeIpv6Only)), + resource.TestCheckResourceAttrSet(resourceName, "ipv6_address"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccEFSMountTarget_ipAddressTypeIPv6OnlyWithIPv6Address(t *testing.T) { + ctx := acctest.Context(t) + var mount awstypes.MountTargetDescription + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_efs_mount_target.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EFSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckMountTargetDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccMountTargetConfig_ipAddressTypeIPv6OnlyWithIPv6Address(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckMountTargetExists(ctx, resourceName, &mount), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddress, ""), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, string(awstypes.IpAddressTypeIpv6Only)), + resource.TestCheckResourceAttrSet(resourceName, "ipv6_address"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccEFSMountTarget_ipAddressTypeDualStack(t *testing.T) { + ctx := acctest.Context(t) + var mount awstypes.MountTargetDescription + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_efs_mount_target.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EFSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckMountTargetDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccMountTargetConfig_ipAddressTypeDualStack(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckMountTargetExists(ctx, resourceName, &mount), + resource.TestCheckResourceAttrSet(resourceName, names.AttrIPAddress), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, string(awstypes.IpAddressTypeDualStack)), + resource.TestCheckResourceAttrSet(resourceName, "ipv6_address"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccEFSMountTarget_ipAddressTypeDualStackWithIPv6Address(t *testing.T) { + ctx := acctest.Context(t) + var mount awstypes.MountTargetDescription + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_efs_mount_target.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EFSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckMountTargetDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccMountTargetConfig_ipAddressTypeDualStackWithIPv6Address(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckMountTargetExists(ctx, resourceName, &mount), + resource.TestCheckResourceAttrSet(resourceName, names.AttrIPAddress), + resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, string(awstypes.IpAddressTypeDualStack)), + resource.TestCheckResourceAttrSet(resourceName, "ipv6_address"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/13845 func TestAccEFSMountTarget_IPAddress_emptyString(t *testing.T) { ctx := acctest.Context(t) @@ -202,6 +324,33 @@ resource "aws_efs_file_system" "test" { `, rName)) } +func testAccMountTargetConfig_withDualStackSubnet(rName string) string { + return acctest.ConfigCompose(acctest.ConfigVPCWithSubnetsIPv6(rName, 2), fmt.Sprintf(` +resource "aws_subnet" "test_ipv6_only" { + vpc_id = aws_vpc.test.id + availability_zone = data.aws_availability_zones.available.names[0] + + ipv6_cidr_block = cidrsubnet(aws_vpc.test.ipv6_cidr_block, 8, 7) + + enable_resource_name_dns_aaaa_record_on_launch = true + + assign_ipv6_address_on_creation = true + + ipv6_native = true + + tags = { + Name = %[1]q + } +} + +resource "aws_efs_file_system" "test" { + tags = { + Name = %[1]q + } +} +`, rName)) +} + func testAccMountTargetConfig_basic(rName string) string { return acctest.ConfigCompose(testAccMountTargetConfig_base(rName), ` resource "aws_efs_mount_target" "test" { @@ -244,3 +393,45 @@ resource "aws_efs_mount_target" "test" { } `) } + +func testAccMountTargetConfig_ipAddressTypeIPv6Only(rName string) string { + return acctest.ConfigCompose(testAccMountTargetConfig_withDualStackSubnet(rName), ` +resource "aws_efs_mount_target" "test" { + file_system_id = aws_efs_file_system.test.id + ip_address_type = "IPV6_ONLY" + subnet_id = aws_subnet.test_ipv6_only.id +} +`) +} + +func testAccMountTargetConfig_ipAddressTypeIPv6OnlyWithIPv6Address(rName string) string { + return acctest.ConfigCompose(testAccMountTargetConfig_withDualStackSubnet(rName), ` +resource "aws_efs_mount_target" "test" { + file_system_id = aws_efs_file_system.test.id + ip_address_type = "IPV6_ONLY" + ipv6_address = cidrhost(aws_subnet.test_ipv6_only.ipv6_cidr_block, 10) + subnet_id = aws_subnet.test_ipv6_only.id +} +`) +} + +func testAccMountTargetConfig_ipAddressTypeDualStack(rName string) string { + return acctest.ConfigCompose(testAccMountTargetConfig_withDualStackSubnet(rName), ` +resource "aws_efs_mount_target" "test" { + file_system_id = aws_efs_file_system.test.id + ip_address_type = "DUAL_STACK" + subnet_id = aws_subnet.test[0].id +} +`) +} + +func testAccMountTargetConfig_ipAddressTypeDualStackWithIPv6Address(rName string) string { + return acctest.ConfigCompose(testAccMountTargetConfig_withDualStackSubnet(rName), ` +resource "aws_efs_mount_target" "test" { + file_system_id = aws_efs_file_system.test.id + ip_address_type = "DUAL_STACK" + ipv6_address = cidrhost(aws_subnet.test[0].ipv6_cidr_block, 10) + subnet_id = aws_subnet.test[0].id +} +`) +} From 6b6c5e4d339544ec86753cc046d7567ce8fa7319 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:11:53 +0900 Subject: [PATCH 0966/2115] Add ip_address_type and ipv6_address attributes for the data source --- .../service/efs/mount_target_data_source.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/service/efs/mount_target_data_source.go b/internal/service/efs/mount_target_data_source.go index 7f6de5f24ae5..894b9cea23d8 100644 --- a/internal/service/efs/mount_target_data_source.go +++ b/internal/service/efs/mount_target_data_source.go @@ -54,6 +54,14 @@ func dataSourceMountTarget() *schema.Resource { Type: schema.TypeString, Computed: true, }, + names.AttrIPAddressType: { + Type: schema.TypeString, + Computed: true, + }, + "ipv6_address": { + Type: schema.TypeString, + Computed: true, + }, "mount_target_id": { Type: schema.TypeString, Optional: true, @@ -123,6 +131,16 @@ func dataSourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta d.Set("file_system_arn", fsARN) d.Set(names.AttrFileSystemID, fsID) d.Set(names.AttrIPAddress, mt.IpAddress) + if mt.IpAddress != nil && mt.Ipv6Address != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeDualStack) + } else if mt.IpAddress != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeIpv4Only) + } else if mt.Ipv6Address != nil { + d.Set(names.AttrIPAddressType, awstypes.IpAddressTypeIpv6Only) + } else { + d.Set(names.AttrIPAddressType, nil) + } + d.Set("ipv6_address", mt.Ipv6Address) d.Set("mount_target_dns_name", meta.(*conns.AWSClient).RegionalHostname(ctx, fmt.Sprintf("%s.%s.efs", aws.ToString(mt.AvailabilityZoneName), aws.ToString(mt.FileSystemId)))) d.Set("mount_target_id", mt.MountTargetId) d.Set(names.AttrNetworkInterfaceID, mt.NetworkInterfaceId) From 97a606f551697e6e0a67c865066139b4cdcad02b Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:12:21 +0900 Subject: [PATCH 0967/2115] Add checks to the acctests for the data source --- internal/service/efs/mount_target_data_source_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/efs/mount_target_data_source_test.go b/internal/service/efs/mount_target_data_source_test.go index 774c3f84e8b0..78f497822377 100644 --- a/internal/service/efs/mount_target_data_source_test.go +++ b/internal/service/efs/mount_target_data_source_test.go @@ -30,6 +30,8 @@ func TestAccEFSMountTargetDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "file_system_arn", resourceName, "file_system_arn"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrFileSystemID, resourceName, names.AttrFileSystemID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddress, resourceName, names.AttrIPAddress), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddressType, resourceName, names.AttrIPAddressType), + resource.TestCheckResourceAttrPair(dataSourceName, "ipv6_address", resourceName, "ipv6_address"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrSubnetID, resourceName, names.AttrSubnetID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrNetworkInterfaceID, resourceName, names.AttrNetworkInterfaceID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDNSName, resourceName, names.AttrDNSName), @@ -61,6 +63,8 @@ func TestAccEFSMountTargetDataSource_byAccessPointID(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "file_system_arn", resourceName, "file_system_arn"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrFileSystemID, resourceName, names.AttrFileSystemID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddress, resourceName, names.AttrIPAddress), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddressType, resourceName, names.AttrIPAddressType), + resource.TestCheckResourceAttrPair(dataSourceName, "ipv6_address", resourceName, "ipv6_address"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrSubnetID, resourceName, names.AttrSubnetID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrNetworkInterfaceID, resourceName, names.AttrNetworkInterfaceID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDNSName, resourceName, names.AttrDNSName), @@ -92,6 +96,8 @@ func TestAccEFSMountTargetDataSource_byFileSystemID(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "file_system_arn", resourceName, "file_system_arn"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrFileSystemID, resourceName, names.AttrFileSystemID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddress, resourceName, names.AttrIPAddress), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrIPAddressType, resourceName, names.AttrIPAddressType), + resource.TestCheckResourceAttrPair(dataSourceName, "ipv6_address", resourceName, "ipv6_address"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrSubnetID, resourceName, names.AttrSubnetID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrNetworkInterfaceID, resourceName, names.AttrNetworkInterfaceID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDNSName, resourceName, names.AttrDNSName), From e2fdf7fd64fcb3408e3ddbf9f29e7cf48eaac104 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:12:49 +0900 Subject: [PATCH 0968/2115] Update the documentation for the resource --- website/docs/r/efs_mount_target.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/r/efs_mount_target.html.markdown b/website/docs/r/efs_mount_target.html.markdown index 51c03ab784ed..95d1d65048fb 100644 --- a/website/docs/r/efs_mount_target.html.markdown +++ b/website/docs/r/efs_mount_target.html.markdown @@ -38,6 +38,8 @@ This resource supports the following arguments: * `subnet_id` - (Required) The ID of the subnet to add the mount target in. * `ip_address` - (Optional) The address (within the address range of the specified subnet) at which the file system may be mounted via the mount target. +* `ip_address_type` - (Optional) IP address type for the mount target. Valid values are `IPV4_ONLY` (only IPv4 addresses), `IPV6_ONLY` (only IPv6 addresses), and `DUAL_STACK` (dual-stack, both IPv4 and IPv6 addresses). Defaults to `IPV4_ONLY`. +* `ipv6_address` - (Optional) IPv6 address to use. Valid only when `ip_address_type` is set to `IPV6_ONLY` or `DUAL_STACK`. * `security_groups` - (Optional) A list of up to 5 VPC security group IDs (that must be for the same VPC as subnet specified) in effect for the mount target. From 9c7f0a9da46169beaa6db634fd3b69f2cedd3e4f Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:13:01 +0900 Subject: [PATCH 0969/2115] Update the documentation for the data source --- website/docs/d/efs_mount_target.html.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/docs/d/efs_mount_target.html.markdown b/website/docs/d/efs_mount_target.html.markdown index 02028a405b30..f7104cedb91d 100644 --- a/website/docs/d/efs_mount_target.html.markdown +++ b/website/docs/d/efs_mount_target.html.markdown @@ -39,6 +39,8 @@ This data source exports the following attributes in addition to the arguments a * `file_system_arn` - Amazon Resource Name of the file system for which the mount target is intended. * `subnet_id` - ID of the mount target's subnet. * `ip_address` - Address at which the file system may be mounted via the mount target. +* `ip_address_type` - IP address type for the mount target. +* `ipv6_address` - IPv6 address at which the file system may be mounted via the mount target. * `security_groups` - List of VPC security group IDs attached to the mount target. * `dns_name` - DNS name for the EFS file system. * `mount_target_dns_name` - The DNS name for the given subnet/AZ per [documented convention](http://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-cmd-dns-name.html). From e35c9684e105c9683499e0d67c2644ced6ab9395 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:24:28 +0900 Subject: [PATCH 0970/2115] terraform fmt --- internal/service/efs/mount_target_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/efs/mount_target_test.go b/internal/service/efs/mount_target_test.go index 167e1412a789..4e2e63adfaf3 100644 --- a/internal/service/efs/mount_target_test.go +++ b/internal/service/efs/mount_target_test.go @@ -332,7 +332,7 @@ resource "aws_subnet" "test_ipv6_only" { ipv6_cidr_block = cidrsubnet(aws_vpc.test.ipv6_cidr_block, 8, 7) - enable_resource_name_dns_aaaa_record_on_launch = true + enable_resource_name_dns_aaaa_record_on_launch = true assign_ipv6_address_on_creation = true From 24b28c9b178363deab8a4dc5fc9a7cdc38070e97 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 09:28:12 +0900 Subject: [PATCH 0971/2115] add changelog --- .changelog/44079.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/44079.txt diff --git a/.changelog/44079.txt b/.changelog/44079.txt new file mode 100644 index 000000000000..a10b32f43dcf --- /dev/null +++ b/.changelog/44079.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` arguments to support IPv6 connectivity +``` + +```release-note:enhancement +data-source/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` attributes +``` From 0bfee6f18e5e1a80b74ac14a286896d5e65863e6 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 14:49:37 +0900 Subject: [PATCH 0972/2115] Implement source_kms_key_arn argument for the resource --- internal/service/lambda/function.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 74422a7b53de..24d1e9c74734 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -390,6 +390,12 @@ func resourceFunction() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "source_kms_key_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: verify.ValidARN, + ConflictsWith: []string{"image_uri"}, + }, names.AttrTags: tftags.TagsSchema(), names.AttrTagsAll: tftags.TagsSchemaComputed(), names.AttrTimeout: { @@ -575,6 +581,10 @@ func resourceFunctionCreate(ctx context.Context, d *schema.ResourceData, meta an input.SnapStart = expandSnapStart(v.([]any)) } + if v, ok := d.GetOk("source_kms_key_arn"); ok { + input.Code.SourceKMSKeyArn = aws.String(v.(string)) + } + if v, ok := d.GetOk("tracing_config"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { input.TracingConfig = &awstypes.TracingConfig{ Mode: awstypes.TracingMode(v.([]any)[0].(map[string]any)[names.AttrMode].(string)), @@ -669,6 +679,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta any) } function := output.Configuration + functionCode := output.Code d.Set("architectures", function.Architectures) functionARN := aws.ToString(function.FunctionArn) d.Set(names.AttrARN, functionARN) @@ -728,6 +739,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta any) } d.Set("source_code_hash", d.Get("source_code_hash")) d.Set("source_code_size", function.CodeSize) + d.Set("source_kms_key_arn", functionCode.SourceKMSKeyArn) d.Set(names.AttrTimeout, function.Timeout) tracingConfigMode := awstypes.TracingModePassThrough if function.TracingConfig != nil { @@ -1000,6 +1012,11 @@ func resourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, meta an } } + // If source_kms_key_arn is set, it should be always included in the update + if v, ok := d.GetOk("source_kms_key_arn"); ok { + input.SourceKMSKeyArn = aws.String(v.(string)) + } + _, err := conn.UpdateFunctionCode(ctx, &input) if err != nil { @@ -1489,6 +1506,7 @@ func needsFunctionCodeUpdate(d sdkv2.ResourceDiffer) bool { d.HasChange(names.AttrS3Bucket) || d.HasChange("s3_key") || d.HasChange("s3_object_version") || + d.HasChange("source_kms_key_arn") || d.HasChange("image_uri") || d.HasChange("architectures") } From 6e6cb72ad9a886061d48abcf1ca64c8782088d0b Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 14:50:09 +0900 Subject: [PATCH 0973/2115] Add an acctest for source_kms_key_arn --- internal/service/lambda/function_test.go | 115 +++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/internal/service/lambda/function_test.go b/internal/service/lambda/function_test.go index a391f41d41b6..5d1734c90571 100644 --- a/internal/service/lambda/function_test.go +++ b/internal/service/lambda/function_test.go @@ -2356,6 +2356,58 @@ func TestAccLambdaFunction_ipv6AllowedForDualStack(t *testing.T) { }) } +func TestAccLambdaFunction_sourceKMSKeyARN(t *testing.T) { + ctx := acctest.Context(t) + var conf lambda.GetFunctionOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_lambda_function.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.LambdaServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccFunctionConfig_sourceKMSKeyARN(rName, "test"), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckFunctionExists(ctx, resourceName, &conf), + testAccCheckFunctionInvokeARN(resourceName, &conf), + testAccCheckFunctionQualifiedInvokeARN(resourceName, &conf), + testAccCheckFunctionName(&conf, rName), + resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test", "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"filename", "publish"}, + }, + { + Config: testAccFunctionConfig_sourceKMSKeyARN(rName, "test2"), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckFunctionExists(ctx, resourceName, &conf), + testAccCheckFunctionInvokeARN(resourceName, &conf), + testAccCheckFunctionQualifiedInvokeARN(resourceName, &conf), + testAccCheckFunctionName(&conf, rName), + resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test2", "arn"), + ), + }, + }, + }) +} + func TestAccLambdaFunction_skipDestroy(t *testing.T) { ctx := acctest.Context(t) var conf lambda.GetFunctionOutput @@ -4186,6 +4238,69 @@ resource "aws_lambda_function" "test" { `, rName)) } +func testAccFunctionConfig_sourceKMSKeyARN(rName, kmsIdentifier string) string { + return acctest.ConfigCompose( + acctest.ConfigLambdaBase(rName, rName, rName), + fmt.Sprintf(` +resource "aws_kms_key" "test" { + description = "%[1]s-1" + deletion_window_in_days = 7 + enable_key_rotation = true + + policy = < Date: Fri, 29 Aug 2025 14:51:46 +0900 Subject: [PATCH 0974/2115] Add source_kms_key_arn attributes to the data source --- internal/service/lambda/function_data_source.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/lambda/function_data_source.go b/internal/service/lambda/function_data_source.go index f46d08b550a5..82d3f2e71e41 100644 --- a/internal/service/lambda/function_data_source.go +++ b/internal/service/lambda/function_data_source.go @@ -200,6 +200,10 @@ func dataSourceFunction() *schema.Resource { Type: schema.TypeInt, Computed: true, }, + "source_kms_key_arn": { + Type: schema.TypeString, + Computed: true, + }, names.AttrTags: tftags.TagsSchemaComputed(), names.AttrTimeout: { Type: schema.TypeInt, @@ -297,6 +301,7 @@ func dataSourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta an } function := output.Configuration + functionCode := output.Code functionARN := aws.ToString(function.FunctionArn) qualifierSuffix := fmt.Sprintf(":%s", aws.ToString(input.Qualifier)) versionSuffix := fmt.Sprintf(":%s", aws.ToString(function.Version)) @@ -358,6 +363,7 @@ func dataSourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta an d.Set("signing_profile_version_arn", function.SigningProfileVersionArn) d.Set("source_code_hash", function.CodeSha256) d.Set("source_code_size", function.CodeSize) + d.Set("source_kms_key_arn", functionCode.SourceKMSKeyArn) d.Set(names.AttrTimeout, function.Timeout) tracingConfigMode := awstypes.TracingModePassThrough if function.TracingConfig != nil { From 5c31447a9ab6b6ecee863bc82ec9404dc3559ec5 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 14:52:09 +0900 Subject: [PATCH 0975/2115] Add a check for source_kms_key_arn to the data source test --- internal/service/lambda/function_data_source_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/lambda/function_data_source_test.go b/internal/service/lambda/function_data_source_test.go index 77efcf82158e..b98bdcc8a708 100644 --- a/internal/service/lambda/function_data_source_test.go +++ b/internal/service/lambda/function_data_source_test.go @@ -54,6 +54,7 @@ func TestAccLambdaFunctionDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, "signing_profile_version_arn", resourceName, "signing_profile_version_arn"), resource.TestCheckResourceAttrPair(dataSourceName, "source_code_hash", resourceName, "code_sha256"), resource.TestCheckResourceAttrPair(dataSourceName, "source_code_size", resourceName, "source_code_size"), + resource.TestCheckResourceAttrPair(dataSourceName, "source_kms_key_arn", resourceName, "source_kms_key_arn"), resource.TestCheckResourceAttrPair(dataSourceName, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrTimeout, resourceName, names.AttrTimeout), resource.TestCheckResourceAttrPair(dataSourceName, "tracing_config.#", resourceName, "tracing_config.#"), From f4cd9d7d89a9b6485c2726380339eaa0e78e9fbf Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 14:53:34 +0900 Subject: [PATCH 0976/2115] Update the documentation for the resource --- website/docs/r/lambda_function.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/lambda_function.html.markdown b/website/docs/r/lambda_function.html.markdown index 09857bba3d82..6bf2fc2d71bd 100644 --- a/website/docs/r/lambda_function.html.markdown +++ b/website/docs/r/lambda_function.html.markdown @@ -521,6 +521,7 @@ The following arguments are optional: * `skip_destroy` - (Optional) Whether to retain the old version of a previously deployed Lambda Layer. Default is `false`. * `snap_start` - (Optional) Configuration block for snap start settings. [See below](#snap_start-configuration-block). * `source_code_hash` - (Optional) Base64-encoded SHA256 hash of the package file. Used to trigger updates when source code changes. +* `source_kms_key_arn` - (Optional) ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. Conflicts with `image_uri`. * `tags` - (Optional) Key-value map of tags for the Lambda function. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) Amount of time your Lambda Function has to run in seconds. Defaults to 3. Valid between 1 and 900. * `tracing_config` - (Optional) Configuration block for X-Ray tracing. [See below](#tracing_config-configuration-block). From e6258cb24909d14bfa0668686143766b053487c8 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 14:53:49 +0900 Subject: [PATCH 0977/2115] Update the documentation for the data source --- website/docs/d/lambda_function.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/lambda_function.html.markdown b/website/docs/d/lambda_function.html.markdown index 61b8c1a3cbc1..c0108877d25e 100644 --- a/website/docs/d/lambda_function.html.markdown +++ b/website/docs/d/lambda_function.html.markdown @@ -142,6 +142,7 @@ This data source exports the following attributes in addition to the arguments a * `signing_profile_version_arn` - ARN for a signing profile version. * `source_code_hash` - (**Deprecated** use `code_sha256` instead) Base64-encoded representation of raw SHA-256 sum of the zip file. * `source_code_size` - Size in bytes of the function .zip file. +* `source_kms_key_arn` - ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. * `tags` - Map of tags assigned to the Lambda Function. * `timeout` - Function execution time at which Lambda should terminate the function. * `tracing_config` - Tracing settings of the function. [See below](#tracing_config-attribute-reference). From 90b9750dcb6d44f7740c227c696d907b8b33edfe Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 15:03:27 +0900 Subject: [PATCH 0978/2115] add changelog --- .changelog/44080.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/44080.txt diff --git a/.changelog/44080.txt b/.changelog/44080.txt new file mode 100644 index 000000000000..6c732e60a247 --- /dev/null +++ b/.changelog/44080.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_lambda_function: Add `source_kms_key_arn` argument +``` + +```release-note:enhancement +data-source/aws_lambda_function: Add `source_kms_key_arn` attribute +``` From 836a04d30c90a7d3c752bdac230d4ba68e8636e4 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 29 Aug 2025 15:43:38 +0900 Subject: [PATCH 0979/2115] replace `arn` with `names.AttrARN` --- internal/service/lambda/function_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/lambda/function_test.go b/internal/service/lambda/function_test.go index 5d1734c90571..a83e77c69cc3 100644 --- a/internal/service/lambda/function_test.go +++ b/internal/service/lambda/function_test.go @@ -2380,7 +2380,7 @@ func TestAccLambdaFunction_sourceKMSKeyARN(t *testing.T) { testAccCheckFunctionInvokeARN(resourceName, &conf), testAccCheckFunctionQualifiedInvokeARN(resourceName, &conf), testAccCheckFunctionName(&conf, rName), - resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test", names.AttrARN), ), }, { @@ -2401,7 +2401,7 @@ func TestAccLambdaFunction_sourceKMSKeyARN(t *testing.T) { testAccCheckFunctionInvokeARN(resourceName, &conf), testAccCheckFunctionQualifiedInvokeARN(resourceName, &conf), testAccCheckFunctionName(&conf, rName), - resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test2", "arn"), + resource.TestCheckResourceAttrPair(resourceName, "source_kms_key_arn", "aws_kms_key.test2", names.AttrARN), ), }, }, From d9414b63a2c25edd70034839d8611e7de2ce8d42 Mon Sep 17 00:00:00 2001 From: robinrz Date: Fri, 29 Aug 2025 06:58:09 +0000 Subject: [PATCH 0980/2115] remove 100 item limit for user_and_group_quotas block --- internal/service/fsx/openzfs_volume.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/fsx/openzfs_volume.go b/internal/service/fsx/openzfs_volume.go index ac6d0f901799..6dc7cbc9c363 100644 --- a/internal/service/fsx/openzfs_volume.go +++ b/internal/service/fsx/openzfs_volume.go @@ -174,7 +174,6 @@ func resourceOpenZFSVolume() *schema.Resource { Type: schema.TypeSet, Optional: true, Computed: true, - MaxItems: 100, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrID: { From ea4746a241564f88b8581fbdd76f38fc5b75d844 Mon Sep 17 00:00:00 2001 From: robinrz Date: Fri, 29 Aug 2025 07:05:49 +0000 Subject: [PATCH 0981/2115] update user_and_group_quotas documentation to link to FSx for OpenZFS quotas --- website/docs/r/fsx_openzfs_volume.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/fsx_openzfs_volume.html.markdown b/website/docs/r/fsx_openzfs_volume.html.markdown index 2e10f5ab1993..71514449609c 100644 --- a/website/docs/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/r/fsx_openzfs_volume.html.markdown @@ -36,7 +36,7 @@ This resource supports the following arguments: * `origin_snapshot` - (Optional) Specifies the configuration to use when creating the OpenZFS volume. See [`origin_snapshot` Block](#origin_snapshot-block) below for details. * `storage_capacity_quota_gib` - (Optional) The maximum amount of storage in gibibytes (GiB) that the volume can use from its parent. * `storage_capacity_reservation_gib` - (Optional) The amount of storage in gibibytes (GiB) to reserve from the parent volume. -* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum of 100 items. See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. +* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `nfs_exports` Block From 770c62358a1ba12eb6738436b03fb424c95467ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 10:26:16 -0400 Subject: [PATCH 0982/2115] Correct CHANGELOG entry file name. --- .changelog/{43688.txt => 44072.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{43688.txt => 44072.txt} (100%) diff --git a/.changelog/43688.txt b/.changelog/44072.txt similarity index 100% rename from .changelog/43688.txt rename to .changelog/44072.txt From ebcea6635280fb4b5a4400f6e6e984979099f1bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 10:28:05 -0400 Subject: [PATCH 0983/2115] Tweak CHANGELOG entry. --- .changelog/44072.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44072.txt b/.changelog/44072.txt index 7282476e3811..b39821a4304f 100644 --- a/.changelog/44072.txt +++ b/.changelog/44072.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_s3tables_table_policy: Fix namespaceNameValidator to allow hyphens +resource/aws_s3tables_table_policy: Fix `namespace` validation to allow hyphens (`-`) ``` From 79cdc1ec9317181f1136caad8579db19176cc5c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Aug 2025 10:43:57 -0400 Subject: [PATCH 0984/2115] Merge pull request #44081 from hashicorp/dependabot/go_modules/aws-sdk-go-v2-070752cb69 Bump the aws-sdk-go-v2 group across 1 directory with 46 updates --- go.mod | 92 ++++++++++----------- go.sum | 184 +++++++++++++++++++++--------------------- tools/tfsdk2fw/go.mod | 92 ++++++++++----------- tools/tfsdk2fw/go.sum | 184 +++++++++++++++++++++--------------------- 4 files changed, 276 insertions(+), 276 deletions(-) diff --git a/go.mod b/go.mod index 0d87585ecf77..9caacdd522b9 100644 --- a/go.mod +++ b/go.mod @@ -12,34 +12,34 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.38.2 - github.com/aws/aws-sdk-go-v2/config v1.31.4 - github.com/aws/aws-sdk-go-v2/credentials v1.18.8 + github.com/aws/aws-sdk-go-v2/config v1.31.5 + github.com/aws/aws-sdk-go-v2/credentials v1.18.9 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 github.com/aws/aws-sdk-go-v2/service/account v1.28.1 github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 @@ -53,12 +53,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 @@ -68,9 +68,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 - github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 + github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 @@ -103,9 +103,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 @@ -116,32 +116,32 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 - github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 + github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 - github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 - github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 + github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 + github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 - github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 + github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 @@ -179,43 +179,43 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 - github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 + github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 - github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 + github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 - github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 + github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 @@ -227,7 +227,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 @@ -236,9 +236,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 - github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 + github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 @@ -246,30 +246,30 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 - github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 + github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 - github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 + github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 - github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 + github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 - github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 + github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 diff --git a/go.sum b/go.sum index 967884bde097..fb0804578524 100644 --- a/go.sum +++ b/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJL github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.4 h1:aY2IstXOfjdLtr1lDvxFBk5DpBnHgS5GS3jgR/0BmPw= -github.com/aws/aws-sdk-go-v2/config v1.31.4/go.mod h1:1IAykiegrTp6n+CbZoCpW6kks1I74fEDgl2BPQSkLSU= -github.com/aws/aws-sdk-go-v2/credentials v1.18.8 h1:0FfdP0I9gs/f1rwtEdkcEdsclTEkPB8o6zWUG2Z8+IM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.8/go.mod h1:9UReQ1UmGooX93JKzHyr7PRF3F+p3r+PmRwR7+qHJYA= +github.com/aws/aws-sdk-go-v2/config v1.31.5 h1:wsZr2kq1XeKU/D2QDcW5xEB1zHPdHAuQqnR0yaygAQQ= +github.com/aws/aws-sdk-go-v2/config v1.31.5/go.mod h1:IpXejRuSIyOSCyT4BomfIJ5gWRcDoX/NJaAHh9Cp8jE= +github.com/aws/aws-sdk-go-v2/credentials v1.18.9 h1:zKrnPtmO7j2FpMqudayjCzNxyO8KtPQGCIzqEosKQbg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.9/go.mod h1:gAotjkj0roLrwvBxECN1Q8ILfkVsw3Ntph6FP1LnZ8Q= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 h1:eZAl6tdv3HrIHAxbpnDQByEOD84bmxyhLmgvUYJ8ggo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2/go.mod h1:vV+YS0SWfpwbIGOUWbB5NWklaYKscfYrQRb9ggHptxs= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 h1:0gJ4oDYyvGZz0C/YNmDkbpL25AK+cILbyDbPexWz/+0= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3/go.mod h1:BE+FqQuGYSvEk8NJc33a+JNkirdkdRqCrc+7B0HWb3E= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= @@ -53,8 +53,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJE github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 h1:89ZRA0dGP/EX+fJnAfWDyAoWngnQJAbiza4S4yEwDMQ= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= @@ -67,16 +67,16 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 h1:gWaSM3wwoCGvXasjXGfY7WGi1tTXnUjVQRyd/JFUFsM= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 h1:s5C5EIq0NRrIW+0RnwLFfm77FR/+8O7t4DysALJ5kd8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= @@ -89,8 +89,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kf github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 h1:auDXR4zI6q2bVLjF4XRhKdN9JgAUqJAy2caw9XIz/M0= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9q github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 h1:qWViczom6aZ/mFKkjptIT55N8YqXS/OR2r5dS092TkI= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 h1:wCV+L8MEgAARnNKCl5v31WvTH66jPar5ocQCyMPGkMo= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= @@ -147,12 +147,12 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0M github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 h1:4+AaZRANLgs9R94EMW9DYVIfLS7g3c0wHnzf+NHC9nc= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 h1:AgzRQqcYWrrDY5qYmIZh8VNN73JLcPgvj4vJk1AASEI= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8B github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 h1:OnxXO7FKZ8JcY1zF9xuFvAoM9BTKslm/bhQAkDje9xE= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.1/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.0/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxj github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 h1:LLUGJEURE5wqls4ncuyaSd1qTUa/vVtDh2n7+Jq5oHk= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= @@ -217,12 +217,12 @@ github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/i github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 h1:HcrPUVElslX0M45ICJ2aEl0UMsJj/Y6RQNGcNJOgu2E= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 h1:tKqdrRKCkt/6SM9jaBsGnx2piN1L96e3eoRgVxaYeX8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 h1:tA0fwu2ZwJzVuNlyOpKaeS2pB4n9KyBKH6Apo+8s18s= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 h1:SFGMSoIZ+eoBVomUepL0NsunbKS8KZ+TupTVBwajQAk= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 h1:HMGUQWPOu0Z6gzc/odJ1T0UJezDwzy3xSy13fOUSTp8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= @@ -243,14 +243,14 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRD github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 h1:JZgIA6hS67zlCGKT4NqbPsLPASglwYBlONwvvxSwh14= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.3/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.0/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 h1:mOKjXzROoDn3753aPa5OY7tAnOzn52x+gtsHt/JI6PA= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= @@ -259,10 +259,10 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 h1:8Sd86m15j8DsdRTWbbFFlDRZCmsd0tehmmxoUjBZe44= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.3/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 h1:g9hUSavNhjbvA762fJmOWUTsLQDZbAf2fct28B9iP6c= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.3/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.0/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.0/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= @@ -271,8 +271,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktp github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 h1:TtGSyEgKZZfVrv9sA02Kt7BL4c7/4evV6jxr8bYLpck= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.1/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.0/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnD github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 h1:hfAw0mYZEArJIH1chpOSDD9RL5cr8YdohaoglquVutQ= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 h1:BJyXbWDO3GbJz1hTtFVd1Qgy+RJCsA+Ha2ClW40no5A= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= @@ -303,8 +303,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgY github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 h1:h7Xf+ZDcRskzMpo5EuZAOGrVYhTzWmNCaOGDwBLhd38= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 h1:ojqDIdMimJVlkMt9TTcxyZ0jDyvavXtfQaiuhndSAv4= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= @@ -379,8 +379,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStT github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 h1:k1WZJIid8seg7q1oRhkYxxB5HJ/Q1qTK98ML4JZ7aNw= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= @@ -389,32 +389,32 @@ github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 h1:g42YyO07tFnNMnjOwbYpchfZzSvVGf6K+HtXmjwqBKI= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.3/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 h1:0WkIrO7jV0NlP1a9QY+CK2lUsKLPPJSkQgSr/ryZPyE= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 h1:ymSOKhRgXVzFc+d10qXBRFMNOLVw93ud44jmKRfGV+E= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 h1:sjca1ctN+ICI2uerjFTYGawESq6OM+cPafMyTld0p9I= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.3/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.0/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 h1:wlkJ4GMBARImCR72Jqv+GOQZR9kk8eInpW0+7vpKmF0= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 h1:RYxQtAqIMzqSI3jwa79tO8u5QM3dEA6gsFs1N6vYbCk= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 h1:HpNLkXkBgbXByi+MB6xKT1P+iPRIJ30sXSfGL63kxiA= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= @@ -423,22 +423,22 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FS github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 h1:C9tZ0LkMleWzfJKCZW6mUxBUxvw/nE8Y4+yFjPsC+Ns= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 h1:sPUzA4sJ65A7Gz51z9F19Bf1Kcq65YqkE5qInbk+NtI= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.4/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.0/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 h1:DQ2IGVPAGd61eSFjGYmrSOEEpXawUVbkv8hjA4sNI0U= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= @@ -451,8 +451,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyK github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 h1:/TvOR24L0/rdGKxlt9FjrXn4Pb6onrphD9Q8L+38Xvk= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= @@ -475,8 +475,8 @@ github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/M github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 h1:4Tsena1ElxsXIho5WDVHsuf46H4VqY+9mCEbR22CR3w= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= @@ -493,12 +493,12 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 h1:owlFsGzDBOxj8Bh20Po0Go4BBj+voxAenaXmR0qwbf4= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 h1:3YlE78IQ/CESvF5iEpDHE+hxoRTA0owzJ4PA2lx9KeY= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.3/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 h1:ahBxdOF8x//FK0EIMmGz7Pa7UFLEFu9BzVWBA1ab9zo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.0/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= @@ -513,14 +513,14 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvX github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 h1:CMchvzv5LVZun2EgjAM/yVT0W/SmtgeTWCYMDHfMx+8= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 h1:tuAGiLIZnQvXgKWrwacO3AMVNC7AeUGKw/iOGGcMCp0= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 h1:z6lajFT/qGlLRB/I8V5CCklqSuWZKUkdwRAn9leIkiQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.3/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 h1:H4QPAHLE1bHSQrZV6Hz+CPpJG+Mtf+rkl6NFb/Y7sv8= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.0/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= @@ -529,16 +529,16 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVS github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 h1:OYdiS6+2u+UZOvLPTfhanYJVtaf8oEYblaaaZURkgQo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.3/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.0/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 h1:DcwQUm+emSJi83WoYqoGxQ9A+AhgmZGMwmh2Ry6hslU= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= @@ -549,8 +549,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 h1:QxshrLtaSXmJY4YtCd5NreSBQYpQLzH0YLiPyDXMTHU= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.3/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 h1:c2SDs4RUMwDBWtRY0gCQ1qL9eoKh7NmZiI0Msf5zWEw= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.0/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= @@ -561,8 +561,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 h1:GqUJvEWTgVn5HQLJgergz8HJTeMu3qov4rvarzWUcMs= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.3/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 h1:9vFfby2iH/7EKEYYZYV70wjWgO4tLtdAxTnsM1Lv9js= +github.com/aws/aws-sdk-go-v2/service/xray v1.35.0/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 26fa20cdff89..294bafceeae1 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -20,10 +20,10 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.8 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.5 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.9 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect @@ -33,25 +33,25 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 // indirect github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 // indirect github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 // indirect github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 // indirect github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 // indirect github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 // indirect github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 // indirect github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 // indirect github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 // indirect github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 // indirect github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 // indirect github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 // indirect github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 // indirect github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 // indirect github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 // indirect github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 // indirect @@ -65,12 +65,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 // indirect @@ -80,9 +80,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 // indirect github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 // indirect github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 // indirect github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 // indirect @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 // indirect github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 // indirect github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 // indirect github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 // indirect @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 // indirect github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 // indirect github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 // indirect github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 // indirect @@ -115,9 +115,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 // indirect github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 // indirect github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 // indirect @@ -128,26 +128,26 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 // indirect github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 // indirect github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 // indirect github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 // indirect github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 // indirect github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 // indirect github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 // indirect github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 // indirect github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 // indirect github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 // indirect github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 // indirect github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 // indirect github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 // indirect github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 // indirect github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 // indirect @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 // indirect github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 // indirect @@ -167,7 +167,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 // indirect github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 // indirect github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 // indirect github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 // indirect github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 // indirect @@ -196,43 +196,43 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 // indirect github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 // indirect github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 // indirect github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 // indirect github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 // indirect github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 // indirect github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 // indirect github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 // indirect github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 // indirect github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 // indirect github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 // indirect github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 // indirect github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 // indirect github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 // indirect github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 // indirect @@ -244,7 +244,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 // indirect github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 // indirect github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 // indirect github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 // indirect @@ -253,9 +253,9 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 // indirect github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 // indirect github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 // indirect @@ -263,31 +263,31 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 // indirect github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 // indirect github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 // indirect github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 // indirect github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 // indirect github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 // indirect github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 // indirect github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 // indirect github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 // indirect github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 // indirect github.com/aws/smithy-go v1.23.0 // indirect github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index dcaeaf333101..10e51ac168e7 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJL github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.4 h1:aY2IstXOfjdLtr1lDvxFBk5DpBnHgS5GS3jgR/0BmPw= -github.com/aws/aws-sdk-go-v2/config v1.31.4/go.mod h1:1IAykiegrTp6n+CbZoCpW6kks1I74fEDgl2BPQSkLSU= -github.com/aws/aws-sdk-go-v2/credentials v1.18.8 h1:0FfdP0I9gs/f1rwtEdkcEdsclTEkPB8o6zWUG2Z8+IM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.8/go.mod h1:9UReQ1UmGooX93JKzHyr7PRF3F+p3r+PmRwR7+qHJYA= +github.com/aws/aws-sdk-go-v2/config v1.31.5 h1:wsZr2kq1XeKU/D2QDcW5xEB1zHPdHAuQqnR0yaygAQQ= +github.com/aws/aws-sdk-go-v2/config v1.31.5/go.mod h1:IpXejRuSIyOSCyT4BomfIJ5gWRcDoX/NJaAHh9Cp8jE= +github.com/aws/aws-sdk-go-v2/credentials v1.18.9 h1:zKrnPtmO7j2FpMqudayjCzNxyO8KtPQGCIzqEosKQbg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.9/go.mod h1:gAotjkj0roLrwvBxECN1Q8ILfkVsw3Ntph6FP1LnZ8Q= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2 h1:eZAl6tdv3HrIHAxbpnDQByEOD84bmxyhLmgvUYJ8ggo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.2/go.mod h1:vV+YS0SWfpwbIGOUWbB5NWklaYKscfYrQRb9ggHptxs= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 h1:0gJ4oDYyvGZz0C/YNmDkbpL25AK+cILbyDbPexWz/+0= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3/go.mod h1:BE+FqQuGYSvEk8NJc33a+JNkirdkdRqCrc+7B0HWb3E= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= @@ -53,8 +53,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJE github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3 h1:89ZRA0dGP/EX+fJnAfWDyAoWngnQJAbiza4S4yEwDMQ= -github.com/aws/aws-sdk-go-v2/service/amplify v1.36.3/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= @@ -67,16 +67,16 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3 h1:gWaSM3wwoCGvXasjXGfY7WGi1tTXnUjVQRyd/JFUFsM= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.39.3/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1 h1:s5C5EIq0NRrIW+0RnwLFfm77FR/+8O7t4DysALJ5kd8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.1/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= @@ -89,8 +89,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kf github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3 h1:auDXR4zI6q2bVLjF4XRhKdN9JgAUqJAy2caw9XIz/M0= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.28.3/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9q github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3 h1:qWViczom6aZ/mFKkjptIT55N8YqXS/OR2r5dS092TkI= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.32.3/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3 h1:wCV+L8MEgAARnNKCl5v31WvTH66jPar5ocQCyMPGkMo= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.33.3/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= @@ -147,12 +147,12 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0M github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3 h1:4+AaZRANLgs9R94EMW9DYVIfLS7g3c0wHnzf+NHC9nc= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.33.3/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3 h1:AgzRQqcYWrrDY5qYmIZh8VNN73JLcPgvj4vJk1AASEI= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.33.3/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8B github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.1 h1:OnxXO7FKZ8JcY1zF9xuFvAoM9BTKslm/bhQAkDje9xE= -github.com/aws/aws-sdk-go-v2/service/connect v1.137.1/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.0/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxj github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3 h1:LLUGJEURE5wqls4ncuyaSd1qTUa/vVtDh2n7+Jq5oHk= -github.com/aws/aws-sdk-go-v2/service/databrew v1.37.3/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= @@ -217,12 +217,12 @@ github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/i github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2 h1:HcrPUVElslX0M45ICJ2aEl0UMsJj/Y6RQNGcNJOgu2E= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.49.2/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1 h1:tKqdrRKCkt/6SM9jaBsGnx2piN1L96e3eoRgVxaYeX8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.247.1/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3 h1:tA0fwu2ZwJzVuNlyOpKaeS2pB4n9KyBKH6Apo+8s18s= -github.com/aws/aws-sdk-go-v2/service/ecr v1.49.3/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 h1:SFGMSoIZ+eoBVomUepL0NsunbKS8KZ+TupTVBwajQAk= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 h1:HMGUQWPOu0Z6gzc/odJ1T0UJezDwzy3xSy13fOUSTp8= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= @@ -243,14 +243,14 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRD github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.3 h1:JZgIA6hS67zlCGKT4NqbPsLPASglwYBlONwvvxSwh14= -github.com/aws/aws-sdk-go-v2/service/emr v1.53.3/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.0/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3 h1:mOKjXzROoDn3753aPa5OY7tAnOzn52x+gtsHt/JI6PA= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.44.3/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= @@ -259,10 +259,10 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.3 h1:8Sd86m15j8DsdRTWbbFFlDRZCmsd0tehmmxoUjBZe44= -github.com/aws/aws-sdk-go-v2/service/fis v1.36.3/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.3 h1:g9hUSavNhjbvA762fJmOWUTsLQDZbAf2fct28B9iP6c= -github.com/aws/aws-sdk-go-v2/service/fms v1.43.3/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.0/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.0/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= @@ -271,8 +271,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktp github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.1 h1:TtGSyEgKZZfVrv9sA02Kt7BL4c7/4evV6jxr8bYLpck= -github.com/aws/aws-sdk-go-v2/service/glue v1.127.1/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.0/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnD github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1 h1:hfAw0mYZEArJIH1chpOSDD9RL5cr8YdohaoglquVutQ= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.34.1/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 h1:BJyXbWDO3GbJz1hTtFVd1Qgy+RJCsA+Ha2ClW40no5A= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= @@ -303,8 +303,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgY github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3 h1:h7Xf+ZDcRskzMpo5EuZAOGrVYhTzWmNCaOGDwBLhd38= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.24.3/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2 h1:ojqDIdMimJVlkMt9TTcxyZ0jDyvavXtfQaiuhndSAv4= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.39.2/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= @@ -379,8 +379,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStT github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3 h1:k1WZJIid8seg7q1oRhkYxxB5HJ/Q1qTK98ML4JZ7aNw= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.54.3/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= @@ -389,32 +389,32 @@ github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.3 h1:g42YyO07tFnNMnjOwbYpchfZzSvVGf6K+HtXmjwqBKI= -github.com/aws/aws-sdk-go-v2/service/oam v1.21.3/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3 h1:0WkIrO7jV0NlP1a9QY+CK2lUsKLPPJSkQgSr/ryZPyE= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.51.3/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 h1:ymSOKhRgXVzFc+d10qXBRFMNOLVw93ud44jmKRfGV+E= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.3 h1:sjca1ctN+ICI2uerjFTYGawESq6OM+cPafMyTld0p9I= -github.com/aws/aws-sdk-go-v2/service/osis v1.18.3/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.0/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3 h1:wlkJ4GMBARImCR72Jqv+GOQZR9kk8eInpW0+7vpKmF0= -github.com/aws/aws-sdk-go-v2/service/pcs v1.11.3/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2 h1:RYxQtAqIMzqSI3jwa79tO8u5QM3dEA6gsFs1N6vYbCk= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.24.2/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3 h1:HpNLkXkBgbXByi+MB6xKT1P+iPRIJ30sXSfGL63kxiA= -github.com/aws/aws-sdk-go-v2/service/pipes v1.22.3/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= @@ -423,22 +423,22 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FS github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3 h1:C9tZ0LkMleWzfJKCZW6mUxBUxvw/nE8Y4+yFjPsC+Ns= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.92.3/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.4 h1:sPUzA4sJ65A7Gz51z9F19Bf1Kcq65YqkE5qInbk+NtI= -github.com/aws/aws-sdk-go-v2/service/rds v1.103.4/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.0/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3 h1:DQ2IGVPAGd61eSFjGYmrSOEEpXawUVbkv8hjA4sNI0U= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.50.3/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= @@ -451,8 +451,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyK github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3 h1:/TvOR24L0/rdGKxlt9FjrXn4Pb6onrphD9Q8L+38Xvk= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.32.3/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= @@ -475,8 +475,8 @@ github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/M github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3 h1:4Tsena1ElxsXIho5WDVHsuf46H4VqY+9mCEbR22CR3w= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.16.3/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= @@ -493,12 +493,12 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3 h1:owlFsGzDBOxj8Bh20Po0Go4BBj+voxAenaXmR0qwbf4= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.31.3/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.3 h1:3YlE78IQ/CESvF5iEpDHE+hxoRTA0owzJ4PA2lx9KeY= -github.com/aws/aws-sdk-go-v2/service/ses v1.33.3/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2 h1:ahBxdOF8x//FK0EIMmGz7Pa7UFLEFu9BzVWBA1ab9zo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.52.2/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.0/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= @@ -513,14 +513,14 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvX github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3 h1:CMchvzv5LVZun2EgjAM/yVT0W/SmtgeTWCYMDHfMx+8= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.38.3/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1 h1:tuAGiLIZnQvXgKWrwacO3AMVNC7AeUGKw/iOGGcMCp0= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.24.1/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.3 h1:z6lajFT/qGlLRB/I8V5CCklqSuWZKUkdwRAn9leIkiQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.28.3/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 h1:H4QPAHLE1bHSQrZV6Hz+CPpJG+Mtf+rkl6NFb/Y7sv8= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.0/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= @@ -529,16 +529,16 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVS github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.3 h1:OYdiS6+2u+UZOvLPTfhanYJVtaf8oEYblaaaZURkgQo= -github.com/aws/aws-sdk-go-v2/service/swf v1.31.3/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.0/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3 h1:DcwQUm+emSJi83WoYqoGxQ9A+AhgmZGMwmh2Ry6hslU= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.34.3/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= @@ -549,8 +549,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.3 h1:QxshrLtaSXmJY4YtCd5NreSBQYpQLzH0YLiPyDXMTHU= -github.com/aws/aws-sdk-go-v2/service/waf v1.29.3/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 h1:c2SDs4RUMwDBWtRY0gCQ1qL9eoKh7NmZiI0Msf5zWEw= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.0/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= @@ -561,8 +561,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.3 h1:GqUJvEWTgVn5HQLJgergz8HJTeMu3qov4rvarzWUcMs= -github.com/aws/aws-sdk-go-v2/service/xray v1.34.3/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 h1:9vFfby2iH/7EKEYYZYV70wjWgO4tLtdAxTnsM1Lv9js= +github.com/aws/aws-sdk-go-v2/service/xray v1.35.0/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= From 518167a60784334c1650c6b57a60de9021d14315 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 29 Aug 2025 10:45:40 -0400 Subject: [PATCH 0985/2115] feat(go-vcr): include `go-vcr` retryer override when configured via extra options (#44071) All generated service clients contain a functional option which overrides the default retryer with additional handling for `go-vcr`-specific errors. However, a handful of service clients include additional hand-written options which _also_ override the default retryer, typically addressing some nuance related to error codes unique to a given service. To ensure these service-local overrides do not overwrite the `go-vcr` handling, the extra options implementations have been modified to merge both sets of retryables. --- .../service/apigateway/service_package.go | 31 ++++++--- .../service/apigatewayv2/service_package.go | 39 +++++++---- internal/service/appsync/service_package.go | 25 +++++-- .../service/cloudformation/service_package.go | 25 +++++-- .../service/cloudhsmv2/service_package.go | 25 +++++-- internal/service/dynamodb/service_package.go | 25 +++++-- internal/service/ec2/service_package.go | 67 +++++++++++-------- internal/service/fms/service_package.go | 35 ++++++---- internal/service/kafka/service_package.go | 25 +++++-- internal/service/kinesis/service_package.go | 27 +++++--- internal/service/lightsail/service_package.go | 27 +++++--- .../service/organizations/service_package.go | 25 +++++-- internal/service/s3/service_package.go | 22 ++++-- internal/service/schemas/service_package.go | 25 +++++-- internal/service/ssoadmin/service_package.go | 25 +++++-- 15 files changed, 306 insertions(+), 142 deletions(-) diff --git a/internal/service/apigateway/service_package.go b/internal/service/apigateway/service_package.go index 971b88347495..72df1997f257 100644 --- a/internal/service/apigateway/service_package.go +++ b/internal/service/apigateway/service_package.go @@ -10,24 +10,35 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/apigateway" "github.com/aws/aws-sdk-go-v2/service/apigateway/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*apigateway.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*apigateway.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*apigateway.Options){ func(o *apigateway.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - // Many operations can return an error such as: - // ConflictException: Unable to complete operation due to concurrent modification. Please try again later. - // Handle them all globally for the service client. - if errs.IsAErrorMessageContains[*types.ConflictException](err, "try again later") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + // Many operations can return an error such as: + // ConflictException: Unable to complete operation due to concurrent modification. Please try again later. + // Handle them all globally for the service client. + if errs.IsAErrorMessageContains[*types.ConflictException](err, "try again later") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/apigatewayv2/service_package.go b/internal/service/apigatewayv2/service_package.go index 8750162a3036..f87d1ac2fa4c 100644 --- a/internal/service/apigatewayv2/service_package.go +++ b/internal/service/apigatewayv2/service_package.go @@ -10,28 +10,39 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" awstypes "github.com/aws/aws-sdk-go-v2/service/apigatewayv2/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*apigatewayv2.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*apigatewayv2.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*apigatewayv2.Options){ func(o *apigatewayv2.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.ConflictException](err, "try again later") { - return aws.TrueTernary - } - // In some instances, ConflictException error responses have been observed as - // a *smithy.OperationError type (not an *awstypes.ConflictException), which - // can't be handled via errs.IsAErrorMessageContains. Instead we fall back - // to a simple match on the message contents. - if errs.Contains(err, "Unable to complete operation due to concurrent modification. Please try again later.") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.ConflictException](err, "try again later") { + return aws.TrueTernary + } + // In some instances, ConflictException error responses have been observed as + // a *smithy.OperationError type (not an *awstypes.ConflictException), which + // can't be handled via errs.IsAErrorMessageContains. Instead we fall back + // to a simple match on the message contents. + if errs.Contains(err, "Unable to complete operation due to concurrent modification. Please try again later.") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go index b3c5964b9cc5..60a460384b3d 100644 --- a/internal/service/appsync/service_package.go +++ b/internal/service/appsync/service_package.go @@ -10,21 +10,32 @@ import ( "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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*appsync.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*appsync.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*appsync.Options){ func(o *appsync.Options) { - 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. - })) + retryables := []retry.IsErrorRetryable{ + 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. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/cloudformation/service_package.go b/internal/service/cloudformation/service_package.go index 72857d345946..aeecbc29b8a8 100644 --- a/internal/service/cloudformation/service_package.go +++ b/internal/service/cloudformation/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cloudformation" "github.com/aws/aws-sdk-go-v2/service/cloudformation/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*cloudformation.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*cloudformation.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*cloudformation.Options){ func(o *cloudformation.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*types.OperationInProgressException](err, "Another Operation on StackSet") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*types.OperationInProgressException](err, "Another Operation on StackSet") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/cloudhsmv2/service_package.go b/internal/service/cloudhsmv2/service_package.go index b6cbcd2bc000..1e7cb743bb0e 100644 --- a/internal/service/cloudhsmv2/service_package.go +++ b/internal/service/cloudhsmv2/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2" "github.com/aws/aws-sdk-go-v2/service/cloudhsmv2/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*cloudhsmv2.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*cloudhsmv2.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*cloudhsmv2.Options){ func(o *cloudhsmv2.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*types.CloudHsmInternalFailureException](err, "request was rejected because of an AWS CloudHSM internal failure") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*types.CloudHsmInternalFailureException](err, "request was rejected because of an AWS CloudHSM internal failure") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/dynamodb/service_package.go b/internal/service/dynamodb/service_package.go index 27e87699e880..6be271c25855 100644 --- a/internal/service/dynamodb/service_package.go +++ b/internal/service/dynamodb/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/dynamodb" awstypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*dynamodb.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*dynamodb.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*dynamodb.Options){ func(o *dynamodb.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "Subscriber limit exceeded:") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "Subscriber limit exceeded:") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/ec2/service_package.go b/internal/service/ec2/service_package.go index fe8d0f62c255..a88343f07fe3 100644 --- a/internal/service/ec2/service_package.go +++ b/internal/service/ec2/service_package.go @@ -10,41 +10,52 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*ec2.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*ec2.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*ec2.Options){ func(o *ec2.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if tfawserr.ErrMessageContains(err, errCodeInvalidParameterValue, "This call cannot be completed because there are pending VPNs or Virtual Interfaces") { // AttachVpnGateway, DetachVpnGateway - return aws.TrueTernary - } - - if tfawserr.ErrCodeEquals(err, errCodeInsufficientInstanceCapacity) { // CreateCapacityReservation, RunInstances - return aws.TrueTernary - } - - if tfawserr.ErrMessageContains(err, errCodeOperationNotPermitted, "Endpoint cannot be created while another endpoint is being created") { // CreateClientVpnEndpoint - return aws.TrueTernary - } - - if tfawserr.ErrMessageContains(err, errCodeConcurrentMutationLimitExceeded, "Cannot initiate another change for this endpoint at this time") { // CreateClientVpnRoute, DeleteClientVpnRoute - return aws.TrueTernary - } - - if tfawserr.ErrMessageContains(err, errCodeVPNConnectionLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnConnection - return aws.TrueTernary - } - - if tfawserr.ErrMessageContains(err, errCodeVPNGatewayLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnGateway - return aws.TrueTernary - } - - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if tfawserr.ErrMessageContains(err, errCodeInvalidParameterValue, "This call cannot be completed because there are pending VPNs or Virtual Interfaces") { // AttachVpnGateway, DetachVpnGateway + return aws.TrueTernary + } + + if tfawserr.ErrCodeEquals(err, errCodeInsufficientInstanceCapacity) { // CreateCapacityReservation, RunInstances + return aws.TrueTernary + } + + if tfawserr.ErrMessageContains(err, errCodeOperationNotPermitted, "Endpoint cannot be created while another endpoint is being created") { // CreateClientVpnEndpoint + return aws.TrueTernary + } + + if tfawserr.ErrMessageContains(err, errCodeConcurrentMutationLimitExceeded, "Cannot initiate another change for this endpoint at this time") { // CreateClientVpnRoute, DeleteClientVpnRoute + return aws.TrueTernary + } + + if tfawserr.ErrMessageContains(err, errCodeVPNConnectionLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnConnection + return aws.TrueTernary + } + + if tfawserr.ErrMessageContains(err, errCodeVPNGatewayLimitExceeded, "maximum number of mutating objects has been reached") { // CreateVpnGateway + return aws.TrueTernary + } + + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/fms/service_package.go b/internal/service/fms/service_package.go index d665b7225ce4..bfbfa5253a42 100644 --- a/internal/service/fms/service_package.go +++ b/internal/service/fms/service_package.go @@ -10,26 +10,37 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/fms" awstypes "github.com/aws/aws-sdk-go-v2/service/fms/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*fms.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*fms.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*fms.Options){ func(o *fms.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - // Acceptance testing creates and deletes resources in quick succession. - // The FMS onboarding process into Organizations is opaque to consumers. - // Since we cannot reasonably check this status before receiving the error, - // set the operation as retryable. - if errs.IsAErrorMessageContains[*awstypes.InvalidOperationException](err, "Your AWS Organization is currently onboarding with AWS Firewall Manager and cannot be offboarded") || - errs.IsAErrorMessageContains[*awstypes.InvalidOperationException](err, "Your AWS Organization is currently offboarding with AWS Firewall Manager. Please submit onboard request after offboarded") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + // Acceptance testing creates and deletes resources in quick succession. + // The FMS onboarding process into Organizations is opaque to consumers. + // Since we cannot reasonably check this status before receiving the error, + // set the operation as retryable. + if errs.IsAErrorMessageContains[*awstypes.InvalidOperationException](err, "Your AWS Organization is currently onboarding with AWS Firewall Manager and cannot be offboarded") || + errs.IsAErrorMessageContains[*awstypes.InvalidOperationException](err, "Your AWS Organization is currently offboarding with AWS Firewall Manager. Please submit onboard request after offboarded") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/kafka/service_package.go b/internal/service/kafka/service_package.go index ab0a31be43d7..f10c1fc6c7cd 100644 --- a/internal/service/kafka/service_package.go +++ b/internal/service/kafka/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/kafka" awstypes "github.com/aws/aws-sdk-go-v2/service/kafka/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*kafka.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*kafka.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*kafka.Options){ func(o *kafka.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.TooManyRequestsException](err, "Too Many Requests") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.TooManyRequestsException](err, "Too Many Requests") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/kinesis/service_package.go b/internal/service/kinesis/service_package.go index 9c76f4c33f64..1ab9ff107362 100644 --- a/internal/service/kinesis/service_package.go +++ b/internal/service/kinesis/service_package.go @@ -10,22 +10,33 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/kinesis" "github.com/aws/aws-sdk-go-v2/service/kinesis/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*kinesis.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*kinesis.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*kinesis.Options){ func(o *kinesis.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*types.LimitExceededException](err, "simultaneously be in CREATING or DELETING") || - errs.IsAErrorMessageContains[*types.LimitExceededException](err, "Rate exceeded for stream") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*types.LimitExceededException](err, "simultaneously be in CREATING or DELETING") || + errs.IsAErrorMessageContains[*types.LimitExceededException](err, "Rate exceeded for stream") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/lightsail/service_package.go b/internal/service/lightsail/service_package.go index 929e5d65e81f..d385339cfe27 100644 --- a/internal/service/lightsail/service_package.go +++ b/internal/service/lightsail/service_package.go @@ -11,22 +11,33 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/lightsail" awstypes "github.com/aws/aws-sdk-go-v2/service/lightsail/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*lightsail.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*lightsail.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*lightsail.Options){ func(o *lightsail.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Please try again in a few minutes") || - strings.Contains(err.Error(), "Please wait for it to complete before trying again") { - return aws.TrueTernary - } - return aws.UnknownTernary - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Please try again in a few minutes") || + strings.Contains(err.Error(), "Please wait for it to complete before trying again") { + return aws.TrueTernary + } + return aws.UnknownTernary + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/organizations/service_package.go b/internal/service/organizations/service_package.go index f1d7ff789de8..056a268d13c0 100644 --- a/internal/service/organizations/service_package.go +++ b/internal/service/organizations/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/organizations" awstypes "github.com/aws/aws-sdk-go-v2/service/organizations/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*organizations.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*organizations.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*organizations.Options){ func(o *organizations.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.ConcurrentModificationException](err, "Try again later") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.ConcurrentModificationException](err, "Try again later") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/s3/service_package.go b/internal/service/s3/service_package.go index b7f8d5ab0ca6..87e46cec1a18 100644 --- a/internal/service/s3/service_package.go +++ b/internal/service/s3/service_package.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/vcr" ) func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*s3.Options) { @@ -38,12 +39,21 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string o.UsePathStyle = config["s3_use_path_style"].(bool) }, func(o *s3.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if tfawserr.ErrMessageContains(err, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if tfawserr.ErrMessageContains(err, errCodeOperationAborted, "A conflicting conditional operation is currently in progress against this resource. Please try again.") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/schemas/service_package.go b/internal/service/schemas/service_package.go index 2570bcfb675f..f2e9ca7b24b5 100644 --- a/internal/service/schemas/service_package.go +++ b/internal/service/schemas/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/schemas" awstypes "github.com/aws/aws-sdk-go-v2/service/schemas/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*schemas.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*schemas.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*schemas.Options){ func(o *schemas.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsAErrorMessageContains[*awstypes.TooManyRequestsException](err, "Too Many Requests") { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsAErrorMessageContains[*awstypes.TooManyRequestsException](err, "Too Many Requests") { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } diff --git a/internal/service/ssoadmin/service_package.go b/internal/service/ssoadmin/service_package.go index 573b993a1c0e..ec6ad84d1bc2 100644 --- a/internal/service/ssoadmin/service_package.go +++ b/internal/service/ssoadmin/service_package.go @@ -10,21 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/ssoadmin" "github.com/aws/aws-sdk-go-v2/service/ssoadmin/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/internal/vcr" ) -func (p *servicePackage) withExtraOptions(_ context.Context, config map[string]any) []func(*ssoadmin.Options) { +func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string]any) []func(*ssoadmin.Options) { cfg := *(config["aws_sdkv2_config"].(*aws.Config)) return []func(*ssoadmin.Options){ func(o *ssoadmin.Options) { - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(func(err error) aws.Ternary { - if errs.IsA[*types.ConflictException](err) || errs.IsA[*types.ThrottlingException](err) { - return aws.TrueTernary - } - return aws.UnknownTernary // Delegate to configured Retryer. - })) + retryables := []retry.IsErrorRetryable{ + retry.IsErrorRetryableFunc(func(err error) aws.Ternary { + if errs.IsA[*types.ConflictException](err) || errs.IsA[*types.ThrottlingException](err) { + return aws.TrueTernary + } + return aws.UnknownTernary // Delegate to configured Retryer. + }), + } + // Include go-vcr retryable to prevent generated client retryer from being overridden + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + } + + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) }, } } From 7e2fc000170d375a01d1e9f11d9692734869458a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 10:45:28 -0400 Subject: [PATCH 0986/2115] S3 Tables: Only sweep customer buckets. --- internal/service/s3tables/sweep.go | 121 ++++++++++++++++++----------- 1 file changed, 74 insertions(+), 47 deletions(-) diff --git a/internal/service/s3tables/sweep.go b/internal/service/s3tables/sweep.go index a4b938162941..591e452a0b44 100644 --- a/internal/service/s3tables/sweep.go +++ b/internal/service/s3tables/sweep.go @@ -5,9 +5,11 @@ package s3tables import ( "context" + "log" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3tables" + awstypes "github.com/aws/aws-sdk-go-v2/service/s3tables/types" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" @@ -16,43 +18,47 @@ import ( ) func RegisterSweepers() { - awsv2.Register("aws_s3tables_namespace", sweepNamespaces, - "aws_s3tables_table", - ) - + awsv2.Register("aws_s3tables_namespace", sweepNamespaces, "aws_s3tables_table") awsv2.Register("aws_s3tables_table", sweepTables) - - awsv2.Register("aws_s3tables_table_bucket", sweepTableBuckets, - "aws_s3tables_namespace", - ) + awsv2.Register("aws_s3tables_table_bucket", sweepTableBuckets, "aws_s3tables_namespace") } func sweepNamespaces(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.S3TablesClient(ctx) + var input s3tables.ListTableBucketsInput + sweepResources := make([]sweep.Sweepable, 0) - var sweepResources []sweep.Sweepable + pages := s3tables.NewListTableBucketsPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) - tableBuckets := s3tables.NewListTableBucketsPaginator(conn, &s3tables.ListTableBucketsInput{}) - for tableBuckets.HasMorePages() { - page, err := tableBuckets.NextPage(ctx) if err != nil { return nil, err } - for _, bucket := range page.TableBuckets { - namespaces := s3tables.NewListNamespacesPaginator(conn, &s3tables.ListNamespacesInput{ - TableBucketARN: bucket.Arn, - }) - for namespaces.HasMorePages() { - page, err := namespaces.NextPage(ctx) + for _, v := range page.TableBuckets { + tableBucketARN := aws.ToString(v.Arn) + + if typ := v.Type; typ != awstypes.TableBucketTypeCustomer { + log.Printf("[INFO] Skipping S3 Tables Table Bucket %s: Type=%s", tableBucketARN, typ) + continue + } + + input := s3tables.ListNamespacesInput{ + TableBucketARN: aws.String(tableBucketARN), + } + pages := s3tables.NewListNamespacesPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + if err != nil { return nil, err } - for _, namespace := range page.Namespaces { + for _, v := range page.Namespaces { sweepResources = append(sweepResources, framework.NewSweepResource(newNamespaceResource, client, - framework.NewAttribute("table_bucket_arn", aws.ToString(bucket.Arn)), - framework.NewAttribute(names.AttrNamespace, namespace.Namespace[0]), + framework.NewAttribute("table_bucket_arn", tableBucketARN), + framework.NewAttribute(names.AttrNamespace, v.Namespace[0]), )) } } @@ -64,42 +70,55 @@ func sweepNamespaces(ctx context.Context, client *conns.AWSClient) ([]sweep.Swee func sweepTables(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.S3TablesClient(ctx) + var input s3tables.ListTableBucketsInput + sweepResources := make([]sweep.Sweepable, 0) - var sweepResources []sweep.Sweepable + pages := s3tables.NewListTableBucketsPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) - tableBuckets := s3tables.NewListTableBucketsPaginator(conn, &s3tables.ListTableBucketsInput{}) - for tableBuckets.HasMorePages() { - page, err := tableBuckets.NextPage(ctx) if err != nil { return nil, err } - for _, bucket := range page.TableBuckets { - namespaces := s3tables.NewListNamespacesPaginator(conn, &s3tables.ListNamespacesInput{ - TableBucketARN: bucket.Arn, - }) - for namespaces.HasMorePages() { - page, err := namespaces.NextPage(ctx) + for _, v := range page.TableBuckets { + tableBucketARN := aws.ToString(v.Arn) + + if typ := v.Type; typ != awstypes.TableBucketTypeCustomer { + log.Printf("[INFO] Skipping S3 Tables Table Bucket %s: Type=%s", tableBucketARN, typ) + continue + } + + input := s3tables.ListNamespacesInput{ + TableBucketARN: aws.String(tableBucketARN), + } + pages := s3tables.NewListNamespacesPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + if err != nil { return nil, err } - for _, namespace := range page.Namespaces { - tables := s3tables.NewListTablesPaginator(conn, &s3tables.ListTablesInput{ - TableBucketARN: bucket.Arn, - Namespace: aws.String(namespace.Namespace[0]), - }) - for tables.HasMorePages() { - page, err := tables.NextPage(ctx) + for _, v := range page.Namespaces { + namespace := v.Namespace[0] + input := s3tables.ListTablesInput{ + Namespace: aws.String(namespace), + TableBucketARN: aws.String(tableBucketARN), + } + pages := s3tables.NewListTablesPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + if err != nil { return nil, err } - for _, table := range page.Tables { + for _, v := range page.Tables { sweepResources = append(sweepResources, framework.NewSweepResource(newTableResource, client, - framework.NewAttribute("table_bucket_arn", aws.ToString(bucket.Arn)), - framework.NewAttribute(names.AttrNamespace, namespace.Namespace[0]), - framework.NewAttribute(names.AttrName, aws.ToString(table.Name)), + framework.NewAttribute("table_bucket_arn", tableBucketARN), + framework.NewAttribute(names.AttrNamespace, namespace), + framework.NewAttribute(names.AttrName, aws.ToString(v.Name)), )) } } @@ -113,19 +132,27 @@ func sweepTables(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepabl func sweepTableBuckets(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.S3TablesClient(ctx) + var input s3tables.ListTableBucketsInput + sweepResources := make([]sweep.Sweepable, 0) - var sweepResources []sweep.Sweepable - - pages := s3tables.NewListTableBucketsPaginator(conn, &s3tables.ListTableBucketsInput{}) + pages := s3tables.NewListTableBucketsPaginator(conn, &input) for pages.HasMorePages() { page, err := pages.NextPage(ctx) + if err != nil { return nil, err } - for _, bucket := range page.TableBuckets { + for _, v := range page.TableBuckets { + tableBucketARN := aws.ToString(v.Arn) + + if typ := v.Type; typ != awstypes.TableBucketTypeCustomer { + log.Printf("[INFO] Skipping S3 Tables Table Bucket %s: Type=%s", tableBucketARN, typ) + continue + } + sweepResources = append(sweepResources, framework.NewSweepResource(newTableBucketResource, client, - framework.NewAttribute(names.AttrARN, aws.ToString(bucket.Arn)), + framework.NewAttribute(names.AttrARN, tableBucketARN), )) } } From 8edff15b6a784663bee98cdb7882606bfd42527f Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 29 Aug 2025 10:50:14 -0400 Subject: [PATCH 0987/2115] Add parameterized resource identity to `aws_instance` (#44068) ```console % make testacc PKG=ec2 TESTS=TestAccEC2Instance_Identity make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2Instance_Identity' -timeout 360m -vet=off 2025/08/28 11:28:46 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 11:28:46 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccEC2Instance_Identity_RegionOverride (79.46s) --- PASS: TestAccEC2Instance_Identity_Basic (87.10s) --- PASS: TestAccEC2Instance_Identity_ExistingResource (92.51s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 99.209s ``` ```console % make testacc PKG=ec2 TESTS=TestAccEC2Instance_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccEC2Instance_' -timeout 360m -vet=off 2025/08/28 11:55:33 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/28 11:55:33 Initializing Terraform AWS Provider (SDKv2-style)... === NAME TestAccEC2Instance_cpuOptionsAmdSevSnpEnabledToDisabled ec2_instance_test.go:4597: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-2] === NAME TestAccEC2Instance_cpuOptionsAmdSevSnpDisabledToEnabled ec2_instance_test.go:4641: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-2] --- SKIP: TestAccEC2Instance_cpuOptionsAmdSevSnpDisabledToEnabled (0.40s) === CONT TestAccEC2Instance_changeInstanceTypeAndUserData --- SKIP: TestAccEC2Instance_cpuOptionsAmdSevSnpEnabledToDisabled (0.40s) === CONT TestAccEC2Instance_changeInstanceTypeReplace --- PASS: TestAccEC2Instance_NetworkInterface_primaryNetworkInterfaceSourceDestCheck (97.01s) === CONT TestAccEC2Instance_gp3RootBlockDevice --- PASS: TestAccEC2Instance_NetworkInterface_primaryNetworkInterface (97.64s) === CONT TestAccEC2Instance_changeInstanceType --- PASS: TestAccEC2Instance_EBSRootDevice_basic (102.63s) === CONT TestAccEC2Instance_forceNewAndTagsDrift --- PASS: TestAccEC2Instance_PrimaryNetworkInterface_basic (106.16s) === CONT TestAccEC2Instance_EBSRootDevice_multipleDynamicEBSBlockDevices --- PASS: TestAccEC2Instance_Identity_Basic (112.21s) === CONT TestAccEC2Instance_keyPairCheck --- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPsUpdate (132.56s) === CONT TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifyDeleteOnTermination --- PASS: TestAccEC2Instance_BlockDeviceTags_ebsAndRoot (133.40s) === CONT TestAccEC2Instance_PrivateDNSNameOptions_configured --- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifySize (138.69s) === CONT TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPsUpdate --- PASS: TestAccEC2Instance_sourceDestCheck (139.03s) === CONT TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPs --- PASS: TestAccEC2Instance_EBSRootDevice_modifyType (143.45s) === CONT TestAccEC2Instance_IPv6_primaryEnable --- PASS: TestAccEC2Instance_EBSRootDevice_modifySize (143.53s) === CONT TestAccEC2Instance_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccEC2Instance_BlockDeviceTags_defaultTagsVolumeTags (163.66s) === CONT TestAccEC2Instance_BlockDeviceTags_attachedVolume --- PASS: TestAccEC2Instance_PrivateDNSNameOptions_computed (170.12s) === CONT TestAccEC2Instance_BlockDeviceTags_volumeTags --- PASS: TestAccEC2Instance_gp3RootBlockDevice (94.31s) === CONT TestAccEC2Instance_noAMIEphemeralDevices --- PASS: TestAccEC2Instance_NetworkInterface_addSecondaryInterface (195.13s) === CONT TestAccEC2Instance_networkInstanceVPCSecurityGroupIDs --- PASS: TestAccEC2Instance_EBSRootDevice_multipleDynamicEBSBlockDevices (93.64s) === CONT TestAccEC2Instance_rootInstanceStore --- PASS: TestAccEC2Instance_keyPairCheck (88.79s) === CONT TestAccEC2Instance_networkInstanceRemovingAllSecurityGroups === NAME TestAccEC2Instance_rootInstanceStore ec2_instance_test.go:803: Step 1/2 error: Error running pre-apply plan: exit status 1 Error: Your query returned no results. Please change your search criteria and try again. with data.aws_ami.ubuntu-bionic-ami-hvm-instance-store, on terraform_plugin_test.tf line 12, in data "aws_ami" "ubuntu-bionic-ami-hvm-instance-store": 12: data "aws_ami" "ubuntu-bionic-ami-hvm-instance-store" { --- FAIL: TestAccEC2Instance_rootInstanceStore (2.00s) === CONT TestAccEC2Instance_blockDevices --- PASS: TestAccEC2Instance_changeInstanceTypeAndUserData (223.23s) === CONT TestAccEC2Instance_networkInstanceSecurityGroups --- PASS: TestAccEC2Instance_changeInstanceTypeReplace (228.16s) === CONT TestAccEC2Instance_gp2WithIopsValue --- PASS: TestAccEC2Instance_gp2WithIopsValue (6.05s) === CONT TestAccEC2Instance_IPv6AddressesExplicit --- PASS: TestAccEC2Instance_EBSRootDeviceMultipleBlockDevices_modifyDeleteOnTermination (105.65s) === CONT TestAccEC2Instance_gp2IopsDevice --- PASS: TestAccEC2Instance_IPv6_primaryEnable (97.11s) === CONT TestAccEC2Instance_IPv6AddressCount --- PASS: TestAccEC2Instance_changeInstanceTypeAndUserDataBase64 (241.91s) === CONT TestAccEC2Instance_userDataBase64_update --- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPsUpdate (117.03s) === CONT TestAccEC2Instance_IPv6_supportAddressCountWithIPv4 --- PASS: TestAccEC2Instance_NewNetworkInterface_privateIPAndSecondaryPrivateIPs (121.90s) === CONT TestAccEC2Instance_userDataBase64_updateWithZipFile --- PASS: TestAccEC2Instance_tags_IgnoreTags_Overlap_DefaultTag (125.06s) === CONT TestAccEC2Instance_IPv6_primaryDisable --- PASS: TestAccEC2Instance_forceNewAndTagsDrift (169.47s) === CONT TestAccEC2Instance_userDataBase64_updateWithBashFile --- PASS: TestAccEC2Instance_networkInstanceVPCSecurityGroupIDs (95.40s) === CONT TestAccEC2Instance_userDataBase64 --- PASS: TestAccEC2Instance_blockDevices (93.85s) === CONT TestAccEC2Instance_CreditSpecificationUnlimitedCPUCredits_t2Tot3Taint --- PASS: TestAccEC2Instance_changeInstanceType (202.51s) === CONT TestAccEC2Instance_basicWithSpot --- PASS: TestAccEC2Instance_noAMIEphemeralDevices (114.11s) === CONT TestAccEC2Instance_CapacityReservation_modifyTarget --- PASS: TestAccEC2Instance_BlockDeviceTags_volumeTags (137.69s) === CONT TestAccEC2Instance_RootBlockDevice_kmsKeyARN --- PASS: TestAccEC2Instance_networkInstanceRemovingAllSecurityGroups (108.87s) === CONT TestAccEC2Instance_NetworkInterface_networkCardIndex --- PASS: TestAccEC2Instance_networkInstanceSecurityGroups (96.02s) === CONT TestAccEC2Instance_EBSBlockDevice_RootBlockDevice_removed --- PASS: TestAccEC2Instance_gp2IopsDevice (93.44s) === CONT TestAccEC2Instance_inDefaultVPCBySgName --- PASS: TestAccEC2Instance_BlockDeviceTags_attachedVolume (180.59s) === CONT TestAccEC2Instance_disappears --- PASS: TestAccEC2Instance_PrivateDNSNameOptions_configured (213.52s) === CONT TestAccEC2Instance_basic --- PASS: TestAccEC2Instance_addSecurityGroupNetworkInterface (346.96s) === CONT TestAccEC2Instance_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccEC2Instance_IPv6_supportAddressCountWithIPv4 (99.65s) === CONT TestAccEC2Instance_EBSRootDeviceModifyThroughput_gp3 --- PASS: TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_attachmentResource (357.31s) === CONT TestAccEC2Instance_EBSRootDevice_modifyAll --- PASS: TestAccEC2Instance_NetworkInterface_attachSecondaryInterface_inlineAttachment (357.74s) === CONT TestAccEC2Instance_EBSRootDevice_modifyDeleteOnTermination --- PASS: TestAccEC2Instance_IPv6AddressCount (129.57s) === CONT TestAccEC2Instance_tags_DefaultTags_nonOverlapping --- PASS: TestAccEC2Instance_RootBlockDevice_kmsKeyARN (82.04s) === CONT TestAccEC2Instance_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccEC2Instance_userDataBase64 (108.41s) === CONT TestAccEC2Instance_tags_ComputedTag_OnUpdate_Add --- PASS: TestAccEC2Instance_NetworkInterface_networkCardIndex (91.01s) === CONT TestAccEC2Instance_tags_ComputedTag_OnCreate --- PASS: TestAccEC2Instance_basicWithSpot (115.85s) === CONT TestAccEC2Instance_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccEC2Instance_inDefaultVPCBySgName (88.14s) === CONT TestAccEC2Instance_tags_DefaultTags_nullOverlappingResourceTag --- PASS: TestAccEC2Instance_userDataBase64_update (177.92s) === CONT TestAccEC2Instance_tags_DefaultTags_emptyProviderOnlyTag === NAME TestAccEC2Instance_CapacityReservation_modifyTarget acctest.go:1634: skipping test for aws/us-west-2: Error running apply: exit status 1 Error: starting EC2 Instance (i-04cef967dd61b822f): operation error EC2: StartInstances, https response error StatusCode: 400, RequestID: 2f467166-77dc-4a00-9679-87f2eb010a2d, api error ReservationCapacityExceeded: The requested reservation does not have sufficient compatible and available capacity for this request. with aws_instance.test, on terraform_plugin_test.tf line 50, in resource "aws_instance" "test": 50: resource "aws_instance" "test" { --- PASS: TestAccEC2Instance_disappears (80.74s) === CONT TestAccEC2Instance_tags_DefaultTags_emptyResourceTag --- SKIP: TestAccEC2Instance_CapacityReservation_modifyTarget (130.13s) === CONT TestAccEC2Instance_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccEC2Instance_tags_IgnoreTags_Overlap_ResourceTag (102.78s) === CONT TestAccEC2Instance_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccEC2Instance_userDataBase64_updateWithZipFile (199.46s) === CONT TestAccEC2Instance_tags_DefaultTags_overlapping --- PASS: TestAccEC2Instance_basic (115.07s) === CONT TestAccEC2Instance_EBSRootDeviceModifyIOPS_io2 --- PASS: TestAccEC2Instance_IPv6_primaryDisable (200.22s) === CONT TestAccEC2Instance_EBSRootDeviceModifyIOPS_io1 --- PASS: TestAccEC2Instance_userDataBase64_updateWithBashFile (198.14s) === CONT TestAccEC2Instance_tags_AddOnUpdate --- PASS: TestAccEC2Instance_EBSBlockDevice_RootBlockDevice_removed (151.88s) === CONT TestAccEC2Instance_tags_DefaultTags_providerOnly --- PASS: TestAccEC2Instance_EBSRootDevice_modifyDeleteOnTermination (120.44s) === CONT TestAccEC2Instance_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccEC2Instance_EBSRootDeviceModifyThroughput_gp3 (129.29s) === CONT TestAccEC2Instance_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccEC2Instance_CreditSpecificationUnlimitedCPUCredits_t2Tot3Taint (191.08s) === CONT TestAccEC2Instance_tags_EmptyTag_OnCreate --- PASS: TestAccEC2Instance_tags_ComputedTag_OnCreate (90.07s) === CONT TestAccEC2Instance_iamInstanceProfile --- PASS: TestAccEC2Instance_tags_ComputedTag_OnUpdate_Add (98.04s) === CONT TestAccEC2Instance_Empty_privateIP --- PASS: TestAccEC2Instance_EBSRootDevice_modifyAll (140.73s) === CONT TestAccEC2Instance_associatePublicIPAndPrivateIP --- PASS: TestAccEC2Instance_tags_ComputedTag_OnUpdate_Replace (119.09s) === CONT TestAccEC2Instance_privateIP --- PASS: TestAccEC2Instance_tags_DefaultTags_emptyResourceTag (87.55s) === CONT TestAccEC2Instance_iamInstanceProfilePath --- PASS: TestAccEC2Instance_tags_DefaultTags_nonOverlapping (146.63s) === CONT TestAccEC2Instance_BlockDeviceTags_defaultTagsEBDOverlaps --- PASS: TestAccEC2Instance_tags_DefaultTags_nullOverlappingResourceTag (98.18s) === CONT TestAccEC2Instance_instanceProfileChange --- PASS: TestAccEC2Instance_tags_DefaultTags_emptyProviderOnlyTag (118.55s) === CONT TestAccEC2Instance_BlockDeviceTags_defaultTagsVolumeTagsOverlap --- PASS: TestAccEC2Instance_tags_DefaultTags_nullNonOverlappingResourceTag (128.86s) === CONT TestAccEC2Instance_outpost --- PASS: TestAccEC2Instance_tags_DefaultTags_updateToProviderOnly (95.46s) === CONT TestAccEC2Instance_IPv6AddressCountAndSingleAddressCausesError === NAME TestAccEC2Instance_outpost ec2_instance_test.go:1141: skipping since no Outposts found --- SKIP: TestAccEC2Instance_outpost (0.48s) === CONT TestAccEC2Instance_IPv6_supportAddressCount --- PASS: TestAccEC2Instance_IPv6AddressCountAndSingleAddressCausesError (1.15s) === CONT TestAccEC2Instance_placementPartitionNumber --- PASS: TestAccEC2Instance_tags_DefaultTags_updateToResourceOnly (122.50s) === CONT TestAccEC2Instance_placementGroup --- PASS: TestAccEC2Instance_tags_DefaultTags_overlapping (104.71s) === CONT TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3 --- PASS: TestAccEC2Instance_IPv6AddressesExplicit (330.60s) === CONT TestAccEC2Instance_CreditSpecificationStandardCPUCredits_t2Tot3Taint --- PASS: TestAccEC2Instance_tags_AddOnUpdate (115.24s) === CONT TestAccEC2Instance_CreditSpecificationT3_updateCPUCredits --- PASS: TestAccEC2Instance_Empty_privateIP (89.25s) === CONT TestAccEC2Instance_CreditSpecificationT3_unlimitedCPUCredits --- PASS: TestAccEC2Instance_tags_EmptyTag_OnCreate (102.01s) === CONT TestAccEC2Instance_CreditSpecificationT3_standardCPUCredits --- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io2 (129.53s) === CONT TestAccEC2Instance_CreditSpecificationT3_unspecifiedDefaultsToUnlimited --- PASS: TestAccEC2Instance_associatePublicIPAndPrivateIP (99.53s) === CONT TestAccEC2Instance_CreditSpecification_isNotAppliedToNonBurstable --- PASS: TestAccEC2Instance_EBSRootDeviceModifyIOPS_io1 (129.32s) === CONT TestAccEC2Instance_CreditSpecification_updateCPUCredits --- PASS: TestAccEC2Instance_privateIP (90.04s) === CONT TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t4g --- PASS: TestAccEC2Instance_tags_EmptyTag_OnUpdate_Add (119.98s) === CONT TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3a --- PASS: TestAccEC2Instance_iamInstanceProfile (117.61s) === CONT TestAccEC2Instance_CreditSpecificationUnspecifiedToEmpty_nonBurstable --- PASS: TestAccEC2Instance_tags_EmptyTag_OnUpdate_Replace (136.58s) === CONT TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t2 --- PASS: TestAccEC2Instance_iamInstanceProfilePath (103.10s) === CONT TestAccEC2Instance_CreditSpecification_unlimitedCPUCredits === NAME TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t4g ec2_instance_test.go:5129: Step 1/2 error: Check failed: Check 3/3 error: aws_instance.test: Attribute 'credit_specification.0.cpu_credits' expected "standard", got "unlimited" --- PASS: TestAccEC2Instance_tags_DefaultTags_providerOnly (150.00s) === CONT TestAccEC2Instance_CreditSpecification_standardCPUCredits --- PASS: TestAccEC2Instance_placementPartitionNumber (79.15s) === CONT TestAccEC2Instance_CreditSpecification_unspecifiedDefaultsToStandard --- PASS: TestAccEC2Instance_BlockDeviceTags_defaultTagsEBDOverlaps (109.92s) === CONT TestAccEC2Instance_BlockDeviceTags_defaultTagsRBDOverlap --- PASS: TestAccEC2Instance_IPv6_supportAddressCount (120.59s) === CONT TestAccEC2Instance_UserData_ReplaceOnChange_Off --- PASS: TestAccEC2Instance_placementGroup (109.31s) === CONT TestAccEC2Instance_CapacityReservation_targetID --- PASS: TestAccEC2Instance_CreditSpecificationT3_unspecifiedDefaultsToUnlimited (81.75s) === CONT TestAccEC2Instance_CapacityReservationPreference_none --- PASS: TestAccEC2Instance_BlockDeviceTags_defaultTagsVolumeTagsOverlap (135.77s) === CONT TestAccEC2Instance_CapacityReservationPreference_open --- PASS: TestAccEC2Instance_instanceProfileChange (164.57s) === CONT TestAccEC2Instance_CapacityReservation_unspecifiedDefaultsToOpen --- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3a (80.89s) === CONT TestAccEC2Instance_enclaveOptions --- PASS: TestAccEC2Instance_CreditSpecificationT3_unlimitedCPUCredits (107.98s) === CONT TestAccEC2Instance_metadataOptions --- FAIL: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t4g (96.72s) === CONT TestAccEC2Instance_hibernation --- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t3 (130.95s) === CONT TestAccEC2Instance_UserData_ReplaceOnChange_Off_Base64 --- PASS: TestAccEC2Instance_CreditSpecificationT3_updateCPUCredits (117.21s) === CONT TestAccEC2Instance_CapacityReservation_modifyPreference --- PASS: TestAccEC2Instance_CreditSpecificationT3_standardCPUCredits (116.36s) === CONT TestAccEC2Instance_EBSBlockDevice_invalidIopsForVolumeType --- PASS: TestAccEC2Instance_EBSBlockDevice_invalidIopsForVolumeType (7.05s) === CONT TestAccEC2Instance_EBSBlockDevice_invalidThroughputForVolumeType --- PASS: TestAccEC2Instance_CreditSpecificationUnknownCPUCredits_t2 (99.46s) === CONT TestAccEC2Instance_tags --- PASS: TestAccEC2Instance_EBSBlockDevice_invalidThroughputForVolumeType (7.24s) === CONT TestAccEC2Instance_tags_EmptyMap --- PASS: TestAccEC2Instance_CreditSpecification_unlimitedCPUCredits (103.84s) === CONT TestAccEC2Instance_tags_null --- PASS: TestAccEC2Instance_CreditSpecification_isNotAppliedToNonBurstable (122.28s) === CONT TestAccEC2Instance_Identity_ExistingResource --- PASS: TestAccEC2Instance_CreditSpecification_updateCPUCredits (124.90s) === CONT TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPs --- PASS: TestAccEC2Instance_CreditSpecification_standardCPUCredits (104.17s) === CONT TestAccEC2Instance_EBSBlockDevice_kmsKeyARN --- PASS: TestAccEC2Instance_CreditSpecification_unspecifiedDefaultsToStandard (101.22s) === CONT TestAccEC2Instance_disableAPITerminationFinalFalse --- PASS: TestAccEC2Instance_CreditSpecificationStandardCPUCredits_t2Tot3Taint (162.98s) === CONT TestAccEC2Instance_dedicatedInstance --- PASS: TestAccEC2Instance_BlockDeviceTags_defaultTagsRBDOverlap (105.76s) === CONT TestAccEC2Instance_disableAPITerminationFinalTrue --- PASS: TestAccEC2Instance_CreditSpecificationUnspecifiedToEmpty_nonBurstable (137.83s) === CONT TestAccEC2Instance_cpuOptionsCoreThreadsUnspecifiedToSpecified --- PASS: TestAccEC2Instance_CapacityReservationPreference_none (83.86s) === CONT TestAccEC2Instance_upgradeV6CPUOptions --- PASS: TestAccEC2Instance_CapacityReservation_targetID (96.81s) === CONT TestAccEC2Instance_LaunchTemplateModifyTemplate_defaultVersion --- PASS: TestAccEC2Instance_CapacityReservationPreference_open (95.10s) === CONT TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToDisabledToEnabledToUnspecified ec2_instance_test.go:4464: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-2] --- SKIP: TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToDisabledToEnabledToUnspecified (0.00s) === CONT TestAccEC2Instance_UserData_ReplaceOnChange_On_Base64 --- PASS: TestAccEC2Instance_CapacityReservation_unspecifiedDefaultsToOpen (91.42s) === CONT TestAccEC2Instance_GetPasswordData_trueToFalse --- PASS: TestAccEC2Instance_dedicatedInstance (81.50s) === CONT TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToEnabledToDisabledToUnspecified ec2_instance_test.go:4531: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-2] --- SKIP: TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToEnabledToDisabledToUnspecified (0.00s) === CONT TestAccEC2Instance_LaunchTemplate_setSpecificVersion --- PASS: TestAccEC2Instance_tags_null (94.27s) === CONT TestAccEC2Instance_LaunchTemplate_overrideTemplate --- PASS: TestAccEC2Instance_tags_EmptyMap (104.32s) === CONT TestAccEC2Instance_LaunchTemplate_basic --- PASS: TestAccEC2Instance_UserData_ReplaceOnChange_Off (161.39s) === CONT TestAccEC2Instance_AssociatePublic_overridePrivate --- PASS: TestAccEC2Instance_EBSBlockDevice_kmsKeyARN (107.47s) === CONT TestAccEC2Instance_AssociatePublic_overridePublic --- PASS: TestAccEC2Instance_disableAPITerminationFinalTrue (102.77s) === CONT TestAccEC2Instance_AssociatePublic_explicitPrivate --- PASS: TestAccEC2Instance_disableAPITerminationFinalFalse (109.96s) === CONT TestAccEC2Instance_AssociatePublic_explicitPublic --- PASS: TestAccEC2Instance_enclaveOptions (152.67s) === CONT TestAccEC2Instance_AssociatePublic_defaultPublic --- PASS: TestAccEC2Instance_NewNetworkInterface_emptyPrivateIPAndSecondaryPrivateIPs (123.93s) === CONT TestAccEC2Instance_AssociatePublic_defaultPrivate --- PASS: TestAccEC2Instance_Identity_ExistingResource (130.28s) === CONT TestAccEC2Instance_LaunchTemplate_iamInstanceProfile --- PASS: TestAccEC2Instance_cpuOptionsCoreThreadsUnspecifiedToSpecified (106.73s) === CONT TestAccEC2Instance_LaunchTemplate_vpcSecurityGroup --- PASS: TestAccEC2Instance_hibernation (162.21s) === CONT TestAccEC2Instance_LaunchTemplate_spotAndStop --- PASS: TestAccEC2Instance_LaunchTemplateModifyTemplate_defaultVersion (98.19s) === CONT TestAccEC2Instance_UserData_stringToEncodedString --- PASS: TestAccEC2Instance_UserData_ReplaceOnChange_Off_Base64 (169.11s) === CONT TestAccEC2Instance_UserData_unspecifiedToEmptyString === CONT TestAccEC2Instance_UserData_emptyStringToUnspecified --- PASS: TestAccEC2Instance_upgradeV6CPUOptions (128.48s) --- PASS: TestAccEC2Instance_tags (173.87s) === CONT TestAccEC2Instance_Identity_RegionOverride --- PASS: TestAccEC2Instance_CapacityReservation_modifyPreference (198.88s) === CONT TestAccEC2Instance_cpuOptionsCoreThreads --- PASS: TestAccEC2Instance_metadataOptions (219.90s) === CONT TestAccEC2Instance_atLeastOneOtherEBSVolume ec2_instance_test.go:312: Step 1/3 error: Error running pre-apply plan: exit status 1 Error: Your query returned no results. Please change your search criteria and try again. with data.aws_ami.ubuntu-bionic-ami-hvm-instance-store, on terraform_plugin_test.tf line 12, in data "aws_ami" "ubuntu-bionic-ami-hvm-instance-store": 12: data "aws_ami" "ubuntu-bionic-ami-hvm-instance-store" { --- FAIL: TestAccEC2Instance_atLeastOneOtherEBSVolume (1.91s) === CONT TestAccEC2Instance_UserData_basic --- PASS: TestAccEC2Instance_LaunchTemplate_overrideTemplate (116.26s) === CONT TestAccEC2Instance_UserData_update --- PASS: TestAccEC2Instance_AssociatePublic_overridePublic (98.56s) === CONT TestAccEC2Instance_disableAPIStop --- PASS: TestAccEC2Instance_LaunchTemplate_setSpecificVersion (124.31s) === CONT TestAccEC2Instance_UserData_migrate --- PASS: TestAccEC2Instance_LaunchTemplate_spotAndStop (78.12s) === CONT TestAccEC2Instance_cpuOptionsAmdSevSnpCoreThreads ec2_instance_test.go:4690: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-2] --- SKIP: TestAccEC2Instance_cpuOptionsAmdSevSnpCoreThreads (0.00s) === CONT TestAccEC2Instance_LaunchTemplate_swapIDAndName --- PASS: TestAccEC2Instance_AssociatePublic_overridePrivate (109.41s) === CONT TestAccEC2Instance_autoRecovery --- PASS: TestAccEC2Instance_LaunchTemplate_basic (116.89s) === CONT TestAccEC2Instance_LaunchTemplate_updateTemplateVersion --- PASS: TestAccEC2Instance_AssociatePublic_explicitPrivate (110.15s) === CONT TestAccEC2Instance_NewNetworkInterface_publicIPAndSecondaryPrivateIPs --- PASS: TestAccEC2Instance_AssociatePublic_defaultPrivate (99.29s) === CONT TestAccEC2Instance_UserData_ReplaceOnChange_On --- PASS: TestAccEC2Instance_AssociatePublic_explicitPublic (119.73s) === CONT TestAccEC2Instance_GetPasswordData_falseToTrue --- PASS: TestAccEC2Instance_AssociatePublic_defaultPublic (120.09s) === CONT TestAccEC2Instance_CreditSpecificationEmpty_nonBurstable --- PASS: TestAccEC2Instance_UserData_ReplaceOnChange_On_Base64 (190.34s) === CONT TestAccEC2Instance_BlockDeviceTags_defaultTagsEBSRoot --- PASS: TestAccEC2Instance_UserData_unspecifiedToEmptyString (104.88s) === CONT TestAccEC2Instance_inDefaultVPCBySgID --- PASS: TestAccEC2Instance_LaunchTemplate_iamInstanceProfile (127.39s) --- PASS: TestAccEC2Instance_LaunchTemplate_vpcSecurityGroup (125.29s) --- PASS: TestAccEC2Instance_UserData_emptyStringToUnspecified (106.82s) --- PASS: TestAccEC2Instance_Identity_RegionOverride (110.29s) --- PASS: TestAccEC2Instance_UserData_basic (109.22s) --- PASS: TestAccEC2Instance_cpuOptionsCoreThreads (128.23s) --- PASS: TestAccEC2Instance_GetPasswordData_trueToFalse (271.37s) --- PASS: TestAccEC2Instance_autoRecovery (111.17s) --- PASS: TestAccEC2Instance_LaunchTemplate_swapIDAndName (121.08s) --- PASS: TestAccEC2Instance_disableAPIStop (126.57s) --- PASS: TestAccEC2Instance_UserData_stringToEncodedString (198.17s) --- PASS: TestAccEC2Instance_CreditSpecificationEmpty_nonBurstable (109.45s) --- PASS: TestAccEC2Instance_inDefaultVPCBySgID (98.26s) --- PASS: TestAccEC2Instance_BlockDeviceTags_defaultTagsEBSRoot (120.23s) --- PASS: TestAccEC2Instance_UserData_update (169.15s) --- PASS: TestAccEC2Instance_NewNetworkInterface_publicIPAndSecondaryPrivateIPs (180.33s) --- PASS: TestAccEC2Instance_UserData_ReplaceOnChange_On (180.70s) --- PASS: TestAccEC2Instance_GetPasswordData_falseToTrue (188.59s) --- PASS: TestAccEC2Instance_UserData_migrate (238.58s) --- PASS: TestAccEC2Instance_LaunchTemplate_updateTemplateVersion (243.69s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/ec2 1191.165s ``` --- .changelog/44068.txt | 3 + internal/service/ec2/ec2_instance.go | 11 +- .../ec2/ec2_instance_identity_gen_test.go | 237 ++++++++++++++++++ internal/service/ec2/service_package_gen.go | 6 +- .../ec2/testdata/Instance/basic/main_gen.tf | 36 +++ .../Instance/basic_v6.10.0/main_gen.tf | 46 ++++ .../Instance/region_override/main_gen.tf | 46 ++++ .../ec2/testdata/tmpl/ec2_instance_tags.gtpl | 1 + website/docs/r/instance.html.markdown | 26 ++ 9 files changed, 410 insertions(+), 2 deletions(-) create mode 100644 .changelog/44068.txt create mode 100644 internal/service/ec2/ec2_instance_identity_gen_test.go create mode 100644 internal/service/ec2/testdata/Instance/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/Instance/basic_v6.10.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/Instance/region_override/main_gen.tf diff --git a/.changelog/44068.txt b/.changelog/44068.txt new file mode 100644 index 000000000000..19b51b700c36 --- /dev/null +++ b/.changelog/44068.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_instance: Add resource identity support +``` diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 344323000e26..2fa886cc88e1 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -37,6 +37,7 @@ import ( "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/provider/sdkv2/importer" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" itypes "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -46,9 +47,13 @@ import ( // @SDKResource("aws_instance", name="Instance") // @Tags(identifierAttribute="id") +// @IdentityAttribute("id") +// @CustomImport // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;awstypes;awstypes.Instance") // @Testing(importIgnore="user_data_replace_on_change") // @Testing(generator=false) +// @Testing(preIdentityVersion="v6.10.0") +// @Testing(plannableImportAction="NoOp") func resourceInstance() *schema.Resource { //lintignore:R011 return &schema.Resource{ @@ -59,8 +64,12 @@ func resourceInstance() *schema.Resource { Importer: &schema.ResourceImporter{ StateContext: func(ctx context.Context, rd *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - rd.Set(names.AttrForceDestroy, false) + identitySpec := importer.IdentitySpec(ctx) + if err := importer.RegionalSingleParameterized(ctx, rd, identitySpec, meta.(importer.AWSClient)); err != nil { + return nil, err + } + rd.Set(names.AttrForceDestroy, false) return []*schema.ResourceData{rd}, nil }, }, diff --git a/internal/service/ec2/ec2_instance_identity_gen_test.go b/internal/service/ec2/ec2_instance_identity_gen_test.go new file mode 100644 index 000000000000..e2de8e44186a --- /dev/null +++ b/internal/service/ec2/ec2_instance_identity_gen_test.go @@ -0,0 +1,237 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/config" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccEC2Instance_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.Instance + resourceName := "aws_instance.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckInstanceDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic/"), + ConfigVariables: config.Variables{}, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic/"), + ConfigVariables: config.Variables{}, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "user_data_replace_on_change", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic/"), + ConfigVariables: config.Variables{}, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic/"), + ConfigVariables: config.Variables{}, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccEC2Instance_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_instance.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "user_data_replace_on_change", + }, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/region_override/"), + ConfigVariables: config.Variables{ + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.10.0 +func TestAccEC2Instance_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.Instance + resourceName := "aws_instance.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckInstanceDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic_v6.10.0/"), + ConfigVariables: config.Variables{}, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInstanceExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/Instance/basic/"), + ConfigVariables: config.Variables{}, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index 88217c66c5a8..73f3fb5702d4 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -1298,7 +1298,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + CustomImport: true, + }, }, { Factory: resourceInternetGateway, diff --git a/internal/service/ec2/testdata/Instance/basic/main_gen.tf b/internal/service/ec2/testdata/Instance/basic/main_gen.tf new file mode 100644 index 000000000000..e6f13617506b --- /dev/null +++ b/internal/service/ec2/testdata/Instance/basic/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-arm64.id + instance_type = "t4g.nano" + + metadata_options { + http_tokens = "required" + } +} + +# acctest.ConfigLatestAmazonLinux2HVMEBSARM64AMI + +# acctest.configLatestAmazonLinux2HVMEBSAMI("arm64") + +data "aws_ami" "amzn2-ami-minimal-hvm-ebs-arm64" { + most_recent = true + owners = ["amazon"] + + filter { + name = "name" + values = ["amzn2-ami-minimal-hvm-*"] + } + + filter { + name = "root-device-type" + values = ["ebs"] + } + + filter { + name = "architecture" + values = ["arm64"] + } +} + diff --git a/internal/service/ec2/testdata/Instance/basic_v6.10.0/main_gen.tf b/internal/service/ec2/testdata/Instance/basic_v6.10.0/main_gen.tf new file mode 100644 index 000000000000..48bf53876924 --- /dev/null +++ b/internal/service/ec2/testdata/Instance/basic_v6.10.0/main_gen.tf @@ -0,0 +1,46 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_instance" "test" { + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-arm64.id + instance_type = "t4g.nano" + + metadata_options { + http_tokens = "required" + } +} + +# acctest.ConfigLatestAmazonLinux2HVMEBSARM64AMI + +# acctest.configLatestAmazonLinux2HVMEBSAMI("arm64") + +data "aws_ami" "amzn2-ami-minimal-hvm-ebs-arm64" { + most_recent = true + owners = ["amazon"] + + filter { + name = "name" + values = ["amzn2-ami-minimal-hvm-*"] + } + + filter { + name = "root-device-type" + values = ["ebs"] + } + + filter { + name = "architecture" + values = ["arm64"] + } +} + +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.10.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/Instance/region_override/main_gen.tf b/internal/service/ec2/testdata/Instance/region_override/main_gen.tf new file mode 100644 index 000000000000..84ff8e6deaa1 --- /dev/null +++ b/internal/service/ec2/testdata/Instance/region_override/main_gen.tf @@ -0,0 +1,46 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_instance" "test" { + region = var.region + + ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-arm64.id + instance_type = "t4g.nano" + + metadata_options { + http_tokens = "required" + } +} + +# acctest.ConfigLatestAmazonLinux2HVMEBSARM64AMI + +# acctest.configLatestAmazonLinux2HVMEBSAMI("arm64") + +data "aws_ami" "amzn2-ami-minimal-hvm-ebs-arm64" { + region = var.region + + most_recent = true + owners = ["amazon"] + + filter { + name = "name" + values = ["amzn2-ami-minimal-hvm-*"] + } + + filter { + name = "root-device-type" + values = ["ebs"] + } + + filter { + name = "architecture" + values = ["arm64"] + } +} + + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/tmpl/ec2_instance_tags.gtpl b/internal/service/ec2/testdata/tmpl/ec2_instance_tags.gtpl index 6faefb2a830b..e16b850c47f9 100644 --- a/internal/service/ec2/testdata/tmpl/ec2_instance_tags.gtpl +++ b/internal/service/ec2/testdata/tmpl/ec2_instance_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_instance" "test" { +{{- template "region" }} ami = data.aws_ami.amzn2-ami-minimal-hvm-ebs-arm64.id instance_type = "t4g.nano" diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index ef204c5c5a90..30d824732c2c 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -487,6 +487,32 @@ For `instance_market_options`, in addition to the arguments above, the following ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_instance.example + identity = { + id = "i-12345678" + } +} + +resource "aws_instance" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the instance. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import instances using the `id`. For example: ```terraform From edcc7b7c420c9947be3794485589a03df0be819f Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 29 Aug 2025 14:55:32 +0000 Subject: [PATCH 0988/2115] Update CHANGELOG.md for #44075 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bf1ab3f2d7d..c404ea7c1a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## 6.12.0 (Unreleased) +ENHANCEMENTS: + +* resource/aws_instance: Add resource identity support ([#44068](https://github.com/hashicorp/terraform-provider-aws/issues/44068)) +* resource/aws_ssm_association: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_ssm_document: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_ssm_maintenance_window: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_ssm_maintenance_window_target: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_ssm_maintenance_window_task: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_ssm_patch_baseline: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) + ## 6.11.0 (August 28, 2025) FEATURES: From 85f0dd0471b3f63ac5354ba84782a53768d049c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 11:00:34 -0400 Subject: [PATCH 0989/2115] Revert "Fixes namespaceNameValidator and addresses https://github.com/hashicorp/terraform-provider-aws/issues/43688" This reverts commit affd61aa5468d3ba3d5ae2e46a1ca3355bf8837d. --- internal/service/s3tables/namespace.go | 2 +- internal/service/s3tables/validate.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/service/s3tables/namespace.go b/internal/service/s3tables/namespace.go index a60852c04279..4f539b6f317f 100644 --- a/internal/service/s3tables/namespace.go +++ b/internal/service/s3tables/namespace.go @@ -245,7 +245,7 @@ type namespaceResourceModel struct { var namespaceNameValidator = []validator.String{ stringvalidator.LengthBetween(1, 255), - stringMustContainLowerCaseLettersNumbersHyphensUnderscores, + stringMustContainLowerCaseLettersNumbersUnderscores, stringMustStartWithLetterOrNumber, stringMustEndWithLetterOrNumber, } diff --git a/internal/service/s3tables/validate.go b/internal/service/s3tables/validate.go index fcef802a9b39..be3a4af9db0d 100644 --- a/internal/service/s3tables/validate.go +++ b/internal/service/s3tables/validate.go @@ -9,9 +9,8 @@ import ( ) var ( - stringMustContainLowerCaseLettersNumbersHypens = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase letters, numbers, or hyphens") - stringMustContainLowerCaseLettersNumbersUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z_]+$`), "must contain only lowercase letters, numbers, or underscores") - stringMustContainLowerCaseLettersNumbersHyphensUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-_]+$`), "must contain only lowercase letters, numbers, hyphens or underscores") + stringMustContainLowerCaseLettersNumbersHypens = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z-]+$`), "must contain only lowercase letters, numbers, or hyphens") + stringMustContainLowerCaseLettersNumbersUnderscores = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z_]+$`), "must contain only lowercase letters, numbers, or underscores") stringMustStartWithLetterOrNumber = stringvalidator.RegexMatches(regexache.MustCompile(`^[0-9a-z]`), "must start with a letter or number") stringMustEndWithLetterOrNumber = stringvalidator.RegexMatches(regexache.MustCompile(`[0-9a-z]$`), "must end with a letter or number") From 535af6774f501092461c24b4b5ebfc4d58978820 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 11:50:32 -0400 Subject: [PATCH 0990/2115] r/aws_s3tables_namespace: Tidy up. --- internal/service/s3tables/exports_test.go | 11 +- internal/service/s3tables/namespace.go | 171 ++++++++++---------- internal/service/s3tables/namespace_test.go | 28 ++-- 3 files changed, 99 insertions(+), 111 deletions(-) diff --git a/internal/service/s3tables/exports_test.go b/internal/service/s3tables/exports_test.go index 8ca8c7ca056f..d5c0b5e5a7df 100644 --- a/internal/service/s3tables/exports_test.go +++ b/internal/service/s3tables/exports_test.go @@ -10,17 +10,16 @@ var ( NewResourceTableBucketPolicy = newTableBucketPolicyResource ResourceTablePolicy = newTablePolicyResource - FindNamespace = findNamespace - FindTableByThreePartKey = findTableByThreePartKey - FindTableBucketByARN = findTableBucketByARN - FindTableBucketPolicy = findTableBucketPolicy - FindTablePolicy = findTablePolicy + FindNamespaceByTwoPartKey = findNamespaceByTwoPartKey + FindTableByThreePartKey = findTableByThreePartKey + FindTableBucketByARN = findTableBucketByARN + FindTableBucketPolicy = findTableBucketPolicy + FindTablePolicy = findTablePolicy TableIDFromTableARN = tableIDFromTableARN ) const ( - ResNameNamespace = resNameNamespace NamespaceIDSeparator = namespaceIDSeparator ) diff --git a/internal/service/s3tables/namespace.go b/internal/service/s3tables/namespace.go index 4f539b6f317f..b46d4ccfd8c8 100644 --- a/internal/service/s3tables/namespace.go +++ b/internal/service/s3tables/namespace.go @@ -24,10 +24,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -38,17 +38,13 @@ func newNamespaceResource(_ context.Context) (resource.ResourceWithConfigure, er return &namespaceResource{}, nil } -const ( - resNameNamespace = "Namespace" -) - type namespaceResource struct { framework.ResourceWithModel[namespaceResourceModel] framework.WithNoUpdate } -func (r *namespaceResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *namespaceResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrCreatedAt: schema.StringAttribute{ CustomType: timetypes.RFC3339Type{}, @@ -87,151 +83,146 @@ func (r *namespaceResource) Schema(ctx context.Context, req resource.SchemaReque } } -func (r *namespaceResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var plan namespaceResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *namespaceResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data namespaceResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - var input s3tables.CreateNamespaceInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { - return + conn := r.Meta().S3TablesClient(ctx) + + namespace, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Namespace), fwflex.StringValueFromFramework(ctx, data.TableBucketARN) + input := s3tables.CreateNamespaceInput{ + Namespace: []string{namespace}, + TableBucketARN: aws.String(tableBucketARN), } - input.Namespace = []string{plan.Namespace.ValueString()} - out, err := conn.CreateNamespace(ctx, &input) + _, err := conn.CreateNamespace(ctx, &input) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameNamespace, plan.Namespace.String(), err), - err.Error(), - ) - return - } - if out == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameNamespace, plan.Namespace.String(), nil), - errors.New("empty output").Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("creating S3 Tables Namespace (%s)", namespace), err.Error()) + return } - namespace, err := findNamespace(ctx, conn, plan.TableBucketARN.ValueString(), out.Namespace[0]) + output, err := findNamespaceByTwoPartKey(ctx, conn, tableBucketARN, namespace) + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, resNameNamespace, plan.Namespace.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Namespace (%s)", namespace), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, namespace, &plan)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - plan.Namespace = types.StringValue(out.Namespace[0]) - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *namespaceResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state namespaceResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *namespaceResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data namespaceResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findNamespace(ctx, conn, state.TableBucketARN.ValueString(), state.Namespace.ValueString()) + conn := r.Meta().S3TablesClient(ctx) + + namespace, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Namespace), fwflex.StringValueFromFramework(ctx, data.TableBucketARN) + output, err := findNamespaceByTwoPartKey(ctx, conn, tableBucketARN, namespace) + if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, resNameNamespace, state.Namespace.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Namespace (%s)", namespace), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *namespaceResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state namespaceResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *namespaceResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data namespaceResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + namespace, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Namespace), fwflex.StringValueFromFramework(ctx, data.TableBucketARN) input := s3tables.DeleteNamespaceInput{ - Namespace: state.Namespace.ValueStringPointer(), - TableBucketARN: state.TableBucketARN.ValueStringPointer(), + Namespace: aws.String(namespace), + TableBucketARN: aws.String(tableBucketARN), } - _, err := conn.DeleteNamespace(ctx, &input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return + } + if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return - } + response.Diagnostics.AddError(fmt.Sprintf("deleting S3 Tables Namespace (%s)", namespace), err.Error()) - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, resNameNamespace, state.Namespace.String(), err), - err.Error(), - ) return } } -func (r *namespaceResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - identifier, err := parseNamespaceIdentifier(req.ID) +func (r *namespaceResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + identifier, err := parseNamespaceIdentifier(request.ID) if err != nil { - resp.Diagnostics.AddError( + response.Diagnostics.AddError( "Invalid Import ID", "Import IDs for S3 Tables Namespaces must use the format
"+namespaceIDSeparator+".\n"+ - fmt.Sprintf("Had %q", req.ID), + fmt.Sprintf("Had %q", request.ID), ) return } - identifier.PopulateState(ctx, &resp.State, &resp.Diagnostics) + identifier.PopulateState(ctx, &response.State, &response.Diagnostics) } -func findNamespace(ctx context.Context, conn *s3tables.Client, bucketARN, name string) (*s3tables.GetNamespaceOutput, error) { - in := s3tables.GetNamespaceInput{ - Namespace: aws.String(name), - TableBucketARN: aws.String(bucketARN), +func findNamespaceByTwoPartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace string) (*s3tables.GetNamespaceOutput, error) { + input := s3tables.GetNamespaceInput{ + Namespace: aws.String(namespace), + TableBucketARN: aws.String(tableBucketARN), } - out, err := conn.GetNamespace(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findNamespace(ctx, conn, &input) +} + +func findNamespace(ctx context.Context, conn *s3tables.Client, input *s3tables.GetNamespaceInput) (*s3tables.GetNamespaceOutput, error) { + output, err := conn.GetNamespace(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - if out == nil { - return nil, tfresource.NewEmptyResultError(in) + if output == nil { + return nil, tfresource.NewEmptyResultError(input) } - return out, nil + return output, nil } type namespaceResourceModel struct { diff --git a/internal/service/s3tables/namespace_test.go b/internal/service/s3tables/namespace_test.go index e570e9b378da..8fd971287b0f 100644 --- a/internal/service/s3tables/namespace_test.go +++ b/internal/service/s3tables/namespace_test.go @@ -18,7 +18,6 @@ import ( "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/create" "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" tfs3tables "github.com/hashicorp/terraform-provider-aws/internal/service/s3tables" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -102,40 +101,39 @@ func testAccCheckNamespaceDestroy(ctx context.Context) resource.TestCheckFunc { continue } - _, err := tfs3tables.FindNamespace(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace]) + _, err := tfs3tables.FindNamespaceByTwoPartKey(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace]) + if tfresource.NotFound(err) { - return nil + continue } + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameNamespace, rs.Primary.ID, err) + return err } - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameNamespace, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("S3 Tables Namespace %s still exists", rs.Primary.Attributes[names.AttrNamespace]) } return nil } } -func testAccCheckNamespaceExists(ctx context.Context, name string, namespace *s3tables.GetNamespaceOutput) resource.TestCheckFunc { +func testAccCheckNamespaceExists(ctx context.Context, n string, v *s3tables.GetNamespaceOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameNamespace, name, errors.New("not found")) - } - - if rs.Primary.Attributes["table_bucket_arn"] == "" || rs.Primary.Attributes[names.AttrNamespace] == "" { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameNamespace, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) - resp, err := tfs3tables.FindNamespace(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace]) + output, err := tfs3tables.FindNamespaceByTwoPartKey(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace]) + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameNamespace, rs.Primary.ID, err) + return err } - *namespace = *resp + *v = *output return nil } From 72508b2c9b86668c5b05c2f5139b989b9d2c491e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 12:24:54 -0400 Subject: [PATCH 0991/2115] r/aws_s3tables_table_policy: Tidy up. --- internal/service/s3tables/exports_test.go | 24 +-- internal/service/s3tables/namespace_test.go | 15 +- .../service/s3tables/table_bucket_policy.go | 181 +++++++---------- .../s3tables/table_bucket_policy_test.go | 31 ++- .../service/s3tables/table_bucket_test.go | 2 +- internal/service/s3tables/table_policy.go | 190 ++++++++---------- .../service/s3tables/table_policy_test.go | 29 ++- internal/service/s3tables/table_test.go | 2 +- 8 files changed, 201 insertions(+), 273 deletions(-) diff --git a/internal/service/s3tables/exports_test.go b/internal/service/s3tables/exports_test.go index d5c0b5e5a7df..087f059833b2 100644 --- a/internal/service/s3tables/exports_test.go +++ b/internal/service/s3tables/exports_test.go @@ -4,25 +4,21 @@ package s3tables var ( - NewResourceNamespace = newNamespaceResource - NewResourceTable = newTableResource - NewResourceTableBucket = newTableBucketResource - NewResourceTableBucketPolicy = newTableBucketPolicyResource - ResourceTablePolicy = newTablePolicyResource + ResourceNamespace = newNamespaceResource + ResourceTable = newTableResource + ResourceTableBucket = newTableBucketResource + ResourceTableBucketPolicy = newTableBucketPolicyResource + ResourceTablePolicy = newTablePolicyResource - FindNamespaceByTwoPartKey = findNamespaceByTwoPartKey - FindTableByThreePartKey = findTableByThreePartKey - FindTableBucketByARN = findTableBucketByARN - FindTableBucketPolicy = findTableBucketPolicy - FindTablePolicy = findTablePolicy + FindNamespaceByTwoPartKey = findNamespaceByTwoPartKey + FindTableByThreePartKey = findTableByThreePartKey + FindTableBucketByARN = findTableBucketByARN + FindTableBucketPolicyByARN = findTableBucketPolicyByARN + FindTablePolicyByThreePartKey = findTablePolicyByThreePartKey TableIDFromTableARN = tableIDFromTableARN ) -const ( - NamespaceIDSeparator = namespaceIDSeparator -) - type ( TableIdentifier = tableIdentifier ) diff --git a/internal/service/s3tables/namespace_test.go b/internal/service/s3tables/namespace_test.go index 8fd971287b0f..b8d9abb6fc38 100644 --- a/internal/service/s3tables/namespace_test.go +++ b/internal/service/s3tables/namespace_test.go @@ -55,7 +55,7 @@ func TestAccS3TablesNamespace_basic(t *testing.T) { { ResourceName: resourceName, ImportState: true, - ImportStateIdFunc: testAccNamespaceImportStateIdFunc(resourceName), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ";", "table_bucket_arn", names.AttrNamespace), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrNamespace, }, @@ -84,7 +84,7 @@ func TestAccS3TablesNamespace_disappears(t *testing.T) { Config: testAccNamespaceConfig_basic(rName, bucketName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNamespaceExists(ctx, resourceName, &namespace), - acctest.CheckFrameworkResourceDisappearsWithStateFunc(ctx, acctest.Provider, tfs3tables.NewResourceNamespace, resourceName, namespaceDisappearsStateFunc), + acctest.CheckFrameworkResourceDisappearsWithStateFunc(ctx, acctest.Provider, tfs3tables.ResourceNamespace, resourceName, namespaceDisappearsStateFunc), ), ExpectNonEmptyPlan: true, }, @@ -139,17 +139,6 @@ func testAccCheckNamespaceExists(ctx context.Context, n string, v *s3tables.GetN } } -func testAccNamespaceImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { - return func(s *terraform.State) (string, error) { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return "", fmt.Errorf("not found: %s", resourceName) - } - - return rs.Primary.Attributes["table_bucket_arn"] + tfs3tables.NamespaceIDSeparator + rs.Primary.Attributes[names.AttrNamespace], nil - } -} - func namespaceDisappearsStateFunc(ctx context.Context, state *tfsdk.State, is *terraform.InstanceState) error { v, ok := is.Attributes[names.AttrNamespace] if !ok { diff --git a/internal/service/s3tables/table_bucket_policy.go b/internal/service/s3tables/table_bucket_policy.go index 575d4586ff1a..86db3d3b077a 100644 --- a/internal/service/s3tables/table_bucket_policy.go +++ b/internal/service/s3tables/table_bucket_policy.go @@ -5,6 +5,7 @@ package s3tables import ( "context" + "fmt" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3tables" @@ -15,13 +16,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" - "github.com/hashicorp/terraform-provider-aws/names" ) // @FrameworkResource("aws_s3tables_table_bucket_policy", name="Table Bucket Policy") @@ -29,16 +29,12 @@ func newTableBucketPolicyResource(_ context.Context) (resource.ResourceWithConfi return &tableBucketPolicyResource{}, nil } -const ( - ResNameTableBucketPolicy = "Table Bucket Policy" -) - type tableBucketPolicyResource struct { framework.ResourceWithModel[tableBucketPolicyResourceModel] } -func (r *tableBucketPolicyResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *tableBucketPolicyResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ "resource_policy": schema.StringAttribute{ CustomType: fwtypes.IAMPolicyType, @@ -55,167 +51,146 @@ func (r *tableBucketPolicyResource) Schema(ctx context.Context, req resource.Sch } } -func (r *tableBucketPolicyResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var plan tableBucketPolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketPolicyResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data tableBucketPolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + tableBucketARN := fwflex.StringValueFromFramework(ctx, data.TableBucketARN) var input s3tables.PutTableBucketPolicyInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } _, err := conn.PutTableBucketPolicy(ctx, &input) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.TableBucketARN.String(), err), - err.Error(), - ) - return - } - out, err := findTableBucketPolicy(ctx, conn, plan.TableBucketARN.ValueString()) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.TableBucketARN.String(), err), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("creating S3 Tables Table Bucket Policy (%s)", tableBucketARN), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *tableBucketPolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tableBucketPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketPolicyResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data tableBucketPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findTableBucketPolicy(ctx, conn, state.TableBucketARN.ValueString()) + conn := r.Meta().S3TablesClient(ctx) + + tableBucketARN := fwflex.StringValueFromFramework(ctx, data.TableBucketARN) + output, err := findTableBucketPolicyByARN(ctx, conn, tableBucketARN) + if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, ResNameTableBucketPolicy, state.TableBucketARN.String(), err), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Bucket Policy (%s)", tableBucketARN), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) -} + data.ResourcePolicy = fwtypes.IAMPolicyValue(aws.ToString(output.ResourcePolicy)) -func (r *tableBucketPolicyResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - conn := r.Meta().S3TablesClient(ctx) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} - var plan tableBucketPolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketPolicyResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new tableBucketPolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + tableBucketARN := fwflex.StringValueFromFramework(ctx, new.TableBucketARN) var input s3tables.PutTableBucketPolicyInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } _, err := conn.PutTableBucketPolicy(ctx, &input) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.TableBucketARN.String(), err), - err.Error(), - ) - return - } - out, err := findTableBucketPolicy(ctx, conn, plan.TableBucketARN.ValueString()) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.TableBucketARN.String(), err), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("updating S3 Tables Table Bucket Policy (%s)", tableBucketARN), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(response.State.Set(ctx, new)...) } -func (r *tableBucketPolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tableBucketPolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tableBucketPolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data tableBucketPolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + tableBucketARN := fwflex.StringValueFromFramework(ctx, data.TableBucketARN) input := s3tables.DeleteTableBucketPolicyInput{ - TableBucketARN: state.TableBucketARN.ValueStringPointer(), + TableBucketARN: aws.String(tableBucketARN), } - _, err := conn.DeleteTableBucketPolicy(ctx, &input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return + } + if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return - } + response.Diagnostics.AddError(fmt.Sprintf("deleting S3 Tables Table Bucket Policy (%s)", tableBucketARN), err.Error()) - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, ResNameTableBucketPolicy, state.TableBucketARN.String(), err), - err.Error(), - ) return } } -func (r *tableBucketPolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root("table_bucket_arn"), req, resp) +func (r *tableBucketPolicyResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root("table_bucket_arn"), request, response) } -func findTableBucketPolicy(ctx context.Context, conn *s3tables.Client, tableBucketARN string) (*s3tables.GetTableBucketPolicyOutput, error) { - in := s3tables.GetTableBucketPolicyInput{ +func findTableBucketPolicyByARN(ctx context.Context, conn *s3tables.Client, tableBucketARN string) (*s3tables.GetTableBucketPolicyOutput, error) { + input := s3tables.GetTableBucketPolicyInput{ TableBucketARN: aws.String(tableBucketARN), } - out, err := conn.GetTableBucketPolicy(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findTableBucketPolicy(ctx, conn, &input) +} + +func findTableBucketPolicy(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTableBucketPolicyInput) (*s3tables.GetTableBucketPolicyOutput, error) { + output, err := conn.GetTableBucketPolicy(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - return out, nil + if output == nil || aws.ToString(output.ResourcePolicy) == "" { + return nil, tfresource.NewEmptyResultError(input) + } + + return output, nil } type tableBucketPolicyResourceModel struct { diff --git a/internal/service/s3tables/table_bucket_policy_test.go b/internal/service/s3tables/table_bucket_policy_test.go index 5e08ba3b5aea..82b0b4424cf0 100644 --- a/internal/service/s3tables/table_bucket_policy_test.go +++ b/internal/service/s3tables/table_bucket_policy_test.go @@ -5,7 +5,6 @@ package s3tables_test import ( "context" - "errors" "fmt" "testing" @@ -15,7 +14,6 @@ import ( "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/create" tfs3tables "github.com/hashicorp/terraform-provider-aws/internal/service/s3tables" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -77,7 +75,7 @@ func TestAccS3TablesTableBucketPolicy_disappears(t *testing.T) { Config: testAccTableBucketPolicyConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableBucketPolicyExists(ctx, resourceName, &tablebucketpolicy), - acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.NewResourceTableBucketPolicy, resourceName), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.ResourceTableBucketPolicy, resourceName), ), ExpectNonEmptyPlan: true, }, @@ -94,40 +92,39 @@ func testAccCheckTableBucketPolicyDestroy(ctx context.Context) resource.TestChec continue } - _, err := tfs3tables.FindTableBucketPolicy(ctx, conn, rs.Primary.Attributes["table_bucket_arn"]) + _, err := tfs3tables.FindTableBucketPolicyByARN(ctx, conn, rs.Primary.Attributes["table_bucket_arn"]) + if tfresource.NotFound(err) { - return nil + continue } + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTableBucketPolicy, rs.Primary.ID, err) + return err } - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTableBucketPolicy, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("S3 Tables Table Bucket Policy %s still exists", rs.Primary.Attributes["table_bucket_arn"]) } return nil } } -func testAccCheckTableBucketPolicyExists(ctx context.Context, name string, tablebucketpolicy *s3tables.GetTableBucketPolicyOutput) resource.TestCheckFunc { +func testAccCheckTableBucketPolicyExists(ctx context.Context, n string, v *s3tables.GetTableBucketPolicyOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucketPolicy, name, errors.New("not found")) - } - - if rs.Primary.Attributes["table_bucket_arn"] == "" { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucketPolicy, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) - resp, err := tfs3tables.FindTableBucketPolicy(ctx, conn, rs.Primary.Attributes["table_bucket_arn"]) + output, err := tfs3tables.FindTableBucketPolicyByARN(ctx, conn, rs.Primary.Attributes["table_bucket_arn"]) + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTableBucketPolicy, rs.Primary.ID, err) + return err } - *tablebucketpolicy = *resp + *v = *output return nil } diff --git a/internal/service/s3tables/table_bucket_test.go b/internal/service/s3tables/table_bucket_test.go index acfa94cedcd8..e6584e324228 100644 --- a/internal/service/s3tables/table_bucket_test.go +++ b/internal/service/s3tables/table_bucket_test.go @@ -171,7 +171,7 @@ func TestAccS3TablesTableBucket_disappears(t *testing.T) { Config: testAccTableBucketConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableBucketExists(ctx, resourceName, &v), - acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.NewResourceTableBucket, resourceName), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.ResourceTableBucket, resourceName), ), ExpectNonEmptyPlan: true, }, diff --git a/internal/service/s3tables/table_policy.go b/internal/service/s3tables/table_policy.go index 49831fe0ef94..83beccdbff69 100644 --- a/internal/service/s3tables/table_policy.go +++ b/internal/service/s3tables/table_policy.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -30,16 +30,12 @@ func newTablePolicyResource(_ context.Context) (resource.ResourceWithConfigure, return &tablePolicyResource{}, nil } -const ( - ResNameTablePolicy = "Table Policy" -) - type tablePolicyResource struct { framework.ResourceWithModel[tablePolicyResourceModel] } -func (r *tablePolicyResource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *tablePolicyResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrName: schema.StringAttribute{ Required: true, @@ -70,185 +66,163 @@ func (r *tablePolicyResource) Schema(ctx context.Context, req resource.SchemaReq } } -func (r *tablePolicyResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var plan tablePolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tablePolicyResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data tablePolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, data.Name) var input s3tables.PutTablePolicyInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { return } _, err := conn.PutTablePolicy(ctx, &input) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTablePolicy, plan.Name.String(), err), - err.Error(), - ) - return - } - out, err := findTablePolicy(ctx, conn, plan.TableBucketARN.ValueString(), plan.Namespace.ValueString(), plan.Name.ValueString()) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.Name.String(), err), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("creating S3 Tables Table Policy (%s)", name), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(response.State.Set(ctx, data)...) } -func (r *tablePolicyResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tablePolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tablePolicyResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data tablePolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } - out, err := findTablePolicy(ctx, conn, state.TableBucketARN.ValueString(), state.Namespace.ValueString(), state.Name.ValueString()) + conn := r.Meta().S3TablesClient(ctx) + + name, namespace, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Name), fwflex.StringValueFromFramework(ctx, data.Namespace), fwflex.StringValueFromFramework(ctx, data.TableBucketARN) + output, err := findTablePolicyByThreePartKey(ctx, conn, tableBucketARN, namespace, name) + if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + return } + if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionReading, ResNameTablePolicy, state.Name.String(), err), - err.Error(), - ) + response.Diagnostics.AddError(fmt.Sprintf("reading S3 Tables Table Policy (%s)", name), err.Error()) + return } - resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, output, &data)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } -func (r *tablePolicyResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var plan tablePolicyResourceModel - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { +func (r *tablePolicyResource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { + var new tablePolicyResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &new)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + name := fwflex.StringValueFromFramework(ctx, new.Name) var input s3tables.PutTablePolicyInput - resp.Diagnostics.Append(flex.Expand(ctx, plan, &input)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, new, &input)...) + if response.Diagnostics.HasError() { return } _, err := conn.PutTablePolicy(ctx, &input) - if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionUpdating, ResNameTablePolicy, plan.Name.String(), err), - err.Error(), - ) - return - } - out, err := findTablePolicy(ctx, conn, plan.TableBucketARN.ValueString(), plan.Namespace.ValueString(), plan.Name.ValueString()) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionCreating, ResNameTableBucketPolicy, plan.Name.String(), err), - err.Error(), - ) - return - } + response.Diagnostics.AddError(fmt.Sprintf("creating S3 Tables Table Policy (%s)", name), err.Error()) - resp.Diagnostics.Append(flex.Flatten(ctx, out, &plan)...) - if resp.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } -func (r *tablePolicyResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - conn := r.Meta().S3TablesClient(ctx) - - var state tablePolicyResourceModel - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { +func (r *tablePolicyResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data tablePolicyResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { return } + conn := r.Meta().S3TablesClient(ctx) + + name, namespace, tableBucketARN := fwflex.StringValueFromFramework(ctx, data.Name), fwflex.StringValueFromFramework(ctx, data.Namespace), fwflex.StringValueFromFramework(ctx, data.TableBucketARN) input := s3tables.DeleteTablePolicyInput{ - Name: state.Name.ValueStringPointer(), - Namespace: state.Namespace.ValueStringPointer(), - TableBucketARN: state.TableBucketARN.ValueStringPointer(), + Name: aws.String(name), + Namespace: aws.String(namespace), + TableBucketARN: aws.String(tableBucketARN), } - _, err := conn.DeleteTablePolicy(ctx, &input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return + } + if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return - } + response.Diagnostics.AddError(fmt.Sprintf("deleting S3 Tables Table Policy (%s)", name), err.Error()) - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.S3Tables, create.ErrActionDeleting, ResNameTablePolicy, state.Name.String(), err), - err.Error(), - ) return } } -func (r *tablePolicyResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - identifier, err := parseTableIdentifier(req.ID) +func (r *tablePolicyResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + identifier, err := parseTableIdentifier(request.ID) if err != nil { - resp.Diagnostics.AddError( + response.Diagnostics.AddError( "Invalid Import ID", "Import IDs for S3 Tables Table Policies must use the format
"+tableIDSeparator+""+tableIDSeparator+"
.\n"+ - fmt.Sprintf("Had %q", req.ID), + fmt.Sprintf("Had %q", request.ID), ) return } - identifier.PopulateState(ctx, &resp.State, &resp.Diagnostics) + identifier.PopulateState(ctx, &response.State, &response.Diagnostics) } -func findTablePolicy(ctx context.Context, conn *s3tables.Client, bucketARN, namespace, name string) (*s3tables.GetTablePolicyOutput, error) { - in := s3tables.GetTablePolicyInput{ +func findTablePolicyByThreePartKey(ctx context.Context, conn *s3tables.Client, tableBucketARN, namespace, name string) (*s3tables.GetTablePolicyOutput, error) { + input := s3tables.GetTablePolicyInput{ Name: aws.String(name), Namespace: aws.String(namespace), - TableBucketARN: aws.String(bucketARN), + TableBucketARN: aws.String(tableBucketARN), } - out, err := conn.GetTablePolicy(ctx, &in) - if err != nil { - if errs.IsA[*awstypes.NotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, - } + return findTablePolicy(ctx, conn, &input) +} + +func findTablePolicy(ctx context.Context, conn *s3tables.Client, input *s3tables.GetTablePolicyInput) (*s3tables.GetTablePolicyOutput, error) { + output, err := conn.GetTablePolicy(ctx, input) + + if errs.IsA[*awstypes.NotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, } + } + if err != nil { return nil, err } - if out == nil { - return nil, tfresource.NewEmptyResultError(in) + if output == nil || aws.ToString(output.ResourcePolicy) == "" { + return nil, tfresource.NewEmptyResultError(input) } - return out, nil + return output, nil } type tablePolicyResourceModel struct { diff --git a/internal/service/s3tables/table_policy_test.go b/internal/service/s3tables/table_policy_test.go index 8af7c3d86da2..7e2c8827297f 100644 --- a/internal/service/s3tables/table_policy_test.go +++ b/internal/service/s3tables/table_policy_test.go @@ -5,7 +5,6 @@ package s3tables_test import ( "context" - "errors" "fmt" "strings" "testing" @@ -16,7 +15,6 @@ import ( "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/create" tfs3tables "github.com/hashicorp/terraform-provider-aws/internal/service/s3tables" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -101,48 +99,47 @@ func testAccCheckTablePolicyDestroy(ctx context.Context) resource.TestCheckFunc continue } - _, err := tfs3tables.FindTablePolicy(ctx, conn, + _, err := tfs3tables.FindTablePolicyByThreePartKey(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace], rs.Primary.Attributes[names.AttrName], ) + if tfresource.NotFound(err) { - return nil + continue } + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTablePolicy, rs.Primary.ID, err) + return err } - return create.Error(names.S3Tables, create.ErrActionCheckingDestroyed, tfs3tables.ResNameTablePolicy, rs.Primary.ID, errors.New("not destroyed")) + return fmt.Errorf("S3 Tables Table Policy %s still exists", rs.Primary.Attributes[names.AttrName]) } return nil } } -func testAccCheckTablePolicyExists(ctx context.Context, name string, tablepolicy *s3tables.GetTablePolicyOutput) resource.TestCheckFunc { +func testAccCheckTablePolicyExists(ctx context.Context, n string, v *s3tables.GetTablePolicyOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[name] + rs, ok := s.RootModule().Resources[n] if !ok { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTablePolicy, name, errors.New("not found")) - } - - if rs.Primary.Attributes["table_bucket_arn"] == "" || rs.Primary.Attributes[names.AttrNamespace] == "" || rs.Primary.Attributes[names.AttrName] == "" { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTablePolicy, name, errors.New("not set")) + return fmt.Errorf("Not found: %s", n) } conn := acctest.Provider.Meta().(*conns.AWSClient).S3TablesClient(ctx) - resp, err := tfs3tables.FindTablePolicy(ctx, conn, + output, err := tfs3tables.FindTablePolicyByThreePartKey(ctx, conn, rs.Primary.Attributes["table_bucket_arn"], rs.Primary.Attributes[names.AttrNamespace], rs.Primary.Attributes[names.AttrName], ) + if err != nil { - return create.Error(names.S3Tables, create.ErrActionCheckingExistence, tfs3tables.ResNameTablePolicy, rs.Primary.ID, err) + return err } - *tablepolicy = *resp + *v = *output return nil } diff --git a/internal/service/s3tables/table_test.go b/internal/service/s3tables/table_test.go index 77484d277ffa..77539b6fbde3 100644 --- a/internal/service/s3tables/table_test.go +++ b/internal/service/s3tables/table_test.go @@ -124,7 +124,7 @@ func TestAccS3TablesTable_disappears(t *testing.T) { Config: testAccTableConfig_basic(rName, namespace, bucketName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExists(ctx, resourceName, &table), - acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.NewResourceTable, resourceName), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfs3tables.ResourceTable, resourceName), ), ExpectNonEmptyPlan: true, ConfigPlanChecks: resource.ConfigPlanChecks{ From 426cc25fb0e460a042f0ebba83962947f7658070 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 14:24:27 -0400 Subject: [PATCH 0992/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccS3TablesTablePolicy_' PKG=s3tables make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3tables/... -v -count 1 -parallel 20 -run=TestAccS3TablesTablePolicy_ -timeout 360m -vet=off 2025/08/29 14:22:37 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/29 14:22:37 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccS3TablesTablePolicy_basic === PAUSE TestAccS3TablesTablePolicy_basic === RUN TestAccS3TablesTablePolicy_disappears === PAUSE TestAccS3TablesTablePolicy_disappears === CONT TestAccS3TablesTablePolicy_basic === CONT TestAccS3TablesTablePolicy_disappears --- PASS: TestAccS3TablesTablePolicy_disappears (20.54s) --- PASS: TestAccS3TablesTablePolicy_basic (22.83s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3tables 28.359s From 8aefcf5c9034edef4c5327e9134cd99b8cc572b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 14:27:25 -0400 Subject: [PATCH 0993/2115] r/aws_s3tables_table_policy: Remove plan-time validation of `name` and `namespace`. --- .changelog/44072.txt | 2 +- internal/service/s3tables/table_policy.go | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.changelog/44072.txt b/.changelog/44072.txt index b39821a4304f..2155022ce2f2 100644 --- a/.changelog/44072.txt +++ b/.changelog/44072.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_s3tables_table_policy: Fix `namespace` validation to allow hyphens (`-`) +resource/aws_s3tables_table_policy: Remove plan-time validation of `name` and `namespace` ``` diff --git a/internal/service/s3tables/table_policy.go b/internal/service/s3tables/table_policy.go index 83beccdbff69..cc942c8e8d60 100644 --- a/internal/service/s3tables/table_policy.go +++ b/internal/service/s3tables/table_policy.go @@ -38,15 +38,13 @@ func (r *tablePolicyResource) Schema(ctx context.Context, request resource.Schem response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrName: schema.StringAttribute{ - Required: true, - Validators: tableNameValidator, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, }, names.AttrNamespace: schema.StringAttribute{ - Required: true, - Validators: namespaceNameValidator, + Required: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), }, From 24c5182eca12255b6b83b5787fb5b371559aa629 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:47:18 -0400 Subject: [PATCH 0994/2115] tfresource.Retry: Use 'internal/retry'. --- internal/tfresource/errors.go | 48 ++++++++++++++++++++++++ internal/tfresource/retry.go | 62 ++++++++----------------------- internal/tfresource/retry_test.go | 9 +++-- 3 files changed, 68 insertions(+), 51 deletions(-) diff --git a/internal/tfresource/errors.go b/internal/tfresource/errors.go index f40eaf738fe7..80456acc5a77 100644 --- a/internal/tfresource/errors.go +++ b/internal/tfresource/errors.go @@ -4,6 +4,8 @@ package tfresource import ( + "errors" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) @@ -33,3 +35,49 @@ var TimedOut = retry.TimedOut // which handles both Plugin SDK V2 and internal error types. For net-new usage, // prefer calling retry.SetLastError directly. var SetLastError = retry.SetLastError + +// From github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry: + +// RetryError forces client code to choose whether or not a given error is retryable. +type RetryError struct { + Err error + Retryable bool +} + +func (e *RetryError) Error() string { + return e.Unwrap().Error() +} + +func (e *RetryError) Unwrap() error { + return e.Err +} + +// RetryableError is a helper to create a RetryError that's retryable from a +// given error. To prevent logic errors, will return an error when passed a +// nil error. +func RetryableError(err error) *RetryError { + if err == nil { + return &RetryError{ + Err: errors.New("empty retryable error received. " + + "This is a bug with the Terraform AWS Provider and should be " + + "reported as a GitHub issue in the provider repository."), + Retryable: false, + } + } + return &RetryError{Err: err, Retryable: true} +} + +// NonRetryableError is a helper to create a RetryError that's _not_ retryable +// from a given error. To prevent logic errors, will return an error when +// passed a nil error. +func NonRetryableError(err error) *RetryError { + if err == nil { + return &RetryError{ + Err: errors.New("empty non-retryable error received. " + + "This is a bug with the Terraform AWS Provider and should be " + + "reported as a GitHub issue in the provider repository."), + Retryable: false, + } + } + return &RetryError{Err: err, Retryable: false} +} diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index 1fd14c7139ae..49b19520f2ca 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -7,7 +7,6 @@ import ( "context" "fmt" "math/rand" - "sync" "time" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" @@ -223,60 +222,29 @@ func WithContinuousTargetOccurence(continuousTargetOccurence int) OptionsFunc { // Retry allows configuration of StateChangeConf's various time arguments. // This is especially useful for AWS services that are prone to throttling, such as Route53, where // the default durations cause problems. -func Retry(ctx context.Context, timeout time.Duration, f sdkretry.RetryFunc, optFns ...OptionsFunc) error { - // These are used to pull the error out of the function; need a mutex to - // avoid a data race. - var resultErr error - var resultErrMu sync.Mutex - - options := Options{} +func Retry(ctx context.Context, timeout time.Duration, f func(context.Context) *RetryError, optFns ...OptionsFunc) error { + options := Options{ + MinPollInterval: 500 * time.Millisecond, //nolint:mnd // 500ms is the Plugin SDKv2 default + } for _, fn := range optFns { fn(&options) } - c := &sdkretry.StateChangeConf{ - Pending: []string{"retryableerror"}, - Target: []string{"success"}, - Timeout: timeout, - MinTimeout: 500 * time.Millisecond, - Refresh: func() (any, string, error) { - rerr := f() - - resultErrMu.Lock() - defer resultErrMu.Unlock() - - if rerr == nil { - resultErr = nil - return 42, "success", nil - } - - resultErr = rerr.Err - - if rerr.Retryable { - return 42, "retryableerror", nil + _, err := retryWhen(ctx, timeout, + func(ctx context.Context) (any, error) { + return nil, f(ctx) + }, + func(err error) (bool, error) { + if err, ok := errs.As[*RetryError](err); ok { + return err.Retryable, err.Err } - return nil, "quit", rerr.Err + return false, err }, - } - - options.Apply(c) + backoff.WithDelay(backoff.SDKv2HelperRetryCompatibleDelay(options.Delay, options.PollInterval, options.MinPollInterval)), + ) - _, waitErr := c.WaitForStateContext(ctx) - - // Need to acquire the lock here to be able to avoid race using resultErr as - // the return value - resultErrMu.Lock() - defer resultErrMu.Unlock() - - // resultErr may be nil because the wait timed out and resultErr was never - // set; this is still an error - if resultErr == nil { - return waitErr - } - // resultErr takes precedence over waitErr if both are set because it is - // more likely to be useful - return resultErr + return err } func retryWhen[T any](ctx context.Context, timeout time.Duration, f func(context.Context) (T, error), retryable Retryable, opts ...backoff.Option) (T, error) { diff --git a/internal/tfresource/retry_test.go b/internal/tfresource/retry_test.go index ffb504050db6..dafd385bbe59 100644 --- a/internal/tfresource/retry_test.go +++ b/internal/tfresource/retry_test.go @@ -11,7 +11,8 @@ import ( "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -354,8 +355,8 @@ func TestRetryContext_error(t *testing.T) { ctx := t.Context() expected := fmt.Errorf("nope") - f := func() *retry.RetryError { - return retry.NonRetryableError(expected) + f := func(context.Context) *tfresource.RetryError { + return tfresource.NonRetryableError(expected) } errCh := make(chan error) @@ -430,7 +431,7 @@ func TestOptionsApply(t *testing.T) { t.Run(name, func(t *testing.T) { t.Parallel() - conf := retry.StateChangeConf{} + conf := sdkretry.StateChangeConf{} testCase.options.Apply(&conf) From e91ebcceb94821f2cb13b02f1be7e4f3dcc2ba63 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 29 Aug 2025 15:48:05 -0400 Subject: [PATCH 0995/2115] r/aws_s3_bucket_[acl|logging]: deprecate `display_name` attributes (#44090) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AWS has deprecated the `DisplayName` field in the `Owner` and `Grantee` data types. The corresponding provider attributes have been deprecated in preparation for removal in `v7.0.0`. > End of support notice: Beginning November 21, 2025, Amazon S3 will stop returning DisplayName. Update your applications to use canonical IDs (unique identifier for AWS accounts), AWS account ID (12 digit identifier) or IAM ARNs (full resource naming) as a direct replacement of DisplayName. > > Between July 15, 2025 and November 21, 2025, you will begin to see an increasing rate of missing DisplayName in the Owner object. > > This change affects the following AWS Regions: US East (N. Virginia) Region, US West (N. California) Region, US West (Oregon) Region, Asia Pacific (Singapore) Region, Asia Pacific (Sydney) Region, Asia Pacific (Tokyo) Region, Europe (Ireland) Region, and South America (São Paulo) Region. - https://docs.aws.amazon.com/AmazonS3/latest/API/API_Owner.html - https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html ```console % make testacc PKG=s3 TESTS="TestAccS3BucketACL_|TestAccS3BucketLogging_" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/s3/... -v -count 1 -parallel 20 -run='TestAccS3BucketACL_|TestAccS3BucketLogging_' -timeout 360m -vet=off 2025/08/29 14:17:58 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/29 14:17:58 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccS3BucketACL_directoryBucket (18.01s) === CONT TestAccS3BucketACL_Identity_ExistingResource --- PASS: TestAccS3BucketACL_disappears (32.50s) === CONT TestAccS3BucketACL_basic --- PASS: TestAccS3BucketLogging_disappears (51.51s) === CONT TestAccS3BucketACL_grantToACL --- PASS: TestAccS3BucketLogging_basic (57.74s) === CONT TestAccS3BucketLogging_Identity_RegionOverride === CONT TestAccS3BucketLogging_directoryBucket --- PASS: TestAccS3BucketLogging_withExpectedBucketOwner (59.51s) --- PASS: TestAccS3BucketACL_migrate_aclWithChange (62.71s) === CONT TestAccS3BucketACL_Identity_RegionOverride --- PASS: TestAccS3BucketACL_migrate_aclNoChange (68.47s) --- PASS: TestAccS3BucketACL_migrate_grantsWithChange (68.95s) --- PASS: TestAccS3BucketACL_Identity_Basic (74.37s) --- PASS: TestAccS3BucketLogging_migrate_loggingNoChange (75.71s) --- PASS: TestAccS3BucketACL_updateACL (79.34s) --- PASS: TestAccS3BucketACL_ACLToGrant (79.42s) --- PASS: TestAccS3BucketACL_basic (49.26s) --- PASS: TestAccS3BucketACL_updateGrant (83.86s) --- PASS: TestAccS3BucketLogging_migrate_loggingWithChange (84.50s) --- PASS: TestAccS3BucketLogging_directoryBucket (25.56s) --- PASS: TestAccS3BucketLogging_update (88.56s) --- PASS: TestAccS3BucketLogging_Identity_Basic (88.70s) --- PASS: TestAccS3BucketLogging_Identity_ExistingResource (96.22s) --- PASS: TestAccS3BucketACL_Identity_ExistingResource (79.98s) --- PASS: TestAccS3BucketACL_Identity_RegionOverride (39.80s) --- PASS: TestAccS3BucketLogging_Identity_RegionOverride (45.88s) --- PASS: TestAccS3BucketACL_grantToACL (52.65s) --- PASS: TestAccS3BucketLogging_TargetGrantByGroup (106.58s) --- PASS: TestAccS3BucketLogging_TargetGrantByID (109.02s) --- PASS: TestAccS3BucketLogging_withTargetObjectKeyFormat (120.35s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3 127.481s ``` --- .changelog/44090.txt | 9 +++++++++ internal/service/s3/bucket_acl.go | 4 ++++ internal/service/s3/bucket_acl_test.go | 18 ++++++------------ internal/service/s3/bucket_logging.go | 2 ++ internal/service/s3/bucket_logging_test.go | 6 ++---- 5 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 .changelog/44090.txt diff --git a/.changelog/44090.txt b/.changelog/44090.txt new file mode 100644 index 000000000000..769521fdf32c --- /dev/null +++ b/.changelog/44090.txt @@ -0,0 +1,9 @@ +```release-note:note +resource/aws_s3_bucket_logging: The `target_grant.grantee.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. +``` +```release-note:note +resource/aws_s3_bucket_acl: The `access_control_policy.grant.grantee.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. +``` +```release-note:note +resource/aws_s3_bucket_acl: The `access_control_policy.owner.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Owner.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. +``` diff --git a/internal/service/s3/bucket_acl.go b/internal/service/s3/bucket_acl.go index bf89a5fec002..c667d7f9e6f0 100644 --- a/internal/service/s3/bucket_acl.go +++ b/internal/service/s3/bucket_acl.go @@ -73,6 +73,8 @@ func resourceBucketACL() *schema.Resource { names.AttrDisplayName: { Type: schema.TypeString, Computed: true, + Deprecated: "display_name is deprecated. This attribute is no longer returned by " + + "AWS and will be removed in a future major version.", }, names.AttrID: { Type: schema.TypeString, @@ -108,6 +110,8 @@ func resourceBucketACL() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, + Deprecated: "display_name is deprecated. This attribute is no longer returned by " + + "AWS and will be removed in a future major version.", }, names.AttrID: { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_acl_test.go b/internal/service/s3/bucket_acl_test.go index 4790bb8a6ffe..482d74251319 100644 --- a/internal/service/s3/bucket_acl_test.go +++ b/internal/service/s3/bucket_acl_test.go @@ -286,8 +286,7 @@ func TestAccS3BucketACL_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.owner.0.display_name", @@ -458,8 +457,7 @@ func TestAccS3BucketACL_updateACL(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.grant.1.grantee.0.display_name", @@ -507,8 +505,7 @@ func TestAccS3BucketACL_updateGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.grant.1.grantee.0.display_name", @@ -547,8 +544,7 @@ func TestAccS3BucketACL_updateGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.grant.1.grantee.0.display_name", @@ -607,8 +603,7 @@ func TestAccS3BucketACL_ACLToGrant(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.grant.1.grantee.0.display_name", @@ -660,8 +655,7 @@ func TestAccS3BucketACL_grantToACL(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent for the ACL grantee and owner. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{ "access_control_policy.0.grant.0.grantee.0.display_name", "access_control_policy.0.owner.0.display_name", diff --git a/internal/service/s3/bucket_logging.go b/internal/service/s3/bucket_logging.go index 59b5c71defac..38f61d9d20ab 100644 --- a/internal/service/s3/bucket_logging.go +++ b/internal/service/s3/bucket_logging.go @@ -66,6 +66,8 @@ func resourceBucketLogging() *schema.Resource { names.AttrDisplayName: { Type: schema.TypeString, Computed: true, + Deprecated: "display_name is deprecated. This attribute is no longer returned by " + + "AWS and will be removed in a future major version.", }, "email_address": { Type: schema.TypeString, diff --git a/internal/service/s3/bucket_logging_test.go b/internal/service/s3/bucket_logging_test.go index 749ef29e12a5..90699704e689 100644 --- a/internal/service/s3/bucket_logging_test.go +++ b/internal/service/s3/bucket_logging_test.go @@ -141,8 +141,7 @@ func TestAccS3BucketLogging_TargetGrantByID(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent when the grant is assigned by ID. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{"target_grant.0.grantee.0.display_name"}, }, { @@ -162,8 +161,7 @@ func TestAccS3BucketLogging_TargetGrantByID(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - // DisplayName is eventually consistent when the grant is assigned by ID. - // Ignore verification to prevent flaky test results. + // DisplayName is deprecated and will be inconsistently returned between July and November 2025. ImportStateVerifyIgnore: []string{"target_grant.0.grantee.0.display_name"}, }, { From f043c859c9214652a1e1069e85b61156cbec9584 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 29 Aug 2025 19:53:05 +0000 Subject: [PATCH 0996/2115] Update CHANGELOG.md for #44090 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c404ea7c1a26..9427f6f26cbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,18 @@ ## 6.12.0 (Unreleased) +NOTES: + +* resource/aws_s3_bucket_acl: The `access_control_policy.grant.grantee.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. ([#44090](https://github.com/hashicorp/terraform-provider-aws/issues/44090)) +* resource/aws_s3_bucket_acl: The `access_control_policy.owner.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Owner.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. ([#44090](https://github.com/hashicorp/terraform-provider-aws/issues/44090)) +* resource/aws_s3_bucket_logging: The `target_grant.grantee.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. ([#44090](https://github.com/hashicorp/terraform-provider-aws/issues/44090)) + ENHANCEMENTS: +* data-source/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` attributes ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) +* data-source/aws_lambda_function: Add `source_kms_key_arn` attribute ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) +* resource/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` arguments to support IPv6 connectivity ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) * resource/aws_instance: Add resource identity support ([#44068](https://github.com/hashicorp/terraform-provider-aws/issues/44068)) +* resource/aws_lambda_function: Add `source_kms_key_arn` argument ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) * resource/aws_ssm_association: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_document: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_maintenance_window: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) @@ -10,6 +20,10 @@ ENHANCEMENTS: * resource/aws_ssm_maintenance_window_task: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_patch_baseline: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +BUG FIXES: + +* resource/aws_s3tables_table_policy: Remove plan-time validation of `name` and `namespace` ([#44072](https://github.com/hashicorp/terraform-provider-aws/issues/44072)) + ## 6.11.0 (August 28, 2025) FEATURES: From bb5575220dbceaab24c832d2d01a87e0efd19247 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:07 -0400 Subject: [PATCH 0997/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - budgets. --- internal/service/budgets/find.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/service/budgets/find.go b/internal/service/budgets/find.go index 62752653027c..b22fdcb538cb 100644 --- a/internal/service/budgets/find.go +++ b/internal/service/budgets/find.go @@ -7,18 +7,17 @@ import ( "context" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) func FindBudgetWithDelay[T any](ctx context.Context, f func() (T, error)) (T, error) { var resp T - err := tfresource.Retry(ctx, 30*time.Second, func() *retry.RetryError { + err := tfresource.Retry(ctx, 30*time.Second, func(ctx context.Context) *tfresource.RetryError { var err error resp, err = f() if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From 6d313887841ea4c83f113cab5570ce17103782d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:07 -0400 Subject: [PATCH 0998/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - chime. --- internal/service/chime/find.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/service/chime/find.go b/internal/service/chime/find.go index 2f3935824606..6f11cc98ca40 100644 --- a/internal/service/chime/find.go +++ b/internal/service/chime/find.go @@ -7,7 +7,6 @@ import ( "context" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -17,15 +16,15 @@ const ( func FindVoiceConnectorResourceWithRetry[T any](ctx context.Context, isNewResource bool, f func() (T, error)) (T, error) { var resp T - err := tfresource.Retry(ctx, voiceConnectorResourcePropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, voiceConnectorResourcePropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error resp, err = f() if isNewResource && tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From 5d2a090d28cc4333679a8d18e24acee0c9d2d9d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:07 -0400 Subject: [PATCH 0999/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - chimesdkmediapipelines. --- .../media_insights_pipeline_configuration.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go index c5e56f760687..a2fed29be6f5 100644 --- a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go +++ b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration.go @@ -497,15 +497,15 @@ func resourceMediaInsightsPipelineConfigurationCreate(ctx context.Context, d *sc // Retry when forbidden exception is received; iam role propagation is eventually consistent var out *chimesdkmediapipelines.CreateMediaInsightsPipelineConfigurationOutput - createError := tfresource.Retry(ctx, iamPropagationTimeout, func() *retry.RetryError { + createError := tfresource.Retry(ctx, iamPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = conn.CreateMediaInsightsPipelineConfiguration(ctx, in) if err != nil { var forbiddenException *awstypes.ForbiddenException if errors.As(err, &forbiddenException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil @@ -581,15 +581,15 @@ func resourceMediaInsightsPipelineConfigurationUpdate(ctx context.Context, d *sc } // Retry when forbidden exception is received; iam role propagation is eventually consistent - updateError := tfresource.Retry(ctx, iamPropagationTimeout, func() *retry.RetryError { + updateError := tfresource.Retry(ctx, iamPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.UpdateMediaInsightsPipelineConfiguration(ctx, in) if err != nil { var forbiddenException *awstypes.ForbiddenException if errors.As(err, &forbiddenException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From 46d9752ee999306498c11c374aeecf87bdc9bcbb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:08 -0400 Subject: [PATCH 1000/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - chimesdkvoice. --- internal/service/chimesdkvoice/find..go | 7 +++---- internal/service/chimesdkvoice/global_settings.go | 7 +++---- internal/service/chimesdkvoice/global_settings_test.go | 5 ++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/internal/service/chimesdkvoice/find..go b/internal/service/chimesdkvoice/find..go index c252432e6e94..35e85cc97737 100644 --- a/internal/service/chimesdkvoice/find..go +++ b/internal/service/chimesdkvoice/find..go @@ -7,7 +7,6 @@ import ( "context" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) @@ -17,15 +16,15 @@ const ( func FindSIPResourceWithRetry[T any](ctx context.Context, isNewResource bool, f func() (T, error)) (T, error) { var resp T - err := tfresource.Retry(ctx, sipResourcePropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, sipResourcePropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error resp, err = f() if isNewResource && tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil diff --git a/internal/service/chimesdkvoice/global_settings.go b/internal/service/chimesdkvoice/global_settings.go index 58fdf4b403fc..cb6e3ad7ed61 100644 --- a/internal/service/chimesdkvoice/global_settings.go +++ b/internal/service/chimesdkvoice/global_settings.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" awstypes "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice/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/create" @@ -64,17 +63,17 @@ func resourceGlobalSettingsRead(ctx context.Context, d *schema.ResourceData, met // Include retry handling to allow for propagation of the Global Settings // logging bucket configuration var out *chimesdkvoice.GetGlobalSettingsOutput - err := tfresource.Retry(ctx, globalSettingsPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, globalSettingsPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var getErr error input := chimesdkvoice.GetGlobalSettingsInput{} out, getErr = conn.GetGlobalSettings(ctx, &input) if getErr != nil { - return retry.NonRetryableError(getErr) + return tfresource.NonRetryableError(getErr) } if out.VoiceConnector == nil || out.VoiceConnector.CdrBucket == nil { - return retry.RetryableError(tfresource.NewEmptyResultError(&chimesdkvoice.GetGlobalSettingsInput{})) + return tfresource.RetryableError(tfresource.NewEmptyResultError(&chimesdkvoice.GetGlobalSettingsInput{})) } return nil diff --git a/internal/service/chimesdkvoice/global_settings_test.go b/internal/service/chimesdkvoice/global_settings_test.go index c4f3e1edbb9f..a0002199d976 100644 --- a/internal/service/chimesdkvoice/global_settings_test.go +++ b/internal/service/chimesdkvoice/global_settings_test.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -132,11 +131,11 @@ func testAccCheckGlobalSettingsDestroy(ctx context.Context) resource.TestCheckFu const retryTimeout = 10 * time.Second response := &chimesdkvoice.GetGlobalSettingsOutput{} - err := tfresource.Retry(ctx, retryTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, retryTimeout, func(ctx context.Context) *tfresource.RetryError { var err error response, err = conn.GetGlobalSettings(ctx, input) if err == nil && response.VoiceConnector.CdrBucket != nil { - return retry.RetryableError(errors.New("error Chime Voice Connector Global settings still exists")) + return tfresource.RetryableError(errors.New("error Chime Voice Connector Global settings still exists")) } return nil }) From a48682ca94929165829c234534ce25841c0db5e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:11 -0400 Subject: [PATCH 1001/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - comprehend. --- internal/service/comprehend/document_classifier.go | 8 ++++---- internal/service/comprehend/entity_recognizer.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/comprehend/document_classifier.go b/internal/service/comprehend/document_classifier.go index 13066f11d6e2..e51897dbb1f4 100644 --- a/internal/service/comprehend/document_classifier.go +++ b/internal/service/comprehend/document_classifier.go @@ -495,7 +495,7 @@ func documentClassifierPublishVersion(ctx context.Context, conn *comprehend.Clie } var out *comprehend.CreateDocumentClassifierOutput - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = conn.CreateDocumentClassifier(ctx, in) @@ -503,12 +503,12 @@ func documentClassifierPublishVersion(ctx context.Context, conn *comprehend.Clie var tmre *types.TooManyRequestsException var qee ratelimit.QuotaExceededError // This is not a typo: the ratelimit.QuotaExceededError is returned as a struct, not a pointer if errors.As(err, &tmre) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } else if errors.As(err, &qee) { // Unable to get a rate limit token - return retry.RetryableError(err) + return tfresource.RetryableError(err) } else { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } } diff --git a/internal/service/comprehend/entity_recognizer.go b/internal/service/comprehend/entity_recognizer.go index cff06835d147..371ad1335d76 100644 --- a/internal/service/comprehend/entity_recognizer.go +++ b/internal/service/comprehend/entity_recognizer.go @@ -522,7 +522,7 @@ func entityRecognizerPublishVersion(ctx context.Context, conn *comprehend.Client } var out *comprehend.CreateEntityRecognizerOutput - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = conn.CreateEntityRecognizer(ctx, in) @@ -530,12 +530,12 @@ func entityRecognizerPublishVersion(ctx context.Context, conn *comprehend.Client var tmre *types.TooManyRequestsException var qee ratelimit.QuotaExceededError // This is not a typo: the ratelimit.QuotaExceededError is returned as a struct, not a pointer if errors.As(err, &tmre) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } else if errors.As(err, &qee) { // Unable to get a rate limit token - return retry.RetryableError(err) + return tfresource.RetryableError(err) } else { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } } From a5cb1e7fa1269d0542aa4237d9cfbac0735a2f26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:14 -0400 Subject: [PATCH 1002/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - ds. --- internal/service/ds/directory.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ds/directory.go b/internal/service/ds/directory.go index d9ae6af5c5ae..02fd69b80366 100644 --- a/internal/service/ds/directory.go +++ b/internal/service/ds/directory.go @@ -224,9 +224,9 @@ func resourceDirectoryCreate(ctx context.Context, d *schema.ResourceData, meta a // created concurrently. Retry creation in that case. // When it fails, it will typically be within the first few minutes of creation, so there is no need // to wait for deletion. - err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { if err := creator.Create(ctx, conn, name, d); err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if _, err := waitDirectoryCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil { @@ -248,11 +248,11 @@ func resourceDirectoryCreate(ctx context.Context, d *schema.ResourceData, meta a )) } - return retry.RetryableError(err) + return tfresource.RetryableError(err) } } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From dfde22aefce9f4ea3f54e8d91e81f3686605441a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:15 -0400 Subject: [PATCH 1003/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - dynamodb. --- internal/service/dynamodb/sweep.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/service/dynamodb/sweep.go b/internal/service/dynamodb/sweep.go index 2b15a4732766..64c059376271 100644 --- a/internal/service/dynamodb/sweep.go +++ b/internal/service/dynamodb/sweep.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/dynamodb" awstypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -157,17 +156,17 @@ func (bs backupSweeper) Delete(ctx context.Context, optFns ...tfresource.Options const ( timeout = 10 * time.Minute ) - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { log.Printf("[DEBUG] Deleting DynamoDB Backup: %s", bs.arn) _, err := bs.conn.DeleteBackup(ctx, input) if errs.IsA[*awstypes.BackupNotFoundException](err) { return nil } if errs.IsA[*awstypes.BackupInUseException](err) || errs.IsA[*awstypes.LimitExceededException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From 3f178c04344cdf7a50fa3add84312fe1884949b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:15 -0400 Subject: [PATCH 1004/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - eks. --- internal/service/eks/cluster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index f7e1c6754fbb..7e4acda89ef9 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -923,17 +923,17 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any input := eks.DeleteClusterInput{ Name: aws.String(d.Id()), } - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.DeleteCluster(ctx, &input) if errs.IsAErrorMessageContains[*types.ResourceInUseException](err, "in progress") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From c384b85ca54ac3196c9b6891aa7df8852a50e4d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:19 -0400 Subject: [PATCH 1005/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - guardduty. --- internal/service/guardduty/malware_protection_plan.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/guardduty/malware_protection_plan.go b/internal/service/guardduty/malware_protection_plan.go index 5ce75a9d566d..c2f60cfc496f 100644 --- a/internal/service/guardduty/malware_protection_plan.go +++ b/internal/service/guardduty/malware_protection_plan.go @@ -149,18 +149,18 @@ func (r *malwareProtectionPlanResource) Create(ctx context.Context, req resource var out *guardduty.CreateMalwareProtectionPlanOutput - err := tfresource.Retry(ctx, iamPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, iamPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = conn.CreateMalwareProtectionPlan(ctx, input) if err != nil { var nfe *awstypes.ResourceNotFoundException var bre *awstypes.BadRequestException // Error returned due to IAM eventual consistency if errors.As(err, &nfe) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } else if errors.As(err, &bre) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From 41fd7f86c9899ae65e6634c7bb49ba14a3e91316 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:20 -0400 Subject: [PATCH 1006/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - inspector2. --- internal/service/inspector2/enabler.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/inspector2/enabler.go b/internal/service/inspector2/enabler.go index 8f4ce6a76cb8..1b9a6738c7ee 100644 --- a/internal/service/inspector2/enabler.go +++ b/internal/service/inspector2/enabler.go @@ -114,14 +114,14 @@ func resourceEnablerCreate(ctx context.Context, d *schema.ResourceData, meta any id := enablerID(accountIDs, typeEnable) var out *inspector2.EnableOutput - err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error out, err = conn.Enable(ctx, in) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if out == nil { - return retry.RetryableError(tfresource.NewEmptyResultError(nil)) + return tfresource.RetryableError(tfresource.NewEmptyResultError(nil)) } if len(out.FailedAccounts) == 0 { @@ -142,10 +142,10 @@ func resourceEnablerCreate(ctx context.Context, d *schema.ResourceData, meta any } return false }) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) }) if tfresource.TimedOut(err) { out, err = conn.Enable(ctx, in) From a802cad178dd153715e698c18ddf97dba97b6395 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:26 -0400 Subject: [PATCH 1007/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - opensearch. --- internal/service/opensearch/wait.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/opensearch/wait.go b/internal/service/opensearch/wait.go index 63110158ec83..bd5a4789208b 100644 --- a/internal/service/opensearch/wait.go +++ b/internal/service/opensearch/wait.go @@ -42,21 +42,21 @@ func waitUpgradeSucceeded(ctx context.Context, conn *opensearch.Client, name str func waitForDomainCreation(ctx context.Context, conn *opensearch.Client, domainName string, timeout time.Duration) error { var out *awstypes.DomainStatus - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = findDomainByName(ctx, conn, domainName) if tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if !aws.ToBool(out.Processing) && (out.Endpoint != nil || out.Endpoints != nil) { return nil } - return retry.RetryableError( + return tfresource.RetryableError( fmt.Errorf("%q: Timeout while waiting for OpenSearch Domain to be created", domainName)) }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) @@ -77,18 +77,18 @@ func waitForDomainCreation(ctx context.Context, conn *opensearch.Client, domainN func waitForDomainUpdate(ctx context.Context, conn *opensearch.Client, domainName string, timeout time.Duration) error { var out *awstypes.DomainStatus - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = findDomainByName(ctx, conn, domainName) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if !aws.ToBool(out.Processing) { return nil } - return retry.RetryableError( + return tfresource.RetryableError( fmt.Errorf("%q: Timeout while waiting for changes to be processed", domainName)) }, tfresource.WithDelay(1*time.Minute), tfresource.WithPollInterval(10*time.Second)) @@ -109,7 +109,7 @@ func waitForDomainUpdate(ctx context.Context, conn *opensearch.Client, domainNam func waitForDomainDelete(ctx context.Context, conn *opensearch.Client, domainName string, timeout time.Duration) error { var out *awstypes.DomainStatus - err := tfresource.Retry(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error out, err = findDomainByName(ctx, conn, domainName) @@ -117,14 +117,14 @@ func waitForDomainDelete(ctx context.Context, conn *opensearch.Client, domainNam if tfresource.NotFound(err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if out != nil && !aws.ToBool(out.Processing) { return nil } - return retry.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch Domain %q to be deleted", domainName)) + return tfresource.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch Domain %q to be deleted", domainName)) }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) if tfresource.TimedOut(err) { From 91e96f7e34b5854522c064f7972f5d1f85b7db99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:29 -0400 Subject: [PATCH 1008/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - ram. --- internal/service/ram/resource_share_accepter.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/ram/resource_share_accepter.go b/internal/service/ram/resource_share_accepter.go index a1638af3ad18..f90d1f6462fc 100644 --- a/internal/service/ram/resource_share_accepter.go +++ b/internal/service/ram/resource_share_accepter.go @@ -294,16 +294,16 @@ func findMaybeResourceShareInvitationRetry(ctx context.Context, conn *ram.Client // Retry for RAM resource share invitation eventual consistency. errNotFound := errors.New("not found") var output option.Option[awstypes.ResourceShareInvitation] - err := tfresource.Retry(ctx, resourceShareInvitationPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, resourceShareInvitationPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = findMaybeResourceShareInvitation(ctx, conn, input, filter) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if output.IsNone() { - return retry.RetryableError(errNotFound) + return tfresource.RetryableError(errNotFound) } return nil From 5312d34f8be4b8e9e2a25b237b8730ced3661d79 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:32 -0400 Subject: [PATCH 1009/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - secretsmanager. --- internal/service/secretsmanager/secret.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 9359447b925c..06af6b8fef04 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -247,19 +247,19 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta any) d } var policy *secretsmanager.GetResourcePolicyOutput - err = tfresource.Retry(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { output, err := findSecretPolicyByID(ctx, conn, d.Id()) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if v := output.ResourcePolicy; v != nil { if valid, err := tfiam.PolicyHasValidAWSPrincipals(aws.ToString(v)); err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } else if !valid { log.Printf("[DEBUG] Retrying because of invalid principals") - return retry.RetryableError(errors.New("contains invalid principals")) + return tfresource.RetryableError(errors.New("contains invalid principals")) } } From cc78b70155438c2f575b15875dc95c767510bcf7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 15:58:34 -0400 Subject: [PATCH 1010/2115] Add 'context.Context' arg to function called by 'tfresource.Retry' - sns. --- internal/service/sns/topic.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/sns/topic.go b/internal/service/sns/topic.go index 67b01a1c90e1..2a1a1c1de2ab 100644 --- a/internal/service/sns/topic.go +++ b/internal/service/sns/topic.go @@ -497,19 +497,19 @@ func topicName(d sdkv2.ResourceDiffer) string { // nosemgrep:ci.aws-in-func-name func findTopicAttributesWithValidAWSPrincipalsByARN(ctx context.Context, conn *sns.Client, arn string) (map[string]string, error) { var attributes map[string]string - err := tfresource.Retry(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error attributes, err = findTopicAttributesByARN(ctx, conn, arn) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } valid, err := tfiam.PolicyHasValidAWSPrincipals(attributes[topicAttributeNamePolicy]) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if !valid { - return retry.RetryableError(errors.New("contains invalid principals")) + return tfresource.RetryableError(errors.New("contains invalid principals")) } return nil From dcd2ade491f80b6144aef11b11b4b9ed7729f9b6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 29 Aug 2025 16:00:12 -0400 Subject: [PATCH 1011/2115] Correct file name. --- internal/service/chimesdkvoice/{find..go => find.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename internal/service/chimesdkvoice/{find..go => find.go} (100%) diff --git a/internal/service/chimesdkvoice/find..go b/internal/service/chimesdkvoice/find.go similarity index 100% rename from internal/service/chimesdkvoice/find..go rename to internal/service/chimesdkvoice/find.go From 638f3a9fe7b5050948360b209ebfadf5283e9ffd Mon Sep 17 00:00:00 2001 From: aljazmbts Date: Sat, 30 Aug 2025 12:41:02 +0200 Subject: [PATCH 1012/2115] feat: Add placement group_id support to EC2 launch templates Add support for specifying placement groups by ID in EC2 launch templates, providing an alternative to the existing group_name parameter. Changes: - Add group_id field to launch template placement configuration - Implement proper conflict validation between group_name and group_id - Add expand/flatten functions for group_id API mapping - Include comprehensive acceptance test coverage: * Test basic group_id functionality * Test migration from group_name to group_id * Test data source support for group_id - Add documentation for new group_id parameter with conflict notes - Add proper changelog entry file (.changelog/38908.txt) This enables users to reference placement groups by their unique ID rather than name, providing more robust infrastructure as code practices and supporting programmatic placement group management. This is particularly useful for placement groups that are shared through Resource Access Manager (RAM), where cross-account access may provide the group ID but not the name. The implementation maintains full backward compatibility with existing group_name configurations while adding the new group_id option with proper validation to prevent conflicting specifications. --- .changelog/38908.txt | 7 ++ internal/service/ec2/ec2_launch_template.go | 18 ++- .../ec2/ec2_launch_template_data_source.go | 4 + .../ec2_launch_template_data_source_test.go | 47 ++++++++ .../service/ec2/ec2_launch_template_test.go | 103 ++++++++++++++++++ website/docs/r/launch_template.html.markdown | 3 +- 6 files changed, 179 insertions(+), 3 deletions(-) create mode 100644 .changelog/38908.txt diff --git a/.changelog/38908.txt b/.changelog/38908.txt new file mode 100644 index 000000000000..c7c820c92e6c --- /dev/null +++ b/.changelog/38908.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_launch_template: Add `placement.group_id` argument +``` + +```release-note:enhancement +data-source/aws_launch_template: Add `placement.group_id` attribute +``` diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index a9ffc2cd5caf..8b3870f26121 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -898,8 +898,14 @@ func resourceLaunchTemplate() *schema.Resource { Optional: true, }, names.AttrGroupName: { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"placement.0.group_id"}, + }, + "group_id": { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"placement.0.group_name"}, }, "host_id": { Type: schema.TypeString, @@ -2092,6 +2098,10 @@ func expandLaunchTemplatePlacementRequest(tfMap map[string]any) *awstypes.Launch apiObject.GroupName = aws.String(v) } + if v, ok := tfMap["group_id"].(string); ok && v != "" { + apiObject.GroupId = aws.String(v) + } + if v, ok := tfMap["host_id"].(string); ok && v != "" { apiObject.HostId = aws.String(v) } @@ -2996,6 +3006,10 @@ func flattenLaunchTemplatePlacement(apiObject *awstypes.LaunchTemplatePlacement) tfMap[names.AttrGroupName] = aws.ToString(v) } + if v := apiObject.GroupId; v != nil { + tfMap["group_id"] = aws.ToString(v) + } + if v := apiObject.HostId; v != nil { tfMap["host_id"] = aws.ToString(v) } diff --git a/internal/service/ec2/ec2_launch_template_data_source.go b/internal/service/ec2/ec2_launch_template_data_source.go index 1fee63c40e68..408814f5d3bb 100644 --- a/internal/service/ec2/ec2_launch_template_data_source.go +++ b/internal/service/ec2/ec2_launch_template_data_source.go @@ -708,6 +708,10 @@ func dataSourceLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "group_id": { + Type: schema.TypeString, + Computed: true, + }, "host_id": { Type: schema.TypeString, Computed: true, diff --git a/internal/service/ec2/ec2_launch_template_data_source_test.go b/internal/service/ec2/ec2_launch_template_data_source_test.go index d63c9014f15e..21a9f1fcb6ce 100644 --- a/internal/service/ec2/ec2_launch_template_data_source_test.go +++ b/internal/service/ec2/ec2_launch_template_data_source_test.go @@ -259,6 +259,32 @@ data "aws_launch_template" "test" { `, rName) } +func TestAccEC2LaunchTemplateDataSource_placementGroupID(t *testing.T) { + ctx := acctest.Context(t) + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + dataSourceName := "data.aws_launch_template.test" + resourceName := "aws_launch_template.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLaunchTemplateDataSourceConfig_placementGroupID(rName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceName, names.AttrID), + resource.TestCheckResourceAttrPair(resourceName, names.AttrName, dataSourceName, names.AttrName), + resource.TestCheckResourceAttrPair(resourceName, "placement.#", dataSourceName, "placement.#"), + resource.TestCheckResourceAttrPair(resourceName, "placement.0.group_id", dataSourceName, "placement.0.group_id"), + resource.TestCheckResourceAttr(dataSourceName, "placement.0.group_name", ""), + ), + }, + }, + }) +} + func testAccLaunchTemplateDataSourceConfig_matchTags(rName string) string { return fmt.Sprintf(` resource "aws_launch_template" "test" { @@ -276,3 +302,24 @@ data "aws_launch_template" "test" { } `, rName) } + +func testAccLaunchTemplateDataSourceConfig_placementGroupID(rName string) string { + return fmt.Sprintf(` +resource "aws_placement_group" "test" { + name = %[1]q + strategy = "cluster" +} + +resource "aws_launch_template" "test" { + name = %[1]q + + placement { + group_id = aws_placement_group.test.placement_group_id + } +} + +data "aws_launch_template" "test" { + name = aws_launch_template.test.name +} +`, rName) +} diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index c2f1aee4e916..07c05577fc08 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -4119,6 +4119,109 @@ resource "aws_launch_template" "test" { `, rName) } +func testAccLaunchTemplateConfig_placementGroupID(rName string) string { + return fmt.Sprintf(` +resource "aws_placement_group" "test" { + name = %[1]q + strategy = "cluster" +} + +resource "aws_launch_template" "test" { + name = %[1]q + + placement { + group_id = aws_placement_group.test.placement_group_id + } +} +`, rName) +} + +func testAccLaunchTemplateConfig_placementGroupName(rName string) string { + return fmt.Sprintf(` +resource "aws_placement_group" "test" { + name = %[1]q + strategy = "cluster" +} + +resource "aws_launch_template" "test" { + name = %[1]q + + placement { + group_name = aws_placement_group.test.name + } +} +`, rName) +} + +func TestAccEC2LaunchTemplate_placement_groupID(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLaunchTemplateConfig_placementGroupID(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccEC2LaunchTemplate_placement_groupNameToGroupID(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLaunchTemplateConfig_placementGroupName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_name"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_id", ""), + ), + }, + { + Config: testAccLaunchTemplateConfig_placementGroupID(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccLaunchTemplateConfig_asgBasic(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index 31454dc1ec2e..0d9100110979 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -461,7 +461,8 @@ The `placement` block supports the following: * `affinity` - (Optional) The affinity setting for an instance on a Dedicated Host. * `availability_zone` - (Optional) The Availability Zone for the instance. -* `group_name` - (Optional) The name of the placement group for the instance. +* `group_name` - (Optional) The name of the placement group for the instance. Conflicts with `group_id`. +* `group_id` - (Optional) The ID of the placement group for the instance. Conflicts with `group_name`. * `host_id` - (Optional) The ID of the Dedicated Host for the instance. * `host_resource_group_arn` - (Optional) The ARN of the Host Resource Group in which to launch instances. * `spread_domain` - (Optional) Reserved for future use. From 596fab62dc43bb850d3e53935ccc0cbdbb1dbbf8 Mon Sep 17 00:00:00 2001 From: team-tf-cdk Date: Mon, 1 Sep 2025 00:35:26 +0000 Subject: [PATCH 1013/2115] cdktf: update index.html.markdown,r/xray_sampling_rule.html.markdown,r/xray_resource_policy.html.markdown,r/xray_group.html.markdown,r/xray_encryption_config.html.markdown,r/workspacesweb_user_settings_association.html.markdown,r/workspacesweb_user_settings.html.markdown,r/workspacesweb_user_access_logging_settings_association.html.markdown,r/workspacesweb_user_access_logging_settings.html.markdown,r/workspacesweb_trust_store_association.html.markdown,r/workspacesweb_trust_store.html.markdown,r/workspacesweb_session_logger_association.html.markdown,r/workspacesweb_session_logger.html.markdown,r/workspacesweb_portal.html.markdown,r/workspacesweb_network_settings_association.html.markdown,r/workspacesweb_network_settings.html.markdown,r/workspacesweb_ip_access_settings_association.html.markdown,r/workspacesweb_ip_access_settings.html.markdown,r/workspacesweb_identity_provider.html.markdown,r/workspacesweb_data_protection_settings_association.html.markdown,r/workspacesweb_data_protection_settings.html.markdown,r/workspacesweb_browser_settings_association.html.markdown,r/workspacesweb_browser_settings.html.markdown,r/workspaces_workspace.html.markdown,r/workspaces_ip_group.html.markdown,r/workspaces_directory.html.markdown,r/workspaces_connection_alias.html.markdown,r/wafv2_web_acl_rule_group_association.html.markdown,r/wafv2_web_acl_logging_configuration.html.markdown,r/wafv2_web_acl_association.html.markdown,r/wafv2_web_acl.html.markdown,r/wafv2_rule_group.html.markdown,r/wafv2_regex_pattern_set.html.markdown,r/wafv2_ip_set.html.markdown,r/wafv2_api_key.html.markdown,r/wafregional_xss_match_set.html.markdown,r/wafregional_web_acl_association.html.markdown,r/wafregional_web_acl.html.markdown,r/wafregional_sql_injection_match_set.html.markdown,r/wafregional_size_constraint_set.html.markdown,r/wafregional_rule_group.html.markdown,r/wafregional_rule.html.markdown,r/wafregional_regex_pattern_set.html.markdown,r/wafregional_regex_match_set.html.markdown,r/wafregional_rate_based_rule.html.markdown,r/wafregional_ipset.html.markdown,r/wafregional_geo_match_set.html.markdown,r/wafregional_byte_match_set.html.markdown,r/waf_xss_match_set.html.markdown,r/waf_web_acl.html.markdown,r/waf_sql_injection_match_set.html.markdown,r/waf_size_constraint_set.html.markdown,r/waf_rule_group.html.markdown,r/waf_rule.html.markdown,r/waf_regex_pattern_set.html.markdown,r/waf_regex_match_set.html.markdown,r/waf_rate_based_rule.html.markdown,r/waf_ipset.html.markdown,r/waf_geo_match_set.html.markdown,r/waf_byte_match_set.html.markdown,r/vpn_gateway_route_propagation.html.markdown,r/vpn_gateway_attachment.html.markdown,r/vpn_gateway.html.markdown,r/vpn_connection_route.html.markdown,r/vpn_connection.html.markdown,r/vpclattice_target_group_attachment.html.markdown,r/vpclattice_target_group.html.markdown,r/vpclattice_service_network_vpc_association.html.markdown,r/vpclattice_service_network_service_association.html.markdown,r/vpclattice_service_network_resource_association.html.markdown,r/vpclattice_service_network.html.markdown,r/vpclattice_service.html.markdown,r/vpclattice_resource_policy.html.markdown,r/vpclattice_resource_gateway.html.markdown,r/vpclattice_resource_configuration.html.markdown,r/vpclattice_listener_rule.html.markdown,r/vpclattice_listener.html.markdown,r/vpclattice_auth_policy.html.markdown,r/vpclattice_access_log_subscription.html.markdown,r/vpc_security_group_vpc_association.html.markdown,r/vpc_security_group_ingress_rule.html.markdown,r/vpc_security_group_egress_rule.html.markdown,r/vpc_route_server_vpc_association.html.markdown,r/vpc_route_server_propagation.html.markdown,r/vpc_route_server_peer.html.markdown,r/vpc_route_server_endpoint.html.markdown,r/vpc_route_server.html.markdown,r/vpc_peering_connection_options.html.markdown,r/vpc_peering_connection_accepter.html.markdown,r/vpc_peering_connection.html.markdown,r/vpc_network_performance_metric_subscription.html.markdown,r/vpc_ipv6_cidr_block_association.html.markdown,r/vpc_ipv4_cidr_block_association.html.markdown,r/vpc_ipam_scope.html.markdown,r/vpc_ipam_resource_discovery_association.html.markdown,r/vpc_ipam_resource_discovery.html.markdown,r/vpc_ipam_preview_next_cidr.html.markdown,r/vpc_ipam_pool_cidr_allocation.html.markdown,r/vpc_ipam_pool_cidr.html.markdown,r/vpc_ipam_pool.html.markdown,r/vpc_ipam_organization_admin_account.html.markdown,r/vpc_ipam.html.markdown,r/vpc_endpoint_subnet_association.html.markdown,r/vpc_endpoint_service_private_dns_verification.html.markdown,r/vpc_endpoint_service_allowed_principal.html.markdown,r/vpc_endpoint_service.html.markdown,r/vpc_endpoint_security_group_association.html.markdown,r/vpc_endpoint_route_table_association.html.markdown,r/vpc_endpoint_private_dns.html.markdown,r/vpc_endpoint_policy.html.markdown,r/vpc_endpoint_connection_notification.html.markdown,r/vpc_endpoint_connection_accepter.html.markdown,r/vpc_endpoint.html.markdown,r/vpc_dhcp_options_association.html.markdown,r/vpc_dhcp_options.html.markdown,r/vpc_block_public_access_options.html.markdown,r/vpc_block_public_access_exclusion.html.markdown,r/vpc.html.markdown,r/volume_attachment.html.markdown,r/verifiedpermissions_schema.html.markdown,r/verifiedpermissions_policy_template.html.markdown,r/verifiedpermissions_policy_store.html.markdown,r/verifiedpermissions_policy.html.markdown,r/verifiedpermissions_identity_source.html.markdown,r/verifiedaccess_trust_provider.html.markdown,r/verifiedaccess_instance_trust_provider_attachment.html.markdown,r/verifiedaccess_instance_logging_configuration.html.markdown,r/verifiedaccess_instance.html.markdown,r/verifiedaccess_group.html.markdown,r/verifiedaccess_endpoint.html.markdown,r/transfer_workflow.html.markdown,r/transfer_user.html.markdown,r/transfer_tag.html.markdown,r/transfer_ssh_key.html.markdown,r/transfer_server.html.markdown,r/transfer_profile.html.markdown,r/transfer_connector.html.markdown,r/transfer_certificate.html.markdown,r/transfer_agreement.html.markdown,r/transfer_access.html.markdown,r/transcribe_vocabulary_filter.html.markdown,r/transcribe_vocabulary.html.markdown,r/transcribe_medical_vocabulary.html.markdown,r/transcribe_language_model.html.markdown,r/timestreamwrite_table.html.markdown,r/timestreamwrite_database.html.markdown,r/timestreamquery_scheduled_query.html.markdown,r/timestreaminfluxdb_db_instance.html.markdown,r/timestreaminfluxdb_db_cluster.html.markdown,r/synthetics_group_association.html.markdown,r/synthetics_group.html.markdown,r/synthetics_canary.html.markdown,r/swf_domain.html.markdown,r/subnet.html.markdown,r/storagegateway_working_storage.html.markdown,r/storagegateway_upload_buffer.html.markdown,r/storagegateway_tape_pool.html.markdown,r/storagegateway_stored_iscsi_volume.html.markdown,r/storagegateway_smb_file_share.html.markdown,r/storagegateway_nfs_file_share.html.markdown,r/storagegateway_gateway.html.markdown,r/storagegateway_file_system_association.html.markdown,r/storagegateway_cached_iscsi_volume.html.markdown,r/storagegateway_cache.html.markdown,r/ssoadmin_trusted_token_issuer.html.markdown,r/ssoadmin_permissions_boundary_attachment.html.markdown,r/ssoadmin_permission_set_inline_policy.html.markdown,r/ssoadmin_permission_set.html.markdown,r/ssoadmin_managed_policy_attachment.html.markdown,r/ssoadmin_instance_access_control_attributes.html.markdown,r/ssoadmin_customer_managed_policy_attachment.html.markdown,r/ssoadmin_application_assignment_configuration.html.markdown,r/ssoadmin_application_assignment.html.markdown,r/ssoadmin_application_access_scope.html.markdown,r/ssoadmin_application.html.markdown,r/ssoadmin_account_assignment.html.markdown,r/ssmquicksetup_configuration_manager.html.markdown,r/ssmincidents_response_plan.html.markdown,r/ssmincidents_replication_set.html.markdown,r/ssmcontacts_rotation.html.markdown,r/ssmcontacts_plan.html.markdown,r/ssmcontacts_contact_channel.html.markdown,r/ssmcontacts_contact.html.markdown,r/ssm_service_setting.html.markdown,r/ssm_resource_data_sync.html.markdown,r/ssm_patch_group.html.markdown,r/ssm_patch_baseline.html.markdown,r/ssm_parameter.html.markdown,r/ssm_maintenance_window_task.html.markdown,r/ssm_maintenance_window_target.html.markdown,r/ssm_maintenance_window.html.markdown,r/ssm_document.html.markdown,r/ssm_default_patch_baseline.html.markdown,r/ssm_association.html.markdown,r/ssm_activation.html.markdown,r/sqs_queue_redrive_policy.html.markdown,r/sqs_queue_redrive_allow_policy.html.markdown,r/sqs_queue_policy.html.markdown,r/sqs_queue.html.markdown,r/spot_instance_request.html.markdown,r/spot_fleet_request.html.markdown,r/spot_datafeed_subscription.html.markdown,r/sns_topic_subscription.html.markdown,r/sns_topic_policy.html.markdown,r/sns_topic_data_protection_policy.html.markdown,r/sns_topic.html.markdown,r/sns_sms_preferences.html.markdown,r/sns_platform_application.html.markdown,r/snapshot_create_volume_permission.html.markdown,r/signer_signing_profile_permission.html.markdown,r/signer_signing_profile.html.markdown,r/signer_signing_job.html.markdown,r/shield_subscription.html.markdown,r/shield_protection_health_check_association.html.markdown,r/shield_protection_group.html.markdown,r/shield_protection.html.markdown,r/shield_proactive_engagement.html.markdown,r/shield_drt_access_role_arn_association.html.markdown,r/shield_drt_access_log_bucket_association.html.markdown,r/shield_application_layer_automatic_response.html.markdown,r/sfn_state_machine.html.markdown,r/sfn_alias.html.markdown,r/sfn_activity.html.markdown,r/sesv2_email_identity_policy.html.markdown,r/sesv2_email_identity_mail_from_attributes.html.markdown,r/sesv2_email_identity_feedback_attributes.html.markdown,r/sesv2_email_identity.html.markdown,r/sesv2_dedicated_ip_pool.html.markdown,r/sesv2_dedicated_ip_assignment.html.markdown,r/sesv2_contact_list.html.markdown,r/sesv2_configuration_set_event_destination.html.markdown,r/sesv2_configuration_set.html.markdown,r/sesv2_account_vdm_attributes.html.markdown,r/sesv2_account_suppression_attributes.html.markdown,r/ses_template.html.markdown,r/ses_receipt_rule_set.html.markdown,r/ses_receipt_rule.html.markdown,r/ses_receipt_filter.html.markdown,r/ses_identity_policy.html.markdown,r/ses_identity_notification_topic.html.markdown,r/ses_event_destination.html.markdown,r/ses_email_identity.html.markdown,r/ses_domain_mail_from.html.markdown,r/ses_domain_identity_verification.html.markdown,r/ses_domain_identity.html.markdown,r/ses_domain_dkim.html.markdown,r/ses_configuration_set.html.markdown,r/ses_active_receipt_rule_set.html.markdown,r/servicequotas_template_association.html.markdown,r/servicequotas_template.html.markdown,r/servicequotas_service_quota.html.markdown,r/servicecatalogappregistry_attribute_group_association.html.markdown,r/servicecatalogappregistry_attribute_group.html.markdown,r/servicecatalogappregistry_application.html.markdown,r/servicecatalog_tag_option_resource_association.html.markdown,r/servicecatalog_tag_option.html.markdown,r/servicecatalog_service_action.html.markdown,r/servicecatalog_provisioning_artifact.html.markdown,r/servicecatalog_provisioned_product.html.markdown,r/servicecatalog_product_portfolio_association.html.markdown,r/servicecatalog_product.html.markdown,r/servicecatalog_principal_portfolio_association.html.markdown,r/servicecatalog_portfolio_share.html.markdown,r/servicecatalog_portfolio.html.markdown,r/servicecatalog_organizations_access.html.markdown,r/servicecatalog_constraint.html.markdown,r/servicecatalog_budget_resource_association.html.markdown,r/service_discovery_service.html.markdown,r/service_discovery_public_dns_namespace.html.markdown,r/service_discovery_private_dns_namespace.html.markdown,r/service_discovery_instance.html.markdown,r/service_discovery_http_namespace.html.markdown,r/serverlessapplicationrepository_cloudformation_stack.html.markdown,r/securitylake_subscriber_notification.html.markdown,r/securitylake_subscriber.html.markdown,r/securitylake_data_lake.html.markdown,r/securitylake_custom_log_source.html.markdown,r/securitylake_aws_log_source.html.markdown,r/securityhub_standards_subscription.html.markdown,r/securityhub_standards_control_association.html.markdown,r/securityhub_standards_control.html.markdown,r/securityhub_product_subscription.html.markdown,r/securityhub_organization_configuration.html.markdown,r/securityhub_organization_admin_account.html.markdown,r/securityhub_member.html.markdown,r/securityhub_invite_accepter.html.markdown,r/securityhub_insight.html.markdown,r/securityhub_finding_aggregator.html.markdown,r/securityhub_configuration_policy_association.markdown,r/securityhub_configuration_policy.html.markdown,r/securityhub_automation_rule.html.markdown,r/securityhub_action_target.html.markdown,r/securityhub_account.html.markdown,r/security_group_rule.html.markdown,r/security_group.html.markdown,r/secretsmanager_secret_version.html.markdown,r/secretsmanager_secret_rotation.html.markdown,r/secretsmanager_secret_policy.html.markdown,r/secretsmanager_secret.html.markdown,r/schemas_schema.html.markdown,r/schemas_registry_policy.html.markdown,r/schemas_registry.html.markdown,r/schemas_discoverer.html.markdown,r/scheduler_schedule_group.html.markdown,r/scheduler_schedule.html.markdown,r/sagemaker_workteam.html.markdown,r/sagemaker_workforce.html.markdown,r/sagemaker_user_profile.html.markdown,r/sagemaker_studio_lifecycle_config.html.markdown,r/sagemaker_space.html.markdown,r/sagemaker_servicecatalog_portfolio_status.html.markdown,r/sagemaker_project.html.markdown,r/sagemaker_pipeline.html.markdown,r/sagemaker_notebook_instance_lifecycle_configuration.html.markdown,r/sagemaker_notebook_instance.html.markdown,r/sagemaker_monitoring_schedule.html.markdown,r/sagemaker_model_package_group_policy.html.markdown,r/sagemaker_model_package_group.html.markdown,r/sagemaker_model.html.markdown,r/sagemaker_mlflow_tracking_server.html.markdown,r/sagemaker_image_version.html.markdown,r/sagemaker_image.html.markdown,r/sagemaker_human_task_ui.html.markdown,r/sagemaker_hub.html.markdown,r/sagemaker_flow_definition.html.markdown,r/sagemaker_feature_group.html.markdown,r/sagemaker_endpoint_configuration.html.markdown,r/sagemaker_endpoint.html.markdown,r/sagemaker_domain.html.markdown,r/sagemaker_device_fleet.html.markdown,r/sagemaker_device.html.markdown,r/sagemaker_data_quality_job_definition.html.markdown,r/sagemaker_code_repository.html.markdown,r/sagemaker_app_image_config.html.markdown,r/sagemaker_app.html.markdown,r/s3tables_table_policy.html.markdown,r/s3tables_table_bucket_policy.html.markdown,r/s3tables_table_bucket.html.markdown,r/s3tables_table.html.markdown,r/s3tables_namespace.html.markdown,r/s3outposts_endpoint.html.markdown,r/s3control_storage_lens_configuration.html.markdown,r/s3control_object_lambda_access_point_policy.html.markdown,r/s3control_object_lambda_access_point.html.markdown,r/s3control_multi_region_access_point_policy.html.markdown,r/s3control_multi_region_access_point.html.markdown,r/s3control_directory_bucket_access_point_scope.html.markdown,r/s3control_bucket_policy.html.markdown,r/s3control_bucket_lifecycle_configuration.html.markdown,r/s3control_bucket.html.markdown,r/s3control_access_point_policy.html.markdown,r/s3control_access_grants_location.html.markdown,r/s3control_access_grants_instance_resource_policy.html.markdown,r/s3control_access_grants_instance.html.markdown,r/s3control_access_grant.html.markdown,r/s3_object_copy.html.markdown,r/s3_object.html.markdown,r/s3_directory_bucket.html.markdown,r/s3_bucket_website_configuration.html.markdown,r/s3_bucket_versioning.html.markdown,r/s3_bucket_server_side_encryption_configuration.html.markdown,r/s3_bucket_request_payment_configuration.html.markdown,r/s3_bucket_replication_configuration.html.markdown,r/s3_bucket_public_access_block.html.markdown,r/s3_bucket_policy.html.markdown,r/s3_bucket_ownership_controls.html.markdown,r/s3_bucket_object_lock_configuration.html.markdown,r/s3_bucket_object.html.markdown,r/s3_bucket_notification.html.markdown,r/s3_bucket_metric.html.markdown,r/s3_bucket_metadata_configuration.html.markdown,r/s3_bucket_logging.html.markdown,r/s3_bucket_lifecycle_configuration.html.markdown,r/s3_bucket_inventory.html.markdown,r/s3_bucket_intelligent_tiering_configuration.html.markdown,r/s3_bucket_cors_configuration.html.markdown,r/s3_bucket_analytics_configuration.html.markdown,r/s3_bucket_acl.html.markdown,r/s3_bucket_accelerate_configuration.html.markdown,r/s3_bucket.html.markdown,r/s3_account_public_access_block.html.markdown,r/s3_access_point.html.markdown,r/rum_metrics_destination.html.markdown,r/rum_app_monitor.html.markdown,r/route_table_association.html.markdown,r/route_table.html.markdown,r/route53recoveryreadiness_resource_set.html.markdown,r/route53recoveryreadiness_recovery_group.html.markdown,r/route53recoveryreadiness_readiness_check.html.markdown,r/route53recoveryreadiness_cell.html.markdown,r/route53recoverycontrolconfig_safety_rule.html.markdown,r/route53recoverycontrolconfig_routing_control.html.markdown,r/route53recoverycontrolconfig_control_panel.html.markdown,r/route53recoverycontrolconfig_cluster.html.markdown,r/route53profiles_resource_association.html.markdown,r/route53profiles_profile.html.markdown,r/route53profiles_association.html.markdown,r/route53domains_registered_domain.html.markdown,r/route53domains_domain.html.markdown,r/route53domains_delegation_signer_record.html.markdown,r/route53_zone_association.html.markdown,r/route53_zone.html.markdown,r/route53_vpc_association_authorization.html.markdown,r/route53_traffic_policy_instance.html.markdown,r/route53_traffic_policy.html.markdown,r/route53_resolver_rule_association.html.markdown,r/route53_resolver_rule.html.markdown,r/route53_resolver_query_log_config_association.html.markdown,r/route53_resolver_query_log_config.html.markdown,r/route53_resolver_firewall_rule_group_association.html.markdown,r/route53_resolver_firewall_rule_group.html.markdown,r/route53_resolver_firewall_rule.html.markdown,r/route53_resolver_firewall_domain_list.html.markdown,r/route53_resolver_firewall_config.html.markdown,r/route53_resolver_endpoint.html.markdown,r/route53_resolver_dnssec_config.html.markdown,r/route53_resolver_config.html.markdown,r/route53_records_exclusive.html.markdown,r/route53_record.html.markdown,r/route53_query_log.html.markdown,r/route53_key_signing_key.html.markdown,r/route53_hosted_zone_dnssec.html.markdown,r/route53_health_check.html.markdown,r/route53_delegation_set.html.markdown,r/route53_cidr_location.html.markdown,r/route53_cidr_collection.html.markdown,r/route.html.markdown,r/rolesanywhere_trust_anchor.html.markdown,r/rolesanywhere_profile.html.markdown,r/resourcegroups_resource.html.markdown,r/resourcegroups_group.html.markdown,r/resourceexplorer2_view.html.markdown,r/resourceexplorer2_index.html.markdown,r/resiliencehub_resiliency_policy.html.markdown,r/rekognition_stream_processor.html.markdown,r/rekognition_project.html.markdown,r/rekognition_collection.html.markdown,r/redshiftserverless_workgroup.html.markdown,r/redshiftserverless_usage_limit.html.markdown,r/redshiftserverless_snapshot.html.markdown,r/redshiftserverless_resource_policy.html.markdown,r/redshiftserverless_namespace.html.markdown,r/redshiftserverless_endpoint_access.html.markdown,r/redshiftserverless_custom_domain_association.html.markdown,r/redshiftdata_statement.html.markdown,r/redshift_usage_limit.html.markdown,r/redshift_subnet_group.html.markdown,r/redshift_snapshot_schedule_association.html.markdown,r/redshift_snapshot_schedule.html.markdown,r/redshift_snapshot_copy_grant.html.markdown,r/redshift_snapshot_copy.html.markdown,r/redshift_scheduled_action.html.markdown,r/redshift_resource_policy.html.markdown,r/redshift_partner.html.markdown,r/redshift_parameter_group.html.markdown,r/redshift_logging.html.markdown,r/redshift_integration.html.markdown,r/redshift_hsm_configuration.html.markdown,r/redshift_hsm_client_certificate.html.markdown,r/redshift_event_subscription.html.markdown,r/redshift_endpoint_authorization.html.markdown,r/redshift_endpoint_access.html.markdown,r/redshift_data_share_consumer_association.html.markdown,r/redshift_data_share_authorization.html.markdown,r/redshift_cluster_snapshot.html.markdown,r/redshift_cluster_iam_roles.html.markdown,r/redshift_cluster.html.markdown,r/redshift_authentication_profile.html.markdown,r/rds_shard_group.html.markdown,r/rds_reserved_instance.html.markdown,r/rds_integration.html.markdown,r/rds_instance_state.html.markdown,r/rds_global_cluster.html.markdown,r/rds_export_task.html.markdown,r/rds_custom_db_engine_version.markdown,r/rds_cluster_snapshot_copy.html.markdown,r/rds_cluster_role_association.html.markdown,r/rds_cluster_parameter_group.html.markdown,r/rds_cluster_instance.html.markdown,r/rds_cluster_endpoint.html.markdown,r/rds_cluster_activity_stream.html.markdown,r/rds_cluster.html.markdown,r/rds_certificate.html.markdown,r/rbin_rule.html.markdown,r/ram_sharing_with_organization.html.markdown,r/ram_resource_share_accepter.html.markdown,r/ram_resource_share.html.markdown,r/ram_resource_association.html.markdown,r/ram_principal_association.html.markdown,r/quicksight_vpc_connection.html.markdown,r/quicksight_user_custom_permission.html.markdown,r/quicksight_user.html.markdown,r/quicksight_theme.html.markdown,r/quicksight_template_alias.html.markdown,r/quicksight_template.html.markdown,r/quicksight_role_membership.html.markdown,r/quicksight_role_custom_permission.html.markdown,r/quicksight_refresh_schedule.html.markdown,r/quicksight_namespace.html.markdown,r/quicksight_key_registration.html.markdown,r/quicksight_ip_restriction.html.markdown,r/quicksight_ingestion.html.markdown,r/quicksight_iam_policy_assignment.html.markdown,r/quicksight_group_membership.html.markdown,r/quicksight_group.html.markdown,r/quicksight_folder_membership.html.markdown,r/quicksight_folder.html.markdown,r/quicksight_data_source.html.markdown,r/quicksight_data_set.html.markdown,r/quicksight_dashboard.html.markdown,r/quicksight_custom_permissions.html.markdown,r/quicksight_analysis.html.markdown,r/quicksight_account_subscription.html.markdown,r/quicksight_account_settings.html.markdown,r/qldb_stream.html.markdown,r/qldb_ledger.html.markdown,r/qbusiness_application.html.markdown,r/proxy_protocol_policy.html.markdown,r/prometheus_workspace_configuration.html.markdown,r/prometheus_workspace.html.markdown,r/prometheus_scraper.html.markdown,r/prometheus_rule_group_namespace.html.markdown,r/prometheus_query_logging_configuration.html.markdown,r/prometheus_alert_manager_definition.html.markdown,r/placement_group.html.markdown,r/pipes_pipe.html.markdown,r/pinpointsmsvoicev2_phone_number.html.markdown,r/pinpointsmsvoicev2_opt_out_list.html.markdown,r/pinpointsmsvoicev2_configuration_set.html.markdown,r/pinpoint_sms_channel.html.markdown,r/pinpoint_gcm_channel.html.markdown,r/pinpoint_event_stream.html.markdown,r/pinpoint_email_template.markdown,r/pinpoint_email_channel.html.markdown,r/pinpoint_baidu_channel.html.markdown,r/pinpoint_app.html.markdown,r/pinpoint_apns_voip_sandbox_channel.html.markdown,r/pinpoint_apns_voip_channel.html.markdown,r/pinpoint_apns_sandbox_channel.html.markdown,r/pinpoint_apns_channel.html.markdown,r/pinpoint_adm_channel.html.markdown,r/paymentcryptography_key_alias.html.markdown,r/paymentcryptography_key.html.markdown,r/osis_pipeline.html.markdown,r/organizations_resource_policy.html.markdown,r/organizations_policy_attachment.html.markdown,r/organizations_policy.html.markdown,r/organizations_organizational_unit.html.markdown,r/organizations_organization.html.markdown,r/organizations_delegated_administrator.html.markdown,r/organizations_account.html.markdown,r/opensearchserverless_vpc_endpoint.html.markdown,r/opensearchserverless_security_policy.html.markdown,r/opensearchserverless_security_config.html.markdown,r/opensearchserverless_lifecycle_policy.html.markdown,r/opensearchserverless_collection.html.markdown,r/opensearchserverless_access_policy.html.markdown,r/opensearch_vpc_endpoint.html.markdown,r/opensearch_package_association.html.markdown,r/opensearch_package.html.markdown,r/opensearch_outbound_connection.html.markdown,r/opensearch_inbound_connection_accepter.html.markdown,r/opensearch_domain_saml_options.html.markdown,r/opensearch_domain_policy.html.markdown,r/opensearch_domain.html.markdown,r/opensearch_authorize_vpc_endpoint_access.html.markdown,r/oam_sink_policy.html.markdown,r/oam_sink.html.markdown,r/oam_link.html.markdown,r/notificationscontacts_email_contact.html.markdown,r/notifications_notification_hub.html.markdown,r/notifications_notification_configuration.html.markdown,r/notifications_event_rule.html.markdown,r/notifications_channel_association.html.markdown,r/networkmonitor_probe.html.markdown,r/networkmonitor_monitor.html.markdown,r/networkmanager_vpc_attachment.html.markdown,r/networkmanager_transit_gateway_route_table_attachment.html.markdown,r/networkmanager_transit_gateway_registration.html.markdown,r/networkmanager_transit_gateway_peering.html.markdown,r/networkmanager_transit_gateway_connect_peer_association.html.markdown,r/networkmanager_site_to_site_vpn_attachment.html.markdown,r/networkmanager_site.html.markdown,r/networkmanager_link_association.html.markdown,r/networkmanager_link.html.markdown,r/networkmanager_global_network.html.markdown,r/networkmanager_dx_gateway_attachment.html.markdown,r/networkmanager_device.html.markdown,r/networkmanager_customer_gateway_association.html.markdown,r/networkmanager_core_network_policy_attachment.html.markdown,r/networkmanager_core_network.html.markdown,r/networkmanager_connection.html.markdown,r/networkmanager_connect_peer.html.markdown,r/networkmanager_connect_attachment.html.markdown,r/networkmanager_attachment_accepter.html.markdown,r/networkfirewall_vpc_endpoint_association.html.markdown,r/networkfirewall_tls_inspection_configuration.html.markdown,r/networkfirewall_rule_group.html.markdown,r/networkfirewall_resource_policy.html.markdown,r/networkfirewall_logging_configuration.html.markdown,r/networkfirewall_firewall_transit_gateway_attachment_accepter.html.markdown,r/networkfirewall_firewall_policy.html.markdown,r/networkfirewall_firewall.html.markdown,r/network_interface_sg_attachment.html.markdown,r/network_interface_permission.html.markdown,r/network_interface_attachment.html.markdown,r/network_interface.html.markdown,r/network_acl_rule.html.markdown,r/network_acl_association.html.markdown,r/network_acl.html.markdown,r/neptunegraph_graph.html.markdown,r/neptune_subnet_group.html.markdown,r/neptune_parameter_group.html.markdown,r/neptune_global_cluster.html.markdown,r/neptune_event_subscription.html.markdown,r/neptune_cluster_snapshot.html.markdown,r/neptune_cluster_parameter_group.html.markdown,r/neptune_cluster_instance.html.markdown,r/neptune_cluster_endpoint.html.markdown,r/neptune_cluster.html.markdown,r/nat_gateway_eip_association.html.markdown,r/nat_gateway.html.markdown,r/mwaa_environment.html.markdown,r/mskconnect_worker_configuration.html.markdown,r/mskconnect_custom_plugin.html.markdown,r/mskconnect_connector.html.markdown,r/msk_vpc_connection.html.markdown,r/msk_single_scram_secret_association.html.markdown,r/msk_serverless_cluster.html.markdown,r/msk_scram_secret_association.html.markdown,r/msk_replicator.html.markdown,r/msk_configuration.html.markdown,r/msk_cluster_policy.html.markdown,r/msk_cluster.html.markdown,r/mq_configuration.html.markdown,r/mq_broker.html.markdown,r/memorydb_user.html.markdown,r/memorydb_subnet_group.html.markdown,r/memorydb_snapshot.html.markdown,r/memorydb_parameter_group.html.markdown,r/memorydb_multi_region_cluster.html.markdown,r/memorydb_cluster.html.markdown,r/memorydb_acl.html.markdown,r/medialive_multiplex_program.html.markdown,r/medialive_multiplex.html.markdown,r/medialive_input_security_group.html.markdown,r/medialive_input.html.markdown,r/medialive_channel.html.markdown,r/media_store_container_policy.html.markdown,r/media_store_container.html.markdown,r/media_packagev2_channel_group.html.markdown,r/media_package_channel.html.markdown,r/media_convert_queue.html.markdown,r/main_route_table_association.html.markdown,r/macie2_organization_configuration.html.markdown,r/macie2_organization_admin_account.html.markdown,r/macie2_member.html.markdown,r/macie2_invitation_accepter.html.markdown,r/macie2_findings_filter.html.markdown,r/macie2_custom_data_identifier.html.markdown,r/macie2_classification_job.html.markdown,r/macie2_classification_export_configuration.html.markdown,r/macie2_account.html.markdown,r/m2_environment.html.markdown,r/m2_deployment.html.markdown,r/m2_application.html.markdown,r/location_tracker_association.html.markdown,r/location_tracker.html.markdown,r/location_route_calculator.html.markdown,r/location_place_index.html.markdown,r/location_map.html.markdown,r/location_geofence_collection.html.markdown,r/load_balancer_policy.html.markdown,r/load_balancer_listener_policy.html.markdown,r/load_balancer_backend_server_policy.html.markdown,r/lightsail_static_ip_attachment.html.markdown,r/lightsail_static_ip.html.markdown,r/lightsail_lb_stickiness_policy.html.markdown,r/lightsail_lb_https_redirection_policy.html.markdown,r/lightsail_lb_certificate_attachment.html.markdown,r/lightsail_lb_certificate.html.markdown,r/lightsail_lb_attachment.html.markdown,r/lightsail_lb.html.markdown,r/lightsail_key_pair.html.markdown,r/lightsail_instance_public_ports.html.markdown,r/lightsail_instance.html.markdown,r/lightsail_domain_entry.html.markdown,r/lightsail_domain.html.markdown,r/lightsail_distribution.html.markdown,r/lightsail_disk_attachment.html.markdown,r/lightsail_disk.html.markdown,r/lightsail_database.html.markdown,r/lightsail_container_service_deployment_version.html.markdown,r/lightsail_container_service.html.markdown,r/lightsail_certificate.html.markdown,r/lightsail_bucket_resource_access.html.markdown,r/lightsail_bucket_access_key.html.markdown,r/lightsail_bucket.html.markdown,r/licensemanager_license_configuration.html.markdown,r/licensemanager_grant_accepter.html.markdown,r/licensemanager_grant.html.markdown,r/licensemanager_association.html.markdown,r/lexv2models_slot_type.html.markdown,r/lexv2models_slot.html.markdown,r/lexv2models_intent.html.markdown,r/lexv2models_bot_version.html.markdown,r/lexv2models_bot_locale.html.markdown,r/lexv2models_bot.html.markdown,r/lex_slot_type.html.markdown,r/lex_intent.html.markdown,r/lex_bot_alias.html.markdown,r/lex_bot.html.markdown,r/lb_trust_store_revocation.html.markdown,r/lb_trust_store.html.markdown,r/lb_target_group_attachment.html.markdown,r/lb_target_group.html.markdown,r/lb_ssl_negotiation_policy.html.markdown,r/lb_listener_rule.html.markdown,r/lb_listener_certificate.html.markdown,r/lb_listener.html.markdown,r/lb_cookie_stickiness_policy.html.markdown,r/lb.html.markdown,r/launch_template.html.markdown,r/launch_configuration.html.markdown,r/lambda_runtime_management_config.html.markdown,r/lambda_provisioned_concurrency_config.html.markdown,r/lambda_permission.html.markdown,r/lambda_layer_version_permission.html.markdown,r/lambda_layer_version.html.markdown,r/lambda_invocation.html.markdown,r/lambda_function_url.html.markdown,r/lambda_function_recursion_config.html.markdown,r/lambda_function_event_invoke_config.html.markdown,r/lambda_function.html.markdown,r/lambda_event_source_mapping.html.markdown,r/lambda_code_signing_config.html.markdown,r/lambda_alias.html.markdown,r/lakeformation_resource_lf_tags.html.markdown,r/lakeformation_resource_lf_tag.html.markdown,r/lakeformation_resource.html.markdown,r/lakeformation_permissions.html.markdown,r/lakeformation_opt_in.html.markdown,r/lakeformation_lf_tag.html.markdown,r/lakeformation_data_lake_settings.html.markdown,r/lakeformation_data_cells_filter.html.markdown,r/kms_replica_key.html.markdown,r/kms_replica_external_key.html.markdown,r/kms_key_policy.html.markdown,r/kms_key.html.markdown,r/kms_grant.html.markdown,r/kms_external_key.html.markdown,r/kms_custom_key_store.html.markdown,r/kms_ciphertext.html.markdown,r/kms_alias.html.markdown,r/kinesisanalyticsv2_application_snapshot.html.markdown,r/kinesisanalyticsv2_application.html.markdown,r/kinesis_video_stream.html.markdown,r/kinesis_stream_consumer.html.markdown,r/kinesis_stream.html.markdown,r/kinesis_resource_policy.html.markdown,r/kinesis_firehose_delivery_stream.html.markdown,r/kinesis_analytics_application.html.markdown,r/keyspaces_table.html.markdown,r/keyspaces_keyspace.html.markdown,r/key_pair.html.markdown,r/kendra_thesaurus.html.markdown,r/kendra_query_suggestions_block_list.html.markdown,r/kendra_index.html.markdown,r/kendra_faq.html.markdown,r/kendra_experience.html.markdown,r/kendra_data_source.html.markdown,r/ivschat_room.html.markdown,r/ivschat_logging_configuration.html.markdown,r/ivs_recording_configuration.html.markdown,r/ivs_playback_key_pair.html.markdown,r/ivs_channel.html.markdown,r/iot_topic_rule_destination.html.markdown,r/iot_topic_rule.html.markdown,r/iot_thing_type.html.markdown,r/iot_thing_principal_attachment.html.markdown,r/iot_thing_group_membership.html.markdown,r/iot_thing_group.html.markdown,r/iot_thing.html.markdown,r/iot_role_alias.html.markdown,r/iot_provisioning_template.html.markdown,r/iot_policy_attachment.html.markdown,r/iot_policy.html.markdown,r/iot_logging_options.html.markdown,r/iot_indexing_configuration.html.markdown,r/iot_event_configurations.html.markdown,r/iot_domain_configuration.html.markdown,r/iot_certificate.html.markdown,r/iot_ca_certificate.html.markdown,r/iot_billing_group.html.markdown,r/iot_authorizer.html.markdown,r/internetmonitor_monitor.html.markdown,r/internet_gateway_attachment.html.markdown,r/internet_gateway.html.markdown,r/instance.html.markdown,r/inspector_resource_group.html.markdown,r/inspector_assessment_template.html.markdown,r/inspector_assessment_target.html.markdown,r/inspector2_organization_configuration.html.markdown,r/inspector2_member_association.html.markdown,r/inspector2_filter.html.markdown,r/inspector2_enabler.html.markdown,r/inspector2_delegated_admin_account.html.markdown,r/imagebuilder_workflow.html.markdown,r/imagebuilder_lifecycle_policy.html.markdown,r/imagebuilder_infrastructure_configuration.html.markdown,r/imagebuilder_image_recipe.html.markdown,r/imagebuilder_image_pipeline.html.markdown,r/imagebuilder_image.html.markdown,r/imagebuilder_distribution_configuration.html.markdown,r/imagebuilder_container_recipe.html.markdown,r/imagebuilder_component.html.markdown,r/identitystore_user.html.markdown,r/identitystore_group_membership.html.markdown,r/identitystore_group.html.markdown,r/iam_virtual_mfa_device.html.markdown,r/iam_user_ssh_key.html.markdown,r/iam_user_policy_attachments_exclusive.html.markdown,r/iam_user_policy_attachment.html.markdown,r/iam_user_policy.html.markdown,r/iam_user_policies_exclusive.html.markdown,r/iam_user_login_profile.html.markdown,r/iam_user_group_membership.html.markdown,r/iam_user.html.markdown,r/iam_signing_certificate.html.markdown,r/iam_service_specific_credential.html.markdown,r/iam_service_linked_role.html.markdown,r/iam_server_certificate.html.markdown,r/iam_security_token_service_preferences.html.markdown,r/iam_saml_provider.html.markdown,r/iam_role_policy_attachments_exclusive.html.markdown,r/iam_role_policy_attachment.html.markdown,r/iam_role_policy.html.markdown,r/iam_role_policies_exclusive.html.markdown,r/iam_role.html.markdown,r/iam_policy_attachment.html.markdown,r/iam_policy.html.markdown,r/iam_organizations_features.html.markdown,r/iam_openid_connect_provider.html.markdown,r/iam_instance_profile.html.markdown,r/iam_group_policy_attachments_exclusive.html.markdown,r/iam_group_policy_attachment.html.markdown,r/iam_group_policy.html.markdown,r/iam_group_policies_exclusive.html.markdown,r/iam_group_membership.html.markdown,r/iam_group.html.markdown,r/iam_account_password_policy.html.markdown,r/iam_account_alias.html.markdown,r/iam_access_key.html.markdown,r/guardduty_threatintelset.html.markdown,r/guardduty_publishing_destination.html.markdown,r/guardduty_organization_configuration_feature.html.markdown,r/guardduty_organization_configuration.html.markdown,r/guardduty_organization_admin_account.html.markdown,r/guardduty_member_detector_feature.html.markdown,r/guardduty_member.html.markdown,r/guardduty_malware_protection_plan.html.markdown,r/guardduty_ipset.html.markdown,r/guardduty_invite_accepter.html.markdown,r/guardduty_filter.html.markdown,r/guardduty_detector_feature.html.markdown,r/guardduty_detector.html.markdown,r/grafana_workspace_service_account_token.html.markdown,r/grafana_workspace_service_account.html.markdown,r/grafana_workspace_saml_configuration.html.markdown,r/grafana_workspace_api_key.html.markdown,r/grafana_workspace.html.markdown,r/grafana_role_association.html.markdown,r/grafana_license_association.html.markdown,r/glue_workflow.html.markdown,r/glue_user_defined_function.html.markdown,r/glue_trigger.html.markdown,r/glue_security_configuration.html.markdown,r/glue_schema.html.markdown,r/glue_resource_policy.html.markdown,r/glue_registry.html.markdown,r/glue_partition_index.html.markdown,r/glue_partition.html.markdown,r/glue_ml_transform.html.markdown,r/glue_job.html.markdown,r/glue_dev_endpoint.html.markdown,r/glue_data_quality_ruleset.html.markdown,r/glue_data_catalog_encryption_settings.html.markdown,r/glue_crawler.html.markdown,r/glue_connection.html.markdown,r/glue_classifier.html.markdown,r/glue_catalog_table_optimizer.html.markdown,r/glue_catalog_table.html.markdown,r/glue_catalog_database.html.markdown,r/globalaccelerator_listener.html.markdown,r/globalaccelerator_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_listener.html.markdown,r/globalaccelerator_custom_routing_endpoint_group.html.markdown,r/globalaccelerator_custom_routing_accelerator.html.markdown,r/globalaccelerator_cross_account_attachment.html.markdown,r/globalaccelerator_accelerator.html.markdown,r/glacier_vault_lock.html.markdown,r/glacier_vault.html.markdown,r/gamelift_script.html.markdown,r/gamelift_game_session_queue.html.markdown,r/gamelift_game_server_group.html.markdown,r/gamelift_fleet.html.markdown,r/gamelift_build.html.markdown,r/gamelift_alias.html.markdown,r/fsx_windows_file_system.html.markdown,r/fsx_s3_access_point_attachment.html.markdown,r/fsx_openzfs_volume.html.markdown,r/fsx_openzfs_snapshot.html.markdown,r/fsx_openzfs_file_system.html.markdown,r/fsx_ontap_volume.html.markdown,r/fsx_ontap_storage_virtual_machine.html.markdown,r/fsx_ontap_file_system.html.markdown,r/fsx_lustre_file_system.html.markdown,r/fsx_file_cache.html.markdown,r/fsx_data_repository_association.html.markdown,r/fsx_backup.html.markdown,r/fms_resource_set.html.markdown,r/fms_policy.html.markdown,r/fms_admin_account.html.markdown,r/flow_log.html.markdown,r/fis_experiment_template.html.markdown,r/finspace_kx_volume.html.markdown,r/finspace_kx_user.html.markdown,r/finspace_kx_scaling_group.html.markdown,r/finspace_kx_environment.html.markdown,r/finspace_kx_dataview.html.markdown,r/finspace_kx_database.html.markdown,r/finspace_kx_cluster.html.markdown,r/evidently_segment.html.markdown,r/evidently_project.html.markdown,r/evidently_launch.html.markdown,r/evidently_feature.html.markdown,r/emrserverless_application.html.markdown,r/emrcontainers_virtual_cluster.html.markdown,r/emrcontainers_job_template.html.markdown,r/emr_studio_session_mapping.html.markdown,r/emr_studio.html.markdown,r/emr_security_configuration.html.markdown,r/emr_managed_scaling_policy.html.markdown,r/emr_instance_group.html.markdown,r/emr_instance_fleet.html.markdown,r/emr_cluster.html.markdown,r/emr_block_public_access_configuration.html.markdown,r/elb_attachment.html.markdown,r/elb.html.markdown,r/elastictranscoder_preset.html.markdown,r/elastictranscoder_pipeline.html.markdown,r/elasticsearch_vpc_endpoint.html.markdown,r/elasticsearch_domain_saml_options.html.markdown,r/elasticsearch_domain_policy.html.markdown,r/elasticsearch_domain.html.markdown,r/elasticache_user_group_association.html.markdown,r/elasticache_user_group.html.markdown,r/elasticache_user.html.markdown,r/elasticache_subnet_group.html.markdown,r/elasticache_serverless_cache.html.markdown,r/elasticache_reserved_cache_node.html.markdown,r/elasticache_replication_group.html.markdown,r/elasticache_parameter_group.html.markdown,r/elasticache_global_replication_group.html.markdown,r/elasticache_cluster.html.markdown,r/elastic_beanstalk_environment.html.markdown,r/elastic_beanstalk_configuration_template.html.markdown,r/elastic_beanstalk_application_version.html.markdown,r/elastic_beanstalk_application.html.markdown,r/eks_pod_identity_association.html.markdown,r/eks_node_group.html.markdown,r/eks_identity_provider_config.html.markdown,r/eks_fargate_profile.html.markdown,r/eks_cluster.html.markdown,r/eks_addon.html.markdown,r/eks_access_policy_association.html.markdown,r/eks_access_entry.html.markdown,r/eip_domain_name.html.markdown,r/eip_association.html.markdown,r/eip.html.markdown,r/egress_only_internet_gateway.html.markdown,r/efs_replication_configuration.html.markdown,r/efs_mount_target.html.markdown,r/efs_file_system_policy.html.markdown,r/efs_file_system.html.markdown,r/efs_backup_policy.html.markdown,r/efs_access_point.html.markdown,r/ecs_task_set.html.markdown,r/ecs_task_definition.html.markdown,r/ecs_tag.html.markdown,r/ecs_service.html.markdown,r/ecs_cluster_capacity_providers.html.markdown,r/ecs_cluster.html.markdown,r/ecs_capacity_provider.html.markdown,r/ecs_account_setting_default.html.markdown,r/ecrpublic_repository_policy.html.markdown,r/ecrpublic_repository.html.markdown,r/ecr_repository_policy.html.markdown,r/ecr_repository_creation_template.html.markdown,r/ecr_repository.html.markdown,r/ecr_replication_configuration.html.markdown,r/ecr_registry_scanning_configuration.html.markdown,r/ecr_registry_policy.html.markdown,r/ecr_pull_through_cache_rule.html.markdown,r/ecr_lifecycle_policy.html.markdown,r/ecr_account_setting.html.markdown,r/ec2_transit_gateway_vpc_attachment_accepter.html.markdown,r/ec2_transit_gateway_vpc_attachment.html.markdown,r/ec2_transit_gateway_route_table_propagation.html.markdown,r/ec2_transit_gateway_route_table_association.html.markdown,r/ec2_transit_gateway_route_table.html.markdown,r/ec2_transit_gateway_route.html.markdown,r/ec2_transit_gateway_prefix_list_reference.html.markdown,r/ec2_transit_gateway_policy_table_association.html.markdown,r/ec2_transit_gateway_policy_table.html.markdown,r/ec2_transit_gateway_peering_attachment_accepter.html.markdown,r/ec2_transit_gateway_peering_attachment.html.markdown,r/ec2_transit_gateway_multicast_group_source.html.markdown,r/ec2_transit_gateway_multicast_group_member.html.markdown,r/ec2_transit_gateway_multicast_domain_association.html.markdown,r/ec2_transit_gateway_multicast_domain.html.markdown,r/ec2_transit_gateway_default_route_table_propagation.html.markdown,r/ec2_transit_gateway_default_route_table_association.html.markdown,r/ec2_transit_gateway_connect_peer.html.markdown,r/ec2_transit_gateway_connect.html.markdown,r/ec2_transit_gateway.html.markdown,r/ec2_traffic_mirror_target.html.markdown,r/ec2_traffic_mirror_session.html.markdown,r/ec2_traffic_mirror_filter_rule.html.markdown,r/ec2_traffic_mirror_filter.html.markdown,r/ec2_tag.html.markdown,r/ec2_subnet_cidr_reservation.html.markdown,r/ec2_serial_console_access.html.markdown,r/ec2_network_insights_path.html.markdown,r/ec2_network_insights_analysis.html.markdown,r/ec2_managed_prefix_list_entry.html.markdown,r/ec2_managed_prefix_list.html.markdown,r/ec2_local_gateway_route_table_vpc_association.html.markdown,r/ec2_local_gateway_route.html.markdown,r/ec2_instance_state.html.markdown,r/ec2_instance_metadata_defaults.html.markdown,r/ec2_instance_connect_endpoint.html.markdown,r/ec2_image_block_public_access.markdown,r/ec2_host.html.markdown,r/ec2_fleet.html.markdown,r/ec2_default_credit_specification.html.markdown,r/ec2_client_vpn_route.html.markdown,r/ec2_client_vpn_network_association.html.markdown,r/ec2_client_vpn_endpoint.html.markdown,r/ec2_client_vpn_authorization_rule.html.markdown,r/ec2_carrier_gateway.html.markdown,r/ec2_capacity_reservation.html.markdown,r/ec2_capacity_block_reservation.html.markdown,r/ec2_availability_zone_group.html.markdown,r/ebs_volume.html.markdown,r/ebs_snapshot_import.html.markdown,r/ebs_snapshot_copy.html.markdown,r/ebs_snapshot_block_public_access.html.markdown,r/ebs_snapshot.html.markdown,r/ebs_fast_snapshot_restore.html.markdown,r/ebs_encryption_by_default.html.markdown,r/ebs_default_kms_key.html.markdown,r/dynamodb_tag.html.markdown,r/dynamodb_table_replica.html.markdown,r/dynamodb_table_item.html.markdown,r/dynamodb_table_export.html.markdown,r/dynamodb_table.html.markdown,r/dynamodb_resource_policy.html.markdown,r/dynamodb_kinesis_streaming_destination.html.markdown,r/dynamodb_global_table.html.markdown,r/dynamodb_contributor_insights.html.markdown,r/dx_transit_virtual_interface.html.markdown,r/dx_public_virtual_interface.html.markdown,r/dx_private_virtual_interface.html.markdown,r/dx_macsec_key_association.html.markdown,r/dx_lag.html.markdown,r/dx_hosted_transit_virtual_interface_accepter.html.markdown,r/dx_hosted_transit_virtual_interface.html.markdown,r/dx_hosted_public_virtual_interface_accepter.html.markdown,r/dx_hosted_public_virtual_interface.html.markdown,r/dx_hosted_private_virtual_interface_accepter.html.markdown,r/dx_hosted_private_virtual_interface.html.markdown,r/dx_hosted_connection.html.markdown,r/dx_gateway_association_proposal.html.markdown,r/dx_gateway_association.html.markdown,r/dx_gateway.html.markdown,r/dx_connection_confirmation.html.markdown,r/dx_connection_association.html.markdown,r/dx_connection.html.markdown,r/dx_bgp_peer.html.markdown,r/dsql_cluster_peering.html.markdown,r/dsql_cluster.html.markdown,r/drs_replication_configuration_template.html.markdown,r/docdbelastic_cluster.html.markdown,r/docdb_subnet_group.html.markdown,r/docdb_global_cluster.html.markdown,r/docdb_event_subscription.html.markdown,r/docdb_cluster_snapshot.html.markdown,r/docdb_cluster_parameter_group.html.markdown,r/docdb_cluster_instance.html.markdown,r/docdb_cluster.html.markdown,r/dms_s3_endpoint.html.markdown,r/dms_replication_task.html.markdown,r/dms_replication_subnet_group.html.markdown,r/dms_replication_instance.html.markdown,r/dms_replication_config.html.markdown,r/dms_event_subscription.html.markdown,r/dms_endpoint.html.markdown,r/dms_certificate.html.markdown,r/dlm_lifecycle_policy.html.markdown,r/directory_service_trust.html.markdown,r/directory_service_shared_directory_accepter.html.markdown,r/directory_service_shared_directory.html.markdown,r/directory_service_region.html.markdown,r/directory_service_radius_settings.html.markdown,r/directory_service_log_subscription.html.markdown,r/directory_service_directory.html.markdown,r/directory_service_conditional_forwarder.html.markdown,r/devopsguru_service_integration.html.markdown,r/devopsguru_resource_collection.html.markdown,r/devopsguru_notification_channel.html.markdown,r/devopsguru_event_sources_config.html.markdown,r/devicefarm_upload.html.markdown,r/devicefarm_test_grid_project.html.markdown,r/devicefarm_project.html.markdown,r/devicefarm_network_profile.html.markdown,r/devicefarm_instance_profile.html.markdown,r/devicefarm_device_pool.html.markdown,r/detective_organization_configuration.html.markdown,r/detective_organization_admin_account.html.markdown,r/detective_member.html.markdown,r/detective_invitation_accepter.html.markdown,r/detective_graph.html.markdown,r/default_vpc_dhcp_options.html.markdown,r/default_vpc.html.markdown,r/default_subnet.html.markdown,r/default_security_group.html.markdown,r/default_route_table.html.markdown,r/default_network_acl.html.markdown,r/db_subnet_group.html.markdown,r/db_snapshot_copy.html.markdown,r/db_snapshot.html.markdown,r/db_proxy_target.html.markdown,r/db_proxy_endpoint.html.markdown,r/db_proxy_default_target_group.html.markdown,r/db_proxy.html.markdown,r/db_parameter_group.html.markdown,r/db_option_group.html.markdown,r/db_instance_role_association.html.markdown,r/db_instance_automated_backups_replication.html.markdown,r/db_instance.html.markdown,r/db_event_subscription.html.markdown,r/db_cluster_snapshot.html.markdown,r/dax_subnet_group.html.markdown,r/dax_parameter_group.html.markdown,r/dax_cluster.html.markdown,r/datazone_user_profile.html.markdown,r/datazone_project.html.markdown,r/datazone_glossary_term.html.markdown,r/datazone_glossary.html.markdown,r/datazone_form_type.html.markdown,r/datazone_environment_profile.html.markdown,r/datazone_environment_blueprint_configuration.html.markdown,r/datazone_environment.html.markdown,r/datazone_domain.html.markdown,r/datazone_asset_type.html.markdown,r/datasync_task.html.markdown,r/datasync_location_smb.html.markdown,r/datasync_location_s3.html.markdown,r/datasync_location_object_storage.html.markdown,r/datasync_location_nfs.html.markdown,r/datasync_location_hdfs.html.markdown,r/datasync_location_fsx_windows_file_system.html.markdown,r/datasync_location_fsx_openzfs_file_system.html.markdown,r/datasync_location_fsx_ontap_file_system.html.markdown,r/datasync_location_fsx_lustre_file_system.html.markdown,r/datasync_location_efs.html.markdown,r/datasync_location_azure_blob.html.markdown,r/datasync_agent.html.markdown,r/datapipeline_pipeline_definition.html.markdown,r/datapipeline_pipeline.html.markdown,r/dataexchange_revision_assets.html.markdown,r/dataexchange_revision.html.markdown,r/dataexchange_event_action.html.markdown,r/dataexchange_data_set.html.markdown,r/customerprofiles_profile.html.markdown,r/customerprofiles_domain.html.markdown,r/customer_gateway.html.markdown,r/cur_report_definition.html.markdown,r/costoptimizationhub_preferences.html.markdown,r/costoptimizationhub_enrollment_status.html.markdown,r/controltower_landing_zone.html.markdown,r/controltower_control.html.markdown,r/connect_vocabulary.html.markdown,r/connect_user_hierarchy_structure.html.markdown,r/connect_user_hierarchy_group.html.markdown,r/connect_user.html.markdown,r/connect_security_profile.html.markdown,r/connect_routing_profile.html.markdown,r/connect_quick_connect.html.markdown,r/connect_queue.html.markdown,r/connect_phone_number_contact_flow_association.html.markdown,r/connect_phone_number.html.markdown,r/connect_lambda_function_association.html.markdown,r/connect_instance_storage_config.html.markdown,r/connect_instance.html.markdown,r/connect_hours_of_operation.html.markdown,r/connect_contact_flow_module.html.markdown,r/connect_contact_flow.html.markdown,r/connect_bot_association.html.markdown,r/config_retention_configuration.html.markdown,r/config_remediation_configuration.html.markdown,r/config_organization_managed_rule.html.markdown,r/config_organization_custom_rule.html.markdown,r/config_organization_custom_policy_rule.html.markdown,r/config_organization_conformance_pack.html.markdown,r/config_delivery_channel.html.markdown,r/config_conformance_pack.html.markdown,r/config_configuration_recorder_status.html.markdown,r/config_configuration_recorder.html.markdown,r/config_configuration_aggregator.html.markdown,r/config_config_rule.html.markdown,r/config_aggregate_authorization.html.markdown,r/computeoptimizer_recommendation_preferences.html.markdown,r/computeoptimizer_enrollment_status.html.markdown,r/comprehend_entity_recognizer.html.markdown,r/comprehend_document_classifier.html.markdown,r/cognito_user_pool_ui_customization.html.markdown,r/cognito_user_pool_domain.html.markdown,r/cognito_user_pool_client.html.markdown,r/cognito_user_pool.html.markdown,r/cognito_user_in_group.html.markdown,r/cognito_user_group.html.markdown,r/cognito_user.html.markdown,r/cognito_risk_configuration.html.markdown,r/cognito_resource_server.html.markdown,r/cognito_managed_user_pool_client.html.markdown,r/cognito_log_delivery_configuration.html.markdown,r/cognito_identity_provider.html.markdown,r/cognito_identity_pool_roles_attachment.html.markdown,r/cognito_identity_pool_provider_principal_tag.html.markdown,r/cognito_identity_pool.html.markdown,r/codestarnotifications_notification_rule.html.markdown,r/codestarconnections_host.html.markdown,r/codestarconnections_connection.html.markdown,r/codepipeline_webhook.html.markdown,r/codepipeline_custom_action_type.html.markdown,r/codepipeline.html.markdown,r/codegurureviewer_repository_association.html.markdown,r/codeguruprofiler_profiling_group.html.markdown,r/codedeploy_deployment_group.html.markdown,r/codedeploy_deployment_config.html.markdown,r/codedeploy_app.html.markdown,r/codeconnections_host.html.markdown,r/codeconnections_connection.html.markdown,r/codecommit_trigger.html.markdown,r/codecommit_repository.html.markdown,r/codecommit_approval_rule_template_association.html.markdown,r/codecommit_approval_rule_template.html.markdown,r/codecatalyst_source_repository.html.markdown,r/codecatalyst_project.html.markdown,r/codecatalyst_dev_environment.html.markdown,r/codebuild_webhook.html.markdown,r/codebuild_source_credential.html.markdown,r/codebuild_resource_policy.html.markdown,r/codebuild_report_group.html.markdown,r/codebuild_project.html.markdown,r/codebuild_fleet.html.markdown,r/codeartifact_repository_permissions_policy.html.markdown,r/codeartifact_repository.html.markdown,r/codeartifact_domain_permissions_policy.html.markdown,r/codeartifact_domain.html.markdown,r/cloudwatch_query_definition.html.markdown,r/cloudwatch_metric_stream.html.markdown,r/cloudwatch_metric_alarm.html.markdown,r/cloudwatch_log_subscription_filter.html.markdown,r/cloudwatch_log_stream.html.markdown,r/cloudwatch_log_resource_policy.html.markdown,r/cloudwatch_log_metric_filter.html.markdown,r/cloudwatch_log_index_policy.html.markdown,r/cloudwatch_log_group.html.markdown,r/cloudwatch_log_destination_policy.html.markdown,r/cloudwatch_log_destination.html.markdown,r/cloudwatch_log_delivery_source.html.markdown,r/cloudwatch_log_delivery_destination_policy.html.markdown,r/cloudwatch_log_delivery_destination.html.markdown,r/cloudwatch_log_delivery.html.markdown,r/cloudwatch_log_data_protection_policy.html.markdown,r/cloudwatch_log_anomaly_detector.html.markdown,r/cloudwatch_log_account_policy.html.markdown,r/cloudwatch_event_target.html.markdown,r/cloudwatch_event_rule.html.markdown,r/cloudwatch_event_permission.html.markdown,r/cloudwatch_event_endpoint.html.markdown,r/cloudwatch_event_connection.html.markdown,r/cloudwatch_event_bus_policy.html.markdown,r/cloudwatch_event_bus.html.markdown,r/cloudwatch_event_archive.html.markdown,r/cloudwatch_event_api_destination.html.markdown,r/cloudwatch_dashboard.html.markdown,r/cloudwatch_contributor_managed_insight_rule.html.markdown,r/cloudwatch_contributor_insight_rule.html.markdown,r/cloudwatch_composite_alarm.html.markdown,r/cloudtrail_organization_delegated_admin_account.html.markdown,r/cloudtrail_event_data_store.html.markdown,r/cloudtrail.html.markdown,r/cloudsearch_domain_service_access_policy.html.markdown,r/cloudsearch_domain.html.markdown,r/cloudhsm_v2_hsm.html.markdown,r/cloudhsm_v2_cluster.html.markdown,r/cloudfrontkeyvaluestore_keys_exclusive.html.markdown,r/cloudfrontkeyvaluestore_key.html.markdown,r/cloudfront_vpc_origin.html.markdown,r/cloudfront_response_headers_policy.html.markdown,r/cloudfront_realtime_log_config.html.markdown,r/cloudfront_public_key.html.markdown,r/cloudfront_origin_request_policy.html.markdown,r/cloudfront_origin_access_identity.html.markdown,r/cloudfront_origin_access_control.html.markdown,r/cloudfront_monitoring_subscription.html.markdown,r/cloudfront_key_value_store.html.markdown,r/cloudfront_key_group.html.markdown,r/cloudfront_function.html.markdown,r/cloudfront_field_level_encryption_profile.html.markdown,r/cloudfront_field_level_encryption_config.html.markdown,r/cloudfront_distribution.html.markdown,r/cloudfront_continuous_deployment_policy.html.markdown,r/cloudfront_cache_policy.html.markdown,r/cloudformation_type.html.markdown,r/cloudformation_stack_set_instance.html.markdown,r/cloudformation_stack_set.html.markdown,r/cloudformation_stack_instances.html.markdown,r/cloudformation_stack.html.markdown,r/cloudcontrolapi_resource.html.markdown,r/cloud9_environment_membership.html.markdown,r/cloud9_environment_ec2.html.markdown,r/cleanrooms_membership.html.markdown,r/cleanrooms_configured_table.html.markdown,r/cleanrooms_collaboration.html.markdown,r/chimesdkvoice_voice_profile_domain.html.markdown,r/chimesdkvoice_sip_rule.html.markdown,r/chimesdkvoice_sip_media_application.html.markdown,r/chimesdkvoice_global_settings.html.markdown,r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown,r/chime_voice_connector_termination_credentials.html.markdown,r/chime_voice_connector_termination.html.markdown,r/chime_voice_connector_streaming.html.markdown,r/chime_voice_connector_origination.html.markdown,r/chime_voice_connector_logging.html.markdown,r/chime_voice_connector_group.html.markdown,r/chime_voice_connector.html.markdown,r/chatbot_teams_channel_configuration.html.markdown,r/chatbot_slack_channel_configuration.html.markdown,r/ce_cost_category.html.markdown,r/ce_cost_allocation_tag.html.markdown,r/ce_anomaly_subscription.html.markdown,r/ce_anomaly_monitor.html.markdown,r/budgets_budget_action.html.markdown,r/budgets_budget.html.markdown,r/bedrockagent_prompt.html.markdown,r/bedrockagent_knowledge_base.html.markdown,r/bedrockagent_flow.html.markdown,r/bedrockagent_data_source.html.markdown,r/bedrockagent_agent_knowledge_base_association.html.markdown,r/bedrockagent_agent_collaborator.html.markdown,r/bedrockagent_agent_alias.html.markdown,r/bedrockagent_agent_action_group.html.markdown,r/bedrockagent_agent.html.markdown,r/bedrock_provisioned_model_throughput.html.markdown,r/bedrock_model_invocation_logging_configuration.html.markdown,r/bedrock_inference_profile.html.markdown,r/bedrock_guardrail_version.html.markdown,r/bedrock_guardrail.html.markdown,r/bedrock_custom_model.html.markdown,r/bcmdataexports_export.html.markdown,r/batch_scheduling_policy.html.markdown,r/batch_job_queue.html.markdown,r/batch_job_definition.html.markdown,r/batch_compute_environment.html.markdown,r/backup_vault_policy.html.markdown,r/backup_vault_notifications.html.markdown,r/backup_vault_lock_configuration.html.markdown,r/backup_vault.html.markdown,r/backup_selection.html.markdown,r/backup_restore_testing_selection.html.markdown,r/backup_restore_testing_plan.html.markdown,r/backup_report_plan.html.markdown,r/backup_region_settings.html.markdown,r/backup_plan.html.markdown,r/backup_logically_air_gapped_vault.html.markdown,r/backup_global_settings.html.markdown,r/backup_framework.html.markdown,r/autoscalingplans_scaling_plan.html.markdown,r/autoscaling_traffic_source_attachment.html.markdown,r/autoscaling_schedule.html.markdown,r/autoscaling_policy.html.markdown,r/autoscaling_notification.html.markdown,r/autoscaling_lifecycle_hook.html.markdown,r/autoscaling_group_tag.html.markdown,r/autoscaling_group.html.markdown,r/autoscaling_attachment.html.markdown,r/auditmanager_organization_admin_account_registration.html.markdown,r/auditmanager_framework_share.html.markdown,r/auditmanager_framework.html.markdown,r/auditmanager_control.html.markdown,r/auditmanager_assessment_report.html.markdown,r/auditmanager_assessment_delegation.html.markdown,r/auditmanager_assessment.html.markdown,r/auditmanager_account_registration.html.markdown,r/athena_workgroup.html.markdown,r/athena_prepared_statement.html.markdown,r/athena_named_query.html.markdown,r/athena_database.html.markdown,r/athena_data_catalog.html.markdown,r/athena_capacity_reservation.html.markdown,r/appsync_type.html.markdown,r/appsync_source_api_association.html.markdown,r/appsync_resolver.html.markdown,r/appsync_graphql_api.html.markdown,r/appsync_function.html.markdown,r/appsync_domain_name_api_association.html.markdown,r/appsync_domain_name.html.markdown,r/appsync_datasource.html.markdown,r/appsync_channel_namespace.html.markdown,r/appsync_api_key.html.markdown,r/appsync_api_cache.html.markdown,r/appsync_api.html.markdown,r/appstream_user_stack_association.html.markdown,r/appstream_user.html.markdown,r/appstream_stack.html.markdown,r/appstream_image_builder.html.markdown,r/appstream_fleet_stack_association.html.markdown,r/appstream_fleet.html.markdown,r/appstream_directory_config.html.markdown,r/apprunner_vpc_ingress_connection.html.markdown,r/apprunner_vpc_connector.html.markdown,r/apprunner_service.html.markdown,r/apprunner_observability_configuration.html.markdown,r/apprunner_deployment.html.markdown,r/apprunner_default_auto_scaling_configuration_version.html.markdown,r/apprunner_custom_domain_association.html.markdown,r/apprunner_connection.html.markdown,r/apprunner_auto_scaling_configuration_version.html.markdown,r/appmesh_virtual_service.html.markdown,r/appmesh_virtual_router.html.markdown,r/appmesh_virtual_node.html.markdown,r/appmesh_virtual_gateway.html.markdown,r/appmesh_route.html.markdown,r/appmesh_mesh.html.markdown,r/appmesh_gateway_route.html.markdown,r/applicationinsights_application.html.markdown,r/appintegrations_event_integration.html.markdown,r/appintegrations_data_integration.html.markdown,r/appflow_flow.html.markdown,r/appflow_connector_profile.html.markdown,r/appfabric_ingestion_destination.html.markdown,r/appfabric_ingestion.html.markdown,r/appfabric_app_bundle.html.markdown,r/appfabric_app_authorization_connection.html.markdown,r/appfabric_app_authorization.html.markdown,r/appconfig_hosted_configuration_version.html.markdown,r/appconfig_extension_association.html.markdown,r/appconfig_extension.html.markdown,r/appconfig_environment.html.markdown,r/appconfig_deployment_strategy.html.markdown,r/appconfig_deployment.html.markdown,r/appconfig_configuration_profile.html.markdown,r/appconfig_application.html.markdown,r/appautoscaling_target.html.markdown,r/appautoscaling_scheduled_action.html.markdown,r/appautoscaling_policy.html.markdown,r/app_cookie_stickiness_policy.html.markdown,r/apigatewayv2_vpc_link.html.markdown,r/apigatewayv2_stage.html.markdown,r/apigatewayv2_route_response.html.markdown,r/apigatewayv2_route.html.markdown,r/apigatewayv2_model.html.markdown,r/apigatewayv2_integration_response.html.markdown,r/apigatewayv2_integration.html.markdown,r/apigatewayv2_domain_name.html.markdown,r/apigatewayv2_deployment.html.markdown,r/apigatewayv2_authorizer.html.markdown,r/apigatewayv2_api_mapping.html.markdown,r/apigatewayv2_api.html.markdown,r/api_gateway_vpc_link.html.markdown,r/api_gateway_usage_plan_key.html.markdown,r/api_gateway_usage_plan.html.markdown,r/api_gateway_stage.html.markdown,r/api_gateway_rest_api_put.markdown,r/api_gateway_rest_api_policy.html.markdown,r/api_gateway_rest_api.html.markdown,r/api_gateway_resource.html.markdown,r/api_gateway_request_validator.html.markdown,r/api_gateway_model.html.markdown,r/api_gateway_method_settings.html.markdown,r/api_gateway_method_response.html.markdown,r/api_gateway_method.html.markdown,r/api_gateway_integration_response.html.markdown,r/api_gateway_integration.html.markdown,r/api_gateway_gateway_response.html.markdown,r/api_gateway_domain_name_access_association.html.markdown,r/api_gateway_domain_name.html.markdown,r/api_gateway_documentation_version.html.markdown,r/api_gateway_documentation_part.html.markdown,r/api_gateway_deployment.html.markdown,r/api_gateway_client_certificate.html.markdown,r/api_gateway_base_path_mapping.html.markdown,r/api_gateway_authorizer.html.markdown,r/api_gateway_api_key.html.markdown,r/api_gateway_account.html.markdown,r/amplify_webhook.html.markdown,r/amplify_domain_association.html.markdown,r/amplify_branch.html.markdown,r/amplify_backend_environment.html.markdown,r/amplify_app.html.markdown,r/ami_launch_permission.html.markdown,r/ami_from_instance.html.markdown,r/ami_copy.html.markdown,r/ami.html.markdown,r/acmpca_policy.html.markdown,r/acmpca_permission.html.markdown,r/acmpca_certificate_authority_certificate.html.markdown,r/acmpca_certificate_authority.html.markdown,r/acmpca_certificate.html.markdown,r/acm_certificate_validation.html.markdown,r/acm_certificate.html.markdown,r/account_region.markdown,r/account_primary_contact.html.markdown,r/account_alternate_contact.html.markdown,r/accessanalyzer_archive_rule.html.markdown,r/accessanalyzer_analyzer.html.markdown,guides/version-6-upgrade.html.markdown,guides/version-5-upgrade.html.markdown,guides/version-4-upgrade.html.markdown,guides/version-3-upgrade.html.markdown,guides/version-2-upgrade.html.markdown,guides/using-aws-with-awscc-provider.html.markdown,guides/resource-tagging.html.markdown,guides/enhanced-region-support.html.markdown,guides/custom-service-endpoints.html.markdown,guides/continuous-validation-examples.html.markdown,functions/trim_iam_role_path.html.markdown,functions/arn_parse.html.markdown,functions/arn_build.html.markdown,ephemeral-resources/ssm_parameter.html.markdown,ephemeral-resources/secretsmanager_secret_version.html.markdown,ephemeral-resources/secretsmanager_random_password.html.markdown,ephemeral-resources/lambda_invocation.html.markdown,ephemeral-resources/kms_secrets.html.markdown,ephemeral-resources/eks_cluster_auth.html.markdown,ephemeral-resources/cognito_identity_openid_token_for_developer_identity.markdown,d/workspaces_workspace.html.markdown,d/workspaces_image.html.markdown,d/workspaces_directory.html.markdown,d/workspaces_bundle.html.markdown,d/wafv2_web_acl.html.markdown,d/wafv2_rule_group.html.markdown,d/wafv2_regex_pattern_set.html.markdown,d/wafv2_ip_set.html.markdown,d/wafregional_web_acl.html.markdown,d/wafregional_subscribed_rule_group.html.markdown,d/wafregional_rule.html.markdown,d/wafregional_rate_based_rule.html.markdown,d/wafregional_ipset.html.markdown,d/waf_web_acl.html.markdown,d/waf_subscribed_rule_group.html.markdown,d/waf_rule.html.markdown,d/waf_rate_based_rule.html.markdown,d/waf_ipset.html.markdown,d/vpn_gateway.html.markdown,d/vpcs.html.markdown,d/vpclattice_service_network.html.markdown,d/vpclattice_service.html.markdown,d/vpclattice_resource_policy.html.markdown,d/vpclattice_listener.html.markdown,d/vpclattice_auth_policy.html.markdown,d/vpc_security_group_rules.html.markdown,d/vpc_security_group_rule.html.markdown,d/vpc_peering_connections.html.markdown,d/vpc_peering_connection.html.markdown,d/vpc_ipams.html.markdown,d/vpc_ipam_preview_next_cidr.html.markdown,d/vpc_ipam_pools.html.markdown,d/vpc_ipam_pool_cidrs.html.markdown,d/vpc_ipam_pool.html.markdown,d/vpc_ipam.html.markdown,d/vpc_endpoint_service.html.markdown,d/vpc_endpoint_associations.html.markdown,d/vpc_endpoint.html.markdown,d/vpc_dhcp_options.html.markdown,d/vpc.html.markdown,d/verifiedpermissions_policy_store.html.markdown,d/transfer_server.html.markdown,d/transfer_connector.html.markdown,d/timestreamwrite_table.html.markdown,d/timestreamwrite_database.html.markdown,d/synthetics_runtime_versions.html.markdown,d/synthetics_runtime_version.html.markdown,d/subnets.html.markdown,d/subnet.html.markdown,d/storagegateway_local_disk.html.markdown,d/ssoadmin_principal_application_assignments.html.markdown,d/ssoadmin_permission_sets.html.markdown,d/ssoadmin_permission_set.html.markdown,d/ssoadmin_instances.html.markdown,d/ssoadmin_application_providers.html.markdown,d/ssoadmin_application_assignments.html.markdown,d/ssoadmin_application.html.markdown,d/ssmincidents_response_plan.html.markdown,d/ssmincidents_replication_set.html.markdown,d/ssmcontacts_rotation.html.markdown,d/ssmcontacts_plan.html.markdown,d/ssmcontacts_contact_channel.html.markdown,d/ssmcontacts_contact.html.markdown,d/ssm_patch_baselines.html.markdown,d/ssm_patch_baseline.html.markdown,d/ssm_parameters_by_path.html.markdown,d/ssm_parameter.html.markdown,d/ssm_maintenance_windows.html.markdown,d/ssm_instances.html.markdown,d/ssm_document.html.markdown,d/sqs_queues.html.markdown,d/sqs_queue.html.markdown,d/spot_datafeed_subscription.html.markdown,d/sns_topic.html.markdown,d/signer_signing_profile.html.markdown,d/signer_signing_job.html.markdown,d/shield_protection.html.markdown,d/sfn_state_machine_versions.html.markdown,d/sfn_state_machine.html.markdown,d/sfn_alias.html.markdown,d/sfn_activity.html.markdown,d/sesv2_email_identity_mail_from_attributes.html.markdown,d/sesv2_email_identity.html.markdown,d/sesv2_dedicated_ip_pool.html.markdown,d/sesv2_configuration_set.html.markdown,d/ses_email_identity.html.markdown,d/ses_domain_identity.html.markdown,d/ses_active_receipt_rule_set.html.markdown,d/servicequotas_templates.html.markdown,d/servicequotas_service_quota.html.markdown,d/servicequotas_service.html.markdown,d/servicecatalogappregistry_attribute_group_associations.html.markdown,d/servicecatalogappregistry_attribute_group.html.markdown,d/servicecatalogappregistry_application.html.markdown,d/servicecatalog_provisioning_artifacts.html.markdown,d/servicecatalog_product.html.markdown,d/servicecatalog_portfolio_constraints.html.markdown,d/servicecatalog_portfolio.html.markdown,d/servicecatalog_launch_paths.html.markdown,d/servicecatalog_constraint.html.markdown,d/service_principal.html.markdown,d/service_discovery_service.html.markdown,d/service_discovery_http_namespace.html.markdown,d/service_discovery_dns_namespace.html.markdown,d/service.html.markdown,d/serverlessapplicationrepository_application.html.markdown,d/securityhub_standards_control_associations.html.markdown,d/security_groups.html.markdown,d/security_group.html.markdown,d/secretsmanager_secrets.html.markdown,d/secretsmanager_secret_versions.html.markdown,d/secretsmanager_secret_version.html.markdown,d/secretsmanager_secret_rotation.html.markdown,d/secretsmanager_secret.html.markdown,d/secretsmanager_random_password.html.markdown,d/sagemaker_prebuilt_ecr_image.html.markdown,d/s3control_multi_region_access_point.html.markdown,d/s3_objects.html.markdown,d/s3_object.html.markdown,d/s3_directory_buckets.html.markdown,d/s3_bucket_policy.html.markdown,d/s3_bucket_objects.html.markdown,d/s3_bucket_object.html.markdown,d/s3_bucket.html.markdown,d/s3_account_public_access_block.html.markdown,d/s3_access_point.html.markdown,d/route_tables.html.markdown,d/route_table.html.markdown,d/route53profiles_profiles.html.markdown,d/route53_zones.html.markdown,d/route53_zone.html.markdown,d/route53_traffic_policy_document.html.markdown,d/route53_resolver_rules.html.markdown,d/route53_resolver_rule.html.markdown,d/route53_resolver_query_log_config.html.markdown,d/route53_resolver_firewall_rules.html.markdown,d/route53_resolver_firewall_rule_group_association.html.markdown,d/route53_resolver_firewall_rule_group.html.markdown,d/route53_resolver_firewall_domain_list.html.markdown,d/route53_resolver_firewall_config.html.markdown,d/route53_resolver_endpoint.html.markdown,d/route53_records.html.markdown,d/route53_delegation_set.html.markdown,d/route.html.markdown,d/resourcegroupstaggingapi_resources.html.markdown,d/resourceexplorer2_search.html.markdown,d/regions.html.markdown,d/region.html.markdown,d/redshiftserverless_workgroup.html.markdown,d/redshiftserverless_namespace.html.markdown,d/redshiftserverless_credentials.html.markdown,d/redshift_subnet_group.html.markdown,d/redshift_producer_data_shares.html.markdown,d/redshift_orderable_cluster.html.markdown,d/redshift_data_shares.html.markdown,d/redshift_cluster_credentials.html.markdown,d/redshift_cluster.html.markdown,d/rds_reserved_instance_offering.html.markdown,d/rds_orderable_db_instance.html.markdown,d/rds_engine_version.html.markdown,d/rds_clusters.html.markdown,d/rds_cluster_parameter_group.html.markdown,d/rds_cluster.html.markdown,d/rds_certificate.html.markdown,d/ram_resource_share.html.markdown,d/quicksight_user.html.markdown,d/quicksight_theme.html.markdown,d/quicksight_group.html.markdown,d/quicksight_data_set.html.markdown,d/quicksight_analysis.html.markdown,d/qldb_ledger.html.markdown,d/prometheus_workspaces.html.markdown,d/prometheus_workspace.html.markdown,d/prometheus_default_scraper_configuration.html.markdown,d/pricing_product.html.markdown,d/prefix_list.html.markdown,d/polly_voices.html.markdown,d/partition.html.markdown,d/outposts_sites.html.markdown,d/outposts_site.html.markdown,d/outposts_outposts.html.markdown,d/outposts_outpost_instance_types.html.markdown,d/outposts_outpost_instance_type.html.markdown,d/outposts_outpost.html.markdown,d/outposts_assets.html.markdown,d/outposts_asset.html.markdown,d/organizations_resource_tags.html.markdown,d/organizations_policy.html.markdown,d/organizations_policies_for_target.html.markdown,d/organizations_policies.html.markdown,d/organizations_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_organizational_units.html.markdown,d/organizations_organizational_unit_descendant_accounts.html.markdown,d/organizations_organizational_unit_child_accounts.html.markdown,d/organizations_organizational_unit.html.markdown,d/organizations_organization.html.markdown,d/organizations_delegated_services.html.markdown,d/organizations_delegated_administrators.html.markdown,d/opensearchserverless_vpc_endpoint.html.markdown,d/opensearchserverless_security_policy.html.markdown,d/opensearchserverless_security_config.html.markdown,d/opensearchserverless_lifecycle_policy.html.markdown,d/opensearchserverless_collection.html.markdown,d/opensearchserverless_access_policy.html.markdown,d/opensearch_domain.html.markdown,d/oam_sinks.html.markdown,d/oam_sink.html.markdown,d/oam_links.html.markdown,d/oam_link.html.markdown,d/networkmanager_sites.html.markdown,d/networkmanager_site.html.markdown,d/networkmanager_links.html.markdown,d/networkmanager_link.html.markdown,d/networkmanager_global_networks.html.markdown,d/networkmanager_global_network.html.markdown,d/networkmanager_devices.html.markdown,d/networkmanager_device.html.markdown,d/networkmanager_core_network_policy_document.html.markdown,d/networkmanager_connections.html.markdown,d/networkmanager_connection.html.markdown,d/networkfirewall_resource_policy.html.markdown,d/networkfirewall_firewall_policy.html.markdown,d/networkfirewall_firewall.html.markdown,d/network_interfaces.html.markdown,d/network_interface.html.markdown,d/network_acls.html.markdown,d/neptune_orderable_db_instance.html.markdown,d/neptune_engine_version.html.markdown,d/nat_gateways.html.markdown,d/nat_gateway.html.markdown,d/mskconnect_worker_configuration.html.markdown,d/mskconnect_custom_plugin.html.markdown,d/mskconnect_connector.html.markdown,d/msk_vpc_connection.html.markdown,d/msk_kafka_version.html.markdown,d/msk_configuration.html.markdown,d/msk_cluster.html.markdown,d/msk_broker_nodes.html.markdown,d/msk_bootstrap_brokers.html.markdown,d/mq_broker_instance_type_offerings.html.markdown,d/mq_broker_engine_types.html.markdown,d/mq_broker.html.markdown,d/memorydb_user.html.markdown,d/memorydb_subnet_group.html.markdown,d/memorydb_snapshot.html.markdown,d/memorydb_parameter_group.html.markdown,d/memorydb_cluster.html.markdown,d/memorydb_acl.html.markdown,d/medialive_input.html.markdown,d/media_convert_queue.html.markdown,d/location_tracker_associations.html.markdown,d/location_tracker_association.html.markdown,d/location_tracker.html.markdown,d/location_route_calculator.html.markdown,d/location_place_index.html.markdown,d/location_map.html.markdown,d/location_geofence_collection.html.markdown,d/licensemanager_received_licenses.html.markdown,d/licensemanager_received_license.html.markdown,d/licensemanager_grants.html.markdown,d/lex_slot_type.html.markdown,d/lex_intent.html.markdown,d/lex_bot_alias.html.markdown,d/lex_bot.html.markdown,d/lbs.html.markdown,d/lb_trust_store.html.markdown,d/lb_target_group.html.markdown,d/lb_listener_rule.html.markdown,d/lb_listener.html.markdown,d/lb_hosted_zone_id.html.markdown,d/lb.html.markdown,d/launch_template.html.markdown,d/launch_configuration.html.markdown,d/lambda_layer_version.html.markdown,d/lambda_invocation.html.markdown,d/lambda_functions.html.markdown,d/lambda_function_url.html.markdown,d/lambda_function.html.markdown,d/lambda_code_signing_config.html.markdown,d/lambda_alias.html.markdown,d/lakeformation_resource.html.markdown,d/lakeformation_permissions.html.markdown,d/lakeformation_data_lake_settings.html.markdown,d/kms_secrets.html.markdown,d/kms_secret.html.markdown,d/kms_public_key.html.markdown,d/kms_key.html.markdown,d/kms_custom_key_store.html.markdown,d/kms_ciphertext.html.markdown,d/kms_alias.html.markdown,d/kinesis_stream_consumer.html.markdown,d/kinesis_stream.html.markdown,d/kinesis_firehose_delivery_stream.html.markdown,d/key_pair.html.markdown,d/kendra_thesaurus.html.markdown,d/kendra_query_suggestions_block_list.html.markdown,d/kendra_index.html.markdown,d/kendra_faq.html.markdown,d/kendra_experience.html.markdown,d/ivs_stream_key.html.markdown,d/ip_ranges.html.markdown,d/iot_registration_code.html.markdown,d/iot_endpoint.html.markdown,d/internet_gateway.html.markdown,d/instances.html.markdown,d/instance.html.markdown,d/inspector_rules_packages.html.markdown,d/imagebuilder_infrastructure_configurations.html.markdown,d/imagebuilder_infrastructure_configuration.html.markdown,d/imagebuilder_image_recipes.html.markdown,d/imagebuilder_image_recipe.html.markdown,d/imagebuilder_image_pipelines.html.markdown,d/imagebuilder_image_pipeline.html.markdown,d/imagebuilder_image.html.markdown,d/imagebuilder_distribution_configurations.html.markdown,d/imagebuilder_distribution_configuration.html.markdown,d/imagebuilder_container_recipes.html.markdown,d/imagebuilder_container_recipe.html.markdown,d/imagebuilder_components.html.markdown,d/imagebuilder_component.html.markdown,d/identitystore_users.html.markdown,d/identitystore_user.html.markdown,d/identitystore_groups.html.markdown,d/identitystore_group_memberships.html.markdown,d/identitystore_group.html.markdown,d/iam_users.html.markdown,d/iam_user_ssh_key.html.markdown,d/iam_user.html.markdown,d/iam_session_context.html.markdown,d/iam_server_certificate.html.markdown,d/iam_saml_provider.html.markdown,d/iam_roles.html.markdown,d/iam_role.html.markdown,d/iam_principal_policy_simulation.html.markdown,d/iam_policy_document.html.markdown,d/iam_policy.html.markdown,d/iam_openid_connect_provider.html.markdown,d/iam_instance_profiles.html.markdown,d/iam_instance_profile.html.markdown,d/iam_group.html.markdown,d/iam_account_alias.html.markdown,d/iam_access_keys.html.markdown,d/guardduty_finding_ids.html.markdown,d/guardduty_detector.html.markdown,d/grafana_workspace.html.markdown,d/glue_script.html.markdown,d/glue_registry.html.markdown,d/glue_data_catalog_encryption_settings.html.markdown,d/glue_connection.html.markdown,d/glue_catalog_table.html.markdown,d/globalaccelerator_custom_routing_accelerator.html.markdown,d/globalaccelerator_accelerator.html.markdown,d/fsx_windows_file_system.html.markdown,d/fsx_openzfs_snapshot.html.markdown,d/fsx_ontap_storage_virtual_machines.html.markdown,d/fsx_ontap_storage_virtual_machine.html.markdown,d/fsx_ontap_file_system.html.markdown,d/fis_experiment_templates.html.markdown,d/emrcontainers_virtual_cluster.html.markdown,d/emr_supported_instance_types.html.markdown,d/emr_release_labels.html.markdown,d/elb_service_account.html.markdown,d/elb_hosted_zone_id.html.markdown,d/elb.html.markdown,d/elasticsearch_domain.html.markdown,d/elasticache_user.html.markdown,d/elasticache_subnet_group.html.markdown,d/elasticache_serverless_cache.html.markdown,d/elasticache_reserved_cache_node_offering.html.markdown,d/elasticache_replication_group.html.markdown,d/elasticache_cluster.html.markdown,d/elastic_beanstalk_solution_stack.html.markdown,d/elastic_beanstalk_hosted_zone.html.markdown,d/elastic_beanstalk_application.html.markdown,d/eks_node_groups.html.markdown,d/eks_node_group.html.markdown,d/eks_clusters.html.markdown,d/eks_cluster_versions.html.markdown,d/eks_cluster_auth.html.markdown,d/eks_cluster.html.markdown,d/eks_addon_version.html.markdown,d/eks_addon.html.markdown,d/eks_access_entry.html.markdown,d/eips.html.markdown,d/eip.html.markdown,d/efs_mount_target.html.markdown,d/efs_file_system.html.markdown,d/efs_access_points.html.markdown,d/efs_access_point.html.markdown,d/ecs_task_execution.html.markdown,d/ecs_task_definition.html.markdown,d/ecs_service.html.markdown,d/ecs_container_definition.html.markdown,d/ecs_clusters.html.markdown,d/ecs_cluster.html.markdown,d/ecrpublic_authorization_token.html.markdown,d/ecr_repository_creation_template.html.markdown,d/ecr_repository.html.markdown,d/ecr_repositories.html.markdown,d/ecr_pull_through_cache_rule.html.markdown,d/ecr_lifecycle_policy_document.html.markdown,d/ecr_images.html.markdown,d/ecr_image.html.markdown,d/ecr_authorization_token.html.markdown,d/ec2_transit_gateway_vpn_attachment.html.markdown,d/ec2_transit_gateway_vpc_attachments.html.markdown,d/ec2_transit_gateway_vpc_attachment.html.markdown,d/ec2_transit_gateway_route_tables.html.markdown,d/ec2_transit_gateway_route_table_routes.html.markdown,d/ec2_transit_gateway_route_table_propagations.html.markdown,d/ec2_transit_gateway_route_table_associations.html.markdown,d/ec2_transit_gateway_route_table.html.markdown,d/ec2_transit_gateway_peering_attachments.html.markdown,d/ec2_transit_gateway_peering_attachment.html.markdown,d/ec2_transit_gateway_multicast_domain.html.markdown,d/ec2_transit_gateway_dx_gateway_attachment.html.markdown,d/ec2_transit_gateway_connect_peer.html.markdown,d/ec2_transit_gateway_connect.html.markdown,d/ec2_transit_gateway_attachments.html.markdown,d/ec2_transit_gateway_attachment.html.markdown,d/ec2_transit_gateway.html.markdown,d/ec2_spot_price.html.markdown,d/ec2_serial_console_access.html.markdown,d/ec2_public_ipv4_pools.html.markdown,d/ec2_public_ipv4_pool.html.markdown,d/ec2_network_insights_path.html.markdown,d/ec2_network_insights_analysis.html.markdown,d/ec2_managed_prefix_lists.html.markdown,d/ec2_managed_prefix_list.html.markdown,d/ec2_local_gateways.html.markdown,d/ec2_local_gateway_virtual_interface_groups.html.markdown,d/ec2_local_gateway_virtual_interface_group.html.markdown,d/ec2_local_gateway_virtual_interface.html.markdown,d/ec2_local_gateway_route_tables.html.markdown,d/ec2_local_gateway_route_table.html.markdown,d/ec2_local_gateway.html.markdown,d/ec2_instance_types.html.markdown,d/ec2_instance_type_offerings.html.markdown,d/ec2_instance_type_offering.html.markdown,d/ec2_instance_type.html.markdown,d/ec2_host.html.markdown,d/ec2_coip_pools.html.markdown,d/ec2_coip_pool.html.markdown,d/ec2_client_vpn_endpoint.html.markdown,d/ec2_capacity_block_offering.html.markdown,d/ebs_volumes.html.markdown,d/ebs_volume.html.markdown,d/ebs_snapshot_ids.html.markdown,d/ebs_snapshot.html.markdown,d/ebs_encryption_by_default.html.markdown,d/ebs_default_kms_key.html.markdown,d/dynamodb_tables.html.markdown,d/dynamodb_table_item.html.markdown,d/dynamodb_table.html.markdown,d/dx_router_configuration.html.markdown,d/dx_locations.html.markdown,d/dx_location.html.markdown,d/dx_gateway.html.markdown,d/dx_connection.html.markdown,d/docdb_orderable_db_instance.html.markdown,d/docdb_engine_version.html.markdown,d/dms_replication_task.html.markdown,d/dms_replication_subnet_group.html.markdown,d/dms_replication_instance.html.markdown,d/dms_endpoint.html.markdown,d/dms_certificate.html.markdown,d/directory_service_directory.html.markdown,d/devopsguru_resource_collection.html.markdown,d/devopsguru_notification_channel.html.markdown,d/default_tags.html.markdown,d/db_subnet_group.html.markdown,d/db_snapshot.html.markdown,d/db_proxy.html.markdown,d/db_parameter_group.html.markdown,d/db_instances.html.markdown,d/db_instance.html.markdown,d/db_event_categories.html.markdown,d/db_cluster_snapshot.html.markdown,d/datazone_environment_blueprint.html.markdown,d/datazone_domain.html.markdown,d/datapipeline_pipeline_definition.html.markdown,d/datapipeline_pipeline.html.markdown,d/customer_gateway.html.markdown,d/cur_report_definition.html.markdown,d/controltower_controls.html.markdown,d/connect_vocabulary.html.markdown,d/connect_user_hierarchy_structure.html.markdown,d/connect_user_hierarchy_group.html.markdown,d/connect_user.html.markdown,d/connect_security_profile.html.markdown,d/connect_routing_profile.html.markdown,d/connect_quick_connect.html.markdown,d/connect_queue.html.markdown,d/connect_prompt.html.markdown,d/connect_lambda_function_association.html.markdown,d/connect_instance_storage_config.html.markdown,d/connect_instance.html.markdown,d/connect_hours_of_operation.html.markdown,d/connect_contact_flow_module.html.markdown,d/connect_contact_flow.html.markdown,d/connect_bot_association.html.markdown,d/cognito_user_pools.html.markdown,d/cognito_user_pool_signing_certificate.html.markdown,d/cognito_user_pool_clients.html.markdown,d/cognito_user_pool_client.html.markdown,d/cognito_user_pool.html.markdown,d/cognito_user_groups.html.markdown,d/cognito_user_group.html.markdown,d/cognito_identity_pool.html.markdown,d/codestarconnections_connection.html.markdown,d/codeguruprofiler_profiling_group.html.markdown,d/codecommit_repository.html.markdown,d/codecommit_approval_rule_template.html.markdown,d/codecatalyst_dev_environment.html.markdown,d/codebuild_fleet.html.markdown,d/codeartifact_repository_endpoint.html.markdown,d/codeartifact_authorization_token.html.markdown,d/cloudwatch_log_groups.html.markdown,d/cloudwatch_log_group.html.markdown,d/cloudwatch_log_data_protection_policy_document.html.markdown,d/cloudwatch_event_source.html.markdown,d/cloudwatch_event_connection.html.markdown,d/cloudwatch_event_buses.html.markdown,d/cloudwatch_event_bus.html.markdown,d/cloudwatch_contributor_managed_insight_rules.html.markdown,d/cloudtrail_service_account.html.markdown,d/cloudhsm_v2_cluster.html.markdown,d/cloudfront_response_headers_policy.html.markdown,d/cloudfront_realtime_log_config.html.markdown,d/cloudfront_origin_request_policy.html.markdown,d/cloudfront_origin_access_identity.html.markdown,d/cloudfront_origin_access_identities.html.markdown,d/cloudfront_origin_access_control.html.markdown,d/cloudfront_log_delivery_canonical_user_id.html.markdown,d/cloudfront_function.html.markdown,d/cloudfront_distribution.html.markdown,d/cloudfront_cache_policy.html.markdown,d/cloudformation_type.html.markdown,d/cloudformation_stack.html.markdown,d/cloudformation_export.html.markdown,d/cloudcontrolapi_resource.html.markdown,d/chatbot_slack_workspace.html.markdown,d/ce_tags.html.markdown,d/ce_cost_category.html.markdown,d/canonical_user_id.html.markdown,d/caller_identity.html.markdown,d/budgets_budget.html.markdown,d/billing_service_account.html.markdown,d/bedrockagent_agent_versions.html.markdown,d/bedrock_inference_profiles.html.markdown,d/bedrock_inference_profile.html.markdown,d/bedrock_foundation_models.html.markdown,d/bedrock_foundation_model.html.markdown,d/bedrock_custom_models.html.markdown,d/bedrock_custom_model.html.markdown,d/batch_scheduling_policy.html.markdown,d/batch_job_queue.html.markdown,d/batch_job_definition.html.markdown,d/batch_compute_environment.html.markdown,d/backup_vault.html.markdown,d/backup_selection.html.markdown,d/backup_report_plan.html.markdown,d/backup_plan.html.markdown,d/backup_framework.html.markdown,d/availability_zones.html.markdown,d/availability_zone.html.markdown,d/autoscaling_groups.html.markdown,d/autoscaling_group.html.markdown,d/auditmanager_framework.html.markdown,d/auditmanager_control.html.markdown,d/athena_named_query.html.markdown,d/arn.html.markdown,d/appstream_image.html.markdown,d/apprunner_hosted_zone_id.html.markdown,d/appmesh_virtual_service.html.markdown,d/appmesh_virtual_router.html.markdown,d/appmesh_virtual_node.html.markdown,d/appmesh_virtual_gateway.html.markdown,d/appmesh_route.html.markdown,d/appmesh_mesh.html.markdown,d/appmesh_gateway_route.html.markdown,d/appintegrations_event_integration.html.markdown,d/appconfig_environments.html.markdown,d/appconfig_environment.html.markdown,d/appconfig_configuration_profiles.html.markdown,d/appconfig_configuration_profile.html.markdown,d/apigatewayv2_vpc_link.html.markdown,d/apigatewayv2_export.html.markdown,d/apigatewayv2_apis.html.markdown,d/apigatewayv2_api.html.markdown,d/api_gateway_vpc_link.html.markdown,d/api_gateway_sdk.html.markdown,d/api_gateway_rest_api.html.markdown,d/api_gateway_resource.html.markdown,d/api_gateway_export.html.markdown,d/api_gateway_domain_name.html.markdown,d/api_gateway_authorizers.html.markdown,d/api_gateway_authorizer.html.markdown,d/api_gateway_api_keys.html.markdown,d/api_gateway_api_key.html.markdown,d/ami_ids.html.markdown,d/ami.html.markdown,d/acmpca_certificate_authority.html.markdown,d/acmpca_certificate.html.markdown,d/acm_certificate.html.markdown,d/account_primary_contact.html.markdown --- .../d/ec2_client_vpn_endpoint.html.markdown | 4 +- .../python/d/efs_mount_target.html.markdown | 4 +- .../python/d/lambda_function.html.markdown | 3 +- .../d/sesv2_email_identity.html.markdown | 3 +- .../custom-service-endpoints.html.markdown | 3 +- .../r/batch_compute_environment.html.markdown | 4 +- .../r/batch_job_definition.html.markdown | 4 +- .../python/r/datazone_domain.html.markdown | 127 +++++- .../r/dlm_lifecycle_policy.html.markdown | 134 ++++++- .../r/dx_hosted_connection.html.markdown | 4 +- ...ynamodb_contributor_insights.html.markdown | 3 +- .../r/ec2_client_vpn_endpoint.html.markdown | 6 +- .../r/ecr_lifecycle_policy.html.markdown | 28 +- .../python/r/ecr_repository.html.markdown | 28 +- .../r/ecr_repository_policy.html.markdown | 28 +- .../cdktf/python/r/ecs_service.html.markdown | 30 +- .../python/r/efs_mount_target.html.markdown | 4 +- ...che_global_replication_group.html.markdown | 22 +- .../cdktf/python/r/instance.html.markdown | 28 +- .../cdktf/python/r/kms_alias.html.markdown | 28 +- .../python/r/kms_external_key.html.markdown | 7 +- .../docs/cdktf/python/r/kms_key.html.markdown | 28 +- .../python/r/lambda_function.html.markdown | 3 +- website/docs/cdktf/python/r/lb.html.markdown | 3 +- ...cksight_account_subscription.html.markdown | 4 +- .../docs/cdktf/python/r/route.html.markdown | 42 +- .../r/route53_resolver_rule.html.markdown | 32 +- ...53_resolver_rule_association.html.markdown | 28 +- .../cdktf/python/r/route_table.html.markdown | 28 +- .../r/s3tables_table_bucket.html.markdown | 5 +- ...ecretsmanager_secret_version.html.markdown | 30 +- .../r/sesv2_email_identity.html.markdown | 3 +- .../cdktf/python/r/sqs_queue.html.markdown | 4 +- .../python/r/ssm_association.html.markdown | 32 +- .../cdktf/python/r/ssm_document.html.markdown | 28 +- .../r/ssm_maintenance_window.html.markdown | 32 +- ...sm_maintenance_window_target.html.markdown | 30 +- .../ssm_maintenance_window_task.html.markdown | 34 +- .../python/r/ssm_parameter.html.markdown | 32 +- .../python/r/ssm_patch_baseline.html.markdown | 28 +- ...imestreaminfluxdb_db_cluster.html.markdown | 337 ++++++++++++++++ ...mestreaminfluxdb_db_instance.html.markdown | 4 +- ...browser_settings_association.html.markdown | 97 +++++ ...tection_settings_association.html.markdown | 84 ++++ ...kspacesweb_identity_provider.html.markdown | 160 ++++++++ ..._access_settings_association.html.markdown | 88 +++++ ...network_settings_association.html.markdown | 147 +++++++ .../r/workspacesweb_portal.html.markdown | 146 +++++++ ...workspacesweb_session_logger.html.markdown | 257 +++++++++++++ ...b_session_logger_association.html.markdown | 134 +++++++ .../r/workspacesweb_trust_store.html.markdown | 119 ++++++ ...sweb_trust_store_association.html.markdown | 92 +++++ ...logging_settings_association.html.markdown | 92 +++++ ...eb_user_settings_association.html.markdown | 88 +++++ .../d/ec2_client_vpn_endpoint.html.markdown | 4 +- .../d/efs_mount_target.html.markdown | 4 +- .../d/lambda_function.html.markdown | 3 +- .../d/sesv2_email_identity.html.markdown | 3 +- .../custom-service-endpoints.html.markdown | 3 +- .../r/batch_compute_environment.html.markdown | 6 +- .../r/batch_job_definition.html.markdown | 4 +- .../r/datazone_domain.html.markdown | 170 +++++++- .../r/dlm_lifecycle_policy.html.markdown | 145 ++++++- .../r/dx_hosted_connection.html.markdown | 4 +- ...ynamodb_contributor_insights.html.markdown | 3 +- .../r/ec2_client_vpn_endpoint.html.markdown | 6 +- .../r/ecr_lifecycle_policy.html.markdown | 28 +- .../typescript/r/ecr_repository.html.markdown | 28 +- .../r/ecr_repository_policy.html.markdown | 28 +- .../typescript/r/ecs_service.html.markdown | 33 +- .../r/efs_mount_target.html.markdown | 4 +- ...che_global_replication_group.html.markdown | 21 +- .../cdktf/typescript/r/instance.html.markdown | 28 +- .../typescript/r/kms_alias.html.markdown | 28 +- .../r/kms_external_key.html.markdown | 7 +- .../cdktf/typescript/r/kms_key.html.markdown | 28 +- .../r/lambda_function.html.markdown | 3 +- .../docs/cdktf/typescript/r/lb.html.markdown | 3 +- ...cksight_account_subscription.html.markdown | 4 +- .../cdktf/typescript/r/route.html.markdown | 42 +- .../r/route53_resolver_rule.html.markdown | 32 +- ...53_resolver_rule_association.html.markdown | 28 +- .../typescript/r/route_table.html.markdown | 28 +- .../r/s3tables_table_bucket.html.markdown | 5 +- ...ecretsmanager_secret_version.html.markdown | 30 +- .../r/sesv2_email_identity.html.markdown | 3 +- .../typescript/r/sqs_queue.html.markdown | 4 +- .../r/ssm_association.html.markdown | 32 +- .../typescript/r/ssm_document.html.markdown | 28 +- .../r/ssm_maintenance_window.html.markdown | 32 +- ...sm_maintenance_window_target.html.markdown | 30 +- .../ssm_maintenance_window_task.html.markdown | 34 +- .../typescript/r/ssm_parameter.html.markdown | 32 +- .../r/ssm_patch_baseline.html.markdown | 28 +- ...imestreaminfluxdb_db_cluster.html.markdown | 364 ++++++++++++++++++ ...mestreaminfluxdb_db_instance.html.markdown | 4 +- ...browser_settings_association.html.markdown | 114 ++++++ ...tection_settings_association.html.markdown | 100 +++++ ...kspacesweb_identity_provider.html.markdown | 173 +++++++++ ..._access_settings_association.html.markdown | 105 +++++ ...network_settings_association.html.markdown | 171 ++++++++ .../r/workspacesweb_portal.html.markdown | 164 ++++++++ ...workspacesweb_session_logger.html.markdown | 309 +++++++++++++++ ...b_session_logger_association.html.markdown | 165 ++++++++ .../r/workspacesweb_trust_store.html.markdown | 135 +++++++ ...sweb_trust_store_association.html.markdown | 108 ++++++ ...logging_settings_association.html.markdown | 112 ++++++ ...eb_user_settings_association.html.markdown | 104 +++++ 108 files changed, 5708 insertions(+), 179 deletions(-) create mode 100644 website/docs/cdktf/python/r/timestreaminfluxdb_db_cluster.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_browser_settings_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_data_protection_settings_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_identity_provider.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_ip_access_settings_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_network_settings_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_portal.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_session_logger.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_session_logger_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_trust_store.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_trust_store_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_user_access_logging_settings_association.html.markdown create mode 100644 website/docs/cdktf/python/r/workspacesweb_user_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/timestreaminfluxdb_db_cluster.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_browser_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_data_protection_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_identity_provider.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_ip_access_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_network_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_portal.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_session_logger.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_session_logger_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_trust_store.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_trust_store_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_user_access_logging_settings_association.html.markdown create mode 100644 website/docs/cdktf/typescript/r/workspacesweb_user_settings_association.html.markdown diff --git a/website/docs/cdktf/python/d/ec2_client_vpn_endpoint.html.markdown b/website/docs/cdktf/python/d/ec2_client_vpn_endpoint.html.markdown index c31fe2281bc8..f6ecee46fa93 100644 --- a/website/docs/cdktf/python/d/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/cdktf/python/d/ec2_client_vpn_endpoint.html.markdown @@ -88,12 +88,14 @@ This data source exports the following attributes in addition to the arguments a * `description` - Brief description of the endpoint. * `dns_name` - DNS name to be used by clients when connecting to the Client VPN endpoint. * `dns_servers` - Information about the DNS servers to be used for DNS resolution. +* `endpoint_ip_address_type` - IP address type for the Client VPN endpoint. * `security_group_ids` - IDs of the security groups for the target network associated with the Client VPN endpoint. * `self_service_portal` - Whether the self-service portal for the Client VPN endpoint is enabled. * `self_service_portal_url` - The URL of the self-service portal. * `server_certificate_arn` - The ARN of the server certificate. * `session_timeout_hours` - The maximum VPN session duration time in hours. * `split_tunnel` - Whether split-tunnel is enabled in the AWS Client VPN endpoint. +* `traffic_ip_address_type` - IP address type for traffic within the Client VPN tunnel. * `transport_protocol` - Transport protocol used by the Client VPN endpoint. * `vpc_id` - ID of the VPC associated with the Client VPN endpoint. * `vpn_port` - Port number for the Client VPN endpoint. @@ -104,4 +106,4 @@ This data source exports the following attributes in addition to the arguments a - `read` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/efs_mount_target.html.markdown b/website/docs/cdktf/python/d/efs_mount_target.html.markdown index 4891304c9b37..e94c19b06906 100644 --- a/website/docs/cdktf/python/d/efs_mount_target.html.markdown +++ b/website/docs/cdktf/python/d/efs_mount_target.html.markdown @@ -53,6 +53,8 @@ This data source exports the following attributes in addition to the arguments a * `file_system_arn` - Amazon Resource Name of the file system for which the mount target is intended. * `subnet_id` - ID of the mount target's subnet. * `ip_address` - Address at which the file system may be mounted via the mount target. +* `ip_address_type` - IP address type for the mount target. +* `ipv6_address` - IPv6 address at which the file system may be mounted via the mount target. * `security_groups` - List of VPC security group IDs attached to the mount target. * `dns_name` - DNS name for the EFS file system. * `mount_target_dns_name` - The DNS name for the given subnet/AZ per [documented convention](http://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-cmd-dns-name.html). @@ -61,4 +63,4 @@ This data source exports the following attributes in addition to the arguments a * `availability_zone_id` - The unique and consistent identifier of the Availability Zone (AZ) that the mount target resides in. * `owner_id` - AWS account ID that owns the resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/lambda_function.html.markdown b/website/docs/cdktf/python/d/lambda_function.html.markdown index 2cde598df174..864ece1352b5 100644 --- a/website/docs/cdktf/python/d/lambda_function.html.markdown +++ b/website/docs/cdktf/python/d/lambda_function.html.markdown @@ -182,6 +182,7 @@ This data source exports the following attributes in addition to the arguments a * `signing_profile_version_arn` - ARN for a signing profile version. * `source_code_hash` - (**Deprecated** use `code_sha256` instead) Base64-encoded representation of raw SHA-256 sum of the zip file. * `source_code_size` - Size in bytes of the function .zip file. +* `source_kms_key_arn` - ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. * `tags` - Map of tags assigned to the Lambda Function. * `timeout` - Function execution time at which Lambda should terminate the function. * `tracing_config` - Tracing settings of the function. [See below](#tracing_config-attribute-reference). @@ -222,4 +223,4 @@ This data source exports the following attributes in addition to the arguments a * `subnet_ids` - List of subnet IDs associated with the Lambda function. * `vpc_id` - ID of the VPC. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/sesv2_email_identity.html.markdown b/website/docs/cdktf/python/d/sesv2_email_identity.html.markdown index 11a7a62edfb6..bc31bd256fea 100644 --- a/website/docs/cdktf/python/d/sesv2_email_identity.html.markdown +++ b/website/docs/cdktf/python/d/sesv2_email_identity.html.markdown @@ -54,6 +54,7 @@ This data source exports the following attributes in addition to the arguments a * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identity_type` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags` - Key-value mapping of resource tags. +* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verified_for_sending_status` - Specifies whether or not the identity is verified. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown b/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown index 21e16d2a0380..e9cd17638338 100644 --- a/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown +++ b/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown @@ -126,6 +126,7 @@ class MyConvertedCode(TerraformStack): |App Runner|`apprunner`|`AWS_ENDPOINT_URL_APPRUNNER`|`apprunner`| |AppStream 2.0|`appstream`|`AWS_ENDPOINT_URL_APPSTREAM`|`appstream`| |AppSync|`appsync`|`AWS_ENDPOINT_URL_APPSYNC`|`appsync`| +|Application Resilience Controller Region Switch|`arcregionswitch`|`AWS_ENDPOINT_URL_ARC_REGION_SWITCH`|`arc_region_switch`| |Athena|`athena`|`AWS_ENDPOINT_URL_ATHENA`|`athena`| |Audit Manager|`auditmanager`|`AWS_ENDPOINT_URL_AUDITMANAGER`|`auditmanager`| |Auto Scaling|`autoscaling`|`AWS_ENDPOINT_URL_AUTO_SCALING`|`auto_scaling`| @@ -459,4 +460,4 @@ class MyConvertedCode(TerraformStack): ) ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/batch_compute_environment.html.markdown b/website/docs/cdktf/python/r/batch_compute_environment.html.markdown index 9ccf2c4d962d..8b071a11747d 100644 --- a/website/docs/cdktf/python/r/batch_compute_environment.html.markdown +++ b/website/docs/cdktf/python/r/batch_compute_environment.html.markdown @@ -266,7 +266,7 @@ This resource supports the following arguments: `update_policy` supports the following: * `job_execution_timeout_minutes` - (Required) Specifies the job timeout (in minutes) when the compute environment infrastructure is updated. -* `terminate_jobs_on_update` - (Required) Specifies whether jobs are automatically terminated when the computer environment infrastructure is updated. +* `terminate_jobs_on_update` - (Required) Specifies whether jobs are automatically terminated when the compute environment infrastructure is updated. ## Attribute Reference @@ -307,4 +307,4 @@ Using `terraform import`, import AWS Batch compute using the `name`. For example [2]: http://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html [3]: http://docs.aws.amazon.com/batch/latest/userguide/troubleshooting.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/batch_job_definition.html.markdown b/website/docs/cdktf/python/r/batch_job_definition.html.markdown index a49aa00dfbc8..ea89c014b5da 100644 --- a/website/docs/cdktf/python/r/batch_job_definition.html.markdown +++ b/website/docs/cdktf/python/r/batch_job_definition.html.markdown @@ -369,7 +369,7 @@ The following arguments are optional: #### eks_metadata -* `labels` - Key-value pairs used to identify, sort, and organize cube resources. +* `labels` - Key-value pairs used to identify, sort, and organize kubernetes resources. #### `eks_secret` @@ -426,4 +426,4 @@ Using `terraform import`, import Batch Job Definition using the `arn`. For examp % terraform import aws_batch_job_definition.test arn:aws:batch:us-east-1:123456789012:job-definition/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datazone_domain.html.markdown b/website/docs/cdktf/python/r/datazone_domain.html.markdown index 376ba2626951..c81ca6cea5ed 100644 --- a/website/docs/cdktf/python/r/datazone_domain.html.markdown +++ b/website/docs/cdktf/python/r/datazone_domain.html.markdown @@ -26,6 +26,7 @@ from cdktf import Fn, Token, TerraformStack # from imports.aws.datazone_domain import DatazoneDomain from imports.aws.iam_role import IamRole +from imports.aws.iam_role_policy import IamRolePolicy class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) @@ -48,28 +49,122 @@ class MyConvertedCode(TerraformStack): ], "Version": "2012-10-17" })), - inline_policy=[IamRoleInlinePolicy( - name="domain_execution_policy", - policy=Token.as_string( - Fn.jsonencode({ - "Statement": [{ - "Action": ["datazone:*", "ram:*", "sso:*", "kms:*"], - "Effect": "Allow", - "Resource": "*" - } - ], - "Version": "2012-10-17" - })) - ) - ], name="my_domain_execution_role" ) + aws_iam_role_policy_domain_execution_role = IamRolePolicy(self, "domain_execution_role_1", + policy=Token.as_string( + Fn.jsonencode({ + "Statement": [{ + "Action": ["datazone:*", "ram:*", "sso:*", "kms:*"], + "Effect": "Allow", + "Resource": "*" + } + ], + "Version": "2012-10-17" + })), + role=domain_execution_role.name + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_policy_domain_execution_role.override_logical_id("domain_execution_role") DatazoneDomain(self, "example", domain_execution_role=domain_execution_role.arn, name="example" ) ``` +### V2 Domain + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_caller_identity import DataAwsCallerIdentity +from imports.aws.data_aws_iam_policy import DataAwsIamPolicy +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.datazone_domain import DatazoneDomain +from imports.aws.iam_role import IamRole +from imports.aws.iam_role_policy_attachment import IamRolePolicyAttachment +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + current = DataAwsCallerIdentity(self, "current") + domain_execution_role = DataAwsIamPolicy(self, "domain_execution_role", + name="SageMakerStudioDomainExecutionRolePolicy" + ) + domain_service_role = DataAwsIamPolicy(self, "domain_service_role", + name="SageMakerStudioDomainServiceRolePolicy" + ) + assume_role_domain_execution = DataAwsIamPolicyDocument(self, "assume_role_domain_execution", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["sts:AssumeRole", "sts:TagSession", "sts:SetContext"], + condition=[DataAwsIamPolicyDocumentStatementCondition( + test="StringEquals", + values=[Token.as_string(current.account_id)], + variable="aws:SourceAccount" + ), DataAwsIamPolicyDocumentStatementCondition( + test="ForAllValues:StringLike", + values=["datazone*"], + variable="aws:TagKeys" + ) + ], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["datazone.amazonaws.com"], + type="Service" + ) + ] + ) + ] + ) + assume_role_domain_service = DataAwsIamPolicyDocument(self, "assume_role_domain_service", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["sts:AssumeRole"], + condition=[DataAwsIamPolicyDocumentStatementCondition( + test="StringEquals", + values=[Token.as_string(current.account_id)], + variable="aws:SourceAccount" + ) + ], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["datazone.amazonaws.com"], + type="Service" + ) + ] + ) + ] + ) + domain_execution = IamRole(self, "domain_execution", + assume_role_policy=Token.as_string(assume_role_domain_execution.json), + name="example-domain-execution-role" + ) + domain_service = IamRole(self, "domain_service", + assume_role_policy=Token.as_string(assume_role_domain_service.json), + name="example-domain-service-role" + ) + aws_iam_role_policy_attachment_domain_execution = + IamRolePolicyAttachment(self, "domain_execution_7", + policy_arn=Token.as_string(domain_execution_role.arn), + role=domain_execution.name + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_policy_attachment_domain_execution.override_logical_id("domain_execution") + aws_iam_role_policy_attachment_domain_service = IamRolePolicyAttachment(self, "domain_service_8", + policy_arn=Token.as_string(domain_service_role.arn), + role=domain_service.name + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_policy_attachment_domain_service.override_logical_id("domain_service") + DatazoneDomain(self, "example", + domain_execution_role=domain_execution.arn, + domain_version="V2", + name="example-domain", + service_role=domain_service.arn + ) +``` + ## Argument Reference The following arguments are required: @@ -81,7 +176,9 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `description` - (Optional) Description of the Domain. +* `domain_version` - (Optional) Version of the Domain. Valid values are `V1` and `V2`. Defaults to `V1`. * `kms_key_identifier` - (Optional) ARN of the KMS key used to encrypt the Amazon DataZone domain, metadata and reporting data. +* `service_role` - (Optional) ARN of the service role used by DataZone. Required when `domain_version` is set to `V2`. * `single_sign_on` - (Optional) Single sign on options, used to [enable AWS IAM Identity Center](https://docs.aws.amazon.com/datazone/latest/userguide/enable-IAM-identity-center-for-datazone.html) for DataZone. * `skip_deletion_check` - (Optional) Whether to skip the deletion check for the Domain. @@ -126,4 +223,4 @@ Using `terraform import`, import DataZone Domain using the `domain_id`. For exam % terraform import aws_datazone_domain.example domain-id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown b/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown index e378f14f5dc1..cca8feecf54b 100644 --- a/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/python/r/dlm_lifecycle_policy.html.markdown @@ -96,6 +96,39 @@ class MyConvertedCode(TerraformStack): ) ``` +### Example Default Policy + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.dlm_lifecycle_policy import DlmLifecyclePolicy +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + DlmLifecyclePolicy(self, "example", + default_policy="VOLUME", + description="tf-acc-basic", + execution_role_arn=Token.as_string(aws_iam_role_example.arn), + policy_details=DlmLifecyclePolicyPolicyDetails( + create_interval=5, + exclusions=DlmLifecyclePolicyPolicyDetailsExclusions( + exclude_boot_volumes=False, + exclude_tags={ + "test": "exclude" + }, + exclude_volume_types=["gp2"] + ), + policy_language="SIMPLIFIED", + resource_type="VOLUME" + ) + ) +``` + ### Example Cross-Region Snapshot Copy Usage ```python @@ -231,6 +264,58 @@ class MyConvertedCode(TerraformStack): aws_iam_role_policy_attachment_example.override_logical_id("example") ``` +### Example Post/Pre Scripts + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_iam_policy import DataAwsIamPolicy +from imports.aws.dlm_lifecycle_policy import DlmLifecyclePolicy +from imports.aws.iam_role_policy_attachment import IamRolePolicyAttachment +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + DlmLifecyclePolicy(self, "example", + description="tf-acc-basic", + execution_role_arn=Token.as_string(aws_iam_role_example.arn), + policy_details=DlmLifecyclePolicyPolicyDetails( + resource_types=["INSTANCE"], + schedule=[DlmLifecyclePolicyPolicyDetailsSchedule( + create_rule=DlmLifecyclePolicyPolicyDetailsScheduleCreateRule( + interval=12, + scripts=DlmLifecyclePolicyPolicyDetailsScheduleCreateRuleScripts( + execute_operation_on_script_failure=False, + execution_handler="AWS_VSS_BACKUP", + maximum_retry_count=2 + ) + ), + name="Windows VSS", + retain_rule=DlmLifecyclePolicyPolicyDetailsScheduleRetainRule( + count=10 + ) + ) + ], + target_tags={ + "tag1": "Windows" + } + ) + ) + aws_iam_role_policy_attachment_example = IamRolePolicyAttachment(self, "example_1", + policy_arn=Token.as_string(data_aws_iam_policy_example.arn), + role=test.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_iam_role_policy_attachment_example.override_logical_id("example") + DataAwsIamPolicy(self, "test", + name="AWSDataLifecycleManagerSSMFullAccess" + ) +``` + ## Argument Reference This resource supports the following arguments: @@ -238,6 +323,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `description` - (Required) A description for the DLM lifecycle policy. * `execution_role_arn` - (Required) The ARN of an IAM role that is able to be assumed by the DLM service. +* `default_policy` - (Required) Specify the type of default policy to create. valid values are `VOLUME` or `INSTANCE`. * `policy_details` - (Required) See the [`policy_details` configuration](#policy-details-arguments) block. Max of 1. * `state` - (Optional) Whether the lifecycle policy should be enabled or disabled. `ENABLED` or `DISABLED` are valid values. Defaults to `ENABLED`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -245,9 +331,16 @@ This resource supports the following arguments: #### Policy Details arguments * `action` - (Optional) The actions to be performed when the event-based policy is triggered. You can specify only one action per policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`action` configuration](#action-arguments) block. +* `copy_tags` - (Optional, Default policies only) Indicates whether the policy should copy tags from the source resource to the snapshot or AMI. Default value is `false`. +* `create_interval` - (Optional, Default policies only) How often the policy should run and create snapshots or AMIs. valid values range from `1` to `7`. Default value is `1`. +* `exclusions` - (Optional, Default policies only) Specifies exclusion parameters for volumes or instances for which you do not want to create snapshots or AMIs. See the [`exclusions` configuration](#exclusions-arguments) block. +* `extend_deletion` - (Optional, Default policies only) snapshot or AMI retention behavior for the policy if the source volume or instance is deleted, or if the policy enters the error, disabled, or deleted state. Default value is `false`. +* `retain_interval` - (Optional, Default policies only) Specifies how long the policy should retain snapshots or AMIs before deleting them. valid values range from `2` to `14`. Default value is `7`. * `event_source` - (Optional) The event that triggers the event-based policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`event_source` configuration](#event-source-arguments) block. +* `resource_type` - (Optional, Default policies only) Type of default policy to create. Valid values are `VOLUME` and `INSTANCE`. * `resource_types` - (Optional) A list of resource types that should be targeted by the lifecycle policy. Valid values are `VOLUME` and `INSTANCE`. * `resource_locations` - (Optional) The location of the resources to backup. If the source resources are located in an AWS Region, specify `CLOUD`. If the source resources are located on an Outpost in your account, specify `OUTPOST`. If the source resources are located in a Local Zone, specify `LOCAL_ZONE`. Valid values are `CLOUD`, `LOCAL_ZONE`, and `OUTPOST`. +* `policy_language` - (Optional) Type of policy to create. `SIMPLIFIED` To create a default policy. `STANDARD` To create a custom policy. * `policy_type` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. @@ -282,6 +375,12 @@ This resource supports the following arguments: * `event_type` - (Required) The type of event. Currently, only `shareSnapshot` events are supported. * `snapshot_owner` - (Required) The IDs of the AWS accounts that can trigger policy by sharing snapshots with your account. The policy only runs if one of the specified AWS accounts shares a snapshot with your account. +#### Exclusions arguments + +* `exclude_boot_volumes` - (Optional) Indicates whether to exclude volumes that are attached to instances as the boot volume. To exclude boot volumes, specify `true`. +* `exclude_tags` - (Optional) Map specifies whether to exclude volumes that have specific tags. +* `exclude_volume_types` - (Optional) List specifies the volume types to exclude. + #### Parameters arguments * `exclude_boot_volume` - (Optional) Indicates whether to exclude the root volume from snapshots created using CreateSnapshots. The default is `false`. @@ -289,6 +388,7 @@ This resource supports the following arguments: #### Schedule arguments +* `archive_rule` - (Optional) Specifies a snapshot archiving rule for a schedule. See [`archive_rule`](#archive-rule-arguments) block. * `copy_tags` - (Optional) Copy all user-defined tags on a source volume to snapshots of the volume created by this policy. * `create_rule` - (Required) See the [`create_rule`](#create-rule-arguments) block. Max of 1 per schedule. * `cross_region_copy_rule` (Optional) - See the [`cross_region_copy_rule`](#cross-region-copy-rule-arguments) block. Max of 3 per schedule. @@ -300,12 +400,21 @@ This resource supports the following arguments: * `tags_to_add` - (Optional) A map of tag keys and their values. DLM lifecycle policies will already tag the snapshot with the tags on the volume. This configuration adds extra tags on top of these. * `variable_tags` - (Optional) A map of tag keys and variable values, where the values are determined when the policy is executed. Only `$(instance-id)` or `$(timestamp)` are valid values. Can only be used when `resource_types` is `INSTANCE`. +#### Archive Rule Arguments + +* `archive_retain_rule` - (Required) Information about the retention period for the snapshot archiving rule. See the [`archive_retain_rule`](#archive-retain-rule-arguments) block. + +#### Archive Retain Rule Arguments + +* `retention_archive_tier` - (Required) Information about retention period in the Amazon EBS Snapshots Archive. See the [`retention_archive_tier`](#retention-archive-tier-arguments) block. + #### Create Rule arguments * `cron_expression` - (Optional) The schedule, as a Cron expression. The schedule interval must be between 1 hour and 1 year. Conflicts with `interval`, `interval_unit`, and `times`. * `interval` - (Optional) How often this lifecycle policy should be evaluated. `1`, `2`,`3`,`4`,`6`,`8`,`12` or `24` are valid values. Conflicts with `cron_expression`. If set, `interval_unit` and `times` must also be set. * `interval_unit` - (Optional) The unit for how often the lifecycle policy should be evaluated. `HOURS` is currently the only allowed value and also the default value. Conflicts with `cron_expression`. Must be set if `interval` is set. * `location` - (Optional) Specifies the destination for snapshots created by the policy. To create snapshots in the same Region as the source resource, specify `CLOUD`. To create snapshots on the same Outpost as the source resource, specify `OUTPOST_LOCAL`. If you omit this parameter, `CLOUD` is used by default. If the policy targets resources in an AWS Region, then you must create snapshots in the same Region as the source resource. If the policy targets resources on an Outpost, then you can create snapshots on the same Outpost as the source resource, or in the Region of that Outpost. Valid values are `CLOUD` and `OUTPOST_LOCAL`. +* `scripts` - (Optional) Specifies pre and/or post scripts for a snapshot lifecycle policy that targets instances. Valid only when `resource_type` is INSTANCE. See the [`scripts` configuration](#scripts-rule-arguments) block. * `times` - (Optional) A list of times in 24 hour clock format that sets when the lifecycle policy should be evaluated. Max of 1. Conflicts with `cron_expression`. Must be set if `interval` is set. #### Deprecate Rule arguments @@ -340,7 +449,8 @@ This resource supports the following arguments: * `deprecate_rule` - (Optional) The AMI deprecation rule for cross-Region AMI copies created by the rule. See the [`deprecate_rule`](#cross-region-copy-rule-deprecate-rule-arguments) block. * `encrypted` - (Required) To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Copies of encrypted snapshots are encrypted, even if this parameter is false or if encryption by default is not enabled. * `retain_rule` - (Required) The retention rule that indicates how long snapshot copies are to be retained in the destination Region. See the [`retain_rule`](#cross-region-copy-rule-retain-rule-arguments) block. Max of 1 per schedule. -* `target` - (Required) The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `target` - Use only for DLM policies of `policy_type=EBS_SNAPSHOT_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `target_region` - Use only for DLM policies of `policy_type=IMAGE_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. #### Cross Region Copy Rule Deprecate Rule arguments @@ -352,6 +462,26 @@ This resource supports the following arguments: * `interval` - (Required) The amount of time to retain each snapshot. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days. * `interval_unit` - (Required) The unit of time for time-based retention. Valid values: `DAYS`, `WEEKS`, `MONTHS`, or `YEARS`. +#### Scripts Rule arguments + +* `execute_operation_on_script_failure` - (Optional) Indicates whether Amazon Data Lifecycle Manager should default to crash-consistent snapshots if the pre script fails. The default is `true`. + +* `execution_handler` - (Required) The SSM document that includes the pre and/or post scripts to run. In case automating VSS backups, specify `AWS_VSS_BACKUP`. In case automating application-consistent snapshots for SAP HANA workloads, specify `AWSSystemsManagerSAP-CreateDLMSnapshotForSAPHANA`. If you are using a custom SSM document that you own, specify either the name or ARN of the SSM document. + +* `execution_handler_service` - (Optional) Indicates the service used to execute the pre and/or post scripts. If using custom SSM documents or automating application-consistent snapshots of SAP HANA workloads, specify `AWS_SYSTEMS_MANAGER`. In case automating VSS Backups, omit this parameter. The default is `AWS_SYSTEMS_MANAGER`. + +* `execution_timeout` - (Optional) Specifies a timeout period, in seconds, after which Amazon Data Lifecycle Manager fails the script run attempt if it has not completed. In case automating VSS Backups, omit this parameter. The default is `10`. + +* `maximum_retry_count` - (Optional) Specifies the number of times Amazon Data Lifecycle Manager should retry scripts that fail. Must be an integer between `0` and `3`. The default is `0`. + +* `stages` - (Optional) List to indicate which scripts Amazon Data Lifecycle Manager should run on target instances. Pre scripts run before Amazon Data Lifecycle Manager initiates snapshot creation. Post scripts run after Amazon Data Lifecycle Manager initiates snapshot creation. Valid values: `PRE` and `POST`. The default is `PRE` and `POST` + +#### Retention Archive Tier Arguments + +* `count` - (Optional)The maximum number of snapshots to retain in the archive storage tier for each volume. Must be an integer between `1` and `1000`. Conflicts with `interval` and `interval_unit`. +* `interval` - (Optional) Specifies the period of time to retain snapshots in the archive tier. After this period expires, the snapshot is permanently deleted. Conflicts with `count`. If set, `interval_unit` must also be set. +* `interval_unit` - (Optional) The unit of time for time-based retention. Valid values are `DAYS`, `WEEKS`, `MONTHS`, `YEARS`. Conflicts with `count`. Must be set if `interval` is set. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -385,4 +515,4 @@ Using `terraform import`, import DLM lifecycle policies using their policy ID. F % terraform import aws_dlm_lifecycle_policy.example policy-abcdef12345678901 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dx_hosted_connection.html.markdown b/website/docs/cdktf/python/r/dx_hosted_connection.html.markdown index 16b69ea9b69f..347087c8df73 100644 --- a/website/docs/cdktf/python/r/dx_hosted_connection.html.markdown +++ b/website/docs/cdktf/python/r/dx_hosted_connection.html.markdown @@ -52,7 +52,7 @@ This resource exports the following attributes in addition to the arguments abov * `aws_device` - The Direct Connect endpoint on which the physical connection terminates. * `connection_region` - The AWS Region where the connection is located. * `has_logical_redundancy` - Indicates whether the connection supports a secondary BGP peer in the same address family (IPv4/IPv6). -* `id` - The ID of the connection. +* `id` - The ID of the hosted connection. * `jumbo_frame_capable` - Boolean value representing if jumbo frames have been enabled for this connection. * `lag_id` - The ID of the LAG. * `loa_issue_time` - The time of the most recent call to [DescribeLoa](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLoa.html) for this connection. @@ -62,4 +62,4 @@ This resource exports the following attributes in addition to the arguments abov * `region` - (**Deprecated**) The AWS Region where the connection is located. Use `connection_region` instead. * `state` - The state of the connection. Possible values include: ordering, requested, pending, available, down, deleting, deleted, rejected, unknown. See [AllocateHostedConnection](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_AllocateHostedConnection.html) for a description of each connection state. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dynamodb_contributor_insights.html.markdown b/website/docs/cdktf/python/r/dynamodb_contributor_insights.html.markdown index 963cc1e5dc8e..5f9572c34482 100644 --- a/website/docs/cdktf/python/r/dynamodb_contributor_insights.html.markdown +++ b/website/docs/cdktf/python/r/dynamodb_contributor_insights.html.markdown @@ -38,6 +38,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `table_name` - (Required) The name of the table to enable contributor insights * `index_name` - (Optional) The global secondary index name +* `mode` - (Optional) argument to specify the [CloudWatch contributor insights mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ## Attribute Reference @@ -68,4 +69,4 @@ Using `terraform import`, import `aws_dynamodb_contributor_insights` using the f % terraform import aws_dynamodb_contributor_insights.test name:ExampleTableName/index:ExampleIndexName/123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ec2_client_vpn_endpoint.html.markdown b/website/docs/cdktf/python/r/ec2_client_vpn_endpoint.html.markdown index 45c7e1f829fd..c1fcef138e1a 100644 --- a/website/docs/cdktf/python/r/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/cdktf/python/r/ec2_client_vpn_endpoint.html.markdown @@ -50,7 +50,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `authentication_options` - (Required) Information about the authentication method to be used to authenticate clients. -* `client_cidr_block` - (Required) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. +* `client_cidr_block` - (Optional) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. When `traffic_ip_address_type` is set to `ipv6`, it must not be specified. Otherwise, it is required. * `client_connect_options` - (Optional) The options for managing connection authorization for new client connections. * `client_login_banner_options` - (Optional) Options for enabling a customizable text banner that will be displayed on AWS provided clients when a VPN session is established. * `client_route_enforcement_options` - (Optional) Options for enforce administrator defined routes on devices connected through the VPN. @@ -58,12 +58,14 @@ This resource supports the following arguments: * `description` - (Optional) A brief description of the Client VPN endpoint. * `disconnect_on_session_timeout` - (Optional) Indicates whether the client VPN session is disconnected after the maximum `session_timeout_hours` is reached. If `true`, users are prompted to reconnect client VPN. If `false`, client VPN attempts to reconnect automatically. The default value is `false`. * `dns_servers` - (Optional) Information about the DNS servers to be used for DNS resolution. A Client VPN endpoint can have up to two DNS servers. If no DNS server is specified, the DNS address of the connecting device is used. +* `endpoint_ip_address_type` - (Optional) IP address type for the Client VPN endpoint. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. * `security_group_ids` - (Optional) The IDs of one or more security groups to apply to the target network. You must also specify the ID of the VPC that contains the security groups. * `self_service_portal` - (Optional) Specify whether to enable the self-service portal for the Client VPN endpoint. Values can be `enabled` or `disabled`. Default value is `disabled`. * `server_certificate_arn` - (Required) The ARN of the ACM server certificate. * `session_timeout_hours` - (Optional) The maximum session duration is a trigger by which end-users are required to re-authenticate prior to establishing a VPN session. Default value is `24` - Valid values: `8 | 10 | 12 | 24` * `split_tunnel` - (Optional) Indicates whether split-tunnel is enabled on VPN endpoint. Default value is `false`. * `tags` - (Optional) A mapping of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `traffic_ip_address_type` - (Optional) IP address type for traffic within the Client VPN tunnel. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. When it is set to `ipv6`, `client_cidr_block` must not be specified. * `transport_protocol` - (Optional) The transport protocol to be used by the VPN session. Default value is `udp`. * `vpc_id` - (Optional) The ID of the VPC to associate with the Client VPN endpoint. If no security group IDs are specified in the request, the default security group for the VPC is applied. * `vpn_port` - (Optional) The port number for the Client VPN endpoint. Valid values are `443` and `1194`. Default value is `443`. @@ -135,4 +137,4 @@ Using `terraform import`, import AWS Client VPN endpoints using the `id` value f % terraform import aws_ec2_client_vpn_endpoint.example cvpn-endpoint-0ac3a1abbccddd666 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecr_lifecycle_policy.html.markdown b/website/docs/cdktf/python/r/ecr_lifecycle_policy.html.markdown index 69c7048ec6f0..c4d6eff0dd41 100644 --- a/website/docs/cdktf/python/r/ecr_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/python/r/ecr_lifecycle_policy.html.markdown @@ -87,6 +87,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_lifecycle_policy.example + identity = { + repository = "tf-example" + } +} + +resource "aws_ecr_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Lifecycle Policy using the name of the repository. For example: ```python @@ -110,4 +136,4 @@ Using `terraform import`, import ECR Lifecycle Policy using the name of the repo % terraform import aws_ecr_lifecycle_policy.example tf-example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecr_repository.html.markdown b/website/docs/cdktf/python/r/ecr_repository.html.markdown index 1cd1d60fbe4a..d37aa19efd1f 100644 --- a/website/docs/cdktf/python/r/ecr_repository.html.markdown +++ b/website/docs/cdktf/python/r/ecr_repository.html.markdown @@ -105,6 +105,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository.service + identity = { + name = "test-service" + } +} + +resource "aws_ecr_repository" "service" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repositories using the `name`. For example: ```python @@ -128,4 +154,4 @@ Using `terraform import`, import ECR Repositories using the `name`. For example: % terraform import aws_ecr_repository.service test-service ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecr_repository_policy.html.markdown b/website/docs/cdktf/python/r/ecr_repository_policy.html.markdown index d613a90c370d..a441c730777f 100644 --- a/website/docs/cdktf/python/r/ecr_repository_policy.html.markdown +++ b/website/docs/cdktf/python/r/ecr_repository_policy.html.markdown @@ -74,6 +74,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository_policy.example + identity = { + repository = "example" + } +} + +resource "aws_ecr_repository_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repository Policy using the repository name. For example: ```python @@ -97,4 +123,4 @@ Using `terraform import`, import ECR Repository Policy using the repository name % terraform import aws_ecr_repository_policy.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecs_service.html.markdown b/website/docs/cdktf/python/r/ecs_service.html.markdown index 4cd9a37d1fdd..3270f7e7e77f 100644 --- a/website/docs/cdktf/python/r/ecs_service.html.markdown +++ b/website/docs/cdktf/python/r/ecs_service.html.markdown @@ -152,6 +152,31 @@ class MyConvertedCode(TerraformStack): ) ``` +### Blue/Green Deployment with SIGINT Rollback + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.ecs_service import EcsService +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + EcsService(self, "example", + cluster=Token.as_string(aws_ecs_cluster_example.id), + deployment_configuration=EcsServiceDeploymentConfiguration( + strategy="BLUE_GREEN" + ), + name="example", + sigint_rollback=True, + wait_for_steady_state=True + ) +``` + ### Redeploy Service On Every Apply The key used with `triggers` is arbitrary. @@ -212,6 +237,7 @@ The following arguments are optional: * `scheduling_strategy` - (Optional) Scheduling strategy to use for the service. The valid values are `REPLICA` and `DAEMON`. Defaults to `REPLICA`. Note that [*Tasks using the Fargate launch type or the `CODE_DEPLOY` or `EXTERNAL` deployment controller types don't support the `DAEMON` scheduling strategy*](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html). * `service_connect_configuration` - (Optional) ECS Service Connect configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace. [See below](#service_connect_configuration). * `service_registries` - (Optional) Service discovery registries for the service. The maximum number of `service_registries` blocks is `1`. [See below](#service_registries). +* `sigint_rollback` - (Optional) Whether to enable graceful termination of deployments using SIGINT signals. When enabled, allows customers to safely cancel an in-progress deployment and automatically trigger a rollback to the previous stable state. Defaults to `false`. Only applicable when using `ECS` deployment controller and requires `wait_for_steady_state = true`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `task_definition` - (Optional) Family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. Required unless using the `EXTERNAL` deployment controller. If a revision is not specified, the latest `ACTIVE` revision is used. * `triggers` - (Optional) Map of arbitrary keys and values that, when changed, will trigger an in-place update (redeployment). Useful with `plantimestamp()`. See example above. @@ -382,7 +408,7 @@ For more information, see [Task Networking](https://docs.aws.amazon.com/AmazonEC `service` supports the following: -* `client_alias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. The maximum number of client aliases that you can have in this list is 1. [See below](#client_alias). +* `client_alias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. For each service block where enabled is true, exactly one `client_alias` with one `port` should be specified. [See below](#client_alias). * `discovery_name` - (Optional) Name of the new AWS Cloud Map service that Amazon ECS creates for this Amazon ECS service. * `ingress_port_override` - (Optional) Port number for the Service Connect proxy to listen on. * `port_name` - (Required) Name of one of the `portMappings` from all the containers in the task definition of this Amazon ECS service. @@ -485,4 +511,4 @@ Using `terraform import`, import ECS services using the `name` together with ecs % terraform import aws_ecs_service.imported cluster-name/service-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/efs_mount_target.html.markdown b/website/docs/cdktf/python/r/efs_mount_target.html.markdown index d36dc73ec876..a67b2328ae3f 100644 --- a/website/docs/cdktf/python/r/efs_mount_target.html.markdown +++ b/website/docs/cdktf/python/r/efs_mount_target.html.markdown @@ -53,6 +53,8 @@ This resource supports the following arguments: * `subnet_id` - (Required) The ID of the subnet to add the mount target in. * `ip_address` - (Optional) The address (within the address range of the specified subnet) at which the file system may be mounted via the mount target. +* `ip_address_type` - (Optional) IP address type for the mount target. Valid values are `IPV4_ONLY` (only IPv4 addresses), `IPV6_ONLY` (only IPv6 addresses), and `DUAL_STACK` (dual-stack, both IPv4 and IPv6 addresses). Defaults to `IPV4_ONLY`. +* `ipv6_address` - (Optional) IPv6 address to use. Valid only when `ip_address_type` is set to `IPV6_ONLY` or `DUAL_STACK`. * `security_groups` - (Optional) A list of up to 5 VPC security group IDs (that must be for the same VPC as subnet specified) in effect for the mount target. @@ -105,4 +107,4 @@ Using `terraform import`, import the EFS mount targets using the `id`. For examp % terraform import aws_efs_mount_target.alpha fsmt-52a643fb ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/elasticache_global_replication_group.html.markdown b/website/docs/cdktf/python/r/elasticache_global_replication_group.html.markdown index 5145ad80e68b..ec23b0c390bd 100644 --- a/website/docs/cdktf/python/r/elasticache_global_replication_group.html.markdown +++ b/website/docs/cdktf/python/r/elasticache_global_replication_group.html.markdown @@ -58,8 +58,7 @@ The initial Redis version is determined by the version set on the primary replic However, once it is part of a Global Replication Group, the Global Replication Group manages the version of all member replication groups. -The member replication groups must have [`lifecycle.ignore_changes[engine_version]`](https://www.terraform.io/language/meta-arguments/lifecycle) set, -or Terraform will always return a diff. +The provider is configured to ignore changes to `engine`, `engine_version` and `parameter_group_name` inside `aws_elasticache_replication_group` resources if they belong to a global replication group. In this example, the primary replication group will be created with Redis 6.0, @@ -68,7 +67,6 @@ The secondary replication group will be created with Redis 6.2. ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug -from cdktf import TerraformResourceLifecycle, TerraformResourceLifecycle from constructs import Construct from cdktf import TerraformStack # @@ -84,9 +82,6 @@ class MyConvertedCode(TerraformStack): description="primary replication group", engine="redis", engine_version="6.0", - lifecycle=TerraformResourceLifecycle( - ignore_changes=[engine_version] - ), node_type="cache.m5.large", num_cache_clusters=1, replication_group_id="example-primary" @@ -99,9 +94,6 @@ class MyConvertedCode(TerraformStack): ElasticacheReplicationGroup(self, "secondary", description="secondary replication group", global_replication_group_id=example.global_replication_group_id, - lifecycle=TerraformResourceLifecycle( - ignore_changes=[engine_version] - ), num_cache_clusters=1, provider=other_region, replication_group_id="example-secondary" @@ -119,7 +111,12 @@ This resource supports the following arguments: See AWS documentation for information on [supported node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheNodes.SupportedTypes.html) and [guidance on selecting node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/nodes-select-size.html). When creating, by default the Global Replication Group inherits the node type of the primary replication group. -* `engine_version` - (Optional) Redis version to use for the Global Replication Group. +* `engine` - (Optional) The name of the cache engine to be used for the clusters in this global replication group. + When creating, by default the Global Replication Group inherits the engine of the primary replication group. + If an engine is specified, the Global Replication Group and all member replication groups will be upgraded to this engine. + Valid values are `redis` or `valkey`. + Default is `redis` if `engine_version` is specified. +* `engine_version` - (Optional) Engine version to use for the Global Replication Group. When creating, by default the Global Replication Group inherits the version of the primary replication group. If a version is specified, the Global Replication Group and all member replication groups will be upgraded to this version. Cannot be downgraded without replacing the Global Replication Group and all member replication groups. @@ -132,7 +129,7 @@ This resource supports the following arguments: * `global_replication_group_description` - (Optional) A user-created description for the global replication group. * `num_node_groups` - (Optional) The number of node groups (shards) on the global replication group. * `parameter_group_name` - (Optional) An ElastiCache Parameter Group to use for the Global Replication Group. - Required when upgrading a major engine version, but will be ignored if left configured after the upgrade is complete. + Required when upgrading an engine or major engine version, but will be ignored if left configured after the upgrade is complete. Specifying without a major version upgrade will fail. Note that ElastiCache creates a copy of this parameter group for each member replication group. @@ -146,7 +143,6 @@ This resource exports the following attributes in addition to the arguments abov * `at_rest_encryption_enabled` - A flag that indicate whether the encryption at rest is enabled. * `auth_token_enabled` - A flag that indicate whether AuthToken (password) is enabled. * `cluster_enabled` - Indicates whether the Global Datastore is cluster enabled. -* `engine` - The name of the cache engine to be used for the clusters in this global replication group. * `global_replication_group_id` - The full ID of the global replication group. * `global_node_groups` - Set of node groups (shards) on the global replication group. Has the values: @@ -187,4 +183,4 @@ Using `terraform import`, import ElastiCache Global Replication Groups using the % terraform import aws_elasticache_global_replication_group.my_global_replication_group okuqm-global-replication-group-1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/instance.html.markdown b/website/docs/cdktf/python/r/instance.html.markdown index 65c410e5baee..c90c6c5602ea 100644 --- a/website/docs/cdktf/python/r/instance.html.markdown +++ b/website/docs/cdktf/python/r/instance.html.markdown @@ -549,6 +549,32 @@ For `instance_market_options`, in addition to the arguments above, the following ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_instance.example + identity = { + id = "i-12345678" + } +} + +resource "aws_instance" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the instance. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import instances using the `id`. For example: ```python @@ -572,4 +598,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/kms_alias.html.markdown b/website/docs/cdktf/python/r/kms_alias.html.markdown index 57fbe8ee0ede..6a75c5a9e5a7 100644 --- a/website/docs/cdktf/python/r/kms_alias.html.markdown +++ b/website/docs/cdktf/python/r/kms_alias.html.markdown @@ -57,6 +57,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_alias.example + identity = { + name = "alias/my-key-alias" + } +} + +resource "aws_kms_alias" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the KMS key alias. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS aliases using the `name`. For example: ```python @@ -80,4 +106,4 @@ Using `terraform import`, import KMS aliases using the `name`. For example: % terraform import aws_kms_alias.a alias/my-key-alias ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/kms_external_key.html.markdown b/website/docs/cdktf/python/r/kms_external_key.html.markdown index d890b0d0f3c3..f524a97fd055 100644 --- a/website/docs/cdktf/python/r/kms_external_key.html.markdown +++ b/website/docs/cdktf/python/r/kms_external_key.html.markdown @@ -38,14 +38,16 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `bypass_policy_lockout_safety_check` - (Optional) Specifies whether to disable the policy lockout check performed when creating or updating the key's policy. Setting this value to `true` increases the risk that the key becomes unmanageable. For more information, refer to the scenario in the [Default Key Policy](https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam) section in the AWS Key Management Service Developer Guide. Defaults to `false`. * `deletion_window_in_days` - (Optional) Duration in days after which the key is deleted after destruction of the resource. Must be between `7` and `30` days. Defaults to `30`. * `description` - (Optional) Description of the key. * `enabled` - (Optional) Specifies whether the key is enabled. Keys pending import can only be `false`. Imported keys default to `true` unless expired. * `key_material_base64` - (Optional) Base64 encoded 256-bit symmetric encryption key material to import. The CMK is permanently associated with this key material. The same key material can be reimported, but you cannot import different key material. +* `key_spec` - (Optional) Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_224`, `HMAC_256`, `HMAC_384`, `HMAC_512`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, `ECC_SECG_P256K1`, `ML_DSA_44`, `ML_DSA_65`, `ML_DSA_87`, or `SM2` (China Regions only). Defaults to `SYMMETRIC_DEFAULT`. For help with choosing a key spec, see the [AWS KMS Developer Guide](https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html). +* `key_usage` - (Optional) Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT`, `SIGN_VERIFY`, or `GENERATE_VERIFY_MAC`. Defaults to `ENCRYPT_DECRYPT`. * `multi_region` - (Optional) Indicates whether the KMS key is a multi-Region (`true`) or regional (`false`) key. Defaults to `false`. * `policy` - (Optional) A key policy JSON document. If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `tags` - (Optional) A key-value map of tags to assign to the key. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `valid_to` - (Optional) Time at which the imported key material expires. When the key material expires, AWS KMS deletes the key material and the CMK becomes unusable. If not specified, key material does not expire. Valid values: [RFC3339 time string](https://tools.ietf.org/html/rfc3339#section-5.8) (`YYYY-MM-DDTHH:MM:SSZ`) @@ -57,7 +59,6 @@ This resource exports the following attributes in addition to the arguments abov * `expiration_model` - Whether the key material expires. Empty when pending key material import, otherwise `KEY_MATERIAL_EXPIRES` or `KEY_MATERIAL_DOES_NOT_EXPIRE`. * `id` - The unique identifier for the key. * `key_state` - The state of the CMK. -* `key_usage` - The cryptographic operations for which you can use the CMK. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Import @@ -85,4 +86,4 @@ Using `terraform import`, import KMS External Keys using the `id`. For example: % terraform import aws_kms_external_key.a arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/kms_key.html.markdown b/website/docs/cdktf/python/r/kms_key.html.markdown index 9b5d2eec745b..e0ff2bf232da 100644 --- a/website/docs/cdktf/python/r/kms_key.html.markdown +++ b/website/docs/cdktf/python/r/kms_key.html.markdown @@ -334,6 +334,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_key.example + identity = { + id = "1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_kms_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the KMS key. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS Keys using the `id`. For example: ```python @@ -357,4 +383,4 @@ Using `terraform import`, import KMS Keys using the `id`. For example: % terraform import aws_kms_key.a 1234abcd-12ab-34cd-56ef-1234567890ab ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lambda_function.html.markdown b/website/docs/cdktf/python/r/lambda_function.html.markdown index 324026b1a556..21800fc84325 100644 --- a/website/docs/cdktf/python/r/lambda_function.html.markdown +++ b/website/docs/cdktf/python/r/lambda_function.html.markdown @@ -594,6 +594,7 @@ The following arguments are optional: * `skip_destroy` - (Optional) Whether to retain the old version of a previously deployed Lambda Layer. Default is `false`. * `snap_start` - (Optional) Configuration block for snap start settings. [See below](#snap_start-configuration-block). * `source_code_hash` - (Optional) Base64-encoded SHA256 hash of the package file. Used to trigger updates when source code changes. +* `source_kms_key_arn` - (Optional) ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. Conflicts with `image_uri`. * `tags` - (Optional) Key-value map of tags for the Lambda function. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) Amount of time your Lambda Function has to run in seconds. Defaults to 3. Valid between 1 and 900. * `tracing_config` - (Optional) Configuration block for X-Ray tracing. [See below](#tracing_config-configuration-block). @@ -694,4 +695,4 @@ Using `terraform import`, import Lambda Functions using the `function_name`. For % terraform import aws_lambda_function.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb.html.markdown b/website/docs/cdktf/python/r/lb.html.markdown index f14e40f9bf2d..d7290adf910b 100644 --- a/website/docs/cdktf/python/r/lb.html.markdown +++ b/website/docs/cdktf/python/r/lb.html.markdown @@ -160,6 +160,7 @@ This resource supports the following arguments: * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `security_groups` - (Optional) List of security group IDs to assign to the LB. Only valid for Load Balancers of type `application` or `network`. For load balancers of type `network` security groups cannot be added if none are currently present, and cannot all be removed once added. If either of these conditions are met, this will force a recreation of the resource. * `preserve_host_header` - (Optional) Whether the Application Load Balancer should preserve the Host header in the HTTP request and send it to the target without any change. Defaults to `false`. +* `secondary_ips_auto_assigned_per_subnet` - (Optional) The number of secondary IP addresses to configure for your load balancer nodes. Only valid for Load Balancers of type `network`. The valid range is 0-7. When decreased, this will force a recreation of the resource. Default: `0`. * `subnet_mapping` - (Optional) Subnet mapping block. See below. For Load Balancers of type `network` subnet mappings can only be added. * `subnets` - (Optional) List of subnet IDs to attach to the LB. For Load Balancers of type `network` subnets can only be added (see [Availability Zones](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/network-load-balancers.html#availability-zones)), deleting a subnet for load balancers of type `network` will force a recreation of the resource. * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -240,4 +241,4 @@ Using `terraform import`, import LBs using their ARN. For example: % terraform import aws_lb.bar arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/quicksight_account_subscription.html.markdown b/website/docs/cdktf/python/r/quicksight_account_subscription.html.markdown index 313be8da5316..3dae325d6e27 100644 --- a/website/docs/cdktf/python/r/quicksight_account_subscription.html.markdown +++ b/website/docs/cdktf/python/r/quicksight_account_subscription.html.markdown @@ -78,6 +78,8 @@ This resource exports the following attributes in addition to the arguments abov In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Account Subscription using `aws_account_id`. For example: +~> Due to the absence of required arguments in the [`DescribeAccountSettings`](https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeAccountSettings.html) API response, importing an existing account subscription will result in a planned replacement on the subsequent `apply` operation. Until the Describe API response in extended to include all configurable arguments, an [`ignore_changes` lifecycle argument](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle#ignore_changes) can be used to suppress differences on arguments not read into state. + ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct @@ -99,4 +101,4 @@ Using `terraform import`, import a QuickSight Account Subscription using `aws_ac % terraform import aws_quicksight_account_subscription.example "012345678901" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/route.html.markdown b/website/docs/cdktf/python/r/route.html.markdown index 3480e1359577..5ec8e2a985c0 100644 --- a/website/docs/cdktf/python/r/route.html.markdown +++ b/website/docs/cdktf/python/r/route.html.markdown @@ -119,6 +119,46 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route.example + identity = { + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + + ### OR by IPv6 CIDR block + # destination_ipv6_cidr_block = "10.42.0.0/16" + + ### OR by prefix list ID + # destination_prefix_list_id = "pl-0570a1d2d725c16be" + } +} + +resource "aws_route" "example" { + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + vpc_peering_connection_id = "pcx-45ff3dc1" +} +``` + +### Identity Schema + +#### Required + +- `route_table_id` - (String) ID of the route table. + +#### Optional + +~> Exactly one of of `destination_cidr_block`, `destination_ipv6_cidr_block`, or `destination_prefix_list_id` is required. + +- `account_id` (String) AWS Account where this resource is managed. +- `destination_cidr_block` - (String) Destination IPv4 CIDR block. +- `destination_ipv6_cidr_block` - (String) Destination IPv6 CIDR block. +- `destination_prefix_list_id` - (String) Destination IPv6 CIDR block. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import individual routes using `ROUTETABLEID_DESTINATION`. Import [local routes](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html#RouteTables) using the VPC's IPv4 or IPv6 CIDR blocks. For example: Import a route in route table `rtb-656C65616E6F72` with an IPv4 destination CIDR of `10.42.0.0/16`: @@ -192,4 +232,4 @@ Import a route in route table `rtb-656C65616E6F72` with a managed prefix list de % terraform import aws_route.my_route rtb-656C65616E6F72_pl-0570a1d2d725c16be ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/route53_resolver_rule.html.markdown b/website/docs/cdktf/python/r/route53_resolver_rule.html.markdown index e8d63ad7d71c..2773b8ce6c43 100644 --- a/website/docs/cdktf/python/r/route53_resolver_rule.html.markdown +++ b/website/docs/cdktf/python/r/route53_resolver_rule.html.markdown @@ -126,6 +126,32 @@ Values are `NOT_SHARED`, `SHARED_BY_ME` or `SHARED_WITH_ME` ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule.example + identity = { + id = "rslvr-rr-0123456789abcdef0" + } +} + +resource "aws_route53_resolver_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rules using the `id`. For example: ```python @@ -140,13 +166,13 @@ from imports.aws.route53_resolver_rule import Route53ResolverRule class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - Route53ResolverRule.generate_config_for_import(self, "sys", "rslvr-rr-0123456789abcdef0") + Route53ResolverRule.generate_config_for_import(self, "example", "rslvr-rr-0123456789abcdef0") ``` Using `terraform import`, import Route53 Resolver rules using the `id`. For example: ```console -% terraform import aws_route53_resolver_rule.sys rslvr-rr-0123456789abcdef0 +% terraform import aws_route53_resolver_rule.example rslvr-rr-0123456789abcdef0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/route53_resolver_rule_association.html.markdown b/website/docs/cdktf/python/r/route53_resolver_rule_association.html.markdown index b16bb1a92e46..23034e692b0f 100644 --- a/website/docs/cdktf/python/r/route53_resolver_rule_association.html.markdown +++ b/website/docs/cdktf/python/r/route53_resolver_rule_association.html.markdown @@ -49,6 +49,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule_association.example + identity = { + id = "rslvr-rrassoc-97242eaf88example" + } +} + +resource "aws_route53_resolver_rule_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule association. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rule associations using the `id`. For example: ```python @@ -72,4 +98,4 @@ Using `terraform import`, import Route53 Resolver rule associations using the `i % terraform import aws_route53_resolver_rule_association.example rslvr-rrassoc-97242eaf88example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/route_table.html.markdown b/website/docs/cdktf/python/r/route_table.html.markdown index 7ff89ac40e8b..a45ebb7325eb 100644 --- a/website/docs/cdktf/python/r/route_table.html.markdown +++ b/website/docs/cdktf/python/r/route_table.html.markdown @@ -223,6 +223,32 @@ attribute once the route resource is created. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route_table.example + identity = { + id = "rtb-4e616f6d69" + } +} + +resource "aws_route_table" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the routing table. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route Tables using the route table `id`. For example: ```python @@ -246,4 +272,4 @@ Using `terraform import`, import Route Tables using the route table `id`. For ex % terraform import aws_route_table.public_rt rtb-4e616f6d69 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/s3tables_table_bucket.html.markdown b/website/docs/cdktf/python/r/s3tables_table_bucket.html.markdown index 00d8b998715c..f59b45a208dc 100644 --- a/website/docs/cdktf/python/r/s3tables_table_bucket.html.markdown +++ b/website/docs/cdktf/python/r/s3tables_table_bucket.html.markdown @@ -44,11 +44,12 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `encryption_configuration` - (Optional) A single table bucket encryption configuration object. [See `encryption_configuration` below](#encryption_configuration). +* `force_destroy` - (Optional, Default:`false`) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. These tables and namespaces are *not* recoverable. This only deletes tables and namespaces when the table bucket is destroyed, *not* when setting this parameter to `true`. Once this parameter is set to `true`, there must be a successful `terraform apply` run before a destroy is required to update this value in the resource state. Without a successful `terraform apply` after this parameter is set, this flag will have no effect. If setting this field in the same operation that would require replacing the table bucket or destroying the table bucket, this flag will not work. Additionally when importing a table bucket, a successful `terraform apply` is required to set this value in state before it will take effect on a destroy operation. * `maintenance_configuration` - (Optional) A single table bucket maintenance configuration object. [See `maintenance_configuration` below](#maintenance_configuration). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### `encryption_configuration` @@ -115,4 +116,4 @@ Using `terraform import`, import S3 Tables Table Bucket using the `arn`. For exa % terraform import aws_s3tables_table_bucket.example arn:aws:s3tables:us-west-2:123456789012:bucket/example-bucket ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/secretsmanager_secret_version.html.markdown b/website/docs/cdktf/python/r/secretsmanager_secret_version.html.markdown index 79870032fdb2..b8a7830ee648 100644 --- a/website/docs/cdktf/python/r/secretsmanager_secret_version.html.markdown +++ b/website/docs/cdktf/python/r/secretsmanager_secret_version.html.markdown @@ -113,6 +113,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_version.example + identity = { + secret_id = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + version_id = "xxxxx-xxxxxxx-xxxxxxx-xxxxx" + } +} + +resource "aws_secretsmanager_secret_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `secret_id` - (String) ID of the secret. +* `version_id` - (String) ID of the secret version. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_version` using the secret ID and version ID. For example: ```python @@ -136,4 +164,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_version` using the s % terraform import aws_secretsmanager_secret_version.example 'arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456|xxxxx-xxxxxxx-xxxxxxx-xxxxx' ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sesv2_email_identity.html.markdown b/website/docs/cdktf/python/r/sesv2_email_identity.html.markdown index 3c10b62a38a2..29695ce1546f 100644 --- a/website/docs/cdktf/python/r/sesv2_email_identity.html.markdown +++ b/website/docs/cdktf/python/r/sesv2_email_identity.html.markdown @@ -139,6 +139,7 @@ This resource exports the following attributes in addition to the arguments abov * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identity_type` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +* `verification_status` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verified_for_sending_status` - Specifies whether or not the identity is verified. ## Import @@ -166,4 +167,4 @@ Using `terraform import`, import SESv2 (Simple Email V2) Email Identity using th % terraform import aws_sesv2_email_identity.example example.com ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sqs_queue.html.markdown b/website/docs/cdktf/python/r/sqs_queue.html.markdown index 291c4e88b730..8de56e2c546a 100644 --- a/website/docs/cdktf/python/r/sqs_queue.html.markdown +++ b/website/docs/cdktf/python/r/sqs_queue.html.markdown @@ -179,7 +179,7 @@ This resource supports the following arguments: * `fifo_throughput_limit` - (Optional) Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. Valid values are `perQueue` (default) and `perMessageGroupId`. * `kms_data_key_reuse_period_seconds` - (Optional) Length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). The default is 300 (5 minutes). * `kms_master_key_id` - (Optional) ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. For more information, see [Key Terms](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-sse-key-terms). -* `max_message_size` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 262144 bytes (256 KiB). The default for this attribute is 262144 (256 KiB). +* `max_message_size` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 1048576 bytes (1024 KiB). The default for this attribute is 262144 (256 KiB). * `message_retention_seconds` - (Optional) Number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4 days). * `name` - (Optional) Name of the queue. Queue names must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens, and must be between 1 and 80 characters long. For a FIFO (first-in-first-out) queue, the name must end with the `.fifo` suffix. If omitted, Terraform will assign a random, unique name. Conflicts with `name_prefix`. * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. @@ -233,4 +233,4 @@ Using `terraform import`, import SQS Queues using the queue `url`. For example: % terraform import aws_sqs_queue.public_queue https://queue.amazonaws.com/80398EXAMPLE/MyQueue ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_association.html.markdown b/website/docs/cdktf/python/r/ssm_association.html.markdown index 79b290011e65..1c443ed2f59e 100644 --- a/website/docs/cdktf/python/r/ssm_association.html.markdown +++ b/website/docs/cdktf/python/r/ssm_association.html.markdown @@ -280,6 +280,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_association.example + identity = { + association_id = "10abcdef-0abc-1234-5678-90abcdef123456" + } +} + +resource "aws_ssm_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `association_id` - (String) ID of the SSM association. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM associations using the `association_id`. For example: ```python @@ -294,13 +320,13 @@ from imports.aws.ssm_association import SsmAssociation class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - SsmAssociation.generate_config_for_import(self, "testAssociation", "10abcdef-0abc-1234-5678-90abcdef123456") + SsmAssociation.generate_config_for_import(self, "example", "10abcdef-0abc-1234-5678-90abcdef123456") ``` Using `terraform import`, import SSM associations using the `association_id`. For example: ```console -% terraform import aws_ssm_association.test-association 10abcdef-0abc-1234-5678-90abcdef123456 +% terraform import aws_ssm_association.example 10abcdef-0abc-1234-5678-90abcdef123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_document.html.markdown b/website/docs/cdktf/python/r/ssm_document.html.markdown index e11b55421e3f..eaa652400358 100644 --- a/website/docs/cdktf/python/r/ssm_document.html.markdown +++ b/website/docs/cdktf/python/r/ssm_document.html.markdown @@ -126,6 +126,32 @@ The `parameter` configuration block provides the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_document.example + identity = { + name = "example" + } +} + +resource "aws_ssm_document" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the SSM document. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Documents using the name. For example: ```python @@ -179,4 +205,4 @@ class MyConvertedCode(TerraformStack): ) ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_maintenance_window.html.markdown b/website/docs/cdktf/python/r/ssm_maintenance_window.html.markdown index 28bf1c840803..dda8fa2b4d29 100644 --- a/website/docs/cdktf/python/r/ssm_maintenance_window.html.markdown +++ b/website/docs/cdktf/python/r/ssm_maintenance_window.html.markdown @@ -61,6 +61,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window.example + identity = { + id = "mw-0123456789" + } +} + +resource "aws_ssm_maintenance_window" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the maintenance window. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Windows using the maintenance window `id`. For example: ```python @@ -75,13 +101,13 @@ from imports.aws.ssm_maintenance_window import SsmMaintenanceWindow class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - SsmMaintenanceWindow.generate_config_for_import(self, "importedWindow", "mw-0123456789") + SsmMaintenanceWindow.generate_config_for_import(self, "example", "mw-0123456789") ``` Using `terraform import`, import SSM Maintenance Windows using the maintenance window `id`. For example: ```console -% terraform import aws_ssm_maintenance_window.imported-window mw-0123456789 +% terraform import aws_ssm_maintenance_window.example mw-0123456789 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_maintenance_window_target.html.markdown b/website/docs/cdktf/python/r/ssm_maintenance_window_target.html.markdown index 2aa989949a25..d1e2e7005830 100644 --- a/website/docs/cdktf/python/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/cdktf/python/r/ssm_maintenance_window_target.html.markdown @@ -103,6 +103,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_target.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "23639a0b-ddbc-4bca-9e72-78d96EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `window_id` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window target. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Window targets using `WINDOW_ID/WINDOW_TARGET_ID`. For example: ```python @@ -126,4 +154,4 @@ Using `terraform import`, import SSM Maintenance Window targets using `WINDOW_ID % terraform import aws_ssm_maintenance_window_target.example mw-0c50858d01EXAMPLE/23639a0b-ddbc-4bca-9e72-78d96EXAMPLE ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_maintenance_window_task.html.markdown b/website/docs/cdktf/python/r/ssm_maintenance_window_task.html.markdown index 22af0a5c0724..edb5324ee6ba 100644 --- a/website/docs/cdktf/python/r/ssm_maintenance_window_task.html.markdown +++ b/website/docs/cdktf/python/r/ssm_maintenance_window_task.html.markdown @@ -251,6 +251,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_task.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "4f7ca192-7e9a-40fe-9192-5cb15EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `window_id` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window task. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Maintenance Window Task using the `window_id` and `window_task_id` separated by `/`. For example: ```python @@ -265,13 +293,13 @@ from imports.aws.ssm_maintenance_window_task import SsmMaintenanceWindowTask class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - SsmMaintenanceWindowTask.generate_config_for_import(self, "task", "/") + SsmMaintenanceWindowTask.generate_config_for_import(self, "example", "/") ``` Using `terraform import`, import AWS Maintenance Window Task using the `window_id` and `window_task_id` separated by `/`. For example: ```console -% terraform import aws_ssm_maintenance_window_task.task / +% terraform import aws_ssm_maintenance_window_task.example / ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_parameter.html.markdown b/website/docs/cdktf/python/r/ssm_parameter.html.markdown index 810a337906a3..e0f4e3bb5743 100644 --- a/website/docs/cdktf/python/r/ssm_parameter.html.markdown +++ b/website/docs/cdktf/python/r/ssm_parameter.html.markdown @@ -115,6 +115,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_parameter.example + identity = { + name = "/my_path/my_paramname" + } +} + +resource "aws_ssm_parameter" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the parameter. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Parameters using the parameter store `name`. For example: ```python @@ -129,13 +155,13 @@ from imports.aws.ssm_parameter import SsmParameter class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - SsmParameter.generate_config_for_import(self, "myParam", "/my_path/my_paramname") + SsmParameter.generate_config_for_import(self, "example", "/my_path/my_paramname") ``` Using `terraform import`, import SSM Parameters using the parameter store `name`. For example: ```console -% terraform import aws_ssm_parameter.my_param /my_path/my_paramname +% terraform import aws_ssm_parameter.example /my_path/my_paramname ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssm_patch_baseline.html.markdown b/website/docs/cdktf/python/r/ssm_patch_baseline.html.markdown index 7d237443c7fa..0fc03e9d60ed 100644 --- a/website/docs/cdktf/python/r/ssm_patch_baseline.html.markdown +++ b/website/docs/cdktf/python/r/ssm_patch_baseline.html.markdown @@ -221,6 +221,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_patch_baseline.example + identity = { + id = "pb-12345678" + } +} + +resource "aws_ssm_patch_baseline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the patch baseline. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Patch Baselines using their baseline ID. For example: ```python @@ -244,4 +270,4 @@ Using `terraform import`, import SSM Patch Baselines using their baseline ID. Fo % terraform import aws_ssm_patch_baseline.example pb-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/timestreaminfluxdb_db_cluster.html.markdown b/website/docs/cdktf/python/r/timestreaminfluxdb_db_cluster.html.markdown new file mode 100644 index 000000000000..9abbd2045726 --- /dev/null +++ b/website/docs/cdktf/python/r/timestreaminfluxdb_db_cluster.html.markdown @@ -0,0 +1,337 @@ +--- +subcategory: "Timestream for InfluxDB" +layout: "aws" +page_title: "AWS: aws_timestreaminfluxdb_db_cluster" +description: |- + Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. +--- + + + +# Resource: aws_timestreaminfluxdb_db_cluster + +Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. + +~> **NOTE:** This resource requires a subscription to [Timestream for InfluxDB Read Replicas (Add-On) on the AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-lftzfxtb5xlv4?applicationId=AWS-Marketplace-Console&ref_=beagle&sr=0-2). + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.timestreaminfluxdb_db_cluster import TimestreaminfluxdbDbCluster +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + TimestreaminfluxdbDbCluster(self, "example", + allocated_storage=20, + bucket="example-bucket-name", + db_instance_type="db.influx.medium", + failover_mode="AUTOMATIC", + name="example-db-cluster", + organization="organization", + password="example-password", + port=8086, + username="admin", + vpc_security_group_ids=[Token.as_string(aws_security_group_example.id)], + vpc_subnet_ids=[example1.id, example2.id] + ) +``` + +### Usage with Prerequisite Resources + +All Timestream for InfluxDB clusters require a VPC, at least two subnets, and a security group. The following example shows how these prerequisite resources can be created and used with `aws_timestreaminfluxdb_db_cluster`. + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.security_group import SecurityGroup +from imports.aws.subnet import Subnet +from imports.aws.timestreaminfluxdb_db_cluster import TimestreaminfluxdbDbCluster +from imports.aws.vpc import Vpc +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = Vpc(self, "example", + cidr_block="10.0.0.0/16" + ) + aws_security_group_example = SecurityGroup(self, "example_1", + name="example", + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_security_group_example.override_logical_id("example") + example1 = Subnet(self, "example_1_2", + cidr_block="10.0.1.0/24", + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + example1.override_logical_id("example_1") + example2 = Subnet(self, "example_2", + cidr_block="10.0.2.0/24", + vpc_id=example.id + ) + aws_timestreaminfluxdb_db_cluster_example = + TimestreaminfluxdbDbCluster(self, "example_4", + allocated_storage=20, + bucket="example-bucket-name", + db_instance_type="db.influx.medium", + name="example-db-cluster", + organization="organization", + password="example-password", + username="admin", + vpc_security_group_ids=[Token.as_string(aws_security_group_example.id)], + vpc_subnet_ids=[example1.id, example2.id] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_timestreaminfluxdb_db_cluster_example.override_logical_id("example") +``` + +### Usage with Public Internet Access Enabled + +The following configuration shows how to define the necessary resources and arguments to allow public internet access on your Timestream for InfluxDB read-replica cluster's primary endpoint (simply referred to as "endpoint") and read endpoint on port `8086`. After applying this configuration, the cluster's InfluxDB UI can be accessed by visiting your cluster's primary endpoint at port `8086`. + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, Op, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.internet_gateway import InternetGateway +from imports.aws.route import Route +from imports.aws.route_table_association import RouteTableAssociation +from imports.aws.security_group import SecurityGroup +from imports.aws.subnet import Subnet +from imports.aws.timestreaminfluxdb_db_cluster import TimestreaminfluxdbDbCluster +from imports.aws.vpc import Vpc +from imports.aws.vpc_security_group_ingress_rule import VpcSecurityGroupIngressRule +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = Vpc(self, "example", + cidr_block="10.0.0.0/16" + ) + aws_internet_gateway_example = InternetGateway(self, "example_1", + tags={ + "Name": "example" + }, + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_internet_gateway_example.override_logical_id("example") + Route(self, "test_route", + destination_cidr_block="0.0.0.0/0", + gateway_id=Token.as_string(aws_internet_gateway_example.id), + route_table_id=example.main_route_table_id + ) + RouteTableAssociation(self, "test_route_table_association", + route_table_id=example.main_route_table_id, + subnet_id=test_subnet.id + ) + aws_security_group_example = SecurityGroup(self, "example_4", + name="example", + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_security_group_example.override_logical_id("example") + example1 = Subnet(self, "example_1_5", + cidr_block="10.0.1.0/24", + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + example1.override_logical_id("example_1") + example2 = Subnet(self, "example_2", + cidr_block="10.0.2.0/24", + vpc_id=example.id + ) + aws_timestreaminfluxdb_db_cluster_example = + TimestreaminfluxdbDbCluster(self, "example_7", + allocated_storage=20, + bucket="example-bucket-name", + db_instance_type="db.influx.medium", + name="example-db-cluster", + organization="organization", + password="example-password", + publicly_accessible=True, + username="admin", + vpc_security_group_ids=[Token.as_string(aws_security_group_example.id)], + vpc_subnet_ids=[example1.id, example2.id] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_timestreaminfluxdb_db_cluster_example.override_logical_id("example") + aws_vpc_security_group_ingress_rule_example = + VpcSecurityGroupIngressRule(self, "example_8", + ip_protocol=Token.as_string(Op.negate(1)), + referenced_security_group_id=Token.as_string(aws_security_group_example.id), + security_group_id=Token.as_string(aws_security_group_example.id) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_vpc_security_group_ingress_rule_example.override_logical_id("example") +``` + +### Usage with S3 Log Delivery Enabled + +You can use an S3 bucket to store logs generated by your Timestream for InfluxDB cluster. The following example shows what resources and arguments are required to configure an S3 bucket for logging, including the IAM policy that needs to be set in order to allow Timestream for InfluxDB to place logs in your S3 bucket. The configuration of the required VPC, security group, and subnets have been left out of the example for brevity. + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.s3_bucket import S3Bucket +from imports.aws.s3_bucket_policy import S3BucketPolicy +from imports.aws.timestreaminfluxdb_db_cluster import TimestreaminfluxdbDbCluster +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = S3Bucket(self, "example", + bucket="example-s3-bucket", + force_destroy=True + ) + aws_timestreaminfluxdb_db_cluster_example = + TimestreaminfluxdbDbCluster(self, "example_1", + allocated_storage=20, + bucket="example-bucket-name", + db_instance_type="db.influx.medium", + log_delivery_configuration=[TimestreaminfluxdbDbClusterLogDeliveryConfiguration( + s3_configuration=[TimestreaminfluxdbDbClusterLogDeliveryConfigurationS3Configuration( + bucket_name=example.bucket, + enabled=True + ) + ] + ) + ], + name="example-db-cluster", + organization="organization", + password="example-password", + username="admin", + vpc_security_group_ids=[Token.as_string(aws_security_group_example.id)], + vpc_subnet_ids=[example1.id, example2.id] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_timestreaminfluxdb_db_cluster_example.override_logical_id("example") + data_aws_iam_policy_document_example = DataAwsIamPolicyDocument(self, "example_2", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["s3:PutObject"], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["timestream-influxdb.amazonaws.com"], + type="Service" + ) + ], + resources=["${" + example.arn + "}/*"] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_iam_policy_document_example.override_logical_id("example") + aws_s3_bucket_policy_example = S3BucketPolicy(self, "example_3", + bucket=example.id, + policy=Token.as_string(data_aws_iam_policy_document_example.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_policy_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `allocated_storage` - (Required) Amount of storage in GiB (gibibytes). The minimum value is `20`, the maximum value is `16384`. The argument `db_storage_type` places restrictions on this argument's minimum value. The following is a list of `db_storage_type` values and the corresponding minimum value for `allocated_storage`: `"InfluxIOIncludedT1": `20`, `"InfluxIOIncludedT2" and `"InfluxIOIncludedT3": `400`. +* `bucket` - (Required) Name of the initial InfluxDB bucket. All InfluxDB data is stored in a bucket. A bucket combines the concept of a database and a retention period (the duration of time that each data point persists). A bucket belongs to an organization. Along with `organization`, `username`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `db_instance_type` - (Required) Timestream for InfluxDB DB instance type to run InfluxDB on. Valid options are: `"db.influx.medium"`, `"db.influx.large"`, `"db.influx.xlarge"`, `"db.influx.2xlarge"`, `"db.influx.4xlarge"`, `"db.influx.8xlarge"`, `"db.influx.12xlarge"`, and `"db.influx.16xlarge"`. This argument is updatable. +* `name` - (Required) Name that uniquely identifies the DB cluster when interacting with the Amazon Timestream for InfluxDB API and CLI commands. This name will also be a prefix included in the endpoint. Cluster names must be unique per customer and per region. The argument must start with a letter, cannot contain consecutive hyphens (`-`) and cannot end with a hyphen. +* `password` - (Required) Password of the initial admin user created in InfluxDB. This password will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `username`, and `organization`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `organization` - (Required) Name of the initial organization for the initial admin user in InfluxDB. An InfluxDB organization is a workspace for a group of users. Along with `bucket`, `username`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `username` - (Required) Username of the initial admin user created in InfluxDB. Must start with a letter and can't end with a hyphen or contain two consecutive hyphens. This username will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `organization`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. +* `vpc_security_group_ids` - (Required) List of VPC security group IDs to associate with the cluster. +* `vpc_subnet_ids` - (Required) List of VPC subnet IDs to associate with the cluster. Provide at least two VPC subnet IDs in different availability zones when deploying with a Multi-AZ standby. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `db_parameter_group_identifier` - (Optional) ID of the DB parameter group assigned to your cluster. This argument is updatable. If added to an existing Timestream for InfluxDB cluster or given a new value, will cause an in-place update to the cluster. However, if a cluster already has a value for `db_parameter_group_identifier`, removing `db_parameter_group_identifier` will cause the cluster to be destroyed and recreated. +* `db_storage_type` - (Default `"InfluxIOIncludedT1"`) Timestream for InfluxDB DB storage type to read and write InfluxDB data. You can choose between 3 different types of provisioned Influx IOPS included storage according to your workloads requirements: Influx IO Included 3000 IOPS, Influx IO Included 12000 IOPS, Influx IO Included 16000 IOPS. Valid options are: `"InfluxIOIncludedT1"`, `"InfluxIOIncludedT2"`, and `"InfluxIOIncludedT3"`. If you use `"InfluxIOIncludedT2" or "InfluxIOIncludedT3", the minimum value for `allocated_storage` is 400. +* `deployment_type` - (Default `"MULTI_NODE_READ_REPLICAS"`) Specifies the type of cluster to create. Valid options are: `"MULTI_NODE_READ_REPLICAS"`. +* `failover_mode` - (Default `"AUTOMATIC"`) Specifies the behavior of failure recovery when the primary node of the cluster fails. Valid options are: `"AUTOMATIC"` and `"NO_FAILOVER"`. +* `log_delivery_configuration` - (Optional) Configuration for sending InfluxDB engine logs to a specified S3 bucket. This argument is updatable. +* `network_type` - (Optional) Specifies whether the network type of the Timestream for InfluxDB cluster is IPV4, which can communicate over IPv4 protocol only, or DUAL, which can communicate over both IPv4 and IPv6 protocols. +* `port` - (Default `8086`) The port on which the cluster accepts connections. Valid values: `1024`-`65535`. Cannot be `2375`-`2376`, `7788`-`7799`, `8090`, or `51678`-`51680`. This argument is updatable. +* `publicly_accessible` - (Default `false`) Configures the DB cluster with a public IP to facilitate access. Other resources, such as a VPC, a subnet, an internet gateway, and a route table with routes, are also required to enabled public access, in addition to this argument. See "[Usage with Public Internet Access Enabled](#usage-with-public-internet-access-enabled)" for an example configuration with all required resources for public internet access. +* `tags` - (Optional) Map of tags assigned to the resource. If configured with a provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Nested Fields + +#### `log_delivery_configuration` + +* `s3_configuration` - (Required) Configuration for S3 bucket log delivery. + +#### `s3_configuration` + +* `bucket_name` - (Required) Name of the S3 bucket to deliver logs to. +* `enabled` - (Required) Indicates whether log delivery to the S3 bucket is enabled. + +**Note**: The following arguments do updates in-place: `db_parameter_group_identifier`, `log_delivery_configuration`, `port`, `db_instance_type`, `failover_mode`, and `tags`. Changes to any other argument after a cluster has been deployed will cause destruction and re-creation of the cluster. Additionally, when `db_parameter_group_identifier` is added to a cluster or modified, the cluster will be updated in-place but if `db_parameter_group_identifier` is removed from a cluster, the cluster will be destroyed and re-created. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Timestream for InfluxDB cluster. +* `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. +* `id` - ID of the Timestream for InfluxDB cluster. +* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. +* `reader_endpoint` - The endpoint used to connect to the Timestream for InfluxDB cluster for read-only operations. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Timestream for InfluxDB cluster using its identifier. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.timestreaminfluxdb_db_cluster import TimestreaminfluxdbDbCluster +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + TimestreaminfluxdbDbCluster.generate_config_for_import(self, "example", "12345abcde") +``` + +Using `terraform import`, import Timestream for InfluxDB cluster using its identifier. For example: + +```console +% terraform import aws_timestreaminfluxdb_db_cluster.example 12345abcde +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/timestreaminfluxdb_db_instance.html.markdown b/website/docs/cdktf/python/r/timestreaminfluxdb_db_instance.html.markdown index af4ec5926a5b..fa9ad680d46c 100644 --- a/website/docs/cdktf/python/r/timestreaminfluxdb_db_instance.html.markdown +++ b/website/docs/cdktf/python/r/timestreaminfluxdb_db_instance.html.markdown @@ -327,7 +327,7 @@ This resource exports the following attributes in addition to the arguments abov * `availability_zone` - Availability Zone in which the DB instance resides. * `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. * `id` - ID of the Timestream for InfluxDB instance. -* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. This secret will be read by the `aws_timestreaminfluxdb_db_instance` resource in order to support importing: deleting the secret or secret values can cause errors. +* `influx_auth_parameters_secret_arn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. * `secondary_availability_zone` - Availability Zone in which the standby instance is located when deploying with a MultiAZ standby instance. * `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). @@ -364,4 +364,4 @@ Using `terraform import`, import Timestream for InfluxDB Db Instance using its i % terraform import aws_timestreaminfluxdb_db_instance.example 12345abcde ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_browser_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_browser_settings_association.html.markdown new file mode 100644 index 000000000000..fcc48ff95770 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_browser_settings_association.html.markdown @@ -0,0 +1,97 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_browser_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. +--- + + + +# Resource: aws_workspacesweb_browser_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Fn, Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_browser_settings import WorkspaceswebBrowserSettings +from imports.aws.workspacesweb_browser_settings_association import WorkspaceswebBrowserSettingsAssociation +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebBrowserSettings(self, "example", + browser_policy=Token.as_string( + Fn.jsonencode({ + "chrome_policies": { + "DefaultDownloadDirectory": { + "value": "/home/as2-streaming-user/MyFiles/TemporaryFiles1" + } + } + })) + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + aws_workspacesweb_browser_settings_association_example = + WorkspaceswebBrowserSettingsAssociation(self, "example_2", + browser_settings_arn=example.browser_settings_arn, + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_browser_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `browser_settings_arn` - (Required) ARN of the browser settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the browser settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_browser_settings_association import WorkspaceswebBrowserSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebBrowserSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + +Using `terraform import`, import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_browser_settings_association.example arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_data_protection_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_data_protection_settings_association.html.markdown new file mode 100644 index 000000000000..ca3893e98f2d --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_data_protection_settings_association.html.markdown @@ -0,0 +1,84 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_data_protection_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. +--- + + + +# Resource: aws_workspacesweb_data_protection_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_data_protection_settings import WorkspaceswebDataProtectionSettings +from imports.aws.workspacesweb_data_protection_settings_association import WorkspaceswebDataProtectionSettingsAssociation +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebDataProtectionSettings(self, "example", + display_name="example" + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + aws_workspacesweb_data_protection_settings_association_example = + WorkspaceswebDataProtectionSettingsAssociation(self, "example_2", + data_protection_settings_arn=example.data_protection_settings_arn, + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_data_protection_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `data_protection_settings_arn` - (Required) ARN of the data protection settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the data protection settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Data Protection Settings Association using the `data_protection_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_data_protection_settings_association import WorkspaceswebDataProtectionSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebDataProtectionSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:dataProtectionSettings/data_protection_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_identity_provider.html.markdown b/website/docs/cdktf/python/r/workspacesweb_identity_provider.html.markdown new file mode 100644 index 000000000000..519b0331da90 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_identity_provider.html.markdown @@ -0,0 +1,160 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_identity_provider" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Identity Provider. +--- + + + +# Resource: aws_workspacesweb_identity_provider + +Terraform resource for managing an AWS WorkSpaces Web Identity Provider. + +## Example Usage + +### Basic Usage with SAML + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_identity_provider import WorkspaceswebIdentityProvider +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebPortal(self, "example", + display_name="example" + ) + aws_workspacesweb_identity_provider_example = + WorkspaceswebIdentityProvider(self, "example_1", + identity_provider_details={ + "MetadataURL": "https://example.com/metadata" + }, + identity_provider_name="example-saml", + identity_provider_type="SAML", + portal_arn=example.portal_arn + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_identity_provider_example.override_logical_id("example") +``` + +### OIDC Identity Provider + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_identity_provider import WorkspaceswebIdentityProvider +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + test = WorkspaceswebPortal(self, "test", + display_name="test" + ) + aws_workspacesweb_identity_provider_test = + WorkspaceswebIdentityProvider(self, "test_1", + identity_provider_details={ + "attributes_request_method": "POST", + "authorize_scopes": "openid, email", + "client_id": "test-client-id", + "client_secret": "test-client-secret", + "oidc_issuer": "https://accounts.google.com" + }, + identity_provider_name="test-updated", + identity_provider_type="OIDC", + portal_arn=test.portal_arn + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_identity_provider_test.override_logical_id("test") +``` + +## Argument Reference + +The following arguments are required: + +* `identity_provider_details` - (Required) Identity provider details. The following list describes the provider detail keys for each identity provider type: + * For Google and Login with Amazon: + * `client_id` + * `client_secret` + * `authorize_scopes` + * For Facebook: + * `client_id` + * `client_secret` + * `authorize_scopes` + * `api_version` + * For Sign in with Apple: + * `client_id` + * `team_id` + * `key_id` + * `private_key` + * `authorize_scopes` + * For OIDC providers: + * `client_id` + * `client_secret` + * `attributes_request_method` + * `oidc_issuer` + * `authorize_scopes` + * `authorize_url` if not available from discovery URL specified by `oidc_issuer` key + * `token_url` if not available from discovery URL specified by `oidc_issuer` key + * `attributes_url` if not available from discovery URL specified by `oidc_issuer` key + * `jwks_uri` if not available from discovery URL specified by `oidc_issuer` key + * For SAML providers: + * `MetadataFile` OR `MetadataURL` + * `IDPSignout` (boolean) optional + * `IDPInit` (boolean) optional + * `RequestSigningAlgorithm` (string) optional - Only accepts rsa-sha256 + * `EncryptedResponses` (boolean) optional +* `identity_provider_name` - (Required) Identity provider name. +* `identity_provider_type` - (Required) Identity provider type. Valid values: `SAML`, `Facebook`, `Google`, `LoginWithAmazon`, `SignInWithApple`, `OIDC`. +* `portal_arn` - (Required) ARN of the web portal. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `identity_provider_arn` - ARN of the identity provider. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Identity Provider using the `identity_provider_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_identity_provider import WorkspaceswebIdentityProvider +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebIdentityProvider.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012") +``` + +Using `terraform import`, import WorkSpaces Web Identity Provider using the `identity_provider_arn`. For example: + +```console +% terraform import aws_workspacesweb_identity_provider.example arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_ip_access_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_ip_access_settings_association.html.markdown new file mode 100644 index 000000000000..aa5f06335720 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_ip_access_settings_association.html.markdown @@ -0,0 +1,88 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_ip_access_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. +--- + + + +# Resource: aws_workspacesweb_ip_access_settings_association + +Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_ip_access_settings import WorkspaceswebIpAccessSettings +from imports.aws.workspacesweb_ip_access_settings_association import WorkspaceswebIpAccessSettingsAssociation +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebIpAccessSettings(self, "example", + display_name="example", + ip_rule=[WorkspaceswebIpAccessSettingsIpRule( + ip_range="10.0.0.0/16" + ) + ] + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + aws_workspacesweb_ip_access_settings_association_example = + WorkspaceswebIpAccessSettingsAssociation(self, "example_2", + ip_access_settings_arn=example.ip_access_settings_arn, + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_ip_access_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `ip_access_settings_arn` - (Required) ARN of the IP access settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the IP access settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web IP Access Settings Association using the `ip_access_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_ip_access_settings_association import WorkspaceswebIpAccessSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebIpAccessSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:ipAccessSettings/ip_access_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_network_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_network_settings_association.html.markdown new file mode 100644 index 000000000000..4404a406a105 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_network_settings_association.html.markdown @@ -0,0 +1,147 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_network_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. +--- + + + +# Resource: aws_workspacesweb_network_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformCount, Fn, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_availability_zones import DataAwsAvailabilityZones +from imports.aws.security_group import SecurityGroup +from imports.aws.subnet import Subnet +from imports.aws.vpc import Vpc +from imports.aws.workspacesweb_network_settings import WorkspaceswebNetworkSettings +from imports.aws.workspacesweb_network_settings_association import WorkspaceswebNetworkSettingsAssociation +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = Vpc(self, "example", + cidr_block="10.0.0.0/16", + tags={ + "Name": "example" + } + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + available = DataAwsAvailabilityZones(self, "available", + filter=[DataAwsAvailabilityZonesFilter( + name="opt-in-status", + values=["opt-in-not-required"] + ) + ], + state="available" + ) + # In most cases loops should be handled in the programming language context and + # not inside of the Terraform context. If you are looping over something external, e.g. a variable or a file input + # you should consider using a for loop. If you are looping over something only known to Terraform, e.g. a result of a data source + # you need to keep this like it is. + example_count = TerraformCount.of(Token.as_number("2")) + aws_security_group_example = SecurityGroup(self, "example_3", + name="example-${" + example_count.index + "}", + tags={ + "Name": "example" + }, + vpc_id=example.id, + count=example_count + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_security_group_example.override_logical_id("example") + # In most cases loops should be handled in the programming language context and + # not inside of the Terraform context. If you are looping over something external, e.g. a variable or a file input + # you should consider using a for loop. If you are looping over something only known to Terraform, e.g. a result of a data source + # you need to keep this like it is. + aws_subnet_example_count = TerraformCount.of(Token.as_number("2")) + aws_subnet_example = Subnet(self, "example_4", + availability_zone=Token.as_string( + Fn.lookup_nested(available.names, [aws_subnet_example_count.index])), + cidr_block=Token.as_string( + Fn.cidrsubnet(example.cidr_block, 8, + Token.as_number(aws_subnet_example_count.index))), + tags={ + "Name": "example" + }, + vpc_id=example.id, + count=aws_subnet_example_count + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_subnet_example.override_logical_id("example") + aws_workspacesweb_network_settings_example = + WorkspaceswebNetworkSettings(self, "example_5", + security_group_ids=[ + Token.as_string(Fn.lookup_nested(aws_security_group_example, ["0", "id"])), + Token.as_string(Fn.lookup_nested(aws_security_group_example, ["1", "id"])) + ], + subnet_ids=[ + Token.as_string(Fn.lookup_nested(aws_subnet_example, ["0", "id"])), + Token.as_string(Fn.lookup_nested(aws_subnet_example, ["1", "id"])) + ], + vpc_id=example.id + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_network_settings_example.override_logical_id("example") + aws_workspacesweb_network_settings_association_example = + WorkspaceswebNetworkSettingsAssociation(self, "example_6", + network_settings_arn=Token.as_string(aws_workspacesweb_network_settings_example.network_settings_arn), + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_network_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `network_settings_arn` - (Required) ARN of the network settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the network settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Network Settings Association using the `network_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_network_settings_association import WorkspaceswebNetworkSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebNetworkSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:networkSettings/network_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_portal.html.markdown b/website/docs/cdktf/python/r/workspacesweb_portal.html.markdown new file mode 100644 index 000000000000..a2f54169625a --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_portal.html.markdown @@ -0,0 +1,146 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_portal" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Portal. +--- + + + +# Resource: aws_workspacesweb_portal + +Terraform resource for managing an AWS WorkSpaces Web Portal. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebPortal(self, "example", + display_name="example-portal", + instance_type="standard.regular" + ) +``` + +### Complete Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.kms_key import KmsKey +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = KmsKey(self, "example", + deletion_window_in_days=7, + description="KMS key for WorkSpaces Web Portal" + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + additional_encryption_context={ + "Environment": "Production" + }, + authentication_type="IAM_Identity_Center", + customer_managed_key=example.arn, + display_name="example-portal", + instance_type="standard.large", + max_concurrent_sessions=10, + tags={ + "Name": "example-portal" + }, + timeouts=[{ + "create": "10m", + "delete": "10m", + "update": "10m" + } + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are optional: + +* `additional_encryption_context` - (Optional) Additional encryption context for the customer managed key. Forces replacement if changed. +* `authentication_type` - (Optional) Authentication type for the portal. Valid values: `Standard`, `IAM_Identity_Center`. +* `browser_settings_arn` - (Optional) ARN of the browser settings to use for the portal. +* `customer_managed_key` - (Optional) ARN of the customer managed key. Forces replacement if changed. +* `display_name` - (Optional) Display name of the portal. +* `instance_type` - (Optional) Instance type for the portal. Valid values: `standard.regular`, `standard.large`. +* `max_concurrent_sessions` - (Optional) Maximum number of concurrent sessions for the portal. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `browser_type` - Browser type of the portal. +* `creation_date` - Creation date of the portal. +* `data_protection_settings_arn` - ARN of the data protection settings associated with the portal. +* `ip_access_settings_arn` - ARN of the IP access settings associated with the portal. +* `network_settings_arn` - ARN of the network settings associated with the portal. +* `portal_arn` - ARN of the portal. +* `portal_endpoint` - Endpoint URL of the portal. +* `portal_status` - Status of the portal. +* `renderer_type` - Renderer type of the portal. +* `session_logger_arn` - ARN of the session logger associated with the portal. +* `status_reason` - Reason for the current status of the portal. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +* `trust_store_arn` - ARN of the trust store associated with the portal. +* `user_access_logging_settings_arn` - ARN of the user access logging settings associated with the portal. +* `user_settings_arn` - ARN of the user settings associated with the portal. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `5m`) +* `update` - (Default `5m`) +* `delete` - (Default `5m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Portal using the `portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebPortal.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678") +``` + +Using `terraform import`, import WorkSpaces Web Portal using the `portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_portal.example arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_session_logger.html.markdown b/website/docs/cdktf/python/r/workspacesweb_session_logger.html.markdown new file mode 100644 index 000000000000..753347c6b90f --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_session_logger.html.markdown @@ -0,0 +1,257 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger. +--- + + + +# Resource: aws_workspacesweb_session_logger + +Terraform resource for managing an AWS WorkSpaces Web Session Logger. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.s3_bucket import S3Bucket +from imports.aws.s3_bucket_policy import S3BucketPolicy +from imports.aws.workspacesweb_session_logger import WorkspaceswebSessionLogger +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = S3Bucket(self, "example", + bucket="example-session-logs" + ) + data_aws_iam_policy_document_example = DataAwsIamPolicyDocument(self, "example_1", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["s3:PutObject"], + effect="Allow", + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["workspaces-web.amazonaws.com"], + type="Service" + ) + ], + resources=["${" + example.arn + "}/*"] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_iam_policy_document_example.override_logical_id("example") + aws_s3_bucket_policy_example = S3BucketPolicy(self, "example_2", + bucket=example.id, + policy=Token.as_string(data_aws_iam_policy_document_example.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_policy_example.override_logical_id("example") + aws_workspacesweb_session_logger_example = WorkspaceswebSessionLogger(self, "example_3", + depends_on=[aws_s3_bucket_policy_example], + display_name="example-session-logger", + event_filter=[WorkspaceswebSessionLoggerEventFilter( + all=[WorkspaceswebSessionLoggerEventFilterAll()] + ) + ], + log_configuration=[WorkspaceswebSessionLoggerLogConfiguration( + s3=[WorkspaceswebSessionLoggerLogConfigurationS3( + bucket=example.id, + folder_structure="Flat", + log_file_format="Json" + ) + ] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_session_logger_example.override_logical_id("example") +``` + +### Complete Configuration with KMS Encryption + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_caller_identity import DataAwsCallerIdentity +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.data_aws_partition import DataAwsPartition +from imports.aws.kms_key import KmsKey +from imports.aws.s3_bucket import S3Bucket +from imports.aws.s3_bucket_policy import S3BucketPolicy +from imports.aws.workspacesweb_session_logger import WorkspaceswebSessionLogger +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = S3Bucket(self, "example", + bucket="example-session-logs", + force_destroy=True + ) + current = DataAwsCallerIdentity(self, "current") + data_aws_iam_policy_document_example = DataAwsIamPolicyDocument(self, "example_2", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["s3:PutObject"], + effect="Allow", + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["workspaces-web.amazonaws.com"], + type="Service" + ) + ], + resources=[example.arn, "${" + example.arn + "}/*"] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_iam_policy_document_example.override_logical_id("example") + data_aws_partition_current = DataAwsPartition(self, "current_3") + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_partition_current.override_logical_id("current") + aws_s3_bucket_policy_example = S3BucketPolicy(self, "example_4", + bucket=example.id, + policy=Token.as_string(data_aws_iam_policy_document_example.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_policy_example.override_logical_id("example") + kms_key_policy = DataAwsIamPolicyDocument(self, "kms_key_policy", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["kms:*"], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["arn:${" + data_aws_partition_current.partition + "}:iam::${" + current.account_id + "}:root" + ], + type="AWS" + ) + ], + resources=["*"] + ), DataAwsIamPolicyDocumentStatement( + actions=["kms:Encrypt", "kms:GenerateDataKey*", "kms:ReEncrypt*", "kms:Decrypt" + ], + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["workspaces-web.amazonaws.com"], + type="Service" + ) + ], + resources=["*"] + ) + ] + ) + aws_kms_key_example = KmsKey(self, "example_6", + description="KMS key for WorkSpaces Web Session Logger", + policy=Token.as_string(kms_key_policy.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_kms_key_example.override_logical_id("example") + aws_workspacesweb_session_logger_example = WorkspaceswebSessionLogger(self, "example_7", + additional_encryption_context={ + "Application": "WorkSpacesWeb", + "Environment": "Production" + }, + customer_managed_key=Token.as_string(aws_kms_key_example.arn), + depends_on=[aws_s3_bucket_policy_example, aws_kms_key_example], + display_name="example-session-logger", + event_filter=[WorkspaceswebSessionLoggerEventFilter( + include=["SessionStart", "SessionEnd"] + ) + ], + log_configuration=[WorkspaceswebSessionLoggerLogConfiguration( + s3=[WorkspaceswebSessionLoggerLogConfigurationS3( + bucket=example.id, + bucket_owner=Token.as_string(current.account_id), + folder_structure="NestedByDate", + key_prefix="workspaces-web-logs/", + log_file_format="JsonLines" + ) + ] + ) + ], + tags={ + "Environment": "Production", + "Name": "example-session-logger" + } + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_session_logger_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `event_filter` - (Required) Event filter that determines which events are logged. See [Event Filter](#event-filter) below. +* `log_configuration` - (Required) Configuration block for specifying where logs are delivered. See [Log Configuration](#log-configuration) below. + +The following arguments are optional: + +* `additional_encryption_context` - (Optional) Map of additional encryption context key-value pairs. +* `customer_managed_key` - (Optional) ARN of the customer managed KMS key used to encrypt sensitive information. +* `display_name` - (Optional) Human-readable display name for the session logger resource. Forces replacement if changed. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Log Configuration + +* `s3` - (Required) Configuration block for S3 log delivery. See [S3 Configuration](#s3-configuration) below. + +### Event Filter + +Exactly one of the following must be specified: + +* `all` - (Optional) Block that specifies to monitor all events. Set to `{}` to monitor all events. +* `include` - (Optional) List of specific events to monitor. Valid values include session events like `SessionStart`, `SessionEnd`, etc. + +### S3 Configuration + +* `bucket` - (Required) S3 bucket name where logs are delivered. +* `folder_structure` - (Required) Folder structure that defines the organizational structure for log files in S3. Valid values: `FlatStructure`, `DateBasedStructure`. +* `log_file_format` - (Required) Format of the log file written to S3. Valid values: `Json`, `Parquet`. +* `bucket_owner` - (Optional) Expected bucket owner of the target S3 bucket. +* `key_prefix` - (Optional) S3 path prefix that determines where log files are stored. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `associated_portal_arns` - List of ARNs of the web portals associated with the session logger. +* `session_logger_arn` - ARN of the session logger. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +~> **Note:** The `additional_encryption_context` and `customer_managed_key` attributes are computed when not specified and will be populated with values from the AWS API response. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger using the `session_logger_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_session_logger import WorkspaceswebSessionLogger +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebSessionLogger.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678") +``` + +Using `terraform import`, import WorkSpaces Web Session Logger using the `session_logger_arn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_session_logger_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_session_logger_association.html.markdown new file mode 100644 index 000000000000..0d2b6467f87f --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_session_logger_association.html.markdown @@ -0,0 +1,134 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. +--- + + + +# Resource: aws_workspacesweb_session_logger_association + +Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_iam_policy_document import DataAwsIamPolicyDocument +from imports.aws.s3_bucket import S3Bucket +from imports.aws.s3_bucket_policy import S3BucketPolicy +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +from imports.aws.workspacesweb_session_logger import WorkspaceswebSessionLogger +from imports.aws.workspacesweb_session_logger_association import WorkspaceswebSessionLoggerAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = S3Bucket(self, "example", + bucket="example-session-logs", + force_destroy=True + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + data_aws_iam_policy_document_example = DataAwsIamPolicyDocument(self, "example_2", + statement=[DataAwsIamPolicyDocumentStatement( + actions=["s3:PutObject"], + effect="Allow", + principals=[DataAwsIamPolicyDocumentStatementPrincipals( + identifiers=["workspaces-web.amazonaws.com"], + type="Service" + ) + ], + resources=["${" + example.arn + "}/*"] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + data_aws_iam_policy_document_example.override_logical_id("example") + aws_s3_bucket_policy_example = S3BucketPolicy(self, "example_3", + bucket=example.id, + policy=Token.as_string(data_aws_iam_policy_document_example.json) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_s3_bucket_policy_example.override_logical_id("example") + aws_workspacesweb_session_logger_example = WorkspaceswebSessionLogger(self, "example_4", + depends_on=[aws_s3_bucket_policy_example], + display_name="example", + event_filter=[WorkspaceswebSessionLoggerEventFilter( + all=[WorkspaceswebSessionLoggerEventFilterAll()] + ) + ], + log_configuration=[WorkspaceswebSessionLoggerLogConfiguration( + s3=[WorkspaceswebSessionLoggerLogConfigurationS3( + bucket=example.id, + folder_structure="Flat", + log_file_format="Json" + ) + ] + ) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_session_logger_example.override_logical_id("example") + aws_workspacesweb_session_logger_association_example = + WorkspaceswebSessionLoggerAssociation(self, "example_5", + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn), + session_logger_arn=Token.as_string(aws_workspacesweb_session_logger_example.session_logger_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_session_logger_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `portal_arn` - (Required) ARN of the web portal. +* `session_logger_arn` - (Required) ARN of the session logger. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_session_logger_association import WorkspaceswebSessionLoggerAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebSessionLoggerAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + +Using `terraform import`, import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger_association.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_trust_store.html.markdown b/website/docs/cdktf/python/r/workspacesweb_trust_store.html.markdown new file mode 100644 index 000000000000..657699ad107f --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_trust_store.html.markdown @@ -0,0 +1,119 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store. +--- + + + +# Resource: aws_workspacesweb_trust_store + +Terraform resource for managing an AWS WorkSpaces Web Trust Store. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Fn, Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_trust_store import WorkspaceswebTrustStore +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebTrustStore(self, "example", + certificate=[WorkspaceswebTrustStoreCertificate( + body=Token.as_string(Fn.file("certificate.pem")) + ) + ] + ) +``` + +### Multiple Certificates + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Fn, Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_trust_store import WorkspaceswebTrustStore +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebTrustStore(self, "example", + certificate=[WorkspaceswebTrustStoreCertificate( + body=Token.as_string(Fn.file("certificate1.pem")) + ), WorkspaceswebTrustStoreCertificate( + body=Token.as_string(Fn.file("certificate2.pem")) + ) + ], + tags={ + "Name": "example-trust-store" + } + ) +``` + +## Argument Reference + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `certificate` - (Optional) Set of certificates to include in the trust store. See [Certificate](#certificate) below. +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Certificate + +* `body` - (Required) Certificate body in PEM format. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `associated_portal_arns` - List of ARNs of the web portals associated with the trust store. +* `trust_store_arn` - ARN of the trust store. +* `tags_all` - Map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +The `certificate` block exports the following additional attributes: + +* `issuer` - Certificate issuer. +* `not_valid_after` - Date and time when the certificate expires in RFC3339 format. +* `not_valid_before` - Date and time when the certificate becomes valid in RFC3339 format. +* `subject` - Certificate subject. +* `thumbprint` - Certificate thumbprint. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store using the `trust_store_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_trust_store import WorkspaceswebTrustStore +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebTrustStore.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678") +``` + +Using `terraform import`, import WorkSpaces Web Trust Store using the `trust_store_arn`. For example: + +```console +% terraform import aws_workspacesweb_trust_store.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_trust_store_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_trust_store_association.html.markdown new file mode 100644 index 000000000000..202aaea43b42 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_trust_store_association.html.markdown @@ -0,0 +1,92 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. +--- + + + +# Resource: aws_workspacesweb_trust_store_association + +Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Fn, Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +from imports.aws.workspacesweb_trust_store import WorkspaceswebTrustStore +from imports.aws.workspacesweb_trust_store_association import WorkspaceswebTrustStoreAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebPortal(self, "example", + display_name="example" + ) + aws_workspacesweb_trust_store_example = WorkspaceswebTrustStore(self, "example_1", + certificate_list=[ + Fn.base64encode(Token.as_string(Fn.file("certificate.pem"))) + ] + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_trust_store_example.override_logical_id("example") + aws_workspacesweb_trust_store_association_example = + WorkspaceswebTrustStoreAssociation(self, "example_2", + portal_arn=example.portal_arn, + trust_store_arn=Token.as_string(aws_workspacesweb_trust_store_example.trust_store_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_trust_store_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `trust_store_arn` - (Required) ARN of the trust store to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the trust store. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_trust_store_association import WorkspaceswebTrustStoreAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebTrustStoreAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + +Using `terraform import`, import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_trust_store_association.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_user_access_logging_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_user_access_logging_settings_association.html.markdown new file mode 100644 index 000000000000..162c1c7c1d82 --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_user_access_logging_settings_association.html.markdown @@ -0,0 +1,92 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_access_logging_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. +--- + + + +# Resource: aws_workspacesweb_user_access_logging_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.kinesis_stream import KinesisStream +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +from imports.aws.workspacesweb_user_access_logging_settings import WorkspaceswebUserAccessLoggingSettings +from imports.aws.workspacesweb_user_access_logging_settings_association import WorkspaceswebUserAccessLoggingSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = KinesisStream(self, "example", + name="amazon-workspaces-web-example", + shard_count=1 + ) + aws_workspacesweb_portal_example = WorkspaceswebPortal(self, "example_1", + display_name="example" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_portal_example.override_logical_id("example") + aws_workspacesweb_user_access_logging_settings_example = + WorkspaceswebUserAccessLoggingSettings(self, "example_2", + kinesis_stream_arn=example.arn + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_user_access_logging_settings_example.override_logical_id("example") + aws_workspacesweb_user_access_logging_settings_association_example = + WorkspaceswebUserAccessLoggingSettingsAssociation(self, "example_3", + portal_arn=Token.as_string(aws_workspacesweb_portal_example.portal_arn), + user_access_logging_settings_arn=Token.as_string(aws_workspacesweb_user_access_logging_settings_example.user_access_logging_settings_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_user_access_logging_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `user_access_logging_settings_arn` - (Required) ARN of the user access logging settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the user access logging settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Access Logging Settings Association using the `user_access_logging_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_user_access_logging_settings_association import WorkspaceswebUserAccessLoggingSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebUserAccessLoggingSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:userAccessLoggingSettings/user_access_logging_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/workspacesweb_user_settings_association.html.markdown b/website/docs/cdktf/python/r/workspacesweb_user_settings_association.html.markdown new file mode 100644 index 000000000000..45d78838da1e --- /dev/null +++ b/website/docs/cdktf/python/r/workspacesweb_user_settings_association.html.markdown @@ -0,0 +1,88 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Settings Association. +--- + + + +# Resource: aws_workspacesweb_user_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Settings Association. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_portal import WorkspaceswebPortal +from imports.aws.workspacesweb_user_settings import WorkspaceswebUserSettings +from imports.aws.workspacesweb_user_settings_association import WorkspaceswebUserSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + example = WorkspaceswebPortal(self, "example", + display_name="example" + ) + aws_workspacesweb_user_settings_example = WorkspaceswebUserSettings(self, "example_1", + copy_allowed="Enabled", + download_allowed="Enabled", + paste_allowed="Enabled", + print_allowed="Enabled", + upload_allowed="Enabled" + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_user_settings_example.override_logical_id("example") + aws_workspacesweb_user_settings_association_example = + WorkspaceswebUserSettingsAssociation(self, "example_2", + portal_arn=example.portal_arn, + user_settings_arn=Token.as_string(aws_workspacesweb_user_settings_example.user_settings_arn) + ) + # This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match. + aws_workspacesweb_user_settings_association_example.override_logical_id("example") +``` + +## Argument Reference + +The following arguments are required: + +* `user_settings_arn` - (Required) ARN of the user settings to associate with the portal. Forces replacement if changed. +* `portal_arn` - (Required) ARN of the portal to associate with the user settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Settings Association using the `user_settings_arn,portal_arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.workspacesweb_user_settings_association import WorkspaceswebUserSettingsAssociation +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + WorkspaceswebUserSettingsAssociation.generate_config_for_import(self, "example", "arn:aws:workspaces-web:us-west-2:123456789012:userSettings/user_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678") +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/ec2_client_vpn_endpoint.html.markdown b/website/docs/cdktf/typescript/d/ec2_client_vpn_endpoint.html.markdown index ee94a9c64673..a7c961fd8a06 100644 --- a/website/docs/cdktf/typescript/d/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/cdktf/typescript/d/ec2_client_vpn_endpoint.html.markdown @@ -95,12 +95,14 @@ This data source exports the following attributes in addition to the arguments a * `description` - Brief description of the endpoint. * `dnsName` - DNS name to be used by clients when connecting to the Client VPN endpoint. * `dnsServers` - Information about the DNS servers to be used for DNS resolution. +* `endpointIpAddressType` - IP address type for the Client VPN endpoint. * `securityGroupIds` - IDs of the security groups for the target network associated with the Client VPN endpoint. * `selfServicePortal` - Whether the self-service portal for the Client VPN endpoint is enabled. * `selfServicePortalUrl` - The URL of the self-service portal. * `serverCertificateArn` - The ARN of the server certificate. * `sessionTimeoutHours` - The maximum VPN session duration time in hours. * `splitTunnel` - Whether split-tunnel is enabled in the AWS Client VPN endpoint. +* `trafficIpAddressType` - IP address type for traffic within the Client VPN tunnel. * `transportProtocol` - Transport protocol used by the Client VPN endpoint. * `vpcId` - ID of the VPC associated with the Client VPN endpoint. * `vpnPort` - Port number for the Client VPN endpoint. @@ -111,4 +113,4 @@ This data source exports the following attributes in addition to the arguments a - `read` - (Default `20m`) - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/efs_mount_target.html.markdown b/website/docs/cdktf/typescript/d/efs_mount_target.html.markdown index c1089aac64b2..dad7da845176 100644 --- a/website/docs/cdktf/typescript/d/efs_mount_target.html.markdown +++ b/website/docs/cdktf/typescript/d/efs_mount_target.html.markdown @@ -56,6 +56,8 @@ This data source exports the following attributes in addition to the arguments a * `fileSystemArn` - Amazon Resource Name of the file system for which the mount target is intended. * `subnetId` - ID of the mount target's subnet. * `ipAddress` - Address at which the file system may be mounted via the mount target. +* `ipAddressType` - IP address type for the mount target. +* `ipv6Address` - IPv6 address at which the file system may be mounted via the mount target. * `securityGroups` - List of VPC security group IDs attached to the mount target. * `dnsName` - DNS name for the EFS file system. * `mountTargetDnsName` - The DNS name for the given subnet/AZ per [documented convention](http://docs.aws.amazon.com/efs/latest/ug/mounting-fs-mount-cmd-dns-name.html). @@ -64,4 +66,4 @@ This data source exports the following attributes in addition to the arguments a * `availabilityZoneId` - The unique and consistent identifier of the Availability Zone (AZ) that the mount target resides in. * `ownerId` - AWS account ID that owns the resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/lambda_function.html.markdown b/website/docs/cdktf/typescript/d/lambda_function.html.markdown index b3e49e33ccc9..71b9b0058a74 100644 --- a/website/docs/cdktf/typescript/d/lambda_function.html.markdown +++ b/website/docs/cdktf/typescript/d/lambda_function.html.markdown @@ -202,6 +202,7 @@ This data source exports the following attributes in addition to the arguments a * `signingProfileVersionArn` - ARN for a signing profile version. * `sourceCodeHash` - (**Deprecated** use `codeSha256` instead) Base64-encoded representation of raw SHA-256 sum of the zip file. * `sourceCodeSize` - Size in bytes of the function .zip file. +* `source_kms_key_arn` - ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. * `tags` - Map of tags assigned to the Lambda Function. * `timeout` - Function execution time at which Lambda should terminate the function. * `tracingConfig` - Tracing settings of the function. [See below](#tracing_config-attribute-reference). @@ -242,4 +243,4 @@ This data source exports the following attributes in addition to the arguments a * `subnetIds` - List of subnet IDs associated with the Lambda function. * `vpcId` - ID of the VPC. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/sesv2_email_identity.html.markdown b/website/docs/cdktf/typescript/d/sesv2_email_identity.html.markdown index 71c6d0d251a8..9c541dd97915 100644 --- a/website/docs/cdktf/typescript/d/sesv2_email_identity.html.markdown +++ b/website/docs/cdktf/typescript/d/sesv2_email_identity.html.markdown @@ -57,6 +57,7 @@ This data source exports the following attributes in addition to the arguments a * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identityType` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tags` - Key-value mapping of resource tags. +* `verificationStatus` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verifiedForSendingStatus` - Specifies whether or not the identity is verified. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown b/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown index b479b433300d..bd24b344b14c 100644 --- a/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown +++ b/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown @@ -134,6 +134,7 @@ class MyConvertedCode extends TerraformStack { |App Runner|`apprunner`|`AWS_ENDPOINT_URL_APPRUNNER`|`apprunner`| |AppStream 2.0|`appstream`|`AWS_ENDPOINT_URL_APPSTREAM`|`appstream`| |AppSync|`appsync`|`AWS_ENDPOINT_URL_APPSYNC`|`appsync`| +|Application Resilience Controller Region Switch|`arcregionswitch`|`AWS_ENDPOINT_URL_ARC_REGION_SWITCH`|`arc_region_switch`| |Athena|`athena`|`AWS_ENDPOINT_URL_ATHENA`|`athena`| |Audit Manager|`auditmanager`|`AWS_ENDPOINT_URL_AUDITMANAGER`|`auditmanager`| |Auto Scaling|`autoscaling`|`AWS_ENDPOINT_URL_AUTO_SCALING`|`auto_scaling`| @@ -475,4 +476,4 @@ class MyConvertedCode extends TerraformStack { ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown b/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown index 2988b6a01d43..2d2294759f21 100644 --- a/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown +++ b/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown @@ -280,7 +280,7 @@ This resource supports the following arguments: `ec2Configuration` supports the following: * `imageIdOverride` - (Optional) The AMI ID used for instances launched in the compute environment that match the image type. This setting overrides the `imageId` argument in the [`computeResources`](#compute_resources) block. -* `image_kubernetes_version` - (Optional) The Kubernetes version for the compute environment. If you don't specify a value, the latest version that AWS Batch supports is used. See [Supported Kubernetes versions](https://docs.aws.amazon.com/batch/latest/userguide/supported_kubernetes_version.html) for the list of Kubernetes versions supported by AWS Batch on Amazon EKS. +* `imageKubernetesVersion` - (Optional) The Kubernetes version for the compute environment. If you don't specify a value, the latest version that AWS Batch supports is used. See [Supported Kubernetes versions](https://docs.aws.amazon.com/batch/latest/userguide/supported_kubernetes_version.html) for the list of Kubernetes versions supported by AWS Batch on Amazon EKS. * `imageType` - (Optional) The image type to match with the instance type to select an AMI. If the `imageIdOverride` parameter isn't specified, then a recent [Amazon ECS-optimized Amazon Linux 2 AMI](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html#al2ami) (`ECS_AL2`) is used. ### launch_template @@ -303,7 +303,7 @@ This resource supports the following arguments: `updatePolicy` supports the following: * `jobExecutionTimeoutMinutes` - (Required) Specifies the job timeout (in minutes) when the compute environment infrastructure is updated. -* `terminateJobsOnUpdate` - (Required) Specifies whether jobs are automatically terminated when the computer environment infrastructure is updated. +* `terminateJobsOnUpdate` - (Required) Specifies whether jobs are automatically terminated when the compute environment infrastructure is updated. ## Attribute Reference @@ -347,4 +347,4 @@ Using `terraform import`, import AWS Batch compute using the `name`. For example [2]: http://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html [3]: http://docs.aws.amazon.com/batch/latest/userguide/troubleshooting.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown b/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown index 4033a438ef86..aa9053c93c76 100644 --- a/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown +++ b/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown @@ -416,7 +416,7 @@ The following arguments are optional: #### eks_metadata -* `labels` - Key-value pairs used to identify, sort, and organize cube resources. +* `labels` - Key-value pairs used to identify, sort, and organize kubernetes resources. #### `eks_secret` @@ -480,4 +480,4 @@ Using `terraform import`, import Batch Job Definition using the `arn`. For examp % terraform import aws_batch_job_definition.test arn:aws:batch:us-east-1:123456789012:job-definition/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datazone_domain.html.markdown b/website/docs/cdktf/typescript/r/datazone_domain.html.markdown index c9dcb3610fb5..c8281abddc6d 100644 --- a/website/docs/cdktf/typescript/r/datazone_domain.html.markdown +++ b/website/docs/cdktf/typescript/r/datazone_domain.html.markdown @@ -26,6 +26,7 @@ import { Fn, Token, TerraformStack } from "cdktf"; */ import { DatazoneDomain } from "./.gen/providers/aws/datazone-domain"; import { IamRole } from "./.gen/providers/aws/iam-role"; +import { IamRolePolicy } from "./.gen/providers/aws/iam-role-policy"; class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); @@ -51,25 +52,31 @@ class MyConvertedCode extends TerraformStack { Version: "2012-10-17", }) ), - inlinePolicy: [ - { - name: "domain_execution_policy", - policy: Token.asString( - Fn.jsonencode({ - Statement: [ - { - Action: ["datazone:*", "ram:*", "sso:*", "kms:*"], - Effect: "Allow", - Resource: "*", - }, - ], - Version: "2012-10-17", - }) - ), - }, - ], name: "my_domain_execution_role", }); + const awsIamRolePolicyDomainExecutionRole = new IamRolePolicy( + this, + "domain_execution_role_1", + { + policy: Token.asString( + Fn.jsonencode({ + Statement: [ + { + Action: ["datazone:*", "ram:*", "sso:*", "kms:*"], + Effect: "Allow", + Resource: "*", + }, + ], + Version: "2012-10-17", + }) + ), + role: domainExecutionRole.name, + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRolePolicyDomainExecutionRole.overrideLogicalId( + "domain_execution_role" + ); new DatazoneDomain(this, "example", { domainExecutionRole: domainExecutionRole.arn, name: "example", @@ -79,6 +86,131 @@ class MyConvertedCode extends TerraformStack { ``` +### V2 Domain + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsCallerIdentity } from "./.gen/providers/aws/data-aws-caller-identity"; +import { DataAwsIamPolicy } from "./.gen/providers/aws/data-aws-iam-policy"; +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { DatazoneDomain } from "./.gen/providers/aws/datazone-domain"; +import { IamRole } from "./.gen/providers/aws/iam-role"; +import { IamRolePolicyAttachment } from "./.gen/providers/aws/iam-role-policy-attachment"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const current = new DataAwsCallerIdentity(this, "current", {}); + const domainExecutionRole = new DataAwsIamPolicy( + this, + "domain_execution_role", + { + name: "SageMakerStudioDomainExecutionRolePolicy", + } + ); + const domainServiceRole = new DataAwsIamPolicy( + this, + "domain_service_role", + { + name: "SageMakerStudioDomainServiceRolePolicy", + } + ); + const assumeRoleDomainExecution = new DataAwsIamPolicyDocument( + this, + "assume_role_domain_execution", + { + statement: [ + { + actions: ["sts:AssumeRole", "sts:TagSession", "sts:SetContext"], + condition: [ + { + test: "StringEquals", + values: [Token.asString(current.accountId)], + variable: "aws:SourceAccount", + }, + { + test: "ForAllValues:StringLike", + values: ["datazone*"], + variable: "aws:TagKeys", + }, + ], + principals: [ + { + identifiers: ["datazone.amazonaws.com"], + type: "Service", + }, + ], + }, + ], + } + ); + const assumeRoleDomainService = new DataAwsIamPolicyDocument( + this, + "assume_role_domain_service", + { + statement: [ + { + actions: ["sts:AssumeRole"], + condition: [ + { + test: "StringEquals", + values: [Token.asString(current.accountId)], + variable: "aws:SourceAccount", + }, + ], + principals: [ + { + identifiers: ["datazone.amazonaws.com"], + type: "Service", + }, + ], + }, + ], + } + ); + const domainExecution = new IamRole(this, "domain_execution", { + assumeRolePolicy: Token.asString(assumeRoleDomainExecution.json), + name: "example-domain-execution-role", + }); + const domainService = new IamRole(this, "domain_service", { + assumeRolePolicy: Token.asString(assumeRoleDomainService.json), + name: "example-domain-service-role", + }); + const awsIamRolePolicyAttachmentDomainExecution = + new IamRolePolicyAttachment(this, "domain_execution_7", { + policyArn: Token.asString(domainExecutionRole.arn), + role: domainExecution.name, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRolePolicyAttachmentDomainExecution.overrideLogicalId( + "domain_execution" + ); + const awsIamRolePolicyAttachmentDomainService = new IamRolePolicyAttachment( + this, + "domain_service_8", + { + policyArn: Token.asString(domainServiceRole.arn), + role: domainService.name, + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRolePolicyAttachmentDomainService.overrideLogicalId("domain_service"); + new DatazoneDomain(this, "example", { + domainExecutionRole: domainExecution.arn, + domainVersion: "V2", + name: "example-domain", + serviceRole: domainService.arn, + }); + } +} + +``` + ## Argument Reference The following arguments are required: @@ -90,7 +222,9 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `description` - (Optional) Description of the Domain. +* `domainVersion` - (Optional) Version of the Domain. Valid values are `V1` and `V2`. Defaults to `V1`. * `kmsKeyIdentifier` - (Optional) ARN of the KMS key used to encrypt the Amazon DataZone domain, metadata and reporting data. +* `serviceRole` - (Optional) ARN of the service role used by DataZone. Required when `domainVersion` is set to `V2`. * `singleSignOn` - (Optional) Single sign on options, used to [enable AWS IAM Identity Center](https://docs.aws.amazon.com/datazone/latest/userguide/enable-IAM-identity-center-for-datazone.html) for DataZone. * `skipDeletionCheck` - (Optional) Whether to skip the deletion check for the Domain. @@ -142,4 +276,4 @@ Using `terraform import`, import DataZone Domain using the `domainId`. For examp % terraform import aws_datazone_domain.example domain-id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown b/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown index a515669ac314..4a4ff8e87db9 100644 --- a/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/dlm_lifecycle_policy.html.markdown @@ -114,6 +114,42 @@ class MyConvertedCode extends TerraformStack { ``` +### Example Default Policy + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DlmLifecyclePolicy } from "./.gen/providers/aws/dlm-lifecycle-policy"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new DlmLifecyclePolicy(this, "example", { + defaultPolicy: "VOLUME", + description: "tf-acc-basic", + executionRoleArn: Token.asString(awsIamRoleExample.arn), + policyDetails: { + createInterval: 5, + exclusions: { + excludeBootVolumes: false, + excludeTags: { + test: "exclude", + }, + excludeVolumeTypes: ["gp2"], + }, + policyLanguage: "SIMPLIFIED", + resourceType: "VOLUME", + }, + }); + } +} + +``` + ### Example Cross-Region Snapshot Copy Usage ```typescript @@ -273,6 +309,66 @@ class MyConvertedCode extends TerraformStack { ``` +### Example Post/Pre Scripts + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsIamPolicy } from "./.gen/providers/aws/data-aws-iam-policy"; +import { DlmLifecyclePolicy } from "./.gen/providers/aws/dlm-lifecycle-policy"; +import { IamRolePolicyAttachment } from "./.gen/providers/aws/iam-role-policy-attachment"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new DlmLifecyclePolicy(this, "example", { + description: "tf-acc-basic", + executionRoleArn: Token.asString(awsIamRoleExample.arn), + policyDetails: { + resourceTypes: ["INSTANCE"], + schedule: [ + { + createRule: { + interval: 12, + scripts: { + executeOperationOnScriptFailure: false, + executionHandler: "AWS_VSS_BACKUP", + maximumRetryCount: 2, + }, + }, + name: "Windows VSS", + retainRule: { + count: 10, + }, + }, + ], + targetTags: { + tag1: "Windows", + }, + }, + }); + const awsIamRolePolicyAttachmentExample = new IamRolePolicyAttachment( + this, + "example_1", + { + policyArn: Token.asString(dataAwsIamPolicyExample.arn), + role: test.id, + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsIamRolePolicyAttachmentExample.overrideLogicalId("example"); + new DataAwsIamPolicy(this, "test", { + name: "AWSDataLifecycleManagerSSMFullAccess", + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: @@ -280,6 +376,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `description` - (Required) A description for the DLM lifecycle policy. * `executionRoleArn` - (Required) The ARN of an IAM role that is able to be assumed by the DLM service. +* `defaultPolicy` - (Required) Specify the type of default policy to create. valid values are `VOLUME` or `INSTANCE`. * `policyDetails` - (Required) See the [`policyDetails` configuration](#policy-details-arguments) block. Max of 1. * `state` - (Optional) Whether the lifecycle policy should be enabled or disabled. `ENABLED` or `DISABLED` are valid values. Defaults to `ENABLED`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -287,9 +384,16 @@ This resource supports the following arguments: #### Policy Details arguments * `action` - (Optional) The actions to be performed when the event-based policy is triggered. You can specify only one action per policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`action` configuration](#action-arguments) block. +* `copyTags` - (Optional, Default policies only) Indicates whether the policy should copy tags from the source resource to the snapshot or AMI. Default value is `false`. +* `createInterval` - (Optional, Default policies only) How often the policy should run and create snapshots or AMIs. valid values range from `1` to `7`. Default value is `1`. +* `exclusions` - (Optional, Default policies only) Specifies exclusion parameters for volumes or instances for which you do not want to create snapshots or AMIs. See the [`exclusions` configuration](#exclusions-arguments) block. +* `extendDeletion` - (Optional, Default policies only) snapshot or AMI retention behavior for the policy if the source volume or instance is deleted, or if the policy enters the error, disabled, or deleted state. Default value is `false`. +* `retainInterval` - (Optional, Default policies only) Specifies how long the policy should retain snapshots or AMIs before deleting them. valid values range from `2` to `14`. Default value is `7`. * `eventSource` - (Optional) The event that triggers the event-based policy. This parameter is required for event-based policies only. If you are creating a snapshot or AMI policy, omit this parameter. See the [`eventSource` configuration](#event-source-arguments) block. +* `resourceType` - (Optional, Default policies only) Type of default policy to create. Valid values are `VOLUME` and `INSTANCE`. * `resourceTypes` - (Optional) A list of resource types that should be targeted by the lifecycle policy. Valid values are `VOLUME` and `INSTANCE`. * `resourceLocations` - (Optional) The location of the resources to backup. If the source resources are located in an AWS Region, specify `CLOUD`. If the source resources are located on an Outpost in your account, specify `OUTPOST`. If the source resources are located in a Local Zone, specify `LOCAL_ZONE`. Valid values are `CLOUD`, `LOCAL_ZONE`, and `OUTPOST`. +* `policyLanguage` - (Optional) Type of policy to create. `SIMPLIFIED` To create a default policy. `STANDARD` To create a custom policy. * `policyType` - (Optional) The valid target resource types and actions a policy can manage. Specify `EBS_SNAPSHOT_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of Amazon EBS snapshots. Specify `IMAGE_MANAGEMENT` to create a lifecycle policy that manages the lifecycle of EBS-backed AMIs. Specify `EVENT_BASED_POLICY` to create an event-based policy that performs specific actions when a defined event occurs in your AWS account. Default value is `EBS_SNAPSHOT_MANAGEMENT`. * `parameters` - (Optional) A set of optional parameters for snapshot and AMI lifecycle policies. See the [`parameters` configuration](#parameters-arguments) block. * `schedule` - (Optional) See the [`schedule` configuration](#schedule-arguments) block. @@ -324,6 +428,12 @@ This resource supports the following arguments: * `eventType` - (Required) The type of event. Currently, only `shareSnapshot` events are supported. * `snapshotOwner` - (Required) The IDs of the AWS accounts that can trigger policy by sharing snapshots with your account. The policy only runs if one of the specified AWS accounts shares a snapshot with your account. +#### Exclusions arguments + +* `excludeBootVolumes` - (Optional) Indicates whether to exclude volumes that are attached to instances as the boot volume. To exclude boot volumes, specify `true`. +* `excludeTags` - (Optional) Map specifies whether to exclude volumes that have specific tags. +* `excludeVolumeTypes` - (Optional) List specifies the volume types to exclude. + #### Parameters arguments * `excludeBootVolume` - (Optional) Indicates whether to exclude the root volume from snapshots created using CreateSnapshots. The default is `false`. @@ -331,6 +441,7 @@ This resource supports the following arguments: #### Schedule arguments +* `archiveRule` - (Optional) Specifies a snapshot archiving rule for a schedule. See [`archiveRule`](#archive-rule-arguments) block. * `copyTags` - (Optional) Copy all user-defined tags on a source volume to snapshots of the volume created by this policy. * `createRule` - (Required) See the [`createRule`](#create-rule-arguments) block. Max of 1 per schedule. * `crossRegionCopyRule` (Optional) - See the [`crossRegionCopyRule`](#cross-region-copy-rule-arguments) block. Max of 3 per schedule. @@ -342,12 +453,21 @@ This resource supports the following arguments: * `tagsToAdd` - (Optional) A map of tag keys and their values. DLM lifecycle policies will already tag the snapshot with the tags on the volume. This configuration adds extra tags on top of these. * `variableTags` - (Optional) A map of tag keys and variable values, where the values are determined when the policy is executed. Only `$(instance-id)` or `$(timestamp)` are valid values. Can only be used when `resourceTypes` is `INSTANCE`. +#### Archive Rule Arguments + +* `archiveRetainRule` - (Required) Information about the retention period for the snapshot archiving rule. See the [`archiveRetainRule`](#archive-retain-rule-arguments) block. + +#### Archive Retain Rule Arguments + +* `retentionArchiveTier` - (Required) Information about retention period in the Amazon EBS Snapshots Archive. See the [`retentionArchiveTier`](#retention-archive-tier-arguments) block. + #### Create Rule arguments * `cronExpression` - (Optional) The schedule, as a Cron expression. The schedule interval must be between 1 hour and 1 year. Conflicts with `interval`, `intervalUnit`, and `times`. * `interval` - (Optional) How often this lifecycle policy should be evaluated. `1`, `2`,`3`,`4`,`6`,`8`,`12` or `24` are valid values. Conflicts with `cronExpression`. If set, `intervalUnit` and `times` must also be set. * `intervalUnit` - (Optional) The unit for how often the lifecycle policy should be evaluated. `HOURS` is currently the only allowed value and also the default value. Conflicts with `cronExpression`. Must be set if `interval` is set. * `location` - (Optional) Specifies the destination for snapshots created by the policy. To create snapshots in the same Region as the source resource, specify `CLOUD`. To create snapshots on the same Outpost as the source resource, specify `OUTPOST_LOCAL`. If you omit this parameter, `CLOUD` is used by default. If the policy targets resources in an AWS Region, then you must create snapshots in the same Region as the source resource. If the policy targets resources on an Outpost, then you can create snapshots on the same Outpost as the source resource, or in the Region of that Outpost. Valid values are `CLOUD` and `OUTPOST_LOCAL`. +* `scripts` - (Optional) Specifies pre and/or post scripts for a snapshot lifecycle policy that targets instances. Valid only when `resourceType` is INSTANCE. See the [`scripts` configuration](#scripts-rule-arguments) block. * `times` - (Optional) A list of times in 24 hour clock format that sets when the lifecycle policy should be evaluated. Max of 1. Conflicts with `cronExpression`. Must be set if `interval` is set. #### Deprecate Rule arguments @@ -382,7 +502,8 @@ This resource supports the following arguments: * `deprecateRule` - (Optional) The AMI deprecation rule for cross-Region AMI copies created by the rule. See the [`deprecateRule`](#cross-region-copy-rule-deprecate-rule-arguments) block. * `encrypted` - (Required) To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Copies of encrypted snapshots are encrypted, even if this parameter is false or if encryption by default is not enabled. * `retainRule` - (Required) The retention rule that indicates how long snapshot copies are to be retained in the destination Region. See the [`retainRule`](#cross-region-copy-rule-retain-rule-arguments) block. Max of 1 per schedule. -* `target` - (Required) The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `target` - Use only for DLM policies of `policy_type=EBS_SNAPSHOT_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. +* `targetRegion` - Use only for DLM policies of `policy_type=IMAGE_MANAGEMENT`. The target Region or the Amazon Resource Name (ARN) of the target Outpost for the snapshot copies. #### Cross Region Copy Rule Deprecate Rule arguments @@ -394,6 +515,26 @@ This resource supports the following arguments: * `interval` - (Required) The amount of time to retain each snapshot. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days. * `intervalUnit` - (Required) The unit of time for time-based retention. Valid values: `DAYS`, `WEEKS`, `MONTHS`, or `YEARS`. +#### Scripts Rule arguments + +* `executeOperationOnScriptFailure` - (Optional) Indicates whether Amazon Data Lifecycle Manager should default to crash-consistent snapshots if the pre script fails. The default is `true`. + +* `executionHandler` - (Required) The SSM document that includes the pre and/or post scripts to run. In case automating VSS backups, specify `AWS_VSS_BACKUP`. In case automating application-consistent snapshots for SAP HANA workloads, specify `AWSSystemsManagerSAP-CreateDLMSnapshotForSAPHANA`. If you are using a custom SSM document that you own, specify either the name or ARN of the SSM document. + +* `executionHandlerService` - (Optional) Indicates the service used to execute the pre and/or post scripts. If using custom SSM documents or automating application-consistent snapshots of SAP HANA workloads, specify `AWS_SYSTEMS_MANAGER`. In case automating VSS Backups, omit this parameter. The default is `AWS_SYSTEMS_MANAGER`. + +* `executionTimeout` - (Optional) Specifies a timeout period, in seconds, after which Amazon Data Lifecycle Manager fails the script run attempt if it has not completed. In case automating VSS Backups, omit this parameter. The default is `10`. + +* `maximumRetryCount` - (Optional) Specifies the number of times Amazon Data Lifecycle Manager should retry scripts that fail. Must be an integer between `0` and `3`. The default is `0`. + +* `stages` - (Optional) List to indicate which scripts Amazon Data Lifecycle Manager should run on target instances. Pre scripts run before Amazon Data Lifecycle Manager initiates snapshot creation. Post scripts run after Amazon Data Lifecycle Manager initiates snapshot creation. Valid values: `PRE` and `POST`. The default is `PRE` and `POST` + +#### Retention Archive Tier Arguments + +* `count` - (Optional)The maximum number of snapshots to retain in the archive storage tier for each volume. Must be an integer between `1` and `1000`. Conflicts with `interval` and `intervalUnit`. +* `interval` - (Optional) Specifies the period of time to retain snapshots in the archive tier. After this period expires, the snapshot is permanently deleted. Conflicts with `count`. If set, `intervalUnit` must also be set. +* `intervalUnit` - (Optional) The unit of time for time-based retention. Valid values are `DAYS`, `WEEKS`, `MONTHS`, `YEARS`. Conflicts with `count`. Must be set if `interval` is set. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -434,4 +575,4 @@ Using `terraform import`, import DLM lifecycle policies using their policy ID. F % terraform import aws_dlm_lifecycle_policy.example policy-abcdef12345678901 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dx_hosted_connection.html.markdown b/website/docs/cdktf/typescript/r/dx_hosted_connection.html.markdown index 5a87d5d6109d..cbb473f63d11 100644 --- a/website/docs/cdktf/typescript/r/dx_hosted_connection.html.markdown +++ b/website/docs/cdktf/typescript/r/dx_hosted_connection.html.markdown @@ -55,7 +55,7 @@ This resource exports the following attributes in addition to the arguments abov * `awsDevice` - The Direct Connect endpoint on which the physical connection terminates. * `connectionRegion` - The AWS Region where the connection is located. * `hasLogicalRedundancy` - Indicates whether the connection supports a secondary BGP peer in the same address family (IPv4/IPv6). -* `id` - The ID of the connection. +* `id` - The ID of the hosted connection. * `jumboFrameCapable` - Boolean value representing if jumbo frames have been enabled for this connection. * `lagId` - The ID of the LAG. * `loaIssueTime` - The time of the most recent call to [DescribeLoa](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_DescribeLoa.html) for this connection. @@ -65,4 +65,4 @@ This resource exports the following attributes in addition to the arguments abov * `region` - (**Deprecated**) The AWS Region where the connection is located. Use `connectionRegion` instead. * `state` - The state of the connection. Possible values include: ordering, requested, pending, available, down, deleting, deleted, rejected, unknown. See [AllocateHostedConnection](https://docs.aws.amazon.com/directconnect/latest/APIReference/API_AllocateHostedConnection.html) for a description of each connection state. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dynamodb_contributor_insights.html.markdown b/website/docs/cdktf/typescript/r/dynamodb_contributor_insights.html.markdown index 930890712c6c..459748e553ed 100644 --- a/website/docs/cdktf/typescript/r/dynamodb_contributor_insights.html.markdown +++ b/website/docs/cdktf/typescript/r/dynamodb_contributor_insights.html.markdown @@ -41,6 +41,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `tableName` - (Required) The name of the table to enable contributor insights * `indexName` - (Optional) The global secondary index name +* `mode` - (Optional) argument to specify the [CloudWatch contributor insights mode](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/contributorinsights_HowItWorks.html#contributorinsights_HowItWorks.Modes) ## Attribute Reference @@ -78,4 +79,4 @@ Using `terraform import`, import `aws_dynamodb_contributor_insights` using the f % terraform import aws_dynamodb_contributor_insights.test name:ExampleTableName/index:ExampleIndexName/123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ec2_client_vpn_endpoint.html.markdown b/website/docs/cdktf/typescript/r/ec2_client_vpn_endpoint.html.markdown index d8f1ff240801..17cb549e13b2 100644 --- a/website/docs/cdktf/typescript/r/ec2_client_vpn_endpoint.html.markdown +++ b/website/docs/cdktf/typescript/r/ec2_client_vpn_endpoint.html.markdown @@ -54,7 +54,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `authenticationOptions` - (Required) Information about the authentication method to be used to authenticate clients. -* `clientCidrBlock` - (Required) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. +* `clientCidrBlock` - (Optional) The IPv4 address range, in CIDR notation, from which to assign client IP addresses. The address range cannot overlap with the local CIDR of the VPC in which the associated subnet is located, or the routes that you add manually. The address range cannot be changed after the Client VPN endpoint has been created. The CIDR block should be /22 or greater. When `trafficIpAddressType` is set to `ipv6`, it must not be specified. Otherwise, it is required. * `clientConnectOptions` - (Optional) The options for managing connection authorization for new client connections. * `clientLoginBannerOptions` - (Optional) Options for enabling a customizable text banner that will be displayed on AWS provided clients when a VPN session is established. * `clientRouteEnforcementOptions` - (Optional) Options for enforce administrator defined routes on devices connected through the VPN. @@ -62,12 +62,14 @@ This resource supports the following arguments: * `description` - (Optional) A brief description of the Client VPN endpoint. * `disconnectOnSessionTimeout` - (Optional) Indicates whether the client VPN session is disconnected after the maximum `sessionTimeoutHours` is reached. If `true`, users are prompted to reconnect client VPN. If `false`, client VPN attempts to reconnect automatically. The default value is `false`. * `dnsServers` - (Optional) Information about the DNS servers to be used for DNS resolution. A Client VPN endpoint can have up to two DNS servers. If no DNS server is specified, the DNS address of the connecting device is used. +* `endpointIpAddressType` - (Optional) IP address type for the Client VPN endpoint. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. * `securityGroupIds` - (Optional) The IDs of one or more security groups to apply to the target network. You must also specify the ID of the VPC that contains the security groups. * `selfServicePortal` - (Optional) Specify whether to enable the self-service portal for the Client VPN endpoint. Values can be `enabled` or `disabled`. Default value is `disabled`. * `serverCertificateArn` - (Required) The ARN of the ACM server certificate. * `sessionTimeoutHours` - (Optional) The maximum session duration is a trigger by which end-users are required to re-authenticate prior to establishing a VPN session. Default value is `24` - Valid values: `8 | 10 | 12 | 24` * `splitTunnel` - (Optional) Indicates whether split-tunnel is enabled on VPN endpoint. Default value is `false`. * `tags` - (Optional) A mapping of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `trafficIpAddressType` - (Optional) IP address type for traffic within the Client VPN tunnel. Valid values are `ipv4`, `ipv6`, or `dual-stack`. Defaults to `ipv4`. When it is set to `ipv6`, `clientCidrBlock` must not be specified. * `transportProtocol` - (Optional) The transport protocol to be used by the VPN session. Default value is `udp`. * `vpcId` - (Optional) The ID of the VPC to associate with the Client VPN endpoint. If no security group IDs are specified in the request, the default security group for the VPC is applied. * `vpnPort` - (Optional) The port number for the Client VPN endpoint. Valid values are `443` and `1194`. Default value is `443`. @@ -146,4 +148,4 @@ Using `terraform import`, import AWS Client VPN endpoints using the `id` value f % terraform import aws_ec2_client_vpn_endpoint.example cvpn-endpoint-0ac3a1abbccddd666 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecr_lifecycle_policy.html.markdown b/website/docs/cdktf/typescript/r/ecr_lifecycle_policy.html.markdown index 17be19e0ee3e..fa96b0d9f281 100644 --- a/website/docs/cdktf/typescript/r/ecr_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/ecr_lifecycle_policy.html.markdown @@ -103,6 +103,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_lifecycle_policy.example + identity = { + repository = "tf-example" + } +} + +resource "aws_ecr_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Lifecycle Policy using the name of the repository. For example: ```typescript @@ -129,4 +155,4 @@ Using `terraform import`, import ECR Lifecycle Policy using the name of the repo % terraform import aws_ecr_lifecycle_policy.example tf-example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecr_repository.html.markdown b/website/docs/cdktf/typescript/r/ecr_repository.html.markdown index e3d2e147fdca..f69894ceceed 100644 --- a/website/docs/cdktf/typescript/r/ecr_repository.html.markdown +++ b/website/docs/cdktf/typescript/r/ecr_repository.html.markdown @@ -113,6 +113,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository.service + identity = { + name = "test-service" + } +} + +resource "aws_ecr_repository" "service" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the ECR repository. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repositories using the `name`. For example: ```typescript @@ -139,4 +165,4 @@ Using `terraform import`, import ECR Repositories using the `name`. For example: % terraform import aws_ecr_repository.service test-service ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecr_repository_policy.html.markdown b/website/docs/cdktf/typescript/r/ecr_repository_policy.html.markdown index 18e490c87645..bd285f9755ad 100644 --- a/website/docs/cdktf/typescript/r/ecr_repository_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/ecr_repository_policy.html.markdown @@ -101,6 +101,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecr_repository_policy.example + identity = { + repository = "example" + } +} + +resource "aws_ecr_repository_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `repository` - (String) Name of the ECR repository. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECR Repository Policy using the repository name. For example: ```typescript @@ -127,4 +153,4 @@ Using `terraform import`, import ECR Repository Policy using the repository name % terraform import aws_ecr_repository_policy.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecs_service.html.markdown b/website/docs/cdktf/typescript/r/ecs_service.html.markdown index 2af4ad1f1ec1..538880364861 100644 --- a/website/docs/cdktf/typescript/r/ecs_service.html.markdown +++ b/website/docs/cdktf/typescript/r/ecs_service.html.markdown @@ -173,6 +173,34 @@ class MyConvertedCode extends TerraformStack { ``` +### Blue/Green Deployment with SIGINT Rollback + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { EcsService } from "./.gen/providers/aws/ecs-service"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new EcsService(this, "example", { + cluster: Token.asString(awsEcsClusterExample.id), + deploymentConfiguration: { + strategy: "BLUE_GREEN", + }, + name: "example", + sigintRollback: true, + waitForSteadyState: true, + }); + } +} + +``` + ### Redeploy Service On Every Apply The key used with `triggers` is arbitrary. @@ -239,6 +267,7 @@ The following arguments are optional: * `schedulingStrategy` - (Optional) Scheduling strategy to use for the service. The valid values are `REPLICA` and `DAEMON`. Defaults to `REPLICA`. Note that [*Tasks using the Fargate launch type or the `CODE_DEPLOY` or `EXTERNAL` deployment controller types don't support the `DAEMON` scheduling strategy*](https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_CreateService.html). * `serviceConnectConfiguration` - (Optional) ECS Service Connect configuration for this service to discover and connect to services, and be discovered by, and connected from, other services within a namespace. [See below](#service_connect_configuration). * `serviceRegistries` - (Optional) Service discovery registries for the service. The maximum number of `serviceRegistries` blocks is `1`. [See below](#service_registries). +* `sigintRollback` - (Optional) Whether to enable graceful termination of deployments using SIGINT signals. When enabled, allows customers to safely cancel an in-progress deployment and automatically trigger a rollback to the previous stable state. Defaults to `false`. Only applicable when using `ECS` deployment controller and requires `wait_for_steady_state = true`. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `taskDefinition` - (Optional) Family and revision (`family:revision`) or full ARN of the task definition that you want to run in your service. Required unless using the `EXTERNAL` deployment controller. If a revision is not specified, the latest `ACTIVE` revision is used. * `triggers` - (Optional) Map of arbitrary keys and values that, when changed, will trigger an in-place update (redeployment). Useful with `plantimestamp()`. See example above. @@ -409,7 +438,7 @@ For more information, see [Task Networking](https://docs.aws.amazon.com/AmazonEC `service` supports the following: -* `clientAlias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. The maximum number of client aliases that you can have in this list is 1. [See below](#client_alias). +* `clientAlias` - (Optional) List of client aliases for this Service Connect service. You use these to assign names that can be used by client applications. For each service block where enabled is true, exactly one `clientAlias` with one `port` should be specified. [See below](#client_alias). * `discoveryName` - (Optional) Name of the new AWS Cloud Map service that Amazon ECS creates for this Amazon ECS service. * `ingressPortOverride` - (Optional) Port number for the Service Connect proxy to listen on. * `portName` - (Required) Name of one of the `portMappings` from all the containers in the task definition of this Amazon ECS service. @@ -519,4 +548,4 @@ Using `terraform import`, import ECS services using the `name` together with ecs % terraform import aws_ecs_service.imported cluster-name/service-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/efs_mount_target.html.markdown b/website/docs/cdktf/typescript/r/efs_mount_target.html.markdown index 088b1af1e99b..140a52a28e30 100644 --- a/website/docs/cdktf/typescript/r/efs_mount_target.html.markdown +++ b/website/docs/cdktf/typescript/r/efs_mount_target.html.markdown @@ -56,6 +56,8 @@ This resource supports the following arguments: * `subnetId` - (Required) The ID of the subnet to add the mount target in. * `ipAddress` - (Optional) The address (within the address range of the specified subnet) at which the file system may be mounted via the mount target. +* `ipAddressType` - (Optional) IP address type for the mount target. Valid values are `IPV4_ONLY` (only IPv4 addresses), `IPV6_ONLY` (only IPv6 addresses), and `DUAL_STACK` (dual-stack, both IPv4 and IPv6 addresses). Defaults to `IPV4_ONLY`. +* `ipv6Address` - (Optional) IPv6 address to use. Valid only when `ipAddressType` is set to `IPV6_ONLY` or `DUAL_STACK`. * `securityGroups` - (Optional) A list of up to 5 VPC security group IDs (that must be for the same VPC as subnet specified) in effect for the mount target. @@ -111,4 +113,4 @@ Using `terraform import`, import the EFS mount targets using the `id`. For examp % terraform import aws_efs_mount_target.alpha fsmt-52a643fb ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/elasticache_global_replication_group.html.markdown b/website/docs/cdktf/typescript/r/elasticache_global_replication_group.html.markdown index 8630d1b73d57..bdc6d5dacf09 100644 --- a/website/docs/cdktf/typescript/r/elasticache_global_replication_group.html.markdown +++ b/website/docs/cdktf/typescript/r/elasticache_global_replication_group.html.markdown @@ -61,8 +61,7 @@ The initial Redis version is determined by the version set on the primary replic However, once it is part of a Global Replication Group, the Global Replication Group manages the version of all member replication groups. -The member replication groups must have [`lifecycle.ignore_changes[engine_version]`](https://www.terraform.io/language/meta-arguments/lifecycle) set, -or Terraform will always return a diff. +The provider is configured to ignore changes to `engine`, `engineVersion` and `parameterGroupName` inside `aws_elasticache_replication_group` resources if they belong to a global replication group. In this example, the primary replication group will be created with Redis 6.0, @@ -86,9 +85,6 @@ class MyConvertedCode extends TerraformStack { description: "primary replication group", engine: "redis", engineVersion: "6.0", - lifecycle: { - ignoreChanges: [engineVersion], - }, nodeType: "cache.m5.large", numCacheClusters: 1, replicationGroupId: "example-primary", @@ -101,9 +97,6 @@ class MyConvertedCode extends TerraformStack { new ElasticacheReplicationGroup(this, "secondary", { description: "secondary replication group", globalReplicationGroupId: example.globalReplicationGroupId, - lifecycle: { - ignoreChanges: [engineVersion], - }, numCacheClusters: 1, provider: otherRegion, replicationGroupId: "example-secondary", @@ -124,7 +117,12 @@ This resource supports the following arguments: See AWS documentation for information on [supported node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheNodes.SupportedTypes.html) and [guidance on selecting node types](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/nodes-select-size.html). When creating, by default the Global Replication Group inherits the node type of the primary replication group. -* `engineVersion` - (Optional) Redis version to use for the Global Replication Group. +* `engine` - (Optional) The name of the cache engine to be used for the clusters in this global replication group. + When creating, by default the Global Replication Group inherits the engine of the primary replication group. + If an engine is specified, the Global Replication Group and all member replication groups will be upgraded to this engine. + Valid values are `redis` or `valkey`. + Default is `redis` if `engineVersion` is specified. +* `engineVersion` - (Optional) Engine version to use for the Global Replication Group. When creating, by default the Global Replication Group inherits the version of the primary replication group. If a version is specified, the Global Replication Group and all member replication groups will be upgraded to this version. Cannot be downgraded without replacing the Global Replication Group and all member replication groups. @@ -137,7 +135,7 @@ This resource supports the following arguments: * `globalReplicationGroupDescription` - (Optional) A user-created description for the global replication group. * `numNodeGroups` - (Optional) The number of node groups (shards) on the global replication group. * `parameterGroupName` - (Optional) An ElastiCache Parameter Group to use for the Global Replication Group. - Required when upgrading a major engine version, but will be ignored if left configured after the upgrade is complete. + Required when upgrading an engine or major engine version, but will be ignored if left configured after the upgrade is complete. Specifying without a major version upgrade will fail. Note that ElastiCache creates a copy of this parameter group for each member replication group. @@ -151,7 +149,6 @@ This resource exports the following attributes in addition to the arguments abov * `atRestEncryptionEnabled` - A flag that indicate whether the encryption at rest is enabled. * `authTokenEnabled` - A flag that indicate whether AuthToken (password) is enabled. * `clusterEnabled` - Indicates whether the Global Datastore is cluster enabled. -* `engine` - The name of the cache engine to be used for the clusters in this global replication group. * `globalReplicationGroupId` - The full ID of the global replication group. * `globalNodeGroups` - Set of node groups (shards) on the global replication group. Has the values: @@ -199,4 +196,4 @@ Using `terraform import`, import ElastiCache Global Replication Groups using the % terraform import aws_elasticache_global_replication_group.my_global_replication_group okuqm-global-replication-group-1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/instance.html.markdown b/website/docs/cdktf/typescript/r/instance.html.markdown index 267bf8f39fb2..3c8d95416b9f 100644 --- a/website/docs/cdktf/typescript/r/instance.html.markdown +++ b/website/docs/cdktf/typescript/r/instance.html.markdown @@ -573,6 +573,32 @@ For `instanceMarketOptions`, in addition to the arguments above, the following a ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_instance.example + identity = { + id = "i-12345678" + } +} + +resource "aws_instance" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the instance. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import instances using the `id`. For example: ```typescript @@ -599,4 +625,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/kms_alias.html.markdown b/website/docs/cdktf/typescript/r/kms_alias.html.markdown index 3bb4204b4d31..97cc8193d27b 100644 --- a/website/docs/cdktf/typescript/r/kms_alias.html.markdown +++ b/website/docs/cdktf/typescript/r/kms_alias.html.markdown @@ -60,6 +60,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_alias.example + identity = { + name = "alias/my-key-alias" + } +} + +resource "aws_kms_alias" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the KMS key alias. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS aliases using the `name`. For example: ```typescript @@ -86,4 +112,4 @@ Using `terraform import`, import KMS aliases using the `name`. For example: % terraform import aws_kms_alias.a alias/my-key-alias ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/kms_external_key.html.markdown b/website/docs/cdktf/typescript/r/kms_external_key.html.markdown index c3600eb2921d..693d231883d2 100644 --- a/website/docs/cdktf/typescript/r/kms_external_key.html.markdown +++ b/website/docs/cdktf/typescript/r/kms_external_key.html.markdown @@ -41,14 +41,16 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `bypassPolicyLockoutSafetyCheck` - (Optional) Specifies whether to disable the policy lockout check performed when creating or updating the key's policy. Setting this value to `true` increases the risk that the key becomes unmanageable. For more information, refer to the scenario in the [Default Key Policy](https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam) section in the AWS Key Management Service Developer Guide. Defaults to `false`. * `deletionWindowInDays` - (Optional) Duration in days after which the key is deleted after destruction of the resource. Must be between `7` and `30` days. Defaults to `30`. * `description` - (Optional) Description of the key. * `enabled` - (Optional) Specifies whether the key is enabled. Keys pending import can only be `false`. Imported keys default to `true` unless expired. * `keyMaterialBase64` - (Optional) Base64 encoded 256-bit symmetric encryption key material to import. The CMK is permanently associated with this key material. The same key material can be reimported, but you cannot import different key material. +* `keySpec` - (Optional) Specifies whether the key contains a symmetric key or an asymmetric key pair and the encryption algorithms or signing algorithms that the key supports. Valid values: `SYMMETRIC_DEFAULT`, `RSA_2048`, `RSA_3072`, `RSA_4096`, `HMAC_224`, `HMAC_256`, `HMAC_384`, `HMAC_512`, `ECC_NIST_P256`, `ECC_NIST_P384`, `ECC_NIST_P521`, `ECC_SECG_P256K1`, `ML_DSA_44`, `ML_DSA_65`, `ML_DSA_87`, or `SM2` (China Regions only). Defaults to `SYMMETRIC_DEFAULT`. For help with choosing a key spec, see the [AWS KMS Developer Guide](https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html). +* `keyUsage` - (Optional) Specifies the intended use of the key. Valid values: `ENCRYPT_DECRYPT`, `SIGN_VERIFY`, or `GENERATE_VERIFY_MAC`. Defaults to `ENCRYPT_DECRYPT`. * `multiRegion` - (Optional) Indicates whether the KMS key is a multi-Region (`true`) or regional (`false`) key. Defaults to `false`. * `policy` - (Optional) A key policy JSON document. If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `tags` - (Optional) A key-value map of tags to assign to the key. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `validTo` - (Optional) Time at which the imported key material expires. When the key material expires, AWS KMS deletes the key material and the CMK becomes unusable. If not specified, key material does not expire. Valid values: [RFC3339 time string](https://tools.ietf.org/html/rfc3339#section-5.8) (`YYYY-MM-DDTHH:MM:SSZ`) @@ -60,7 +62,6 @@ This resource exports the following attributes in addition to the arguments abov * `expirationModel` - Whether the key material expires. Empty when pending key material import, otherwise `KEY_MATERIAL_EXPIRES` or `KEY_MATERIAL_DOES_NOT_EXPIRE`. * `id` - The unique identifier for the key. * `keyState` - The state of the CMK. -* `keyUsage` - The cryptographic operations for which you can use the CMK. * `tagsAll` - A map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Import @@ -95,4 +96,4 @@ Using `terraform import`, import KMS External Keys using the `id`. For example: % terraform import aws_kms_external_key.a arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/kms_key.html.markdown b/website/docs/cdktf/typescript/r/kms_key.html.markdown index bfe885aaee45..a2d7da2c47a1 100644 --- a/website/docs/cdktf/typescript/r/kms_key.html.markdown +++ b/website/docs/cdktf/typescript/r/kms_key.html.markdown @@ -429,6 +429,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kms_key.example + identity = { + id = "1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_kms_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the KMS key. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import KMS Keys using the `id`. For example: ```typescript @@ -459,4 +485,4 @@ Using `terraform import`, import KMS Keys using the `id`. For example: % terraform import aws_kms_key.a 1234abcd-12ab-34cd-56ef-1234567890ab ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lambda_function.html.markdown b/website/docs/cdktf/typescript/r/lambda_function.html.markdown index 00069b6b1542..1dcf17b6f138 100644 --- a/website/docs/cdktf/typescript/r/lambda_function.html.markdown +++ b/website/docs/cdktf/typescript/r/lambda_function.html.markdown @@ -660,6 +660,7 @@ The following arguments are optional: * `skipDestroy` - (Optional) Whether to retain the old version of a previously deployed Lambda Layer. Default is `false`. * `snapStart` - (Optional) Configuration block for snap start settings. [See below](#snap_start-configuration-block). * `sourceCodeHash` - (Optional) Base64-encoded SHA256 hash of the package file. Used to trigger updates when source code changes. +* `source_kms_key_arn` - (Optional) ARN of the AWS Key Management Service key used to encrypt the function's `.zip` deployment package. Conflicts with `imageUri`. * `tags` - (Optional) Key-value map of tags for the Lambda function. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `timeout` - (Optional) Amount of time your Lambda Function has to run in seconds. Defaults to 3. Valid between 1 and 900. * `tracingConfig` - (Optional) Configuration block for X-Ray tracing. [See below](#tracing_config-configuration-block). @@ -763,4 +764,4 @@ Using `terraform import`, import Lambda Functions using the `functionName`. For % terraform import aws_lambda_function.example example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb.html.markdown b/website/docs/cdktf/typescript/r/lb.html.markdown index fe4ad9b86d28..ff9b34628264 100644 --- a/website/docs/cdktf/typescript/r/lb.html.markdown +++ b/website/docs/cdktf/typescript/r/lb.html.markdown @@ -180,6 +180,7 @@ This resource supports the following arguments: * `namePrefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `securityGroups` - (Optional) List of security group IDs to assign to the LB. Only valid for Load Balancers of type `application` or `network`. For load balancers of type `network` security groups cannot be added if none are currently present, and cannot all be removed once added. If either of these conditions are met, this will force a recreation of the resource. * `preserveHostHeader` - (Optional) Whether the Application Load Balancer should preserve the Host header in the HTTP request and send it to the target without any change. Defaults to `false`. +* `secondaryIpsAutoAssignedPerSubnet` - (Optional) The number of secondary IP addresses to configure for your load balancer nodes. Only valid for Load Balancers of type `network`. The valid range is 0-7. When decreased, this will force a recreation of the resource. Default: `0`. * `subnetMapping` - (Optional) Subnet mapping block. See below. For Load Balancers of type `network` subnet mappings can only be added. * `subnets` - (Optional) List of subnet IDs to attach to the LB. For Load Balancers of type `network` subnets can only be added (see [Availability Zones](https://docs.aws.amazon.com/elasticloadbalancing/latest/network/network-load-balancers.html#availability-zones)), deleting a subnet for load balancers of type `network` will force a recreation of the resource. * `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. @@ -267,4 +268,4 @@ Using `terraform import`, import LBs using their ARN. For example: % terraform import aws_lb.bar arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/quicksight_account_subscription.html.markdown b/website/docs/cdktf/typescript/r/quicksight_account_subscription.html.markdown index 352ca8d2935c..cc1f28264d41 100644 --- a/website/docs/cdktf/typescript/r/quicksight_account_subscription.html.markdown +++ b/website/docs/cdktf/typescript/r/quicksight_account_subscription.html.markdown @@ -81,6 +81,8 @@ This resource exports the following attributes in addition to the arguments abov In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Account Subscription using `awsAccountId`. For example: +~> Due to the absence of required arguments in the [`DescribeAccountSettings`](https://docs.aws.amazon.com/quicksight/latest/APIReference/API_DescribeAccountSettings.html) API response, importing an existing account subscription will result in a planned replacement on the subsequent `apply` operation. Until the Describe API response in extended to include all configurable arguments, an [`ignore_changes` lifecycle argument](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle#ignore_changes) can be used to suppress differences on arguments not read into state. + ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; @@ -109,4 +111,4 @@ Using `terraform import`, import a QuickSight Account Subscription using `awsAcc % terraform import aws_quicksight_account_subscription.example "012345678901" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/route.html.markdown b/website/docs/cdktf/typescript/r/route.html.markdown index af07444d4d1a..26231fe10f63 100644 --- a/website/docs/cdktf/typescript/r/route.html.markdown +++ b/website/docs/cdktf/typescript/r/route.html.markdown @@ -125,6 +125,46 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route.example + identity = { + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + + ### OR by IPv6 CIDR block + # destination_ipv6_cidr_block = "10.42.0.0/16" + + ### OR by prefix list ID + # destination_prefix_list_id = "pl-0570a1d2d725c16be" + } +} + +resource "aws_route" "example" { + route_table_id = "rtb-656C65616E6F72" + destination_cidr_block = "10.42.0.0/16" + vpc_peering_connection_id = "pcx-45ff3dc1" +} +``` + +### Identity Schema + +#### Required + +- `routeTableId` - (String) ID of the route table. + +#### Optional + +~> Exactly one of of `destinationCidrBlock`, `destinationIpv6CidrBlock`, or `destinationPrefixListId` is required. + +- `accountId` (String) AWS Account where this resource is managed. +- `destinationCidrBlock` - (String) Destination IPv4 CIDR block. +- `destinationIpv6CidrBlock` - (String) Destination IPv6 CIDR block. +- `destinationPrefixListId` - (String) Destination IPv6 CIDR block. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import individual routes using `ROUTETABLEID_DESTINATION`. Import [local routes](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html#RouteTables) using the VPC's IPv4 or IPv6 CIDR blocks. For example: Import a route in route table `rtb-656C65616E6F72` with an IPv4 destination CIDR of `10.42.0.0/16`: @@ -219,4 +259,4 @@ Import a route in route table `rtb-656C65616E6F72` with a managed prefix list de % terraform import aws_route.my_route rtb-656C65616E6F72_pl-0570a1d2d725c16be ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/route53_resolver_rule.html.markdown b/website/docs/cdktf/typescript/r/route53_resolver_rule.html.markdown index e15536e28086..88a471db3699 100644 --- a/website/docs/cdktf/typescript/r/route53_resolver_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/route53_resolver_rule.html.markdown @@ -137,6 +137,32 @@ Values are `NOT_SHARED`, `SHARED_BY_ME` or `SHARED_WITH_ME` ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule.example + identity = { + id = "rslvr-rr-0123456789abcdef0" + } +} + +resource "aws_route53_resolver_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rules using the `id`. For example: ```typescript @@ -153,7 +179,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); Route53ResolverRule.generateConfigForImport( this, - "sys", + "example", "rslvr-rr-0123456789abcdef0" ); } @@ -164,7 +190,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import Route53 Resolver rules using the `id`. For example: ```console -% terraform import aws_route53_resolver_rule.sys rslvr-rr-0123456789abcdef0 +% terraform import aws_route53_resolver_rule.example rslvr-rr-0123456789abcdef0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/route53_resolver_rule_association.html.markdown b/website/docs/cdktf/typescript/r/route53_resolver_rule_association.html.markdown index 80836bf53ac0..7e84268a404a 100644 --- a/website/docs/cdktf/typescript/r/route53_resolver_rule_association.html.markdown +++ b/website/docs/cdktf/typescript/r/route53_resolver_rule_association.html.markdown @@ -52,6 +52,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_resolver_rule_association.example + identity = { + id = "rslvr-rrassoc-97242eaf88example" + } +} + +resource "aws_route53_resolver_rule_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the Route53 Resolver rule association. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Resolver rule associations using the `id`. For example: ```typescript @@ -82,4 +108,4 @@ Using `terraform import`, import Route53 Resolver rule associations using the `i % terraform import aws_route53_resolver_rule_association.example rslvr-rrassoc-97242eaf88example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/route_table.html.markdown b/website/docs/cdktf/typescript/r/route_table.html.markdown index 6a7f68f48995..0738480c420f 100644 --- a/website/docs/cdktf/typescript/r/route_table.html.markdown +++ b/website/docs/cdktf/typescript/r/route_table.html.markdown @@ -241,6 +241,32 @@ attribute once the route resource is created. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route_table.example + identity = { + id = "rtb-4e616f6d69" + } +} + +resource "aws_route_table" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the routing table. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route Tables using the route table `id`. For example: ```typescript @@ -267,4 +293,4 @@ Using `terraform import`, import Route Tables using the route table `id`. For ex % terraform import aws_route_table.public_rt rtb-4e616f6d69 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/s3tables_table_bucket.html.markdown b/website/docs/cdktf/typescript/r/s3tables_table_bucket.html.markdown index 407a5a01fd04..9cdff4920e4d 100644 --- a/website/docs/cdktf/typescript/r/s3tables_table_bucket.html.markdown +++ b/website/docs/cdktf/typescript/r/s3tables_table_bucket.html.markdown @@ -47,11 +47,12 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `encryptionConfiguration` - (Optional) A single table bucket encryption configuration object. [See `encryptionConfiguration` below](#encryption_configuration). +* `forceDestroy` - (Optional, Default:`false`) Whether all tables and namespaces within the table bucket should be deleted *when the table bucket is destroyed* so that the table bucket can be destroyed without error. These tables and namespaces are *not* recoverable. This only deletes tables and namespaces when the table bucket is destroyed, *not* when setting this parameter to `true`. Once this parameter is set to `true`, there must be a successful `terraform apply` run before a destroy is required to update this value in the resource state. Without a successful `terraform apply` after this parameter is set, this flag will have no effect. If setting this field in the same operation that would require replacing the table bucket or destroying the table bucket, this flag will not work. Additionally when importing a table bucket, a successful `terraform apply` is required to set this value in state before it will take effect on a destroy operation. * `maintenanceConfiguration` - (Optional) A single table bucket maintenance configuration object. [See `maintenanceConfiguration` below](#maintenance_configuration). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ### `encryptionConfiguration` @@ -125,4 +126,4 @@ Using `terraform import`, import S3 Tables Table Bucket using the `arn`. For exa % terraform import aws_s3tables_table_bucket.example arn:aws:s3tables:us-west-2:123456789012:bucket/example-bucket ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/secretsmanager_secret_version.html.markdown b/website/docs/cdktf/typescript/r/secretsmanager_secret_version.html.markdown index 9b608f5fe642..d10f5b34727c 100644 --- a/website/docs/cdktf/typescript/r/secretsmanager_secret_version.html.markdown +++ b/website/docs/cdktf/typescript/r/secretsmanager_secret_version.html.markdown @@ -129,6 +129,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_version.example + identity = { + secret_id = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + version_id = "xxxxx-xxxxxxx-xxxxxxx-xxxxx" + } +} + +resource "aws_secretsmanager_secret_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `secretId` - (String) ID of the secret. +* `versionId` - (String) ID of the secret version. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_version` using the secret ID and version ID. For example: ```typescript @@ -159,4 +187,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_version` using the s % terraform import aws_secretsmanager_secret_version.example 'arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456|xxxxx-xxxxxxx-xxxxxxx-xxxxx' ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sesv2_email_identity.html.markdown b/website/docs/cdktf/typescript/r/sesv2_email_identity.html.markdown index 2dcb9595a53b..93863be49f20 100644 --- a/website/docs/cdktf/typescript/r/sesv2_email_identity.html.markdown +++ b/website/docs/cdktf/typescript/r/sesv2_email_identity.html.markdown @@ -156,6 +156,7 @@ This resource exports the following attributes in addition to the arguments abov * `tokens` - If you used Easy DKIM to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete. If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key. * `identityType` - The email identity type. Valid values: `EMAIL_ADDRESS`, `DOMAIN`. * `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +* `verificationStatus` - The verification status of the identity. The status can be one of the following: `PENDING`, `SUCCESS`, `FAILED`, `TEMPORARY_FAILURE`, and `NOT_STARTED`. * `verifiedForSendingStatus` - Specifies whether or not the identity is verified. ## Import @@ -186,4 +187,4 @@ Using `terraform import`, import SESv2 (Simple Email V2) Email Identity using th % terraform import aws_sesv2_email_identity.example example.com ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sqs_queue.html.markdown b/website/docs/cdktf/typescript/r/sqs_queue.html.markdown index 35d46811e915..686a2e531bf4 100644 --- a/website/docs/cdktf/typescript/r/sqs_queue.html.markdown +++ b/website/docs/cdktf/typescript/r/sqs_queue.html.markdown @@ -208,7 +208,7 @@ This resource supports the following arguments: * `fifoThroughputLimit` - (Optional) Specifies whether the FIFO queue throughput quota applies to the entire queue or per message group. Valid values are `perQueue` (default) and `perMessageGroupId`. * `kmsDataKeyReusePeriodSeconds` - (Optional) Length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again. An integer representing seconds, between 60 seconds (1 minute) and 86,400 seconds (24 hours). The default is 300 (5 minutes). * `kmsMasterKeyId` - (Optional) ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK. For more information, see [Key Terms](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-sse-key-terms). -* `maxMessageSize` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 262144 bytes (256 KiB). The default for this attribute is 262144 (256 KiB). +* `maxMessageSize` - (Optional) Limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 1048576 bytes (1024 KiB). The default for this attribute is 262144 (256 KiB). * `messageRetentionSeconds` - (Optional) Number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4 days). * `name` - (Optional) Name of the queue. Queue names must be made up of only uppercase and lowercase ASCII letters, numbers, underscores, and hyphens, and must be between 1 and 80 characters long. For a FIFO (first-in-first-out) queue, the name must end with the `.fifo` suffix. If omitted, Terraform will assign a random, unique name. Conflicts with `namePrefix`. * `namePrefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. @@ -269,4 +269,4 @@ Using `terraform import`, import SQS Queues using the queue `url`. For example: % terraform import aws_sqs_queue.public_queue https://queue.amazonaws.com/80398EXAMPLE/MyQueue ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_association.html.markdown b/website/docs/cdktf/typescript/r/ssm_association.html.markdown index 150aa387b6d2..0326e3aecb9f 100644 --- a/website/docs/cdktf/typescript/r/ssm_association.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_association.html.markdown @@ -325,6 +325,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_association.example + identity = { + association_id = "10abcdef-0abc-1234-5678-90abcdef123456" + } +} + +resource "aws_ssm_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `associationId` - (String) ID of the SSM association. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM associations using the `associationId`. For example: ```typescript @@ -341,7 +367,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); SsmAssociation.generateConfigForImport( this, - "testAssociation", + "example", "10abcdef-0abc-1234-5678-90abcdef123456" ); } @@ -352,7 +378,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import SSM associations using the `associationId`. For example: ```console -% terraform import aws_ssm_association.test-association 10abcdef-0abc-1234-5678-90abcdef123456 +% terraform import aws_ssm_association.example 10abcdef-0abc-1234-5678-90abcdef123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_document.html.markdown b/website/docs/cdktf/typescript/r/ssm_document.html.markdown index a9f648d02b5d..575ce9b0d68b 100644 --- a/website/docs/cdktf/typescript/r/ssm_document.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_document.html.markdown @@ -134,6 +134,32 @@ The `parameter` configuration block provides the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_document.example + identity = { + name = "example" + } +} + +resource "aws_ssm_document" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the SSM document. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Documents using the name. For example: ```typescript @@ -196,4 +222,4 @@ class MyConvertedCode extends TerraformStack { ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_maintenance_window.html.markdown b/website/docs/cdktf/typescript/r/ssm_maintenance_window.html.markdown index 426eb12e7c2d..e88905977b32 100644 --- a/website/docs/cdktf/typescript/r/ssm_maintenance_window.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_maintenance_window.html.markdown @@ -64,6 +64,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window.example + identity = { + id = "mw-0123456789" + } +} + +resource "aws_ssm_maintenance_window" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the maintenance window. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Windows using the maintenance window `id`. For example: ```typescript @@ -80,7 +106,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); SsmMaintenanceWindow.generateConfigForImport( this, - "importedWindow", + "example", "mw-0123456789" ); } @@ -91,7 +117,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import SSM Maintenance Windows using the maintenance window `id`. For example: ```console -% terraform import aws_ssm_maintenance_window.imported-window mw-0123456789 +% terraform import aws_ssm_maintenance_window.example mw-0123456789 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_maintenance_window_target.html.markdown b/website/docs/cdktf/typescript/r/ssm_maintenance_window_target.html.markdown index 643f0a3a09c2..1e5932a11f8f 100644 --- a/website/docs/cdktf/typescript/r/ssm_maintenance_window_target.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_maintenance_window_target.html.markdown @@ -111,6 +111,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_target.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "23639a0b-ddbc-4bca-9e72-78d96EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `windowId` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window target. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Maintenance Window targets using `WINDOW_ID/WINDOW_TARGET_ID`. For example: ```typescript @@ -141,4 +169,4 @@ Using `terraform import`, import SSM Maintenance Window targets using `WINDOW_ID % terraform import aws_ssm_maintenance_window_target.example mw-0c50858d01EXAMPLE/23639a0b-ddbc-4bca-9e72-78d96EXAMPLE ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_maintenance_window_task.html.markdown b/website/docs/cdktf/typescript/r/ssm_maintenance_window_task.html.markdown index a1b73e050f41..e11ab1623d0e 100644 --- a/website/docs/cdktf/typescript/r/ssm_maintenance_window_task.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_maintenance_window_task.html.markdown @@ -270,6 +270,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_maintenance_window_task.example + identity = { + window_id = "mw-0c50858d01EXAMPLE" + id = "4f7ca192-7e9a-40fe-9192-5cb15EXAMPLE" + } +} + +resource "aws_ssm_maintenance_window_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `windowId` - (String) ID of the maintenance window. +* `id` - (String) ID of the maintenance window task. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Maintenance Window Task using the `windowId` and `windowTaskId` separated by `/`. For example: ```typescript @@ -286,7 +314,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); SsmMaintenanceWindowTask.generateConfigForImport( this, - "task", + "example", "/" ); } @@ -297,7 +325,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import AWS Maintenance Window Task using the `windowId` and `windowTaskId` separated by `/`. For example: ```console -% terraform import aws_ssm_maintenance_window_task.task / +% terraform import aws_ssm_maintenance_window_task.example / ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_parameter.html.markdown b/website/docs/cdktf/typescript/r/ssm_parameter.html.markdown index d4c4a1b8788b..c843e02e7657 100644 --- a/website/docs/cdktf/typescript/r/ssm_parameter.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_parameter.html.markdown @@ -121,6 +121,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_parameter.example + identity = { + name = "/my_path/my_paramname" + } +} + +resource "aws_ssm_parameter" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` - (String) Name of the parameter. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Parameters using the parameter store `name`. For example: ```typescript @@ -137,7 +163,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); SsmParameter.generateConfigForImport( this, - "myParam", + "example", "/my_path/my_paramname" ); } @@ -148,7 +174,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import SSM Parameters using the parameter store `name`. For example: ```console -% terraform import aws_ssm_parameter.my_param /my_path/my_paramname +% terraform import aws_ssm_parameter.example /my_path/my_paramname ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssm_patch_baseline.html.markdown b/website/docs/cdktf/typescript/r/ssm_patch_baseline.html.markdown index 7346512c9a8f..b470d2157c0e 100644 --- a/website/docs/cdktf/typescript/r/ssm_patch_baseline.html.markdown +++ b/website/docs/cdktf/typescript/r/ssm_patch_baseline.html.markdown @@ -254,6 +254,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssm_patch_baseline.example + identity = { + id = "pb-12345678" + } +} + +resource "aws_ssm_patch_baseline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the patch baseline. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSM Patch Baselines using their baseline ID. For example: ```typescript @@ -280,4 +306,4 @@ Using `terraform import`, import SSM Patch Baselines using their baseline ID. Fo % terraform import aws_ssm_patch_baseline.example pb-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_cluster.html.markdown b/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_cluster.html.markdown new file mode 100644 index 000000000000..378b53ad0403 --- /dev/null +++ b/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_cluster.html.markdown @@ -0,0 +1,364 @@ +--- +subcategory: "Timestream for InfluxDB" +layout: "aws" +page_title: "AWS: aws_timestreaminfluxdb_db_cluster" +description: |- + Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. +--- + + + +# Resource: aws_timestreaminfluxdb_db_cluster + +Terraform resource for managing an Amazon Timestream for InfluxDB read-replica cluster. + +~> **NOTE:** This resource requires a subscription to [Timestream for InfluxDB Read Replicas (Add-On) on the AWS Marketplace](https://aws.amazon.com/marketplace/pp/prodview-lftzfxtb5xlv4?applicationId=AWS-Marketplace-Console&ref_=beagle&sr=0-2). + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { TimestreaminfluxdbDbCluster } from "./.gen/providers/aws/timestreaminfluxdb-db-cluster"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new TimestreaminfluxdbDbCluster(this, "example", { + allocatedStorage: 20, + bucket: "example-bucket-name", + dbInstanceType: "db.influx.medium", + failoverMode: "AUTOMATIC", + name: "example-db-cluster", + organization: "organization", + password: "example-password", + port: 8086, + username: "admin", + vpcSecurityGroupIds: [Token.asString(awsSecurityGroupExample.id)], + vpcSubnetIds: [example1.id, example2.id], + }); + } +} + +``` + +### Usage with Prerequisite Resources + +All Timestream for InfluxDB clusters require a VPC, at least two subnets, and a security group. The following example shows how these prerequisite resources can be created and used with `aws_timestreaminfluxdb_db_cluster`. + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { SecurityGroup } from "./.gen/providers/aws/security-group"; +import { Subnet } from "./.gen/providers/aws/subnet"; +import { TimestreaminfluxdbDbCluster } from "./.gen/providers/aws/timestreaminfluxdb-db-cluster"; +import { Vpc } from "./.gen/providers/aws/vpc"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new Vpc(this, "example", { + cidrBlock: "10.0.0.0/16", + }); + const awsSecurityGroupExample = new SecurityGroup(this, "example_1", { + name: "example", + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsSecurityGroupExample.overrideLogicalId("example"); + const example1 = new Subnet(this, "example_1_2", { + cidrBlock: "10.0.1.0/24", + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + example1.overrideLogicalId("example_1"); + const example2 = new Subnet(this, "example_2", { + cidrBlock: "10.0.2.0/24", + vpcId: example.id, + }); + const awsTimestreaminfluxdbDbClusterExample = + new TimestreaminfluxdbDbCluster(this, "example_4", { + allocatedStorage: 20, + bucket: "example-bucket-name", + dbInstanceType: "db.influx.medium", + name: "example-db-cluster", + organization: "organization", + password: "example-password", + username: "admin", + vpcSecurityGroupIds: [Token.asString(awsSecurityGroupExample.id)], + vpcSubnetIds: [example1.id, example2.id], + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsTimestreaminfluxdbDbClusterExample.overrideLogicalId("example"); + } +} + +``` + +### Usage with Public Internet Access Enabled + +The following configuration shows how to define the necessary resources and arguments to allow public internet access on your Timestream for InfluxDB read-replica cluster's primary endpoint (simply referred to as "endpoint") and read endpoint on port `8086`. After applying this configuration, the cluster's InfluxDB UI can be accessed by visiting your cluster's primary endpoint at port `8086`. + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, Op, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { InternetGateway } from "./.gen/providers/aws/internet-gateway"; +import { Route } from "./.gen/providers/aws/route"; +import { RouteTableAssociation } from "./.gen/providers/aws/route-table-association"; +import { SecurityGroup } from "./.gen/providers/aws/security-group"; +import { Subnet } from "./.gen/providers/aws/subnet"; +import { TimestreaminfluxdbDbCluster } from "./.gen/providers/aws/timestreaminfluxdb-db-cluster"; +import { Vpc } from "./.gen/providers/aws/vpc"; +import { VpcSecurityGroupIngressRule } from "./.gen/providers/aws/vpc-security-group-ingress-rule"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new Vpc(this, "example", { + cidrBlock: "10.0.0.0/16", + }); + const awsInternetGatewayExample = new InternetGateway(this, "example_1", { + tags: { + Name: "example", + }, + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsInternetGatewayExample.overrideLogicalId("example"); + new Route(this, "test_route", { + destinationCidrBlock: "0.0.0.0/0", + gatewayId: Token.asString(awsInternetGatewayExample.id), + routeTableId: example.mainRouteTableId, + }); + new RouteTableAssociation(this, "test_route_table_association", { + routeTableId: example.mainRouteTableId, + subnetId: testSubnet.id, + }); + const awsSecurityGroupExample = new SecurityGroup(this, "example_4", { + name: "example", + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsSecurityGroupExample.overrideLogicalId("example"); + const example1 = new Subnet(this, "example_1_5", { + cidrBlock: "10.0.1.0/24", + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + example1.overrideLogicalId("example_1"); + const example2 = new Subnet(this, "example_2", { + cidrBlock: "10.0.2.0/24", + vpcId: example.id, + }); + const awsTimestreaminfluxdbDbClusterExample = + new TimestreaminfluxdbDbCluster(this, "example_7", { + allocatedStorage: 20, + bucket: "example-bucket-name", + dbInstanceType: "db.influx.medium", + name: "example-db-cluster", + organization: "organization", + password: "example-password", + publiclyAccessible: true, + username: "admin", + vpcSecurityGroupIds: [Token.asString(awsSecurityGroupExample.id)], + vpcSubnetIds: [example1.id, example2.id], + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsTimestreaminfluxdbDbClusterExample.overrideLogicalId("example"); + const awsVpcSecurityGroupIngressRuleExample = + new VpcSecurityGroupIngressRule(this, "example_8", { + ipProtocol: Token.asString(Op.negate(1)), + referencedSecurityGroupId: Token.asString(awsSecurityGroupExample.id), + securityGroupId: Token.asString(awsSecurityGroupExample.id), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsVpcSecurityGroupIngressRuleExample.overrideLogicalId("example"); + } +} + +``` + +### Usage with S3 Log Delivery Enabled + +You can use an S3 bucket to store logs generated by your Timestream for InfluxDB cluster. The following example shows what resources and arguments are required to configure an S3 bucket for logging, including the IAM policy that needs to be set in order to allow Timestream for InfluxDB to place logs in your S3 bucket. The configuration of the required VPC, security group, and subnets have been left out of the example for brevity. + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { S3Bucket } from "./.gen/providers/aws/s3-bucket"; +import { S3BucketPolicy } from "./.gen/providers/aws/s3-bucket-policy"; +import { TimestreaminfluxdbDbCluster } from "./.gen/providers/aws/timestreaminfluxdb-db-cluster"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new S3Bucket(this, "example", { + bucket: "example-s3-bucket", + forceDestroy: true, + }); + const awsTimestreaminfluxdbDbClusterExample = + new TimestreaminfluxdbDbCluster(this, "example_1", { + allocatedStorage: 20, + bucket: "example-bucket-name", + dbInstanceType: "db.influx.medium", + logDeliveryConfiguration: [ + { + s3Configuration: [ + { + bucketName: example.bucket, + enabled: true, + }, + ], + }, + ], + name: "example-db-cluster", + organization: "organization", + password: "example-password", + username: "admin", + vpcSecurityGroupIds: [Token.asString(awsSecurityGroupExample.id)], + vpcSubnetIds: [example1.id, example2.id], + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsTimestreaminfluxdbDbClusterExample.overrideLogicalId("example"); + const dataAwsIamPolicyDocumentExample = new DataAwsIamPolicyDocument( + this, + "example_2", + { + statement: [ + { + actions: ["s3:PutObject"], + principals: [ + { + identifiers: ["timestream-influxdb.amazonaws.com"], + type: "Service", + }, + ], + resources: ["${" + example.arn + "}/*"], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsIamPolicyDocumentExample.overrideLogicalId("example"); + const awsS3BucketPolicyExample = new S3BucketPolicy(this, "example_3", { + bucket: example.id, + policy: Token.asString(dataAwsIamPolicyDocumentExample.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketPolicyExample.overrideLogicalId("example"); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `allocatedStorage` - (Required) Amount of storage in GiB (gibibytes). The minimum value is `20`, the maximum value is `16384`. The argument `dbStorageType` places restrictions on this argument's minimum value. The following is a list of `dbStorageType` values and the corresponding minimum value for `allocatedStorage`: `"InfluxIOIncludedT1": `20`, `"InfluxIOIncludedT2" and `"InfluxIOIncludedT3": `400`. +* `bucket` - (Required) Name of the initial InfluxDB bucket. All InfluxDB data is stored in a bucket. A bucket combines the concept of a database and a retention period (the duration of time that each data point persists). A bucket belongs to an organization. Along with `organization`, `username`, and `password`, this argument will be stored in the secret referred to by the `influxAuthParametersSecretArn` attribute. +* `dbInstanceType` - (Required) Timestream for InfluxDB DB instance type to run InfluxDB on. Valid options are: `"db.influx.medium"`, `"db.influx.large"`, `"db.influx.xlarge"`, `"db.influx.2xlarge"`, `"db.influx.4xlarge"`, `"db.influx.8xlarge"`, `"db.influx.12xlarge"`, and `"db.influx.16xlarge"`. This argument is updatable. +* `name` - (Required) Name that uniquely identifies the DB cluster when interacting with the Amazon Timestream for InfluxDB API and CLI commands. This name will also be a prefix included in the endpoint. Cluster names must be unique per customer and per region. The argument must start with a letter, cannot contain consecutive hyphens (`-`) and cannot end with a hyphen. +* `password` - (Required) Password of the initial admin user created in InfluxDB. This password will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `username`, and `organization`, this argument will be stored in the secret referred to by the `influxAuthParametersSecretArn` attribute. +* `organization` - (Required) Name of the initial organization for the initial admin user in InfluxDB. An InfluxDB organization is a workspace for a group of users. Along with `bucket`, `username`, and `password`, this argument will be stored in the secret referred to by the `influxAuthParametersSecretArn` attribute. +* `username` - (Required) Username of the initial admin user created in InfluxDB. Must start with a letter and can't end with a hyphen or contain two consecutive hyphens. This username will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `organization`, and `password`, this argument will be stored in the secret referred to by the `influxAuthParametersSecretArn` attribute. +* `vpcSecurityGroupIds` - (Required) List of VPC security group IDs to associate with the cluster. +* `vpcSubnetIds` - (Required) List of VPC subnet IDs to associate with the cluster. Provide at least two VPC subnet IDs in different availability zones when deploying with a Multi-AZ standby. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `dbParameterGroupIdentifier` - (Optional) ID of the DB parameter group assigned to your cluster. This argument is updatable. If added to an existing Timestream for InfluxDB cluster or given a new value, will cause an in-place update to the cluster. However, if a cluster already has a value for `dbParameterGroupIdentifier`, removing `dbParameterGroupIdentifier` will cause the cluster to be destroyed and recreated. +* `dbStorageType` - (Default `"InfluxIOIncludedT1"`) Timestream for InfluxDB DB storage type to read and write InfluxDB data. You can choose between 3 different types of provisioned Influx IOPS included storage according to your workloads requirements: Influx IO Included 3000 IOPS, Influx IO Included 12000 IOPS, Influx IO Included 16000 IOPS. Valid options are: `"InfluxIOIncludedT1"`, `"InfluxIOIncludedT2"`, and `"InfluxIOIncludedT3"`. If you use `"InfluxIOIncludedT2" or "InfluxIOIncludedT3", the minimum value for `allocated_storage` is 400. +* `deploymentType` - (Default `"MULTI_NODE_READ_REPLICAS"`) Specifies the type of cluster to create. Valid options are: `"MULTI_NODE_READ_REPLICAS"`. +* `failoverMode` - (Default `"AUTOMATIC"`) Specifies the behavior of failure recovery when the primary node of the cluster fails. Valid options are: `"AUTOMATIC"` and `"NO_FAILOVER"`. +* `logDeliveryConfiguration` - (Optional) Configuration for sending InfluxDB engine logs to a specified S3 bucket. This argument is updatable. +* `networkType` - (Optional) Specifies whether the network type of the Timestream for InfluxDB cluster is IPV4, which can communicate over IPv4 protocol only, or DUAL, which can communicate over both IPv4 and IPv6 protocols. +* `port` - (Default `8086`) The port on which the cluster accepts connections. Valid values: `1024`-`65535`. Cannot be `2375`-`2376`, `7788`-`7799`, `8090`, or `51678`-`51680`. This argument is updatable. +* `publiclyAccessible` - (Default `false`) Configures the DB cluster with a public IP to facilitate access. Other resources, such as a VPC, a subnet, an internet gateway, and a route table with routes, are also required to enabled public access, in addition to this argument. See "[Usage with Public Internet Access Enabled](#usage-with-public-internet-access-enabled)" for an example configuration with all required resources for public internet access. +* `tags` - (Optional) Map of tags assigned to the resource. If configured with a provider [`defaultTags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Nested Fields + +#### `logDeliveryConfiguration` + +* `s3Configuration` - (Required) Configuration for S3 bucket log delivery. + +#### `s3Configuration` + +* `bucketName` - (Required) Name of the S3 bucket to deliver logs to. +* `enabled` - (Required) Indicates whether log delivery to the S3 bucket is enabled. + +**Note**: The following arguments do updates in-place: `dbParameterGroupIdentifier`, `logDeliveryConfiguration`, `port`, `dbInstanceType`, `failoverMode`, and `tags`. Changes to any other argument after a cluster has been deployed will cause destruction and re-creation of the cluster. Additionally, when `dbParameterGroupIdentifier` is added to a cluster or modified, the cluster will be updated in-place but if `dbParameterGroupIdentifier` is removed from a cluster, the cluster will be destroyed and re-created. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Timestream for InfluxDB cluster. +* `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. +* `id` - ID of the Timestream for InfluxDB cluster. +* `influxAuthParametersSecretArn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. +* `readerEndpoint` - The endpoint used to connect to the Timestream for InfluxDB cluster for read-only operations. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Timestream for InfluxDB cluster using its identifier. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { TimestreaminfluxdbDbCluster } from "./.gen/providers/aws/timestreaminfluxdb-db-cluster"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + TimestreaminfluxdbDbCluster.generateConfigForImport( + this, + "example", + "12345abcde" + ); + } +} + +``` + +Using `terraform import`, import Timestream for InfluxDB cluster using its identifier. For example: + +```console +% terraform import aws_timestreaminfluxdb_db_cluster.example 12345abcde +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_instance.html.markdown b/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_instance.html.markdown index 3c39c0c3258f..b44468542083 100644 --- a/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_instance.html.markdown +++ b/website/docs/cdktf/typescript/r/timestreaminfluxdb_db_instance.html.markdown @@ -350,7 +350,7 @@ This resource exports the following attributes in addition to the arguments abov * `availabilityZone` - Availability Zone in which the DB instance resides. * `endpoint` - Endpoint used to connect to InfluxDB. The default InfluxDB port is 8086. * `id` - ID of the Timestream for InfluxDB instance. -* `influxAuthParametersSecretArn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. This secret will be read by the `aws_timestreaminfluxdb_db_instance` resource in order to support importing: deleting the secret or secret values can cause errors. +* `influxAuthParametersSecretArn` - ARN of the AWS Secrets Manager secret containing the initial InfluxDB authorization parameters. The secret value is a JSON formatted key-value pair holding InfluxDB authorization values: organization, bucket, username, and password. * `secondaryAvailabilityZone` - Availability Zone in which the standby instance is located when deploying with a MultiAZ standby instance. * `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). @@ -394,4 +394,4 @@ Using `terraform import`, import Timestream for InfluxDB Db Instance using its i % terraform import aws_timestreaminfluxdb_db_instance.example 12345abcde ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_browser_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_browser_settings_association.html.markdown new file mode 100644 index 000000000000..86cccd9e828e --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_browser_settings_association.html.markdown @@ -0,0 +1,114 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_browser_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. +--- + + + +# Resource: aws_workspacesweb_browser_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Browser Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Fn, Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebBrowserSettings } from "./.gen/providers/aws/workspacesweb-browser-settings"; +import { WorkspaceswebBrowserSettingsAssociation } from "./.gen/providers/aws/workspacesweb-browser-settings-association"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebBrowserSettings(this, "example", { + browserPolicy: Token.asString( + Fn.jsonencode({ + chromePolicies: { + DefaultDownloadDirectory: { + value: "/home/as2-streaming-user/MyFiles/TemporaryFiles1", + }, + }, + }) + ), + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const awsWorkspaceswebBrowserSettingsAssociationExample = + new WorkspaceswebBrowserSettingsAssociation(this, "example_2", { + browserSettingsArn: example.browserSettingsArn, + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebBrowserSettingsAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `browserSettingsArn` - (Required) ARN of the browser settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the browser settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebBrowserSettingsAssociation } from "./.gen/providers/aws/workspacesweb-browser-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebBrowserSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Browser Settings Association using the `browser_settings_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_browser_settings_association.example arn:aws:workspaces-web:us-west-2:123456789012:browserSettings/browser_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_data_protection_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_data_protection_settings_association.html.markdown new file mode 100644 index 000000000000..5ad2f6955cf3 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_data_protection_settings_association.html.markdown @@ -0,0 +1,100 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_data_protection_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. +--- + + + +# Resource: aws_workspacesweb_data_protection_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Data Protection Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebDataProtectionSettings } from "./.gen/providers/aws/workspacesweb-data-protection-settings"; +import { WorkspaceswebDataProtectionSettingsAssociation } from "./.gen/providers/aws/workspacesweb-data-protection-settings-association"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebDataProtectionSettings(this, "example", { + displayName: "example", + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const awsWorkspaceswebDataProtectionSettingsAssociationExample = + new WorkspaceswebDataProtectionSettingsAssociation(this, "example_2", { + dataProtectionSettingsArn: example.dataProtectionSettingsArn, + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebDataProtectionSettingsAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `dataProtectionSettingsArn` - (Required) ARN of the data protection settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the data protection settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Data Protection Settings Association using the `data_protection_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebDataProtectionSettingsAssociation } from "./.gen/providers/aws/workspacesweb-data-protection-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebDataProtectionSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:dataProtectionSettings/data_protection_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_identity_provider.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_identity_provider.html.markdown new file mode 100644 index 000000000000..3553c1002637 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_identity_provider.html.markdown @@ -0,0 +1,173 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_identity_provider" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Identity Provider. +--- + + + +# Resource: aws_workspacesweb_identity_provider + +Terraform resource for managing an AWS WorkSpaces Web Identity Provider. + +## Example Usage + +### Basic Usage with SAML + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebIdentityProvider } from "./.gen/providers/aws/workspacesweb-identity-provider"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebPortal(this, "example", { + displayName: "example", + }); + const awsWorkspaceswebIdentityProviderExample = + new WorkspaceswebIdentityProvider(this, "example_1", { + identityProviderDetails: { + MetadataURL: "https://example.com/metadata", + }, + identityProviderName: "example-saml", + identityProviderType: "SAML", + portalArn: example.portalArn, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebIdentityProviderExample.overrideLogicalId("example"); + } +} + +``` + +### OIDC Identity Provider + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebIdentityProvider } from "./.gen/providers/aws/workspacesweb-identity-provider"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const test = new WorkspaceswebPortal(this, "test", { + displayName: "test", + }); + const awsWorkspaceswebIdentityProviderTest = + new WorkspaceswebIdentityProvider(this, "test_1", { + identityProviderDetails: { + attributes_request_method: "POST", + authorize_scopes: "openid, email", + client_id: "test-client-id", + client_secret: "test-client-secret", + oidc_issuer: "https://accounts.google.com", + }, + identityProviderName: "test-updated", + identityProviderType: "OIDC", + portalArn: test.portalArn, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebIdentityProviderTest.overrideLogicalId("test"); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `identityProviderDetails` - (Required) Identity provider details. The following list describes the provider detail keys for each identity provider type: + * For Google and Login with Amazon: + * `clientId` + * `clientSecret` + * `authorize_scopes` + * For Facebook: + * `clientId` + * `clientSecret` + * `authorize_scopes` + * `apiVersion` + * For Sign in with Apple: + * `clientId` + * `teamId` + * `keyId` + * `privateKey` + * `authorize_scopes` + * For OIDC providers: + * `clientId` + * `clientSecret` + * `attributes_request_method` + * `oidc_issuer` + * `authorize_scopes` + * `authorize_url` if not available from discovery URL specified by `oidc_issuer` key + * `tokenUrl` if not available from discovery URL specified by `oidc_issuer` key + * `attributes_url` if not available from discovery URL specified by `oidc_issuer` key + * `jwksUri` if not available from discovery URL specified by `oidc_issuer` key + * For SAML providers: + * `MetadataFile` OR `MetadataURL` + * `IDPSignout` (boolean) optional + * `IDPInit` (boolean) optional + * `RequestSigningAlgorithm` (string) optional - Only accepts rsa-sha256 + * `EncryptedResponses` (boolean) optional +* `identityProviderName` - (Required) Identity provider name. +* `identityProviderType` - (Required) Identity provider type. Valid values: `SAML`, `Facebook`, `Google`, `LoginWithAmazon`, `SignInWithApple`, `OIDC`. +* `portalArn` - (Required) ARN of the web portal. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `identityProviderArn` - ARN of the identity provider. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Identity Provider using the `identityProviderArn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebIdentityProvider } from "./.gen/providers/aws/workspacesweb-identity-provider"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebIdentityProvider.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Identity Provider using the `identityProviderArn`. For example: + +```console +% terraform import aws_workspacesweb_identity_provider.example arn:aws:workspaces-web:us-west-2:123456789012:identityprovider/abcdef12345678/12345678-1234-1234-1234-123456789012 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_ip_access_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_ip_access_settings_association.html.markdown new file mode 100644 index 000000000000..5e97cc87f4dd --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_ip_access_settings_association.html.markdown @@ -0,0 +1,105 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_ip_access_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. +--- + + + +# Resource: aws_workspacesweb_ip_access_settings_association + +Terraform resource for managing an AWS WorkSpaces Web IP Access Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebIpAccessSettings } from "./.gen/providers/aws/workspacesweb-ip-access-settings"; +import { WorkspaceswebIpAccessSettingsAssociation } from "./.gen/providers/aws/workspacesweb-ip-access-settings-association"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebIpAccessSettings(this, "example", { + displayName: "example", + ipRule: [ + { + ipRange: "10.0.0.0/16", + }, + ], + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const awsWorkspaceswebIpAccessSettingsAssociationExample = + new WorkspaceswebIpAccessSettingsAssociation(this, "example_2", { + ipAccessSettingsArn: example.ipAccessSettingsArn, + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebIpAccessSettingsAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `ipAccessSettingsArn` - (Required) ARN of the IP access settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the IP access settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web IP Access Settings Association using the `ip_access_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebIpAccessSettingsAssociation } from "./.gen/providers/aws/workspacesweb-ip-access-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebIpAccessSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:ipAccessSettings/ip_access_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_network_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_network_settings_association.html.markdown new file mode 100644 index 000000000000..eab09affcb23 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_network_settings_association.html.markdown @@ -0,0 +1,171 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_network_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. +--- + + + +# Resource: aws_workspacesweb_network_settings_association + +Terraform resource for managing an AWS WorkSpaces Web Network Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformCount, Fn, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsAvailabilityZones } from "./.gen/providers/aws/data-aws-availability-zones"; +import { SecurityGroup } from "./.gen/providers/aws/security-group"; +import { Subnet } from "./.gen/providers/aws/subnet"; +import { Vpc } from "./.gen/providers/aws/vpc"; +import { WorkspaceswebNetworkSettings } from "./.gen/providers/aws/workspacesweb-network-settings"; +import { WorkspaceswebNetworkSettingsAssociation } from "./.gen/providers/aws/workspacesweb-network-settings-association"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new Vpc(this, "example", { + cidrBlock: "10.0.0.0/16", + tags: { + Name: "example", + }, + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const available = new DataAwsAvailabilityZones(this, "available", { + filter: [ + { + name: "opt-in-status", + values: ["opt-in-not-required"], + }, + ], + state: "available", + }); + /*In most cases loops should be handled in the programming language context and + not inside of the Terraform context. If you are looping over something external, e.g. a variable or a file input + you should consider using a for loop. If you are looping over something only known to Terraform, e.g. a result of a data source + you need to keep this like it is.*/ + const exampleCount = TerraformCount.of(Token.asNumber("2")); + const awsSecurityGroupExample = new SecurityGroup(this, "example_3", { + name: "example-${" + exampleCount.index + "}", + tags: { + Name: "example", + }, + vpcId: example.id, + count: exampleCount, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsSecurityGroupExample.overrideLogicalId("example"); + /*In most cases loops should be handled in the programming language context and + not inside of the Terraform context. If you are looping over something external, e.g. a variable or a file input + you should consider using a for loop. If you are looping over something only known to Terraform, e.g. a result of a data source + you need to keep this like it is.*/ + const awsSubnetExampleCount = TerraformCount.of(Token.asNumber("2")); + const awsSubnetExample = new Subnet(this, "example_4", { + availabilityZone: Token.asString( + Fn.lookupNested(available.names, [awsSubnetExampleCount.index]) + ), + cidrBlock: Token.asString( + Fn.cidrsubnet( + example.cidrBlock, + 8, + Token.asNumber(awsSubnetExampleCount.index) + ) + ), + tags: { + Name: "example", + }, + vpcId: example.id, + count: awsSubnetExampleCount, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsSubnetExample.overrideLogicalId("example"); + const awsWorkspaceswebNetworkSettingsExample = + new WorkspaceswebNetworkSettings(this, "example_5", { + securityGroupIds: [ + Token.asString(Fn.lookupNested(awsSecurityGroupExample, ["0", "id"])), + Token.asString(Fn.lookupNested(awsSecurityGroupExample, ["1", "id"])), + ], + subnetIds: [ + Token.asString(Fn.lookupNested(awsSubnetExample, ["0", "id"])), + Token.asString(Fn.lookupNested(awsSubnetExample, ["1", "id"])), + ], + vpcId: example.id, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebNetworkSettingsExample.overrideLogicalId("example"); + const awsWorkspaceswebNetworkSettingsAssociationExample = + new WorkspaceswebNetworkSettingsAssociation(this, "example_6", { + networkSettingsArn: Token.asString( + awsWorkspaceswebNetworkSettingsExample.networkSettingsArn + ), + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebNetworkSettingsAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `networkSettingsArn` - (Required) ARN of the network settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the network settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Network Settings Association using the `network_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebNetworkSettingsAssociation } from "./.gen/providers/aws/workspacesweb-network-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebNetworkSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:networkSettings/network_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_portal.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_portal.html.markdown new file mode 100644 index 000000000000..3a6d45d94ef2 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_portal.html.markdown @@ -0,0 +1,164 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_portal" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Portal. +--- + + + +# Resource: aws_workspacesweb_portal + +Terraform resource for managing an AWS WorkSpaces Web Portal. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new WorkspaceswebPortal(this, "example", { + displayName: "example-portal", + instanceType: "standard.regular", + }); + } +} + +``` + +### Complete Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { KmsKey } from "./.gen/providers/aws/kms-key"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new KmsKey(this, "example", { + deletionWindowInDays: 7, + description: "KMS key for WorkSpaces Web Portal", + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + additionalEncryptionContext: { + Environment: "Production", + }, + authenticationType: "IAM_Identity_Center", + customerManagedKey: example.arn, + displayName: "example-portal", + instanceType: "standard.large", + maxConcurrentSessions: 10, + tags: { + Name: "example-portal", + }, + timeouts: [ + { + create: "10m", + delete: "10m", + update: "10m", + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + } +} + +``` + +## Argument Reference + +The following arguments are optional: + +* `additionalEncryptionContext` - (Optional) Additional encryption context for the customer managed key. Forces replacement if changed. +* `authenticationType` - (Optional) Authentication type for the portal. Valid values: `Standard`, `IAM_Identity_Center`. +* `browserSettingsArn` - (Optional) ARN of the browser settings to use for the portal. +* `customerManagedKey` - (Optional) ARN of the customer managed key. Forces replacement if changed. +* `displayName` - (Optional) Display name of the portal. +* `instanceType` - (Optional) Instance type for the portal. Valid values: `standard.regular`, `standard.large`. +* `maxConcurrentSessions` - (Optional) Maximum number of concurrent sessions for the portal. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `browserType` - Browser type of the portal. +* `creationDate` - Creation date of the portal. +* `dataProtectionSettingsArn` - ARN of the data protection settings associated with the portal. +* `ipAccessSettingsArn` - ARN of the IP access settings associated with the portal. +* `networkSettingsArn` - ARN of the network settings associated with the portal. +* `portalArn` - ARN of the portal. +* `portalEndpoint` - Endpoint URL of the portal. +* `portalStatus` - Status of the portal. +* `rendererType` - Renderer type of the portal. +* `sessionLoggerArn` - ARN of the session logger associated with the portal. +* `statusReason` - Reason for the current status of the portal. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). +* `trustStoreArn` - ARN of the trust store associated with the portal. +* `userAccessLoggingSettingsArn` - ARN of the user access logging settings associated with the portal. +* `userSettingsArn` - ARN of the user settings associated with the portal. + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `5m`) +* `update` - (Default `5m`) +* `delete` - (Default `5m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Portal using the `portalArn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebPortal.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Portal using the `portalArn`. For example: + +```console +% terraform import aws_workspacesweb_portal.example arn:aws:workspaces-web:us-west-2:123456789012:portal/abcdef12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_session_logger.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_session_logger.html.markdown new file mode 100644 index 000000000000..3e3e182279c8 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_session_logger.html.markdown @@ -0,0 +1,309 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger. +--- + + + +# Resource: aws_workspacesweb_session_logger + +Terraform resource for managing an AWS WorkSpaces Web Session Logger. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { S3Bucket } from "./.gen/providers/aws/s3-bucket"; +import { S3BucketPolicy } from "./.gen/providers/aws/s3-bucket-policy"; +import { WorkspaceswebSessionLogger } from "./.gen/providers/aws/workspacesweb-session-logger"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new S3Bucket(this, "example", { + bucket: "example-session-logs", + }); + const dataAwsIamPolicyDocumentExample = new DataAwsIamPolicyDocument( + this, + "example_1", + { + statement: [ + { + actions: ["s3:PutObject"], + effect: "Allow", + principals: [ + { + identifiers: ["workspaces-web.amazonaws.com"], + type: "Service", + }, + ], + resources: ["${" + example.arn + "}/*"], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsIamPolicyDocumentExample.overrideLogicalId("example"); + const awsS3BucketPolicyExample = new S3BucketPolicy(this, "example_2", { + bucket: example.id, + policy: Token.asString(dataAwsIamPolicyDocumentExample.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketPolicyExample.overrideLogicalId("example"); + const awsWorkspaceswebSessionLoggerExample = new WorkspaceswebSessionLogger( + this, + "example_3", + { + dependsOn: [awsS3BucketPolicyExample], + displayName: "example-session-logger", + eventFilter: [ + { + all: [{}], + }, + ], + logConfiguration: [ + { + s3: [ + { + bucket: example.id, + folderStructure: "Flat", + logFileFormat: "Json", + }, + ], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebSessionLoggerExample.overrideLogicalId("example"); + } +} + +``` + +### Complete Configuration with KMS Encryption + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsCallerIdentity } from "./.gen/providers/aws/data-aws-caller-identity"; +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { DataAwsPartition } from "./.gen/providers/aws/data-aws-partition"; +import { KmsKey } from "./.gen/providers/aws/kms-key"; +import { S3Bucket } from "./.gen/providers/aws/s3-bucket"; +import { S3BucketPolicy } from "./.gen/providers/aws/s3-bucket-policy"; +import { WorkspaceswebSessionLogger } from "./.gen/providers/aws/workspacesweb-session-logger"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new S3Bucket(this, "example", { + bucket: "example-session-logs", + forceDestroy: true, + }); + const current = new DataAwsCallerIdentity(this, "current", {}); + const dataAwsIamPolicyDocumentExample = new DataAwsIamPolicyDocument( + this, + "example_2", + { + statement: [ + { + actions: ["s3:PutObject"], + effect: "Allow", + principals: [ + { + identifiers: ["workspaces-web.amazonaws.com"], + type: "Service", + }, + ], + resources: [example.arn, "${" + example.arn + "}/*"], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsIamPolicyDocumentExample.overrideLogicalId("example"); + const dataAwsPartitionCurrent = new DataAwsPartition(this, "current_3", {}); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsPartitionCurrent.overrideLogicalId("current"); + const awsS3BucketPolicyExample = new S3BucketPolicy(this, "example_4", { + bucket: example.id, + policy: Token.asString(dataAwsIamPolicyDocumentExample.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketPolicyExample.overrideLogicalId("example"); + const kmsKeyPolicy = new DataAwsIamPolicyDocument(this, "kms_key_policy", { + statement: [ + { + actions: ["kms:*"], + principals: [ + { + identifiers: [ + "arn:${" + + dataAwsPartitionCurrent.partition + + "}:iam::${" + + current.accountId + + "}:root", + ], + type: "AWS", + }, + ], + resources: ["*"], + }, + { + actions: [ + "kms:Encrypt", + "kms:GenerateDataKey*", + "kms:ReEncrypt*", + "kms:Decrypt", + ], + principals: [ + { + identifiers: ["workspaces-web.amazonaws.com"], + type: "Service", + }, + ], + resources: ["*"], + }, + ], + }); + const awsKmsKeyExample = new KmsKey(this, "example_6", { + description: "KMS key for WorkSpaces Web Session Logger", + policy: Token.asString(kmsKeyPolicy.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsKmsKeyExample.overrideLogicalId("example"); + const awsWorkspaceswebSessionLoggerExample = new WorkspaceswebSessionLogger( + this, + "example_7", + { + additionalEncryptionContext: { + Application: "WorkSpacesWeb", + Environment: "Production", + }, + customerManagedKey: Token.asString(awsKmsKeyExample.arn), + dependsOn: [awsS3BucketPolicyExample, awsKmsKeyExample], + displayName: "example-session-logger", + eventFilter: [ + { + include: ["SessionStart", "SessionEnd"], + }, + ], + logConfiguration: [ + { + s3: [ + { + bucket: example.id, + bucketOwner: Token.asString(current.accountId), + folderStructure: "NestedByDate", + keyPrefix: "workspaces-web-logs/", + logFileFormat: "JsonLines", + }, + ], + }, + ], + tags: { + Environment: "Production", + Name: "example-session-logger", + }, + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebSessionLoggerExample.overrideLogicalId("example"); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `eventFilter` - (Required) Event filter that determines which events are logged. See [Event Filter](#event-filter) below. +* `logConfiguration` - (Required) Configuration block for specifying where logs are delivered. See [Log Configuration](#log-configuration) below. + +The following arguments are optional: + +* `additionalEncryptionContext` - (Optional) Map of additional encryption context key-value pairs. +* `customerManagedKey` - (Optional) ARN of the customer managed KMS key used to encrypt sensitive information. +* `displayName` - (Optional) Human-readable display name for the session logger resource. Forces replacement if changed. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Log Configuration + +* `s3` - (Required) Configuration block for S3 log delivery. See [S3 Configuration](#s3-configuration) below. + +### Event Filter + +Exactly one of the following must be specified: + +* `all` - (Optional) Block that specifies to monitor all events. Set to `{}` to monitor all events. +* `include` - (Optional) List of specific events to monitor. Valid values include session events like `SessionStart`, `SessionEnd`, etc. + +### S3 Configuration + +* `bucket` - (Required) S3 bucket name where logs are delivered. +* `folderStructure` - (Required) Folder structure that defines the organizational structure for log files in S3. Valid values: `FlatStructure`, `DateBasedStructure`. +* `logFileFormat` - (Required) Format of the log file written to S3. Valid values: `Json`, `Parquet`. +* `bucketOwner` - (Optional) Expected bucket owner of the target S3 bucket. +* `keyPrefix` - (Optional) S3 path prefix that determines where log files are stored. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `associatedPortalArns` - List of ARNs of the web portals associated with the session logger. +* `sessionLoggerArn` - ARN of the session logger. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +~> **Note:** The `additionalEncryptionContext` and `customerManagedKey` attributes are computed when not specified and will be populated with values from the AWS API response. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger using the `sessionLoggerArn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebSessionLogger } from "./.gen/providers/aws/workspacesweb-session-logger"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebSessionLogger.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Session Logger using the `sessionLoggerArn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_session_logger_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_session_logger_association.html.markdown new file mode 100644 index 000000000000..6b8d467ef3a4 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_session_logger_association.html.markdown @@ -0,0 +1,165 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_session_logger_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. +--- + + + +# Resource: aws_workspacesweb_session_logger_association + +Terraform resource for managing an AWS WorkSpaces Web Session Logger Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsIamPolicyDocument } from "./.gen/providers/aws/data-aws-iam-policy-document"; +import { S3Bucket } from "./.gen/providers/aws/s3-bucket"; +import { S3BucketPolicy } from "./.gen/providers/aws/s3-bucket-policy"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +import { WorkspaceswebSessionLogger } from "./.gen/providers/aws/workspacesweb-session-logger"; +import { WorkspaceswebSessionLoggerAssociation } from "./.gen/providers/aws/workspacesweb-session-logger-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new S3Bucket(this, "example", { + bucket: "example-session-logs", + forceDestroy: true, + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const dataAwsIamPolicyDocumentExample = new DataAwsIamPolicyDocument( + this, + "example_2", + { + statement: [ + { + actions: ["s3:PutObject"], + effect: "Allow", + principals: [ + { + identifiers: ["workspaces-web.amazonaws.com"], + type: "Service", + }, + ], + resources: ["${" + example.arn + "}/*"], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + dataAwsIamPolicyDocumentExample.overrideLogicalId("example"); + const awsS3BucketPolicyExample = new S3BucketPolicy(this, "example_3", { + bucket: example.id, + policy: Token.asString(dataAwsIamPolicyDocumentExample.json), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsS3BucketPolicyExample.overrideLogicalId("example"); + const awsWorkspaceswebSessionLoggerExample = new WorkspaceswebSessionLogger( + this, + "example_4", + { + dependsOn: [awsS3BucketPolicyExample], + displayName: "example", + eventFilter: [ + { + all: [{}], + }, + ], + logConfiguration: [ + { + s3: [ + { + bucket: example.id, + folderStructure: "Flat", + logFileFormat: "Json", + }, + ], + }, + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebSessionLoggerExample.overrideLogicalId("example"); + const awsWorkspaceswebSessionLoggerAssociationExample = + new WorkspaceswebSessionLoggerAssociation(this, "example_5", { + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + sessionLoggerArn: Token.asString( + awsWorkspaceswebSessionLoggerExample.sessionLoggerArn + ), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebSessionLoggerAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `portalArn` - (Required) ARN of the web portal. +* `sessionLoggerArn` - (Required) ARN of the session logger. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebSessionLoggerAssociation } from "./.gen/providers/aws/workspacesweb-session-logger-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebSessionLoggerAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Session Logger Association using the `session_logger_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_session_logger_association.example arn:aws:workspaces-web:us-west-2:123456789012:sessionLogger/session_logger-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_trust_store.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_trust_store.html.markdown new file mode 100644 index 000000000000..517b7f0a959f --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_trust_store.html.markdown @@ -0,0 +1,135 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store. +--- + + + +# Resource: aws_workspacesweb_trust_store + +Terraform resource for managing an AWS WorkSpaces Web Trust Store. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Fn, Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebTrustStore } from "./.gen/providers/aws/workspacesweb-trust-store"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new WorkspaceswebTrustStore(this, "example", { + certificate: [ + { + body: Token.asString(Fn.file("certificate.pem")), + }, + ], + }); + } +} + +``` + +### Multiple Certificates + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Fn, Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebTrustStore } from "./.gen/providers/aws/workspacesweb-trust-store"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new WorkspaceswebTrustStore(this, "example", { + certificate: [ + { + body: Token.asString(Fn.file("certificate1.pem")), + }, + { + body: Token.asString(Fn.file("certificate2.pem")), + }, + ], + tags: { + Name: "example-trust-store", + }, + }); + } +} + +``` + +## Argument Reference + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `certificate` - (Optional) Set of certificates to include in the trust store. See [Certificate](#certificate) below. +* `tags` - (Optional) Map of tags to assign to the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### Certificate + +* `body` - (Required) Certificate body in PEM format. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `associatedPortalArns` - List of ARNs of the web portals associated with the trust store. +* `trustStoreArn` - ARN of the trust store. +* `tagsAll` - Map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +The `certificate` block exports the following additional attributes: + +* `issuer` - Certificate issuer. +* `notValidAfter` - Date and time when the certificate expires in RFC3339 format. +* `notValidBefore` - Date and time when the certificate becomes valid in RFC3339 format. +* `subject` - Certificate subject. +* `thumbprint` - Certificate thumbprint. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store using the `trustStoreArn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebTrustStore } from "./.gen/providers/aws/workspacesweb-trust-store"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebTrustStore.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Trust Store using the `trustStoreArn`. For example: + +```console +% terraform import aws_workspacesweb_trust_store.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_trust_store_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_trust_store_association.html.markdown new file mode 100644 index 000000000000..678715521d1d --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_trust_store_association.html.markdown @@ -0,0 +1,108 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_trust_store_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. +--- + + + +# Resource: aws_workspacesweb_trust_store_association + +Terraform resource for managing an AWS WorkSpaces Web Trust Store Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Fn, Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +import { WorkspaceswebTrustStore } from "./.gen/providers/aws/workspacesweb-trust-store"; +import { WorkspaceswebTrustStoreAssociation } from "./.gen/providers/aws/workspacesweb-trust-store-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebPortal(this, "example", { + displayName: "example", + }); + const awsWorkspaceswebTrustStoreExample = new WorkspaceswebTrustStore( + this, + "example_1", + { + certificate_list: [ + Fn.base64encode(Token.asString(Fn.file("certificate.pem"))), + ], + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebTrustStoreExample.overrideLogicalId("example"); + const awsWorkspaceswebTrustStoreAssociationExample = + new WorkspaceswebTrustStoreAssociation(this, "example_2", { + portalArn: example.portalArn, + trustStoreArn: Token.asString( + awsWorkspaceswebTrustStoreExample.trustStoreArn + ), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebTrustStoreAssociationExample.overrideLogicalId("example"); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `trustStoreArn` - (Required) ARN of the trust store to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the trust store. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebTrustStoreAssociation } from "./.gen/providers/aws/workspacesweb-trust-store-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebTrustStoreAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + +Using `terraform import`, import WorkSpaces Web Trust Store Association using the `trust_store_arn,portal_arn`. For example: + +```console +% terraform import aws_workspacesweb_trust_store_association.example arn:aws:workspaces-web:us-west-2:123456789012:trustStore/trust_store-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678 +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_user_access_logging_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_user_access_logging_settings_association.html.markdown new file mode 100644 index 000000000000..5fa647393129 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_user_access_logging_settings_association.html.markdown @@ -0,0 +1,112 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_access_logging_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. +--- + + + +# Resource: aws_workspacesweb_user_access_logging_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Access Logging Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { KinesisStream } from "./.gen/providers/aws/kinesis-stream"; +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +import { WorkspaceswebUserAccessLoggingSettings } from "./.gen/providers/aws/workspacesweb-user-access-logging-settings"; +import { WorkspaceswebUserAccessLoggingSettingsAssociation } from "./.gen/providers/aws/workspacesweb-user-access-logging-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new KinesisStream(this, "example", { + name: "amazon-workspaces-web-example", + shardCount: 1, + }); + const awsWorkspaceswebPortalExample = new WorkspaceswebPortal( + this, + "example_1", + { + displayName: "example", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebPortalExample.overrideLogicalId("example"); + const awsWorkspaceswebUserAccessLoggingSettingsExample = + new WorkspaceswebUserAccessLoggingSettings(this, "example_2", { + kinesisStreamArn: example.arn, + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebUserAccessLoggingSettingsExample.overrideLogicalId( + "example" + ); + const awsWorkspaceswebUserAccessLoggingSettingsAssociationExample = + new WorkspaceswebUserAccessLoggingSettingsAssociation(this, "example_3", { + portalArn: Token.asString(awsWorkspaceswebPortalExample.portalArn), + userAccessLoggingSettingsArn: Token.asString( + awsWorkspaceswebUserAccessLoggingSettingsExample.userAccessLoggingSettingsArn + ), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebUserAccessLoggingSettingsAssociationExample.overrideLogicalId( + "example" + ); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `userAccessLoggingSettingsArn` - (Required) ARN of the user access logging settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the user access logging settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Access Logging Settings Association using the `user_access_logging_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebUserAccessLoggingSettingsAssociation } from "./.gen/providers/aws/workspacesweb-user-access-logging-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebUserAccessLoggingSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:userAccessLoggingSettings/user_access_logging_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/workspacesweb_user_settings_association.html.markdown b/website/docs/cdktf/typescript/r/workspacesweb_user_settings_association.html.markdown new file mode 100644 index 000000000000..396f6f63b0c7 --- /dev/null +++ b/website/docs/cdktf/typescript/r/workspacesweb_user_settings_association.html.markdown @@ -0,0 +1,104 @@ +--- +subcategory: "WorkSpaces Web" +layout: "aws" +page_title: "AWS: aws_workspacesweb_user_settings_association" +description: |- + Terraform resource for managing an AWS WorkSpaces Web User Settings Association. +--- + + + +# Resource: aws_workspacesweb_user_settings_association + +Terraform resource for managing an AWS WorkSpaces Web User Settings Association. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebPortal } from "./.gen/providers/aws/workspacesweb-portal"; +import { WorkspaceswebUserSettings } from "./.gen/providers/aws/workspacesweb-user-settings"; +import { WorkspaceswebUserSettingsAssociation } from "./.gen/providers/aws/workspacesweb-user-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + const example = new WorkspaceswebPortal(this, "example", { + displayName: "example", + }); + const awsWorkspaceswebUserSettingsExample = new WorkspaceswebUserSettings( + this, + "example_1", + { + copyAllowed: "Enabled", + downloadAllowed: "Enabled", + pasteAllowed: "Enabled", + printAllowed: "Enabled", + uploadAllowed: "Enabled", + } + ); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebUserSettingsExample.overrideLogicalId("example"); + const awsWorkspaceswebUserSettingsAssociationExample = + new WorkspaceswebUserSettingsAssociation(this, "example_2", { + portalArn: example.portalArn, + userSettingsArn: Token.asString( + awsWorkspaceswebUserSettingsExample.userSettingsArn + ), + }); + /*This allows the Terraform resource name to match the original name. You can remove the call if you don't need them to match.*/ + awsWorkspaceswebUserSettingsAssociationExample.overrideLogicalId("example"); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `userSettingsArn` - (Required) ARN of the user settings to associate with the portal. Forces replacement if changed. +* `portalArn` - (Required) ARN of the portal to associate with the user settings. Forces replacement if changed. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). + +## Attribute Reference + +This resource exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import WorkSpaces Web User Settings Association using the `user_settings_arn,portal_arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { WorkspaceswebUserSettingsAssociation } from "./.gen/providers/aws/workspacesweb-user-settings-association"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + WorkspaceswebUserSettingsAssociation.generateConfigForImport( + this, + "example", + "arn:aws:workspaces-web:us-west-2:123456789012:userSettings/user_settings-id-12345678,arn:aws:workspaces-web:us-west-2:123456789012:portal/portal-id-12345678" + ); + } +} + +``` + + \ No newline at end of file From 46cd62524024134890853a5f535b277931ebd21b Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:00:51 +0900 Subject: [PATCH 1014/2115] Implement ephemeral_storage argument --- internal/service/synthetics/canary.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 1fc04d59b8e6..1ae673ca1f28 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -133,6 +133,12 @@ func ResourceCanary() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + "ephemeral_storage": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntBetween(1024, 5120), + }, "memory_in_mb": { Type: schema.TypeInt, Optional: true, @@ -718,6 +724,10 @@ func expandCanaryRunConfig(l []any) *awstypes.CanaryRunConfigInput { codeConfig.EnvironmentVariables = flex.ExpandStringValueMap(vars) } + if v, ok := m["ephemeral_storage"].(int); ok && v > 0 { + codeConfig.EphemeralStorage = aws.Int32(int32(v)) + } + return codeConfig } @@ -736,6 +746,10 @@ func flattenCanaryRunConfig(canaryCodeOut *awstypes.CanaryRunConfigOutput, envVa m["environment_variables"] = envVars } + if canaryCodeOut.EphemeralStorage != nil { + m["ephemeral_storage"] = aws.ToInt32(canaryCodeOut.EphemeralStorage) + } + return []any{m} } From 95ae43187e43cb4da20ea394180cc9ee92cd66cd Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:01:45 +0900 Subject: [PATCH 1015/2115] Add an acctest for ephemeral_storage argument --- internal/service/synthetics/canary_test.go | 97 ++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 9ae5f6732f4b..5ab7b8912a8b 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -41,6 +41,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.ephemeral_storage", "1024"), resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), resource.TestCheckResourceAttr(resourceName, "failure_retention_period", "31"), @@ -73,6 +74,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.ephemeral_storage", "1024"), resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), resource.TestCheckResourceAttr(resourceName, "failure_retention_period", "31"), @@ -606,6 +608,75 @@ func TestAccSyntheticsCanary_vpcIPv6AllowedForDualStack(t *testing.T) { }) } +func TestAccSyntheticsCanary_runConfigEphemeralStorage(t *testing.T) { + ctx := acctest.Context(t) + var conf1, conf2 awstypes.Canary + rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(8)) + resourceName := "aws_synthetics_canary.test" + runtimeVersionDataSourceName := "data.aws_synthetics_runtime_version.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SyntheticsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCanaryDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccCanaryConfig_runConfigEphemeralStorage(rName, 1024), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf1), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.ephemeral_storage", "1024"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), + //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), + resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), + resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "timeline.0.created"), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "READY"), + resource.TestCheckResourceAttr(resourceName, "artifact_config.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"zip_file", "start_canary", "delete_lambda"}, + }, + { + Config: testAccCanaryConfig_runConfigEphemeralStorage(rName, 2048), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf2), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.memory_in_mb", "1500"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.timeout_in_seconds", "840"), + resource.TestCheckResourceAttr(resourceName, "run_config.0.ephemeral_storage", "2048"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), + //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), + resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), + resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "timeline.0.created"), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "READY"), + resource.TestCheckResourceAttr(resourceName, "artifact_config.#", "0"), + ), + }, + }, + }) +} + func TestAccSyntheticsCanary_tags(t *testing.T) { ctx := acctest.Context(t) var conf awstypes.Canary @@ -1392,6 +1463,32 @@ resource "aws_synthetics_canary" "test" { `, rName)) } +func testAccCanaryConfig_runConfigEphemeralStorage(rName string, ephemeralStorage int) string { + return acctest.ConfigCompose( + testAccCanaryConfig_base(rName), + fmt.Sprintf(` +resource "aws_synthetics_canary" "test" { + # Must have bucket versioning enabled first + depends_on = [aws_s3_bucket_versioning.test, aws_iam_role.test, aws_iam_role_policy.test] + + name = %[1]q + artifact_s3_location = "s3://${aws_s3_bucket.test.bucket}/" + execution_role_arn = aws_iam_role.test.arn + handler = "exports.handler" + zip_file = "test-fixtures/lambdatest.zip" + runtime_version = data.aws_synthetics_runtime_version.test.version_name + delete_lambda = true + + schedule { + expression = "rate(0 minute)" + } + run_config { + ephemeral_storage = %[2]d + } +} +`, rName, ephemeralStorage)) +} + func testAccCanaryConfig_tags1(rName, tagKey1, tagValue1 string) string { return acctest.ConfigCompose( testAccCanaryConfig_base(rName), From 0923ac55cca5bb56f4985c86e2c329de92a7e445 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:02:17 +0900 Subject: [PATCH 1016/2115] Set engine_arn from EngineConfigs instead of EngineArn GetCanary API now returns EngineArn as null --- internal/service/synthetics/canary.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 1ae673ca1f28..56467cf64fdb 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -394,7 +394,9 @@ func resourceCanaryRead(ctx context.Context, d *schema.ResourceData, meta any) d }.String() d.Set(names.AttrARN, canaryArn) d.Set("artifact_s3_location", canary.ArtifactS3Location) - d.Set("engine_arn", canary.EngineArn) + if canary.EngineConfigs != nil && len(canary.EngineConfigs) > 0 { + d.Set("engine_arn", canary.EngineConfigs[0].EngineArn) + } d.Set(names.AttrExecutionRoleARN, canary.ExecutionRoleArn) d.Set("failure_retention_period", canary.FailureRetentionPeriodInDays) d.Set("handler", canary.Code.Handler) From c87f5819d15d827cd02e62ed3e50fb5d6ff99832 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:03:35 +0900 Subject: [PATCH 1017/2115] Comment out checks for source_location_arn GetCanary now returns SourceLocationArn as null --- internal/service/synthetics/canary_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 5ab7b8912a8b..c436b1611fd2 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -51,7 +51,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), @@ -84,7 +84,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/test/", rName)), resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), @@ -342,7 +342,7 @@ func TestAccSyntheticsCanary_s3(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), ), From 2a0ec21b48a314e0c3bc8f0fa2f88baefb0770e0 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:12:06 +0900 Subject: [PATCH 1018/2115] Update the documentation to include ephemeral_storage --- website/docs/r/synthetics_canary.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/synthetics_canary.html.markdown b/website/docs/r/synthetics_canary.html.markdown index 42c3da1d5f90..ebb1c6c5cb0a 100644 --- a/website/docs/r/synthetics_canary.html.markdown +++ b/website/docs/r/synthetics_canary.html.markdown @@ -76,6 +76,7 @@ The following arguments are optional: * `memory_in_mb` - (Optional) Maximum amount of memory available to the canary while it is running, in MB. The value you specify must be a multiple of 64. * `active_tracing` - (Optional) Whether this canary is to use active AWS X-Ray tracing when it runs. You can enable active tracing only for canaries that use version syn-nodejs-2.0 or later for their canary runtime. * `environment_variables` - (Optional) Map of environment variables that are accessible from the canary during execution. Please see [AWS Docs](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime) for variables reserved for Lambda. +* `ephemeral_storage` - (Optional) Amount of ephemeral storage (in MB) allocated for the canary run during execution. Defaults to 1024. ### vpc_config From 56f42d5a1511e74ebbbad7a0a24a6fec09807f98 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:34:55 +0900 Subject: [PATCH 1019/2115] add changelog --- .changelog/44105.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44105.txt diff --git a/.changelog/44105.txt b/.changelog/44105.txt new file mode 100644 index 000000000000..b6cd83abda53 --- /dev/null +++ b/.changelog/44105.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_synthetics_canary: Add `run_config.ephemeral_storage` argument. +``` From 008508f55c1456ee657079ca0d9aa5c4a5c3cf31 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 1 Sep 2025 22:47:34 +0900 Subject: [PATCH 1020/2115] Omit nil check; len() for nil slices is defined as zero, reported by linter --- internal/service/synthetics/canary.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 56467cf64fdb..7e6db51e4f4e 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -394,7 +394,7 @@ func resourceCanaryRead(ctx context.Context, d *schema.ResourceData, meta any) d }.String() d.Set(names.AttrARN, canaryArn) d.Set("artifact_s3_location", canary.ArtifactS3Location) - if canary.EngineConfigs != nil && len(canary.EngineConfigs) > 0 { + if len(canary.EngineConfigs) > 0 { d.Set("engine_arn", canary.EngineConfigs[0].EngineArn) } d.Set(names.AttrExecutionRoleARN, canary.ExecutionRoleArn) From 8e60c4f2d3989c467eac6725c325446751b70767 Mon Sep 17 00:00:00 2001 From: Sagar Barai Date: Mon, 1 Sep 2025 22:34:39 +0530 Subject: [PATCH 1021/2115] Fix typo in aws_wafv2_rule_group docs --- website/docs/r/wafv2_rule_group.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/wafv2_rule_group.html.markdown b/website/docs/r/wafv2_rule_group.html.markdown index 3577dde09bbb..6fc2a75a3f66 100644 --- a/website/docs/r/wafv2_rule_group.html.markdown +++ b/website/docs/r/wafv2_rule_group.html.markdown @@ -312,7 +312,7 @@ resource "aws_wafv2_rule_group" "example" { } ``` -### Using rule_json +### Using rules_json ```terraform resource "aws_wafv2_rule_group" "example" { @@ -320,7 +320,7 @@ resource "aws_wafv2_rule_group" "example" { scope = "REGIONAL" capacity = 100 - rule_json = jsonencode([{ + rules_json = jsonencode([{ Name = "rule-1" Priority = 1 Action = { @@ -365,7 +365,7 @@ This resource supports the following arguments: * `name` - (Required, Forces new resource) A friendly name of the rule group. * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `rule` - (Optional) The rule blocks used to identify the web requests that you want to `allow`, `block`, or `count`. See [Rules](#rules) below for details. -* `rule_json` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `rule_json` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. +* `rules_json` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `rules_json` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. * `scope` - (Required, Forces new resource) Specifies whether this is for an AWS CloudFront distribution or for a regional application. Valid values are `CLOUDFRONT` or `REGIONAL`. To work with CloudFront, you must also specify the region `us-east-1` (N. Virginia) on the AWS provider. * `tags` - (Optional) An array of key:value pairs to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `visibility_config` - (Required) Defines and enables Amazon CloudWatch metrics and web request sample collection. See [Visibility Configuration](#visibility-configuration) below for details. From 4a8eed03e357c290ea65e1a999bf211ae3638e8d Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Mon, 1 Sep 2025 21:26:17 +0200 Subject: [PATCH 1022/2115] docs: add example for two log sources --- .../r/securitylake_subscriber.html.markdown | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/website/docs/r/securitylake_subscriber.html.markdown b/website/docs/r/securitylake_subscriber.html.markdown index d8c5990670b7..62a22427a113 100644 --- a/website/docs/r/securitylake_subscriber.html.markdown +++ b/website/docs/r/securitylake_subscriber.html.markdown @@ -14,6 +14,8 @@ Terraform resource for managing an AWS Security Lake Subscriber. ## Example Usage +### Basic Usage + ```terraform resource "aws_securitylake_subscriber" "example" { subscriber_name = "example-name" @@ -34,6 +36,36 @@ resource "aws_securitylake_subscriber" "example" { } ``` +### Multiple Log Sources + +```terraform +resource "aws_securitylake_subscriber" "example" { + subscriber_name = "example-name" + access_type = "S3" + + source { + aws_log_source_resource { + source_name = "SH_FINDINGS" + source_version = "2.0" + } + } + + source { + aws_log_source_resource { + source_name = "ROUTE53" + source_version = "2.0" + } + } + + subscriber_identity { + external_id = "example" + principal = "1234567890" + } + + depends_on = [aws_securitylake_data_lake.example] +} +``` + ## Argument Reference This resource supports the following arguments: @@ -64,8 +96,8 @@ The `subscriber_identity` block supports the following arguments: The `aws_log_source_resource` block supports the following arguments: -* `source_name` - (Required) Provides data expiration details of Amazon Security Lake object. -* `source_version` - (Optional) Provides data storage transition details of Amazon Security Lake object. +* `source_name` - (Required) The name for a AWS source. This must be a Regionally unique value. Valid values: `ROUTE53`, `VPC_FLOW`, `SH_FINDINGS`, `CLOUD_TRAIL_MGMT`, `LAMBDA_EXECUTION`, `S3_DATA`, `EKS_AUDIT` and `WAF`. +* `source_version` - (Optional) The version for a AWS source. This must be a Regionally unique value. ### `custom_log_source_resource` Block From 2b57ddd28bcdc6d3c92fc831f443738ea76267ba Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Mon, 1 Sep 2025 21:38:41 +0200 Subject: [PATCH 1023/2115] fix: fix formatting issue in terraform code --- website/docs/r/securitylake_subscriber.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/securitylake_subscriber.html.markdown b/website/docs/r/securitylake_subscriber.html.markdown index 62a22427a113..1683668256bc 100644 --- a/website/docs/r/securitylake_subscriber.html.markdown +++ b/website/docs/r/securitylake_subscriber.html.markdown @@ -40,8 +40,8 @@ resource "aws_securitylake_subscriber" "example" { ```terraform resource "aws_securitylake_subscriber" "example" { - subscriber_name = "example-name" - access_type = "S3" + subscriber_name = "example-name" + access_type = "S3" source { aws_log_source_resource { @@ -52,8 +52,8 @@ resource "aws_securitylake_subscriber" "example" { source { aws_log_source_resource { - source_name = "ROUTE53" - source_version = "2.0" + source_name = "ROUTE53" + source_version = "2.0" } } From 2896613c8eb02da228977c0c5b39bbc83f6896be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:31 -0400 Subject: [PATCH 1024/2115] 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 9caacdd522b9..f6f971c1b28d 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 - github.com/aws/aws-sdk-go-v2 v1.38.2 + github.com/aws/aws-sdk-go-v2 v1.38.3 github.com/aws/aws-sdk-go-v2/config v1.31.5 github.com/aws/aws-sdk-go-v2/credentials v1.18.9 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 diff --git a/go.sum b/go.sum index fb0804578524..e193f33bd292 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,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-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJLMyM= -github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk= +github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= github.com/aws/aws-sdk-go-v2/config v1.31.5 h1:wsZr2kq1XeKU/D2QDcW5xEB1zHPdHAuQqnR0yaygAQQ= From c702d5d1b9de77c8571c9af6b861df9346011f6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:32 -0400 Subject: [PATCH 1025/2115] 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 f6f971c1b28d..74264f7db822 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.38.3 - github.com/aws/aws-sdk-go-v2/config v1.31.5 - github.com/aws/aws-sdk-go-v2/credentials v1.18.9 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 + github.com/aws/aws-sdk-go-v2/config v1.31.6 + github.com/aws/aws-sdk-go-v2/credentials v1.18.10 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 github.com/aws/aws-sdk-go-v2/service/account v1.28.1 @@ -249,10 +249,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 - github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 + github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 - github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 + github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 @@ -323,16 +323,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.7.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index e193f33bd292..0ee65ad36005 100644 --- a/go.sum +++ b/go.sum @@ -27,18 +27,18 @@ github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMt github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.5 h1:wsZr2kq1XeKU/D2QDcW5xEB1zHPdHAuQqnR0yaygAQQ= -github.com/aws/aws-sdk-go-v2/config v1.31.5/go.mod h1:IpXejRuSIyOSCyT4BomfIJ5gWRcDoX/NJaAHh9Cp8jE= -github.com/aws/aws-sdk-go-v2/credentials v1.18.9 h1:zKrnPtmO7j2FpMqudayjCzNxyO8KtPQGCIzqEosKQbg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.9/go.mod h1:gAotjkj0roLrwvBxECN1Q8ILfkVsw3Ntph6FP1LnZ8Q= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= +github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= +github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ= +github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 h1:0gJ4oDYyvGZz0C/YNmDkbpL25AK+cILbyDbPexWz/+0= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3/go.mod h1:BE+FqQuGYSvEk8NJc33a+JNkirdkdRqCrc+7B0HWb3E= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5/go.mod h1:csQLMI+odbC0/J+UecSTztG70Dc4aTCOu4GyPNDNpVo= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 h1:ovHE1XM53pMGOwINf8Mas4FMl5XRRMAihNokV1YViZ8= @@ -299,8 +299,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 h1:gC3YW8AojITDXfI github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5/go.mod h1:z5OdVolKifM0NpEel6wLkM/TQ0eodWB2dmDFoj3WCbw= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgYu9UCQnIMKaOhkVaFvLy1HneD6T4sS/DlKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= @@ -519,16 +519,16 @@ github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 h1:H4QPAHLE1bHSQrZV6Hz+CPpJG+Mtf+rkl6NFb/Y7sv8= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.0/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1/go.mod h1:HPzXfFgrLd02lYpcFYdDz5xZs94LOb+lWlvbAGaeMsk= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= github.com/aws/aws-sdk-go-v2/service/swf v1.32.0/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= From f3d219920e0508a7fcda4c31d51457a828f29786 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:35 -0400 Subject: [PATCH 1026/2115] 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 74264f7db822..9e92d7ec1db3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.31.6 github.com/aws/aws-sdk-go-v2/credentials v1.18.10 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 github.com/aws/aws-sdk-go-v2/service/account v1.28.1 github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 @@ -221,7 +221,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 @@ -326,12 +326,12 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect diff --git a/go.sum b/go.sum index 0ee65ad36005..feb0bb4343b1 100644 --- a/go.sum +++ b/go.sum @@ -33,16 +33,16 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIY github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 h1:0gJ4oDYyvGZz0C/YNmDkbpL25AK+cILbyDbPexWz/+0= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3/go.mod h1:BE+FqQuGYSvEk8NJc33a+JNkirdkdRqCrc+7B0HWb3E= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 h1:ovHE1XM53pMGOwINf8Mas4FMl5XRRMAihNokV1YViZ8= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5/go.mod h1:Cmu/DOSYwcr0xYTFk7sA9NJ5HF3ND0EqNUBdoK16nPI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 h1:ntf4V0+gKWtRv8D0to90E3g69618MInKW78fds20zbY= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1/go.mod h1:6TzoN4j7QtbeN62zbHHOEThTBqFDnUpNsdHE2SXuu0k= github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= @@ -295,14 +295,14 @@ github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 h1:gC3YW8AojITDXfI5avcKZst5iOg6v5aQEU4HIcxwAss= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5/go.mod h1:z5OdVolKifM0NpEel6wLkM/TQ0eodWB2dmDFoj3WCbw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= @@ -463,8 +463,8 @@ github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6g github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 h1:HNAbIp6VXmtKR+JuDmywGcRc3kYoIGT9y4a2Zg9bSTQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2/go.mod h1:6VSEglrPCTx7gi7Z7l/CtqSgbnFr1N6UJ6+Ik+vjuEo= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3/go.mod h1:noqWDtfKyO38kGEjpcvCeLA/fzf28s5GqEhZzMh0l0Q= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= From 9e513a5a30c2e0cbf58431d8e55fa5aa12e3d622 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:36 -0400 Subject: [PATCH 1027/2115] 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 9e92d7ec1db3..2191b7c64c23 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.18.10 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 github.com/aws/aws-sdk-go-v2/service/account v1.28.1 github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 diff --git a/go.sum b/go.sum index feb0bb4343b1..bb49618cf62b 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 h1:ntf4V0+gKWtRv8D0to90E3g69618MInKW78fds20zbY= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1/go.mod h1:6TzoN4j7QtbeN62zbHHOEThTBqFDnUpNsdHE2SXuu0k= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= github.com/aws/aws-sdk-go-v2/service/account v1.28.1/go.mod h1:UCcTaFy22BpCwjdiXGTCiVjtBZgtJb56eos4OI43B9g= github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= From a848ef7643de1cec0bf0e590bf58cc214d466f51 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:38 -0400 Subject: [PATCH 1028/2115] 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 2191b7c64c23..82a9936811a0 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 - github.com/aws/aws-sdk-go-v2/service/account v1.28.1 + github.com/aws/aws-sdk-go-v2/service/account v1.28.2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 diff --git a/go.sum b/go.sum index bb49618cf62b..47e299ab81de 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= -github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= -github.com/aws/aws-sdk-go-v2/service/account v1.28.1/go.mod h1:UCcTaFy22BpCwjdiXGTCiVjtBZgtJb56eos4OI43B9g= +github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= +github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= github.com/aws/aws-sdk-go-v2/service/acm v1.37.1/go.mod h1:l7aVt1kcuhWwEBe3MR6A8ouigGf8SyyOFoZImL16cEI= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= From af60eae2a8b33898ec1fa049e827f2be3620c53e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:39 -0400 Subject: [PATCH 1029/2115] 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 82a9936811a0..73fbbe9c36ba 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 github.com/aws/aws-sdk-go-v2/service/account v1.28.2 - github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 + github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 diff --git a/go.sum b/go.sum index 47e299ab81de..eb7db54c551b 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMy github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.1/go.mod h1:l7aVt1kcuhWwEBe3MR6A8ouigGf8SyyOFoZImL16cEI= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= From 4192bd5194480eb66dfbb692ceed34dce42e01fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:40 -0400 Subject: [PATCH 1030/2115] 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 73fbbe9c36ba..5d649936f615 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 github.com/aws/aws-sdk-go-v2/service/account v1.28.2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 diff --git a/go.sum b/go.sum index eb7db54c551b..d8ff7551d67f 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m59 github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= From bc0bb821cee7977a6073b781a03c98e929914949 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:42 -0400 Subject: [PATCH 1031/2115] 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 5d649936f615..fdb4ca611f6c 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.28.2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 - github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 + github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 diff --git a/go.sum b/go.sum index d8ff7551d67f..ab4cb7267ad5 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= From 950bb32789828ba96d5d967652ecf98226f468d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:44 -0400 Subject: [PATCH 1032/2115] 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 fdb4ca611f6c..02865684c844 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 diff --git a/go.sum b/go.sum index ab4cb7267ad5..cf38cc72b1d2 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JC github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= From 5e0567a24a2d0622259aa3288d9def00550c19ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:45 -0400 Subject: [PATCH 1033/2115] 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 02865684c844..d0da41676e51 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 diff --git a/go.sum b/go.sum index cf38cc72b1d2..e8d1d3c6a330 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1/go.mod h1:VxrbU0yq1a6AdduW/yI5YrMbfACUXfJq2Gpj23JUJu8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= From 6b4307fe63a8b7763f7337bd060feafb08cafe88 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:47 -0400 Subject: [PATCH 1034/2115] 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 d0da41676e51..9fac6a2bf260 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 diff --git a/go.sum b/go.sum index e8d1d3c6a330..3ed21166d6dc 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5g github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1/go.mod h1:VxrbU0yq1a6AdduW/yI5YrMbfACUXfJq2Gpj23JUJu8= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1/go.mod h1:FbIQEQbdcSAJ35ZSLM9+4pUAEVXe0RsCJKgzZiRy8wk= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= From 513d60338ec175b7d564d8e599e10ea37f317612 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:49 -0400 Subject: [PATCH 1035/2115] 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 9fac6a2bf260..b0737180a25c 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 diff --git a/go.sum b/go.sum index 3ed21166d6dc..ecc321677a70 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2l github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1/go.mod h1:FbIQEQbdcSAJ35ZSLM9+4pUAEVXe0RsCJKgzZiRy8wk= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1/go.mod h1:IX3LdIF1/2D00vH+eBQ5cbFXrK9HfPW8dTH6gzWThY8= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= From 58f57d24bb33da91b524ed2260ae4893c214ba2c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:50 -0400 Subject: [PATCH 1036/2115] 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 b0737180a25c..a2153b3bfe2b 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 diff --git a/go.sum b/go.sum index ecc321677a70..536d2b0a6c93 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL32 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1/go.mod h1:IX3LdIF1/2D00vH+eBQ5cbFXrK9HfPW8dTH6gzWThY8= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= From 04b115ef594bd68aafa84bc3c9c312fec64f1246 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:52 -0400 Subject: [PATCH 1037/2115] 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 a2153b3bfe2b..b830fd37e0db 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 diff --git a/go.sum b/go.sum index 536d2b0a6c93..c568ba8b5bf9 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVw github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= From cbeef60e8ee81470841cfc8fad322e798bf3fcb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:54 -0400 Subject: [PATCH 1038/2115] 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 b830fd37e0db..fde1cdaa1791 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 diff --git a/go.sum b/go.sum index c568ba8b5bf9..5d8b3ab18403 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTj github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= From 5e0c085b4d9ffedf02d87c580244be27f45d354a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:55 -0400 Subject: [PATCH 1039/2115] 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 fde1cdaa1791..d831f6d0d431 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 diff --git a/go.sum b/go.sum index 5d8b3ab18403..c91d17d61120 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,8 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1th github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= From a8ba55f5e9dbb7d862a9b049055f2930f9f084fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:57 -0400 Subject: [PATCH 1040/2115] 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 d831f6d0d431..d9a3831cf1a2 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 diff --git a/go.sum b/go.sum index c91d17d61120..60542b0546af 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/ze github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= From c1684e9c61db12c40113651b42c9a974d75b5cd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:58 -0400 Subject: [PATCH 1041/2115] 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 d9a3831cf1a2..795a1a5e5126 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 diff --git a/go.sum b/go.sum index 60542b0546af..42eac942f688 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFq github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= From b604249deb2cbf8405e92902d5b01854a11e6ae1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:59 -0400 Subject: [PATCH 1042/2115] go get github.com/aws/aws-sdk-go-v2/service/appmesh. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 795a1a5e5126..e92551c86412 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 diff --git a/go.sum b/go.sum index 42eac942f688..fc440c64c3ba 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= From 64f14d6c40c70fa04174a97c9153de1af25294cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:56:59 -0400 Subject: [PATCH 1043/2115] 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 e92551c86412..7ae27bdc8270 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 diff --git a/go.sum b/go.sum index fc440c64c3ba..e988d03a4136 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDl github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= From d454086740b1f2e23a82130ae013326ad1c5ff2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:00 -0400 Subject: [PATCH 1044/2115] 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 7ae27bdc8270..d5344ea6d778 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 diff --git a/go.sum b/go.sum index e988d03a4136..eabf273c7c96 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1/go.mod h1:3etelpvZBQTN26rH5Cf/S82hU4DUi9XP9s4Lq1bAeRw= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= From 628214b8e036b7a78d7ee6444b59165587ae3a54 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:02 -0400 Subject: [PATCH 1045/2115] 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 d5344ea6d778..af869aff4baa 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 diff --git a/go.sum b/go.sum index eabf273c7c96..2c27b0f25111 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/N github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1/go.mod h1:3etelpvZBQTN26rH5Cf/S82hU4DUi9XP9s4Lq1bAeRw= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3/go.mod h1:0nr7mHOJvPp6YPsl1foq6dtYCvLXOqA32PNh4rOvV6M= github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= From f76c538e970e50462588308a9efeb89cc9366bee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:03 -0400 Subject: [PATCH 1046/2115] go get github.com/aws/aws-sdk-go-v2/service/arcregionswitch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index af869aff4baa..f5f1b9ac6729 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 diff --git a/go.sum b/go.sum index 2c27b0f25111..7bb067b6f6fe 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMA github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3/go.mod h1:0nr7mHOJvPp6YPsl1foq6dtYCvLXOqA32PNh4rOvV6M= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= github.com/aws/aws-sdk-go-v2/service/athena v1.55.1/go.mod h1:uiwfDwJN9bdkTr0nBmjzZ5pE6j91gIkdZr5FL1gcH8s= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= From e902c4176721abaa48e575c2f8c02ab8392b4287 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:04 -0400 Subject: [PATCH 1047/2115] 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 f5f1b9ac6729..aebddb1c90a6 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 - github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 + github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 diff --git a/go.sum b/go.sum index 7bb067b6f6fe..f0acefd9e790 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJS github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.1/go.mod h1:uiwfDwJN9bdkTr0nBmjzZ5pE6j91gIkdZr5FL1gcH8s= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= From 53a99c70716b66cadc0499b4a69cbb65a2a042ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:05 -0400 Subject: [PATCH 1048/2115] 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 aebddb1c90a6..aa1e3ce07263 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 diff --git a/go.sum b/go.sum index f0acefd9e790..04e3eea12cb4 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= From f85caf27c9b77e6e2af490b6bdbdb327a0f07bc3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:07 -0400 Subject: [PATCH 1049/2115] 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 aa1e3ce07263..99f58ff78e32 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 diff --git a/go.sum b/go.sum index 04e3eea12cb4..1f4d868d4c4e 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVt github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= From 5d7b4ae8b424e22d33f1a137b73ea7cfd6cc148b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:07 -0400 Subject: [PATCH 1050/2115] 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 99f58ff78e32..e75d247bcc4e 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 diff --git a/go.sum b/go.sum index 1f4d868d4c4e..7ad41ff65e00 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT9 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= From af4112b47d89c2af78675011cbbbada02cf8c86d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:08 -0400 Subject: [PATCH 1051/2115] 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 e75d247bcc4e..9990830197dd 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 - github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 + github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 diff --git a/go.sum b/go.sum index 7ad41ff65e00..23c9ab0cef17 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/Mg github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= github.com/aws/aws-sdk-go-v2/service/batch v1.57.4/go.mod h1:tli8PsM6pY+zVBNO5TQmjpfH4EOUQmVmZMwdYrNS2dM= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= From 88660e5fbb9bd29d2eda1c5d62e4fe2ef8126258 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:09 -0400 Subject: [PATCH 1052/2115] 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 9990830197dd..ec478cfc61d8 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 diff --git a/go.sum b/go.sum index 23c9ab0cef17..f7c7f0922a03 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUB github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.4/go.mod h1:tli8PsM6pY+zVBNO5TQmjpfH4EOUQmVmZMwdYrNS2dM= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3/go.mod h1:eVLsZruYbIlLNYiJmgLYrfUHojwUuicjZWtdqNNKNM0= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= From 21813483467002deac5b6750a6261acfc446fcb0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:11 -0400 Subject: [PATCH 1053/2115] 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 ec478cfc61d8..9947c470fe15 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 diff --git a/go.sum b/go.sum index f7c7f0922a03..8e6a1dc8e37b 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,8 @@ github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLp github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3/go.mod h1:eVLsZruYbIlLNYiJmgLYrfUHojwUuicjZWtdqNNKNM0= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1/go.mod h1:/cPr0IPQv5WdY66EbW0Q6MhkEgsffgZm3yce+9p8bTk= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= From 3c75f41df290aa9ba12a00ecbad242977b6f7dc7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:12 -0400 Subject: [PATCH 1054/2115] 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 9947c470fe15..8c01097bb30c 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 diff --git a/go.sum b/go.sum index 8e6a1dc8e37b..1290f673c971 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1/go.mod h1:/cPr0IPQv5WdY66EbW0Q6MhkEgsffgZm3yce+9p8bTk= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1/go.mod h1:zEodD2/kBZ3ZkvCQ+BI+ssglVf63iFaQFUTPJ+nHqp0= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= From 746c9f75beebf221e005ffdd5e27754c689e0f04 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:13 -0400 Subject: [PATCH 1055/2115] 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 8c01097bb30c..cd0da26b4f63 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 diff --git a/go.sum b/go.sum index 1290f673c971..cfccb28df068 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,8 @@ github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJIS github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1/go.mod h1:zEodD2/kBZ3ZkvCQ+BI+ssglVf63iFaQFUTPJ+nHqp0= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1/go.mod h1:A9jOizMWCC5jhr6LxEDUHX2E93F1yhHFLSXt675rYnM= github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= From dac24de5494fa1da6a967f9bc4584c736d33660f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:14 -0400 Subject: [PATCH 1056/2115] go get github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cd0da26b4f63..7c011159f4f7 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 diff --git a/go.sum b/go.sum index cfccb28df068..115235a71bee 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BX github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1/go.mod h1:A9jOizMWCC5jhr6LxEDUHX2E93F1yhHFLSXt675rYnM= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= github.com/aws/aws-sdk-go-v2/service/billing v1.7.2/go.mod h1:lsoYw+OFJmS8qAQ5dqJgVxdrD2bpwb/H745dIn0FYbs= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= From dbcadfbcc3288844e31add3adea5d5f428e3ba19 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:15 -0400 Subject: [PATCH 1057/2115] go get github.com/aws/aws-sdk-go-v2/service/billing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7c011159f4f7..51331b0faa95 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 - github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 diff --git a/go.sum b/go.sum index 115235a71bee..5e26e560a5c8 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.2/go.mod h1:lsoYw+OFJmS8qAQ5dqJgVxdrD2bpwb/H745dIn0FYbs= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2/go.mod h1:MbAwOxXSx2BqyRO7lwjBif37kxuJXmKtH1evpqO2JrM= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= From 5cfd70ebaa409b9e3343e796df94a537ea4765dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:16 -0400 Subject: [PATCH 1058/2115] 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 51331b0faa95..341d65841c6a 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 diff --git a/go.sum b/go.sum index 5e26e560a5c8..41e5bcb71c72 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxc github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2/go.mod h1:MbAwOxXSx2BqyRO7lwjBif37kxuJXmKtH1evpqO2JrM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1/go.mod h1:7FcgDxYbo1T+/PalhytMEKMamKlvO8ArdBL6faoA4MA= github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 h1:rfnS0WZj9LUQ+EqMAfZiGKtquux/U7m4AbijAB+rLD4= From b017fab8b9717adaae2531d28b8ccaee3a0ec95c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:19 -0400 Subject: [PATCH 1059/2115] go get github.com/aws/aws-sdk-go-v2/service/chime. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 341d65841c6a..4afb180a2e90 100644 --- a/go.mod +++ b/go.mod @@ -48,8 +48,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 - github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 + github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 diff --git a/go.sum b/go.sum index 41e5bcb71c72..412b6ada1d87 100644 --- a/go.sum +++ b/go.sum @@ -107,10 +107,10 @@ github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGj github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1/go.mod h1:7FcgDxYbo1T+/PalhytMEKMamKlvO8ArdBL6faoA4MA= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 h1:rfnS0WZj9LUQ+EqMAfZiGKtquux/U7m4AbijAB+rLD4= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.0/go.mod h1:cCaE9m91FJAzxAxDtVuNkYUGi2b8BGT0BdxUpCAuSSE= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 h1:IUPXngqpjUMMNk4SInQHLcsRiD9Bs8ALoVdkWt8ocBk= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1/go.mod h1:LHkXcBjWxtd4d3oNXk2yYgutSJRm8RDXswU02q4zWrw= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= From 37a56ea6cd3245862e71add4546fb90dd58863ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:20 -0400 Subject: [PATCH 1060/2115] 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 4afb180a2e90..807ddc6d1240 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 diff --git a/go.sum b/go.sum index 412b6ada1d87..2f363aeb48ca 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxor github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 h1:IUPXngqpjUMMNk4SInQHLcsRiD9Bs8ALoVdkWt8ocBk= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1/go.mod h1:LHkXcBjWxtd4d3oNXk2yYgutSJRm8RDXswU02q4zWrw= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= From dbad531a636a5fd10d6d3b1c7c58916f0b44d4b9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:21 -0400 Subject: [PATCH 1061/2115] 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 807ddc6d1240..fb6bc4f88f98 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 diff --git a/go.sum b/go.sum index 2f363aeb48ca..9c9e4dce4e70 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34o github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= From 7964b55616365bdd1b98f28f4fa7d4925ed8ddff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:22 -0400 Subject: [PATCH 1062/2115] 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 fb6bc4f88f98..fe3006f2ab50 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 diff --git a/go.sum b/go.sum index 9c9e4dce4e70..7c17e787b072 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4b github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLrPy1vwP8l7OSJGcwaKVd8oY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= From df31fe15bc7e3393476f1517003a7cad65352be0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:24 -0400 Subject: [PATCH 1063/2115] 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 fe3006f2ab50..f7cf5d29726e 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 diff --git a/go.sum b/go.sum index 7c17e787b072..6434bbea87a5 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnp github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLrPy1vwP8l7OSJGcwaKVd8oY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= From c6186f53fb13c07fb9a614820c042ed37ef0c708 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:25 -0400 Subject: [PATCH 1064/2115] 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 f7cf5d29726e..be3b57993b9f 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 diff --git a/go.sum b/go.sum index 6434bbea87a5..1fb7922de102 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLr github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1/go.mod h1:/1a6OiHnno31OznAJQT7fyU0oUVKEWlfQkWIYzM8sjk= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= From 2164dd801e5a96a73da4d22bb3262207fb7bfb4b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:25 -0400 Subject: [PATCH 1065/2115] 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 be3b57993b9f..0d53f952b6e4 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 diff --git a/go.sum b/go.sum index 1fb7922de102..5dd9536444e9 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1/go.mod h1:/1a6OiHnno31OznAJQT7fyU0oUVKEWlfQkWIYzM8sjk= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= From 6d1e93c5da83fcb96f3a70d3ccfd5c40ffa19a8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:27 -0400 Subject: [PATCH 1066/2115] 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 0d53f952b6e4..9ba5fc209331 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 diff --git a/go.sum b/go.sum index 5dd9536444e9..b0d78135f71f 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+I github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcDcf6Vc0MltrMFi08FCYCIaE= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= From cad64db8880a75f4963abcbe9b9b790b00ae5dfa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:28 -0400 Subject: [PATCH 1067/2115] 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 9ba5fc209331..b17389bb6333 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 diff --git a/go.sum b/go.sum index b0d78135f71f..0864f92dde1c 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcDcf6Vc0MltrMFi08FCYCIaE= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= From 006d6077c7f04da100a5656728ca2faa305a99db Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:29 -0400 Subject: [PATCH 1068/2115] 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 b17389bb6333..e1401721fba9 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 diff --git a/go.sum b/go.sum index 0864f92dde1c..7ba482c7f2b0 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcD github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= From bf2485e59daca3d6c808b2a5e76fb50817f0bd2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:30 -0400 Subject: [PATCH 1069/2115] 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 e1401721fba9..641e24186707 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 diff --git a/go.sum b/go.sum index 7ba482c7f2b0..6f37e261eb42 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1/go.mod h1:TXpE7TkM6gbt/s2S/xndpv7jy3AP2jnlfBtNu0r4aYY= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= From 8989bafb51e1f09f159c0bf239df7b5774e94b90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:31 -0400 Subject: [PATCH 1070/2115] 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 641e24186707..8a2992ecda09 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 diff --git a/go.sum b/go.sum index 6f37e261eb42..656e4028c88c 100644 --- a/go.sum +++ b/go.sum @@ -131,8 +131,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWj github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1/go.mod h1:TXpE7TkM6gbt/s2S/xndpv7jy3AP2jnlfBtNu0r4aYY= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1/go.mod h1:QJBeAX9imA8RWLG7/X2RJtTmSerdENe/hCGIjllPGHI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= From 0101d53e827c932e2d1b8555b9b2d972d7db6edb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:33 -0400 Subject: [PATCH 1071/2115] 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 8a2992ecda09..a664a0f5a8a4 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 diff --git a/go.sum b/go.sum index 656e4028c88c..099d4ba31684 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PF github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1/go.mod h1:QJBeAX9imA8RWLG7/X2RJtTmSerdENe/hCGIjllPGHI= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1/go.mod h1:yfmvd1yoaZOPxwn97mnTnF6Jt/d8sThRqfs2RISPQi0= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= From 0ea690eef37dbe78b680a408ddffd9bb6a4242dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:34 -0400 Subject: [PATCH 1072/2115] 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 a664a0f5a8a4..7595563c1cbc 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 diff --git a/go.sum b/go.sum index 099d4ba31684..7171264ec3a9 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9J github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1/go.mod h1:yfmvd1yoaZOPxwn97mnTnF6Jt/d8sThRqfs2RISPQi0= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1/go.mod h1:1Dyvs+9cfooiIHba3iRvM88OPUB2NH8soQgW8gGCXaE= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= From d748e11d0cbcb4a292ad03278250c1bc66783ebc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:35 -0400 Subject: [PATCH 1073/2115] 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 7595563c1cbc..419f5ecb7993 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 diff --git a/go.sum b/go.sum index 7171264ec3a9..f5faa6a915b7 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6A github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1/go.mod h1:1Dyvs+9cfooiIHba3iRvM88OPUB2NH8soQgW8gGCXaE= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0/go.mod h1:ufwtLF0mNQW0gCLbgdaHFgVtzUHeZ4VKKgdCjrmKpIE= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= From 9d65b75a76b633816d38b9c2124d9f2d33f9adec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:36 -0400 Subject: [PATCH 1074/2115] 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 419f5ecb7993..da4cde60bcdd 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 diff --git a/go.sum b/go.sum index f5faa6a915b7..0f2d15262df4 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0/go.mod h1:ufwtLF0mNQW0gCLbgdaHFgVtzUHeZ4VKKgdCjrmKpIE= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3/go.mod h1:WIcsVbfKETtSzv7BMpVsAe10+8pkBBN8JGwJRGnZAQI= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= From ee643f4d8b0dbf11f915003ebc9b7d9c7f2a707b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:37 -0400 Subject: [PATCH 1075/2115] 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 da4cde60bcdd..c70c5b5d6f1a 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 diff --git a/go.sum b/go.sum index 0f2d15262df4..0a283a013982 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0re github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3/go.mod h1:WIcsVbfKETtSzv7BMpVsAe10+8pkBBN8JGwJRGnZAQI= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= From a21de93ded0c06d14b23655c26efe4a7b6bb4968 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:38 -0400 Subject: [PATCH 1076/2115] 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 c70c5b5d6f1a..a0af2972acba 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 diff --git a/go.sum b/go.sum index 0a283a013982..3e291c811d19 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+Yyp github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= From 086ea3e719eeaadef90cab3ebd7deddf2dbd00f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:39 -0400 Subject: [PATCH 1077/2115] go get github.com/aws/aws-sdk-go-v2/service/codeconnections. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a0af2972acba..4325de33948d 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 diff --git a/go.sum b/go.sum index 3e291c811d19..743225ec19c1 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7V github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= From e6b3711fc9ff85e3c42d1bafbc63af418db36560 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:40 -0400 Subject: [PATCH 1078/2115] 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 4325de33948d..74be32199354 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 diff --git a/go.sum b/go.sum index 743225ec19c1..866145241340 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HP github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= From 8204d8c8d2914c9253184992f4e9af18ae22055d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:41 -0400 Subject: [PATCH 1079/2115] 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 74be32199354..0bd7ba2f6743 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 diff --git a/go.sum b/go.sum index 866145241340..eb4a1865b811 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGA github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= From fbac6b9463212df8322ee300f7b98c07fabfa75b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:42 -0400 Subject: [PATCH 1080/2115] 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 0bd7ba2f6743..018184c90e33 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 diff --git a/go.sum b/go.sum index eb4a1865b811..8861899ede3e 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYs github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= From 3d58cb2d3d268ef53e2dfcdebd9cbca546b31213 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:43 -0400 Subject: [PATCH 1081/2115] 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 018184c90e33..203301d4e3bd 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 diff --git a/go.sum b/go.sum index 8861899ede3e..7e1f8dc35feb 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1/go.mod h1:hB5a4Dd4Q59lQl+f7Q7DIbFWZuUdv60pZRfmKySYXy8= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= From 558dcdd43f52a71a7c6cb1076d2224a37a4b7e5d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:44 -0400 Subject: [PATCH 1082/2115] 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 203301d4e3bd..b78ffd951d0c 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 diff --git a/go.sum b/go.sum index 7e1f8dc35feb..0ae757238231 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kj github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1/go.mod h1:hB5a4Dd4Q59lQl+f7Q7DIbFWZuUdv60pZRfmKySYXy8= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1/go.mod h1:eXa+YkefIF2/zXsnW7vtA+KOHqWdRByLbMyMlPf0qTE= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= From 4c1fe22d61c8775d8db39c35bed80bd6bc012e41 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:46 -0400 Subject: [PATCH 1083/2115] 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 b78ffd951d0c..ad0be5dbea1f 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 diff --git a/go.sum b/go.sum index 0ae757238231..d174329b00ec 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1/go.mod h1:eXa+YkefIF2/zXsnW7vtA+KOHqWdRByLbMyMlPf0qTE= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1/go.mod h1:BA0tEb4cNsfecUnT72QtAiwVj4RDrhANkbMWgr8upt4= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= From 097a3b41e18f26fb64a39d2755cb4ab50477d6e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:46 -0400 Subject: [PATCH 1084/2115] 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 ad0be5dbea1f..82eec16e4fb7 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 diff --git a/go.sum b/go.sum index d174329b00ec..d10ec4802bfb 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1om github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1/go.mod h1:BA0tEb4cNsfecUnT72QtAiwVj4RDrhANkbMWgr8upt4= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2/go.mod h1:u6UQOkyctJPBzjoo+DykqLZ0e4UJXJez67sFtGjRYmc= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= From 41ea790ea3051af9f675b8a38a60b5d0ae1aae5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:47 -0400 Subject: [PATCH 1085/2115] go get github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 82eec16e4fb7..cbb44c873af2 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 diff --git a/go.sum b/go.sum index d10ec4802bfb..2673bd78da7e 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiL github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2/go.mod h1:u6UQOkyctJPBzjoo+DykqLZ0e4UJXJez67sFtGjRYmc= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1/go.mod h1:bpueKKPNQQyTsKgFet4PdAgl+XLSHBKUiZ0j+vQlk34= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= From 88973b142958c974615faa64e7d36b0536ee7834 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:48 -0400 Subject: [PATCH 1086/2115] 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 cbb44c873af2..eb69bb6b0122 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 diff --git a/go.sum b/go.sum index 2673bd78da7e..eb3e1f902e14 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VO github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1/go.mod h1:bpueKKPNQQyTsKgFet4PdAgl+XLSHBKUiZ0j+vQlk34= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= From 31cf48687c02d3deb09cbb86de3683a964d7fcaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:50 -0400 Subject: [PATCH 1087/2115] 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 eb69bb6b0122..b750834f9f6a 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 diff --git a/go.sum b/go.sum index eb3e1f902e14..9eaba57957ef 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrv github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= From c7f5e4dd4f93fabaa19a46f0cdd465ed7acbd581 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:51 -0400 Subject: [PATCH 1088/2115] 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 b750834f9f6a..4aac31d77823 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 diff --git a/go.sum b/go.sum index 9eaba57957ef..90e8d1c12fb7 100644 --- a/go.sum +++ b/go.sum @@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZml github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= github.com/aws/aws-sdk-go-v2/service/connect v1.138.0/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= From ca954aca214b2cac68180f34a191169b36a63b06 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:52 -0400 Subject: [PATCH 1089/2115] go get github.com/aws/aws-sdk-go-v2/service/connect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4aac31d77823..d8ea655f5ec4 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 - github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 + github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 diff --git a/go.sum b/go.sum index 90e8d1c12fb7..3e7926f2d645 100644 --- a/go.sum +++ b/go.sum @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pv github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.0/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= From fa51ef38a741ece2e15e9728ebbfe33cb28ce45d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:54 -0400 Subject: [PATCH 1090/2115] 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 d8ea655f5ec4..5aedaee5df06 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 diff --git a/go.sum b/go.sum index 3e7926f2d645..d64e16f49785 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WC github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1/go.mod h1:xbYZ9+N7gYc30vMR6IOb4Y5UHB3V6q2aaxe4SrVNXLc= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= From f8989ac6c24c3933f7c6782a36de28f471b94a9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:55 -0400 Subject: [PATCH 1091/2115] 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 5aedaee5df06..d42ff8ec0c30 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 diff --git a/go.sum b/go.sum index d64e16f49785..ad31469fd5b0 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ug github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1/go.mod h1:xbYZ9+N7gYc30vMR6IOb4Y5UHB3V6q2aaxe4SrVNXLc= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1/go.mod h1:yOFkixPF7VkKZKzkgEYx7UM7nqkhPWRNkV1AoWXEwqw= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= From 3866a7f462ad91bfae1ebf4e3f2585c53113b3f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:56 -0400 Subject: [PATCH 1092/2115] 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 d42ff8ec0c30..8f297b8578a4 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 diff --git a/go.sum b/go.sum index ad31469fd5b0..d201f31aeb4c 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoC github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1/go.mod h1:yOFkixPF7VkKZKzkgEYx7UM7nqkhPWRNkV1AoWXEwqw= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2/go.mod h1:rpux7wx/IwrzFQeHZejTPAw5K+VjkZgqxwSVb4f8VUY= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= From 93e296e2f178d27c76e7d63f979b256ba8a50c3a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:57 -0400 Subject: [PATCH 1093/2115] 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 8f297b8578a4..f12938f97092 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 diff --git a/go.sum b/go.sum index d201f31aeb4c..02a24d81dcf2 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9ca github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2/go.mod h1:rpux7wx/IwrzFQeHZejTPAw5K+VjkZgqxwSVb4f8VUY= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1/go.mod h1:ujChJcb5Na2xzIwgJFkNO+B241PF3W599te3yD32e8Q= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= From 8a32c8d58ea0771ec7fecaeb23fec3b92eaacd0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:58 -0400 Subject: [PATCH 1094/2115] 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 f12938f97092..729c9fb7145f 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 diff --git a/go.sum b/go.sum index 02a24d81dcf2..7949bb0aca90 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0n github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1/go.mod h1:ujChJcb5Na2xzIwgJFkNO+B241PF3W599te3yD32e8Q= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= From 3e6ff404a1a8c93c89b16f532f7316984a6f4192 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:57:59 -0400 Subject: [PATCH 1095/2115] 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 729c9fb7145f..b8919d4fd3d6 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 diff --git a/go.sum b/go.sum index 7949bb0aca90..2b91e424cdfe 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWf github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= From 22392f83d733cfbacc9a71d085f9dcf2cca3144d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:00 -0400 Subject: [PATCH 1096/2115] go get github.com/aws/aws-sdk-go-v2/service/databasemigrationservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b8919d4fd3d6..fb986aee8205 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 diff --git a/go.sum b/go.sum index 2b91e424cdfe..438fe9c22691 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtm github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= From 18b7f85c50ec187849a5ccef0416219579d11fad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:01 -0400 Subject: [PATCH 1097/2115] go get github.com/aws/aws-sdk-go-v2/service/databrew. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fb986aee8205..b81646c6f3f5 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 diff --git a/go.sum b/go.sum index 438fe9c22691..57fcb0158d26 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= From fc3a7baac771eb014fe97a9b29cec8069727b1f9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:02 -0400 Subject: [PATCH 1098/2115] go get github.com/aws/aws-sdk-go-v2/service/dataexchange. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b81646c6f3f5..bd0d7c092a62 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 diff --git a/go.sum b/go.sum index 57fcb0158d26..431a3cf24afb 100644 --- a/go.sum +++ b/go.sum @@ -187,8 +187,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+O github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0/go.mod h1:AszugMxR76tEt6QU7mbYM41h35MgeamN7HrXL08i098= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= From 4aae61cc925c1d94b4e26dada20a083e79ae6664 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:03 -0400 Subject: [PATCH 1099/2115] go get github.com/aws/aws-sdk-go-v2/service/datapipeline. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bd0d7c092a62..92e29170bf26 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 diff --git a/go.sum b/go.sum index 431a3cf24afb..408dab8e2514 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,8 @@ github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe6 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0/go.mod h1:AszugMxR76tEt6QU7mbYM41h35MgeamN7HrXL08i098= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1/go.mod h1:LIVjAaMXcYxF2hlrfS67SbIC0r9xGyLQCY4WkeUAbLI= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= From 624e1c8ddfb8708d4cdfab94ebee02e7722c8d83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:04 -0400 Subject: [PATCH 1100/2115] 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 92e29170bf26..4f8de29c18dc 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 diff --git a/go.sum b/go.sum index 408dab8e2514..5cab35162fb7 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8t github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1/go.mod h1:LIVjAaMXcYxF2hlrfS67SbIC0r9xGyLQCY4WkeUAbLI= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1/go.mod h1:QRv7lhO6qNHRWOvW8tzqkPwwRRBamrtYtnHY+DVrZr8= github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= From d494d4f0c50ad034b957bdcc99dd0ca737a2a20e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:06 -0400 Subject: [PATCH 1101/2115] 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 4f8de29c18dc..7c9f77ceb2da 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 diff --git a/go.sum b/go.sum index 5cab35162fb7..e3d8079e3dfe 100644 --- a/go.sum +++ b/go.sum @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1/go.mod h1:QRv7lhO6qNHRWOvW8tzqkPwwRRBamrtYtnHY+DVrZr8= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= github.com/aws/aws-sdk-go-v2/service/dax v1.28.1/go.mod h1:bROwP3K7obQzc1lytji0K6MDwavTNADoCXzIMBL4rV0= github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= From 1fb14eb9e687f166f318f9d67b3eb504704b8d02 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:08 -0400 Subject: [PATCH 1102/2115] 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 7c9f77ceb2da..242d130691f5 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 - github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 + github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 diff --git a/go.sum b/go.sum index e3d8079e3dfe..9468ce60e703 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqY github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.1/go.mod h1:bROwP3K7obQzc1lytji0K6MDwavTNADoCXzIMBL4rV0= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= github.com/aws/aws-sdk-go-v2/service/detective v1.37.2/go.mod h1:3db0FYylodrSUD0M+aAK3qHW2vX09oOn4zpuA0RCJBM= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= From 433d7a2d7b3c6ce2e3cebaf66ef4c9966320f857 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:09 -0400 Subject: [PATCH 1103/2115] go get github.com/aws/aws-sdk-go-v2/service/detective. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 242d130691f5..a563dc927fee 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 - github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 diff --git a/go.sum b/go.sum index 9468ce60e703..db6fd25f2994 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY5 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.2/go.mod h1:3db0FYylodrSUD0M+aAK3qHW2vX09oOn4zpuA0RCJBM= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1/go.mod h1:6zhbFkB+HRZ0cSg9tAydoSbegTDErbaFtxUdNIknhsg= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= From 7cdffb85f61c1da47fd0862a257483fff91a11a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:10 -0400 Subject: [PATCH 1104/2115] 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 a563dc927fee..016e2b5f95d9 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 diff --git a/go.sum b/go.sum index db6fd25f2994..753d65a6583e 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1/go.mod h1:6zhbFkB+HRZ0cSg9tAydoSbegTDErbaFtxUdNIknhsg= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1/go.mod h1:ZrN/blD6ifgST8JxHwLIXnVJ0y/IE4MyZTTkxKMf4jA= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= From 6ab73120e9b24e2b496dd8a7027cf53bb08ef0ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:12 -0400 Subject: [PATCH 1105/2115] 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 016e2b5f95d9..552efcdd36da 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 diff --git a/go.sum b/go.sum index 753d65a6583e..729efb5bce20 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,8 @@ github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9t github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1/go.mod h1:ZrN/blD6ifgST8JxHwLIXnVJ0y/IE4MyZTTkxKMf4jA= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1/go.mod h1:pq3d1zkOEUuWtIsrPhTeaa2NK4bycj1zimpeep4trrY= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= From 52e27115c48e64f541db089e9efaf3b338267b92 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:13 -0400 Subject: [PATCH 1106/2115] go get github.com/aws/aws-sdk-go-v2/service/directconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 552efcdd36da..e07a12c43cdc 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 diff --git a/go.sum b/go.sum index 729efb5bce20..b5ca9ca26006 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIH github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1/go.mod h1:pq3d1zkOEUuWtIsrPhTeaa2NK4bycj1zimpeep4trrY= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0/go.mod h1:KkCYX9biRFzx8lAEgYyNSuQ3ljMK2ZOTnplMhHyCfhk= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= From 54faa1b245a050959f27640f4398b6ebf1a0616b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:15 -0400 Subject: [PATCH 1107/2115] 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 e07a12c43cdc..d26d7daa6718 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 diff --git a/go.sum b/go.sum index b5ca9ca26006..9152045d808c 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,8 @@ github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHP github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0/go.mod h1:KkCYX9biRFzx8lAEgYyNSuQ3ljMK2ZOTnplMhHyCfhk= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1/go.mod h1:5WWwggaheKkEFmlCkClB7VnUgnRMVYrWSFJHQujEQ+4= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= From cdce2baf9fe06b092dd3f2708537fc971aa2af9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:16 -0400 Subject: [PATCH 1108/2115] 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 d26d7daa6718..e1982c70d3e5 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 diff --git a/go.sum b/go.sum index 9152045d808c..d821b19f4bbb 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRY github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1/go.mod h1:5WWwggaheKkEFmlCkClB7VnUgnRMVYrWSFJHQujEQ+4= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1/go.mod h1:6BdZwKA5lrUl5FoReQ000/D+OnVxfGxZyjwuWNKxiRo= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= From 001aee2c04803e59ef0b7cc9f98a2a10d502452c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:17 -0400 Subject: [PATCH 1109/2115] 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 e1982c70d3e5..3a9c95817916 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 diff --git a/go.sum b/go.sum index d821b19f4bbb..c4b591b4ac45 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1/go.mod h1:6BdZwKA5lrUl5FoReQ000/D+OnVxfGxZyjwuWNKxiRo= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1/go.mod h1:jCU6Bb4RlCMdvgVZTmfrCSHAJ5wzNXdJKEgQfX6M1Kk= github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= From 53772351a5375e7ac2e305fb751d182790f5ad80 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:19 -0400 Subject: [PATCH 1110/2115] 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 3a9c95817916..45e429d51d18 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 diff --git a/go.sum b/go.sum index c4b591b4ac45..35b9bedaf17c 100644 --- a/go.sum +++ b/go.sum @@ -211,8 +211,8 @@ github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dI github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1/go.mod h1:jCU6Bb4RlCMdvgVZTmfrCSHAJ5wzNXdJKEgQfX6M1Kk= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= From 89bf3326e3b33c84b9a22b08d96fe6202bb3ab78 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:20 -0400 Subject: [PATCH 1111/2115] 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 45e429d51d18..f358ee89ceb4 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 - github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 + github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 diff --git a/go.sum b/go.sum index 35b9bedaf17c..75b345ae3a34 100644 --- a/go.sum +++ b/go.sum @@ -213,8 +213,8 @@ github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 h1:SFGMSoIZ+eoBVomUepL0NsunbKS8KZ+TupTVBwajQAk= From 006ce131895fcdafc59b54208be10228ed5b34de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:22 -0400 Subject: [PATCH 1112/2115] go get github.com/aws/aws-sdk-go-v2/service/dynamodb. --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f358ee89ceb4..7012fdc24a8e 100644 --- a/go.mod +++ b/go.mod @@ -102,8 +102,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 @@ -329,7 +329,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect diff --git a/go.sum b/go.sum index 75b345ae3a34..2bfbd4abb1f7 100644 --- a/go.sum +++ b/go.sum @@ -215,10 +215,10 @@ github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/p github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 h1:SFGMSoIZ+eoBVomUepL0NsunbKS8KZ+TupTVBwajQAk= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 h1:HMGUQWPOu0Z6gzc/odJ1T0UJezDwzy3xSy13fOUSTp8= github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= @@ -297,8 +297,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebP github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= From f188527ecbb83344c69d3c9b1aa1b5e6965c89e9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:24 -0400 Subject: [PATCH 1113/2115] 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 7012fdc24a8e..8ad4da496bf3 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 diff --git a/go.sum b/go.sum index 2bfbd4abb1f7..50e03cd3684c 100644 --- a/go.sum +++ b/go.sum @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGi github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 h1:HMGUQWPOu0Z6gzc/odJ1T0UJezDwzy3xSy13fOUSTp8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 h1:1wn3h1PKTKQ9tg7bzfm4x1iqKYsLY2qfmV4SsDmakkI= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= From b0650030dea344491fa645a7ccfc1b83bf6eb8b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:24 -0400 Subject: [PATCH 1114/2115] 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 8ad4da496bf3..46b4f9089a0b 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 diff --git a/go.sum b/go.sum index 50e03cd3684c..8208e3bddf01 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynl github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 h1:1wn3h1PKTKQ9tg7bzfm4x1iqKYsLY2qfmV4SsDmakkI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= From 84a29a1df11ab606455ada633c2c1ee9c1bfcb71 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:26 -0400 Subject: [PATCH 1115/2115] go get github.com/aws/aws-sdk-go-v2/service/ecs. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 46b4f9089a0b..4ef972eaebc0 100644 --- a/go.mod +++ b/go.mod @@ -106,8 +106,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 diff --git a/go.sum b/go.sum index 8208e3bddf01..50f01c567e67 100644 --- a/go.sum +++ b/go.sum @@ -223,10 +223,10 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 h1:1wn3h1PKTKQ9tg7bzfm4x1iqKYs github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3/go.mod h1:Djd18W785OhsZRJcmWOBScRpJfrYtPYPl5e6ignT0lw= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZKp3nA4pqgIODScw= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 h1:E+nb7y5lRuNHsINV4nNFurH+U4BnJsa3SCPIZyUZxFo= github.com/aws/aws-sdk-go-v2/service/efs v1.40.2/go.mod h1:XkI+sL604XSxj0puip8ECW4ZI4BEksuJq77qVrk9FlI= github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= From 9e890f584517f5740860fea7e5b706a3676b4d75 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:27 -0400 Subject: [PATCH 1116/2115] go get github.com/aws/aws-sdk-go-v2/service/efs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4ef972eaebc0..7315a05912c5 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 - github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 diff --git a/go.sum b/go.sum index 50f01c567e67..d8f5010cbd7f 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zss github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZKp3nA4pqgIODScw= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 h1:E+nb7y5lRuNHsINV4nNFurH+U4BnJsa3SCPIZyUZxFo= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.2/go.mod h1:XkI+sL604XSxj0puip8ECW4ZI4BEksuJq77qVrk9FlI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= github.com/aws/aws-sdk-go-v2/service/eks v1.73.0/go.mod h1:L3v6KI08dxAjEC16qpPb/uH7mMFlk5Ut7IVbFmB+2SQ= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= From 57ca763246b69a9254c0b0b83327ccf898e322a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:28 -0400 Subject: [PATCH 1117/2115] 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 7315a05912c5..af23841995b8 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 - github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 + github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 diff --git a/go.sum b/go.sum index d8f5010cbd7f..d3c2e66bd369 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.0/go.mod h1:L3v6KI08dxAjEC16qpPb/uH7mMFlk5Ut7IVbFmB+2SQ= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0/go.mod h1:XJKCh9tr2gv4EiSbh7v4QOacRLLjgv91+DvuNuvwOxM= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= From 5c1041588496b22d6ccd0002201f5ae3ab4e967c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:29 -0400 Subject: [PATCH 1118/2115] 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 af23841995b8..48f94d0e37bd 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 diff --git a/go.sum b/go.sum index d3c2e66bd369..cc7c400412cc 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GB github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0/go.mod h1:XJKCh9tr2gv4EiSbh7v4QOacRLLjgv91+DvuNuvwOxM= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2/go.mod h1:28fLKqJDUYtJyagwMg5mY4pjHeIqotYqj3Y7r1ZbF0I= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= From 98704529e4c07fa32186844d3bc3b7561eba4fa9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:30 -0400 Subject: [PATCH 1119/2115] 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 48f94d0e37bd..bf3acb1d5c5d 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 diff --git a/go.sum b/go.sum index cc7c400412cc..02d58b56954f 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCn github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2/go.mod h1:28fLKqJDUYtJyagwMg5mY4pjHeIqotYqj3Y7r1ZbF0I= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1/go.mod h1:IOeGzMdHDJsRZefrjoGKP7OWctaKmfKbjHY8UsKuVZA= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= From 08603e74a8d4900534ac45ec2972439e2e105ee8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:32 -0400 Subject: [PATCH 1120/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bf3acb1d5c5d..76d06a087259 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 diff --git a/go.sum b/go.sum index 02d58b56954f..6a4cb61dc82e 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQ github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1/go.mod h1:IOeGzMdHDJsRZefrjoGKP7OWctaKmfKbjHY8UsKuVZA= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1/go.mod h1:Azqh2nJoQmlG04590JiE0Mipn41CehcT2iOZNGJ+4Hc= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= From 06e0dd5a2246f8652988feeea8af8a7169b63989 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:33 -0400 Subject: [PATCH 1121/2115] 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 76d06a087259..7b6fcb8390b2 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 diff --git a/go.sum b/go.sum index 6a4cb61dc82e..0bafceb6e5fb 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsu github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1/go.mod h1:Azqh2nJoQmlG04590JiE0Mipn41CehcT2iOZNGJ+4Hc= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= From acb6a46c3d91828dd433701eac4c60e2f02aca47 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:34 -0400 Subject: [PATCH 1122/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticsearchservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7b6fcb8390b2..fe44f44fded6 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 diff --git a/go.sum b/go.sum index 0bafceb6e5fb..a973d110b362 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= From b5e1412a24ab990977c93b5696189849f8b88c52 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:35 -0400 Subject: [PATCH 1123/2115] go get github.com/aws/aws-sdk-go-v2/service/elastictranscoder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe44f44fded6..f43206de84ee 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 diff --git a/go.sum b/go.sum index a973d110b362..ed749dc07ba5 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= github.com/aws/aws-sdk-go-v2/service/emr v1.54.0/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= From db44ecd3cad13935f2cc67e2069734d31a1e253b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:36 -0400 Subject: [PATCH 1124/2115] 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 f43206de84ee..f81ce8ade917 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 - github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 + github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 diff --git a/go.sum b/go.sum index ed749dc07ba5..2236599b1561 100644 --- a/go.sum +++ b/go.sum @@ -243,8 +243,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.0/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= From cdb9008107aedd3fb09be618604e31d630714a9b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:38 -0400 Subject: [PATCH 1125/2115] go get github.com/aws/aws-sdk-go-v2/service/emrcontainers. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f81ce8ade917..9db721c040d9 100644 --- a/go.mod +++ b/go.mod @@ -117,7 +117,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 diff --git a/go.sum b/go.sum index 2236599b1561..10d7a5496a04 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= From 6dbcfda1020a7b2c4dff8594bb5400d7d39a9fee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:39 -0400 Subject: [PATCH 1126/2115] 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 9db721c040d9..5218d67f386b 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 diff --git a/go.sum b/go.sum index 10d7a5496a04..4150449647e5 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2k github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= From 0dc946350e426aee3445e2f74ab8e417129624df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:40 -0400 Subject: [PATCH 1127/2115] 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 5218d67f386b..aca6e5d7af2e 100644 --- a/go.mod +++ b/go.mod @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 diff --git a/go.sum b/go.sum index 4150449647e5..4905666e554b 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= From 8b0e22c2308eacde7ef7043c39f6cc0019f159e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:42 -0400 Subject: [PATCH 1128/2115] 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 aca6e5d7af2e..43afc7603fa4 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 diff --git a/go.sum b/go.sum index 4905666e554b..fc66b9f49f40 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kB github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= github.com/aws/aws-sdk-go-v2/service/evs v1.4.1/go.mod h1:mgvTMpQm1K4jL6cwHxzY3lwL4294bhszUdrFTb5OE/A= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= From 74140695f3592f19cde548423d329caf99a6ce12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:43 -0400 Subject: [PATCH 1129/2115] go get github.com/aws/aws-sdk-go-v2/service/evs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 43afc7603fa4..680c1bc17279 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 - github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 + github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 diff --git a/go.sum b/go.sum index fc66b9f49f40..ab8a656f9839 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StT github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.1/go.mod h1:mgvTMpQm1K4jL6cwHxzY3lwL4294bhszUdrFTb5OE/A= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= From 5f7fd051a8cbad0a3a006a7844d76c7aeee58b0e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:45 -0400 Subject: [PATCH 1130/2115] 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 680c1bc17279..d3cc8e7f3173 100644 --- a/go.mod +++ b/go.mod @@ -122,7 +122,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 diff --git a/go.sum b/go.sum index ab8a656f9839..1f5d5eb2cbed 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgG github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= From 22a6bc3147b2439f1cb379b6ff4c8786609078d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:46 -0400 Subject: [PATCH 1131/2115] 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 d3cc8e7f3173..c0e169a14e99 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 diff --git a/go.sum b/go.sum index 1f5d5eb2cbed..0ab257d2fedb 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= github.com/aws/aws-sdk-go-v2/service/fis v1.37.0/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= From fbc436cbc22f5ad5f9e431c38d9e3427d08ded71 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:47 -0400 Subject: [PATCH 1132/2115] 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 c0e169a14e99..76c66d4bb8d5 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 - github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 + github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 diff --git a/go.sum b/go.sum index 0ab257d2fedb..977f73b07f33 100644 --- a/go.sum +++ b/go.sum @@ -259,8 +259,8 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+t github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.0/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= github.com/aws/aws-sdk-go-v2/service/fms v1.44.0/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= From 17be95313058627dffafca7c131553d3bb0d3cc1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:48 -0400 Subject: [PATCH 1133/2115] 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 76c66d4bb8d5..0593d383b2d7 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 - github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 + github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 diff --git a/go.sum b/go.sum index 977f73b07f33..cf41ce9ba72c 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMc github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.0/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= From 349ef5cde762d805424e25a1c9b555c0194fec12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:49 -0400 Subject: [PATCH 1134/2115] go get github.com/aws/aws-sdk-go-v2/service/fsx. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0593d383b2d7..63c2d63f5117 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 diff --git a/go.sum b/go.sum index cf41ce9ba72c..18e8ed94b9d5 100644 --- a/go.sum +++ b/go.sum @@ -263,8 +263,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1/go.mod h1:2JfwDlPZm27OCX8U2OI6/nfS8uycIULmcLuyihlA0Bc= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= From b6cf269a1e2360c532300e7b93428cbcef73f920 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:51 -0400 Subject: [PATCH 1135/2115] go get github.com/aws/aws-sdk-go-v2/service/gamelift. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 63c2d63f5117..c66ba6897589 100644 --- a/go.mod +++ b/go.mod @@ -127,7 +127,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 diff --git a/go.sum b/go.sum index 18e8ed94b9d5..d5c3844f82ba 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9Rd github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1/go.mod h1:2JfwDlPZm27OCX8U2OI6/nfS8uycIULmcLuyihlA0Bc= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= From 20b9dba15e32fc3e7198534d4491f2fb7f8d442f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:51 -0400 Subject: [PATCH 1136/2115] 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 c66ba6897589..ae367a9ef45e 100644 --- a/go.mod +++ b/go.mod @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 diff --git a/go.sum b/go.sum index d5c3844f82ba..9854b37bf2b8 100644 --- a/go.sum +++ b/go.sum @@ -267,8 +267,8 @@ github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= From f1d8ffcf132df5297c233b1a0ca35667bf9abffc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:52 -0400 Subject: [PATCH 1137/2115] 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 ae367a9ef45e..1ad815ba934e 100644 --- a/go.mod +++ b/go.mod @@ -129,7 +129,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 diff --git a/go.sum b/go.sum index 9854b37bf2b8..bc955b58b3f8 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6Wt github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= github.com/aws/aws-sdk-go-v2/service/glue v1.128.0/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= From ba6a5a986b2d6a68917f0099fa1bc15f56073865 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:54 -0400 Subject: [PATCH 1138/2115] go get github.com/aws/aws-sdk-go-v2/service/glue. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1ad815ba934e..195cd02a2e48 100644 --- a/go.mod +++ b/go.mod @@ -130,7 +130,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 - github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 + github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 diff --git a/go.sum b/go.sum index bc955b58b3f8..f93bbfe69742 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4X github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.0/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= From a9df94b7bff5d3fcfdceefd95f8d2863407a0c8a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:55 -0400 Subject: [PATCH 1139/2115] go get github.com/aws/aws-sdk-go-v2/service/grafana. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 195cd02a2e48..9492face28d5 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 diff --git a/go.sum b/go.sum index f93bbfe69742..082c1df9a73d 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1/go.mod h1:P9G7ovQCb8ugsMqSk6NmPeD3rQiVYVNqCEcEPZGor/E= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= From cef1403abbfba03b8066ffe4217ae5ae827aaeaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:56 -0400 Subject: [PATCH 1140/2115] go get github.com/aws/aws-sdk-go-v2/service/greengrass. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9492face28d5..b7d97030cc76 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 diff --git a/go.sum b/go.sum index 082c1df9a73d..83b63577c504 100644 --- a/go.sum +++ b/go.sum @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYC github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1/go.mod h1:P9G7ovQCb8ugsMqSk6NmPeD3rQiVYVNqCEcEPZGor/E= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= From be0d876f23cc71fa20de7e66b0b8ba4a28788dec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:58:57 -0400 Subject: [PATCH 1141/2115] 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 b7d97030cc76..b018a600c8ee 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 diff --git a/go.sum b/go.sum index 83b63577c504..7c0cea6b96e6 100644 --- a/go.sum +++ b/go.sum @@ -277,8 +277,8 @@ github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9Q github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 h1:BJyXbWDO3GbJz1hTtFVd1Qgy+RJCsA+Ha2ClW40no5A= From dc4a55c51eb7f5d647a1495b7898f4384f1e7451 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:00 -0400 Subject: [PATCH 1142/2115] 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 b018a600c8ee..1339a20a886e 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 diff --git a/go.sum b/go.sum index 7c0cea6b96e6..0a4dd5463b28 100644 --- a/go.sum +++ b/go.sum @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIw github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 h1:BJyXbWDO3GbJz1hTtFVd1Qgy+RJCsA+Ha2ClW40no5A= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= From 045c09e0521424ae95d7ad565ef72444d217cb48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:00 -0400 Subject: [PATCH 1143/2115] 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 1339a20a886e..8a07488e0d23 100644 --- a/go.mod +++ b/go.mod @@ -136,7 +136,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 - github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 diff --git a/go.sum b/go.sum index 0a4dd5463b28..66f02d0b6c32 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,8 @@ github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1/go.mod h1:eTHLmeHFpGDOjgbL39/C4sZ4ahyb2ZGc1i3hr1Q9hMA= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= From eb2a58794a5ecfda23cb4edeb29fb700bb5824cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:01 -0400 Subject: [PATCH 1144/2115] 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 8a07488e0d23..2cb57cb14a58 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 diff --git a/go.sum b/go.sum index 66f02d0b6c32..597bf849b4ef 100644 --- a/go.sum +++ b/go.sum @@ -285,8 +285,8 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrw github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1/go.mod h1:eTHLmeHFpGDOjgbL39/C4sZ4ahyb2ZGc1i3hr1Q9hMA= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1/go.mod h1:oIEe0OfHys9BGsobPKUYgBA0i9gOTChYe0mP1s10Hpg= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= From 5cdc70e5aa6fe6b0480b7616328f4dbfbe61a8a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:03 -0400 Subject: [PATCH 1145/2115] go get github.com/aws/aws-sdk-go-v2/service/imagebuilder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2cb57cb14a58..a3d40ab9d966 100644 --- a/go.mod +++ b/go.mod @@ -138,7 +138,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 diff --git a/go.sum b/go.sum index 597bf849b4ef..ec32cbadfeeb 100644 --- a/go.sum +++ b/go.sum @@ -287,8 +287,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAp github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1/go.mod h1:oIEe0OfHys9BGsobPKUYgBA0i9gOTChYe0mP1s10Hpg= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0/go.mod h1:Q1oshEWbDmk65i0xxjnUU9i9qJK3hypi7cnVvquvrDI= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= From 6700d8f8043610878f1e29bc55ef7d166ed5bb53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:04 -0400 Subject: [PATCH 1146/2115] go get github.com/aws/aws-sdk-go-v2/service/inspector. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a3d40ab9d966..8e30c0590d65 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 diff --git a/go.sum b/go.sum index ec32cbadfeeb..e8b441356592 100644 --- a/go.sum +++ b/go.sum @@ -289,8 +289,8 @@ github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4c github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0/go.mod h1:Q1oshEWbDmk65i0xxjnUU9i9qJK3hypi7cnVvquvrDI= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= From 62a307cf8c23185b96968e93cb474492114534fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:05 -0400 Subject: [PATCH 1147/2115] 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 8e30c0590d65..d156052f0f4b 100644 --- a/go.mod +++ b/go.mod @@ -140,7 +140,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 diff --git a/go.sum b/go.sum index e8b441356592..21a036dcb4dc 100644 --- a/go.sum +++ b/go.sum @@ -291,8 +291,8 @@ github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= From 8166a10211f3bfa9014c0fd97e8bae1785d05dfb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:05 -0400 Subject: [PATCH 1148/2115] 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 d156052f0f4b..8b2cdf7ddec0 100644 --- a/go.mod +++ b/go.mod @@ -141,7 +141,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 diff --git a/go.sum b/go.sum index 21a036dcb4dc..02d99745aa76 100644 --- a/go.sum +++ b/go.sum @@ -303,8 +303,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJX github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= From 73a7229ebb5cf0e01c4c4736ab3c518fc2abf102 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:06 -0400 Subject: [PATCH 1149/2115] go get github.com/aws/aws-sdk-go-v2/service/invoicing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8b2cdf7ddec0..a231d506ce8a 100644 --- a/go.mod +++ b/go.mod @@ -142,7 +142,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 diff --git a/go.sum b/go.sum index 02d99745aa76..bd3b1fc1f915 100644 --- a/go.sum +++ b/go.sum @@ -305,8 +305,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgn github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= github.com/aws/aws-sdk-go-v2/service/iot v1.69.0/go.mod h1:vSM41OX/dDgIxJcoKYW5LzM5bcfgLUt/CXD9+Qpfl70= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= From 7e2cd9443e60cd293e8efd444429f6e59c5d80ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:08 -0400 Subject: [PATCH 1150/2115] go get github.com/aws/aws-sdk-go-v2/service/iot. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a231d506ce8a..2ccca207c64f 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 - github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 + github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 diff --git a/go.sum b/go.sum index bd3b1fc1f915..e51ac5127f36 100644 --- a/go.sum +++ b/go.sum @@ -307,8 +307,8 @@ github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEw github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.0/go.mod h1:vSM41OX/dDgIxJcoKYW5LzM5bcfgLUt/CXD9+Qpfl70= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1/go.mod h1:303Kx6cdaSgREaHzfHfJl3WyB+t/vTOm5KbXMM8Dy4w= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= From 81ba221104a6ced08f72c11da184ff39ef2322f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:09 -0400 Subject: [PATCH 1151/2115] go get github.com/aws/aws-sdk-go-v2/service/ivs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2ccca207c64f..d2c8cef3da28 100644 --- a/go.mod +++ b/go.mod @@ -144,7 +144,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 diff --git a/go.sum b/go.sum index e51ac5127f36..d70181983c77 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aL github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1/go.mod h1:303Kx6cdaSgREaHzfHfJl3WyB+t/vTOm5KbXMM8Dy4w= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0/go.mod h1:NRf1OmevrJxGBSwR17qZaR90/eeg/rwM+4YurDoJ4w8= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= From 15f85b5f40a36776b9e09d309e077885027efe3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:10 -0400 Subject: [PATCH 1152/2115] 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 d2c8cef3da28..f53eb5f44a5d 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 diff --git a/go.sum b/go.sum index d70181983c77..447375ffc6cd 100644 --- a/go.sum +++ b/go.sum @@ -311,8 +311,8 @@ github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFK github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0/go.mod h1:NRf1OmevrJxGBSwR17qZaR90/eeg/rwM+4YurDoJ4w8= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1/go.mod h1:y5EjKbwcgQItIkYzxfGnxtqE16Ygml/f3JTRk5408BA= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= From d4b736e91ceb4b6571315b4c1416ecdf60ef204d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:11 -0400 Subject: [PATCH 1153/2115] 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 f53eb5f44a5d..c5f64a036558 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 diff --git a/go.sum b/go.sum index 447375ffc6cd..176313561d0b 100644 --- a/go.sum +++ b/go.sum @@ -313,8 +313,8 @@ github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1/go.mod h1:y5EjKbwcgQItIkYzxfGnxtqE16Ygml/f3JTRk5408BA= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0/go.mod h1:jYoXOY9FSXfnfQ1wHoJJfYBKc8O6ZYy4BYq/2mRfJcc= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= From 45d906c14872f7952834ef52c7c7daac8a5f210a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:12 -0400 Subject: [PATCH 1154/2115] go get github.com/aws/aws-sdk-go-v2/service/kafkaconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c5f64a036558..fdb0ca638e7c 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 diff --git a/go.sum b/go.sum index 176313561d0b..599945db9940 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0/go.mod h1:jYoXOY9FSXfnfQ1wHoJJfYBKc8O6ZYy4BYq/2mRfJcc= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= From fc9260b9e352e4833ca344f920c0fa1f31678b9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:13 -0400 Subject: [PATCH 1155/2115] 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 fdb0ca638e7c..9bad7e8d8e78 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 diff --git a/go.sum b/go.sum index 599945db9940..70e659cb18e6 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBe github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= From 8bf41e22ea531bcdb5b91aa86af7881f77521e99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:14 -0400 Subject: [PATCH 1156/2115] 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 9bad7e8d8e78..921beaa149c7 100644 --- a/go.mod +++ b/go.mod @@ -149,7 +149,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 diff --git a/go.sum b/go.sum index 70e659cb18e6..eeaf62d92cba 100644 --- a/go.sum +++ b/go.sum @@ -319,8 +319,8 @@ github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= From 3b25dfb26eb6487e7ac0795c3a03b1ed4a685c0c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:15 -0400 Subject: [PATCH 1157/2115] 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 921beaa149c7..ce8db9c84cac 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 diff --git a/go.sum b/go.sum index eeaf62d92cba..ea419a129290 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGU github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= From 7552ab5ba3cdffa6b0f097837aee011fd1bbc217 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:16 -0400 Subject: [PATCH 1158/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalytics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ce8db9c84cac..db4420069a18 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 diff --git a/go.sum b/go.sum index ea419a129290..55c154f818ea 100644 --- a/go.sum +++ b/go.sum @@ -323,8 +323,8 @@ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2/go.mod h1:+y5C92Um6L/1Kfcddcz/KlP4w+cen23bY0cziHfx7zQ= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= From 89ecf8ca31e706752e52f86bdf5b667cc2b92cd2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:17 -0400 Subject: [PATCH 1159/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index db4420069a18..0329fc08eee5 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 diff --git a/go.sum b/go.sum index 55c154f818ea..895489a6ce6b 100644 --- a/go.sum +++ b/go.sum @@ -325,8 +325,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/ github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2/go.mod h1:+y5C92Um6L/1Kfcddcz/KlP4w+cen23bY0cziHfx7zQ= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0/go.mod h1:FY33uQ6Wb6FMrBhant1hvI5eQEgfPxj4JOl8f+vmXrA= github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= From 6dab7835848062ded12f9a663a53a282a401d87f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:18 -0400 Subject: [PATCH 1160/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisvideo. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0329fc08eee5..52d0cf3be599 100644 --- a/go.mod +++ b/go.mod @@ -153,7 +153,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 diff --git a/go.sum b/go.sum index 895489a6ce6b..8cb8d29ffa74 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofO github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0/go.mod h1:FY33uQ6Wb6FMrBhant1hvI5eQEgfPxj4JOl8f+vmXrA= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= github.com/aws/aws-sdk-go-v2/service/kms v1.45.0/go.mod h1:le5DfWrncVIxOWL2Q0NnDqvhH8ULiGYgC9iS8BtwcZE= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= From d971a3b78049e3194bbccc32e4502ef76960a8bc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:19 -0400 Subject: [PATCH 1161/2115] 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 52d0cf3be599..9b4ea5a76cff 100644 --- a/go.mod +++ b/go.mod @@ -154,7 +154,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 - github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 + github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 diff --git a/go.sum b/go.sum index 8cb8d29ffa74..dfcb838c9166 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.0/go.mod h1:le5DfWrncVIxOWL2Q0NnDqvhH8ULiGYgC9iS8BtwcZE= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0/go.mod h1:QC+BX9N676IvQfSoU67bL8fnX4CnKwCJd4udK51ajQU= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= From 27cb16948b68b451a79e298273a2bb82f5587027 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:21 -0400 Subject: [PATCH 1162/2115] 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 9b4ea5a76cff..a307d9f6b798 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 diff --git a/go.sum b/go.sum index dfcb838c9166..0ed275f58687 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0/go.mod h1:QC+BX9N676IvQfSoU67bL8fnX4CnKwCJd4udK51ajQU= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1/go.mod h1:YUfOkjyQ07oPsYHn7Jw1eY2HpNWvWLdChJY2BCF91AU= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= From e9c46b666224db3cd0523119ab7f5a5db06e22ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:22 -0400 Subject: [PATCH 1163/2115] 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 a307d9f6b798..bf1a4a763edb 100644 --- a/go.mod +++ b/go.mod @@ -156,7 +156,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 diff --git a/go.sum b/go.sum index 0ed275f58687..237d39162bfa 100644 --- a/go.sum +++ b/go.sum @@ -333,8 +333,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1/go.mod h1:YUfOkjyQ07oPsYHn7Jw1eY2HpNWvWLdChJY2BCF91AU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1/go.mod h1:YJAd2LReCr50LXZC4yiZyfqtDXNFTspMk4b8XNN23mY= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= From 30a46a298684adabc94e8371b97332b250ff4dd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:23 -0400 Subject: [PATCH 1164/2115] 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 bf1a4a763edb..09909c20e704 100644 --- a/go.mod +++ b/go.mod @@ -157,7 +157,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 diff --git a/go.sum b/go.sum index 237d39162bfa..8eaa516e42d5 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNv github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1/go.mod h1:YJAd2LReCr50LXZC4yiZyfqtDXNFTspMk4b8XNN23mY= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0/go.mod h1:yC+FE+kUrFgWwlfCOcTNYtEcYnvAb4dxCAEjeEs7XyM= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= From fed8177ccce6be4aa82dc184eb4148362278a940 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:24 -0400 Subject: [PATCH 1165/2115] go get github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 09909c20e704..4d26284ba0a3 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 diff --git a/go.sum b/go.sum index 8eaa516e42d5..3b4ec84ace5d 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,8 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5D github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0/go.mod h1:yC+FE+kUrFgWwlfCOcTNYtEcYnvAb4dxCAEjeEs7XyM= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1/go.mod h1:lKUKI2/ejaYnQgSqCdSpdbSc2D4pA5LpijkAknZFJDQ= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= From 7c4113af53f4c5a3a476755d7a41f2ea62cf6c36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:26 -0400 Subject: [PATCH 1166/2115] 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 4d26284ba0a3..65e9a488e437 100644 --- a/go.mod +++ b/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 github.com/aws/aws-sdk-go-v2/service/location v1.49.1 diff --git a/go.sum b/go.sum index 3b4ec84ace5d..05170f778c32 100644 --- a/go.sum +++ b/go.sum @@ -339,8 +339,8 @@ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUv github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1/go.mod h1:lKUKI2/ejaYnQgSqCdSpdbSc2D4pA5LpijkAknZFJDQ= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1/go.mod h1:cVju73Vwz9ixw1zaR0tdZGB+M3GCRn8BRgLFRJ8oE6c= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= From 6c9666061db9c650910c1916e13be84ad4c10bdb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:27 -0400 Subject: [PATCH 1167/2115] go get github.com/aws/aws-sdk-go-v2/service/licensemanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 65e9a488e437..44238fb6da1b 100644 --- a/go.mod +++ b/go.mod @@ -160,7 +160,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 github.com/aws/aws-sdk-go-v2/service/location v1.49.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 diff --git a/go.sum b/go.sum index 05170f778c32..f372ba072897 100644 --- a/go.sum +++ b/go.sum @@ -341,8 +341,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBp github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1/go.mod h1:cVju73Vwz9ixw1zaR0tdZGB+M3GCRn8BRgLFRJ8oE6c= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1/go.mod h1:HBXDArKSFmUoPiHIatSFZP7RCOuSO86D1skZZPP0eLI= github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= From b1ed9430f7af3c4f9a817dd0559ad5d775383489 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:29 -0400 Subject: [PATCH 1168/2115] 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 44238fb6da1b..9df4e916e3ca 100644 --- a/go.mod +++ b/go.mod @@ -161,7 +161,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 github.com/aws/aws-sdk-go-v2/service/location v1.49.1 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 diff --git a/go.sum b/go.sum index f372ba072897..1119d670657c 100644 --- a/go.sum +++ b/go.sum @@ -343,8 +343,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M0 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1/go.mod h1:HBXDArKSFmUoPiHIatSFZP7RCOuSO86D1skZZPP0eLI= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= github.com/aws/aws-sdk-go-v2/service/location v1.49.1/go.mod h1:4wXR5FxUtCbxrR10BM5v0JU9tWRuAPbxM0t63rSP5s0= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= From 20a2db566cb4464d7ffad5aaafd5a1c1298ea24a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:30 -0400 Subject: [PATCH 1169/2115] go get github.com/aws/aws-sdk-go-v2/service/location. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9df4e916e3ca..54a9b4115b8b 100644 --- a/go.mod +++ b/go.mod @@ -162,7 +162,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 - github.com/aws/aws-sdk-go-v2/service/location v1.49.1 + github.com/aws/aws-sdk-go-v2/service/location v1.49.2 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 diff --git a/go.sum b/go.sum index 1119d670657c..9138bb55cc9e 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbs github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= -github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= -github.com/aws/aws-sdk-go-v2/service/location v1.49.1/go.mod h1:4wXR5FxUtCbxrR10BM5v0JU9tWRuAPbxM0t63rSP5s0= +github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= +github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1/go.mod h1:Dvovz10WP1Kh0UYpgiYIJX2kU173PioVcZ8iUu3UlAU= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= From b8a9cbf1661dd106f2278ef2c01c5b44a9c747c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:31 -0400 Subject: [PATCH 1170/2115] 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 54a9b4115b8b..66b636730098 100644 --- a/go.mod +++ b/go.mod @@ -163,7 +163,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 github.com/aws/aws-sdk-go-v2/service/location v1.49.2 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 diff --git a/go.sum b/go.sum index 9138bb55cc9e..fb2731897449 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmL github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1/go.mod h1:Dvovz10WP1Kh0UYpgiYIJX2kU173PioVcZ8iUu3UlAU= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1/go.mod h1:OVFTr1QPEKPMXJFJmq7lB6g2LNu0Ra1jlyWRTUwVDNk= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 h1:z4pOPvM9QIFDn0outkKgx/Q/wHEvkFpc8HM0ecldnME= From 604699527c62cab5cb6519aa2e07cb64b8f2f1a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:33 -0400 Subject: [PATCH 1171/2115] go get github.com/aws/aws-sdk-go-v2/service/macie2. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 66b636730098..a4fcb04df2c4 100644 --- a/go.mod +++ b/go.mod @@ -164,8 +164,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 github.com/aws/aws-sdk-go-v2/service/location v1.49.2 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 diff --git a/go.sum b/go.sum index fb2731897449..3c02a5cad7d9 100644 --- a/go.sum +++ b/go.sum @@ -349,10 +349,10 @@ github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8 github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1/go.mod h1:OVFTr1QPEKPMXJFJmq7lB6g2LNu0Ra1jlyWRTUwVDNk= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 h1:z4pOPvM9QIFDn0outkKgx/Q/wHEvkFpc8HM0ecldnME= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1/go.mod h1:9bIBfRe99bgmTSKGt5kOANZAsmiVsUqAxYLdXtdk0JY= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 h1:eGM7Zu4idZy/puH4GwaSgSEaWMc+sro0UMXPqaUPRf4= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1/go.mod h1:bDTXhc7i3wut4LoMd/3Y/dm6yuHPSZ/l0JKTxAoWJs0= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= From adfc67ea467f29fb2184f25480c14e7f1ec79fad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:34 -0400 Subject: [PATCH 1172/2115] 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 a4fcb04df2c4..6a0ab8756cc6 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 diff --git a/go.sum b/go.sum index 3c02a5cad7d9..0a88c5140204 100644 --- a/go.sum +++ b/go.sum @@ -353,8 +353,8 @@ github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdX github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 h1:eGM7Zu4idZy/puH4GwaSgSEaWMc+sro0UMXPqaUPRf4= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1/go.mod h1:bDTXhc7i3wut4LoMd/3Y/dm6yuHPSZ/l0JKTxAoWJs0= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1/go.mod h1:oQKjFr3ftWy/qU2ilMx4Nl2qz+y9b9pFuD35WgYFDdY= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= From 24e317043cc4cd64b5a7754e8d0d596bda36c4f2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:35 -0400 Subject: [PATCH 1173/2115] 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 6a0ab8756cc6..ea7fc0d12fb5 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 diff --git a/go.sum b/go.sum index 0a88c5140204..38826e2207a9 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BP github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1/go.mod h1:oQKjFr3ftWy/qU2ilMx4Nl2qz+y9b9pFuD35WgYFDdY= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1/go.mod h1:LO7nmXTfTGV1eKso1xizKh8h4WnC6FpHmCu1KDx+1qU= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 h1:nHVIvgHWzu0gIhYF06eRbFVzgvpMW96wrniWanoyxxo= From b6dd7dcbf76ed0258b1255f8ee350111717cd085 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:37 -0400 Subject: [PATCH 1174/2115] go get github.com/aws/aws-sdk-go-v2/service/mediapackage. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ea7fc0d12fb5..47e2820c14a2 100644 --- a/go.mod +++ b/go.mod @@ -168,8 +168,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 diff --git a/go.sum b/go.sum index 38826e2207a9..d812577fc046 100644 --- a/go.sum +++ b/go.sum @@ -357,10 +357,10 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1/go.mod h1:LO7nmXTfTGV1eKso1xizKh8h4WnC6FpHmCu1KDx+1qU= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 h1:nHVIvgHWzu0gIhYF06eRbFVzgvpMW96wrniWanoyxxo= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1/go.mod h1:/mNoNDYQukzDORZEk5w7BIvBtaQJxkl0exo7qMpVmhg= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 h1:U4vORFpANJt9am19Hi9PnMb7140ECSv4431rQf1dr/0= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1/go.mod h1:69XqFSlzFjBTMeJO1P+qv1kwNRN6nRBQnaUI5uuoBDQ= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= From 16f7feb30f1dd91cedb6c9cab305d818cf5c5579 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:38 -0400 Subject: [PATCH 1175/2115] 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 47e2820c14a2..c0f7ec230bab 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 diff --git a/go.sum b/go.sum index d812577fc046..c8001c8b3b0b 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 h1:U4vORFpANJt9am19Hi9PnMb7140ECSv4431rQf1dr/0= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1/go.mod h1:69XqFSlzFjBTMeJO1P+qv1kwNRN6nRBQnaUI5uuoBDQ= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1/go.mod h1:Ulo4NRLCKAt7Py+XVaO1SlaZAxCQ4f3N2SxhpqdeHT0= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= From a433e495db4322584fdfc44e50e21d06a869a5dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:39 -0400 Subject: [PATCH 1176/2115] go get github.com/aws/aws-sdk-go-v2/service/mediapackagevod. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c0f7ec230bab..0c8cb3847b7b 100644 --- a/go.mod +++ b/go.mod @@ -171,7 +171,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 diff --git a/go.sum b/go.sum index c8001c8b3b0b..a95f7148982b 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1/go.mod h1:Ulo4NRLCKAt7Py+XVaO1SlaZAxCQ4f3N2SxhpqdeHT0= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1/go.mod h1:K7LVOq+IYECTdoQw3gwabdstLSTwYM2ysghvYx7OOn0= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 h1:3zfMUIyOkz9zAyBsrO+nKKGkiOamHvNYMFx6NzHJNIU= From 4dfed1fc91c6a09ea9057d095a4216a869a14954 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:41 -0400 Subject: [PATCH 1177/2115] go get github.com/aws/aws-sdk-go-v2/service/memorydb. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 0c8cb3847b7b..6c8f00a78cc0 100644 --- a/go.mod +++ b/go.mod @@ -172,8 +172,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 diff --git a/go.sum b/go.sum index a95f7148982b..94908a2e1189 100644 --- a/go.sum +++ b/go.sum @@ -365,10 +365,10 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zj github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1/go.mod h1:K7LVOq+IYECTdoQw3gwabdstLSTwYM2ysghvYx7OOn0= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 h1:3zfMUIyOkz9zAyBsrO+nKKGkiOamHvNYMFx6NzHJNIU= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1/go.mod h1:zaOIb+NMBSJtbPRIOhG4hfuyFskU0/CWyPIjZWHY4tc= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 h1:u49AKqJDtDHHQH/DWcy02Q8CtYovszGuTo/AsTKA8wA= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0/go.mod h1:9WVDrtazLGKgkmMp+7OrIEapwBesTX96szFSZUHw86I= github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= From 372b962bca766ca6f1f04d00b2860d745007fd9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:43 -0400 Subject: [PATCH 1178/2115] go get github.com/aws/aws-sdk-go-v2/service/mgn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6c8f00a78cc0..fdccc5fe3909 100644 --- a/go.mod +++ b/go.mod @@ -174,7 +174,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 diff --git a/go.sum b/go.sum index 94908a2e1189..c03a0534c7ac 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAI github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 h1:u49AKqJDtDHHQH/DWcy02Q8CtYovszGuTo/AsTKA8wA= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0/go.mod h1:9WVDrtazLGKgkmMp+7OrIEapwBesTX96szFSZUHw86I= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= github.com/aws/aws-sdk-go-v2/service/mq v1.33.1/go.mod h1:k/EsVXGxs6dcuBioJb3LWwmX7LcXPHLbweDoc6dl24g= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= From 8dd017d39669e4c94950a0e49e4281dd52ffd477 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:44 -0400 Subject: [PATCH 1179/2115] 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 fdccc5fe3909..5894c02da147 100644 --- a/go.mod +++ b/go.mod @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 - github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 + github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 diff --git a/go.sum b/go.sum index c03a0534c7ac..c59e9a46a34a 100644 --- a/go.sum +++ b/go.sum @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.1/go.mod h1:k/EsVXGxs6dcuBioJb3LWwmX7LcXPHLbweDoc6dl24g= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9vLJwmS3a3G8XLg= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1/go.mod h1:IeLxEAtclnYwPUZLAhUCDPUQ97yiRs7goua3YtOaa1M= github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= From 1c88fb2efb10abab0c07a603a5e41ac70fcb432e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:45 -0400 Subject: [PATCH 1180/2115] 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 5894c02da147..e1208eee930a 100644 --- a/go.mod +++ b/go.mod @@ -176,7 +176,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 diff --git a/go.sum b/go.sum index c59e9a46a34a..195b135a32d5 100644 --- a/go.sum +++ b/go.sum @@ -373,8 +373,8 @@ github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOh github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9vLJwmS3a3G8XLg= github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1/go.mod h1:IeLxEAtclnYwPUZLAhUCDPUQ97yiRs7goua3YtOaa1M= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= From 1f343a73bb2f83f97371b88d02c93b582da94ec2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:47 -0400 Subject: [PATCH 1181/2115] go get github.com/aws/aws-sdk-go-v2/service/neptune. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e1208eee930a..6912ab0ba6cf 100644 --- a/go.mod +++ b/go.mod @@ -177,7 +177,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 - github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 + github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 diff --git a/go.sum b/go.sum index 195b135a32d5..7e805b8dbf04 100644 --- a/go.sum +++ b/go.sum @@ -375,8 +375,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9 github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 h1:TwN2txusfBqaZBtixFilA20xRq0fqbcASyN9TUhHiEI= +github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= From 44db9dd396f8eef8efffcb51d345e923b6faad86 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:48 -0400 Subject: [PATCH 1182/2115] 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 6912ab0ba6cf..29783474e246 100644 --- a/go.mod +++ b/go.mod @@ -178,7 +178,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 diff --git a/go.sum b/go.sum index 7e805b8dbf04..bdd80b26d20d 100644 --- a/go.sum +++ b/go.sum @@ -377,8 +377,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 h1:TwN2txusfBqaZBtixFilA20xRq0fqbcASyN9TUhHiEI= github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= From ea8329fec62679cc57be451afdc34b9a05aa6f6e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:49 -0400 Subject: [PATCH 1183/2115] go get github.com/aws/aws-sdk-go-v2/service/networkfirewall. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 29783474e246..adaae7833f12 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 diff --git a/go.sum b/go.sum index bdd80b26d20d..8696d93fd405 100644 --- a/go.sum +++ b/go.sum @@ -379,8 +379,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 h1:TwN2txusfBqaZBtixFilA20x github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= From 99520bebd47cfedce7a8a3e14d1d9068aae6671b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:50 -0400 Subject: [PATCH 1184/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index adaae7833f12..573bde8f5067 100644 --- a/go.mod +++ b/go.mod @@ -180,7 +180,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 diff --git a/go.sum b/go.sum index 8696d93fd405..3dbfa59b5463 100644 --- a/go.sum +++ b/go.sum @@ -381,8 +381,8 @@ github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1/go.mod h1:S4lAC9xGXy7hk/ddmxFsUdYrqCgaqiHRsz2JFlBSXZ8= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= From 67c12e429669babdc7963148c86113c10f992891 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:51 -0400 Subject: [PATCH 1185/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmonitor. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 573bde8f5067..e1980caa6751 100644 --- a/go.mod +++ b/go.mod @@ -181,7 +181,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 diff --git a/go.sum b/go.sum index 3dbfa59b5463..f75d63633d32 100644 --- a/go.sum +++ b/go.sum @@ -383,8 +383,8 @@ github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rL github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1/go.mod h1:S4lAC9xGXy7hk/ddmxFsUdYrqCgaqiHRsz2JFlBSXZ8= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= From 60b5634522eebc8edce86006d8a16487a235cbf7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:52 -0400 Subject: [PATCH 1186/2115] go get github.com/aws/aws-sdk-go-v2/service/notifications. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e1980caa6751..2f594c788693 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 + github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 diff --git a/go.sum b/go.sum index f75d63633d32..dbfdfbc9435b 100644 --- a/go.sum +++ b/go.sum @@ -385,8 +385,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CF github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 h1:FmGYwdsa7KuUej6bRuJ1grKMEvRkWKEgQFxFGn5q3rI= +github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= From ff96aa858e72289bd25f0e4f69fa3e492621e58a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:53 -0400 Subject: [PATCH 1187/2115] go get github.com/aws/aws-sdk-go-v2/service/notificationscontacts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2f594c788693..afdd8e019f39 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 diff --git a/go.sum b/go.sum index dbfdfbc9435b..3ae8f3149dee 100644 --- a/go.sum +++ b/go.sum @@ -387,8 +387,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 h1:FmGYwdsa7KuUej6bRuJ1grKMEvRkWKEgQFxFGn5q3rI= github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= From 3501b08875e9214cafbc153d9597f82b1b0b1ea3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:54 -0400 Subject: [PATCH 1188/2115] go get github.com/aws/aws-sdk-go-v2/service/odb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index afdd8e019f39..044912597703 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 - github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 + github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 diff --git a/go.sum b/go.sum index 3ae8f3149dee..ce308969d4ac 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+e github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 h1:ymSOKhRgXVzFc+d10qXBRFMNOLVw93ud44jmKRfGV+E= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= From c1c9e0032dc91a8014681d5dbb8ab1f614510790 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:56 -0400 Subject: [PATCH 1189/2115] go get github.com/aws/aws-sdk-go-v2/service/opensearch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 044912597703..ea9517d1e653 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 diff --git a/go.sum b/go.sum index ce308969d4ac..085c2873b57b 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,8 @@ github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8 github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 h1:ymSOKhRgXVzFc+d10qXBRFMNOLVw93ud44jmKRfGV+E= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= From 4a061d7bacd61c2442ff014214f93e16dc7d4783 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:57 -0400 Subject: [PATCH 1190/2115] 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 ea9517d1e653..18ae64d12dda 100644 --- a/go.mod +++ b/go.mod @@ -187,7 +187,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 diff --git a/go.sum b/go.sum index 085c2873b57b..80f4e47dcb73 100644 --- a/go.sum +++ b/go.sum @@ -395,8 +395,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1McsL8kbGpDZcTAYAzkeeGJrVI78eUX+2sj0= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= From b1ec1b77392cf33236ec822238e1287f28fd8710 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:58 -0400 Subject: [PATCH 1191/2115] 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 18ae64d12dda..0c59f1170679 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 diff --git a/go.sum b/go.sum index 80f4e47dcb73..64104f78dc81 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJq github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1McsL8kbGpDZcTAYAzkeeGJrVI78eUX+2sj0= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= github.com/aws/aws-sdk-go-v2/service/osis v1.19.0/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= From 3cdf8244b174ed4705e8aa51360649e459ff7c2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 07:59:59 -0400 Subject: [PATCH 1192/2115] 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 0c59f1170679..7b35f318fce2 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 - github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 + github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 diff --git a/go.sum b/go.sum index 64104f78dc81..863e3ca61fc4 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1Mcs github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.0/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= From 9867d08916317398eacd9552077e4bf5c144d688 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:01 -0400 Subject: [PATCH 1193/2115] go get github.com/aws/aws-sdk-go-v2/service/outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7b35f318fce2..938456260450 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 diff --git a/go.sum b/go.sum index 863e3ca61fc4..5aaa8402fbcc 100644 --- a/go.sum +++ b/go.sum @@ -401,8 +401,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOG github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= From e23150c8a85b646721fd1d9bba8ec5a9945d2b9c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:02 -0400 Subject: [PATCH 1194/2115] 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 938456260450..e4a7e9c42c59 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 diff --git a/go.sum b/go.sum index 5aaa8402fbcc..90c912c2a9f7 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7X github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= From 9f33208c5bf0cf36ae3726dc44d5f67577f68fea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:03 -0400 Subject: [PATCH 1195/2115] 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 e4a7e9c42c59..42db727707e1 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 diff --git a/go.sum b/go.sum index 90c912c2a9f7..3e07c8ad5f2d 100644 --- a/go.sum +++ b/go.sum @@ -405,8 +405,8 @@ github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= From c628de0935c6966ab5769683bcd699d85d72e3ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:04 -0400 Subject: [PATCH 1196/2115] go get github.com/aws/aws-sdk-go-v2/service/pcs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 42db727707e1..a58ba03f48c4 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 diff --git a/go.sum b/go.sum index 3e07c8ad5f2d..921397d0470d 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3UDvkawNLu8yJRPPg= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= From abf21fdd16634456643a9fb6150e15b99310dc78 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:05 -0400 Subject: [PATCH 1197/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpoint. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a58ba03f48c4..1852fd202b24 100644 --- a/go.mod +++ b/go.mod @@ -194,7 +194,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 diff --git a/go.sum b/go.sum index 921397d0470d..b140aeb60a0b 100644 --- a/go.sum +++ b/go.sum @@ -409,8 +409,8 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3UDvkawNLu8yJRPPg= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= From f61ba25dd667b7726c72b9c8ab01ef0190ce63ca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:06 -0400 Subject: [PATCH 1198/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1852fd202b24..7b3af83f10c3 100644 --- a/go.mod +++ b/go.mod @@ -195,7 +195,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 diff --git a/go.sum b/go.sum index b140aeb60a0b..9a661929b5d6 100644 --- a/go.sum +++ b/go.sum @@ -411,8 +411,8 @@ github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3U github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= From 1aa7cac679524c02027482e8d4e54857a5338ef1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:08 -0400 Subject: [PATCH 1199/2115] go get github.com/aws/aws-sdk-go-v2/service/polly. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7b3af83f10c3..0312e9639dd8 100644 --- a/go.mod +++ b/go.mod @@ -196,8 +196,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 - github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 + github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 diff --git a/go.sum b/go.sum index 9a661929b5d6..a2beb4656bfe 100644 --- a/go.sum +++ b/go.sum @@ -413,10 +413,10 @@ github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQ github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1/go.mod h1:6nhxriPrOjTLhbRSGbM4ugEsshpL3AW7BcgH0UtgccM= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= From 39c841a2c4bdc9a451783c39e10b0411a7cee8cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:10 -0400 Subject: [PATCH 1200/2115] 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 0312e9639dd8..204ed42d8492 100644 --- a/go.mod +++ b/go.mod @@ -198,7 +198,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 diff --git a/go.sum b/go.sum index a2beb4656bfe..c8701af6a000 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1/go.mod h1:6nhxriPrOjTLhbRSGbM4ugEsshpL3AW7BcgH0UtgccM= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= From 8f10526f347d8004d508668c70d2592175ca238c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:11 -0400 Subject: [PATCH 1201/2115] 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 204ed42d8492..88a121456053 100644 --- a/go.mod +++ b/go.mod @@ -199,7 +199,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 diff --git a/go.sum b/go.sum index c8701af6a000..5d6b7fbaf77d 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= From 590b7d007c690c046296b939eefe1e5eb2f013af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:12 -0400 Subject: [PATCH 1202/2115] 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 88a121456053..e498e4c2c8f2 100644 --- a/go.mod +++ b/go.mod @@ -200,7 +200,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 diff --git a/go.sum b/go.sum index 5d6b7fbaf77d..184cef937ec2 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= From ef228f4fb5e7fe417f31a46e48fe26304639c145 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:14 -0400 Subject: [PATCH 1203/2115] go get github.com/aws/aws-sdk-go-v2/service/quicksight. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e498e4c2c8f2..a19bbe45e9b1 100644 --- a/go.mod +++ b/go.mod @@ -201,7 +201,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 diff --git a/go.sum b/go.sum index 184cef937ec2..8e0efc1a128d 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,8 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 h1:HPvJaGyfoMWtMbCXHd+IsKOKxsYaazYgjMW/OlVTHsI= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= From a2ad211e71d22ae4c626e287994a4b5a567a3c23 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:14 -0400 Subject: [PATCH 1204/2115] 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 a19bbe45e9b1..49b29a9e87fe 100644 --- a/go.mod +++ b/go.mod @@ -202,7 +202,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 - github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 + github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 diff --git a/go.sum b/go.sum index 8e0efc1a128d..07d7c6ede263 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,8 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4w github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 h1:HPvJaGyfoMWtMbCXHd+IsKOKxsYaazYgjMW/OlVTHsI= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= From 27cc113ee6d46ae5aeca85daf57a5a6fd8b355c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:15 -0400 Subject: [PATCH 1205/2115] 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 49b29a9e87fe..77065bb07ba8 100644 --- a/go.mod +++ b/go.mod @@ -203,7 +203,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 diff --git a/go.sum b/go.sum index 07d7c6ede263..4daa0f8d0b10 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,8 @@ github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 h1:HPvJaGyfoMWtMbCXHd+Is github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= github.com/aws/aws-sdk-go-v2/service/rds v1.104.0/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= From 23c1d26d7a8f26076f40f065bc63f6e05950e22c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:16 -0400 Subject: [PATCH 1206/2115] 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 77065bb07ba8..f4c4c6338958 100644 --- a/go.mod +++ b/go.mod @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 - github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 diff --git a/go.sum b/go.sum index 4daa0f8d0b10..c767790c8af7 100644 --- a/go.sum +++ b/go.sum @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayP github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.0/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi2SJNpXcYbPX/mjyQ= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= From 1e5760d42d0e678f5cabb2b680fb7bfebc8334bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:18 -0400 Subject: [PATCH 1207/2115] 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 f4c4c6338958..d934495d764b 100644 --- a/go.mod +++ b/go.mod @@ -205,7 +205,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 diff --git a/go.sum b/go.sum index c767790c8af7..d97d8cb860ad 100644 --- a/go.sum +++ b/go.sum @@ -431,8 +431,8 @@ github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3l github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi2SJNpXcYbPX/mjyQ= github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= From 8cc85ff500205408e5d6303b0de8f4bcd748b5a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:19 -0400 Subject: [PATCH 1208/2115] 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 d934495d764b..049fc5ec645a 100644 --- a/go.mod +++ b/go.mod @@ -206,7 +206,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 diff --git a/go.sum b/go.sum index d97d8cb860ad..ae46f9e39d5f 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= From b296ba56c54342ebcd097a7670ff7b3a1758af73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:20 -0400 Subject: [PATCH 1209/2115] 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 049fc5ec645a..6e8ab7c99faf 100644 --- a/go.mod +++ b/go.mod @@ -207,7 +207,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 diff --git a/go.sum b/go.sum index ae46f9e39d5f..e37b4d56c8c3 100644 --- a/go.sum +++ b/go.sum @@ -435,8 +435,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1g github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= From 743d38424da22513398117bc4e2bc2d8ce19cfaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:21 -0400 Subject: [PATCH 1210/2115] 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 6e8ab7c99faf..bf86903e3fa0 100644 --- a/go.mod +++ b/go.mod @@ -208,7 +208,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 diff --git a/go.sum b/go.sum index e37b4d56c8c3..5bce92fe3f47 100644 --- a/go.sum +++ b/go.sum @@ -437,8 +437,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= From 31543b79da2d1846bec966aeff044a6d0f2d33e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:22 -0400 Subject: [PATCH 1211/2115] go get github.com/aws/aws-sdk-go-v2/service/resiliencehub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bf86903e3fa0..679fe3ae57a7 100644 --- a/go.mod +++ b/go.mod @@ -209,7 +209,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 diff --git a/go.sum b/go.sum index 5bce92fe3f47..5be0840fae70 100644 --- a/go.sum +++ b/go.sum @@ -439,8 +439,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1/go.mod h1:1bQU4WjW5s2zT399sz1+EjmKgIZLhg+NwmhMV+o/iKM= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= From 939923ae36f351fcf35508a5be990707397b43b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:23 -0400 Subject: [PATCH 1212/2115] 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 679fe3ae57a7..525c86198a2d 100644 --- a/go.mod +++ b/go.mod @@ -210,7 +210,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 diff --git a/go.sum b/go.sum index 5be0840fae70..2c6ae85c3d5a 100644 --- a/go.sum +++ b/go.sum @@ -441,8 +441,8 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FG github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1/go.mod h1:1bQU4WjW5s2zT399sz1+EjmKgIZLhg+NwmhMV+o/iKM= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1/go.mod h1:aJ6F7uUk+H11VAVhjWXjwAVRROj9CPtk6Id6S6AQQ2U= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= From 1a58cc67e2046b92fc3917c691dd1f36d9f1764f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:24 -0400 Subject: [PATCH 1213/2115] 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 525c86198a2d..fa83644ef2a4 100644 --- a/go.mod +++ b/go.mod @@ -211,7 +211,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 diff --git a/go.sum b/go.sum index 2c6ae85c3d5a..30331d2e132f 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,8 @@ github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1/go.mod h1:aJ6F7uUk+H11VAVhjWXjwAVRROj9CPtk6Id6S6AQQ2U= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 h1:hjNxi1Mz1i3BfD3T52iarE2KEMnTKbTYwpq3rP66emk= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1/go.mod h1:bNnnRzp7DygLKwBv0Dh5C3wLhBvQUHVbz8HkNsetr6U= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= From 6acb56e49974c43872a57bd6cabcfa75102dc081 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:25 -0400 Subject: [PATCH 1214/2115] 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 fa83644ef2a4..9deddca1125a 100644 --- a/go.mod +++ b/go.mod @@ -212,7 +212,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 diff --git a/go.sum b/go.sum index 30331d2e132f..64c03361af4f 100644 --- a/go.sum +++ b/go.sum @@ -445,8 +445,8 @@ github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEos github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 h1:hjNxi1Mz1i3BfD3T52iarE2KEMnTKbTYwpq3rP66emk= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1/go.mod h1:bNnnRzp7DygLKwBv0Dh5C3wLhBvQUHVbz8HkNsetr6U= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= From 0920ca8aef9ba22adc7ec5b33e5a043b5089c519 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:27 -0400 Subject: [PATCH 1215/2115] 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 9deddca1125a..7216bb8465fa 100644 --- a/go.mod +++ b/go.mod @@ -213,7 +213,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 diff --git a/go.sum b/go.sum index 64c03361af4f..70a84c6d1989 100644 --- a/go.sum +++ b/go.sum @@ -447,8 +447,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 h1:hjNxi1Mz1i3BfD3T5 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= From b7a6bebca15bca43e72e056f68f4b30bb0d15178 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:27 -0400 Subject: [PATCH 1216/2115] 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 7216bb8465fa..5115e9fbc8eb 100644 --- a/go.mod +++ b/go.mod @@ -214,7 +214,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 diff --git a/go.sum b/go.sum index 70a84c6d1989..be163ca13f1d 100644 --- a/go.sum +++ b/go.sum @@ -449,8 +449,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THD github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99mFaHATfCJEVcYrnT24o4= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= From fa26bd12be2f9abd48ebabee584c69362011fea6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:28 -0400 Subject: [PATCH 1217/2115] 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 5115e9fbc8eb..b2a5a25b41af 100644 --- a/go.mod +++ b/go.mod @@ -215,7 +215,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 diff --git a/go.sum b/go.sum index be163ca13f1d..81aadcc89b03 100644 --- a/go.sum +++ b/go.sum @@ -451,8 +451,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1Gu github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99mFaHATfCJEVcYrnT24o4= github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEkyS1tXU0k5iOj+TIUrXJI4zgpkSM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= From 0e8d49b6583153126c165a65e2667d554681f49d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:29 -0400 Subject: [PATCH 1218/2115] 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 b2a5a25b41af..6e368e2b36b6 100644 --- a/go.mod +++ b/go.mod @@ -216,7 +216,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 diff --git a/go.sum b/go.sum index 81aadcc89b03..4f1cbfb83323 100644 --- a/go.sum +++ b/go.sum @@ -453,8 +453,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99m github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEkyS1tXU0k5iOj+TIUrXJI4zgpkSM= github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2/go.mod h1:Tza7auk1JM98mceIqrBpBVgf63OMuZdvFIbUQGwdu0E= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= From bbc147dbb3789d926e17fcd26f9ef880bf576cc6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:31 -0400 Subject: [PATCH 1219/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6e368e2b36b6..74139384bf4b 100644 --- a/go.mod +++ b/go.mod @@ -217,7 +217,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 diff --git a/go.sum b/go.sum index 4f1cbfb83323..e89160a82245 100644 --- a/go.sum +++ b/go.sum @@ -455,8 +455,8 @@ github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEky github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2/go.mod h1:Tza7auk1JM98mceIqrBpBVgf63OMuZdvFIbUQGwdu0E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1/go.mod h1:GD95a1fjPrxIec85QlXqKiL9VRiHkDJbe/1xCE64xKQ= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= From 02ad2339d0e048cfe30509a0e481e0689486e3f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:32 -0400 Subject: [PATCH 1220/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 74139384bf4b..eb8764452cea 100644 --- a/go.mod +++ b/go.mod @@ -218,7 +218,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 diff --git a/go.sum b/go.sum index e89160a82245..7841a8a9dd96 100644 --- a/go.sum +++ b/go.sum @@ -457,8 +457,8 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0G github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1/go.mod h1:GD95a1fjPrxIec85QlXqKiL9VRiHkDJbe/1xCE64xKQ= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= From 60415de6d7725c18040fc0ef7b6eaa74fe205481 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:33 -0400 Subject: [PATCH 1221/2115] go get github.com/aws/aws-sdk-go-v2/service/route53resolver. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index eb8764452cea..85366a6b0575 100644 --- a/go.mod +++ b/go.mod @@ -219,7 +219,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 diff --git a/go.sum b/go.sum index 7841a8a9dd96..e28d10104c3e 100644 --- a/go.sum +++ b/go.sum @@ -459,8 +459,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTV github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= From a3d214ce2418d3937bbc809312bece3161bd6180 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:35 -0400 Subject: [PATCH 1222/2115] go get github.com/aws/aws-sdk-go-v2/service/s3. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 85366a6b0575..b10878004541 100644 --- a/go.mod +++ b/go.mod @@ -220,7 +220,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 - github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 diff --git a/go.sum b/go.sum index e28d10104c3e..98de3bc0b2a7 100644 --- a/go.sum +++ b/go.sum @@ -461,8 +461,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf0 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= From 5a75d2f7d40fade1003824f497b072efb45a6d00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:36 -0400 Subject: [PATCH 1223/2115] 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 b10878004541..46a95e72020c 100644 --- a/go.mod +++ b/go.mod @@ -222,7 +222,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 diff --git a/go.sum b/go.sum index 98de3bc0b2a7..ee30db81b711 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAA github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3/go.mod h1:noqWDtfKyO38kGEjpcvCeLA/fzf28s5GqEhZzMh0l0Q= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1/go.mod h1:Fm0fdHHqfDHVUjpygYpkib/3TABtK3xF1MFF4r8vquU= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= From 32062192e6faa162b98458bc02e0e33b340a5117 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:37 -0400 Subject: [PATCH 1224/2115] go get github.com/aws/aws-sdk-go-v2/service/s3outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 46a95e72020c..b2e7b708d766 100644 --- a/go.mod +++ b/go.mod @@ -223,7 +223,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 diff --git a/go.sum b/go.sum index ee30db81b711..c9b102a6006a 100644 --- a/go.sum +++ b/go.sum @@ -467,8 +467,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1/go.mod h1:Fm0fdHHqfDHVUjpygYpkib/3TABtK3xF1MFF4r8vquU= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0/go.mod h1:064xhAX/Q21mzYpqYRdZBZHOh8zLAlIVDlupW0QUYZ4= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= From 96e928595cbeffa62538cd3e1fdba9870d92c8ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:38 -0400 Subject: [PATCH 1225/2115] go get github.com/aws/aws-sdk-go-v2/service/s3tables. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b2e7b708d766..94b1a30fd59e 100644 --- a/go.mod +++ b/go.mod @@ -224,7 +224,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 diff --git a/go.sum b/go.sum index c9b102a6006a..7870155220d4 100644 --- a/go.sum +++ b/go.sum @@ -469,8 +469,8 @@ github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0/go.mod h1:064xhAX/Q21mzYpqYRdZBZHOh8zLAlIVDlupW0QUYZ4= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= From b507c57d0f460b0966c12c518f8763658f2c7610 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:39 -0400 Subject: [PATCH 1226/2115] go get github.com/aws/aws-sdk-go-v2/service/s3vectors. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 94b1a30fd59e..a5bc488e68a8 100644 --- a/go.mod +++ b/go.mod @@ -225,7 +225,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 diff --git a/go.sum b/go.sum index 7870155220d4..1f816fc43691 100644 --- a/go.sum +++ b/go.sum @@ -471,8 +471,8 @@ github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= From 597a225b4464a925d2dbac9dc34ab24f5da3ca9a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:40 -0400 Subject: [PATCH 1227/2115] go get github.com/aws/aws-sdk-go-v2/service/sagemaker. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a5bc488e68a8..0102a814e95b 100644 --- a/go.mod +++ b/go.mod @@ -226,7 +226,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 diff --git a/go.sum b/go.sum index 1f816fc43691..3868155f02c8 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcsdGnspIkS9TNwRf6vf1JVxM= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= From c1482ddb7dd9232a412afc13e30bc991de7409e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:42 -0400 Subject: [PATCH 1228/2115] 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 0102a814e95b..364b8ab8d829 100644 --- a/go.mod +++ b/go.mod @@ -227,7 +227,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 diff --git a/go.sum b/go.sum index 3868155f02c8..2dd247939e6c 100644 --- a/go.sum +++ b/go.sum @@ -475,8 +475,8 @@ github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcsdGnspIkS9TNwRf6vf1JVxM= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= From dc1852b43087b6ad6efb2b8e76587a964c9ab767 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:43 -0400 Subject: [PATCH 1229/2115] 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 364b8ab8d829..61e249a09eb8 100644 --- a/go.mod +++ b/go.mod @@ -228,7 +228,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 diff --git a/go.sum b/go.sum index 2dd247939e6c..ca9429c9d3be 100644 --- a/go.sum +++ b/go.sum @@ -477,8 +477,8 @@ github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcs github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1/go.mod h1:hDr+R5WjCdv4Jeb96TCEaEAIVC6Fq2v3Ob8Otk3yofQ= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= From fdb0001c52ebea1e3f7337bc9da9873d916aa79a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:44 -0400 Subject: [PATCH 1230/2115] 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 61e249a09eb8..f2b998d02dd4 100644 --- a/go.mod +++ b/go.mod @@ -229,7 +229,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 diff --git a/go.sum b/go.sum index ca9429c9d3be..09868e609c70 100644 --- a/go.sum +++ b/go.sum @@ -479,8 +479,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrA github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1/go.mod h1:hDr+R5WjCdv4Jeb96TCEaEAIVC6Fq2v3Ob8Otk3yofQ= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 h1:7IlIL8quV8GFdm1BH7ZU0ta5IG1ZDAQkoEO32W2Sdog= From 1fbdf10a16486f3fc8c52bc1d7b593db148e5abd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:46 -0400 Subject: [PATCH 1231/2115] 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 f2b998d02dd4..7c397f097017 100644 --- a/go.mod +++ b/go.mod @@ -231,7 +231,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 diff --git a/go.sum b/go.sum index 09868e609c70..9ca95677d52f 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 h1:7IlIL8quV8GFdm1BH7ZU0ta5IG1ZDAQkoEO32W2Sdog= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1/go.mod h1:LdSgvzxjUIEYqDySJ1MZMHrpnXr82G1wUgbCUn1hj2I= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 h1:NCrZaCcXEeBlILIPXZPhCYvj48eaTwECX3NonrgGWBc= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1/go.mod h1:h6VMaXtdphpPOWC205h7KR2dth0h6Hr8FwdDIntf3W4= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= From dc5e1f2fa77719e0a3efe5e4b0fafa94eb6e1344 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:47 -0400 Subject: [PATCH 1232/2115] go get github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7c397f097017..cfeb7dcb89f0 100644 --- a/go.mod +++ b/go.mod @@ -232,7 +232,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 diff --git a/go.sum b/go.sum index 9ca95677d52f..57acb37f73ec 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 h1:NCrZaCcXEeBlILIPXZPhCYvj48eaTwECX3NonrgGWBc= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1/go.mod h1:h6VMaXtdphpPOWC205h7KR2dth0h6Hr8FwdDIntf3W4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1/go.mod h1:ISXBwTLGsBEdPKnc8hgwLMMLKAoDOBY/Gk1pAcVxegk= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= From 772009c2131071c33ec15bf87e7fa492473714fd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:49 -0400 Subject: [PATCH 1233/2115] go get github.com/aws/aws-sdk-go-v2/service/servicecatalog. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cfeb7dcb89f0..156622fb9422 100644 --- a/go.mod +++ b/go.mod @@ -233,7 +233,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 diff --git a/go.sum b/go.sum index 57acb37f73ec..16f94aad5bcd 100644 --- a/go.sum +++ b/go.sum @@ -487,8 +487,8 @@ github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVb github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1/go.mod h1:ISXBwTLGsBEdPKnc8hgwLMMLKAoDOBY/Gk1pAcVxegk= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= From 6b05cac4ea65501af759b8060426b46e1316bd49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:50 -0400 Subject: [PATCH 1234/2115] 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 156622fb9422..0cd0bd8a8e43 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 diff --git a/go.sum b/go.sum index 16f94aad5bcd..521f65e0193e 100644 --- a/go.sum +++ b/go.sum @@ -489,8 +489,8 @@ github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= From ac525f474be783228f242329d348f3371200a7fe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:51 -0400 Subject: [PATCH 1235/2115] 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 0cd0bd8a8e43..db197d0dd225 100644 --- a/go.mod +++ b/go.mod @@ -235,7 +235,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 diff --git a/go.sum b/go.sum index 521f65e0193e..c7451968a59a 100644 --- a/go.sum +++ b/go.sum @@ -491,8 +491,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHta github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= From d64b843f27d67f2ce79dd5e262db8f2f8497b0fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:52 -0400 Subject: [PATCH 1236/2115] 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 db197d0dd225..00ef29d69072 100644 --- a/go.mod +++ b/go.mod @@ -236,7 +236,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 diff --git a/go.sum b/go.sum index c7451968a59a..43f336574ca1 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0I github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= github.com/aws/aws-sdk-go-v2/service/ses v1.34.0/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= From bd016f05a971b3deca6a151a5a61c0b976570c26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:54 -0400 Subject: [PATCH 1237/2115] go get github.com/aws/aws-sdk-go-v2/service/ses. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 00ef29d69072..81d3e5e9bf0b 100644 --- a/go.mod +++ b/go.mod @@ -237,7 +237,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 - github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 + github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 diff --git a/go.sum b/go.sum index 43f336574ca1..412fe6ba497f 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,8 @@ github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.0/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= From 2c5c70606b8a080b223d899926c0ac6c34ae1db8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:55 -0400 Subject: [PATCH 1238/2115] 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 81d3e5e9bf0b..86cd52c45530 100644 --- a/go.mod +++ b/go.mod @@ -238,7 +238,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 diff --git a/go.sum b/go.sum index 412fe6ba497f..17feee753457 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciA github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= From 0863ad97ba566c8ac481dd18b91da4d75c4ae14f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:56 -0400 Subject: [PATCH 1239/2115] go get github.com/aws/aws-sdk-go-v2/service/sfn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 86cd52c45530..eb0850870e41 100644 --- a/go.mod +++ b/go.mod @@ -239,7 +239,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 diff --git a/go.sum b/go.sum index 17feee753457..4c4fa37dffe7 100644 --- a/go.sum +++ b/go.sum @@ -499,8 +499,8 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRV github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= github.com/aws/aws-sdk-go-v2/service/shield v1.34.1/go.mod h1:k4FmZKhGje2cMSq7iJn68WuvjQlWCleuXBQrlaX92ro= github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 h1:au83o40oc/0gTH1wLdkvlR+5w3H7kotDEVM/yqxDgFk= From 29ad63e0dda93b59a95a5f0463b18a9d8d0b2d12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:58 -0400 Subject: [PATCH 1240/2115] go get github.com/aws/aws-sdk-go-v2/service/signer. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index eb0850870e41..f64fdfd88f17 100644 --- a/go.mod +++ b/go.mod @@ -240,8 +240,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 - github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 - github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 + github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 + github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 diff --git a/go.sum b/go.sum index 4c4fa37dffe7..1101ae144fd4 100644 --- a/go.sum +++ b/go.sum @@ -501,10 +501,10 @@ github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtE github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.1/go.mod h1:k4FmZKhGje2cMSq7iJn68WuvjQlWCleuXBQrlaX92ro= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 h1:au83o40oc/0gTH1wLdkvlR+5w3H7kotDEVM/yqxDgFk= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.1/go.mod h1:kTLokjuxZ3M4FFxoyoIVifyutxQR3hxM8ebhWU29LRE= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 h1:BNdYPzlgwyFLZqeFundNKnPDB+TVVfaqZJoz0q6dURk= github.com/aws/aws-sdk-go-v2/service/sns v1.38.0/go.mod h1:3nf7APIrKwA04hwtT8PLvCaHO5k08M5YA03ZTJjz77o= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= From 7c1241587bd6f007e51eb23b1b00ebdf3a62966b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:59 -0400 Subject: [PATCH 1241/2115] 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 f64fdfd88f17..3e3792d1c698 100644 --- a/go.mod +++ b/go.mod @@ -242,7 +242,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 - github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 + github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 diff --git a/go.sum b/go.sum index 1101ae144fd4..bf0e603e924f 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xq github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 h1:BNdYPzlgwyFLZqeFundNKnPDB+TVVfaqZJoz0q6dURk= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.0/go.mod h1:3nf7APIrKwA04hwtT8PLvCaHO5k08M5YA03ZTJjz77o= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2/go.mod h1:nTr1GkJF+JsCWURFDQSqGqBLJvJUCpBaTCBmZJ4rXuE= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= From b605ca045dbdda402d3342cc9cdcff1c70751d3e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:00:59 -0400 Subject: [PATCH 1242/2115] 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 3e3792d1c698..2a31a7dc7193 100644 --- a/go.mod +++ b/go.mod @@ -243,7 +243,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 diff --git a/go.sum b/go.sum index bf0e603e924f..20c28c3734c1 100644 --- a/go.sum +++ b/go.sum @@ -507,8 +507,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGy github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2/go.mod h1:nTr1GkJF+JsCWURFDQSqGqBLJvJUCpBaTCBmZJ4rXuE= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= From efeb456ddafb46469f627df91984239ff72bc4f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:01 -0400 Subject: [PATCH 1243/2115] 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 2a31a7dc7193..8a40ca68344d 100644 --- a/go.mod +++ b/go.mod @@ -244,7 +244,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 diff --git a/go.sum b/go.sum index 20c28c3734c1..121b239c8c9a 100644 --- a/go.sum +++ b/go.sum @@ -509,8 +509,8 @@ github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwa github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= From 7f7abee2cc734dbdfd9fc0139c2308c684982436 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:02 -0400 Subject: [PATCH 1244/2115] 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 8a40ca68344d..95c2049b6ed8 100644 --- a/go.mod +++ b/go.mod @@ -245,7 +245,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 diff --git a/go.sum b/go.sum index 121b239c8c9a..4dfaca660f9a 100644 --- a/go.sum +++ b/go.sum @@ -511,8 +511,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyM github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= From 152a49d48e960219bae7c68f559aeca827ad4a5d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:04 -0400 Subject: [PATCH 1245/2115] 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 95c2049b6ed8..ca315cf1d232 100644 --- a/go.mod +++ b/go.mod @@ -246,7 +246,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 diff --git a/go.sum b/go.sum index 4dfaca660f9a..4c322d016a0d 100644 --- a/go.sum +++ b/go.sum @@ -513,8 +513,8 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzH github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= From 7fa9d4f3b0e2ce31c32207fb5b6cdfff2a7b2d1d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:05 -0400 Subject: [PATCH 1246/2115] go get github.com/aws/aws-sdk-go-v2/service/ssmquicksetup. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ca315cf1d232..707fd1d9310f 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 diff --git a/go.sum b/go.sum index 4c322d016a0d..7f6a9a0dca1f 100644 --- a/go.sum +++ b/go.sum @@ -515,8 +515,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= From acf27e66b3e902acd41ea245cf84758f524322da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:06 -0400 Subject: [PATCH 1247/2115] 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 707fd1d9310f..c5730acf2469 100644 --- a/go.mod +++ b/go.mod @@ -248,7 +248,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 diff --git a/go.sum b/go.sum index 7f6a9a0dca1f..9ed6575a129f 100644 --- a/go.sum +++ b/go.sum @@ -517,8 +517,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qo github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= From 7039f386fc46c65e01e2e98d4bd29d842d97b8af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:09 -0400 Subject: [PATCH 1248/2115] 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 c5730acf2469..88f4d282227d 100644 --- a/go.mod +++ b/go.mod @@ -250,7 +250,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 diff --git a/go.sum b/go.sum index 9ed6575a129f..2b68ee7c3837 100644 --- a/go.sum +++ b/go.sum @@ -521,8 +521,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEn github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= From a1136122e10ab454ac23a4c6a9acf69663ead152 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:10 -0400 Subject: [PATCH 1249/2115] go get github.com/aws/aws-sdk-go-v2/service/storagegateway. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 88f4d282227d..e3b21cf5cbe3 100644 --- a/go.mod +++ b/go.mod @@ -251,7 +251,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 diff --git a/go.sum b/go.sum index 2b68ee7c3837..c45ab20e03f1 100644 --- a/go.sum +++ b/go.sum @@ -525,8 +525,8 @@ github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= From 1206978fe4b785ed3387baeae88f28398c5d2159 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:12 -0400 Subject: [PATCH 1250/2115] 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 e3b21cf5cbe3..2a9161214ebb 100644 --- a/go.mod +++ b/go.mod @@ -253,7 +253,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 - github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 + github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 diff --git a/go.sum b/go.sum index c45ab20e03f1..f1e32c260398 100644 --- a/go.sum +++ b/go.sum @@ -529,8 +529,8 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyX github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.0/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= From e0874b9bfdf85693840ca4cd5ed9984b2a7d1768 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:14 -0400 Subject: [PATCH 1251/2115] 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 2a9161214ebb..e33d50747e4f 100644 --- a/go.mod +++ b/go.mod @@ -254,7 +254,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 diff --git a/go.sum b/go.sum index f1e32c260398..87a71b611cda 100644 --- a/go.sum +++ b/go.sum @@ -531,8 +531,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= From 8fd2ae2ffa24d9122f336b3750344b14e089be5b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:15 -0400 Subject: [PATCH 1252/2115] go get github.com/aws/aws-sdk-go-v2/service/taxsettings. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e33d50747e4f..75d39b2e5836 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 diff --git a/go.sum b/go.sum index 87a71b611cda..d06e1c94618c 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= From cd185c90cdac5d40ac97089ebe85b2b160e2b132 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:16 -0400 Subject: [PATCH 1253/2115] 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 75d39b2e5836..9372aa59d6f5 100644 --- a/go.mod +++ b/go.mod @@ -256,7 +256,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 diff --git a/go.sum b/go.sum index d06e1c94618c..3b772c070266 100644 --- a/go.sum +++ b/go.sum @@ -535,8 +535,8 @@ github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNN github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= From 6f81340ad9add83f026eb95dbdbdab21bbbc57b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:17 -0400 Subject: [PATCH 1254/2115] go get github.com/aws/aws-sdk-go-v2/service/timestreamquery. --- go.sum | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 3b772c070266..6d1b155964da 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= From 8a0705624b98afc509ab0122fab5c7941bc23367 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:18 -0400 Subject: [PATCH 1255/2115] go get github.com/aws/aws-sdk-go-v2/service/timestreamwrite. --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9372aa59d6f5..718447b479a3 100644 --- a/go.mod +++ b/go.mod @@ -257,8 +257,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 diff --git a/go.sum b/go.sum index 6d1b155964da..208d0c9609b5 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1/go.mod h1:E9fVjmRExKItXS3Z7D84qP3PcmzEJGNLH3Zg4GO13gg= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= From c2f6913b9979bdd739a60951e4b4b0edf8558d12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:19 -0400 Subject: [PATCH 1256/2115] 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 718447b479a3..63264dd95aee 100644 --- a/go.mod +++ b/go.mod @@ -259,7 +259,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 diff --git a/go.sum b/go.sum index 208d0c9609b5..63e9c4fc671b 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1/go.mod h1:E9fVjmRExKItXS3Z7D84qP3PcmzEJGNLH3Zg4GO13gg= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1/go.mod h1:v5bHGripgR3DInv3X4lG4AjS/k/ljgb3MNJdqNOu93g= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= From bdeb0bdd3198c17ae54b189e3a01048c17810892 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:20 -0400 Subject: [PATCH 1257/2115] 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 63264dd95aee..7111671d0bb7 100644 --- a/go.mod +++ b/go.mod @@ -260,7 +260,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 diff --git a/go.sum b/go.sum index 63e9c4fc671b..203dce9c9f5d 100644 --- a/go.sum +++ b/go.sum @@ -543,8 +543,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1/go.mod h1:v5bHGripgR3DInv3X4lG4AjS/k/ljgb3MNJdqNOu93g= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= From 7602fe7729854507230ca1af2e7686cb45cb7d0f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:22 -0400 Subject: [PATCH 1258/2115] go get github.com/aws/aws-sdk-go-v2/service/vpclattice. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7111671d0bb7..3b982cd16420 100644 --- a/go.mod +++ b/go.mod @@ -261,8 +261,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 diff --git a/go.sum b/go.sum index 203dce9c9f5d..e5edb2f419f6 100644 --- a/go.sum +++ b/go.sum @@ -545,10 +545,10 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2M github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 h1:YHkBeqmOTk9JaOXj5aBmv5osRkyR+GNGagoEM98bk90= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 h1:c2SDs4RUMwDBWtRY0gCQ1qL9eoKh7NmZiI0Msf5zWEw= github.com/aws/aws-sdk-go-v2/service/waf v1.30.0/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= From cd73caa10c67b9a45c0af3f56e0b9dc5ee1b9194 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:23 -0400 Subject: [PATCH 1259/2115] 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 3b982cd16420..0ea1f7b2b992 100644 --- a/go.mod +++ b/go.mod @@ -263,7 +263,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 - github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 + github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 diff --git a/go.sum b/go.sum index e5edb2f419f6..65ac202eb6a3 100644 --- a/go.sum +++ b/go.sum @@ -549,8 +549,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 h1:YHkBeqmOTk9J github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 h1:c2SDs4RUMwDBWtRY0gCQ1qL9eoKh7NmZiI0Msf5zWEw= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.0/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= From 11d1d81b9308dde2a75a649a5a6ad1525747250d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:25 -0400 Subject: [PATCH 1260/2115] 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 0ea1f7b2b992..259b0203d5e9 100644 --- a/go.mod +++ b/go.mod @@ -264,7 +264,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 diff --git a/go.sum b/go.sum index 65ac202eb6a3..d1db649659e3 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8T github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1/go.mod h1:BZWeUmYp1Vra+wmpCeuBjpmbfWU2oBi5jZukBDh8IVU= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= From e8920b14daa279ebf39f50a1f03b436fdabbe976 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:25 -0400 Subject: [PATCH 1261/2115] 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 259b0203d5e9..8c71eeaa57b2 100644 --- a/go.mod +++ b/go.mod @@ -265,7 +265,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 diff --git a/go.sum b/go.sum index d1db649659e3..28fd993d0dfc 100644 --- a/go.sum +++ b/go.sum @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1C github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1/go.mod h1:BZWeUmYp1Vra+wmpCeuBjpmbfWU2oBi5jZukBDh8IVU= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1/go.mod h1:yiLut9L99R3spfqmkcGZcp2z0fwNXCUXivALQ9qDqPc= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= From 15543e2a6344c6361488b3787adaa617b460c09f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:27 -0400 Subject: [PATCH 1262/2115] 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 8c71eeaa57b2..8291f173dd92 100644 --- a/go.mod +++ b/go.mod @@ -266,7 +266,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 diff --git a/go.sum b/go.sum index 28fd993d0dfc..b77b5e0abe0d 100644 --- a/go.sum +++ b/go.sum @@ -555,8 +555,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhX github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1/go.mod h1:yiLut9L99R3spfqmkcGZcp2z0fwNXCUXivALQ9qDqPc= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= From 10349bf90ae3843ffde8e62ec2a1925d82ccf6c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:28 -0400 Subject: [PATCH 1263/2115] 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 8291f173dd92..6458276c2e04 100644 --- a/go.mod +++ b/go.mod @@ -267,7 +267,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 github.com/aws/smithy-go v1.23.0 diff --git a/go.sum b/go.sum index b77b5e0abe0d..33e2cca43b62 100644 --- a/go.sum +++ b/go.sum @@ -557,8 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcy github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 h1:9vFfby2iH/7EKEYYZYV70wjWgO4tLtdAxTnsM1Lv9js= From 83113d2896d728af2b619da9007453f0c63a30cd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:01:30 -0400 Subject: [PATCH 1264/2115] 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 6458276c2e04..371e331b0260 100644 --- a/go.mod +++ b/go.mod @@ -269,7 +269,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 - github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 + github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 diff --git a/go.sum b/go.sum index 33e2cca43b62..c33825dc6e72 100644 --- a/go.sum +++ b/go.sum @@ -561,8 +561,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= -github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 h1:9vFfby2iH/7EKEYYZYV70wjWgO4tLtdAxTnsM1Lv9js= -github.com/aws/aws-sdk-go-v2/service/xray v1.35.0/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= From a2cf83dcbd7147de0fa913f38935a6ad03eb3d89 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:04:42 -0400 Subject: [PATCH 1265/2115] 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 371e331b0260..a4749bb87b46 100644 --- a/go.mod +++ b/go.mod @@ -268,7 +268,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 diff --git a/go.sum b/go.sum index c33825dc6e72..70e25f85b8b1 100644 --- a/go.sum +++ b/go.sum @@ -559,8 +559,8 @@ github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3L github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2/go.mod h1:L53nfLqk4M1G+rZek3o4rOzimvntauPKkGrWWjQ1F/Y= github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= From 03435a8452f57da0d19eb5348ad39ff5ab9a1a21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:05:53 -0400 Subject: [PATCH 1266/2115] 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 a4749bb87b46..ec702cb0f231 100644 --- a/go.mod +++ b/go.mod @@ -230,7 +230,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 diff --git a/go.sum b/go.sum index 70e25f85b8b1..3de634ae8a84 100644 --- a/go.sum +++ b/go.sum @@ -481,8 +481,8 @@ github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2/go.mod h1:iGwIZwjxYYEwbnE7NUCDBGAvrkmWu2DMpxSXoYATaCc= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= From 3584197937ff4dbf036bd614808968b90f657c71 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:06:43 -0400 Subject: [PATCH 1267/2115] 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 ec702cb0f231..8dce59d9da28 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 - github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 + github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 diff --git a/go.sum b/go.sum index 3de634ae8a84..e18728f8c9cb 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 h1:FmGYwdsa7KuUej6bRuJ github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.1/go.mod h1:7FL0wpgqB1DXHmD5sh0Shnq70Ib6Yb3ayh0OHeJO9a4= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= From fad6981725eaf9eeacfe7d7e06386b3b91d7806b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:07:44 -0400 Subject: [PATCH 1268/2115] 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 8dce59d9da28..9b2eee8c9c78 100644 --- a/go.mod +++ b/go.mod @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 diff --git a/go.sum b/go.sum index e18728f8c9cb..710da96a7428 100644 --- a/go.sum +++ b/go.sum @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2/go.mod h1:HssjGKML+1CKdk/rpboJ1GDnqPdIRbKcaHn+rWb8WnI= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= From 48a57da9f13dd5611dafeae997f803b912cc6935 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:24:47 -0400 Subject: [PATCH 1269/2115] r/aws_cognito_managed_login_branding: Add 'settings_all' attribute. --- .../cognitoidp/managed_login_branding.go | 95 ++++++++++++++++++- ...gnito_managed_login_branding.html.markdown | 1 + 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 2e3992906afe..966ab14e741e 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -68,6 +68,10 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), Optional: true, }, + "settings_all": schema.StringAttribute{ + CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), + Computed: true, + }, "use_cognito_provided_values": schema.BoolAttribute{ Optional: true, Computed: true, @@ -172,6 +176,23 @@ func (r *managedLoginBrandingResource) Create(ctx context.Context, request resou data.ManagedLoginBrandingID = fwflex.StringToFramework(ctx, mlb.ManagedLoginBrandingId) data.UseCognitoProvidedValues = fwflex.BoolValueToFramework(ctx, mlb.UseCognitoProvidedValues) + userPoolID, managedLoginBrandingID := fwflex.StringValueFromFramework(ctx, data.UserPoolID), fwflex.StringValueFromFramework(ctx, data.ManagedLoginBrandingID) + // Return all values. + mlb, err = findManagedLoginBrandingByThreePartKey(ctx, conn, userPoolID, managedLoginBrandingID, true) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) + + return + } + + settingsAll, diags := flattenManagedLoginBrandingSettings(ctx, mlb.Settings) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } + data.SettingsAll = settingsAll + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } @@ -207,6 +228,29 @@ func (r *managedLoginBrandingResource) Read(ctx context.Context, request resourc return } + settings, diags := flattenManagedLoginBrandingSettings(ctx, mlb.Settings) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } + data.Settings = settings + + // Return all values. + mlb, err = findManagedLoginBrandingByThreePartKey(ctx, conn, userPoolID, managedLoginBrandingID, true) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) + + return + } + + settingsAll, diags := flattenManagedLoginBrandingSettings(ctx, mlb.Settings) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } + data.SettingsAll = settingsAll + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } @@ -256,6 +300,22 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou return } + // Return all values. + mlb, err := findManagedLoginBrandingByThreePartKey(ctx, conn, userPoolID, managedLoginBrandingID, true) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) + + return + } + + settingsAll, diags := flattenManagedLoginBrandingSettings(ctx, mlb.Settings) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } + new.SettingsAll = settingsAll + response.Diagnostics.Append(response.State.Set(ctx, &new)...) } @@ -342,11 +402,44 @@ type managedLoginBrandingResourceModel struct { Asset fwtypes.SetNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` ClientID types.String `tfsdk:"client_id"` ManagedLoginBrandingID types.String `tfsdk:"managed_login_branding_id"` - Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings"` + Settings fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings" autoflex:"-"` + SettingsAll fwtypes.SmithyJSON[document.Interface] `tfsdk:"settings_all" autoflex:"-"` UseCognitoProvidedValues types.Bool `tfsdk:"use_cognito_provided_values"` UserPoolID types.String `tfsdk:"user_pool_id"` } +func flattenManagedLoginBrandingSettings(ctx context.Context, settings document.Interface) (fwtypes.SmithyJSON[document.Interface], diag.Diagnostics) { + var diags diag.Diagnostics + + if settings == nil { + return fwtypes.NewSmithyJSONNull[document.Interface](), diags + } + + value, err := tfsmithy.DocumentToJSONString(settings) + + if err != nil { + diags.AddError("reading Smithy document", err.Error()) + + return fwtypes.NewSmithyJSONNull[document.Interface](), diags + } + + settings, d := fwtypes.NewSmithyJSONValue(value, document.NewLazyDocument).ToSmithyDocument(ctx) + diags.Append(d...) + if diags.HasError() { + return fwtypes.NewSmithyJSONNull[document.Interface](), diags + } + + value, err = tfsmithy.DocumentToJSONString(settings) + + if err != nil { + diags.AddError("reading Smithy document", err.Error()) + + return fwtypes.NewSmithyJSONNull[document.Interface](), diags + } + + return fwtypes.NewSmithyJSONValue(value, document.NewLazyDocument), diags +} + type assetTypeModel struct { Bytes types.String `tfsdk:"bytes"` Category fwtypes.StringEnum[awstypes.AssetCategoryType] `tfsdk:"category"` diff --git a/website/docs/r/cognito_managed_login_branding.html.markdown b/website/docs/r/cognito_managed_login_branding.html.markdown index 3f83602276e3..ca6e6a9ca987 100644 --- a/website/docs/r/cognito_managed_login_branding.html.markdown +++ b/website/docs/r/cognito_managed_login_branding.html.markdown @@ -70,6 +70,7 @@ The following arguments are optional: This resource exports the following attributes in addition to the arguments above: * `managed_login_branding_id` - ID of the managed login branding style. +* `settings_all` - Settings including Amazon Cognito defaults. ## Import From fd580770dd55c376d5fc7f0759ac3a8c188d9952 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:48:26 -0400 Subject: [PATCH 1270/2115] Add CHANGELOG entry. --- .changelog/38527.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/38527.txt diff --git a/.changelog/38527.txt b/.changelog/38527.txt new file mode 100644 index 000000000000..69122473bf3e --- /dev/null +++ b/.changelog/38527.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_instance: Add `placement_group_id` argument +``` + +```release-note:enhancement +data-source/aws_instance: Add `placement_group_id` attribute +``` \ No newline at end of file From b2545cc61c09740bc1431565b0bc70cfeee56dc8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:55:54 -0400 Subject: [PATCH 1271/2115] aws_instance: Read 'placement_group_id'. --- internal/service/ec2/ec2_instance.go | 16 ++++++---------- internal/service/ec2/ec2_instance_data_source.go | 16 +++++++++------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 26d902107985..d22ecb87b544 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -1244,17 +1244,13 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta any) if v := instance.Placement; v != nil { d.Set(names.AttrAvailabilityZone, v.AvailabilityZone) - - d.Set("placement_group", v.GroupName) - d.Set("host_id", v.HostId) - if v := v.HostResourceGroupArn; v != nil { d.Set("host_resource_group_arn", instance.Placement.HostResourceGroupArn) } - + d.Set("placement_group", v.GroupName) + d.Set("placement_group_id", v.GroupId) d.Set("placement_partition_number", v.PartitionNumber) - d.Set("tenancy", v.Tenancy) } @@ -3081,7 +3077,7 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta any) (* opts.InstanceType = awstypes.InstanceType(v.(string)) } - var instanceInterruptionBehavior string + var instanceInterruptionBehavior awstypes.InstanceInterruptionBehavior if v, ok := d.GetOk(names.AttrLaunchTemplate); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { launchTemplateSpecification := expandLaunchTemplateSpecification(v.([]any)[0].(map[string]any)) @@ -3094,7 +3090,7 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta any) (* opts.LaunchTemplate = launchTemplateSpecification if launchTemplateData.InstanceMarketOptions != nil && launchTemplateData.InstanceMarketOptions.SpotOptions != nil { - instanceInterruptionBehavior = string(launchTemplateData.InstanceMarketOptions.SpotOptions.InstanceInterruptionBehavior) + instanceInterruptionBehavior = launchTemplateData.InstanceMarketOptions.SpotOptions.InstanceInterruptionBehavior } } @@ -3168,12 +3164,12 @@ func buildInstanceOpts(ctx context.Context, d *schema.ResourceData, meta any) (* AvailabilityZone: aws.String(d.Get(names.AttrAvailabilityZone).(string)), } - if v, ok := d.GetOk("placement_group"); ok && (instanceInterruptionBehavior == "" || instanceInterruptionBehavior == string(awstypes.InstanceInterruptionBehaviorTerminate)) { + if v, ok := d.GetOk("placement_group"); ok && (instanceInterruptionBehavior == "" || instanceInterruptionBehavior == awstypes.InstanceInterruptionBehaviorTerminate) { opts.Placement.GroupName = aws.String(v.(string)) opts.SpotPlacement.GroupName = aws.String(v.(string)) } - if v, ok := d.GetOk("placement_group_id"); ok && (instanceInterruptionBehavior == "" || instanceInterruptionBehavior == string(awstypes.InstanceInterruptionBehaviorTerminate)) { + if v, ok := d.GetOk("placement_group_id"); ok && (instanceInterruptionBehavior == "" || instanceInterruptionBehavior == awstypes.InstanceInterruptionBehaviorTerminate) { opts.Placement.GroupId = aws.String(v.(string)) // AWS SDK missing groupID in type for spotplacement // opts.SpotPlacement.GroupId = aws.String(v.(string)) diff --git a/internal/service/ec2/ec2_instance_data_source.go b/internal/service/ec2/ec2_instance_data_source.go index 9f3396eb5057..de915bb8cedb 100644 --- a/internal/service/ec2/ec2_instance_data_source.go +++ b/internal/service/ec2/ec2_instance_data_source.go @@ -474,13 +474,15 @@ func instanceDescriptionAttributes(ctx context.Context, d *schema.ResourceData, // Set the easy attributes d.Set("instance_state", instance.State.Name) - d.Set(names.AttrAvailabilityZone, instance.Placement.AvailabilityZone) - d.Set("placement_group", instance.Placement.GroupName) - d.Set("placement_partition_number", instance.Placement.PartitionNumber) - d.Set("tenancy", instance.Placement.Tenancy) - d.Set("host_id", instance.Placement.HostId) - d.Set("host_resource_group_arn", instance.Placement.HostResourceGroupArn) - + if v := instance.Placement; v != nil { + d.Set(names.AttrAvailabilityZone, v.AvailabilityZone) + d.Set("host_id", v.HostId) + d.Set("host_resource_group_arn", v.HostResourceGroupArn) + d.Set("placement_group", v.GroupName) + d.Set("placement_group_id", v.GroupId) + d.Set("placement_partition_number", v.PartitionNumber) + d.Set("tenancy", v.Tenancy) + } d.Set("ami", instance.ImageId) d.Set(names.AttrInstanceType, instanceType) d.Set("key_name", instance.KeyName) From de94655c0bde3db9cfc21d4ebe15e9d73603107c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:56:05 -0400 Subject: [PATCH 1272/2115] aws_instance: Document 'placement_group_id'. --- website/docs/d/instance.html.markdown | 1 + website/docs/r/instance.html.markdown | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/website/docs/d/instance.html.markdown b/website/docs/d/instance.html.markdown index 0d94af8bee0d..0e7b0b08b58b 100644 --- a/website/docs/d/instance.html.markdown +++ b/website/docs/d/instance.html.markdown @@ -101,6 +101,7 @@ interpolation. * `outpost_arn` - ARN of the Outpost. * `password_data` - Base-64 encoded encrypted password data for the instance. Useful for getting the administrator password for instances running Microsoft Windows. This attribute is only exported if `get_password_data` is true. See [GetPasswordData](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetPasswordData.html) for more information. * `placement_group` - Placement group of the Instance. +* `placement_group_id` - Placement group ID of the Instance. * `placement_partition_number` - Number of the partition the instance is in. * `private_dns` - Private DNS name assigned to the Instance. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC. * `private_dns_name_options` - Options for the instance hostname. diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index 30d824732c2c..914628b9675c 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -240,7 +240,8 @@ This resource supports the following arguments: * `metadata_options` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) * `network_interface` - (Optional, **Deprecated** to specify the primary network interface, use `primary_network_interface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. -* `placement_group` - (Optional) Placement Group to start the instance in. +* `placement_group` - (Optional) Placement Group to start the instance in. Conflicts with `placement_group_id`. +* `placement_group_id` - (Optional) Placement Group ID to start the instance in. Conflicts with `placement_group`. * `placement_partition_number` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. * `primary_network_interface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `private_dns_name_options` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. From ab445c56233dc400c5d3fce3f3c84e7888e68429 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 08:57:43 -0400 Subject: [PATCH 1273/2115] Tweak acceptance tests. --- internal/service/ec2/ec2_instance_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index beefe4941c52..c20067a8f5bf 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -1173,7 +1173,7 @@ func TestAccEC2Instance_placementGroup(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_placementGroupId(rName), + Config: testAccInstanceConfig_placementGroup(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "placement_group", rName), @@ -1189,7 +1189,7 @@ func TestAccEC2Instance_placementGroup(t *testing.T) { }) } -func TestAccEC2Instance_placementGroupId(t *testing.T) { +func TestAccEC2Instance_placementGroupID(t *testing.T) { ctx := acctest.Context(t) var v awstypes.Instance resourceName := "aws_instance.test" @@ -1202,7 +1202,7 @@ func TestAccEC2Instance_placementGroupId(t *testing.T) { CheckDestroy: testAccCheckInstanceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccInstanceConfig_placementGroupId(rName), + Config: testAccInstanceConfig_placementGroupID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "placement_group_id", rName), @@ -7456,7 +7456,7 @@ resource "aws_instance" "test" { `, rName)) } -func testAccInstanceConfig_placementGroupId(rName string) string { +func testAccInstanceConfig_placementGroupID(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), testAccInstanceConfig_vpcBase(rName, false, 0), From f1670ae512b2978b7924d8829574c4073a4df518 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 09:11:28 -0400 Subject: [PATCH 1274/2115] chore(go-vcr): wrap `InteractionNotFoundRetryableFunc` in `vcr` package (#44092) Previously every reference to `vcr.InteractionNotFoundRetryableFunc` was wrapped with `retry.IsErrorRetryableFunc`. This moves the wrapping into the variable declaration to reduce the boilerplate syntax in generated and handwritten service client configurations. Confirmation that a test known to currently fail with a VCR related error still does without retrying: ```console % VCR_MODE=REPLAY_ONLY VCR_PATH=/Users/jaredbaker/development/_vcr-testdata/ make testacc PKG=timestreaminfluxdb TESTS=TestAccTimestreamInfluxDBDBCluster_basic make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 20 -run='TestAccTimestreamInfluxDBDBCluster_basic' -timeout 360m -vet=off 2025/08/29 15:55:02 Creating Terraform AWS Provider (SDKv2-style)... 2025/08/29 15:55:02 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccTimestreamInfluxDBDBCluster_basic === PAUSE TestAccTimestreamInfluxDBDBCluster_basic === CONT TestAccTimestreamInfluxDBDBCluster_basic acctest.go:313: at least one environment variable of [AWS_PROFILE AWS_ACCESS_KEY_ID AWS_CONTAINER_CREDENTIALS_FULL_URI] must be set. Usage: credentials for running acceptance testing panic.go:636: provider meta not found for test TestAccTimestreamInfluxDBDBCluster_basic --- FAIL: TestAccTimestreamInfluxDBDBCluster_basic (0.00s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb 6.458s FAIL make: *** [testacc] Error 1 ``` --- internal/generate/servicepackage/service_package_gen.go.gtpl | 2 +- internal/service/accessanalyzer/service_package_gen.go | 3 +-- internal/service/account/service_package_gen.go | 3 +-- internal/service/acm/service_package_gen.go | 3 +-- internal/service/acmpca/service_package_gen.go | 3 +-- internal/service/amp/service_package_gen.go | 3 +-- internal/service/amplify/service_package_gen.go | 3 +-- internal/service/apigateway/service_package.go | 2 +- internal/service/apigateway/service_package_gen.go | 3 +-- internal/service/apigatewayv2/service_package.go | 2 +- internal/service/apigatewayv2/service_package_gen.go | 3 +-- internal/service/appautoscaling/service_package_gen.go | 3 +-- internal/service/appconfig/service_package_gen.go | 3 +-- internal/service/appfabric/service_package_gen.go | 3 +-- internal/service/appflow/service_package_gen.go | 3 +-- internal/service/appintegrations/service_package_gen.go | 3 +-- internal/service/applicationinsights/service_package_gen.go | 3 +-- internal/service/applicationsignals/service_package_gen.go | 3 +-- internal/service/appmesh/service_package_gen.go | 3 +-- internal/service/apprunner/service_package_gen.go | 3 +-- internal/service/appstream/service_package_gen.go | 3 +-- internal/service/appsync/service_package.go | 2 +- internal/service/appsync/service_package_gen.go | 3 +-- internal/service/arcregionswitch/service_package_gen.go | 3 +-- internal/service/athena/service_package_gen.go | 3 +-- internal/service/auditmanager/service_package_gen.go | 3 +-- internal/service/autoscaling/service_package_gen.go | 3 +-- internal/service/autoscalingplans/service_package_gen.go | 3 +-- internal/service/backup/service_package_gen.go | 3 +-- internal/service/batch/service_package_gen.go | 3 +-- internal/service/bcmdataexports/service_package_gen.go | 3 +-- internal/service/bedrock/service_package_gen.go | 3 +-- internal/service/bedrockagent/service_package_gen.go | 3 +-- internal/service/bedrockagentcore/service_package_gen.go | 3 +-- internal/service/billing/service_package_gen.go | 3 +-- internal/service/budgets/service_package_gen.go | 3 +-- internal/service/ce/service_package_gen.go | 3 +-- internal/service/chatbot/service_package_gen.go | 3 +-- internal/service/chime/service_package_gen.go | 3 +-- .../service/chimesdkmediapipelines/service_package_gen.go | 3 +-- internal/service/chimesdkvoice/service_package_gen.go | 3 +-- internal/service/cleanrooms/service_package_gen.go | 3 +-- internal/service/cloud9/service_package_gen.go | 3 +-- internal/service/cloudcontrol/service_package_gen.go | 3 +-- internal/service/cloudformation/service_package.go | 2 +- internal/service/cloudformation/service_package_gen.go | 3 +-- internal/service/cloudfront/service_package_gen.go | 3 +-- .../service/cloudfrontkeyvaluestore/service_package_gen.go | 3 +-- internal/service/cloudhsmv2/service_package.go | 2 +- internal/service/cloudhsmv2/service_package_gen.go | 3 +-- internal/service/cloudsearch/service_package_gen.go | 3 +-- internal/service/cloudtrail/service_package_gen.go | 3 +-- internal/service/cloudwatch/service_package_gen.go | 3 +-- internal/service/codeartifact/service_package_gen.go | 3 +-- internal/service/codebuild/service_package_gen.go | 3 +-- internal/service/codecatalyst/service_package_gen.go | 3 +-- internal/service/codecommit/service_package_gen.go | 3 +-- internal/service/codeconnections/service_package_gen.go | 3 +-- internal/service/codeguruprofiler/service_package_gen.go | 3 +-- internal/service/codegurureviewer/service_package_gen.go | 3 +-- internal/service/codepipeline/service_package_gen.go | 3 +-- internal/service/codestarconnections/service_package_gen.go | 3 +-- .../service/codestarnotifications/service_package_gen.go | 3 +-- internal/service/cognitoidentity/service_package_gen.go | 3 +-- internal/service/cognitoidp/service_package_gen.go | 3 +-- internal/service/comprehend/service_package_gen.go | 3 +-- internal/service/computeoptimizer/service_package_gen.go | 3 +-- internal/service/configservice/service_package_gen.go | 3 +-- internal/service/connect/service_package_gen.go | 3 +-- internal/service/connectcases/service_package_gen.go | 3 +-- internal/service/controltower/service_package_gen.go | 3 +-- internal/service/costoptimizationhub/service_package_gen.go | 3 +-- internal/service/cur/service_package_gen.go | 3 +-- internal/service/customerprofiles/service_package_gen.go | 3 +-- internal/service/databrew/service_package_gen.go | 3 +-- internal/service/dataexchange/service_package_gen.go | 3 +-- internal/service/datapipeline/service_package_gen.go | 3 +-- internal/service/datasync/service_package_gen.go | 3 +-- internal/service/datazone/service_package_gen.go | 3 +-- internal/service/dax/service_package_gen.go | 3 +-- internal/service/deploy/service_package_gen.go | 3 +-- internal/service/detective/service_package_gen.go | 3 +-- internal/service/devicefarm/service_package_gen.go | 3 +-- internal/service/devopsguru/service_package_gen.go | 3 +-- internal/service/directconnect/service_package_gen.go | 3 +-- internal/service/dlm/service_package_gen.go | 3 +-- internal/service/dms/service_package_gen.go | 3 +-- internal/service/docdb/service_package_gen.go | 3 +-- internal/service/docdbelastic/service_package_gen.go | 3 +-- internal/service/drs/service_package_gen.go | 3 +-- internal/service/ds/service_package_gen.go | 3 +-- internal/service/dsql/service_package_gen.go | 3 +-- internal/service/dynamodb/service_package.go | 2 +- internal/service/dynamodb/service_package_gen.go | 3 +-- internal/service/ec2/service_package.go | 2 +- internal/service/ec2/service_package_gen.go | 3 +-- internal/service/ecr/service_package_gen.go | 3 +-- internal/service/ecrpublic/service_package_gen.go | 3 +-- internal/service/ecs/service_package_gen.go | 3 +-- internal/service/efs/service_package_gen.go | 3 +-- internal/service/eks/service_package_gen.go | 3 +-- internal/service/elasticache/service_package_gen.go | 3 +-- internal/service/elasticbeanstalk/service_package_gen.go | 3 +-- internal/service/elasticsearch/service_package_gen.go | 3 +-- internal/service/elastictranscoder/service_package_gen.go | 3 +-- internal/service/elb/service_package_gen.go | 3 +-- internal/service/elbv2/service_package_gen.go | 3 +-- internal/service/emr/service_package_gen.go | 3 +-- internal/service/emrcontainers/service_package_gen.go | 3 +-- internal/service/emrserverless/service_package_gen.go | 3 +-- internal/service/events/service_package_gen.go | 3 +-- internal/service/evidently/service_package_gen.go | 3 +-- internal/service/evs/service_package_gen.go | 3 +-- internal/service/finspace/service_package_gen.go | 3 +-- internal/service/firehose/service_package_gen.go | 3 +-- internal/service/fis/service_package_gen.go | 3 +-- internal/service/fms/service_package.go | 2 +- internal/service/fms/service_package_gen.go | 3 +-- internal/service/fsx/service_package_gen.go | 3 +-- internal/service/gamelift/service_package_gen.go | 3 +-- internal/service/glacier/service_package_gen.go | 3 +-- internal/service/globalaccelerator/service_package_gen.go | 3 +-- internal/service/glue/service_package_gen.go | 3 +-- internal/service/grafana/service_package_gen.go | 3 +-- internal/service/greengrass/service_package_gen.go | 3 +-- internal/service/groundstation/service_package_gen.go | 3 +-- internal/service/guardduty/service_package_gen.go | 3 +-- internal/service/healthlake/service_package_gen.go | 3 +-- internal/service/iam/service_package_gen.go | 3 +-- internal/service/identitystore/service_package_gen.go | 3 +-- internal/service/imagebuilder/service_package_gen.go | 3 +-- internal/service/inspector/service_package_gen.go | 3 +-- internal/service/inspector2/service_package_gen.go | 3 +-- internal/service/internetmonitor/service_package_gen.go | 3 +-- internal/service/invoicing/service_package_gen.go | 3 +-- internal/service/iot/service_package_gen.go | 3 +-- internal/service/ivs/service_package_gen.go | 3 +-- internal/service/ivschat/service_package_gen.go | 3 +-- internal/service/kafka/service_package.go | 2 +- internal/service/kafka/service_package_gen.go | 3 +-- internal/service/kafkaconnect/service_package_gen.go | 3 +-- internal/service/kendra/service_package_gen.go | 3 +-- internal/service/keyspaces/service_package_gen.go | 3 +-- internal/service/kinesis/service_package.go | 2 +- internal/service/kinesis/service_package_gen.go | 3 +-- internal/service/kinesisanalytics/service_package_gen.go | 3 +-- internal/service/kinesisanalyticsv2/service_package_gen.go | 3 +-- internal/service/kinesisvideo/service_package_gen.go | 3 +-- internal/service/kms/service_package_gen.go | 3 +-- internal/service/lakeformation/service_package_gen.go | 3 +-- internal/service/lambda/service_package_gen.go | 3 +-- internal/service/launchwizard/service_package_gen.go | 3 +-- internal/service/lexmodels/service_package_gen.go | 3 +-- internal/service/lexv2models/service_package_gen.go | 3 +-- internal/service/licensemanager/service_package_gen.go | 3 +-- internal/service/lightsail/service_package.go | 2 +- internal/service/lightsail/service_package_gen.go | 3 +-- internal/service/location/service_package_gen.go | 3 +-- internal/service/logs/service_package_gen.go | 3 +-- internal/service/lookoutmetrics/service_package_gen.go | 3 +-- internal/service/m2/service_package_gen.go | 3 +-- internal/service/macie2/service_package_gen.go | 3 +-- internal/service/mediaconnect/service_package_gen.go | 3 +-- internal/service/mediaconvert/service_package_gen.go | 3 +-- internal/service/medialive/service_package_gen.go | 3 +-- internal/service/mediapackage/service_package_gen.go | 3 +-- internal/service/mediapackagev2/service_package_gen.go | 3 +-- internal/service/mediapackagevod/service_package_gen.go | 3 +-- internal/service/mediastore/service_package_gen.go | 3 +-- internal/service/memorydb/service_package_gen.go | 3 +-- internal/service/mgn/service_package_gen.go | 3 +-- internal/service/mq/service_package_gen.go | 3 +-- internal/service/mwaa/service_package_gen.go | 3 +-- internal/service/neptune/service_package_gen.go | 3 +-- internal/service/neptunegraph/service_package_gen.go | 3 +-- internal/service/networkfirewall/service_package_gen.go | 3 +-- internal/service/networkmanager/service_package_gen.go | 3 +-- internal/service/networkmonitor/service_package_gen.go | 3 +-- internal/service/notifications/service_package_gen.go | 3 +-- .../service/notificationscontacts/service_package_gen.go | 3 +-- internal/service/oam/service_package_gen.go | 3 +-- internal/service/odb/service_package_gen.go | 3 +-- internal/service/opensearch/service_package_gen.go | 3 +-- internal/service/opensearchserverless/service_package_gen.go | 3 +-- internal/service/organizations/service_package.go | 2 +- internal/service/organizations/service_package_gen.go | 3 +-- internal/service/osis/service_package_gen.go | 3 +-- internal/service/outposts/service_package_gen.go | 3 +-- internal/service/paymentcryptography/service_package_gen.go | 3 +-- internal/service/pcaconnectorad/service_package_gen.go | 3 +-- internal/service/pcs/service_package_gen.go | 3 +-- internal/service/pinpoint/service_package_gen.go | 3 +-- internal/service/pinpointsmsvoicev2/service_package_gen.go | 3 +-- internal/service/pipes/service_package_gen.go | 3 +-- internal/service/polly/service_package_gen.go | 3 +-- internal/service/pricing/service_package_gen.go | 3 +-- internal/service/qbusiness/service_package_gen.go | 3 +-- internal/service/qldb/service_package_gen.go | 3 +-- internal/service/quicksight/service_package_gen.go | 3 +-- internal/service/ram/service_package_gen.go | 3 +-- internal/service/rbin/service_package_gen.go | 3 +-- internal/service/rds/service_package_gen.go | 3 +-- internal/service/redshift/service_package_gen.go | 3 +-- internal/service/redshiftdata/service_package_gen.go | 3 +-- internal/service/redshiftserverless/service_package_gen.go | 3 +-- internal/service/rekognition/service_package_gen.go | 3 +-- internal/service/resiliencehub/service_package_gen.go | 3 +-- internal/service/resourceexplorer2/service_package_gen.go | 3 +-- internal/service/resourcegroups/service_package_gen.go | 3 +-- .../service/resourcegroupstaggingapi/service_package_gen.go | 3 +-- internal/service/rolesanywhere/service_package_gen.go | 3 +-- internal/service/route53/service_package_gen.go | 3 +-- internal/service/route53domains/service_package_gen.go | 3 +-- internal/service/route53profiles/service_package_gen.go | 3 +-- .../route53recoverycontrolconfig/service_package_gen.go | 3 +-- .../service/route53recoveryreadiness/service_package_gen.go | 3 +-- internal/service/route53resolver/service_package_gen.go | 3 +-- internal/service/rum/service_package_gen.go | 3 +-- internal/service/s3/service_package.go | 2 +- internal/service/s3/service_package_gen.go | 3 +-- internal/service/s3control/service_package_gen.go | 3 +-- internal/service/s3outposts/service_package_gen.go | 3 +-- internal/service/s3tables/service_package_gen.go | 3 +-- internal/service/s3vectors/service_package_gen.go | 3 +-- internal/service/sagemaker/service_package_gen.go | 3 +-- internal/service/scheduler/service_package_gen.go | 3 +-- internal/service/schemas/service_package.go | 2 +- internal/service/schemas/service_package_gen.go | 3 +-- internal/service/secretsmanager/service_package_gen.go | 3 +-- internal/service/securityhub/service_package_gen.go | 3 +-- internal/service/securitylake/service_package_gen.go | 3 +-- internal/service/serverlessrepo/service_package_gen.go | 3 +-- internal/service/servicecatalog/service_package_gen.go | 3 +-- .../service/servicecatalogappregistry/service_package_gen.go | 3 +-- internal/service/servicediscovery/service_package_gen.go | 3 +-- internal/service/servicequotas/service_package_gen.go | 3 +-- internal/service/ses/service_package_gen.go | 3 +-- internal/service/sesv2/service_package_gen.go | 3 +-- internal/service/sfn/service_package_gen.go | 3 +-- internal/service/shield/service_package_gen.go | 3 +-- internal/service/signer/service_package_gen.go | 3 +-- internal/service/sns/service_package_gen.go | 3 +-- internal/service/sqs/service_package_gen.go | 3 +-- internal/service/ssm/service_package_gen.go | 3 +-- internal/service/ssmcontacts/service_package_gen.go | 3 +-- internal/service/ssmincidents/service_package_gen.go | 3 +-- internal/service/ssmquicksetup/service_package_gen.go | 3 +-- internal/service/ssmsap/service_package_gen.go | 3 +-- internal/service/sso/service_package_gen.go | 3 +-- internal/service/ssoadmin/service_package.go | 2 +- internal/service/ssoadmin/service_package_gen.go | 3 +-- internal/service/storagegateway/service_package_gen.go | 3 +-- internal/service/sts/service_package_gen.go | 3 +-- internal/service/swf/service_package_gen.go | 3 +-- internal/service/synthetics/service_package_gen.go | 3 +-- internal/service/taxsettings/service_package_gen.go | 3 +-- internal/service/timestreaminfluxdb/service_package_gen.go | 3 +-- internal/service/timestreamquery/service_package_gen.go | 3 +-- internal/service/timestreamwrite/service_package_gen.go | 3 +-- internal/service/transcribe/service_package_gen.go | 3 +-- internal/service/transfer/service_package_gen.go | 3 +-- internal/service/verifiedpermissions/service_package_gen.go | 3 +-- internal/service/vpclattice/service_package_gen.go | 3 +-- internal/service/waf/service_package_gen.go | 3 +-- internal/service/wafregional/service_package_gen.go | 3 +-- internal/service/wafv2/service_package_gen.go | 3 +-- internal/service/wellarchitected/service_package_gen.go | 3 +-- internal/service/workspaces/service_package_gen.go | 3 +-- internal/service/workspacesweb/service_package_gen.go | 3 +-- internal/service/xray/service_package_gen.go | 3 +-- internal/vcr/retry.go | 5 +++-- 271 files changed, 273 insertions(+), 526 deletions(-) diff --git a/internal/generate/servicepackage/service_package_gen.go.gtpl b/internal/generate/servicepackage/service_package_gen.go.gtpl index 0304cab0e198..a7c385529a3b 100644 --- a/internal/generate/servicepackage/service_package_gen.go.gtpl +++ b/internal/generate/servicepackage/service_package_gen.go.gtpl @@ -411,7 +411,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *{{ .GoV2Package }}.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, {{- if gt (len .EndpointRegionOverrides) 0 }} diff --git a/internal/service/accessanalyzer/service_package_gen.go b/internal/service/accessanalyzer/service_package_gen.go index cfccf6606481..ffda1b88d8da 100644 --- a/internal/service/accessanalyzer/service_package_gen.go +++ b/internal/service/accessanalyzer/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/accessanalyzer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *accessanalyzer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/account/service_package_gen.go b/internal/service/account/service_package_gen.go index e2b4451fd74f..06c35090022a 100644 --- a/internal/service/account/service_package_gen.go +++ b/internal/service/account/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/account" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *account.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/acm/service_package_gen.go b/internal/service/acm/service_package_gen.go index c434dfd72bbf..b037e6f9000c 100644 --- a/internal/service/acm/service_package_gen.go +++ b/internal/service/acm/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/acm" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -90,7 +89,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *acm.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/acmpca/service_package_gen.go b/internal/service/acmpca/service_package_gen.go index 69080b6937a5..4e5e5cc6e577 100644 --- a/internal/service/acmpca/service_package_gen.go +++ b/internal/service/acmpca/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/acmpca" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -135,7 +134,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *acmpca.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/amp/service_package_gen.go b/internal/service/amp/service_package_gen.go index 79c18b6bd234..7b355d6015da 100644 --- a/internal/service/amp/service_package_gen.go +++ b/internal/service/amp/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/amp" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -132,7 +131,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *amp.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/amplify/service_package_gen.go b/internal/service/amplify/service_package_gen.go index dde161fa6d07..b6d0786f4ed3 100644 --- a/internal/service/amplify/service_package_gen.go +++ b/internal/service/amplify/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/amplify" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -94,7 +93,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *amplify.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/apigateway/service_package.go b/internal/service/apigateway/service_package.go index 72df1997f257..ee7403a17803 100644 --- a/internal/service/apigateway/service_package.go +++ b/internal/service/apigateway/service_package.go @@ -35,7 +35,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/apigateway/service_package_gen.go b/internal/service/apigateway/service_package_gen.go index c3a998ee2e21..be04a12e3433 100644 --- a/internal/service/apigateway/service_package_gen.go +++ b/internal/service/apigateway/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/apigateway" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -309,7 +308,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *apigateway.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/apigatewayv2/service_package.go b/internal/service/apigatewayv2/service_package.go index f87d1ac2fa4c..8e95f7b46afe 100644 --- a/internal/service/apigatewayv2/service_package.go +++ b/internal/service/apigatewayv2/service_package.go @@ -39,7 +39,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/apigatewayv2/service_package_gen.go b/internal/service/apigatewayv2/service_package_gen.go index 5869e7bd2b39..f5338b93a5b9 100644 --- a/internal/service/apigatewayv2/service_package_gen.go +++ b/internal/service/apigatewayv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/apigatewayv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -169,7 +168,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *apigatewayv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appautoscaling/service_package_gen.go b/internal/service/appautoscaling/service_package_gen.go index 95b17a526a13..416cf8931663 100644 --- a/internal/service/appautoscaling/service_package_gen.go +++ b/internal/service/appautoscaling/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/applicationautoscaling" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -79,7 +78,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *applicationautoscaling.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appconfig/service_package_gen.go b/internal/service/appconfig/service_package_gen.go index 38dbb6af462b..daefe1a74249 100644 --- a/internal/service/appconfig/service_package_gen.go +++ b/internal/service/appconfig/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appconfig" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -156,7 +155,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appconfig.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appfabric/service_package_gen.go b/internal/service/appfabric/service_package_gen.go index 0ee52854e243..88be2640d942 100644 --- a/internal/service/appfabric/service_package_gen.go +++ b/internal/service/appfabric/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appfabric" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -104,7 +103,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appfabric.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appflow/service_package_gen.go b/internal/service/appflow/service_package_gen.go index 311f40dd8a91..b16387ddb224 100644 --- a/internal/service/appflow/service_package_gen.go +++ b/internal/service/appflow/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appflow" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -85,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appflow.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appintegrations/service_package_gen.go b/internal/service/appintegrations/service_package_gen.go index 5f498207a4e2..8a74fb325711 100644 --- a/internal/service/appintegrations/service_package_gen.go +++ b/internal/service/appintegrations/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appintegrations" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -84,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appintegrations.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/applicationinsights/service_package_gen.go b/internal/service/applicationinsights/service_package_gen.go index de212766be62..40fa0bd3ca4d 100644 --- a/internal/service/applicationinsights/service_package_gen.go +++ b/internal/service/applicationinsights/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/applicationinsights" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *applicationinsights.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/applicationsignals/service_package_gen.go b/internal/service/applicationsignals/service_package_gen.go index 3bd4bee21692..f8929f4e0186 100644 --- a/internal/service/applicationsignals/service_package_gen.go +++ b/internal/service/applicationsignals/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/applicationsignals" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *applicationsignals.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appmesh/service_package_gen.go b/internal/service/appmesh/service_package_gen.go index 1129d9061d59..a406f77c2e88 100644 --- a/internal/service/appmesh/service_package_gen.go +++ b/internal/service/appmesh/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appmesh" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -171,7 +170,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appmesh.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/apprunner/service_package_gen.go b/internal/service/apprunner/service_package_gen.go index 3f91ba15fd4f..74a6139468db 100644 --- a/internal/service/apprunner/service_package_gen.go +++ b/internal/service/apprunner/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/apprunner" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -176,7 +175,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *apprunner.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appstream/service_package_gen.go b/internal/service/appstream/service_package_gen.go index d56dd15fa82d..2cc0c3c63f84 100644 --- a/internal/service/appstream/service_package_gen.go +++ b/internal/service/appstream/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/appstream" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -116,7 +115,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appstream.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/appsync/service_package.go b/internal/service/appsync/service_package.go index 60a460384b3d..b52bde174404 100644 --- a/internal/service/appsync/service_package.go +++ b/internal/service/appsync/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/appsync/service_package_gen.go b/internal/service/appsync/service_package_gen.go index 9f8bdab19657..5cc70eb3856d 100644 --- a/internal/service/appsync/service_package_gen.go +++ b/internal/service/appsync/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -140,7 +139,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *appsync.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/arcregionswitch/service_package_gen.go b/internal/service/arcregionswitch/service_package_gen.go index 7be113b379e4..adf9dc464d86 100644 --- a/internal/service/arcregionswitch/service_package_gen.go +++ b/internal/service/arcregionswitch/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/arcregionswitch" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -57,7 +56,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *arcregionswitch.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *arcregionswitch.Options) { diff --git a/internal/service/athena/service_package_gen.go b/internal/service/athena/service_package_gen.go index f325ce6cefd2..4eb841dcfe9e 100644 --- a/internal/service/athena/service_package_gen.go +++ b/internal/service/athena/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/athena" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -111,7 +110,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *athena.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/auditmanager/service_package_gen.go b/internal/service/auditmanager/service_package_gen.go index 7acbd3c8820b..729f96581f49 100644 --- a/internal/service/auditmanager/service_package_gen.go +++ b/internal/service/auditmanager/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/auditmanager" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -134,7 +133,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *auditmanager.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/autoscaling/service_package_gen.go b/internal/service/autoscaling/service_package_gen.go index 34366bb379e0..1ea68d0a2410 100644 --- a/internal/service/autoscaling/service_package_gen.go +++ b/internal/service/autoscaling/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/autoscaling" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -131,7 +130,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *autoscaling.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/autoscalingplans/service_package_gen.go b/internal/service/autoscalingplans/service_package_gen.go index e870e92da1e4..9d5c35603160 100644 --- a/internal/service/autoscalingplans/service_package_gen.go +++ b/internal/service/autoscalingplans/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/autoscalingplans" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *autoscalingplans.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/backup/service_package_gen.go b/internal/service/backup/service_package_gen.go index f880b9659815..40f8a103338f 100644 --- a/internal/service/backup/service_package_gen.go +++ b/internal/service/backup/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/backup" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -204,7 +203,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *backup.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/batch/service_package_gen.go b/internal/service/batch/service_package_gen.go index 9d6cb7a523d0..471e6d418208 100644 --- a/internal/service/batch/service_package_gen.go +++ b/internal/service/batch/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/batch" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -136,7 +135,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *batch.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/bcmdataexports/service_package_gen.go b/internal/service/bcmdataexports/service_package_gen.go index 6c5329fe5d02..6743d6333016 100644 --- a/internal/service/bcmdataexports/service_package_gen.go +++ b/internal/service/bcmdataexports/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/bcmdataexports" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -71,7 +70,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *bcmdataexports.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/bedrock/service_package_gen.go b/internal/service/bedrock/service_package_gen.go index 70a06ac59aac..0c92629c2078 100644 --- a/internal/service/bedrock/service_package_gen.go +++ b/internal/service/bedrock/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/bedrock" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -155,7 +154,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *bedrock.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/bedrockagent/service_package_gen.go b/internal/service/bedrockagent/service_package_gen.go index 48bbb3c336f4..86919f6a0d60 100644 --- a/internal/service/bedrockagent/service_package_gen.go +++ b/internal/service/bedrockagent/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/bedrockagent" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -134,7 +133,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *bedrockagent.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/bedrockagentcore/service_package_gen.go b/internal/service/bedrockagentcore/service_package_gen.go index 0561f94c21ca..769dae80d59b 100644 --- a/internal/service/bedrockagentcore/service_package_gen.go +++ b/internal/service/bedrockagentcore/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/bedrockagentcorecontrol" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *bedrockagentcorecontrol.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/billing/service_package_gen.go b/internal/service/billing/service_package_gen.go index 077999b4f199..84aedd7d64f0 100644 --- a/internal/service/billing/service_package_gen.go +++ b/internal/service/billing/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/billing" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -65,7 +64,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *billing.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *billing.Options) { diff --git a/internal/service/budgets/service_package_gen.go b/internal/service/budgets/service_package_gen.go index bc9f4497679c..41d7cbf39024 100644 --- a/internal/service/budgets/service_package_gen.go +++ b/internal/service/budgets/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/budgets" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -86,7 +85,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *budgets.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ce/service_package_gen.go b/internal/service/ce/service_package_gen.go index d46811698a1d..15d5c98dfa43 100644 --- a/internal/service/ce/service_package_gen.go +++ b/internal/service/ce/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/costexplorer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -125,7 +124,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *costexplorer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/chatbot/service_package_gen.go b/internal/service/chatbot/service_package_gen.go index 6536d8dbe935..c8af6c429559 100644 --- a/internal/service/chatbot/service_package_gen.go +++ b/internal/service/chatbot/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/chatbot" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *chatbot.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/chime/service_package_gen.go b/internal/service/chime/service_package_gen.go index 2af6e774fdaf..f0182817f976 100644 --- a/internal/service/chime/service_package_gen.go +++ b/internal/service/chime/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/chime" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -103,7 +102,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *chime.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/chimesdkmediapipelines/service_package_gen.go b/internal/service/chimesdkmediapipelines/service_package_gen.go index 1d960f828475..f3c8c8ca060e 100644 --- a/internal/service/chimesdkmediapipelines/service_package_gen.go +++ b/internal/service/chimesdkmediapipelines/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/chimesdkmediapipelines" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -74,7 +73,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *chimesdkmediapipelines.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/chimesdkvoice/service_package_gen.go b/internal/service/chimesdkvoice/service_package_gen.go index a5361f60ce10..3d3414e00435 100644 --- a/internal/service/chimesdkvoice/service_package_gen.go +++ b/internal/service/chimesdkvoice/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/chimesdkvoice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -88,7 +87,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *chimesdkvoice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cleanrooms/service_package_gen.go b/internal/service/cleanrooms/service_package_gen.go index 6acf26d69c4b..6aac145772ab 100644 --- a/internal/service/cleanrooms/service_package_gen.go +++ b/internal/service/cleanrooms/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cleanrooms" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -86,7 +85,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cleanrooms.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloud9/service_package_gen.go b/internal/service/cloud9/service_package_gen.go index 697856d52b1c..be69ad45d5ef 100644 --- a/internal/service/cloud9/service_package_gen.go +++ b/internal/service/cloud9/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloud9" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloud9.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudcontrol/service_package_gen.go b/internal/service/cloudcontrol/service_package_gen.go index 520614e30ff8..714ae7d75fb5 100644 --- a/internal/service/cloudcontrol/service_package_gen.go +++ b/internal/service/cloudcontrol/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudcontrol" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -71,7 +70,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudcontrol.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudformation/service_package.go b/internal/service/cloudformation/service_package.go index aeecbc29b8a8..42f7881893b8 100644 --- a/internal/service/cloudformation/service_package.go +++ b/internal/service/cloudformation/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/cloudformation/service_package_gen.go b/internal/service/cloudformation/service_package_gen.go index 3cb0df76d46f..dbcbc6eeecce 100644 --- a/internal/service/cloudformation/service_package_gen.go +++ b/internal/service/cloudformation/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudformation" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -110,7 +109,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudformation.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudfront/service_package_gen.go b/internal/service/cloudfront/service_package_gen.go index d494a144b2dc..cc54f5f4075f 100644 --- a/internal/service/cloudfront/service_package_gen.go +++ b/internal/service/cloudfront/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudfront" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -237,7 +236,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudfront.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go index 9ed19764d50f..44cfd16e2344 100644 --- a/internal/service/cloudfrontkeyvaluestore/service_package_gen.go +++ b/internal/service/cloudfrontkeyvaluestore/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudfrontkeyvaluestore" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -79,7 +78,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudfrontkeyvaluestore.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudhsmv2/service_package.go b/internal/service/cloudhsmv2/service_package.go index 1e7cb743bb0e..ae7217f75244 100644 --- a/internal/service/cloudhsmv2/service_package.go +++ b/internal/service/cloudhsmv2/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/cloudhsmv2/service_package_gen.go b/internal/service/cloudhsmv2/service_package_gen.go index 97f1dc31146a..1d57a7bc349b 100644 --- a/internal/service/cloudhsmv2/service_package_gen.go +++ b/internal/service/cloudhsmv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudhsmv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -80,7 +79,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudhsmv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudsearch/service_package_gen.go b/internal/service/cloudsearch/service_package_gen.go index dab12f518331..22633386a09b 100644 --- a/internal/service/cloudsearch/service_package_gen.go +++ b/internal/service/cloudsearch/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudsearch" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -70,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudsearch.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudtrail/service_package_gen.go b/internal/service/cloudtrail/service_package_gen.go index b9d00af8074c..cad5e5620720 100644 --- a/internal/service/cloudtrail/service_package_gen.go +++ b/internal/service/cloudtrail/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudtrail" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -107,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudtrail.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cloudwatch/service_package_gen.go b/internal/service/cloudwatch/service_package_gen.go index cefa8952429b..0eb9f9603c6d 100644 --- a/internal/service/cloudwatch/service_package_gen.go +++ b/internal/service/cloudwatch/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudwatch" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -121,7 +120,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudwatch.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codeartifact/service_package_gen.go b/internal/service/codeartifact/service_package_gen.go index b36ff7fd8ed2..04ac023a3f56 100644 --- a/internal/service/codeartifact/service_package_gen.go +++ b/internal/service/codeartifact/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codeartifact" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -129,7 +128,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codeartifact.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codebuild/service_package_gen.go b/internal/service/codebuild/service_package_gen.go index 1af30e8a1c3f..50c655fe1ac1 100644 --- a/internal/service/codebuild/service_package_gen.go +++ b/internal/service/codebuild/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codebuild" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -141,7 +140,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codebuild.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codecatalyst/service_package_gen.go b/internal/service/codecatalyst/service_package_gen.go index 1d03a9b80713..037d32acb759 100644 --- a/internal/service/codecatalyst/service_package_gen.go +++ b/internal/service/codecatalyst/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codecatalyst" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codecatalyst.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codecommit/service_package_gen.go b/internal/service/codecommit/service_package_gen.go index 43f70ffbecae..7eaaebf91d64 100644 --- a/internal/service/codecommit/service_package_gen.go +++ b/internal/service/codecommit/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codecommit" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -98,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codecommit.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codeconnections/service_package_gen.go b/internal/service/codeconnections/service_package_gen.go index cf033d550bd0..d6acf0a75a12 100644 --- a/internal/service/codeconnections/service_package_gen.go +++ b/internal/service/codeconnections/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codeconnections" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -84,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codeconnections.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codeguruprofiler/service_package_gen.go b/internal/service/codeguruprofiler/service_package_gen.go index 32ee4bccad1e..b06f6536d9b4 100644 --- a/internal/service/codeguruprofiler/service_package_gen.go +++ b/internal/service/codeguruprofiler/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codeguruprofiler" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -74,7 +73,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codeguruprofiler.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codegurureviewer/service_package_gen.go b/internal/service/codegurureviewer/service_package_gen.go index 3e257c082378..abf8e3e6c1e0 100644 --- a/internal/service/codegurureviewer/service_package_gen.go +++ b/internal/service/codegurureviewer/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codegurureviewer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -74,7 +73,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codegurureviewer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codepipeline/service_package_gen.go b/internal/service/codepipeline/service_package_gen.go index e8336ec89a99..33887a074b44 100644 --- a/internal/service/codepipeline/service_package_gen.go +++ b/internal/service/codepipeline/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codepipeline" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codepipeline.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codestarconnections/service_package_gen.go b/internal/service/codestarconnections/service_package_gen.go index 675968794411..8a762a6ea66b 100644 --- a/internal/service/codestarconnections/service_package_gen.go +++ b/internal/service/codestarconnections/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codestarconnections" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -94,7 +93,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codestarconnections.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/codestarnotifications/service_package_gen.go b/internal/service/codestarnotifications/service_package_gen.go index 9bec72af4aa2..0ee290e7890d 100644 --- a/internal/service/codestarnotifications/service_package_gen.go +++ b/internal/service/codestarnotifications/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codestarnotifications" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -74,7 +73,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codestarnotifications.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cognitoidentity/service_package_gen.go b/internal/service/cognitoidentity/service_package_gen.go index cad2d3a46132..8f92a7bfce63 100644 --- a/internal/service/cognitoidentity/service_package_gen.go +++ b/internal/service/cognitoidentity/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cognitoidentity" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -100,7 +99,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cognitoidentity.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/cognitoidp/service_package_gen.go b/internal/service/cognitoidp/service_package_gen.go index 46a883eb59da..92a923558004 100644 --- a/internal/service/cognitoidp/service_package_gen.go +++ b/internal/service/cognitoidp/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cognitoidentityprovider" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -182,7 +181,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cognitoidentityprovider.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/comprehend/service_package_gen.go b/internal/service/comprehend/service_package_gen.go index 7ebebd001eb2..192b9246e9c0 100644 --- a/internal/service/comprehend/service_package_gen.go +++ b/internal/service/comprehend/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/comprehend" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -90,7 +89,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *comprehend.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/computeoptimizer/service_package_gen.go b/internal/service/computeoptimizer/service_package_gen.go index cd9186e5f913..c94fe7f4caa7 100644 --- a/internal/service/computeoptimizer/service_package_gen.go +++ b/internal/service/computeoptimizer/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/computeoptimizer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -70,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *computeoptimizer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/configservice/service_package_gen.go b/internal/service/configservice/service_package_gen.go index e415f1e20412..b477dc2c1f0c 100644 --- a/internal/service/configservice/service_package_gen.go +++ b/internal/service/configservice/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/configservice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -146,7 +145,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *configservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/connect/service_package_gen.go b/internal/service/connect/service_package_gen.go index e4319af190cf..a9fa5b82b72d 100644 --- a/internal/service/connect/service_package_gen.go +++ b/internal/service/connect/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/connect" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -305,7 +304,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *connect.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/connectcases/service_package_gen.go b/internal/service/connectcases/service_package_gen.go index d9030fd810ca..8aa79a1aa42d 100644 --- a/internal/service/connectcases/service_package_gen.go +++ b/internal/service/connectcases/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/connectcases" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *connectcases.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index dd769e188d94..0234dbe4bf0b 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/controltower" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -80,7 +79,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *controltower.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/costoptimizationhub/service_package_gen.go b/internal/service/costoptimizationhub/service_package_gen.go index c44aa052a8c9..3e728b1e2f78 100644 --- a/internal/service/costoptimizationhub/service_package_gen.go +++ b/internal/service/costoptimizationhub/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/costoptimizationhub" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -71,7 +70,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *costoptimizationhub.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *costoptimizationhub.Options) { diff --git a/internal/service/cur/service_package_gen.go b/internal/service/cur/service_package_gen.go index 148427a2f2e1..a6009fe2cbf5 100644 --- a/internal/service/cur/service_package_gen.go +++ b/internal/service/cur/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/costandusagereportservice" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -78,7 +77,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *costandusagereportservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *costandusagereportservice.Options) { diff --git a/internal/service/customerprofiles/service_package_gen.go b/internal/service/customerprofiles/service_package_gen.go index a70afa29fb76..b1921ad18382 100644 --- a/internal/service/customerprofiles/service_package_gen.go +++ b/internal/service/customerprofiles/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/customerprofiles" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *customerprofiles.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/databrew/service_package_gen.go b/internal/service/databrew/service_package_gen.go index 5cfee58365b1..f9431b25619f 100644 --- a/internal/service/databrew/service_package_gen.go +++ b/internal/service/databrew/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/databrew" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *databrew.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dataexchange/service_package_gen.go b/internal/service/dataexchange/service_package_gen.go index 53c4c0692464..58393499d8e1 100644 --- a/internal/service/dataexchange/service_package_gen.go +++ b/internal/service/dataexchange/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/dataexchange" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *dataexchange.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/datapipeline/service_package_gen.go b/internal/service/datapipeline/service_package_gen.go index 856e3f9b32e3..5df6d107882a 100644 --- a/internal/service/datapipeline/service_package_gen.go +++ b/internal/service/datapipeline/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/datapipeline" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -88,7 +87,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *datapipeline.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/datasync/service_package_gen.go b/internal/service/datasync/service_package_gen.go index 6575fe62d329..906128001ddb 100644 --- a/internal/service/datasync/service_package_gen.go +++ b/internal/service/datasync/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/datasync" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -238,7 +237,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *datasync.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/datazone/service_package_gen.go b/internal/service/datazone/service_package_gen.go index 6f7a34be8c35..2212fea8fa48 100644 --- a/internal/service/datazone/service_package_gen.go +++ b/internal/service/datazone/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/datazone" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -134,7 +133,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *datazone.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dax/service_package_gen.go b/internal/service/dax/service_package_gen.go index 0e15f2d1017f..7dc9720335c7 100644 --- a/internal/service/dax/service_package_gen.go +++ b/internal/service/dax/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/dax" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -79,7 +78,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *dax.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/deploy/service_package_gen.go b/internal/service/deploy/service_package_gen.go index 58b4a8d29dd8..19b22e837dca 100644 --- a/internal/service/deploy/service_package_gen.go +++ b/internal/service/deploy/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/codedeploy" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -82,7 +81,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *codedeploy.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/detective/service_package_gen.go b/internal/service/detective/service_package_gen.go index b3b2478ae622..776dd6d42931 100644 --- a/internal/service/detective/service_package_gen.go +++ b/internal/service/detective/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/detective" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -91,7 +90,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *detective.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/devicefarm/service_package_gen.go b/internal/service/devicefarm/service_package_gen.go index ba4f34275916..1766b99a4db0 100644 --- a/internal/service/devicefarm/service_package_gen.go +++ b/internal/service/devicefarm/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/devicefarm" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -151,7 +150,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *devicefarm.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/devopsguru/service_package_gen.go b/internal/service/devopsguru/service_package_gen.go index ebf78063807f..d4deb0a82ad4 100644 --- a/internal/service/devopsguru/service_package_gen.go +++ b/internal/service/devopsguru/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/devopsguru" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -103,7 +102,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *devopsguru.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/directconnect/service_package_gen.go b/internal/service/directconnect/service_package_gen.go index de9b0705bb61..b27ba0cbb56e 100644 --- a/internal/service/directconnect/service_package_gen.go +++ b/internal/service/directconnect/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/directconnect" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -233,7 +232,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *directconnect.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dlm/service_package_gen.go b/internal/service/dlm/service_package_gen.go index 48bf0685127e..497359645a16 100644 --- a/internal/service/dlm/service_package_gen.go +++ b/internal/service/dlm/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/dlm" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *dlm.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dms/service_package_gen.go b/internal/service/dms/service_package_gen.go index 5c10780af222..dbb8ca640336 100644 --- a/internal/service/dms/service_package_gen.go +++ b/internal/service/dms/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/databasemigrationservice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -183,7 +182,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *databasemigrationservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/docdb/service_package_gen.go b/internal/service/docdb/service_package_gen.go index 01926c87a130..971521a242d4 100644 --- a/internal/service/docdb/service_package_gen.go +++ b/internal/service/docdb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/docdb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -128,7 +127,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *docdb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/docdbelastic/service_package_gen.go b/internal/service/docdbelastic/service_package_gen.go index 036a0c617200..57235189bc89 100644 --- a/internal/service/docdbelastic/service_package_gen.go +++ b/internal/service/docdbelastic/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/docdbelastic" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -71,7 +70,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *docdbelastic.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/drs/service_package_gen.go b/internal/service/drs/service_package_gen.go index 67a2d58e5e1b..ca7cc93d8df6 100644 --- a/internal/service/drs/service_package_gen.go +++ b/internal/service/drs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/drs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *drs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ds/service_package_gen.go b/internal/service/ds/service_package_gen.go index 13d95a896fad..437c3c5c14c5 100644 --- a/internal/service/ds/service_package_gen.go +++ b/internal/service/ds/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/directoryservice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -118,7 +117,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *directoryservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dsql/service_package_gen.go b/internal/service/dsql/service_package_gen.go index 518f91f1b115..5f13ad9b2023 100644 --- a/internal/service/dsql/service_package_gen.go +++ b/internal/service/dsql/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/dsql" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *dsql.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/dynamodb/service_package.go b/internal/service/dynamodb/service_package.go index 6be271c25855..4d1485fb1e9f 100644 --- a/internal/service/dynamodb/service_package.go +++ b/internal/service/dynamodb/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/dynamodb/service_package_gen.go b/internal/service/dynamodb/service_package_gen.go index 900ddc966df6..f0fe873f787d 100644 --- a/internal/service/dynamodb/service_package_gen.go +++ b/internal/service/dynamodb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/dynamodb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -153,7 +152,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *dynamodb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ec2/service_package.go b/internal/service/ec2/service_package.go index a88343f07fe3..636f2cb4fe2a 100644 --- a/internal/service/ec2/service_package.go +++ b/internal/service/ec2/service_package.go @@ -52,7 +52,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index 73f3fb5702d4..71fbe4a4b291 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ec2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -1811,7 +1810,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ec2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ecr/service_package_gen.go b/internal/service/ecr/service_package_gen.go index bc3955871bf5..51a11009b9c7 100644 --- a/internal/service/ecr/service_package_gen.go +++ b/internal/service/ecr/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ecr" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -181,7 +180,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ecr.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ecrpublic/service_package_gen.go b/internal/service/ecrpublic/service_package_gen.go index 4e7f13324e5e..32f6e94d39f7 100644 --- a/internal/service/ecrpublic/service_package_gen.go +++ b/internal/service/ecrpublic/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ecrpublic" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -80,7 +79,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ecrpublic.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ecs/service_package_gen.go b/internal/service/ecs/service_package_gen.go index 0e5e6c6adc0b..9de057aa28a7 100644 --- a/internal/service/ecs/service_package_gen.go +++ b/internal/service/ecs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ecs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -168,7 +167,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ecs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/efs/service_package_gen.go b/internal/service/efs/service_package_gen.go index 184e40a90307..7aedda912d75 100644 --- a/internal/service/efs/service_package_gen.go +++ b/internal/service/efs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/efs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -127,7 +126,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *efs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/eks/service_package_gen.go b/internal/service/eks/service_package_gen.go index c459528558aa..be71f63e85ba 100644 --- a/internal/service/eks/service_package_gen.go +++ b/internal/service/eks/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/eks" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -196,7 +195,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *eks.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elasticache/service_package_gen.go b/internal/service/elasticache/service_package_gen.go index 7dcd5509367f..ad3affdb2a1c 100644 --- a/internal/service/elasticache/service_package_gen.go +++ b/internal/service/elasticache/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elasticache" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -181,7 +180,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elasticache.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elasticbeanstalk/service_package_gen.go b/internal/service/elasticbeanstalk/service_package_gen.go index e70854e8bbf3..cdf4a14adf24 100644 --- a/internal/service/elasticbeanstalk/service_package_gen.go +++ b/internal/service/elasticbeanstalk/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elasticbeanstalk" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -113,7 +112,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elasticbeanstalk.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elasticsearch/service_package_gen.go b/internal/service/elasticsearch/service_package_gen.go index 96de89afe318..00343041e74a 100644 --- a/internal/service/elasticsearch/service_package_gen.go +++ b/internal/service/elasticsearch/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elasticsearchservice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elasticsearchservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elastictranscoder/service_package_gen.go b/internal/service/elastictranscoder/service_package_gen.go index d1e0fc1c74b9..5b98d904c6a3 100644 --- a/internal/service/elastictranscoder/service_package_gen.go +++ b/internal/service/elastictranscoder/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elastictranscoder" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -70,7 +69,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elastictranscoder.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elb/service_package_gen.go b/internal/service/elb/service_package_gen.go index 278bb75d66bb..ea5231049024 100644 --- a/internal/service/elb/service_package_gen.go +++ b/internal/service/elb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elasticloadbalancing" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -140,7 +139,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elasticloadbalancing.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/elbv2/service_package_gen.go b/internal/service/elbv2/service_package_gen.go index 1e092c02a371..7bcc7b8f4cab 100644 --- a/internal/service/elbv2/service_package_gen.go +++ b/internal/service/elbv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/elasticloadbalancingv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -311,7 +310,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *elasticloadbalancingv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/emr/service_package_gen.go b/internal/service/emr/service_package_gen.go index 1e2482e25ee8..f27220c57c4b 100644 --- a/internal/service/emr/service_package_gen.go +++ b/internal/service/emr/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/emr" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -126,7 +125,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *emr.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/emrcontainers/service_package_gen.go b/internal/service/emrcontainers/service_package_gen.go index 3ca95f700770..9099419a40b3 100644 --- a/internal/service/emrcontainers/service_package_gen.go +++ b/internal/service/emrcontainers/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/emrcontainers" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -84,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *emrcontainers.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/emrserverless/service_package_gen.go b/internal/service/emrserverless/service_package_gen.go index 277035feff33..d8da7f91094c 100644 --- a/internal/service/emrserverless/service_package_gen.go +++ b/internal/service/emrserverless/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/emrserverless" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *emrserverless.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/events/service_package_gen.go b/internal/service/events/service_package_gen.go index 2fb4903f9674..926a7e2ffea2 100644 --- a/internal/service/events/service_package_gen.go +++ b/internal/service/events/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/eventbridge" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -157,7 +156,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *eventbridge.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/evidently/service_package_gen.go b/internal/service/evidently/service_package_gen.go index c0bbc8e2291b..efdbc4bd3a09 100644 --- a/internal/service/evidently/service_package_gen.go +++ b/internal/service/evidently/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/evidently" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -94,7 +93,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *evidently.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/evs/service_package_gen.go b/internal/service/evs/service_package_gen.go index e55702097fc3..61c777a16355 100644 --- a/internal/service/evs/service_package_gen.go +++ b/internal/service/evs/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/evs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *evs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/finspace/service_package_gen.go b/internal/service/finspace/service_package_gen.go index a88d15fbea9f..7c4dc08ba161 100644 --- a/internal/service/finspace/service_package_gen.go +++ b/internal/service/finspace/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/finspace" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -121,7 +120,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *finspace.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/firehose/service_package_gen.go b/internal/service/firehose/service_package_gen.go index 964f32673abc..d5b958c56e48 100644 --- a/internal/service/firehose/service_package_gen.go +++ b/internal/service/firehose/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/firehose" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -74,7 +73,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *firehose.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/fis/service_package_gen.go b/internal/service/fis/service_package_gen.go index 3d456785620a..248151156c33 100644 --- a/internal/service/fis/service_package_gen.go +++ b/internal/service/fis/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/fis" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -72,7 +71,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *fis.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/fms/service_package.go b/internal/service/fms/service_package.go index bfbfa5253a42..d0402b920398 100644 --- a/internal/service/fms/service_package.go +++ b/internal/service/fms/service_package.go @@ -37,7 +37,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/fms/service_package_gen.go b/internal/service/fms/service_package_gen.go index e3b4f630abfe..6b1ce12aa184 100644 --- a/internal/service/fms/service_package_gen.go +++ b/internal/service/fms/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/fms" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *fms.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/fsx/service_package_gen.go b/internal/service/fsx/service_package_gen.go index 5823f05125e9..3122b566b7d1 100644 --- a/internal/service/fsx/service_package_gen.go +++ b/internal/service/fsx/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/fsx" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -196,7 +195,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *fsx.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/gamelift/service_package_gen.go b/internal/service/gamelift/service_package_gen.go index 862afc4cb95b..018be933b24d 100644 --- a/internal/service/gamelift/service_package_gen.go +++ b/internal/service/gamelift/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/gamelift" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -112,7 +111,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *gamelift.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/glacier/service_package_gen.go b/internal/service/glacier/service_package_gen.go index 968c2e567b30..9914e2e1e3b3 100644 --- a/internal/service/glacier/service_package_gen.go +++ b/internal/service/glacier/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/glacier" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *glacier.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/globalaccelerator/service_package_gen.go b/internal/service/globalaccelerator/service_package_gen.go index 2406248b9b76..edf3cf4dcee1 100644 --- a/internal/service/globalaccelerator/service_package_gen.go +++ b/internal/service/globalaccelerator/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/globalaccelerator" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -165,7 +164,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *globalaccelerator.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *globalaccelerator.Options) { diff --git a/internal/service/glue/service_package_gen.go b/internal/service/glue/service_package_gen.go index 62601f0887eb..f6cda2c44b46 100644 --- a/internal/service/glue/service_package_gen.go +++ b/internal/service/glue/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/glue" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -265,7 +264,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *glue.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/grafana/service_package_gen.go b/internal/service/grafana/service_package_gen.go index d482566cb182..8e7d1b39b4a7 100644 --- a/internal/service/grafana/service_package_gen.go +++ b/internal/service/grafana/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/grafana" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -112,7 +111,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *grafana.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/greengrass/service_package_gen.go b/internal/service/greengrass/service_package_gen.go index cd3ba85a7c56..23617bb8de28 100644 --- a/internal/service/greengrass/service_package_gen.go +++ b/internal/service/greengrass/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/greengrass" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *greengrass.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/groundstation/service_package_gen.go b/internal/service/groundstation/service_package_gen.go index 42270d05bced..e713f1b8ee8d 100644 --- a/internal/service/groundstation/service_package_gen.go +++ b/internal/service/groundstation/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/groundstation" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *groundstation.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/guardduty/service_package_gen.go b/internal/service/guardduty/service_package_gen.go index cd9fe3671a81..ca4d9ff3c7c4 100644 --- a/internal/service/guardduty/service_package_gen.go +++ b/internal/service/guardduty/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/guardduty" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -167,7 +166,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *guardduty.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/healthlake/service_package_gen.go b/internal/service/healthlake/service_package_gen.go index 1557b1590c75..4d36bbb7ac30 100644 --- a/internal/service/healthlake/service_package_gen.go +++ b/internal/service/healthlake/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/healthlake" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *healthlake.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/iam/service_package_gen.go b/internal/service/iam/service_package_gen.go index a67a46bc79a1..1619058c64fd 100644 --- a/internal/service/iam/service_package_gen.go +++ b/internal/service/iam/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/iam" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -453,7 +452,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *iam.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/identitystore/service_package_gen.go b/internal/service/identitystore/service_package_gen.go index 42075abfc204..49609eac8d81 100644 --- a/internal/service/identitystore/service_package_gen.go +++ b/internal/service/identitystore/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/identitystore" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -108,7 +107,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *identitystore.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/imagebuilder/service_package_gen.go b/internal/service/imagebuilder/service_package_gen.go index 894524f20e2c..2f30629ac89c 100644 --- a/internal/service/imagebuilder/service_package_gen.go +++ b/internal/service/imagebuilder/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/imagebuilder" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -272,7 +271,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *imagebuilder.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/inspector/service_package_gen.go b/internal/service/inspector/service_package_gen.go index 0fd0d0a45b2a..7edee03e7f3b 100644 --- a/internal/service/inspector/service_package_gen.go +++ b/internal/service/inspector/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/inspector" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -104,7 +103,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *inspector.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/inspector2/service_package_gen.go b/internal/service/inspector2/service_package_gen.go index 3251b899686a..cbe28817d923 100644 --- a/internal/service/inspector2/service_package_gen.go +++ b/internal/service/inspector2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/inspector2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *inspector2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/internetmonitor/service_package_gen.go b/internal/service/internetmonitor/service_package_gen.go index 1261787ec223..2a7091f94f36 100644 --- a/internal/service/internetmonitor/service_package_gen.go +++ b/internal/service/internetmonitor/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/internetmonitor" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *internetmonitor.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/invoicing/service_package_gen.go b/internal/service/invoicing/service_package_gen.go index e15a533c083d..85976d6d6f67 100644 --- a/internal/service/invoicing/service_package_gen.go +++ b/internal/service/invoicing/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/invoicing" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *invoicing.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/iot/service_package_gen.go b/internal/service/iot/service_package_gen.go index 7ed75bd408db..f2c8a31b0b7d 100644 --- a/internal/service/iot/service_package_gen.go +++ b/internal/service/iot/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/iot" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -231,7 +230,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *iot.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ivs/service_package_gen.go b/internal/service/ivs/service_package_gen.go index aa0c9fade5fb..6fa2d73597ac 100644 --- a/internal/service/ivs/service_package_gen.go +++ b/internal/service/ivs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ivs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -110,7 +109,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ivs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ivschat/service_package_gen.go b/internal/service/ivschat/service_package_gen.go index 02274ce5eadc..1581dde10c5d 100644 --- a/internal/service/ivschat/service_package_gen.go +++ b/internal/service/ivschat/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ivschat" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -88,7 +87,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ivschat.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kafka/service_package.go b/internal/service/kafka/service_package.go index f10c1fc6c7cd..13d2e9eb7b0b 100644 --- a/internal/service/kafka/service_package.go +++ b/internal/service/kafka/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/kafka/service_package_gen.go b/internal/service/kafka/service_package_gen.go index 24c4540a73fe..7ae4151e0b82 100644 --- a/internal/service/kafka/service_package_gen.go +++ b/internal/service/kafka/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kafka" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -157,7 +156,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kafka.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kafkaconnect/service_package_gen.go b/internal/service/kafkaconnect/service_package_gen.go index b0c043ca0a3c..7695326aec8e 100644 --- a/internal/service/kafkaconnect/service_package_gen.go +++ b/internal/service/kafkaconnect/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kafkaconnect" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -113,7 +112,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kafkaconnect.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kendra/service_package_gen.go b/internal/service/kendra/service_package_gen.go index 0dcae1db5973..dea8e255d886 100644 --- a/internal/service/kendra/service_package_gen.go +++ b/internal/service/kendra/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kendra" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -140,7 +139,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kendra.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/keyspaces/service_package_gen.go b/internal/service/keyspaces/service_package_gen.go index 343313198992..0106f1f16797 100644 --- a/internal/service/keyspaces/service_package_gen.go +++ b/internal/service/keyspaces/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/keyspaces" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -76,7 +75,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *keyspaces.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kinesis/service_package.go b/internal/service/kinesis/service_package.go index 1ab9ff107362..d2654399ff68 100644 --- a/internal/service/kinesis/service_package.go +++ b/internal/service/kinesis/service_package.go @@ -33,7 +33,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/kinesis/service_package_gen.go b/internal/service/kinesis/service_package_gen.go index db8ad0439144..c24b924949ff 100644 --- a/internal/service/kinesis/service_package_gen.go +++ b/internal/service/kinesis/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kinesis" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -110,7 +109,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kinesis.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kinesisanalytics/service_package_gen.go b/internal/service/kinesisanalytics/service_package_gen.go index 6ee787aa936d..ef4cee21462a 100644 --- a/internal/service/kinesisanalytics/service_package_gen.go +++ b/internal/service/kinesisanalytics/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kinesisanalytics" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kinesisanalytics.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kinesisanalyticsv2/service_package_gen.go b/internal/service/kinesisanalyticsv2/service_package_gen.go index a7c11e15f241..ce8f7de6d74b 100644 --- a/internal/service/kinesisanalyticsv2/service_package_gen.go +++ b/internal/service/kinesisanalyticsv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kinesisanalyticsv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kinesisanalyticsv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kinesisvideo/service_package_gen.go b/internal/service/kinesisvideo/service_package_gen.go index 9551d3c24480..14d158e79905 100644 --- a/internal/service/kinesisvideo/service_package_gen.go +++ b/internal/service/kinesisvideo/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kinesisvideo" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kinesisvideo.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/kms/service_package_gen.go b/internal/service/kms/service_package_gen.go index ae83fa0c9fb2..67e226e07ad8 100644 --- a/internal/service/kms/service_package_gen.go +++ b/internal/service/kms/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/kms" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -186,7 +185,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *kms.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lakeformation/service_package_gen.go b/internal/service/lakeformation/service_package_gen.go index ab72250387b0..0f4c58dcd1ca 100644 --- a/internal/service/lakeformation/service_package_gen.go +++ b/internal/service/lakeformation/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/lakeformation" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -126,7 +125,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lakeformation.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go index 2b58c7182ad7..cc19d311790d 100644 --- a/internal/service/lambda/service_package_gen.go +++ b/internal/service/lambda/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/lambda" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -214,7 +213,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lambda.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/launchwizard/service_package_gen.go b/internal/service/launchwizard/service_package_gen.go index 72d505af8a1a..f5c547326042 100644 --- a/internal/service/launchwizard/service_package_gen.go +++ b/internal/service/launchwizard/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/launchwizard" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *launchwizard.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lexmodels/service_package_gen.go b/internal/service/lexmodels/service_package_gen.go index c3598ea1beab..08c775426b32 100644 --- a/internal/service/lexmodels/service_package_gen.go +++ b/internal/service/lexmodels/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/lexmodelbuildingservice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -107,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lexmodelbuildingservice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lexv2models/service_package_gen.go b/internal/service/lexv2models/service_package_gen.go index 6ca0e933e7fc..5a49edd4964d 100644 --- a/internal/service/lexv2models/service_package_gen.go +++ b/internal/service/lexv2models/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/lexmodelsv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -97,7 +96,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lexmodelsv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/licensemanager/service_package_gen.go b/internal/service/licensemanager/service_package_gen.go index 4c6ccaeb93d6..b5c3f5f30428 100644 --- a/internal/service/licensemanager/service_package_gen.go +++ b/internal/service/licensemanager/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/licensemanager" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -104,7 +103,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *licensemanager.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lightsail/service_package.go b/internal/service/lightsail/service_package.go index d385339cfe27..34190cd1442b 100644 --- a/internal/service/lightsail/service_package.go +++ b/internal/service/lightsail/service_package.go @@ -34,7 +34,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/lightsail/service_package_gen.go b/internal/service/lightsail/service_package_gen.go index eef313b9f53e..0c02b487d9b6 100644 --- a/internal/service/lightsail/service_package_gen.go +++ b/internal/service/lightsail/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/lightsail" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -232,7 +231,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lightsail.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/location/service_package_gen.go b/internal/service/location/service_package_gen.go index 3a37ad20da4e..f59637d1135e 100644 --- a/internal/service/location/service_package_gen.go +++ b/internal/service/location/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/location" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -152,7 +151,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *location.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/logs/service_package_gen.go b/internal/service/logs/service_package_gen.go index c5e32bb19f90..d2150587f372 100644 --- a/internal/service/logs/service_package_gen.go +++ b/internal/service/logs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/cloudwatchlogs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -199,7 +198,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *cloudwatchlogs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/lookoutmetrics/service_package_gen.go b/internal/service/lookoutmetrics/service_package_gen.go index 7f869e98fb75..3c58493174fe 100644 --- a/internal/service/lookoutmetrics/service_package_gen.go +++ b/internal/service/lookoutmetrics/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/lookoutmetrics" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *lookoutmetrics.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/m2/service_package_gen.go b/internal/service/m2/service_package_gen.go index 25ac2cf66c53..95423fc49217 100644 --- a/internal/service/m2/service_package_gen.go +++ b/internal/service/m2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/m2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -82,7 +81,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *m2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/macie2/service_package_gen.go b/internal/service/macie2/service_package_gen.go index 0cfafb475a03..2a0ea7a02fc4 100644 --- a/internal/service/macie2/service_package_gen.go +++ b/internal/service/macie2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/macie2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -131,7 +130,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *macie2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediaconnect/service_package_gen.go b/internal/service/mediaconnect/service_package_gen.go index 0f4c1083ab22..c080add8c339 100644 --- a/internal/service/mediaconnect/service_package_gen.go +++ b/internal/service/mediaconnect/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/mediaconnect" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediaconnect.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediaconvert/service_package_gen.go b/internal/service/mediaconvert/service_package_gen.go index dbcc8e574378..af225523730a 100644 --- a/internal/service/mediaconvert/service_package_gen.go +++ b/internal/service/mediaconvert/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mediaconvert" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -77,7 +76,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediaconvert.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/medialive/service_package_gen.go b/internal/service/medialive/service_package_gen.go index 57baca08d0fa..3f655da43a26 100644 --- a/internal/service/medialive/service_package_gen.go +++ b/internal/service/medialive/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/medialive" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -109,7 +108,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *medialive.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediapackage/service_package_gen.go b/internal/service/mediapackage/service_package_gen.go index 9100210de196..a4c49b1f91a9 100644 --- a/internal/service/mediapackage/service_package_gen.go +++ b/internal/service/mediapackage/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mediapackage" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediapackage.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediapackagev2/service_package_gen.go b/internal/service/mediapackagev2/service_package_gen.go index 86d3b438d64d..da0f4fe55f33 100644 --- a/internal/service/mediapackagev2/service_package_gen.go +++ b/internal/service/mediapackagev2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mediapackagev2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediapackagev2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediapackagevod/service_package_gen.go b/internal/service/mediapackagevod/service_package_gen.go index 2ee6641f772f..642f8ddba2a6 100644 --- a/internal/service/mediapackagevod/service_package_gen.go +++ b/internal/service/mediapackagevod/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/mediapackagevod" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediapackagevod.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mediastore/service_package_gen.go b/internal/service/mediastore/service_package_gen.go index 82782bc16ad7..45ce3731bca5 100644 --- a/internal/service/mediastore/service_package_gen.go +++ b/internal/service/mediastore/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mediastore" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mediastore.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/memorydb/service_package_gen.go b/internal/service/memorydb/service_package_gen.go index 2bd8f09089e1..faae9ee3c629 100644 --- a/internal/service/memorydb/service_package_gen.go +++ b/internal/service/memorydb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/memorydb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -177,7 +176,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *memorydb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mgn/service_package_gen.go b/internal/service/mgn/service_package_gen.go index 175ece1c5643..61ad8d76c7c7 100644 --- a/internal/service/mgn/service_package_gen.go +++ b/internal/service/mgn/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/mgn" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mgn.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mq/service_package_gen.go b/internal/service/mq/service_package_gen.go index 435ce53bb5ec..fac79ee09048 100644 --- a/internal/service/mq/service_package_gen.go +++ b/internal/service/mq/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mq" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -95,7 +94,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mq.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/mwaa/service_package_gen.go b/internal/service/mwaa/service_package_gen.go index c1863606db66..7cf21e295f93 100644 --- a/internal/service/mwaa/service_package_gen.go +++ b/internal/service/mwaa/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/mwaa" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *mwaa.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/neptune/service_package_gen.go b/internal/service/neptune/service_package_gen.go index 8463e03b5e94..b17e391ae26e 100644 --- a/internal/service/neptune/service_package_gen.go +++ b/internal/service/neptune/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/neptune" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -146,7 +145,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *neptune.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/neptunegraph/service_package_gen.go b/internal/service/neptunegraph/service_package_gen.go index 58734cc85744..fb4fadfae784 100644 --- a/internal/service/neptunegraph/service_package_gen.go +++ b/internal/service/neptunegraph/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/neptunegraph" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *neptunegraph.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/networkfirewall/service_package_gen.go b/internal/service/networkfirewall/service_package_gen.go index f84328be9ece..eb149e560598 100644 --- a/internal/service/networkfirewall/service_package_gen.go +++ b/internal/service/networkfirewall/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/networkfirewall" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -147,7 +146,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *networkfirewall.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/networkmanager/service_package_gen.go b/internal/service/networkmanager/service_package_gen.go index ced9aa8cd8fa..fe4b124a8faf 100644 --- a/internal/service/networkmanager/service_package_gen.go +++ b/internal/service/networkmanager/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/networkmanager" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -279,7 +278,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *networkmanager.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/networkmonitor/service_package_gen.go b/internal/service/networkmonitor/service_package_gen.go index 9ae5254e9af6..504a3fe50ccb 100644 --- a/internal/service/networkmonitor/service_package_gen.go +++ b/internal/service/networkmonitor/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/networkmonitor" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -76,7 +75,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *networkmonitor.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/notifications/service_package_gen.go b/internal/service/notifications/service_package_gen.go index e2feabef781a..019f39a8c774 100644 --- a/internal/service/notifications/service_package_gen.go +++ b/internal/service/notifications/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/notifications" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -86,7 +85,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *notifications.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *notifications.Options) { diff --git a/internal/service/notificationscontacts/service_package_gen.go b/internal/service/notificationscontacts/service_package_gen.go index 2609ad11b7d9..7fd9a7cd7c35 100644 --- a/internal/service/notificationscontacts/service_package_gen.go +++ b/internal/service/notificationscontacts/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/notificationscontacts" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -68,7 +67,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *notificationscontacts.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *notificationscontacts.Options) { diff --git a/internal/service/oam/service_package_gen.go b/internal/service/oam/service_package_gen.go index cd2150f5371f..b6b8838348b0 100644 --- a/internal/service/oam/service_package_gen.go +++ b/internal/service/oam/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/oam" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -107,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *oam.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/odb/service_package_gen.go b/internal/service/odb/service_package_gen.go index a44c1aa78cb0..2e343ea751fd 100644 --- a/internal/service/odb/service_package_gen.go +++ b/internal/service/odb/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/odb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *odb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/opensearch/service_package_gen.go b/internal/service/opensearch/service_package_gen.go index 41067ed206d2..12bdfa72df91 100644 --- a/internal/service/opensearch/service_package_gen.go +++ b/internal/service/opensearch/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/opensearch" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -123,7 +122,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *opensearch.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/opensearchserverless/service_package_gen.go b/internal/service/opensearchserverless/service_package_gen.go index 3384cb1182b3..2a1d44a0b059 100644 --- a/internal/service/opensearchserverless/service_package_gen.go +++ b/internal/service/opensearchserverless/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/opensearchserverless" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -138,7 +137,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *opensearchserverless.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/organizations/service_package.go b/internal/service/organizations/service_package.go index 056a268d13c0..09b0ecdad8fb 100644 --- a/internal/service/organizations/service_package.go +++ b/internal/service/organizations/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/organizations/service_package_gen.go b/internal/service/organizations/service_package_gen.go index ebb09a986d5a..0762d92695b5 100644 --- a/internal/service/organizations/service_package_gen.go +++ b/internal/service/organizations/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/organizations" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -221,7 +220,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *organizations.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/osis/service_package_gen.go b/internal/service/osis/service_package_gen.go index 535d67b594be..2a967030dca7 100644 --- a/internal/service/osis/service_package_gen.go +++ b/internal/service/osis/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/osis" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *osis.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/outposts/service_package_gen.go b/internal/service/outposts/service_package_gen.go index 324286451a96..0ca5c744e9fc 100644 --- a/internal/service/outposts/service_package_gen.go +++ b/internal/service/outposts/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/outposts" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -106,7 +105,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *outposts.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/paymentcryptography/service_package_gen.go b/internal/service/paymentcryptography/service_package_gen.go index b53186f02b1d..12c4544c3543 100644 --- a/internal/service/paymentcryptography/service_package_gen.go +++ b/internal/service/paymentcryptography/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/paymentcryptography" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -77,7 +76,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *paymentcryptography.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pcaconnectorad/service_package_gen.go b/internal/service/pcaconnectorad/service_package_gen.go index f749110f0c45..3870b8cf40ef 100644 --- a/internal/service/pcaconnectorad/service_package_gen.go +++ b/internal/service/pcaconnectorad/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/pcaconnectorad" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pcaconnectorad.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pcs/service_package_gen.go b/internal/service/pcs/service_package_gen.go index 689a6f69cbbd..10e1c470d695 100644 --- a/internal/service/pcs/service_package_gen.go +++ b/internal/service/pcs/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/pcs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pcs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pinpoint/service_package_gen.go b/internal/service/pinpoint/service_package_gen.go index df851117da41..9de12ae65681 100644 --- a/internal/service/pinpoint/service_package_gen.go +++ b/internal/service/pinpoint/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/pinpoint" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -137,7 +136,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pinpoint.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pinpointsmsvoicev2/service_package_gen.go b/internal/service/pinpointsmsvoicev2/service_package_gen.go index d614087e6d7a..3e3ddee2221f 100644 --- a/internal/service/pinpointsmsvoicev2/service_package_gen.go +++ b/internal/service/pinpointsmsvoicev2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/pinpointsmsvoicev2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -85,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pinpointsmsvoicev2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pipes/service_package_gen.go b/internal/service/pipes/service_package_gen.go index 2d3fa8eea9ce..6da87a605344 100644 --- a/internal/service/pipes/service_package_gen.go +++ b/internal/service/pipes/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/pipes" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pipes.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/polly/service_package_gen.go b/internal/service/polly/service_package_gen.go index aaa908a27c18..ffb1faf75c47 100644 --- a/internal/service/polly/service_package_gen.go +++ b/internal/service/polly/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/polly" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *polly.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/pricing/service_package_gen.go b/internal/service/pricing/service_package_gen.go index 52d6a7bc90e3..e4fe2b7f2cb1 100644 --- a/internal/service/pricing/service_package_gen.go +++ b/internal/service/pricing/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/pricing" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *pricing.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/qbusiness/service_package_gen.go b/internal/service/qbusiness/service_package_gen.go index 2580a6dde1f2..e8949f40c0ab 100644 --- a/internal/service/qbusiness/service_package_gen.go +++ b/internal/service/qbusiness/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/qbusiness" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *qbusiness.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/qldb/service_package_gen.go b/internal/service/qldb/service_package_gen.go index 1abfe6797b33..8885bb659a08 100644 --- a/internal/service/qldb/service_package_gen.go +++ b/internal/service/qldb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/qldb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *qldb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/quicksight/service_package_gen.go b/internal/service/quicksight/service_package_gen.go index 0ffe4c882010..fd49181ece5e 100644 --- a/internal/service/quicksight/service_package_gen.go +++ b/internal/service/quicksight/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/quicksight" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -273,7 +272,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *quicksight.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ram/service_package_gen.go b/internal/service/ram/service_package_gen.go index 47ce79fa1702..5e341532fdc4 100644 --- a/internal/service/ram/service_package_gen.go +++ b/internal/service/ram/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ram" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -99,7 +98,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ram.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/rbin/service_package_gen.go b/internal/service/rbin/service_package_gen.go index 2aeb517d7211..925c1842bacf 100644 --- a/internal/service/rbin/service_package_gen.go +++ b/internal/service/rbin/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/rbin" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *rbin.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/rds/service_package_gen.go b/internal/service/rds/service_package_gen.go index 2994ece9e4c8..640d9be88d71 100644 --- a/internal/service/rds/service_package_gen.go +++ b/internal/service/rds/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/rds" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -399,7 +398,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *rds.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/redshift/service_package_gen.go b/internal/service/redshift/service_package_gen.go index 7ed7bf02de08..f5bfe9ca75e6 100644 --- a/internal/service/redshift/service_package_gen.go +++ b/internal/service/redshift/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/redshift" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -270,7 +269,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *redshift.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/redshiftdata/service_package_gen.go b/internal/service/redshiftdata/service_package_gen.go index 2cbae6f2b946..0e4b5d011441 100644 --- a/internal/service/redshiftdata/service_package_gen.go +++ b/internal/service/redshiftdata/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/redshiftdata" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *redshiftdata.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/redshiftserverless/service_package_gen.go b/internal/service/redshiftserverless/service_package_gen.go index ae46189f2eee..95763f9b6742 100644 --- a/internal/service/redshiftserverless/service_package_gen.go +++ b/internal/service/redshiftserverless/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/redshiftserverless" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -126,7 +125,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *redshiftserverless.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/rekognition/service_package_gen.go b/internal/service/rekognition/service_package_gen.go index bc4cb0b8f3f4..4faa1b8e7069 100644 --- a/internal/service/rekognition/service_package_gen.go +++ b/internal/service/rekognition/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/rekognition" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -85,7 +84,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *rekognition.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/resiliencehub/service_package_gen.go b/internal/service/resiliencehub/service_package_gen.go index e6d72e06b9b3..65b67434c644 100644 --- a/internal/service/resiliencehub/service_package_gen.go +++ b/internal/service/resiliencehub/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/resiliencehub" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *resiliencehub.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/resourceexplorer2/service_package_gen.go b/internal/service/resourceexplorer2/service_package_gen.go index 4e76b88ee0d7..b25e1dfb51cc 100644 --- a/internal/service/resourceexplorer2/service_package_gen.go +++ b/internal/service/resourceexplorer2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/resourceexplorer2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -91,7 +90,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *resourceexplorer2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/resourcegroups/service_package_gen.go b/internal/service/resourcegroups/service_package_gen.go index a2ec50208cd3..fd42a4089d02 100644 --- a/internal/service/resourcegroups/service_package_gen.go +++ b/internal/service/resourcegroups/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/resourcegroups" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *resourcegroups.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/resourcegroupstaggingapi/service_package_gen.go b/internal/service/resourcegroupstaggingapi/service_package_gen.go index 8bfd4649ccbf..0d7438dee517 100644 --- a/internal/service/resourcegroupstaggingapi/service_package_gen.go +++ b/internal/service/resourcegroupstaggingapi/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/resourcegroupstaggingapi" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *resourcegroupstaggingapi.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/rolesanywhere/service_package_gen.go b/internal/service/rolesanywhere/service_package_gen.go index 7b8245207261..f3cfec4d78d9 100644 --- a/internal/service/rolesanywhere/service_package_gen.go +++ b/internal/service/rolesanywhere/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/rolesanywhere" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -76,7 +75,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *rolesanywhere.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/route53/service_package_gen.go b/internal/service/route53/service_package_gen.go index eb0280ad6a97..cf8217106ee7 100644 --- a/internal/service/route53/service_package_gen.go +++ b/internal/service/route53/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -196,7 +195,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *route53.Options) { diff --git a/internal/service/route53domains/service_package_gen.go b/internal/service/route53domains/service_package_gen.go index d88d5950b153..47a2638e0d2d 100644 --- a/internal/service/route53domains/service_package_gen.go +++ b/internal/service/route53domains/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53domains" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -84,7 +83,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53domains.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *route53domains.Options) { diff --git a/internal/service/route53profiles/service_package_gen.go b/internal/service/route53profiles/service_package_gen.go index 009d6080431b..bd3fb8515895 100644 --- a/internal/service/route53profiles/service_package_gen.go +++ b/internal/service/route53profiles/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53profiles" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -89,7 +88,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53profiles.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/route53recoverycontrolconfig/service_package_gen.go b/internal/service/route53recoverycontrolconfig/service_package_gen.go index f3e05f391aa0..e45e202f6571 100644 --- a/internal/service/route53recoverycontrolconfig/service_package_gen.go +++ b/internal/service/route53recoverycontrolconfig/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53recoverycontrolconfig" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -83,7 +82,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53recoverycontrolconfig.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *route53recoverycontrolconfig.Options) { diff --git a/internal/service/route53recoveryreadiness/service_package_gen.go b/internal/service/route53recoveryreadiness/service_package_gen.go index b3801a1768d6..bd8339b1eaea 100644 --- a/internal/service/route53recoveryreadiness/service_package_gen.go +++ b/internal/service/route53recoveryreadiness/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53recoveryreadiness" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -95,7 +94,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53recoveryreadiness.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *route53recoveryreadiness.Options) { diff --git a/internal/service/route53resolver/service_package_gen.go b/internal/service/route53resolver/service_package_gen.go index 6935005face6..c0f3ae2c88f9 100644 --- a/internal/service/route53resolver/service_package_gen.go +++ b/internal/service/route53resolver/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/route53resolver" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -211,7 +210,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53resolver.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/rum/service_package_gen.go b/internal/service/rum/service_package_gen.go index e989a5f5e80c..8ab78c90d865 100644 --- a/internal/service/rum/service_package_gen.go +++ b/internal/service/rum/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/rum" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *rum.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/s3/service_package.go b/internal/service/s3/service_package.go index 87e46cec1a18..b562f133d62e 100644 --- a/internal/service/s3/service_package.go +++ b/internal/service/s3/service_package.go @@ -50,7 +50,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/s3/service_package_gen.go b/internal/service/s3/service_package_gen.go index c16616c62848..a111efee92b4 100644 --- a/internal/service/s3/service_package_gen.go +++ b/internal/service/s3/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/s3" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -376,7 +375,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *s3.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/s3control/service_package_gen.go b/internal/service/s3control/service_package_gen.go index b5b51773383b..c705cf91dad5 100644 --- a/internal/service/s3control/service_package_gen.go +++ b/internal/service/s3control/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/s3control" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -198,7 +197,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *s3control.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/s3outposts/service_package_gen.go b/internal/service/s3outposts/service_package_gen.go index 69aaf7382484..c95d9137063d 100644 --- a/internal/service/s3outposts/service_package_gen.go +++ b/internal/service/s3outposts/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/s3outposts" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *s3outposts.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/s3tables/service_package_gen.go b/internal/service/s3tables/service_package_gen.go index 970953aee87f..1db7296956b2 100644 --- a/internal/service/s3tables/service_package_gen.go +++ b/internal/service/s3tables/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/s3tables" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -88,7 +87,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *s3tables.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/s3vectors/service_package_gen.go b/internal/service/s3vectors/service_package_gen.go index 322b72386a78..d5ee9e741b74 100644 --- a/internal/service/s3vectors/service_package_gen.go +++ b/internal/service/s3vectors/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/s3vectors" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *s3vectors.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sagemaker/service_package_gen.go b/internal/service/sagemaker/service_package_gen.go index fcf56e2ecdec..8d0c645a48c5 100644 --- a/internal/service/sagemaker/service_package_gen.go +++ b/internal/service/sagemaker/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sagemaker" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -337,7 +336,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sagemaker.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/scheduler/service_package_gen.go b/internal/service/scheduler/service_package_gen.go index 031c2894a366..c70b61ff1e25 100644 --- a/internal/service/scheduler/service_package_gen.go +++ b/internal/service/scheduler/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/scheduler" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -73,7 +72,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *scheduler.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/schemas/service_package.go b/internal/service/schemas/service_package.go index f2e9ca7b24b5..1190063fbdb5 100644 --- a/internal/service/schemas/service_package.go +++ b/internal/service/schemas/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/schemas/service_package_gen.go b/internal/service/schemas/service_package_gen.go index 439f492b0de1..e75cec37061c 100644 --- a/internal/service/schemas/service_package_gen.go +++ b/internal/service/schemas/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/schemas" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -91,7 +90,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *schemas.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/secretsmanager/service_package_gen.go b/internal/service/secretsmanager/service_package_gen.go index 62004095aac4..14d9de4e91b6 100644 --- a/internal/service/secretsmanager/service_package_gen.go +++ b/internal/service/secretsmanager/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/secretsmanager" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -169,7 +168,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *secretsmanager.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/securityhub/service_package_gen.go b/internal/service/securityhub/service_package_gen.go index 541ac7b523a0..c847a9d3240f 100644 --- a/internal/service/securityhub/service_package_gen.go +++ b/internal/service/securityhub/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/securityhub" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -163,7 +162,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *securityhub.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/securitylake/service_package_gen.go b/internal/service/securitylake/service_package_gen.go index 593b2a6ed863..6eea2eed7467 100644 --- a/internal/service/securitylake/service_package_gen.go +++ b/internal/service/securitylake/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/securitylake" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -98,7 +97,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *securitylake.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/serverlessrepo/service_package_gen.go b/internal/service/serverlessrepo/service_package_gen.go index b6d31a1c30aa..c0534fc1bd7c 100644 --- a/internal/service/serverlessrepo/service_package_gen.go +++ b/internal/service/serverlessrepo/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/serverlessapplicationrepository" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -72,7 +71,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *serverlessapplicationrepository.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/servicecatalog/service_package_gen.go b/internal/service/servicecatalog/service_package_gen.go index 4665dbb4268a..396327b20798 100644 --- a/internal/service/servicecatalog/service_package_gen.go +++ b/internal/service/servicecatalog/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/servicecatalog" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -178,7 +177,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *servicecatalog.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/servicecatalogappregistry/service_package_gen.go b/internal/service/servicecatalogappregistry/service_package_gen.go index 42c6c00e05b5..b4aaff1c8382 100644 --- a/internal/service/servicecatalogappregistry/service_package_gen.go +++ b/internal/service/servicecatalogappregistry/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/servicecatalogappregistry" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -107,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *servicecatalogappregistry.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/servicediscovery/service_package_gen.go b/internal/service/servicediscovery/service_package_gen.go index bbadf661222f..86da74ba25b6 100644 --- a/internal/service/servicediscovery/service_package_gen.go +++ b/internal/service/servicediscovery/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/servicediscovery" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -119,7 +118,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *servicediscovery.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/servicequotas/service_package_gen.go b/internal/service/servicequotas/service_package_gen.go index 43bebb7d6b7a..e7b33f4f887c 100644 --- a/internal/service/servicequotas/service_package_gen.go +++ b/internal/service/servicequotas/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/servicequotas" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -97,7 +96,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *servicequotas.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ses/service_package_gen.go b/internal/service/ses/service_package_gen.go index beb44c783d7b..95d7fefaf004 100644 --- a/internal/service/ses/service_package_gen.go +++ b/internal/service/ses/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ses" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -161,7 +160,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ses.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index c05b298ce07c..178e1cb33c1a 100644 --- a/internal/service/sesv2/service_package_gen.go +++ b/internal/service/sesv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sesv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -171,7 +170,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sesv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sfn/service_package_gen.go b/internal/service/sfn/service_package_gen.go index a93d3c35c1fb..9442088cf575 100644 --- a/internal/service/sfn/service_package_gen.go +++ b/internal/service/sfn/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sfn" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -107,7 +106,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sfn.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/shield/service_package_gen.go b/internal/service/shield/service_package_gen.go index 51319868d650..16c9329f4b6d 100644 --- a/internal/service/shield/service_package_gen.go +++ b/internal/service/shield/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/shield" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -125,7 +124,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *shield.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, func(o *shield.Options) { diff --git a/internal/service/signer/service_package_gen.go b/internal/service/signer/service_package_gen.go index 4b8d75122d0d..a382d484af81 100644 --- a/internal/service/signer/service_package_gen.go +++ b/internal/service/signer/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/signer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *signer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sns/service_package_gen.go b/internal/service/sns/service_package_gen.go index e8089f2d7697..5d0ac06a75a2 100644 --- a/internal/service/sns/service_package_gen.go +++ b/internal/service/sns/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sns" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -131,7 +130,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sns.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sqs/service_package_gen.go b/internal/service/sqs/service_package_gen.go index 9f9862063bc7..a2c866b75dfd 100644 --- a/internal/service/sqs/service_package_gen.go +++ b/internal/service/sqs/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sqs" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -117,7 +116,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sqs.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssm/service_package_gen.go b/internal/service/ssm/service_package_gen.go index cebf64854ba4..4c89804593fb 100644 --- a/internal/service/ssm/service_package_gen.go +++ b/internal/service/ssm/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ssm" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -242,7 +241,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssm.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssmcontacts/service_package_gen.go b/internal/service/ssmcontacts/service_package_gen.go index 7224ca5bdca3..7d3bfddc3dd9 100644 --- a/internal/service/ssmcontacts/service_package_gen.go +++ b/internal/service/ssmcontacts/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ssmcontacts" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -125,7 +124,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssmcontacts.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssmincidents/service_package_gen.go b/internal/service/ssmincidents/service_package_gen.go index acad79036321..3bf932409f83 100644 --- a/internal/service/ssmincidents/service_package_gen.go +++ b/internal/service/ssmincidents/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ssmincidents" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -92,7 +91,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssmincidents.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssmquicksetup/service_package_gen.go b/internal/service/ssmquicksetup/service_package_gen.go index 3f53032b6e2d..9604e46310be 100644 --- a/internal/service/ssmquicksetup/service_package_gen.go +++ b/internal/service/ssmquicksetup/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ssmquicksetup" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssmquicksetup.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssmsap/service_package_gen.go b/internal/service/ssmsap/service_package_gen.go index 329e2f5fa3c9..7915f024cc9c 100644 --- a/internal/service/ssmsap/service_package_gen.go +++ b/internal/service/ssmsap/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/ssmsap" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssmsap.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sso/service_package_gen.go b/internal/service/sso/service_package_gen.go index 57892476c81e..c93ace081806 100644 --- a/internal/service/sso/service_package_gen.go +++ b/internal/service/sso/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/sso" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sso.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/ssoadmin/service_package.go b/internal/service/ssoadmin/service_package.go index ec6ad84d1bc2..ae8f467eb22b 100644 --- a/internal/service/ssoadmin/service_package.go +++ b/internal/service/ssoadmin/service_package.go @@ -32,7 +32,7 @@ func (p *servicePackage) withExtraOptions(ctx context.Context, config map[string // Include go-vcr retryable to prevent generated client retryer from being overridden if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - retryables = append(retryables, retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + retryables = append(retryables, vcr.InteractionNotFoundRetryableFunc) } o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retryables...) diff --git a/internal/service/ssoadmin/service_package_gen.go b/internal/service/ssoadmin/service_package_gen.go index 110661e68e38..a4d6c45d2510 100644 --- a/internal/service/ssoadmin/service_package_gen.go +++ b/internal/service/ssoadmin/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/ssoadmin" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -192,7 +191,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *ssoadmin.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/storagegateway/service_package_gen.go b/internal/service/storagegateway/service_package_gen.go index a8022c01ff59..23531aa2effe 100644 --- a/internal/service/storagegateway/service_package_gen.go +++ b/internal/service/storagegateway/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/storagegateway" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -146,7 +145,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *storagegateway.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/sts/service_package_gen.go b/internal/service/sts/service_package_gen.go index 8c4260fbefa9..db20465c77f0 100644 --- a/internal/service/sts/service_package_gen.go +++ b/internal/service/sts/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/sts" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -64,7 +63,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *sts.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/swf/service_package_gen.go b/internal/service/swf/service_package_gen.go index c59664252c4f..d1d2a0e0c16a 100644 --- a/internal/service/swf/service_package_gen.go +++ b/internal/service/swf/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/swf" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *swf.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/synthetics/service_package_gen.go b/internal/service/synthetics/service_package_gen.go index a9ac74725bcd..37a22925e6fa 100644 --- a/internal/service/synthetics/service_package_gen.go +++ b/internal/service/synthetics/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/synthetics" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -95,7 +94,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *synthetics.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/taxsettings/service_package_gen.go b/internal/service/taxsettings/service_package_gen.go index ad2253cc3814..064115b70cd3 100644 --- a/internal/service/taxsettings/service_package_gen.go +++ b/internal/service/taxsettings/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/taxsettings" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *taxsettings.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/timestreaminfluxdb/service_package_gen.go b/internal/service/timestreaminfluxdb/service_package_gen.go index 4348dfae42a1..07887fbf777a 100644 --- a/internal/service/timestreaminfluxdb/service_package_gen.go +++ b/internal/service/timestreaminfluxdb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/timestreaminfluxdb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -76,7 +75,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *timestreaminfluxdb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/timestreamquery/service_package_gen.go b/internal/service/timestreamquery/service_package_gen.go index daf6509ba0b3..045d27c32c5f 100644 --- a/internal/service/timestreamquery/service_package_gen.go +++ b/internal/service/timestreamquery/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/timestreamquery" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -67,7 +66,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *timestreamquery.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/timestreamwrite/service_package_gen.go b/internal/service/timestreamwrite/service_package_gen.go index da35247ae895..68168b71ae65 100644 --- a/internal/service/timestreamwrite/service_package_gen.go +++ b/internal/service/timestreamwrite/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/timestreamwrite" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -89,7 +88,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *timestreamwrite.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/transcribe/service_package_gen.go b/internal/service/transcribe/service_package_gen.go index f0314c6c8074..2a2667ced41c 100644 --- a/internal/service/transcribe/service_package_gen.go +++ b/internal/service/transcribe/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/transcribe" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -94,7 +93,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *transcribe.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/transfer/service_package_gen.go b/internal/service/transfer/service_package_gen.go index b6c0eaf5230a..2597c57fa7fa 100644 --- a/internal/service/transfer/service_package_gen.go +++ b/internal/service/transfer/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/transfer" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -156,7 +155,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *transfer.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/verifiedpermissions/service_package_gen.go b/internal/service/verifiedpermissions/service_package_gen.go index 99aeef68000c..f50383b90ec5 100644 --- a/internal/service/verifiedpermissions/service_package_gen.go +++ b/internal/service/verifiedpermissions/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/verifiedpermissions" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -101,7 +100,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *verifiedpermissions.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index a98a20f96213..57313208f26d 100644 --- a/internal/service/vpclattice/service_package_gen.go +++ b/internal/service/vpclattice/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/vpclattice" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -212,7 +211,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *vpclattice.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/waf/service_package_gen.go b/internal/service/waf/service_package_gen.go index 8269a63a1648..1f71fc0ff938 100644 --- a/internal/service/waf/service_package_gen.go +++ b/internal/service/waf/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/waf" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -173,7 +172,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *waf.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/wafregional/service_package_gen.go b/internal/service/wafregional/service_package_gen.go index bc8db1c0044c..f63717f8fce6 100644 --- a/internal/service/wafregional/service_package_gen.go +++ b/internal/service/wafregional/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/wafregional" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -179,7 +178,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *wafregional.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/wafv2/service_package_gen.go b/internal/service/wafv2/service_package_gen.go index b0fe2ee13cb2..1ef5b620ce6f 100644 --- a/internal/service/wafv2/service_package_gen.go +++ b/internal/service/wafv2/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/wafv2" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -144,7 +143,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *wafv2.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/wellarchitected/service_package_gen.go b/internal/service/wellarchitected/service_package_gen.go index 7fcc663c2497..d6b0b8ef68a7 100644 --- a/internal/service/wellarchitected/service_package_gen.go +++ b/internal/service/wellarchitected/service_package_gen.go @@ -6,7 +6,6 @@ import ( "context" "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/wellarchitected" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -56,7 +55,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *wellarchitected.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/workspaces/service_package_gen.go b/internal/service/workspaces/service_package_gen.go index f25ee5dbfade..09a82280d487 100644 --- a/internal/service/workspaces/service_package_gen.go +++ b/internal/service/workspaces/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/workspaces" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -126,7 +125,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *workspaces.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/workspacesweb/service_package_gen.go b/internal/service/workspacesweb/service_package_gen.go index e39363118036..e8212d5ccbcc 100644 --- a/internal/service/workspacesweb/service_package_gen.go +++ b/internal/service/workspacesweb/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/workspacesweb" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -196,7 +195,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *workspacesweb.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/service/xray/service_package_gen.go b/internal/service/xray/service_package_gen.go index 9988c8415649..9f0ffb3cad60 100644 --- a/internal/service/xray/service_package_gen.go +++ b/internal/service/xray/service_package_gen.go @@ -7,7 +7,6 @@ import ( "unique" "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/xray" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -102,7 +101,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *xray.Options) { if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") - o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), retry.IsErrorRetryableFunc(vcr.InteractionNotFoundRetryableFunc)) + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) } }, withExtraOptions(ctx, p, config), diff --git a/internal/vcr/retry.go b/internal/vcr/retry.go index f52f336df8d9..ece73000fd9c 100644 --- a/internal/vcr/retry.go +++ b/internal/vcr/retry.go @@ -8,14 +8,15 @@ import ( "strings" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/hashicorp/terraform-provider-aws/internal/errs" ) // InteractionNotFoundRetryableFunc is a retryable function to augment retry behavior for AWS service clients // when VCR testing is enabled -var InteractionNotFoundRetryableFunc = func(err error) aws.Ternary { +var InteractionNotFoundRetryableFunc = retry.IsErrorRetryableFunc(func(err error) aws.Ternary { if errs.IsA[*url.Error](err) && strings.Contains(err.Error(), "requested interaction not found") { return aws.FalseTernary } return aws.UnknownTernary // Delegate to configured Retryer. -} +}) From 2f57b3fb9704e8c0f2b01589507c345bb3938b57 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 10:19:03 -0400 Subject: [PATCH 1275/2115] Fix 'TestAccEC2Instance_placementGroupID'. --- internal/service/ec2/ec2_instance_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index c20067a8f5bf..d6d96de45003 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -1205,14 +1205,14 @@ func TestAccEC2Instance_placementGroupID(t *testing.T) { Config: testAccInstanceConfig_placementGroupID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), - resource.TestCheckResourceAttr(resourceName, "placement_group_id", rName), + resource.TestCheckResourceAttrSet(resourceName, "placement_group_id"), ), }, { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"user_data_replace_on_change"}, + ImportStateVerifyIgnore: []string{"user_data_replace_on_change", "user_data"}, }, }, }) @@ -7475,7 +7475,7 @@ resource "aws_instance" "test" { placement_group_id = aws_placement_group.test.placement_group_id # pre-encoded base64 data - user_data = "3dc39dda39be1205215e776bad998da361a5955d" + user_data_base64 = "3dc39dda39be1205215e776bad998da361a5955d" tags = { Name = %[1]q From de65d2cb4d08238e74a15b9ec8cad6e2f2cf8341 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:06:45 -0400 Subject: [PATCH 1276/2115] internal/retry: Return potentially transformed error. --- internal/retry/op.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/retry/op.go b/internal/retry/op.go index 58ed1b95c123..6a54af5ab6e1 100644 --- a/internal/retry/op.go +++ b/internal/retry/op.go @@ -94,7 +94,8 @@ func (op opFunc[T]) If(predicate predicateFunc[T]) runFunc[T] { for l = backoff.NewLoopWithOptions(timeout, opts...); l.Continue(ctx); { t, err = op(ctx) - if retry, err := predicate(t, err); !retry { + var retry bool + if retry, err = predicate(t, err); !retry { return t, err } } From 189f67f70edd8a283a448ba08f946ccd162466dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:22:03 -0400 Subject: [PATCH 1277/2115] Correct CHANGELOG entry file name. --- .changelog/{38908.txt => 44097.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{38908.txt => 44097.txt} (100%) diff --git a/.changelog/38908.txt b/.changelog/44097.txt similarity index 100% rename from .changelog/38908.txt rename to .changelog/44097.txt From 5a3d2bbeda04740b245197276aff280a03d58f68 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:24:47 -0400 Subject: [PATCH 1278/2115] tfresource.RetryError: Lowercase field names. --- internal/tfresource/errors.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/tfresource/errors.go b/internal/tfresource/errors.go index 80456acc5a77..bac461c584aa 100644 --- a/internal/tfresource/errors.go +++ b/internal/tfresource/errors.go @@ -40,16 +40,16 @@ var SetLastError = retry.SetLastError // RetryError forces client code to choose whether or not a given error is retryable. type RetryError struct { - Err error - Retryable bool + err error + isRetryable bool } func (e *RetryError) Error() string { - return e.Unwrap().Error() + return e.err.Error() } func (e *RetryError) Unwrap() error { - return e.Err + return e.err } // RetryableError is a helper to create a RetryError that's retryable from a @@ -58,13 +58,13 @@ func (e *RetryError) Unwrap() error { func RetryableError(err error) *RetryError { if err == nil { return &RetryError{ - Err: errors.New("empty retryable error received. " + + err: errors.New("empty retryable error received. " + "This is a bug with the Terraform AWS Provider and should be " + "reported as a GitHub issue in the provider repository."), - Retryable: false, + isRetryable: false, } } - return &RetryError{Err: err, Retryable: true} + return &RetryError{err: err, isRetryable: true} } // NonRetryableError is a helper to create a RetryError that's _not_ retryable @@ -73,11 +73,11 @@ func RetryableError(err error) *RetryError { func NonRetryableError(err error) *RetryError { if err == nil { return &RetryError{ - Err: errors.New("empty non-retryable error received. " + + err: errors.New("empty non-retryable error received. " + "This is a bug with the Terraform AWS Provider and should be " + "reported as a GitHub issue in the provider repository."), - Retryable: false, + isRetryable: false, } } - return &RetryError{Err: err, Retryable: false} + return &RetryError{err: err, isRetryable: false} } From 4626ec6014e64baf6a01d39ac50ccf8643ce17f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:25:18 -0400 Subject: [PATCH 1279/2115] tfresource.Retry: Extra nil check. --- internal/tfresource/retry.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index 49b19520f2ca..de9843e81420 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -235,8 +235,8 @@ func Retry(ctx context.Context, timeout time.Duration, f func(context.Context) * return nil, f(ctx) }, func(err error) (bool, error) { - if err, ok := errs.As[*RetryError](err); ok { - return err.Retryable, err.Err + if err, ok := errs.As[*RetryError](err); ok && err != nil { + return err.isRetryable, err.err } return false, err From fb905d7edd690a008b74c37b387aeb53c3541eb5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:25:39 -0400 Subject: [PATCH 1280/2115] Extra tests. --- internal/tfresource/retry_test.go | 50 ++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/internal/tfresource/retry_test.go b/internal/tfresource/retry_test.go index dafd385bbe59..0c239596c0b2 100644 --- a/internal/tfresource/retry_test.go +++ b/internal/tfresource/retry_test.go @@ -350,7 +350,31 @@ func TestRetryUntilNotFound(t *testing.T) { } } -func TestRetryContext_error(t *testing.T) { +func TestRetryContext_nil(t *testing.T) { + t.Parallel() + + ctx := t.Context() + var expected *tfresource.RetryError = nil + f := func(context.Context) *tfresource.RetryError { + return nil + } + + errCh := make(chan error) + go func() { + errCh <- tfresource.Retry(ctx, 1*time.Second, f) + }() + + select { + case err := <-errCh: + if err != expected { //nolint:errorlint // We are actually comparing equality + t.Fatalf("bad: %#v", err) + } + case <-time.After(5 * time.Second): + t.Fatal("timeout") + } +} + +func TestRetryContext_nonRetryableError(t *testing.T) { t.Parallel() ctx := t.Context() @@ -374,6 +398,30 @@ func TestRetryContext_error(t *testing.T) { } } +func TestRetryContext_retryableError(t *testing.T) { + t.Parallel() + + ctx := t.Context() + expected := fmt.Errorf("nope") + f := func(context.Context) *tfresource.RetryError { + return tfresource.RetryableError(expected) + } + + errCh := make(chan error) + go func() { + errCh <- tfresource.Retry(ctx, 1*time.Second, f) + }() + + select { + case err := <-errCh: + if err != expected { //nolint:errorlint // We are actually comparing equality + t.Fatalf("bad: %#v", err) + } + case <-time.After(5 * time.Second): + t.Fatal("timeout") + } +} + func TestOptionsApply(t *testing.T) { t.Parallel() From 7843536e162cc78ddb4cf86c2486fa31f7f87270 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:30:19 -0400 Subject: [PATCH 1281/2115] Fix 'ci.helper-schema-TimeoutError-check-doesnt-return-output' semgrep rule. --- .ci/.semgrep.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index 8efaa4b8f920..d24e4537c4ea 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -273,14 +273,6 @@ rules: }) ... if isResourceTimeoutError($ERR) { ... } - - pattern-not-inside: | - $ERR = tfresource.Retry(..., func() *retry.RetryError { - ... - _, $ERR2 = $CONN.$FUNC(...) - ... - }, ...) - ... - if isResourceTimeoutError($ERR) { ... } - patterns: - pattern: | if tfresource.TimedOut($ERR) { @@ -294,14 +286,6 @@ rules: }) ... if tfresource.TimedOut($ERR) { ... } - - pattern-not-inside: | - $ERR = tfresource.Retry(..., func() *retry.RetryError { - ... - _, $ERR2 = $CONN.$FUNC(...) - ... - }, ...) - ... - if tfresource.TimedOut($ERR) { ... } severity: WARNING - id: is-not-found-error From be26fab4ae3e2e7f7fa415e7e50049202c24f6a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:32:51 -0400 Subject: [PATCH 1282/2115] Fix semgrep 'ci.helper-schema-TimeoutError-check-doesnt-return-output' error. --- internal/service/dynamodb/sweep.go | 3 --- internal/service/eks/cluster.go | 4 ---- 2 files changed, 7 deletions(-) diff --git a/internal/service/dynamodb/sweep.go b/internal/service/dynamodb/sweep.go index 64c059376271..40065eb56f3a 100644 --- a/internal/service/dynamodb/sweep.go +++ b/internal/service/dynamodb/sweep.go @@ -171,9 +171,6 @@ func (bs backupSweeper) Delete(ctx context.Context, optFns ...tfresource.Options return nil }, optFns...) - if tfresource.TimedOut(err) { - _, err = bs.conn.DeleteBackup(ctx, input) - } return err } diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index 7e4acda89ef9..1c547807b444 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -939,10 +939,6 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any return nil }, tfresource.WithDelayRand(1*time.Minute), tfresource.WithPollInterval(30*time.Second)) - if tfresource.TimedOut(err) { - _, err = conn.DeleteCluster(ctx, &input) - } - if errs.IsA[*types.ResourceNotFoundException](err) { return diags } From 44977a286f6a199dcfb29a1975e722a1327afffa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 11:40:51 -0400 Subject: [PATCH 1283/2115] aws_launch_template: Alphabetize. --- internal/service/ec2/ec2_launch_template.go | 24 +-- .../ec2/ec2_launch_template_data_source.go | 4 +- .../service/ec2/ec2_launch_template_test.go | 138 +++++++++--------- website/docs/r/launch_template.html.markdown | 2 +- 4 files changed, 84 insertions(+), 84 deletions(-) diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index 8b3870f26121..4755bfcc4b8a 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -897,15 +897,15 @@ func resourceLaunchTemplate() *schema.Resource { Type: schema.TypeString, Optional: true, }, - names.AttrGroupName: { + "group_id": { Type: schema.TypeString, Optional: true, - ConflictsWith: []string{"placement.0.group_id"}, + ConflictsWith: []string{"placement.0.group_name"}, }, - "group_id": { + names.AttrGroupName: { Type: schema.TypeString, Optional: true, - ConflictsWith: []string{"placement.0.group_name"}, + ConflictsWith: []string{"placement.0.group_id"}, }, "host_id": { Type: schema.TypeString, @@ -2094,14 +2094,14 @@ func expandLaunchTemplatePlacementRequest(tfMap map[string]any) *awstypes.Launch apiObject.AvailabilityZone = aws.String(v) } - if v, ok := tfMap[names.AttrGroupName].(string); ok && v != "" { - apiObject.GroupName = aws.String(v) - } - if v, ok := tfMap["group_id"].(string); ok && v != "" { apiObject.GroupId = aws.String(v) } + if v, ok := tfMap[names.AttrGroupName].(string); ok && v != "" { + apiObject.GroupName = aws.String(v) + } + if v, ok := tfMap["host_id"].(string); ok && v != "" { apiObject.HostId = aws.String(v) } @@ -3002,14 +3002,14 @@ func flattenLaunchTemplatePlacement(apiObject *awstypes.LaunchTemplatePlacement) tfMap[names.AttrAvailabilityZone] = aws.ToString(v) } - if v := apiObject.GroupName; v != nil { - tfMap[names.AttrGroupName] = aws.ToString(v) - } - if v := apiObject.GroupId; v != nil { tfMap["group_id"] = aws.ToString(v) } + if v := apiObject.GroupName; v != nil { + tfMap[names.AttrGroupName] = aws.ToString(v) + } + if v := apiObject.HostId; v != nil { tfMap["host_id"] = aws.ToString(v) } diff --git a/internal/service/ec2/ec2_launch_template_data_source.go b/internal/service/ec2/ec2_launch_template_data_source.go index 408814f5d3bb..b9fbd89ff29b 100644 --- a/internal/service/ec2/ec2_launch_template_data_source.go +++ b/internal/service/ec2/ec2_launch_template_data_source.go @@ -704,11 +704,11 @@ func dataSourceLaunchTemplate() *schema.Resource { Type: schema.TypeString, Computed: true, }, - names.AttrGroupName: { + "group_id": { Type: schema.TypeString, Computed: true, }, - "group_id": { + names.AttrGroupName: { Type: schema.TypeString, Computed: true, }, diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index 07c05577fc08..ea63f09b706b 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -1192,6 +1192,75 @@ func TestAccEC2LaunchTemplate_associateCarrierIPAddress(t *testing.T) { }) } +func TestAccEC2LaunchTemplate_Placement_groupID(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLaunchTemplateConfig_placementGroupID(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccEC2LaunchTemplate_Placement_groupNameToGroupID(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccLaunchTemplateConfig_placementGroupName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_name"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_id", ""), + ), + }, + { + Config: testAccLaunchTemplateConfig_placementGroupID(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), + resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccEC2LaunchTemplate_Placement_hostResourceGroupARN(t *testing.T) { ctx := acctest.Context(t) var template awstypes.LaunchTemplate @@ -4153,75 +4222,6 @@ resource "aws_launch_template" "test" { `, rName) } -func TestAccEC2LaunchTemplate_placement_groupID(t *testing.T) { - ctx := acctest.Context(t) - var template awstypes.LaunchTemplate - resourceName := "aws_launch_template.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t) }, - ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), - Steps: []resource.TestStep{ - { - Config: testAccLaunchTemplateConfig_placementGroupID(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckLaunchTemplateExists(ctx, resourceName, &template), - resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), - resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), - resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccEC2LaunchTemplate_placement_groupNameToGroupID(t *testing.T) { - ctx := acctest.Context(t) - var template awstypes.LaunchTemplate - resourceName := "aws_launch_template.test" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t) }, - ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), - Steps: []resource.TestStep{ - { - Config: testAccLaunchTemplateConfig_placementGroupName(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckLaunchTemplateExists(ctx, resourceName, &template), - resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), - resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_name"), - resource.TestCheckResourceAttr(resourceName, "placement.0.group_id", ""), - ), - }, - { - Config: testAccLaunchTemplateConfig_placementGroupID(rName), - Check: resource.ComposeTestCheckFunc( - testAccCheckLaunchTemplateExists(ctx, resourceName, &template), - resource.TestCheckResourceAttr(resourceName, "placement.#", "1"), - resource.TestCheckResourceAttrSet(resourceName, "placement.0.group_id"), - resource.TestCheckResourceAttr(resourceName, "placement.0.group_name", ""), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - func testAccLaunchTemplateConfig_asgBasic(rName string) string { return acctest.ConfigCompose( acctest.ConfigLatestAmazonLinux2HVMEBSX8664AMI(), diff --git a/website/docs/r/launch_template.html.markdown b/website/docs/r/launch_template.html.markdown index 0d9100110979..009d6a8a9ea8 100644 --- a/website/docs/r/launch_template.html.markdown +++ b/website/docs/r/launch_template.html.markdown @@ -461,8 +461,8 @@ The `placement` block supports the following: * `affinity` - (Optional) The affinity setting for an instance on a Dedicated Host. * `availability_zone` - (Optional) The Availability Zone for the instance. -* `group_name` - (Optional) The name of the placement group for the instance. Conflicts with `group_id`. * `group_id` - (Optional) The ID of the placement group for the instance. Conflicts with `group_name`. +* `group_name` - (Optional) The name of the placement group for the instance. Conflicts with `group_id`. * `host_id` - (Optional) The ID of the Dedicated Host for the instance. * `host_resource_group_arn` - (Optional) The ARN of the Host Resource Group in which to launch instances. * `spread_domain` - (Optional) Reserved for future use. From 29c90fcf2714d27574511e98fb14460787e4db6f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 2 Sep 2025 12:05:04 -0400 Subject: [PATCH 1284/2115] tfresource.Retry: Better nil handling. --- internal/tfresource/retry.go | 7 +++++-- internal/tfresource/retry_test.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/tfresource/retry.go b/internal/tfresource/retry.go index de9843e81420..0f1a9c80c28e 100644 --- a/internal/tfresource/retry.go +++ b/internal/tfresource/retry.go @@ -235,8 +235,11 @@ func Retry(ctx context.Context, timeout time.Duration, f func(context.Context) * return nil, f(ctx) }, func(err error) (bool, error) { - if err, ok := errs.As[*RetryError](err); ok && err != nil { - return err.isRetryable, err.err + if err, ok := errs.As[*RetryError](err); ok { + if err != nil { + return err.isRetryable, err.err + } + return false, nil } return false, err diff --git a/internal/tfresource/retry_test.go b/internal/tfresource/retry_test.go index 0c239596c0b2..dd2acc25f527 100644 --- a/internal/tfresource/retry_test.go +++ b/internal/tfresource/retry_test.go @@ -354,7 +354,7 @@ func TestRetryContext_nil(t *testing.T) { t.Parallel() ctx := t.Context() - var expected *tfresource.RetryError = nil + var expected error f := func(context.Context) *tfresource.RetryError { return nil } From 6d218dc89f24129079a356b0c304a638ae93b7a8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 13:58:26 -0400 Subject: [PATCH 1285/2115] r/aws_servicecatalog_provisioned_product(test): add expected error condition --- internal/service/servicecatalog/provisioned_product_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index e50c37778ef9..6dd0f145903d 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1061,11 +1061,17 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), }, }, + ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), }, // Step 5: Clean up by applying a working config { Config: testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), From 36782ec2a3fb92b5f57423b2f9f395b53ed2e045 Mon Sep 17 00:00:00 2001 From: amazreech Date: Mon, 30 Jun 2025 12:55:40 -0400 Subject: [PATCH 1286/2115] Update ECS Service to account of AvailabilityZoneRebalancing property's default behavior change --- .changelog/43241.txt | 4 ++++ internal/service/ecs/service.go | 12 +++++++++--- internal/service/ecs/service_test.go | 17 ++++++++++++++--- website/docs/r/ecs_service.html.markdown | 2 +- 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 .changelog/43241.txt diff --git a/.changelog/43241.txt b/.changelog/43241.txt new file mode 100644 index 000000000000..5e04925037b8 --- /dev/null +++ b/.changelog/43241.txt @@ -0,0 +1,4 @@ +```release-note:enhancement +resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` to allow ECS to default to `ENABLED` for new resources and maintain existing service's AvailabilityZoneRebalancing value during updates when not +specified. +``` \ No newline at end of file diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index abace1f92358..70c78ac75269 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -562,9 +562,15 @@ func resourceService() *schema.Resource { Computed: true, }, "availability_zone_rebalancing": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.AvailabilityZoneRebalancingDisabled, + Type: schema.TypeString, + Optional: true, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + // Suppress diff if resource already exists (update) and the new value is empty + if d.Id() != "" && new == "" { + return true + } + return false + }, ValidateDiagFunc: enum.Validate[awstypes.AvailabilityZoneRebalancing](), }, names.AttrCapacityProviderStrategy: { diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 093b7a90c8e7..9a7897d40595 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -161,7 +161,7 @@ func TestAccECSService_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "service_registries.#", "0"), resource.TestCheckResourceAttr(resourceName, "scheduling_strategy", "REPLICA"), resource.TestCheckResourceAttrPair(resourceName, "task_definition", "aws_ecs_task_definition.test", names.AttrARN), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "DISABLED"), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttr(resourceName, "vpc_lattice_configuration.#", "0"), ), ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -188,7 +188,7 @@ func TestAccECSService_basic(t *testing.T) { acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("service/%s/%s", clusterName, rName)), resource.TestCheckResourceAttr(resourceName, "service_registries.#", "0"), resource.TestCheckResourceAttr(resourceName, "scheduling_strategy", "REPLICA"), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "DISABLED"), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttr(resourceName, "vpc_lattice_configuration.#", "0"), ), ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -2665,7 +2665,7 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { Config: testAccServiceConfig_availabilityZoneRebalancing_nullUpdate(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingDisabled)), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingEnabled)), ), }, { @@ -2675,6 +2675,13 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingDisabled)), ), }, + { + Config: testAccServiceConfig_availabilityZoneRebalancing_nullUpdate(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingDisabled)), + ), + }, { Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "ENABLED"), Check: resource.ComposeTestCheckFunc( @@ -4414,6 +4421,7 @@ resource "aws_ecs_service" "test" { force_new_deployment = true name = %[1]q task_definition = aws_ecs_task_definition.test.arn + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { type = "binpack" @@ -4491,6 +4499,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { type = "binpack" @@ -4562,6 +4571,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { type = "random" @@ -4597,6 +4607,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { type = "binpack" diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index f53d2975a845..24bca84e2348 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -146,7 +146,7 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `alarms` - (Optional) Information about the CloudWatch alarms. [See below](#alarms). -* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. Defaults to `DISABLED`. +* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. When creating a new service, if no value is specified, it defaults to `ENABLED`. When updating an existing service, if no value is specified it defaults to the existing service's AvailabilityZoneRebalancing value. * `capacity_provider_strategy` - (Optional) Capacity provider strategies to use for the service. Can be one or more. These can be updated without destroying and recreating the service only if `force_new_deployment = true` and not changing from 0 `capacity_provider_strategy` blocks to greater than 0, or vice versa. [See below](#capacity_provider_strategy). Conflicts with `launch_type`. * `cluster` - (Optional) ARN of an ECS cluster. * `deployment_circuit_breaker` - (Optional) Configuration block for deployment circuit breaker. [See below](#deployment_circuit_breaker). From ed6790bd3c70205d3fb6a5bc275f4ecc9ff8c1f3 Mon Sep 17 00:00:00 2001 From: David Glaser <112961679+djglaser@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:52:56 -0400 Subject: [PATCH 1287/2115] Update ecs_service.html.markdown and changelog --- .changelog/43241.txt | 6 ++++-- website/docs/r/ecs_service.html.markdown | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.changelog/43241.txt b/.changelog/43241.txt index 5e04925037b8..49e823935748 100644 --- a/.changelog/43241.txt +++ b/.changelog/43241.txt @@ -1,4 +1,6 @@ ```release-note:enhancement -resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` to allow ECS to default to `ENABLED` for new resources and maintain existing service's AvailabilityZoneRebalancing value during updates when not -specified. +resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` to allow ECS to default to `ENABLED` +for new resources compatible with AvailabilityZoneRebalancing and maintain existing service's AvailabilityZoneRebalancing value +during updates when not specified. If an existing service never had an AvailabilityZoneRebalancing value set and is updated, ECS +will treat this as `DISABLED`. ``` \ No newline at end of file diff --git a/website/docs/r/ecs_service.html.markdown b/website/docs/r/ecs_service.html.markdown index 24bca84e2348..9120dc9f7f0c 100644 --- a/website/docs/r/ecs_service.html.markdown +++ b/website/docs/r/ecs_service.html.markdown @@ -146,7 +146,7 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `alarms` - (Optional) Information about the CloudWatch alarms. [See below](#alarms). -* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. When creating a new service, if no value is specified, it defaults to `ENABLED`. When updating an existing service, if no value is specified it defaults to the existing service's AvailabilityZoneRebalancing value. +* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. When creating a new service, if no value is specified, it defaults to `ENABLED` if the service is compatible with AvailabilityZoneRebalancing. When updating an existing service, if no value is specified it defaults to the existing service's AvailabilityZoneRebalancing value. If the service never had an AvailabilityZoneRebalancing value set, Amazon ECS treats this as `DISABLED`. * `capacity_provider_strategy` - (Optional) Capacity provider strategies to use for the service. Can be one or more. These can be updated without destroying and recreating the service only if `force_new_deployment = true` and not changing from 0 `capacity_provider_strategy` blocks to greater than 0, or vice versa. [See below](#capacity_provider_strategy). Conflicts with `launch_type`. * `cluster` - (Optional) ARN of an ECS cluster. * `deployment_circuit_breaker` - (Optional) Configuration block for deployment circuit breaker. [See below](#deployment_circuit_breaker). From 87dbbf69305981b7e5fb49203f099892233dfb39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 11:57:49 -0400 Subject: [PATCH 1288/2115] Consolidate 'testAccServiceConfig_availabilityZoneRebalancing_nullUpdate' into 'testAccServiceConfig_availabilityZoneRebalancing'. --- internal/service/ecs/service_test.go | 105 +++++++++++++++------------ 1 file changed, 60 insertions(+), 45 deletions(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 9a7897d40595..338aecc42310 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -8,6 +8,7 @@ import ( "fmt" "math" "os/exec" + "strconv" "testing" "time" @@ -157,11 +158,11 @@ func TestAccECSService_basic(t *testing.T) { testAccCheckServiceExists(ctx, resourceName, &service), resource.TestCheckResourceAttr(resourceName, "alarms.#", "0"), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("service/%s/%s", clusterName, rName)), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttrPair(resourceName, "cluster", "aws_ecs_cluster.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "service_registries.#", "0"), resource.TestCheckResourceAttr(resourceName, "scheduling_strategy", "REPLICA"), resource.TestCheckResourceAttrPair(resourceName, "task_definition", "aws_ecs_task_definition.test", names.AttrARN), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttr(resourceName, "vpc_lattice_configuration.#", "0"), ), ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -186,9 +187,9 @@ func TestAccECSService_basic(t *testing.T) { testAccCheckServiceExists(ctx, resourceName, &service), resource.TestCheckResourceAttr(resourceName, "alarms.#", "0"), acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("service/%s/%s", clusterName, rName)), + resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttr(resourceName, "service_registries.#", "0"), resource.TestCheckResourceAttr(resourceName, "scheduling_strategy", "REPLICA"), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", "ENABLED"), resource.TestCheckResourceAttr(resourceName, "vpc_lattice_configuration.#", "0"), ), ConfigPlanChecks: resource.ConfigPlanChecks{ @@ -2655,39 +2656,74 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { CheckDestroy: testAccCheckServiceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "ENABLED"), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingEnabled)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), + }, }, { - Config: testAccServiceConfig_availabilityZoneRebalancing_nullUpdate(rName), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingEnabled)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), + }, }, { - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "DISABLED"), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingDisabled), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingDisabled)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), + }, }, { - Config: testAccServiceConfig_availabilityZoneRebalancing_nullUpdate(rName), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingDisabled)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), + }, }, { - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "ENABLED"), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), - resource.TestCheckResourceAttr(resourceName, "availability_zone_rebalancing", string(awstypes.AvailabilityZoneRebalancingEnabled)), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), + }, }, }, }) @@ -4421,6 +4457,7 @@ resource "aws_ecs_service" "test" { force_new_deployment = true name = %[1]q task_definition = aws_ecs_task_definition.test.arn + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { @@ -4499,6 +4536,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { @@ -4571,6 +4609,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { @@ -4607,6 +4646,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn desired_count = 1 + availability_zone_rebalancing = "DISABLED" ordered_placement_strategy { @@ -7443,7 +7483,12 @@ resource "aws_ecs_service" "test" { `, rName) } -func testAccServiceConfig_availabilityZoneRebalancing(rName string, serviceRebalancing string) string { +func testAccServiceConfig_availabilityZoneRebalancing(rName string, azRebalancing awstypes.AvailabilityZoneRebalancing) string { + val := string(azRebalancing) + if val != "null" { + val = strconv.Quote(val) + } + return fmt.Sprintf(` resource "aws_ecs_cluster" "test" { name = %[1]q @@ -7469,37 +7514,7 @@ resource "aws_ecs_service" "test" { name = %[1]q cluster = aws_ecs_cluster.test.id task_definition = aws_ecs_task_definition.test.arn - availability_zone_rebalancing = %[2]q -} - `, rName, serviceRebalancing) -} - -func testAccServiceConfig_availabilityZoneRebalancing_nullUpdate(rName string) string { - return fmt.Sprintf(` -resource "aws_ecs_cluster" "test" { - name = %[1]q -} - -resource "aws_ecs_task_definition" "test" { - family = %[1]q - - container_definitions = < Date: Wed, 13 Aug 2025 12:09:40 -0400 Subject: [PATCH 1289/2115] Add 'TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_configured'. --- internal/service/ecs/service_test.go | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 338aecc42310..3df4a9fb170d 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -2729,6 +2729,59 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { }) } +func TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_configured(t *testing.T) { + ctx := acctest.Context(t) + var service awstypes.Service + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_ecs_service.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), + CheckDestroy: testAccCheckServiceDestroy(ctx), + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "6.8.0", + }, + }, + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), + }, + }, + }, + }) +} + func testAccCheckServiceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) From 99310285c4bc9d7d5d3f9b9dced888f3a1c7f39e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 12:16:04 -0400 Subject: [PATCH 1290/2115] Add 'TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_unconfigured'. --- internal/service/ecs/service_test.go | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 3df4a9fb170d..4e9f4b1ae94e 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -2782,6 +2782,59 @@ func TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_configured(t *t }) } +func TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_unconfigured(t *testing.T) { + ctx := acctest.Context(t) + var service awstypes.Service + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_ecs_service.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), + CheckDestroy: testAccCheckServiceDestroy(ctx), + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "6.8.0", + }, + }, + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), + Check: resource.ComposeTestCheckFunc( + testAccCheckServiceExists(ctx, resourceName, &service), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), + }, + }, + }, + }) +} + func testAccCheckServiceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) From 678f8f2985a233ce916b028ee5bdd988357ff4d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 12:23:29 -0400 Subject: [PATCH 1291/2115] r/aws_ecs_service: Change `availability_zone_rebalancing` to Optional and Computed. --- internal/service/ecs/service.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 70c78ac75269..048097116a4e 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -562,15 +562,9 @@ func resourceService() *schema.Resource { Computed: true, }, "availability_zone_rebalancing": { - Type: schema.TypeString, - Optional: true, - DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { - // Suppress diff if resource already exists (update) and the new value is empty - if d.Id() != "" && new == "" { - return true - } - return false - }, + Type: schema.TypeString, + Optional: true, + Computed: true, ValidateDiagFunc: enum.Validate[awstypes.AvailabilityZoneRebalancing](), }, names.AttrCapacityProviderStrategy: { From 59863e5a2d91752f7a71236502b405fc7956307d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 13 Aug 2025 12:29:26 -0400 Subject: [PATCH 1292/2115] Tweak CHANGELOG entry. --- .changelog/43241.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.changelog/43241.txt b/.changelog/43241.txt index 49e823935748..1ba6a967d21e 100644 --- a/.changelog/43241.txt +++ b/.changelog/43241.txt @@ -1,6 +1,3 @@ ```release-note:enhancement -resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` to allow ECS to default to `ENABLED` -for new resources compatible with AvailabilityZoneRebalancing and maintain existing service's AvailabilityZoneRebalancing value -during updates when not specified. If an existing service never had an AvailabilityZoneRebalancing value set and is updated, ECS -will treat this as `DISABLED`. +resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` and change the attribute to Optional and Computed. This allow ECS to default to `ENABLED` for new resources compatible with *AvailabilityZoneRebalancing* and maintain an existing service's `availability_zone_rebalancing` value during update when not configured. If an existing service never had an `availability_zone_rebalancing` value configured and is updated, ECS will treat this as `DISABLED` ``` \ No newline at end of file From 4140e7f1cbc70a06591e8937de077347602d9099 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 14:55:24 -0400 Subject: [PATCH 1293/2115] r/aws_servicecatalog_provisioned_product: rollback params, artifact ID on failed update ```console % make testacc PKG=servicecatalog TESTS=TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run='TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate' -timeout 360m -vet=off 2025/09/02 14:44:06 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/02 14:44:06 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate (294.43s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog 301.051s ``` --- .../servicecatalog/provisioned_product.go | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 97ffd1475107..2ab03d2a0f49 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -410,18 +410,10 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, // or after an invalid update that returns a 'FAILED' record state. Thus, waiters are now present in the CREATE and UPDATE methods of this resource instead. // Reference: https://github.com/hashicorp/terraform-provider-aws/issues/24574#issuecomment-1126339193 - // // For TAINTED resources, we need to get parameters from the last successful record - // // not the last provisioning record which may have failed - // var recordIdToUse *string - // if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { - // recordIdToUse = detail.LastSuccessfulProvisioningRecordId - // log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), aws.ToString(recordIdToUse)) - // } else { - // recordIdToUse = detail.LastProvisioningRecordId - // } - recordIdToUse := aws.ToString(detail.LastProvisioningRecordId) if detail.Status == awstypes.ProvisionedProductStatusTainted && detail.LastSuccessfulProvisioningRecordId != nil { + // For TAINTED resources, we need to get artifact details from the last successful + // record, as the last provisioned record may have failed. recordIdToUse = aws.ToString(detail.LastSuccessfulProvisioningRecordId) log.Printf("[DEBUG] Service Catalog Provisioned Product (%s) is TAINTED, using last successful record %s for parameter values", d.Id(), recordIdToUse) } @@ -436,10 +428,9 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading Service Catalog Provisioned Product (%s) Record (%s): %s", d.Id(), recordIdToUse, err) } - // To enable debugging of potential v, log as a warning - // instead of exiting prematurely with an error, e.g. - // v can be present after update to a new version failed and the stack - // rolled back to the current version. + // To enable debugging of potential issues, log as a warning instead of exiting prematurely. + // For example, errors can be present after a failed version update, and the stack rolled back + // to the current version. if v := outputDR.RecordDetail.RecordErrors; len(v) > 0 { var errs []error @@ -455,6 +446,7 @@ func resourceProvisionedProductRead(ctx context.Context, d *schema.ResourceData, } d.Set("path_id", outputDR.RecordDetail.PathId) + d.Set("provisioning_artifact_id", outputDR.RecordDetail.ProvisioningArtifactId) setTagsOut(ctx, svcTags(recordKeyValueTags(ctx, outputDR.RecordDetail.RecordTags))) @@ -539,6 +531,16 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat return append(refreshDiags, sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err)...) } + if d.HasChange("provisioning_parameters") { + // If parameters were changed, rollback to previous values. + // + // The read APIs used to refresh state above do not return parameter values, and therefore + // will not reflect that the planned updates did not take effect. Explicitly rolling back + // ensures the planned parameter changes are attempted again on a subsequent apply. + oldParams, _ := d.GetChange("provisioning_parameters") + d.Set("provisioning_parameters", oldParams) + } + // Return the original failure error after state is corrected return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } From d861fc17be38c9bf6c12202a1c90ee622d94e33b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 15:57:23 -0400 Subject: [PATCH 1294/2115] r/aws_servicecatalog_provisioned_product(test): refine plan, state checks ```console % make testacc PKG=servicecatalog TESTS=TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run='TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate' -timeout 360m -vet=off 2025/09/02 15:41:43 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/02 15:41:43 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate === PAUSE TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate === CONT TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate --- PASS: TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate (296.94s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog 303.535s ``` --- .../provisioned_product_test.go | 268 +++++++++--------- 1 file changed, 127 insertions(+), 141 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 6dd0f145903d..00362a925c77 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -11,12 +11,14 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfservicecatalog "github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog" @@ -458,6 +460,127 @@ func TestAccServiceCatalogProvisionedProduct_productTagUpdateAfterError(t *testi }) } +// Validates that a provisioned product in tainted status properly triggers an update +// on subsequent applies. +// Ref: https://github.com/hashicorp/terraform-provider-aws/issues/42585 +func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_servicecatalog_provisioned_product.test" + artifactsDataSourceName := "data.aws_servicecatalog_provisioning_artifacts.product_artifacts" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + initialArtifactID := "provisioning_artifact_details.0.id" + newArtifactID := "provisioning_artifact_details.1.id" + var v awstypes.ProvisionedProductDetail + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ServiceCatalogServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckProvisionedProductDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1 - Setup + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckProvisionedProductExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrStatus), knownvalue.StringExact("AVAILABLE")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("provisioning_parameters"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("FailureSimulation"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact(acctest.CtFalse), + }), + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("ExtraParam"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact("original"), + }), + })), + }, + }, + // Step 2 - Trigger a failure, leaving the provisioned product tainted + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), + ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("provisioning_parameters"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("FailureSimulation"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact(acctest.CtTrue), + }), + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("ExtraParam"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact("updated"), + }), + })), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrStatus), knownvalue.StringExact("TAINTED")), + // Verify state is rolled back to the paramters from the original setup run + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("provisioning_parameters"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("FailureSimulation"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact(acctest.CtFalse), + }), + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("ExtraParam"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact("original"), + }), + })), + }, + }, + // Step 3 - Verify an update is planned, even without configuration changes + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), + }, + // Step 4 - Resolve the failure, verifying an update is completed + { + Config: testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckProvisionedProductExists(ctx, resourceName, &v), + resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrStatus), knownvalue.StringExact("AVAILABLE")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("provisioning_parameters"), knownvalue.ListExact([]knownvalue.Check{ + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("FailureSimulation"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact(acctest.CtFalse), + }), + knownvalue.ObjectExact(map[string]knownvalue.Check{ + names.AttrKey: knownvalue.StringExact("ExtraParam"), + "use_previous_value": knownvalue.Bool(false), + names.AttrValue: knownvalue.StringExact("updated"), + }), + })), + }, + }, + }, + }) +} + func testAccCheckProvisionedProductDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ServiceCatalogClient(ctx) @@ -986,155 +1109,18 @@ resource "aws_s3_bucket" "conflict" { `, rName, conflictingBucketName, tagValue)) } -// TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate reproduces the exact bug scenario: -// -// When a Service Catalog provisioned product update fails, the resource becomes TAINTED. -// The bug is that subsequent `terraform apply` shows "no changes" instead of retrying -// the failed update automatically. -// -// Expected behavior: TAINTED resources should always trigger an update attempt. -// Current (buggy) behavior: TAINTED resources show "no changes" in plan. -// -// This test should FAIL at Step 4 with the current implementation, proving the bug exists. -// Step 4 uses ConfigPlanChecks to verify that an update action should be planned. -func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { - ctx := acctest.Context(t) - resourceName := "aws_servicecatalog_provisioned_product.test" - const artifactsDataSourceName = "data.aws_servicecatalog_provisioning_artifacts.product_artifacts" - const initialArtifactID = "provisioning_artifact_details.0.id" - const newArtifactID = "provisioning_artifact_details.1.id" - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - var pprod awstypes.ProvisionedProductDetail - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t) }, - ErrorCheck: acctest.ErrorCheck(t, names.ServiceCatalogServiceID), - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckProvisionedProductDestroy(ctx), - Steps: []resource.TestStep{ - // Step 1: Create with working configuration - { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName), - Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), - testAccCheckProvisionedProductStatus(ctx, resourceName, "AVAILABLE"), - resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), - resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "none"), - ), - }, - - // Step 2: Update to failing configuration - { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), - ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), - }, - - // // Step 3: Verify resource is now TAINTED after the failed update - // // Use RefreshState to avoid triggering any plan changes due to config differences - // { - // RefreshState: true, - // Check: resource.ComposeAggregateTestCheckFunc( - // // testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), // Can't use this because it fails on TAINTED - // testAccCheckProvisionedProductStatus(ctx, resourceName, "TAINTED"), - // resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "TAINTED"), - // resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), - // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), - // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", "true"), - // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), - // resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_once"), - // ), - // }, - - // Step 4: CRITICAL TEST - Apply the same failing config again - // BUG: Currently this shows "no changes" but should retry the update - // ConfigPlanChecks should FAIL with current implementation, demonstrating the bug - { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), - }, - }, - ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), - }, - - // Step 5: Clean up by applying a working config - { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), - }, - }, - Check: resource.ComposeTestCheckFunc( - testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), - resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "AVAILABLE"), - resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.#", "2"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.key", "FailureSimulation"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.0.value", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.key", "ExtraParam"), - resource.TestCheckResourceAttr(resourceName, "provisioning_parameters.1.value", "changed_to_force_an_update"), - ), - }, - }, - }) -} - -// Helper function to check provisioned product status -func testAccCheckProvisionedProductStatus(ctx context.Context, resourceName, expectedStatus string) resource.TestCheckFunc { - return func(s *terraform.State) error { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return fmt.Errorf("resource not found: %s", resourceName) - } - - conn := acctest.Provider.Meta().(*conns.AWSClient).ServiceCatalogClient(ctx) - - input := &servicecatalog.DescribeProvisionedProductInput{ - Id: aws.String(rs.Primary.ID), - AcceptLanguage: aws.String(tfservicecatalog.AcceptLanguageEnglish), - } - - output, err := conn.DescribeProvisionedProduct(ctx, input) - if err != nil { - return fmt.Errorf("describing Service Catalog Provisioned Product (%s): %w", rs.Primary.ID, err) - } - - if output.ProvisionedProductDetail == nil { - return fmt.Errorf("Service Catalog Provisioned Product (%s) not found", rs.Primary.ID) - } - - actualStatus := string(output.ProvisionedProductDetail.Status) - if actualStatus != expectedStatus { - return fmt.Errorf("Service Catalog Provisioned Product (%s) status: expected %s, got %s", - rs.Primary.ID, expectedStatus, actualStatus) - } - - return nil - } -} - func testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "none") + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "original") } func testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "changed_once") + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "updated") } func testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "changed_to_force_an_update") + return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "updated") } -// testAccProvisionedProductConfig_retryTaintedUpdate creates a simple working CloudFormation template -// This avoids the complex conditional logic that was causing issues in the basic config func testAccProvisionedProductConfig_retryTaintedUpdate(rName string, useNewVersion bool, simulateFailure bool, extraParam string) string { return acctest.ConfigCompose( testAccProvisionedProductPortfolioBaseConfig(rName), From 6d26c8b851d8cb8230cf11ce298b58dc3267c410 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 2 Sep 2025 20:07:43 +0000 Subject: [PATCH 1295/2115] Update CHANGELOG.md for #44093 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9427f6f26cbb..d7ddddfae27b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,14 @@ NOTES: ENHANCEMENTS: * data-source/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` attributes ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) +* data-source/aws_instance: Add `placement_group_id` attribute ([#38527](https://github.com/hashicorp/terraform-provider-aws/issues/38527)) * data-source/aws_lambda_function: Add `source_kms_key_arn` attribute ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) +* data-source/aws_launch_template: Add `placement.group_id` attribute ([#44097](https://github.com/hashicorp/terraform-provider-aws/issues/44097)) * resource/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` arguments to support IPv6 connectivity ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) +* resource/aws_instance: Add `placement_group_id` argument ([#38527](https://github.com/hashicorp/terraform-provider-aws/issues/38527)) * resource/aws_instance: Add resource identity support ([#44068](https://github.com/hashicorp/terraform-provider-aws/issues/44068)) * resource/aws_lambda_function: Add `source_kms_key_arn` argument ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) +* resource/aws_launch_template: Add `placement.group_id` argument ([#44097](https://github.com/hashicorp/terraform-provider-aws/issues/44097)) * resource/aws_ssm_association: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_document: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_maintenance_window: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) From 5b1f474df54d9d6d7af042f076b2845bfb2ed281 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 16:10:06 -0400 Subject: [PATCH 1296/2115] r/aws_servicecatalog_provisioned_product(test): simplify test config --- .../provisioned_product_test.go | 76 +++---------------- 1 file changed, 10 insertions(+), 66 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 00362a925c77..b782961c3a51 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -480,7 +480,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { Steps: []resource.TestStep{ // Step 1 - Setup { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "original"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, initialArtifactID), @@ -503,7 +503,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { }, // Step 2 - Trigger a failure, leaving the provisioned product tainted { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "updated"), ExpectError: regexache.MustCompile(`The following resource\(s\) failed to update:`), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ @@ -541,7 +541,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { }, // Step 3 - Verify an update is planned, even without configuration changes { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "updated"), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), @@ -551,7 +551,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { }, // Step 4 - Resolve the failure, verifying an update is completed { - Config: testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName), + Config: testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "updated"), Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, "provisioning_artifact_id", artifactsDataSourceName, newArtifactID), @@ -1109,22 +1109,15 @@ resource "aws_s3_bucket" "conflict" { `, rName, conflictingBucketName, tagValue)) } -func testAccProvisionedProductConfig_retryTaintedUpdate_Setup(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, false, false, "original") -} - -func testAccProvisionedProductConfig_retryTaintedUpdate_WithFailure(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, true, "updated") -} - -func testAccProvisionedProductConfig_retryTaintedUpdate_ResolveFailure(rName string) string { - return testAccProvisionedProductConfig_retryTaintedUpdate(rName, true, false, "updated") -} - func testAccProvisionedProductConfig_retryTaintedUpdate(rName string, useNewVersion bool, simulateFailure bool, extraParam string) string { return acctest.ConfigCompose( testAccProvisionedProductPortfolioBaseConfig(rName), fmt.Sprintf(` +locals { + initial_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[0] + new_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[1] +} + resource "aws_servicecatalog_provisioned_product" "test" { name = %[1]q product_id = aws_servicecatalog_product.test.id @@ -1139,16 +1132,12 @@ resource "aws_servicecatalog_provisioned_product" "test" { key = "ExtraParam" value = %[4]q } - - depends_on = [ - aws_servicecatalog_constraint.launch_constraint, - ] } resource "aws_servicecatalog_product" "test" { description = %[1]q name = %[1]q - owner = "ägare" + owner = "test" type = "CLOUD_FORMATION_TEMPLATE" provisioning_artifact_parameters { @@ -1180,11 +1169,6 @@ data "aws_servicecatalog_provisioning_artifacts" "product_artifacts" { depends_on = [aws_servicecatalog_provisioning_artifact.new_version] } -locals { - initial_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[0] - new_provisioning_artifact = data.aws_servicecatalog_provisioning_artifacts.product_artifacts.provisioning_artifact_details[1] -} - resource "aws_s3_bucket" "test" { bucket = %[1]q force_destroy = true @@ -1196,45 +1180,5 @@ resource "aws_s3_object" "test" { source = "${path.module}/testdata/foo/product_template.yaml" } - -# Required to validate provisioned product on update -resource "aws_servicecatalog_constraint" "launch_constraint" { - description = "Launch constraint for test product" - portfolio_id = aws_servicecatalog_portfolio.test.id - product_id = aws_servicecatalog_product.test.id - type = "LAUNCH" - - parameters = jsonencode({ - "RoleArn" = aws_iam_role.launch_role.arn - }) - - depends_on = [aws_iam_role_policy_attachment.launch_role] -} - -# IAM role for Service Catalog launch constraint -resource "aws_iam_role" "launch_role" { - name = "%[1]s-launch-role" - - assume_role_policy = jsonencode({ - Version = "2012-10-17" - Statement = [ - { - Action = "sts:AssumeRole" - Effect = "Allow" - Principal = { - Service = "servicecatalog.amazonaws.com" - } - } - ] - }) -} - -data "aws_partition" "current" {} - -# Attach admin policy to launch role (for demo purposes only) -resource "aws_iam_role_policy_attachment" "launch_role" { - role = aws_iam_role.launch_role.name - policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/AdministratorAccess" -} `, rName, useNewVersion, simulateFailure, extraParam)) } From bfde42d2d7ed83dc16bd93af37e7d14be24e9037 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 16:24:10 -0400 Subject: [PATCH 1297/2115] r/aws_servicecatalog_provisioned_product(test): tidy test template ```console % make testacc PKG=servicecatalog TESTS=TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run='TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate' -timeout 360m -vet=off 2025/09/02 16:15:09 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/02 16:15:09 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate (299.97s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog 306.426s ``` --- .../service/servicecatalog/provisioned_product_test.go | 8 +------- .../{foo => retry-tainted-update}/product_template.yaml | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) rename internal/service/servicecatalog/testdata/{foo => retry-tainted-update}/product_template.yaml (99%) diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index b782961c3a51..160a9e4e078c 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -1155,12 +1155,6 @@ resource "aws_servicecatalog_provisioning_artifact" "new_version" { description = "New" template_url = "https://${aws_s3_bucket.test.bucket_regional_domain_name}/${aws_s3_object.test.key}" type = "CLOUD_FORMATION_TEMPLATE" - - # Force a new version to be created when MPI version changes - # Is this needed? - lifecycle { - create_before_destroy = true - } } data "aws_servicecatalog_provisioning_artifacts" "product_artifacts" { @@ -1178,7 +1172,7 @@ resource "aws_s3_object" "test" { bucket = aws_s3_bucket.test.id key = "product_template.yaml" - source = "${path.module}/testdata/foo/product_template.yaml" + source = "${path.module}/testdata/retry-tainted-update/product_template.yaml" } `, rName, useNewVersion, simulateFailure, extraParam)) } diff --git a/internal/service/servicecatalog/testdata/foo/product_template.yaml b/internal/service/servicecatalog/testdata/retry-tainted-update/product_template.yaml similarity index 99% rename from internal/service/servicecatalog/testdata/foo/product_template.yaml rename to internal/service/servicecatalog/testdata/retry-tainted-update/product_template.yaml index e63f55771e3e..af531995bdfa 100644 --- a/internal/service/servicecatalog/testdata/foo/product_template.yaml +++ b/internal/service/servicecatalog/testdata/retry-tainted-update/product_template.yaml @@ -141,7 +141,6 @@ Resources: }; Environment: Variables: - # MPIVersion: !Ref MPIVersion FailureSimulation: !Ref FailureSimulation ExtraParam: !Ref ExtraParam From 52778c5ec0a3b9a2a21ca7c37c1fed1a9bde2adc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 16:25:57 -0400 Subject: [PATCH 1298/2115] chore: changelog --- .changelog/43956.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43956.txt diff --git a/.changelog/43956.txt b/.changelog/43956.txt new file mode 100644 index 000000000000..d3254c1a25ae --- /dev/null +++ b/.changelog/43956.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_servicecatalog_provisioned_product: Set `provisioning_parameters` and `provisioning_artifact_id` to the values from the last successful deployment when update fails +``` From ed015b65fa97cc5a30e862b57101a3d9bbfc2228 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 2 Sep 2025 16:47:40 -0400 Subject: [PATCH 1299/2115] r/aws_servicecatalog_provisioned_product: simplify custom error type ```console % make testacc PKG=servicecatalog TESTS=TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/servicecatalog/... -v -count 1 -parallel 20 -run='TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate' -timeout 360m -vet=off 2025/09/02 16:40:44 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/02 16:40:44 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate (305.21s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/servicecatalog 311.774s ``` --- .../servicecatalog/provisioned_product.go | 23 ++----------------- .../provisioned_product_test.go | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 2ab03d2a0f49..8551698fd9f8 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -519,12 +519,8 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat } if _, err := waitProvisionedProductReady(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutUpdate)); err != nil { - // Check if this is a state inconsistency error - if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { - // Force a state refresh to get actual AWS values before returning error + if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok { log.Printf("[WARN] Service Catalog Provisioned Product (%s) update failed with status %s, refreshing state", d.Id(), failureErr.Status) - - // Perform state refresh to get actual current values from AWS refreshDiags := resourceProvisionedProductRead(ctx, d, meta) if refreshDiags.HasError() { // If refresh fails, return both errors @@ -540,12 +536,8 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat oldParams, _ := d.GetChange("provisioning_parameters") d.Set("provisioning_parameters", oldParams) } - - // Return the original failure error after state is corrected - return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } - // For other errors, proceed as before return sdkdiag.AppendErrorf(diags, "waiting for Service Catalog Provisioned Product (%s) update: %s", d.Id(), err) } @@ -585,15 +577,13 @@ func resourceProvisionedProductDelete(ctx context.Context, d *schema.ResourceDat _, err = waitProvisionedProductTerminated(ctx, conn, d.Id(), d.Get("accept_language").(string), d.Timeout(schema.TimeoutDelete)) - if failureErr, ok := errs.As[*provisionedProductFailureError](err); ok && failureErr.IsStateInconsistent() { + if errs.IsA[*provisionedProductFailureError](err) { input.IgnoreErrors = true _, err = conn.TerminateProvisionedProduct(ctx, &input) - if errs.IsA[*awstypes.ResourceNotFoundException](err) { return diags } - if err != nil { return sdkdiag.AppendErrorf(diags, "terminating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } @@ -735,7 +725,6 @@ func waitProvisionedProductReady(ctx context.Context, conn *servicecatalog.Clien return output, &provisionedProductFailureError{ StatusMessage: aws.ToString(detail.StatusMessage), Status: status, - NeedsRefresh: true, } } } @@ -768,7 +757,6 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. return output, &provisionedProductFailureError{ StatusMessage: aws.ToString(detail.StatusMessage), Status: status, - NeedsRefresh: true, } } } @@ -784,19 +772,12 @@ func waitProvisionedProductTerminated(ctx context.Context, conn *servicecatalog. type provisionedProductFailureError struct { StatusMessage string Status awstypes.ProvisionedProductStatus - NeedsRefresh bool } func (e *provisionedProductFailureError) Error() string { return e.StatusMessage } -// IsStateInconsistent returns true if this error indicates state inconsistency -// that requires a refresh to recover. -func (e *provisionedProductFailureError) IsStateInconsistent() bool { - return e.NeedsRefresh -} - func expandProvisioningParameter(tfMap map[string]any) awstypes.ProvisioningParameter { apiObject := awstypes.ProvisioningParameter{} diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 160a9e4e078c..2984edf4b08d 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -524,7 +524,7 @@ func TestAccServiceCatalogProvisionedProduct_retryTaintedUpdate(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrStatus), knownvalue.StringExact("TAINTED")), - // Verify state is rolled back to the paramters from the original setup run + // Verify state is rolled back to the parameters from the original setup run statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("provisioning_parameters"), knownvalue.ListExact([]knownvalue.Check{ knownvalue.ObjectExact(map[string]knownvalue.Check{ names.AttrKey: knownvalue.StringExact("FailureSimulation"), From 1db74e3bc6a558718d13b6a8024c7e9dfedd2809 Mon Sep 17 00:00:00 2001 From: Tabito Hara <105637744+tabito-hara@users.noreply.github.com> Date: Wed, 3 Sep 2025 06:00:49 +0900 Subject: [PATCH 1300/2115] Apply suggestions from code review Co-authored-by: Kit Ewbank --- internal/service/synthetics/canary.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 7e6db51e4f4e..3dea6bc62376 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -396,6 +396,8 @@ func resourceCanaryRead(ctx context.Context, d *schema.ResourceData, meta any) d d.Set("artifact_s3_location", canary.ArtifactS3Location) if len(canary.EngineConfigs) > 0 { d.Set("engine_arn", canary.EngineConfigs[0].EngineArn) + } else { + d.Set("engine_arn", canary.EngineArn) } d.Set(names.AttrExecutionRoleARN, canary.ExecutionRoleArn) d.Set("failure_retention_period", canary.FailureRetentionPeriodInDays) From a7c5c9fcc5e1aa64e9cf21e2963a07751f586a1e Mon Sep 17 00:00:00 2001 From: robinrz Date: Wed, 3 Sep 2025 01:52:58 +0000 Subject: [PATCH 1301/2115] add release note for PR #44118 --- .changelog/44118.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44118.txt diff --git a/.changelog/44118.txt b/.changelog/44118.txt new file mode 100644 index 000000000000..ee8b0cd40f67 --- /dev/null +++ b/.changelog/44118.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_fsx_openzfs_volume: Add support for >100 user and group quotas +``` \ No newline at end of file From 49d783d6c777acda73563f72b0ccdb6258abd5ef Mon Sep 17 00:00:00 2001 From: robinrz Date: Wed, 3 Sep 2025 02:31:28 +0000 Subject: [PATCH 1302/2115] remove limit of 100 items from user_and_group_quotas block --- internal/service/fsx/openzfs_file_system.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/fsx/openzfs_file_system.go b/internal/service/fsx/openzfs_file_system.go index cb3ecced8150..188add6186d5 100644 --- a/internal/service/fsx/openzfs_file_system.go +++ b/internal/service/fsx/openzfs_file_system.go @@ -227,7 +227,6 @@ func resourceOpenZFSFileSystem() *schema.Resource { Type: schema.TypeSet, Optional: true, Computed: true, - MaxItems: 100, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ names.AttrID: { From ffa5260ab8c03b436593012a5be9a644a7ebd394 Mon Sep 17 00:00:00 2001 From: robinrz Date: Wed, 3 Sep 2025 02:33:14 +0000 Subject: [PATCH 1303/2115] update aws_fsx_openzfs_file_system documentation to point to AWS documentation for limits --- website/docs/r/fsx_openzfs_file_system.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/fsx_openzfs_file_system.html.markdown b/website/docs/r/fsx_openzfs_file_system.html.markdown index 9bcba93aa133..6637dcb91e56 100644 --- a/website/docs/r/fsx_openzfs_file_system.html.markdown +++ b/website/docs/r/fsx_openzfs_file_system.html.markdown @@ -50,6 +50,7 @@ The following arguments are optional: * `security_group_ids` - (Optional) A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups will apply to all network interfaces. * `skip_final_backup` - (Optional) When enabled, will skip the default final backup taken when the file system is deleted. This configuration must be applied separately before attempting to delete the resource to have the desired behavior. Defaults to `false`. * `storage_type` - (Optional) The filesystem storage type. Only `SSD` is supported. +* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the filesystem. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `weekly_maintenance_start_time` - (Optional) The preferred start time (in `d:HH:MM` format) to perform weekly maintenance, in the UTC time zone. From 52fa380557667b06381d76fa3640e525ca7ca45a Mon Sep 17 00:00:00 2001 From: robinrz Date: Wed, 3 Sep 2025 02:42:13 +0000 Subject: [PATCH 1304/2115] add release note for PR #44120 --- .changelog/44120.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44120.txt diff --git a/.changelog/44120.txt b/.changelog/44120.txt new file mode 100644 index 000000000000..8d2eec772914 --- /dev/null +++ b/.changelog/44120.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_fsx_openzfs_file_system: Add support for >100 user and group quotas +``` \ No newline at end of file From 50367562fcee081c3c7b974569c0f9728f4122a0 Mon Sep 17 00:00:00 2001 From: jordanst3wart Date: Wed, 3 Sep 2025 15:05:43 +1000 Subject: [PATCH 1305/2115] add new aws service workmail --- .ci/.semgrep-service-name3.yml | 61 +++++++++++++++++++ .../components/generated/services_all.kt | 1 + go.mod | 1 + go.sum | 2 + internal/conns/awsclient_gen.go | 5 ++ internal/provider/framework/provider_gen.go | 7 +++ internal/provider/sdkv2/provider_gen.go | 8 +++ internal/service/workmail/generate.go | 7 +++ names/consts_gen.go | 2 + names/data/names_data.hcl | 1 - website/allowed-subcategories.txt | 1 + .../custom-service-endpoints.html.markdown | 1 + 12 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 internal/service/workmail/generate.go diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml index e2d89c15a80a..ca3d386b1bef 100644 --- a/.ci/.semgrep-service-name3.yml +++ b/.ci/.semgrep-service-name3.yml @@ -4240,6 +4240,67 @@ rules: patterns: - pattern-regex: "(?i)WellArchitected" severity: WARNING + - id: workmail-in-func-name + languages: + - go + message: Do not use "WorkMail" in func name inside workmail package + paths: + include: + - internal/service/workmail + exclude: + - internal/service/workmail/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)WorkMail" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING + - id: workmail-in-test-name + languages: + - go + message: Include "WorkMail" in test name + paths: + include: + - internal/service/workmail/*_test.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-not-regex: "^TestAccWorkMail" + - pattern-regex: ^TestAcc.* + severity: WARNING + - id: workmail-in-const-name + languages: + - go + message: Do not use "WorkMail" in const name inside workmail package + paths: + include: + - internal/service/workmail + patterns: + - pattern: const $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)WorkMail" + severity: WARNING + - id: workmail-in-var-name + languages: + - go + message: Do not use "WorkMail" in var name inside workmail package + paths: + include: + - internal/service/workmail + patterns: + - pattern: var $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)WorkMail" + severity: WARNING - id: workspaces-in-func-name languages: - go diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt index 215b15e2dc10..63a969500adb 100644 --- a/.teamcity/components/generated/services_all.kt +++ b/.teamcity/components/generated/services_all.kt @@ -258,6 +258,7 @@ val services = mapOf( "wafv2" to ServiceSpec("WAF"), "wavelength" to ServiceSpec("Wavelength", vpcLock = true, patternOverride = "TestAccWavelength", splitPackageRealPackage = "ec2"), "wellarchitected" to ServiceSpec("Well-Architected Tool"), + "workmail" to ServiceSpec("WorkMail"), "workspaces" to ServiceSpec("WorkSpaces", vpcLock = true), "workspacesweb" to ServiceSpec("WorkSpaces Web"), "xray" to ServiceSpec("X-Ray"), diff --git a/go.mod b/go.mod index 9b2eee8c9c78..de4f98938e42 100644 --- a/go.mod +++ b/go.mod @@ -267,6 +267,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 diff --git a/go.sum b/go.sum index 710da96a7428..44650e06bf89 100644 --- a/go.sum +++ b/go.sum @@ -557,6 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcy github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go index 14c22beaaaa6..1782f1943c0f 100644 --- a/internal/conns/awsclient_gen.go +++ b/internal/conns/awsclient_gen.go @@ -255,6 +255,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/wafregional" "github.com/aws/aws-sdk-go-v2/service/wafv2" "github.com/aws/aws-sdk-go-v2/service/wellarchitected" + "github.com/aws/aws-sdk-go-v2/service/workmail" "github.com/aws/aws-sdk-go-v2/service/workspaces" "github.com/aws/aws-sdk-go-v2/service/workspacesweb" "github.com/aws/aws-sdk-go-v2/service/xray" @@ -1266,6 +1267,10 @@ func (c *AWSClient) WellArchitectedClient(ctx context.Context) *wellarchitected. return errs.Must(client[*wellarchitected.Client](ctx, c, names.WellArchitected, make(map[string]any))) } +func (c *AWSClient) WorkMailClient(ctx context.Context) *workmail.Client { + return errs.Must(client[*workmail.Client](ctx, c, names.WorkMail, make(map[string]any))) +} + func (c *AWSClient) WorkSpacesClient(ctx context.Context) *workspaces.Client { return errs.Must(client[*workspaces.Client](ctx, c, names.WorkSpaces, make(map[string]any))) } diff --git a/internal/provider/framework/provider_gen.go b/internal/provider/framework/provider_gen.go index 7323c30a14c4..e4a015994cac 100644 --- a/internal/provider/framework/provider_gen.go +++ b/internal/provider/framework/provider_gen.go @@ -2002,6 +2002,13 @@ func endpointsBlock() schema.SetNestedBlock { Description: "Use this to override the default service endpoint URL", }, + // workmail + + "workmail": schema.StringAttribute{ + Optional: true, + Description: "Use this to override the default service endpoint URL", + }, + // workspaces "workspaces": schema.StringAttribute{ diff --git a/internal/provider/sdkv2/provider_gen.go b/internal/provider/sdkv2/provider_gen.go index f8dc1605c498..3407e1fc6cb1 100644 --- a/internal/provider/sdkv2/provider_gen.go +++ b/internal/provider/sdkv2/provider_gen.go @@ -2309,6 +2309,14 @@ func endpointsSchema() *schema.Schema { Description: "Use this to override the default service endpoint URL", }, + // workmail + + "workmail": { + Type: schema.TypeString, + Optional: true, + Description: "Use this to override the default service endpoint URL", + }, + // workspaces "workspaces": { diff --git a/internal/service/workmail/generate.go b/internal/service/workmail/generate.go new file mode 100644 index 000000000000..92661d4afa51 --- /dev/null +++ b/internal/service/workmail/generate.go @@ -0,0 +1,7 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +//go:generate go run ../../generate/servicepackage/main.go +// ONLY generate directives and package declaration! Do not add anything else to this file. + +package workmail diff --git a/names/consts_gen.go b/names/consts_gen.go index 193e6c5b896f..065cdebdd073 100644 --- a/names/consts_gen.go +++ b/names/consts_gen.go @@ -253,6 +253,7 @@ const ( WAFRegional = "wafregional" WAFV2 = "wafv2" WellArchitected = "wellarchitected" + WorkMail = "workmail" WorkSpaces = "workspaces" WorkSpacesWeb = "workspacesweb" XRay = "xray" @@ -512,6 +513,7 @@ const ( WAFRegionalServiceID = "WAF Regional" WAFV2ServiceID = "WAFV2" WellArchitectedServiceID = "WellArchitected" + WorkMailServiceID = "WorkMail" WorkSpacesServiceID = "WorkSpaces" WorkSpacesWebServiceID = "WorkSpaces Web" XRayServiceID = "XRay" diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 31d87594b3d3..25a6ddae1c7c 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -8973,7 +8973,6 @@ service "workmail" { provider_package_correct = "workmail" doc_prefix = ["workmail_"] brand = "Amazon" - not_implemented = true } service "workmailmessageflow" { diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt index d385a9fe488c..d0fef3789c3b 100644 --- a/website/allowed-subcategories.txt +++ b/website/allowed-subcategories.txt @@ -259,6 +259,7 @@ WAF Classic Regional Wavelength Web Services Budgets Well-Architected Tool +WorkMail WorkSpaces WorkSpaces Web X-Ray diff --git a/website/docs/guides/custom-service-endpoints.html.markdown b/website/docs/guides/custom-service-endpoints.html.markdown index a82e567d64fb..9d363d48e057 100644 --- a/website/docs/guides/custom-service-endpoints.html.markdown +++ b/website/docs/guides/custom-service-endpoints.html.markdown @@ -334,6 +334,7 @@ provider "aws" { |WAF Classic Regional|`wafregional`|`AWS_ENDPOINT_URL_WAF_REGIONAL`|`waf_regional`| |WAF|`wafv2`|`AWS_ENDPOINT_URL_WAFV2`|`wafv2`| |Well-Architected Tool|`wellarchitected`|`AWS_ENDPOINT_URL_WELLARCHITECTED`|`wellarchitected`| +|WorkMail|`workmail`|`AWS_ENDPOINT_URL_WORKMAIL`|`workmail`| |WorkSpaces|`workspaces`|`AWS_ENDPOINT_URL_WORKSPACES`|`workspaces`| |WorkSpaces Web|`workspacesweb`|`AWS_ENDPOINT_URL_WORKSPACES_WEB`|`workspaces_web`| |X-Ray|`xray`|`AWS_ENDPOINT_URL_XRAY`|`xray`| From da847f3f196c1ed5d6906a7eecd1e7c3a1b24108 Mon Sep 17 00:00:00 2001 From: jordanst3wart Date: Wed, 3 Sep 2025 18:18:49 +1000 Subject: [PATCH 1306/2115] add endpoint_api_call --- names/data/names_data.hcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index 25a6ddae1c7c..b2d85630db68 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -8966,6 +8966,10 @@ service "workmail" { human_friendly = "WorkMail" } + endpoint_info { + endpoint_api_call = "ListResources" + } + resource_prefix { correct = "aws_workmail_" } From e1a41f57b3d8a3de37d1a5296dba81c59f8e1826 Mon Sep 17 00:00:00 2001 From: breathingdust <282361+breathingdust@users.noreply.github.com> Date: Wed, 3 Sep 2025 09:05:21 +0000 Subject: [PATCH 1307/2115] docs: update resource counts --- website/docs/index.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index e5058b3f0782..71cc4b407f39 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -9,7 +9,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). From d4c1b0d4509fa0ce83bef728e3086a0c3a5a987f Mon Sep 17 00:00:00 2001 From: jordanst3wart Date: Wed, 3 Sep 2025 19:32:49 +1000 Subject: [PATCH 1308/2115] add the rest of the generated code --- .../provider/sdkv2/service_packages_gen.go | 2 + .../workmail/service_endpoint_resolver_gen.go | 82 +++ .../workmail/service_endpoints_gen_test.go | 602 ++++++++++++++++++ .../service/workmail/service_package_gen.go | 87 +++ internal/sweep/service_packages_gen_test.go | 2 + 5 files changed, 775 insertions(+) create mode 100644 internal/service/workmail/service_endpoint_resolver_gen.go create mode 100644 internal/service/workmail/service_endpoints_gen_test.go create mode 100644 internal/service/workmail/service_package_gen.go diff --git a/internal/provider/sdkv2/service_packages_gen.go b/internal/provider/sdkv2/service_packages_gen.go index a9f570bdccc4..07a6d528f69b 100644 --- a/internal/provider/sdkv2/service_packages_gen.go +++ b/internal/provider/sdkv2/service_packages_gen.go @@ -259,6 +259,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/service/wafregional" "github.com/hashicorp/terraform-provider-aws/internal/service/wafv2" "github.com/hashicorp/terraform-provider-aws/internal/service/wellarchitected" + "github.com/hashicorp/terraform-provider-aws/internal/service/workmail" "github.com/hashicorp/terraform-provider-aws/internal/service/workspaces" "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" "github.com/hashicorp/terraform-provider-aws/internal/service/xray" @@ -518,6 +519,7 @@ func servicePackages(ctx context.Context) []conns.ServicePackage { wafregional.ServicePackage(ctx), wafv2.ServicePackage(ctx), wellarchitected.ServicePackage(ctx), + workmail.ServicePackage(ctx), workspaces.ServicePackage(ctx), workspacesweb.ServicePackage(ctx), xray.ServicePackage(ctx), diff --git a/internal/service/workmail/service_endpoint_resolver_gen.go b/internal/service/workmail/service_endpoint_resolver_gen.go new file mode 100644 index 000000000000..285133ce4852 --- /dev/null +++ b/internal/service/workmail/service_endpoint_resolver_gen.go @@ -0,0 +1,82 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package workmail + +import ( + "context" + "fmt" + "net" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workmail" + smithyendpoints "github.com/aws/smithy-go/endpoints" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/errs" +) + +var _ workmail.EndpointResolverV2 = resolverV2{} + +type resolverV2 struct { + defaultResolver workmail.EndpointResolverV2 +} + +func newEndpointResolverV2() resolverV2 { + return resolverV2{ + defaultResolver: workmail.NewDefaultEndpointResolverV2(), + } +} + +func (r resolverV2) ResolveEndpoint(ctx context.Context, params workmail.EndpointParameters) (endpoint smithyendpoints.Endpoint, err error) { + params = params.WithDefaults() + useFIPS := aws.ToBool(params.UseFIPS) + + if eps := params.Endpoint; aws.ToString(eps) != "" { + tflog.Debug(ctx, "setting endpoint", map[string]any{ + "tf_aws.endpoint": endpoint, + }) + + if useFIPS { + tflog.Debug(ctx, "endpoint set, ignoring UseFIPSEndpoint setting") + params.UseFIPS = aws.Bool(false) + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) + } else if useFIPS { + ctx = tflog.SetField(ctx, "tf_aws.use_fips", useFIPS) + + endpoint, err = r.defaultResolver.ResolveEndpoint(ctx, params) + if err != nil { + return endpoint, err + } + + tflog.Debug(ctx, "endpoint resolved", map[string]any{ + "tf_aws.endpoint": endpoint.URI.String(), + }) + + hostname := endpoint.URI.Hostname() + _, err = net.LookupHost(hostname) + if err != nil { + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + tflog.Debug(ctx, "default endpoint host not found, disabling FIPS", map[string]any{ + "tf_aws.hostname": hostname, + }) + params.UseFIPS = aws.Bool(false) + } else { + err = fmt.Errorf("looking up workmail endpoint %q: %w", hostname, err) + return + } + } else { + return endpoint, err + } + } + + return r.defaultResolver.ResolveEndpoint(ctx, params) +} + +func withBaseEndpoint(endpoint string) func(*workmail.Options) { + return func(o *workmail.Options) { + if endpoint != "" { + o.BaseEndpoint = aws.String(endpoint) + } + } +} diff --git a/internal/service/workmail/service_endpoints_gen_test.go b/internal/service/workmail/service_endpoints_gen_test.go new file mode 100644 index 000000000000..24f870ecb57b --- /dev/null +++ b/internal/service/workmail/service_endpoints_gen_test.go @@ -0,0 +1,602 @@ +// Code generated by internal/generate/serviceendpointtests/main.go; DO NOT EDIT. + +package workmail_test + +import ( + "context" + "errors" + "fmt" + "maps" + "net" + "net/url" + "os" + "path/filepath" + "reflect" + "strings" + "testing" + + "github.com/aws/aws-sdk-go-v2/aws" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/service/workmail" + "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" + terraformsdk "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "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/provider/sdkv2" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type endpointTestCase struct { + with []setupFunc + expected caseExpectations +} + +type caseSetup struct { + config map[string]any + configFile configFile + environmentVariables map[string]string +} + +type configFile struct { + baseUrl string + serviceUrl string +} + +type caseExpectations struct { + diags diag.Diagnostics + endpoint string + region string +} + +type apiCallParams struct { + endpoint string + region string +} + +type setupFunc func(setup *caseSetup) + +type callFunc func(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams + +const ( + packageNameConfigEndpoint = "https://packagename-config.endpoint.test/" + awsServiceEnvvarEndpoint = "https://service-envvar.endpoint.test/" + baseEnvvarEndpoint = "https://base-envvar.endpoint.test/" + serviceConfigFileEndpoint = "https://service-configfile.endpoint.test/" + baseConfigFileEndpoint = "https://base-configfile.endpoint.test/" +) + +const ( + packageName = "workmail" + awsEnvVar = "AWS_ENDPOINT_URL_WORKMAIL" + baseEnvVar = "AWS_ENDPOINT_URL" + configParam = "workmail" +) + +const ( + expectedCallRegion = "us-west-2" //lintignore:AWSAT003 +) + +func TestEndpointConfiguration(t *testing.T) { //nolint:paralleltest // uses t.Setenv + ctx := t.Context() + const providerRegion = "us-west-2" //lintignore:AWSAT003 + const expectedEndpointRegion = providerRegion + + testcases := map[string]endpointTestCase{ + "no config": { + with: []setupFunc{withNoConfig}, + expected: expectDefaultEndpoint(ctx, t, expectedEndpointRegion), + }, + + // Package name endpoint on Config + + "package name endpoint config": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides aws service envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withAwsEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base envvar": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEnvVar, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides service config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withServiceEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + "package name endpoint config overrides base config file": { + with: []setupFunc{ + withPackageNameEndpointInConfig, + withBaseEndpointInConfigFile, + }, + expected: expectPackageNameConfigEndpoint(), + }, + + // Service endpoint in AWS envvar + + "service aws envvar": { + with: []setupFunc{ + withAwsEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base envvar": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEnvVar, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides service config file": { + with: []setupFunc{ + withAwsEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + "service aws envvar overrides base config file": { + with: []setupFunc{ + withAwsEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectAwsEnvVarEndpoint(), + }, + + // Base endpoint in envvar + + "base endpoint envvar": { + with: []setupFunc{ + withBaseEnvVar, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides service config file": { + with: []setupFunc{ + withBaseEnvVar, + withServiceEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + "base endpoint envvar overrides base config file": { + with: []setupFunc{ + withBaseEnvVar, + withBaseEndpointInConfigFile, + }, + expected: expectBaseEnvVarEndpoint(), + }, + + // Service endpoint in config file + + "service config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + "service config file overrides base config file": { + with: []setupFunc{ + withServiceEndpointInConfigFile, + withBaseEndpointInConfigFile, + }, + expected: expectServiceConfigFileEndpoint(), + }, + + // Base endpoint in config file + + "base endpoint config file": { + with: []setupFunc{ + withBaseEndpointInConfigFile, + }, + expected: expectBaseConfigFileEndpoint(), + }, + + // Use FIPS endpoint on Config + + "use fips config": { + with: []setupFunc{ + withUseFIPSInConfig, + }, + expected: expectDefaultFIPSEndpoint(ctx, t, expectedEndpointRegion), + }, + + "use fips config with package name endpoint config": { + with: []setupFunc{ + withUseFIPSInConfig, + withPackageNameEndpointInConfig, + }, + expected: expectPackageNameConfigEndpoint(), + }, + } + + for name, testcase := range testcases { //nolint:paralleltest // uses t.Setenv + t.Run(name, func(t *testing.T) { + testEndpointCase(ctx, t, providerRegion, testcase, callService) + }) + } +} + +func defaultEndpoint(ctx context.Context, region string) (url.URL, error) { + r := workmail.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, workmail.EndpointParameters{ + Region: aws.String(region), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func defaultFIPSEndpoint(ctx context.Context, region string) (url.URL, error) { + r := workmail.NewDefaultEndpointResolverV2() + + ep, err := r.ResolveEndpoint(ctx, workmail.EndpointParameters{ + Region: aws.String(region), + UseFIPS: aws.Bool(true), + }) + if err != nil { + return url.URL{}, err + } + + if ep.URI.Path == "" { + ep.URI.Path = "/" + } + + return ep.URI, nil +} + +func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCallParams { + t.Helper() + + client := meta.WorkMailClient(ctx) + + var result apiCallParams + + input := workmail.ListResourcesInput{} + _, err := client.ListResources(ctx, &input, + func(opts *workmail.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) { + // no-op +} + +func withPackageNameEndpointInConfig(setup *caseSetup) { + if _, ok := setup.config[names.AttrEndpoints]; !ok { + setup.config[names.AttrEndpoints] = []any{ + map[string]any{}, + } + } + endpoints := setup.config[names.AttrEndpoints].([]any)[0].(map[string]any) + endpoints[packageName] = packageNameConfigEndpoint +} + +func withAwsEnvVar(setup *caseSetup) { + setup.environmentVariables[awsEnvVar] = awsServiceEnvvarEndpoint +} + +func withBaseEnvVar(setup *caseSetup) { + setup.environmentVariables[baseEnvVar] = baseEnvvarEndpoint +} + +func withServiceEndpointInConfigFile(setup *caseSetup) { + setup.configFile.serviceUrl = serviceConfigFileEndpoint +} + +func withBaseEndpointInConfigFile(setup *caseSetup) { + setup.configFile.baseUrl = baseConfigFileEndpoint +} + +func withUseFIPSInConfig(setup *caseSetup) { + setup.config["use_fips_endpoint"] = true +} + +func expectDefaultEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer default endpoint: %s", err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectDefaultFIPSEndpoint(ctx context.Context, t *testing.T, region string) caseExpectations { + t.Helper() + + endpoint, err := defaultFIPSEndpoint(ctx, region) + if err != nil { + t.Fatalf("resolving accessanalyzer FIPS endpoint: %s", err) + } + + hostname := endpoint.Hostname() + _, err = net.LookupHost(hostname) + if dnsErr, ok := errs.As[*net.DNSError](err); ok && dnsErr.IsNotFound { + return expectDefaultEndpoint(ctx, t, region) + } else if err != nil { + t.Fatalf("looking up accessanalyzer endpoint %q: %s", hostname, err) + } + + return caseExpectations{ + endpoint: endpoint.String(), + region: expectedCallRegion, + } +} + +func expectPackageNameConfigEndpoint() caseExpectations { + return caseExpectations{ + endpoint: packageNameConfigEndpoint, + region: expectedCallRegion, + } +} + +func expectAwsEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: awsServiceEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseEnvVarEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseEnvvarEndpoint, + region: expectedCallRegion, + } +} + +func expectServiceConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: serviceConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func expectBaseConfigFileEndpoint() caseExpectations { + return caseExpectations{ + endpoint: baseConfigFileEndpoint, + region: expectedCallRegion, + } +} + +func testEndpointCase(ctx context.Context, t *testing.T, region string, testcase endpointTestCase, callF callFunc) { + t.Helper() + + setup := caseSetup{ + config: map[string]any{}, + environmentVariables: map[string]string{}, + } + + for _, f := range testcase.with { + f(&setup) + } + + config := map[string]any{ + names.AttrAccessKey: servicemocks.MockStaticAccessKey, + names.AttrSecretKey: servicemocks.MockStaticSecretKey, + names.AttrRegion: region, + names.AttrSkipCredentialsValidation: true, + names.AttrSkipRequestingAccountID: true, + } + + maps.Copy(config, setup.config) + + if setup.configFile.baseUrl != "" || setup.configFile.serviceUrl != "" { + config[names.AttrProfile] = "default" + tempDir := t.TempDir() + writeSharedConfigFile(t, &config, tempDir, generateSharedConfigFile(setup.configFile)) + } + + for k, v := range setup.environmentVariables { + t.Setenv(k, v) + } + + p, err := sdkv2.NewProvider(ctx) + if err != nil { + t.Fatal(err) + } + + p.TerraformVersion = "1.0.0" + + expectedDiags := testcase.expected.diags + diags := p.Configure(ctx, terraformsdk.NewResourceConfigRaw(config)) + + if diff := cmp.Diff(diags, expectedDiags, cmp.Comparer(sdkdiag.Comparer)); diff != "" { + t.Errorf("unexpected diagnostics difference: %s", diff) + } + + if diags.HasError() { + return + } + + meta := p.Meta().(*conns.AWSClient) + + callParams := callF(ctx, t, meta) + + if e, a := testcase.expected.endpoint, callParams.endpoint; e != a { + t.Errorf("expected endpoint %q, got %q", e, a) + } + + if e, a := testcase.expected.region, callParams.region; e != a { + t.Errorf("expected region %q, got %q", e, a) + } +} + +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 = errors.New("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 any) 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 + + buf.WriteString(` +[default] +aws_access_key_id = DefaultSharedCredentialsAccessKey +aws_secret_access_key = DefaultSharedCredentialsSecretKey +`) + if config.baseUrl != "" { + fmt.Fprintf(&buf, "endpoint_url = %s\n", config.baseUrl) + } + + if config.serviceUrl != "" { + fmt.Fprintf(&buf, ` +services = endpoint-test + +[services endpoint-test] +%[1]s = + endpoint_url = %[2]s +`, configParam, serviceConfigFileEndpoint) + } + + return buf.String() +} + +func writeSharedConfigFile(t *testing.T, config *map[string]any, tempDir, content string) string { + t.Helper() + + file, err := os.Create(filepath.Join(tempDir, "aws-sdk-go-base-shared-configuration-file")) + if err != nil { + t.Fatalf("creating shared configuration file: %s", err) + } + + _, err = file.WriteString(content) + if err != nil { + t.Fatalf(" writing shared configuration file: %s", err) + } + + if v, ok := (*config)[names.AttrSharedConfigFiles]; !ok { + (*config)[names.AttrSharedConfigFiles] = []any{file.Name()} + } else { + (*config)[names.AttrSharedConfigFiles] = append(v.([]any), file.Name()) + } + + return file.Name() +} diff --git a/internal/service/workmail/service_package_gen.go b/internal/service/workmail/service_package_gen.go new file mode 100644 index 000000000000..72e816d639f8 --- /dev/null +++ b/internal/service/workmail/service_package_gen.go @@ -0,0 +1,87 @@ +// Code generated by internal/generate/servicepackage/main.go; DO NOT EDIT. + +package workmail + +import ( + "context" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workmail" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" + "github.com/hashicorp/terraform-provider-aws/internal/vcr" + "github.com/hashicorp/terraform-provider-aws/names" +) + +type servicePackage struct{} + +func (p *servicePackage) FrameworkDataSources(ctx context.Context) []*inttypes.ServicePackageFrameworkDataSource { + return []*inttypes.ServicePackageFrameworkDataSource{} +} + +func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.ServicePackageFrameworkResource { + return []*inttypes.ServicePackageFrameworkResource{} +} + +func (p *servicePackage) SDKDataSources(ctx context.Context) []*inttypes.ServicePackageSDKDataSource { + return []*inttypes.ServicePackageSDKDataSource{} +} + +func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePackageSDKResource { + return []*inttypes.ServicePackageSDKResource{} +} + +func (p *servicePackage) ServicePackageName() string { + return names.WorkMail +} + +// 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) (*workmail.Client, error) { + cfg := *(config["aws_sdkv2_config"].(*aws.Config)) + optFns := []func(*workmail.Options){ + workmail.WithEndpointResolverV2(newEndpointResolverV2()), + withBaseEndpoint(config[names.AttrEndpoint].(string)), + func(o *workmail.Options) { + if region := config[names.AttrRegion].(string); o.Region != region { + tflog.Info(ctx, "overriding provider-configured AWS API region", map[string]any{ + "service": p.ServicePackageName(), + "original_region": o.Region, + "override_region": region, + }) + o.Region = region + } + }, + func(o *workmail.Options) { + if inContext, ok := conns.FromContext(ctx); ok && inContext.VCREnabled() { + tflog.Info(ctx, "overriding retry behavior to immediately return VCR errors") + o.Retryer = conns.AddIsErrorRetryables(cfg.Retryer().(aws.RetryerV2), vcr.InteractionNotFoundRetryableFunc) + } + }, + withExtraOptions(ctx, p, config), + } + + return workmail.NewFromConfig(cfg, optFns...), nil +} + +// withExtraOptions returns a functional option that allows this service package to specify extra API client options. +// This option is always called after any generated options. +func withExtraOptions(ctx context.Context, sp conns.ServicePackage, config map[string]any) func(*workmail.Options) { + if v, ok := sp.(interface { + withExtraOptions(context.Context, map[string]any) []func(*workmail.Options) + }); ok { + optFns := v.withExtraOptions(ctx, config) + + return func(o *workmail.Options) { + for _, optFn := range optFns { + optFn(o) + } + } + } + + return func(*workmail.Options) {} +} + +func ServicePackage(ctx context.Context) conns.ServicePackage { + return &servicePackage{} +} diff --git a/internal/sweep/service_packages_gen_test.go b/internal/sweep/service_packages_gen_test.go index 3588ac486220..b65cd9455036 100644 --- a/internal/sweep/service_packages_gen_test.go +++ b/internal/sweep/service_packages_gen_test.go @@ -259,6 +259,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/service/wafregional" "github.com/hashicorp/terraform-provider-aws/internal/service/wafv2" "github.com/hashicorp/terraform-provider-aws/internal/service/wellarchitected" + "github.com/hashicorp/terraform-provider-aws/internal/service/workmail" "github.com/hashicorp/terraform-provider-aws/internal/service/workspaces" "github.com/hashicorp/terraform-provider-aws/internal/service/workspacesweb" "github.com/hashicorp/terraform-provider-aws/internal/service/xray" @@ -518,6 +519,7 @@ func servicePackages(ctx context.Context) []conns.ServicePackage { wafregional.ServicePackage(ctx), wafv2.ServicePackage(ctx), wellarchitected.ServicePackage(ctx), + workmail.ServicePackage(ctx), workspaces.ServicePackage(ctx), workspacesweb.ServicePackage(ctx), xray.ServicePackage(ctx), From 9b56776eeaf0624f3075fa39879f8649c1d7a87f Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 3 Sep 2025 13:31:04 +0000 Subject: [PATCH 1309/2115] Update CHANGELOG.md for #44124 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7ddddfae27b..6c2ae97136f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ENHANCEMENTS: * resource/aws_ssm_maintenance_window_target: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_maintenance_window_task: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) * resource/aws_ssm_patch_baseline: Add resource identity support ([#44075](https://github.com/hashicorp/terraform-provider-aws/issues/44075)) +* resource/aws_synthetics_canary: Add `run_config.ephemeral_storage` argument. ([#44105](https://github.com/hashicorp/terraform-provider-aws/issues/44105)) BUG FIXES: From 2115e120174d4f0a11a35621d42566e2b60a1860 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:34:57 +0000 Subject: [PATCH 1310/2115] Bump the aws-sdk-go-v2 group across 1 directory with 5 updates Bumps the aws-sdk-go-v2 group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.249.0` | `1.250.0` | | [github.com/aws/aws-sdk-go-v2/service/neptune](https://github.com/aws/aws-sdk-go-v2) | `1.41.1` | `1.42.0` | | [github.com/aws/aws-sdk-go-v2/service/notifications](https://github.com/aws/aws-sdk-go-v2) | `1.6.4` | `1.7.0` | | [github.com/aws/aws-sdk-go-v2/service/quicksight](https://github.com/aws/aws-sdk-go-v2) | `1.93.1` | `1.93.2` | | [github.com/aws/aws-sdk-go-v2/service/resourcegroups](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.33.3` | Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.249.0 to 1.250.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.249.0...service/ec2/v1.250.0) Updates `github.com/aws/aws-sdk-go-v2/service/neptune` from 1.41.1 to 1.42.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/fms/v1.41.1...service/s3/v1.42.0) Updates `github.com/aws/aws-sdk-go-v2/service/notifications` from 1.6.4 to 1.7.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.7.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/credentials/v1.6.4...v1.7.0) Updates `github.com/aws/aws-sdk-go-v2/service/quicksight` from 1.93.1 to 1.93.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.93.1...service/ec2/v1.93.2) Updates `github.com/aws/aws-sdk-go-v2/service/resourcegroups` from 1.33.2 to 1.33.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/mq/v1.33.2...service/ses/v1.33.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.250.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptune dependency-version: 1.42.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notifications dependency-version: 1.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/quicksight dependency-version: 1.93.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroups dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 9b2eee8c9c78..b178f2a1d73a 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 @@ -177,12 +177,12 @@ require ( github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 - github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 @@ -201,7 +201,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 @@ -211,7 +211,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 diff --git a/go.sum b/go.sum index 710da96a7428..ccd5edacc14e 100644 --- a/go.sum +++ b/go.sum @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGi github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0 h1:1wn3h1PKTKQ9tg7bzfm4x1iqKYsLY2qfmV4SsDmakkI= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.249.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 h1:aosVpDecA17GN0AmQRq/Ui3fEt5iQ3Y2QUCIyza6e7s= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= @@ -375,8 +375,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9 github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1 h1:TwN2txusfBqaZBtixFilA20xRq0fqbcASyN9TUhHiEI= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.1/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= @@ -385,8 +385,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CF github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4 h1:FmGYwdsa7KuUej6bRuJ1grKMEvRkWKEgQFxFGn5q3rI= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.4/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= @@ -423,8 +423,8 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1 h1:HPvJaGyfoMWtMbCXHd+IsKOKxsYaazYgjMW/OlVTHsI= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.1/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= @@ -443,8 +443,8 @@ github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2 h1:hjNxi1Mz1i3BfD3T52iarE2KEMnTKbTYwpq3rP66emk= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.2/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= From 1b055636d89921ca20ea9b6c1c9093b73232abab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:35:03 +0000 Subject: [PATCH 1311/2115] Bump github.com/hashicorp/aws-sdk-go-base/v2 Bumps the aws-sdk-go-base group with 1 update in the / directory: [github.com/hashicorp/aws-sdk-go-base/v2](https://github.com/hashicorp/aws-sdk-go-base). Updates `github.com/hashicorp/aws-sdk-go-base/v2` from 2.0.0-beta.65 to 2.0.0-beta.66 - [Release notes](https://github.com/hashicorp/aws-sdk-go-base/releases) - [Changelog](https://github.com/hashicorp/aws-sdk-go-base/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/aws-sdk-go-base/compare/v2.0.0-beta.65...v2.0.0-beta.66) --- updated-dependencies: - dependency-name: github.com/hashicorp/aws-sdk-go-base/v2 dependency-version: 2.0.0-beta.66 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-base ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 9b2eee8c9c78..5314bdea9cbf 100644 --- a/go.mod +++ b/go.mod @@ -279,7 +279,7 @@ require ( github.com/goccy/go-yaml v1.18.0 github.com/google/go-cmp v0.7.0 github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 github.com/hashicorp/awspolicyequivalence v1.7.0 github.com/hashicorp/cli v1.1.7 github.com/hashicorp/go-cleanhttp v0.5.2 @@ -338,7 +338,7 @@ require ( github.com/cloudflare/circl v1.6.1 // indirect github.com/evanphx/json-patch v0.5.2 // indirect github.com/fatih/color v1.18.0 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -369,10 +369,10 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/zclconf/go-cty v1.16.3 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0 // indirect - go.opentelemetry.io/otel v1.36.0 // indirect - go.opentelemetry.io/otel/metric v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect diff --git a/go.sum b/go.sum index 710da96a7428..3b10ec078f31 100644 --- a/go.sum +++ b/go.sum @@ -602,8 +602,8 @@ github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60= github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= @@ -626,8 +626,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 h1:l16/Vrl0+x+HjHJWEjcKPwHYoxN9EC78gAFXKlH6m84= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 h1:81+kWbE1yErFBMjME0I5k3x3kojjKsWtPYHEAutoPow= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65/go.mod h1:WtMzv9T++tfWVea+qB2MXoaqxw33S8bpJslzUike2mQ= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 h1:HA6blfR0h6kGnw4oJ92tZzghubreIkWbQJ4NVNqS688= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66/go.mod h1:7kTJVbY5+igob9Q5N6KO81EGEKDNI9FpjujB31uI/n0= github.com/hashicorp/awspolicyequivalence v1.7.0 h1:HxwPEw2/31BqQa73PinGciTfG2uJ/ATelvDG8X1gScU= github.com/hashicorp/awspolicyequivalence v1.7.0/go.mod h1:+oCTxQEYt+GcRalqrqTCBcJf100SQYiWQ4aENNYxYe0= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= @@ -768,8 +768,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -792,18 +792,18 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0 h1:lR4WnQLBC9XyTwKrz0327rq2QnIdJNpaVIGuW2yMvME= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0/go.mod h1:UK49mXgwqIWFUDH8ibqTswbhy4fuwjEjj4VKMC7krUQ= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 h1:0W0GZvzQe514c3igO063tR0cFVStoABt1agKqlYToL8= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0/go.mod h1:wIvTiRUU7Pbfqas/5JVjGZcftBeSAGSYVMOHWzWG0qE= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= From 87722940b2b42179a24bd002c3643e91ebc01730 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 09:43:01 -0400 Subject: [PATCH 1312/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 534 ++++++++++----------- tools/tfsdk2fw/go.sum | 1068 ++++++++++++++++++++--------------------- 2 files changed, 801 insertions(+), 801 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 294bafceeae1..4a6da6b9b129 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -18,276 +18,276 @@ 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-v2 v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2 v1.38.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.5 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.9 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 // indirect - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 // indirect + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 // indirect github.com/aws/smithy-go v1.23.0 // indirect github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 10e51ac168e7..86fc7e27d027 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -23,546 +23,546 @@ 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-v2 v1.38.2 h1:QUkLO1aTW0yqW95pVzZS0LGFanL71hJ0a49w4TJLMyM= -github.com/aws/aws-sdk-go-v2 v1.38.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk= +github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.5 h1:wsZr2kq1XeKU/D2QDcW5xEB1zHPdHAuQqnR0yaygAQQ= -github.com/aws/aws-sdk-go-v2/config v1.31.5/go.mod h1:IpXejRuSIyOSCyT4BomfIJ5gWRcDoX/NJaAHh9Cp8jE= -github.com/aws/aws-sdk-go-v2/credentials v1.18.9 h1:zKrnPtmO7j2FpMqudayjCzNxyO8KtPQGCIzqEosKQbg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.9/go.mod h1:gAotjkj0roLrwvBxECN1Q8ILfkVsw3Ntph6FP1LnZ8Q= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5 h1:ul7hICbZ5Z/Pp9VnLVGUVe7rqYLXCyIiPU7hQ0sRkow= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.5/go.mod h1:5cIWJ0N6Gjj+72Q6l46DeaNtcxXHV42w/Uq3fIfeUl4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3 h1:0gJ4oDYyvGZz0C/YNmDkbpL25AK+cILbyDbPexWz/+0= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.3/go.mod h1:BE+FqQuGYSvEk8NJc33a+JNkirdkdRqCrc+7B0HWb3E= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5 h1:d45S2DqHZOkHu0uLUW92VdBoT5v0hh3EyR+DzMEh3ag= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.5/go.mod h1:G6e/dR2c2huh6JmIo9SXysjuLuDDGWMeYGibfW2ZrXg= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5 h1:ENhnQOV3SxWHplOqNN1f+uuCNf9n4Y/PKpl6b1WRP0Q= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.5/go.mod h1:csQLMI+odbC0/J+UecSTztG70Dc4aTCOu4GyPNDNpVo= +github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= +github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ= +github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg= +github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5 h1:ovHE1XM53pMGOwINf8Mas4FMl5XRRMAihNokV1YViZ8= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.5/go.mod h1:Cmu/DOSYwcr0xYTFk7sA9NJ5HF3ND0EqNUBdoK16nPI= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1 h1:ntf4V0+gKWtRv8D0to90E3g69618MInKW78fds20zbY= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.1/go.mod h1:6TzoN4j7QtbeN62zbHHOEThTBqFDnUpNsdHE2SXuu0k= -github.com/aws/aws-sdk-go-v2/service/account v1.28.1 h1:GJqHyB+4c8U0p+S7w/C1CGNb3gqgs1Sw6lTqMSpGcHA= -github.com/aws/aws-sdk-go-v2/service/account v1.28.1/go.mod h1:UCcTaFy22BpCwjdiXGTCiVjtBZgtJb56eos4OI43B9g= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.1 h1:P710/BAFzgEHTPVIMB1Qn8K+m4chGfzq8LrXmCJ8hH8= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.1/go.mod h1:l7aVt1kcuhWwEBe3MR6A8ouigGf8SyyOFoZImL16cEI= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0 h1:87qBnaFjCBUf5dEpTEHKmnkJEyXslmEPFItL5L3ZrNk= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.0/go.mod h1:hAXTbJJQ1mZJM1EQZjHA+3syf+iZVyqxRWHqT1OC/Hg= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.1 h1:uhHfjsVcdtk2NVuRWJnPZK33/gFtDhk9hs79iAAVsXw= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.1/go.mod h1:1tj7Y+YXKVKhuVsj4hfe+k4nLE0arLfgC4kCHoKFNYU= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0 h1:PjOJl0ZDQxrTprHRxZbzVwjM/7MQeBrRcwkdXLB39Tc= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.0/go.mod h1:Ajlj0MwU1TxJMYkb37XJUkWs13kuarUPTm7m2kcJDtw= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1 h1:p2pAltDBQvgCyyLsPLo1WSyicdpGcHnpedDRpBo7HHw= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.1/go.mod h1:LUNgU2kLgMZ3ICuuoYj2kI3vikKUYwDI+aVT9gEnajo= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1 h1:nPrMtyiMdUAneLACXq2iFSMPuHyD2IOVl/bLJXL6c2Y= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.1/go.mod h1:VxrbU0yq1a6AdduW/yI5YrMbfACUXfJq2Gpj23JUJu8= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1 h1:o5FTKuEwSn/ttMSj5OI+IYhlAP413waZh8CNTaKClnY= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.1/go.mod h1:FbIQEQbdcSAJ35ZSLM9+4pUAEVXe0RsCJKgzZiRy8wk= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1 h1:a78dFe6wN2hHK0WXQDeBzWS4KyzqYftyzX1OlRFRSPo= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.1/go.mod h1:IX3LdIF1/2D00vH+eBQ5cbFXrK9HfPW8dTH6gzWThY8= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1 h1:5WaOMefb8boa+HBp0bfKRwnf486ynniz08euLteCjY8= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.1/go.mod h1:mdW1uSvcKM+EhR1xefaaeU9O2mdnMF7XwRqf04u7qpA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1 h1:LqlJxMqZKO11psmkCazf+ofBxsjPNwJ1jCqz5D2akow= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.1/go.mod h1:aYkb+J9Eo8XyzZT/I9qbFpXOQvvtD7ytNiwFb/Mz5Fc= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0 h1:CKggICBOHjkRd5HusMhgUj5rncInyNxwQIHjcArLti8= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.0/go.mod h1:BYW9ZlhST3lLDqeesEct+WOzucFNrpk+kf+d/o0M6rs= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0 h1:ApJsTlZFXZncPcpJOI+DGR10vIRSoD4dLDHXnb/ffzE= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.0/go.mod h1:NkTave92JOvfPovjGPUDERHFt7lv5JEFfe/RcbDeaEg= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3 h1:1SZvNJ7Jt4+7eCKR0dAgxI2Fht7IQzCXwklHfOtTfkk= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.3/go.mod h1:sfGT1L951RjKv+4TsRljLmruskq1EQH0VNdp0WvMw0c= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1 h1:b/32H6dJQxll/Kq7fcutiyAwU9XeTu7B4TOv123Tsrc= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.1/go.mod h1:XoNLk8uGFqHI58y2Zfjd8ot+j4D4GKWE1evCEj2eTUc= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2 h1:kl6w4EyM5AMVfZiMLBqySrLhySEtO1r3Xpm8z4KPC9Y= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.2/go.mod h1:owM156DmU/5hlgzAHc3bJO6/Mwx9hM251wIn4cdS4bg= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1 h1:fCti6P4Z5ju/qpVe9ka+FzhT1+t9knCKC1LopL9m6+M= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.1/go.mod h1:SYA8vbJvPufQzriPDOBPm5JQpGjKuXqVTKr59KoHC6k= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1 h1:jRd+pDRMh5vyg7RJwyVrF8VJJACCbo8L1Ggm2duwuWU= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.1/go.mod h1:3etelpvZBQTN26rH5Cf/S82hU4DUi9XP9s4Lq1bAeRw= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3 h1:uYw7UyBPxmHjrdhbWYMcAuOw/w3/t/4ieNsIYeBgbrE= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.3/go.mod h1:0nr7mHOJvPp6YPsl1foq6dtYCvLXOqA32PNh4rOvV6M= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.1 h1:1CFdJpOtQqHj7JJ6e9u5EDdigqBVJAtA19+u/XFN0KM= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.1/go.mod h1:uiwfDwJN9bdkTr0nBmjzZ5pE6j91gIkdZr5FL1gcH8s= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1 h1:KrxnB+/Ix0ah//LT1kfB0fYpRZZ8djckuY7C0hSMekw= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.1/go.mod h1:dn+31JFCoCmiNXGSVIRJ9EVZwl8ZHft5Zqq7gAkp7fU= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1 h1:o4quwc5ezdgvDxfbD2zBL0653Jmpg0tR4SRqg4Ezta0= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.1/go.mod h1:tJLdRVMO6ug+q2LGEjDggT57Rw05agP1snXKFSrm9Jc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0 h1:A0dOhGFcu30rUt2GQsFSiruqUvCr3AcI7kGDUjLCDPg= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.0/go.mod h1:cP6Ud98IH6RUIoJdjF2GOuwxC6InWCyKhqqwd/uJUlU= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.1 h1:BfiJL1h96W458Bw8zZqWAZDboMKEa4Vve4bTlKsuZHI= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.1/go.mod h1:2FxHL+YwO6/T34bIgM9sMiUin5H1bd57aP7NZ2g4Se0= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.4 h1:3gsAbIfuxqz/hvyg8HFs8LEBO97XsZck/Saf1g9N7Qc= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.4/go.mod h1:tli8PsM6pY+zVBNO5TQmjpfH4EOUQmVmZMwdYrNS2dM= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3 h1:2/qC6iyQKuWGUc/Id4iyFk6RvznP/IM15e9/yZxvr2E= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.3/go.mod h1:eVLsZruYbIlLNYiJmgLYrfUHojwUuicjZWtdqNNKNM0= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1 h1:vw2QXcYKXDpkATmlx9u6Wr09DuKVRD+9PaSIIEOzFhQ= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.1/go.mod h1:/cPr0IPQv5WdY66EbW0Q6MhkEgsffgZm3yce+9p8bTk= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1 h1:dhzAY4v6UMfXtTiIx1DYSZ0XsspYeamKL5ZKz6xDvLU= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.1/go.mod h1:zEodD2/kBZ3ZkvCQ+BI+ssglVf63iFaQFUTPJ+nHqp0= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1 h1:oo3m07jVAwsDIpLVyK/xe9SLMU9SJPb1xdDzeOokB1Y= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.1/go.mod h1:A9jOizMWCC5jhr6LxEDUHX2E93F1yhHFLSXt675rYnM= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.2 h1:KoFiEKwKZzNXPw6DXobOE+fj11vlO4dfCEYcEdwD/YU= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.2/go.mod h1:lsoYw+OFJmS8qAQ5dqJgVxdrD2bpwb/H745dIn0FYbs= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2 h1:O+6iMlJS/Q4EuCWjeuQxeWYUbI/Oe2t8dpodDxlcUZE= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.2/go.mod h1:MbAwOxXSx2BqyRO7lwjBif37kxuJXmKtH1evpqO2JrM= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1 h1:4V1/hFlp8c4JcgSj9CJf5v37P6fU1KISSY4n6bFtOBQ= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.1/go.mod h1:7FcgDxYbo1T+/PalhytMEKMamKlvO8ArdBL6faoA4MA= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.0 h1:rfnS0WZj9LUQ+EqMAfZiGKtquux/U7m4AbijAB+rLD4= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.0/go.mod h1:cCaE9m91FJAzxAxDtVuNkYUGi2b8BGT0BdxUpCAuSSE= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1 h1:IUPXngqpjUMMNk4SInQHLcsRiD9Bs8ALoVdkWt8ocBk= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.1/go.mod h1:LHkXcBjWxtd4d3oNXk2yYgutSJRm8RDXswU02q4zWrw= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0 h1:ODu09ttlefuFHYh/9qgasV7EVPwT77w7n3W9Dt6xR4w= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.0/go.mod h1:lYnUjAovFbs8P+hSc5XIoE11iGPlHk2g/FLa0CBDsdY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1 h1:t2qx6QwMdGcPWLTfGst/BhTXjkHPinwvB9+Ym2YmQQE= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.1/go.mod h1:VHXJrJvDZUapCDAbJsLOZ7hkY9rjmz7JDR0pevEwgcM= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0 h1:kJnHCohevlyrJpPCgxAsk9KXO8vmnfffeBbR//zCL0U= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.0/go.mod h1:bmwic4bwDEV7wYLGQOlNRDE233WghpSe0/uJpWnrtgw= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1 h1:L0cPPZhwgpL6eMbwPI31ac1yD6amFaQhs3Gu5A3Z4lw= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.1/go.mod h1:fwCiVK7SBez1VDSj3IPr6PN2y4GxzGFURGw1YsIm5YU= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1 h1:OTip+sZ1/aO3cueSOPimzNeJintrM5+PZCnqgZyRhDo= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.1/go.mod h1:/1a6OiHnno31OznAJQT7fyU0oUVKEWlfQkWIYzM8sjk= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1 h1:GLFwSI5tZqUeaFbVGD13X4HK3imy8+3mRFJOJQqaYbY= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.1/go.mod h1:+sEJAe21HPWwD+5Rlwt/fp0xryJaHWaZX08UXbJ7KwA= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3 h1:baSqpNLPj3wrQ2TWgXY3fjcyx0+Hz35tugIWB8CACJg= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.3/go.mod h1:fwMqawrIGwvy9YHzGyxsiogEXW2uVt3ic521VqeFO8Y= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0 h1:HJiT8gGEPXXRPfOgqk9bhmQB9UAmm5A/iW696FbHS0Q= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.0/go.mod h1:Ll4P7yS0usasJPBnU/Odb14EiQCHZzklx4OiGK2GWoY= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1 h1:w7J6DC2mUbYuzphQwrJrINlonkRnQwSSOCmk1/JumA8= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.1/go.mod h1:eOO8T9QZRTO+h89334J8kmvJOW8yUHFHx+lBvHN6uiY= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1 h1:xOIUnme2rz/ueoZeH4/KYy62ycYNv8aOwCDBMBEUhUA= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.1/go.mod h1:TXpE7TkM6gbt/s2S/xndpv7jy3AP2jnlfBtNu0r4aYY= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1 h1:laOaNfrx9LuLfsDXRQv5yu6kAIY4XDwva18rqbvvzWA= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.1/go.mod h1:QJBeAX9imA8RWLG7/X2RJtTmSerdENe/hCGIjllPGHI= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1 h1:EaZZMoyDYiYyS2xd8GrPvqyX7FWskN2C7qJscceONAs= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.1/go.mod h1:yfmvd1yoaZOPxwn97mnTnF6Jt/d8sThRqfs2RISPQi0= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1 h1:hTk3ctsQAckuWNdv+B2ELcFPRsKwaWbA43C65k8wa0Q= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.1/go.mod h1:1Dyvs+9cfooiIHba3iRvM88OPUB2NH8soQgW8gGCXaE= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0 h1:v1FaGaVUK1FI2ZTpLWzrV49MPZ49cfUGSQOTKhYN5FQ= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.0/go.mod h1:ufwtLF0mNQW0gCLbgdaHFgVtzUHeZ4VKKgdCjrmKpIE= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3 h1:3FeaxggPdMuSREZgQc4sqD99IWO6FnTsGJQlDE8k/jY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.3/go.mod h1:WIcsVbfKETtSzv7BMpVsAe10+8pkBBN8JGwJRGnZAQI= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1 h1:zqrLMYxiBhTcApxEmmD0MkFssRjK/yn8qrPFyZgHe90= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.1/go.mod h1:MdO/rN8DiJUtWlY5XCoOjHaAAY/AvxQ5L4rFRUhe3NU= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0 h1:bJ/QvgNa8M/jgu3ckW1luKjz0W4hRPK6aV4uzFy22JA= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.0/go.mod h1:U0SmK6j3uT69CZnwUViQtK+2us7E8aaP6EYR8nlA6/g= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0 h1:4p/RqjIgBgYg/t2LQfETAUt82vIPmI+pM9w8M2xgV/U= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.0/go.mod h1:Ni1Q6Y5//BeWpM9UDFi55ZyDJDc1/ptGHX7wG4wtW5o= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0 h1:GIEguDMVmN28IYsnmWhD5DZSK8HacW8nNUxWWWh0TGg= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.0/go.mod h1:nXKXgQM8+yHhGfKrm8eA6tLLqf6qBPlEUW767VU0fxI= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0 h1:a99X9mqRjd1y9Egl0Z8fR+qG1+tEV/EHvnV3F5i8G0k= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.0/go.mod h1:YP3EP8K+5HmnV1Ojjn/9shaWI8r916NkgH2YGawq6LU= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1 h1:VOqLvu768m0kWPdH3s53LZWsd0qzNJvWjqwJwl03CTk= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.1/go.mod h1:Hx521/QnFL1mF8fw7TyZJcqdk6G0xQejdBxScTj5jN8= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1 h1:HDxijOUE9p2tdeV2JFGXALXx6Km7qhYM1gD8cAseECQ= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.1/go.mod h1:hB5a4Dd4Q59lQl+f7Q7DIbFWZuUdv60pZRfmKySYXy8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1 h1:7m0KRnKwTyyqpPA5J5NMMJqK4VAqL/7TdhO7KtUN4O8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.1/go.mod h1:eXa+YkefIF2/zXsnW7vtA+KOHqWdRByLbMyMlPf0qTE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1 h1:EgHVKFxUPo3DCqDiSrbIhBm5lmCf6q6wWuOnXU7TsXw= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.1/go.mod h1:BA0tEb4cNsfecUnT72QtAiwVj4RDrhANkbMWgr8upt4= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2 h1:fUO7oazI6MgIzXACC3M9/Qy0fEe6r7Eki6oFAteiASA= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.2/go.mod h1:u6UQOkyctJPBzjoo+DykqLZ0e4UJXJez67sFtGjRYmc= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1 h1:J4NSoppzNWsnfQ+xOQN+4LMWw124mqNyIVc95yBUU1s= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.1/go.mod h1:bpueKKPNQQyTsKgFet4PdAgl+XLSHBKUiZ0j+vQlk34= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0 h1:GZ83aOUiEHog+8BnOQlxg1UxJz46DnxzordAIusr7Bg= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.0/go.mod h1:/cQmV4eGarSfdJSYBTfejp4ow8eC3bHQUqucocSeSs8= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1 h1:mmn3sExsirC/hHTpiRS08oQVAvdm67Cx/qOJkIw5giw= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.1/go.mod h1:dWM1bmtDOniIniIQLtPvXHOq6J+ld8KomF7mjDvrhHw= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.0 h1:EvhA1KAhFG9N6e5BzhQ22jn208tRdmk8l7FSXcMBApw= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.0/go.mod h1:92JXKicCyXoDtGTiF2/OqnOg6N45Jv86vT3vxvETHGg= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1 h1:x6yrPrMQbYR5kKHhi3qXVZNjaMpsfe9xnjliW/XALYY= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.1/go.mod h1:eg54Rpe8C9sDnUrI7Oi+gOSJBaITZrV5cAyO+yRCVQI= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1 h1:x1uafc9h42GA+JoZNlc3ZgZket93HB9+ixCs6LDv9g8= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.1/go.mod h1:xbYZ9+N7gYc30vMR6IOb4Y5UHB3V6q2aaxe4SrVNXLc= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1 h1:rGlYZIBz+1Y7mtu2qmMKdw1I42zjCqe6LUJ0CFuRzwg= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.1/go.mod h1:yOFkixPF7VkKZKzkgEYx7UM7nqkhPWRNkV1AoWXEwqw= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2 h1:+bl1IWBe9czY7+B2VmjERXXM7A0Cv4Z95A5M0pbJ8kk= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.2/go.mod h1:rpux7wx/IwrzFQeHZejTPAw5K+VjkZgqxwSVb4f8VUY= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1 h1:8al8RyP6gjJ8Ti56vJmWblJzRshyHmzl8pCmwwIV0d8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.1/go.mod h1:ujChJcb5Na2xzIwgJFkNO+B241PF3W599te3yD32e8Q= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1 h1:BIH0NWmhyRCWSxjZchOUJ9aE2F6MYmHmaScru2MLSkg= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.1/go.mod h1:HxBMcTcIKIcTCvt0LvH1wzfU7Oub2rRujjIkCpNa3h0= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1 h1:2KE0rvQ7IFVM72gLTJSojx6EZOB/KCIZ7xoyUNynVpo= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.1/go.mod h1:LD5GbxyoJ+npuUkPDt6pqqf4ZmXcIntyLHnzs2572hY= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0 h1:v/JdfpmZECF3FJmzi+SthZB/Axnb8C3NzVsN+xAl2q4= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.0/go.mod h1:Y6YRQvdoajyEdg0yIJypxii715FZOyBzPyhdl7kAPgo= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1 h1:cnpis3/bwF3xPEtr1AFm6BCxV+CykCsdg5GNDDryF3Q= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.1/go.mod h1:oQ1WI0Cn1bAmC5hRzCT6CDpDKm3YjcZc5qlAmOwgL4Y= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0 h1:dFXXlK+eIpG477kepck2yScOoTuXO6sHBk+7mJCiffE= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.0/go.mod h1:AszugMxR76tEt6QU7mbYM41h35MgeamN7HrXL08i098= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1 h1:/y+qgW3mkYrgjkWuuY/IKwPAp9ImU7h3mxdCvsE63r0= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.1/go.mod h1:LIVjAaMXcYxF2hlrfS67SbIC0r9xGyLQCY4WkeUAbLI= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1 h1:d0fOqa3uXzt9ew9KQTD8NEHreuRPdi4UfTMQ6ILUzeg= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.1/go.mod h1:QRv7lhO6qNHRWOvW8tzqkPwwRRBamrtYtnHY+DVrZr8= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.1 h1:GWhsFL+Uwp0VYORyUXuLK0Z/RCPWMBiW4uHLjZLsHi0= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.1/go.mod h1:bROwP3K7obQzc1lytji0K6MDwavTNADoCXzIMBL4rV0= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.2 h1:OJwXieRgNvQ7+6RuEVzPe6yhNG3CKz06vQEmLhRlSiE= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.2/go.mod h1:3db0FYylodrSUD0M+aAK3qHW2vX09oOn4zpuA0RCJBM= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1 h1:XRhowD/zNweGhd8Si/1A73cx5GrYmXbmKNho0VAUChI= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.1/go.mod h1:6zhbFkB+HRZ0cSg9tAydoSbegTDErbaFtxUdNIknhsg= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1 h1:fUhbGfzPFm9VEwjR52jmdMDUl9pwePBS+eruDvYPSLQ= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.1/go.mod h1:ZrN/blD6ifgST8JxHwLIXnVJ0y/IE4MyZTTkxKMf4jA= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1 h1:HwMzGKHPtaufSX74g42ItMNnyVQjUF+QJ8VhmXR0rQI= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.1/go.mod h1:pq3d1zkOEUuWtIsrPhTeaa2NK4bycj1zimpeep4trrY= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0 h1:5MthmITq3unZoB5EHlwYsoadubv0H/vi8/gnO0/UmF4= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.0/go.mod h1:KkCYX9biRFzx8lAEgYyNSuQ3ljMK2ZOTnplMhHyCfhk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1 h1:7UulsUUt7omyKtyiVsVSgyb4ophH1kVV4dtO5ZT7/3o= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.1/go.mod h1:5WWwggaheKkEFmlCkClB7VnUgnRMVYrWSFJHQujEQ+4= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1 h1:wOjzyHbSfOd9PeUOEwI6NCnG1RepyqKJmXRxuJAMZD0= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.1/go.mod h1:6BdZwKA5lrUl5FoReQ000/D+OnVxfGxZyjwuWNKxiRo= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1 h1:2hWFF4KIbgSQ0nHmy+T3uoNmQ096Fty+L6nf4Swb018= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.1/go.mod h1:jCU6Bb4RlCMdvgVZTmfrCSHAJ5wzNXdJKEgQfX6M1Kk= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.1 h1:lxDTrpByAY4y4ibvZ82YMJPoP4/itOixWHRhB0tsywo= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.1/go.mod h1:iWVWdGOZpNs2GQSdPnHWD7eNCEtlvas+M87UsAqVyD0= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3 h1:orYAuiBkDHnWys/nPVPWK1p2u4hJw7B9Z/CD2z7XaiQ= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.3/go.mod h1:3XgR4wxSNt9RpB1F8MgQrqcMTWJ9FCfoXGrcMuy7ooo= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0 h1:SFGMSoIZ+eoBVomUepL0NsunbKS8KZ+TupTVBwajQAk= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.0/go.mod h1:c1yue4JwtH4uvgSduKUyVUvcHRkD09h6IOkvWBaqDno= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0 h1:HMGUQWPOu0Z6gzc/odJ1T0UJezDwzy3xSy13fOUSTp8= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.248.0/go.mod h1:Af36mfLJrRHDbhlCkkuut8nnw/5C29WK1b7mCndH12w= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0 h1:hnQZNKeh5RFUNHwkK26yBNPNAgcAvlPm/KWrOE6ZmfU= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.0/go.mod h1:RBWOYZgpHUpBdXx0aDpIbqJFnfgR4yChDZH/4aj07/g= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1 h1:MM3TR3FAzUWUI4VMYBrZ4NhlqwPQ9pOqkpDek1GOCYE= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.1/go.mod h1:9aYtwEXwAkaakhlzcUvw++8fD8Ow0HFCeHKKNg89mLM= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3 h1:3RXTFwEqcSO9SelJKLTnQuqLXTM8MmaqF2RpLX/8la8= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.3/go.mod h1:Djd18W785OhsZRJcmWOBScRpJfrYtPYPl5e6ignT0lw= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.2 h1:E+nb7y5lRuNHsINV4nNFurH+U4BnJsa3SCPIZyUZxFo= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.2/go.mod h1:XkI+sL604XSxj0puip8ECW4ZI4BEksuJq77qVrk9FlI= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.0 h1:Pm/3wY0HzvZ5DrCMvMpUXhaeD4lJ+3PfgD/VJfROoQ4= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.0/go.mod h1:L3v6KI08dxAjEC16qpPb/uH7mMFlk5Ut7IVbFmB+2SQ= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0 h1:Q/3Cwc1ndao38DgQgyQiIvxdrTxSUi8Bdo4qk4WGGBA= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.0/go.mod h1:XJKCh9tr2gv4EiSbh7v4QOacRLLjgv91+DvuNuvwOxM= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2 h1:XJDLrFJonwlDdutaCfbEW3es2jZDM5+j2xe9IL7WqDw= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.2/go.mod h1:28fLKqJDUYtJyagwMg5mY4pjHeIqotYqj3Y7r1ZbF0I= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1 h1:Tif4eB0xZvLSIHs51tOH+nxv6eRn9POPPx5J//IIOk8= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.1/go.mod h1:IOeGzMdHDJsRZefrjoGKP7OWctaKmfKbjHY8UsKuVZA= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1 h1:XxOfxPttv8wjzYH/wEJulHel1AFLak2To41FRZKw39A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.1/go.mod h1:Azqh2nJoQmlG04590JiE0Mipn41CehcT2iOZNGJ+4Hc= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1 h1:X5MMNbNRxRDWBFClk6sDNcJYQAgoox3RI6GXXfXfiKQ= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.1/go.mod h1:BzmJbqpX8DTw5xsVcbFyYjxoEmpPYuaynTaR034CCp4= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1 h1:QaS57LUzzlz7mV+3eEhn8Ft8Z1cyz5Agfy+xYCrX7bE= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.1/go.mod h1:GE6W9YaT4XMa+uxUokYgj15cL9g0Py2yHwAaMhh6x+E= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.0 h1:8B5euoiyuw3A0eK8zUir9kP41jq16gNbbMv76yY5UZA= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.0/go.mod h1:Ou8vQsZ7XTHCV5U6KS51A12XPeFmeV4DvwThg7NZpS0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1 h1:a4ZH4mlTaiSxYdqiS8UWSq0NG6uc3ZcD6H9PMmWyw5k= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.1/go.mod h1:h1jdpjPeX3REIMTlysGyfJ/jdflyC12IMP6cPN4fFN8= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1 h1:3+GSFjeZqHQgm8qA/xbLUYdg0YuGGHVfUnzc9DaAiGQ= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.1/go.mod h1:CYdv6LKOdBkedQcj71h7yzeCdOJX6UEnIEwcdVmDv2c= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0 h1:IB6/LwU/BIUtRWy9Y8a7nPE4EjoyNjJYgvFWuzXyCRY= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.0/go.mod h1:pokp0HT21urmIMMqGtPtJN1GxpfMQKTDSmWWTSWZQbM= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0 h1:Xe1MNDLpxzEoT/DaIzBEyTETLaB+rMCPFDXoihB6u7g= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.0/go.mod h1:lbFvXS6OaWIgFrQYNA5oq4A2Cvl7x2c4vs6ttsosCK8= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.1 h1:8eRTUAQtUJv8STbll11zGTdbskRMVAhbdwtalanUFaY= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.1/go.mod h1:mgvTMpQm1K4jL6cwHxzY3lwL4294bhszUdrFTb5OE/A= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1 h1:zKNQ4RAHXoEsiz36QRZ5Y+/ppSBCv8pR31Kcrk8/4yY= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.1/go.mod h1:qE1wvPdbwz0Au+S9eySyN8cH0SCjNTeBSnHvs7NI6J4= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1 h1:TRyD99fxiM5IcgZIrAe+jSugO36eFs9eGH0h7D/kSTA= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.1/go.mod h1:vq1O8ZvI+XDLTQ8AEpeOkVbhS8WLe8NpXZTiOHDiY0E= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.0 h1:zcBi/p4BMdkGFnx/t8b4ir8U6CMtPZJG0bEkWRTUY+I= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.0/go.mod h1:DXhB/5hSE2Hetxp8NqzVir5DYNbVYXX9fM4e6yLjqMQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.0 h1:gKVipnjqOkbYU1rX6mhjb+Z59HBMmayPhBWvcpNkAyU= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.0/go.mod h1:EhDOh0SESTIcD2g9g3wMyYIPf6Fjrm+0NymJ+nGg2p4= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1 h1:fY5jK2be1+CT2DSiFym8hfYx+02sPH4QtyEl4ETjOi0= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.1/go.mod h1:NUBOYcDBdVyFhf0aa6jFNWHjzEcZUulaCxyQomz5GbY= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1 h1:f0j428csp1q3joEqIj6gkWNObdsT8h360V8nN614N7s= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.1/go.mod h1:2JfwDlPZm27OCX8U2OI6/nfS8uycIULmcLuyihlA0Bc= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1 h1:70KF2EZU9L3BY6jo11klJktpypO9E2HtDYiMN11eJTA= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.1/go.mod h1:oBB6M31wvwYHe38e11ei2MWC6CUegoWBuX5ExoM4h1I= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1 h1:cMJEyvldkzgeCeZtRXJXXY4y363AEQ6cLH64mZse7Ws= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.1/go.mod h1:0XxnXE9BDmEDAIE4iLtZF5R86yE8tILNsCdZC9FNdtY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.0 h1:ckzIwJfxX2UeuWYWENPtt16kiQ04wIF1VTzfbuq89Mw= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.0/go.mod h1:z7CflxXkoJAsuJ/LMBZ/EaPSeANm0njySEuo7lchVmc= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1 h1:7jyA5/+makKTgcaRXhMFpT1yd+BmgyvQfducPp9Cf4E= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.1/go.mod h1:4kTwuYynfNhF8ohwQbb+X+57clM8Rr52j+54zY/HRvo= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1 h1:g+814MguEuOIKjIUOfmPCSWNVSaoo/xYa1PShNq6rmk= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.1/go.mod h1:P9G7ovQCb8ugsMqSk6NmPeD3rQiVYVNqCEcEPZGor/E= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1 h1:oMVT8l82dvjd+1wbnDhn78QyWpk63pI8X0iY/N2+wl4= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.1/go.mod h1:n60Rei0iH6iuj4+tqOnt796B2HQvgrbrcoCM3J3/RiU= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1 h1:fVcUqFCHzgZ/ZHDlN1uwXv2j47z82ok6Eid6DqrHU7g= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.1/go.mod h1:+WymZY55JdQABVxO9YFyYDmVtjZQyh2GWaTo2wK1cas= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0 h1:BJyXbWDO3GbJz1hTtFVd1Qgy+RJCsA+Ha2ClW40no5A= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.0/go.mod h1:J0zzoY3tXE6wGmMi1sCDtlNLTjkNFB1qX3Qa7kOb+B4= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.2 h1:lzq4ClQdh3BHTp/4yuBvn4iki0ZNRVkmQyMU+lYBXFs= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.2/go.mod h1:18ZptgKWI7Yr/idQYgpEBMy56ccJwx1vqvQD0MscBJw= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1 h1:vBRA+MeCtjVui6T4irW9EU2RFw7cFT2XCkPbXX3RJpQ= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.1/go.mod h1:eTHLmeHFpGDOjgbL39/C4sZ4ahyb2ZGc1i3hr1Q9hMA= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1 h1:RC1TO2YO5QnI0EDwtxLrJlly/WDMTQGGnWdvJWjuwow= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.1/go.mod h1:oIEe0OfHys9BGsobPKUYgBA0i9gOTChYe0mP1s10Hpg= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0 h1:ZxuKc7nYsfmqWyff8ponqg/QZ1J86Mxxmy2ZO+z5OY4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.0/go.mod h1:Q1oshEWbDmk65i0xxjnUU9i9qJK3hypi7cnVvquvrDI= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1 h1:LckQzLKODHF2269pYorsI8BXD6WaUShqmLqNBJE8EVE= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.1/go.mod h1:GFPdUms3p6bgKFxOthlkJCupq3Olz7kQ7h75giti3oU= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= +github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= +github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLrPy1vwP8l7OSJGcwaKVd8oY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcDcf6Vc0MltrMFi08FCYCIaE= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 h1:aosVpDecA17GN0AmQRq/Ui3fEt5iQ3Y2QUCIyza6e7s= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZKp3nA4pqgIODScw= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2/go.mod h1:HssjGKML+1CKdk/rpboJ1GDnqPdIRbKcaHn+rWb8WnI= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5 h1:gC3YW8AojITDXfI5avcKZst5iOg6v5aQEU4HIcxwAss= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.5/go.mod h1:z5OdVolKifM0NpEel6wLkM/TQ0eodWB2dmDFoj3WCbw= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5 h1:KOp7jJ7FNi/0wDm1aeZ2xHfn7ycBvQsbhPQRNRf79lQ= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.5/go.mod h1:AJDn8kwIXofqAM069WTCGUB62PxJNlgla0CNb9NRhto= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5 h1:Cx1M/UUgYu9UCQnIMKaOhkVaFvLy1HneD6T4sS/DlKg= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.5/go.mod h1:fTRNLgrTvPpEzGqc9QkeO4hu/3ng+mdtUbL8shUwXz4= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5 h1:IM2yO5Dd9bzCmYEvLU6Di5kduRKh4O93TjrZ47hxLhQ= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.5/go.mod h1:0nXagJIQFWms6GJ1jvPJLwr8r3hN6f+kTwt17Q2NrPQ= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0 h1:viWnCOrzxAtfAQId+kooGG7iSoJWn0/woqbYaNFsCts= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.0/go.mod h1:EsVqp6A+BKKbuCSdy/4FHGju6olK+XAi1mkvKEitYlo= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3 h1:tf043bnnPrmmnTJWtW2psE7RBcyuNOgKiwYxb5fK70Y= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.3/go.mod h1:ifN9gahB/NlUPDkMvEE/AJPecYHTDvMVJK/6AS8txDA= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.0 h1:bVFR4pnutbUOe6cw9Lup7toA4pyESn53fs+bUl2gXR4= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.0/go.mod h1:vSM41OX/dDgIxJcoKYW5LzM5bcfgLUt/CXD9+Qpfl70= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1 h1:JlO1e83YiQMxwrgbZ1AnNCgFaeNZIGNMY1Z08vkJxoA= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.1/go.mod h1:303Kx6cdaSgREaHzfHfJl3WyB+t/vTOm5KbXMM8Dy4w= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0 h1:gmQhSQqGaC1VSsWGb66A8AQ2eFKzVTEGWkubo/JYr7A= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.0/go.mod h1:NRf1OmevrJxGBSwR17qZaR90/eeg/rwM+4YurDoJ4w8= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1 h1:kcRl78CYXnQPLQz4DU7kz8AZ71M1tF7uyw7RTaUMyRM= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.1/go.mod h1:y5EjKbwcgQItIkYzxfGnxtqE16Ygml/f3JTRk5408BA= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0 h1:wFBbx8uFg4aNFp1WHrUP8umajzOxECjZE+dle5n1NMo= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.0/go.mod h1:jYoXOY9FSXfnfQ1wHoJJfYBKc8O6ZYy4BYq/2mRfJcc= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1 h1:bFiyAmozdIkvqRukziRHZ0vTi9d8FspZq0+lKF3rw9A= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.1/go.mod h1:xxrV0I36JOxMSg3WuDws662GA+NLYrRX90ZBpSsAP0M= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1 h1:CLZBCZyrXGxt9vimiZrc7aPCRY4OOtEpQB1v8eTnGOQ= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.1/go.mod h1:CmzKWAOJN9SchfDRhUOLSeRZXSxeUDYhYXtGfOPQqw4= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0 h1:mXU3dDVeQ+FDgwAKTwOfZcn6Anyunv84+P4/A5W2scI= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.0/go.mod h1:ePVTwgWMwsdC2hwtaNvB0sUxjcaVHyoC4k+ca9dOnrM= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1 h1:0NaKIojj58t9NgZM55kRBBElaX25Q1kpaX+zlgmdafo= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.1/go.mod h1:yHVIbbJSzLC3NqiyvkL+o42OLT8YZeiT6C4wMhBnxNM= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2 h1:DL1qqTlEnrOv86kDSufSlmULiAnydtiu38WzqhHSCuA= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.2/go.mod h1:+y5C92Um6L/1Kfcddcz/KlP4w+cen23bY0cziHfx7zQ= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0 h1:OoIoPA6iAiYSWteP+STb03hrYwe6MIsoW4aKK+4/0/Y= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.0/go.mod h1:FY33uQ6Wb6FMrBhant1hvI5eQEgfPxj4JOl8f+vmXrA= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.0 h1:WYQcp4o0/X+Xd50dSFluzKk3Lee2mP+tP39uMI60s1M= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.0/go.mod h1:le5DfWrncVIxOWL2Q0NnDqvhH8ULiGYgC9iS8BtwcZE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0 h1:MCX6kuAqas4MAz2MKBNw6WP8dVPjj10lrgDYHoyUtuw= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.0/go.mod h1:QC+BX9N676IvQfSoU67bL8fnX4CnKwCJd4udK51ajQU= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1 h1:hsj+w6LwkTew9MeXOsf4/s7TOQ/p13LmTJTWBEib1BQ= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.1/go.mod h1:YUfOkjyQ07oPsYHn7Jw1eY2HpNWvWLdChJY2BCF91AU= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1 h1:83Z9wP+Qsh+Cd6kYMkcaQjHn2fj5F4Fh4oJe2LUkt1w= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.1/go.mod h1:YJAd2LReCr50LXZC4yiZyfqtDXNFTspMk4b8XNN23mY= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0 h1:4ZxzBPflfxSH9uNuobSe2xUMqDlV4yR3ulHbUSXy2xI= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.0/go.mod h1:yC+FE+kUrFgWwlfCOcTNYtEcYnvAb4dxCAEjeEs7XyM= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1 h1:geRw9Ur1wggEiccglEVK+sUevB0uASL2GN4rhi2C4E8= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.1/go.mod h1:lKUKI2/ejaYnQgSqCdSpdbSc2D4pA5LpijkAknZFJDQ= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1 h1:d3SSrnkA7PzsvFHhffpGQxMfKulqdapxUA5t7fUXjCQ= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.1/go.mod h1:cVju73Vwz9ixw1zaR0tdZGB+M3GCRn8BRgLFRJ8oE6c= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1 h1:szIozoXngSj0ibL/GNJbb5e2Y8WUmSqfk0BIiviO2qo= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.1/go.mod h1:HBXDArKSFmUoPiHIatSFZP7RCOuSO86D1skZZPP0eLI= -github.com/aws/aws-sdk-go-v2/service/location v1.49.1 h1:qmoE0s/3l5aGVEv5aCjB0uNhdBWEePOSkepqUBKCsAU= -github.com/aws/aws-sdk-go-v2/service/location v1.49.1/go.mod h1:4wXR5FxUtCbxrR10BM5v0JU9tWRuAPbxM0t63rSP5s0= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1 h1:+f0HIomd186IAU7s8FyxHJeMXw4GVdSS901QqksMSvw= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.1/go.mod h1:Dvovz10WP1Kh0UYpgiYIJX2kU173PioVcZ8iUu3UlAU= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1 h1:F+9z6ATrwgr4lWjjxjFcIym6rT8P0fkM0LeuaUzLf9c= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.1/go.mod h1:OVFTr1QPEKPMXJFJmq7lB6g2LNu0Ra1jlyWRTUwVDNk= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1 h1:z4pOPvM9QIFDn0outkKgx/Q/wHEvkFpc8HM0ecldnME= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.1/go.mod h1:9bIBfRe99bgmTSKGt5kOANZAsmiVsUqAxYLdXtdk0JY= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1 h1:eGM7Zu4idZy/puH4GwaSgSEaWMc+sro0UMXPqaUPRf4= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.1/go.mod h1:bDTXhc7i3wut4LoMd/3Y/dm6yuHPSZ/l0JKTxAoWJs0= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1 h1:AvFmDDiHXgygI9eMxkQVn2OcXW/Mz30JfAoLqyMUhpA= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.1/go.mod h1:oQKjFr3ftWy/qU2ilMx4Nl2qz+y9b9pFuD35WgYFDdY= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1 h1:HhcQzcQ/LNFVljwGL3eMw7LIFlYMzPJ9WLCREC/ssqw= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.1/go.mod h1:LO7nmXTfTGV1eKso1xizKh8h4WnC6FpHmCu1KDx+1qU= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1 h1:nHVIvgHWzu0gIhYF06eRbFVzgvpMW96wrniWanoyxxo= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.1/go.mod h1:/mNoNDYQukzDORZEk5w7BIvBtaQJxkl0exo7qMpVmhg= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1 h1:U4vORFpANJt9am19Hi9PnMb7140ECSv4431rQf1dr/0= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.1/go.mod h1:69XqFSlzFjBTMeJO1P+qv1kwNRN6nRBQnaUI5uuoBDQ= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1 h1:iSM0xOAGcCAPgJmHOm5f8xrpCV5SG5uq2E0CdSWb6Oo= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.1/go.mod h1:Ulo4NRLCKAt7Py+XVaO1SlaZAxCQ4f3N2SxhpqdeHT0= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1 h1:zHyKDPT+9VJ/D9MPnYarK6KQVPI016sc5RTa0n1xd9E= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.1/go.mod h1:K7LVOq+IYECTdoQw3gwabdstLSTwYM2ysghvYx7OOn0= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1 h1:3zfMUIyOkz9zAyBsrO+nKKGkiOamHvNYMFx6NzHJNIU= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.1/go.mod h1:zaOIb+NMBSJtbPRIOhG4hfuyFskU0/CWyPIjZWHY4tc= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0 h1:u49AKqJDtDHHQH/DWcy02Q8CtYovszGuTo/AsTKA8wA= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.0/go.mod h1:9WVDrtazLGKgkmMp+7OrIEapwBesTX96szFSZUHw86I= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.1 h1:fw/32PK9eqPKKotODP5wrN3RtcG8HKbUVoEWK7oUd7s= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.1/go.mod h1:k/EsVXGxs6dcuBioJb3LWwmX7LcXPHLbweDoc6dl24g= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1 h1:7O+k6qih30xLy1lWpW7w4CmpGT5Y0ek85IW07+qGIqk= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.1/go.mod h1:IeLxEAtclnYwPUZLAhUCDPUQ97yiRs7goua3YtOaa1M= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0 h1:yHjTI0Au0tx+3U3L0P5iQStTJRIQ6s2IjCAk+1D+vRI= -github.com/aws/aws-sdk-go-v2/service/neptune v1.41.0/go.mod h1:l5lsPmJNf+/hmz59Geszl0dFs7luI7KK1Co/s9Rf+Ro= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0 h1:CjZ8C3mxmGV2ouZssfx6hgLq4Y5suC7URI14/GPt7P4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.0/go.mod h1:zN1jX+oLPpUKbMBYdYtk0T1o1uJ8vizFBCIseeJeVrs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0 h1:9nG3GeK/rpWYDwO9SdXlWS69m08SO+msIbXGq98QpAg= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.0/go.mod h1:VybrWmhmdYjO2h72XneKqOXfjeMECztgm+SyCSjH4mI= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2 h1:rn3OWMsuu4lLL1yQBl8Ycspdnv869UfqGwZ86G7Mrs4= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.2/go.mod h1:DtDRqF9HD8RX2cEvQ+/YpaM7OGDPigQ8KUENCEKZj9U= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1 h1:lK/QFsuy20cmpxscYFa78xEm29EEdSIn+jQ9rXKjlm8= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.1/go.mod h1:S4lAC9xGXy7hk/ddmxFsUdYrqCgaqiHRsz2JFlBSXZ8= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3 h1:6j4AkoQL8C0BNziE4U0KeA5uyKFlXExeUJnQ7K0CQ5M= -github.com/aws/aws-sdk-go-v2/service/notifications v1.6.3/go.mod h1:Q05iKD80huED19p2aAac9Hc8zrQhYAZ1E2RE8HBv6RM= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3 h1:6JZ4NvKTfGJlyyCsteSlXrvXzfT0kpdVQNP9SUFgMxA= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.3/go.mod h1:O5GKu3mHszVNhiTZfBrvaKmxrNPW2/oPICWJtNIKwF8= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.0 h1:WHgI0gIEr/cNy0QVYi+amOtWh6l8Y2wGkLpbr8Si2Os= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.0/go.mod h1:nsawpNYwK+BeH7I6peq4WBDvMRYrNOLTWM7+FUF5MqY= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.1 h1:MWTkSurFoOHIYP82SBGNa+5j0h9Zc7uEbySza8TOs1c= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.1/go.mod h1:IxUPCFNrgG49w/Zt/nqCI5ZWuqCvcfd9uGYSuDQoITc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0 h1:ymSOKhRgXVzFc+d10qXBRFMNOLVw93ud44jmKRfGV+E= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.0/go.mod h1:3DFRYVbu/dSoLZhOde14xEHiPv4fsHqCtWKT8yC0NEs= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1 h1:yJcdgoxwpw7eHrNmizHx5nSitOxTy3P4kXxlx1/4a/I= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.1/go.mod h1:iKYqxsuU2TST6TvwsIYSmOfF49OfYtaRbgM4niH1kKg= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1 h1:pBoGi2PY5HYh/jqy7HEtV6JyIdbjfVJD/LeyTh3Sw3o= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.1/go.mod h1:cKlQsxVOzyW2X/GsaT3V2zc4VwvnkdTsF+C94gSsFNk= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.0 h1:s1o3HJMBmisNlUz0gOnZnjv72J5/7HjauffkxGW2omk= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.0/go.mod h1:HZL7PvR4LnYaJKa5DWsfXV/CnE1demmNeaZUAELAhpA= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1 h1:hLJsiePuEBDShxwyIyMlumdDG4SQ/bCLFfdPeDI8U9M= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.1/go.mod h1:zkLmJpCGlPF8ja+RxoIp+tntQwT4J6xt0s3YrGUt4P4= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1 h1:8s2vovdjcokU919JhnPxeUkATzbc6T3WmWrKNO1nL4c= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.1/go.mod h1:9YYgEckvRWTmLpiJuGSUFONmLy0viuWWWTseiCLoip8= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1 h1:dmwyBft3RswLbZVWdWFH/50cpRVVEjdr+k0lhKPtM7w= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.1/go.mod h1:i+bBOHqm6Q8bcpebraXieqGk60V6cJWZx71hwd2lJkQ= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0 h1:V5BAdHZqyIzCB7iwZjxTSd+YrkH2uhRyhSROjEElsgw= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.0/go.mod h1:JquhYpHMVvXetBoxFomsHERCkLSpARmwWQrxME7AB6A= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1 h1:tF2iw7c+RLxwxmGOcdS16wrHy3Xki8A0HfUZNXIzr/U= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.1/go.mod h1:PsfNOos2mB0jtbf157ihL8d/+SGM04/+8LPK8t1VLuI= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0 h1:pYW/7/9d9ZIIBDh1ccznc3IGWSKEtuiNx0cgfqKMd2I= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.0/go.mod h1:ODyR6+eneM5FezlzW62y7lTKNZSxKWMIm0dORMC1/Rg= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0 h1:69mVz4p89a1lvHiMaWa1yH6+TSiik4NanJT0/kViAWE= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.0/go.mod h1:VyLemybrO/lh1JYkZtiN+ETVCc2HnNAIqbpXjI5+WoY= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.1 h1:PrUBt464NYunfWT9MvTT8avB39BqzKREz9wkePEq1lc= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.1/go.mod h1:t9sxxKzIZzy9sN63ItZzTnmXNTxM9hU4gTwu5CBTjLw= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1 h1:oixAB8IDh2owkRTx0rhex19I+eA9Js5bjoMO5tDAxbE= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.1/go.mod h1:6nhxriPrOjTLhbRSGbM4ugEsshpL3AW7BcgH0UtgccM= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1 h1:Ws2gCGOa+rWvGHjhbtm6FSvj9mm0pXhuC/YHMM+KC94= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.1/go.mod h1:6mIS5Q6Iyn5lEYuQa8eTUcLUbjrbe9S/XQeS9DFBU+Q= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1 h1:ZBIaPK3alC9QU7PmFXib51oQ1K4fJWXdTIrsO+/cr6k= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.1/go.mod h1:Fhp0iI0cYM4zkG4iskMF4Pbkg+QZKwNCGnE0RDnq7RI= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0 h1:Ysu29E1tqRBztb7tm6uqn7hyD80vsQUvXQATFAk5y0w= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.0/go.mod h1:6SYoxJlRTULJcm7wJM3wy/5Ase8Z4fi94SYhYdUilwE= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.1 h1:bEW6Q1FSbgnWBeZ6y81TXygf3HYCA1813l+peUplOCg= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.1/go.mod h1:qSnVK6uBBT/XZ5qW3fRpNtl8NbqHvfDdcwtaZEMchEo= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1 h1:imWEYfybXZCvXb5PMS0RN3hZeYhv7yNRPXE+zqFdn+I= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.1/go.mod h1:7lt+6wkpXIJmE9Xq7twp+CHbkCn20zZczs/yLhoZYD8= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.0 h1:rg+LCOJHFAzvK5zz2ity+h+mINaFV3mpnU0B4Pc5cjo= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.0/go.mod h1:dTrfmCSaCIsYF+sHOxJsA9bHL/DAfWAmyAciqFTdCFU= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0 h1:T68GUMqcXPS2V4uy+KR0WqDAFjaFqj2BGBkvd5IvlBs= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.0/go.mod h1:5UfnQOKiIo2/GxJ2fbr8VxNeNX0Kzy0C38QaemLd/Vg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1 h1:sYVzev21kOLRqWhsL8CDeOCNqfMQcb7Ame51EQyCTA4= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.1/go.mod h1:0FIi8qVSgJ4g48fhIohWqOYcev9tyFCDUcu3NtZJelk= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1 h1:m9gB14/nXQPrVmKCfPIf9MMQSbzpJAzfG8tFzOKnoWA= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.1/go.mod h1:O7w4XAuOvwcSSFtYc+FUP+hwzZrqDIU/KgswFwHikuw= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0 h1:xDR3nrR3qoPjbhnXUYz3c/cp2a40NnhCYO9Pmy88zKY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.0/go.mod h1:4HqRx38Aj+bvB1KpBSV0mM/C3CpjsgmNEzL4CBvyDuQ= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1 h1:lct94XG713jxa9mWeo1wUmOfnknGUHq2an5U0Hd1OD8= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.1/go.mod h1:abWKrv8u8Et9kSnnC8DvnCH9IwIC1gHAIbGURBdd3wM= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1 h1:s0FWF08VNQN2Hjip4bXkjHp2fSfanfU8m+GzDFL2Utw= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.1/go.mod h1:1bQU4WjW5s2zT399sz1+EjmKgIZLhg+NwmhMV+o/iKM= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1 h1:bcybCi9acd6nOBVcOXdH1XFm6IX0o5OGJQt5z7s1h6Y= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.1/go.mod h1:aJ6F7uUk+H11VAVhjWXjwAVRROj9CPtk6Id6S6AQQ2U= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1 h1:ycYsiXjX16m3gwid5aVXcSR3ZnOEP4yL6a1ZQOPjZ0s= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.1/go.mod h1:bNnnRzp7DygLKwBv0Dh5C3wLhBvQUHVbz8HkNsetr6U= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1 h1:9AIeYdH1U6h97CDwyKLoeFuAw/3i8OGGk1X7lJduJl4= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.1/go.mod h1:iJvCruiVYZFOApjSB2ZTtam5zKwA5eedYmYsyPE/9Dk= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1 h1:t6CAhkQ5yVxPeDeAExUSDKRexiqIrOhUcQ/L3wXFnh8= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.1/go.mod h1:zvtb01R4yNazMQQlaDybZFGDJH13+zSp1psLzG0CUhQ= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0 h1:SSFO7RYYRocZM8IOIQ5GLAXLwtAw2a/j1ULmXL7phBA= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.0/go.mod h1:RwTz/pGCfOpHkY9GP9JASnCzLGtND1XrXG1NDOArXEE= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1 h1:uugQNrw8cY58L1dlrmjpEFODR+B1bjbH0UlnjHv6UIY= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.1/go.mod h1:62OjKHj9WWd+E1wEd7I5M74U/gsVCHxcm68snB5suFw= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2 h1:tAFhiXGjV2vo1FIUfZ++MWZQ2L44rwtuqSyigyqff3E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.2/go.mod h1:Tza7auk1JM98mceIqrBpBVgf63OMuZdvFIbUQGwdu0E= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1 h1:2DQgYS17EkSTZ/1/3tJp6S4ocAj13yA8ujlihI134h4= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.1/go.mod h1:GD95a1fjPrxIec85QlXqKiL9VRiHkDJbe/1xCE64xKQ= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1 h1:tZ1GhQzcaRsAfc6gCP3oKhP5Jfx8fVh5bA3WBI7A5QI= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.1/go.mod h1:0yXHzKNyRYcgtyL4E5uo/6ZJKXNcGxIMiwzmNBJRRAI= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.2 h1:L6ib/bOArf31JobAqjByX5WEyL47TwVYz3SREg7F1KQ= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.2/go.mod h1:05MV3IO3UV8w2PTe0faT9+7pwRcFBCYnuhr6MFA4mLE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2 h1:HNAbIp6VXmtKR+JuDmywGcRc3kYoIGT9y4a2Zg9bSTQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.2/go.mod h1:6VSEglrPCTx7gi7Z7l/CtqSgbnFr1N6UJ6+Ik+vjuEo= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3 h1:m7/VC83iENotCHv1B8fk+yPQr7ek0I0r5sZVn0HH4iU= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.3/go.mod h1:noqWDtfKyO38kGEjpcvCeLA/fzf28s5GqEhZzMh0l0Q= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1 h1:trem5AGZnOfGwAtoabkEox0PgOziukav6E9syQLccfk= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.1/go.mod h1:Fm0fdHHqfDHVUjpygYpkib/3TABtK3xF1MFF4r8vquU= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0 h1:vltWuEWTX8Zb/bslVzDYR6Y1kh2UvEkmGTGKXZtmOrI= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.0/go.mod h1:064xhAX/Q21mzYpqYRdZBZHOh8zLAlIVDlupW0QUYZ4= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3 h1:/iZ2oKFMozwJ2J1nMCBPc/MoWLfXs59dDbXv/HvM1TE= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.3/go.mod h1:6uQeXcPzVYs9enR8/saW/AB+7o7vB5Dv1U6u/cW9uEc= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0 h1:KvnX9MhpDpaqXTxV0/IWA39ZmbSAoKTpyXhwMS8Yar8= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.0/go.mod h1:YnZ60Juu0WtSjG/I37nfa9TXvAXsKnv6nJVyMRFAwRs= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0 h1:ZgcQYuvsZM90sfVqHELkxbLqAN57V5jBhNNKttHiVyw= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.0/go.mod h1:5xuGW1+0nbHzirB6U32W6i5QuM78dFHtwtKXMUG53gY= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0 h1:ltavx0XiTsh8yMxV1GXs6IEbiC2JjcQrbAMK+jFdaK8= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.0/go.mod h1:ppdARMO53q1uotbULVC3+vJqygObq2KkeOmUmPxQ7Ag= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1 h1:iX4OaK+QrUsw2J8k4i/eymX33nFhM4noybFSawxsElU= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.1/go.mod h1:hDr+R5WjCdv4Jeb96TCEaEAIVC6Fq2v3Ob8Otk3yofQ= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1 h1:MvHrLJwyARpg9ycc1cb6i08OrG/tFofF9GqL85NDBJI= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.1/go.mod h1:4ZO/HPsTzHVq5qfjDvhyZWzMNWrx216y6/BffRKMBY4= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1 h1:7IlIL8quV8GFdm1BH7ZU0ta5IG1ZDAQkoEO32W2Sdog= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.1/go.mod h1:LdSgvzxjUIEYqDySJ1MZMHrpnXr82G1wUgbCUn1hj2I= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1 h1:NCrZaCcXEeBlILIPXZPhCYvj48eaTwECX3NonrgGWBc= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.1/go.mod h1:h6VMaXtdphpPOWC205h7KR2dth0h6Hr8FwdDIntf3W4= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1 h1:TRbJB/6KkkcjtL7Mj0ov+Bi5jxpr+rz0xEolhMo+M9Q= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.1/go.mod h1:ISXBwTLGsBEdPKnc8hgwLMMLKAoDOBY/Gk1pAcVxegk= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1 h1:5R6jIM244e8NyzkkBDkJi1JYkc8K1riyK3c4S6Z40yU= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.1/go.mod h1:PvxczENAAg5QbTUTGTJYHmKM1fJ4o2m3gGnF6zgoQU0= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4 h1:936kVrMqBzSuq3uZct9O7dR34oPfiS1Q20Zvb3HIoRo= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.4/go.mod h1:Ygv+DWUipPlq8emMHEKToP2YSSvUdFYAIjxbApdzDzo= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0 h1:r0+VWnv+KsZbjDTnUDG/mX/JnuzugdCsqJLp46+aVpA= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.0/go.mod h1:4acpHKGMWcuCFAUPjCb28ZrBUt8r2FRBox76AVq1vnQ= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.0 h1:B6CvQg7dMf7fAM/bIh03+97Jpw8IMfS2R6/FasQqeqU= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.0/go.mod h1:g7c/djeCSfKioVoSyRduNnsjjt5D/1v2YJmQW04iels= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0 h1:uIGmYyDcX6nUcSxMzNrFF5yuFvz1JwVOJyV1Q/rV1L0= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.0/go.mod h1:miapI1+YLcbMJQm8wlhtsSla9LeneuyHdwaxCmXg0E0= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1 h1:rPgzhSmsLJAk5rrF77Ii0N/vAJdkmIjeJnVN5P8oOs8= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.1/go.mod h1:d4a15sgLFVuXR5QS8QEdqTHoaUJQVqa/tj1LB9oOAww= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.1 h1:961Fy7Em3Ay2ziEwTOgvknd8SkW/RZvfEgbhXPqqg6I= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.1/go.mod h1:k4FmZKhGje2cMSq7iJn68WuvjQlWCleuXBQrlaX92ro= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.1 h1:au83o40oc/0gTH1wLdkvlR+5w3H7kotDEVM/yqxDgFk= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.1/go.mod h1:kTLokjuxZ3M4FFxoyoIVifyutxQR3hxM8ebhWU29LRE= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.0 h1:BNdYPzlgwyFLZqeFundNKnPDB+TVVfaqZJoz0q6dURk= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.0/go.mod h1:3nf7APIrKwA04hwtT8PLvCaHO5k08M5YA03ZTJjz77o= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2 h1:Ett9kEV+1g6yGyz6atUz6rhPgFT8B/Z7Pz6CjTP0JYc= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.2/go.mod h1:nTr1GkJF+JsCWURFDQSqGqBLJvJUCpBaTCBmZJ4rXuE= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1 h1:zzZo2KZU2unh6WCGr8VvGqsnWAvXmjfH6jQ8oj/MakA= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.1/go.mod h1:fp8u6jpj1M+jmNeOcL1Fw+E9lk7112wZvskhHpUqj6U= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3 h1:/m8R30su7vwMpM8WNtAuPSwsGHlgDDT33HTSMBOvt50= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.3/go.mod h1:xubUNjgm7JnSj05f65KWfDu5GnHlWZng9yuXE+G+wHo= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0 h1:A+g2ocskAphtF2d9VHYsURkdY7hLUgefByuka5dUAQk= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.0/go.mod h1:k62Ka0gzuBESISed2dgU3pkg8LFEbf+rmEifQmDfIdI= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1 h1:GtH7VYrpeqEMFxWVqEQ4rjy4BlGWOQP5Z9zEqAE13XM= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.1/go.mod h1:Bpt6ck0RYQgECCLO0TTeruwegrXKGWxp7Uylmue/rLA= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0 h1:uALvQ2zkmfi7EWEe/BP4rvGgI36mquiM4HRFiIRBk8s= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.0/go.mod h1:IhvTwLJIz7IqFnT+ZQZEK147fJ1E3mk1MmsADhpAwC0= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.0 h1:H4QPAHLE1bHSQrZV6Hz+CPpJG+Mtf+rkl6NFb/Y7sv8= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.0/go.mod h1:BnyjuIX0l+KXJVl2o9Ki3Zf0M4pA2hQYopFCRUj9ADU= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1 h1:brnjAX3yp1s5RR5ngE1X87pnxnoJUklGIHi7Q7WBiCk= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.1/go.mod h1:f7vcgBcwjRMLjpBvMRXKX3SXPNfw7obyfs3vEXc90pY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1 h1:8yI3jK5JZ310S8RpgdZdzwvlvBu3QbG8DP7Be/xJ6yo= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.1/go.mod h1:HPzXfFgrLd02lYpcFYdDz5xZs94LOb+lWlvbAGaeMsk= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1 h1:ZPsElIb/lsXtkgsVSMK6M3K6omkuHi8SU7BylhKSWEA= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.1/go.mod h1:kHTHi+O9VUN1dGZRN2GFLF99LBh3/WOnih00vth0/48= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.1 h1:3kWmIg5iiWPMBJyq/I55Fki5fyfoMtrn/SkUIpxPwHQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.1/go.mod h1:yi0b3Qez6YamRVJ+Rbi19IgvjfjPODgVRhkWA6RTMUM= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.0 h1:cbGSsIQt0aQ/9pTvnjdWR/Fvj7SbwWskoNNlfJZaegE= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.0/go.mod h1:p+HOST4QkMrBbIPZoFQ6k1GHDCk7ncbbFxJukCSUan8= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1 h1:tRPFXESI3BcJYv9VMvZD3oyP8VyXqqnxicqge/R1hEc= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.1/go.mod h1:NNhLlE3Elc9TP2uxlCMXUXOXVQq8LLS3EoPe0WKLA8I= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1 h1:CbS3klRb38rxUaWn9TCBOvUggmyvAazFgZm2/WCcV54= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.1/go.mod h1:P0t2hurtrEdfxNlMmcvLhVHyfH3ORPOg0CdnEzKhnEk= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1 h1:CBLqwOFeukhBGOJ5tSI4jgm64b6llHSdrTP9h5KMIj4= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.1/go.mod h1:TjBxeHTc4xZiY/eNvGrKkToK/2Ou74sLPIysLzZmQ+k= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0 h1:Q+RbFcNGf/Xt2PW5LxLWlNK9dXRCAs/X0Yh/TcVSxrY= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.0/go.mod h1:Ajey+9jTCABmrMfQ+hLM2baVxHDBWPliTrxdeyLfeHg= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0 h1:gnVSkSmlQJzCChsnXr6qKd5PIQxCAFUEaDk663QUV+s= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.0/go.mod h1:QKNACf4WZpPQcxayavnZBpYl+JTbyy2evJaxKuczXy0= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1 h1:1t28+hhBmi1UszhBkti/1NdGLPQPJ6CdQwR2qma/l3o= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.1/go.mod h1:E9fVjmRExKItXS3Z7D84qP3PcmzEJGNLH3Zg4GO13gg= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1 h1:0Z/CDKoQcCf6/OL4DIubgEJw/j0TWgFerhWcaqDyruA= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.1/go.mod h1:v5bHGripgR3DInv3X4lG4AjS/k/ljgb3MNJdqNOu93g= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2 h1:9UzC+gKx71Bw9zJD9MH7A/pIgMsW7cDaL83bbQFFkvA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.2/go.mod h1:62uE0PDiR/hQ9SkbzxF730UOyvw4wPoULDRgVoQLsfQ= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0 h1:wgyutrxPxltsKPN+uRPAAg7/AmlXPaIvib1ym0HtWBA= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.0/go.mod h1:fpaFEktEkXSRcNsqAAWZ+fCPzWQMwEAqZzEhbdeTvrQ= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.0 h1:c2SDs4RUMwDBWtRY0gCQ1qL9eoKh7NmZiI0Msf5zWEw= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.0/go.mod h1:GMSTfASBcYApf2JVOOxAN8kBMjWd9Bt4fsjs0POQC/g= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1 h1:CtTHnk6QrS5PVQ1sWIG/lzXHbk2ptkWfqug9RdCon2A= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.1/go.mod h1:caOTTN3tRy8YGq5J1ZmQkLN+x3dMPRs0n/n6DM0mgfI= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1 h1:VBaxE5xNUTuOBZW61PRogto3VQVWQpsaQogfy3MKgdM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.1/go.mod h1:BZWeUmYp1Vra+wmpCeuBjpmbfWU2oBi5jZukBDh8IVU= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1 h1:zi2biQWnN0RawYC44U05FxksQzY5TohW7zOTPjohvHM= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.1/go.mod h1:yiLut9L99R3spfqmkcGZcp2z0fwNXCUXivALQ9qDqPc= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1 h1:veUiK3PuBzK5vn3cqkbSX+m6RLY+s9V/tTUD3ySLz90= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.1/go.mod h1:YV0G5yuDBtNWMrw/RHAhACESYHjd85dHsIrb0VcpUG4= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1 h1:bANnZU5MlDkaQgUTvpA4SVKECzKDhnzs+DmyUgz3eGQ= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.1/go.mod h1:MU7pA6vf7GNCGcGy6UkZOtUyHispfUNn7e5R5To3bNM= -github.com/aws/aws-sdk-go-v2/service/xray v1.35.0 h1:9vFfby2iH/7EKEYYZYV70wjWgO4tLtdAxTnsM1Lv9js= -github.com/aws/aws-sdk-go-v2/service/xray v1.35.0/go.mod h1:8/4VlfdlYwOiuch58ohfkM88AylcR3Tovd8PkyxBh5o= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= +github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= +github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9vLJwmS3a3G8XLg= +github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.1/go.mod h1:7FL0wpgqB1DXHmD5sh0Shnq70Ib6Yb3ayh0OHeJO9a4= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1McsL8kbGpDZcTAYAzkeeGJrVI78eUX+2sj0= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3UDvkawNLu8yJRPPg= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi2SJNpXcYbPX/mjyQ= +github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99mFaHATfCJEVcYrnT24o4= +github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEkyS1tXU0k5iOj+TIUrXJI4zgpkSM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= +github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcsdGnspIkS9TNwRf6vf1JVxM= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2/go.mod h1:iGwIZwjxYYEwbnE7NUCDBGAvrkmWu2DMpxSXoYATaCc= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 h1:YHkBeqmOTk9JaOXj5aBmv5osRkyR+GNGagoEM98bk90= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2/go.mod h1:L53nfLqk4M1G+rZek3o4rOzimvntauPKkGrWWjQ1F/Y= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= From 412a423eb219405c88f68870bd90bc6a6850c446 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 09:47:01 -0400 Subject: [PATCH 1313/2115] Add CHANGELOG entry. --- .changelog/44127.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44127.txt diff --git a/.changelog/44127.txt b/.changelog/44127.txt new file mode 100644 index 000000000000..18776ba9151e --- /dev/null +++ b/.changelog/44127.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +provider: Support `ap-southeast-6` as a valid AWS Region +``` \ No newline at end of file From a45315f40dd297fa63bb103c808ab6dbe67c2236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 09:49:34 -0400 Subject: [PATCH 1314/2115] Bump github.com/spf13/cobra from 1.9.1 to 1.10.1 in /skaff (#44122) Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.9.1 to 1.10.1. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/v1.9.1...v1.10.1) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-version: 1.10.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- skaff/go.mod | 4 ++-- skaff/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/skaff/go.mod b/skaff/go.mod index d23e7f351766..9780d72decac 100644 --- a/skaff/go.mod +++ b/skaff/go.mod @@ -5,7 +5,7 @@ go 1.24.6 require ( github.com/YakDriver/regexache v0.24.0 github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220322001452-8f7a597d0c24 - github.com/spf13/cobra v1.9.1 + github.com/spf13/cobra v1.10.1 ) require ( @@ -17,7 +17,7 @@ require ( github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/spf13/pflag v1.0.6 // indirect + github.com/spf13/pflag v1.0.9 // indirect github.com/zclconf/go-cty v1.16.3 // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/sync v0.16.0 // indirect diff --git a/skaff/go.sum b/skaff/go.sum index 60e3c5c8266f..bb6e75534cd9 100644 --- a/skaff/go.sum +++ b/skaff/go.sum @@ -22,10 +22,10 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= -github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= +github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk= github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= From 7a0918dfb767af20291eefd0f46f6917a03938ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:14:37 -0400 Subject: [PATCH 1315/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - storagegateway. --- internal/service/storagegateway/gateway.go | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/internal/service/storagegateway/gateway.go b/internal/service/storagegateway/gateway.go index 12d1aa2499d6..dd408b91fc9a 100644 --- a/internal/service/storagegateway/gateway.go +++ b/internal/service/storagegateway/gateway.go @@ -305,32 +305,26 @@ func resourceGatewayCreate(ctx context.Context, d *schema.ResourceData, meta any } var response *http.Response - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { response, err = client.Do(request) if err != nil { + errReturn := fmt.Errorf("making HTTP request: %w", err) if errs.IsA[net.Error](err) { - errMessage := fmt.Errorf("making HTTP request: %w", err) - log.Printf("[DEBUG] retryable %s", errMessage) - return retry.RetryableError(errMessage) + return tfresource.RetryableError(errReturn) } - return retry.NonRetryableError(fmt.Errorf("making HTTP request: %w", err)) + return tfresource.NonRetryableError(errReturn) } - if slices.Contains([]int{504}, response.StatusCode) { - errMessage := fmt.Errorf("status code in HTTP response: %d", response.StatusCode) - log.Printf("[DEBUG] retryable %s", errMessage) - return retry.RetryableError(errMessage) + if slices.Contains([]int{http.StatusGatewayTimeout}, response.StatusCode) { + errReturn := fmt.Errorf("status code in HTTP response: %d", response.StatusCode) + return tfresource.RetryableError(errReturn) } return nil }) - if tfresource.TimedOut(err) { - response, err = client.Do(request) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "retrieving activation key from IP Address (%s): %s", gatewayIPAddress, err) } From 4a4072ea7cbe4d5cc9213bc7f371c095c7e4a94b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:16:44 -0400 Subject: [PATCH 1316/2115] Run 'make clean-tidy'. --- skaff/go.mod | 2 +- skaff/go.sum | 4 ++-- tools/tfsdk2fw/go.mod | 12 ++++++------ tools/tfsdk2fw/go.sum | 32 ++++++++++++++++---------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/skaff/go.mod b/skaff/go.mod index 9780d72decac..177af3cf65ef 100644 --- a/skaff/go.mod +++ b/skaff/go.mod @@ -13,7 +13,7 @@ require ( github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 // indirect github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect diff --git a/skaff/go.sum b/skaff/go.sum index bb6e75534cd9..1ded58cb7896 100644 --- a/skaff/go.sum +++ b/skaff/go.sum @@ -13,8 +13,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 h1:81+kWbE1yErFBMjME0I5k3x3kojjKsWtPYHEAutoPow= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65/go.mod h1:WtMzv9T++tfWVea+qB2MXoaqxw33S8bpJslzUike2mQ= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 h1:HA6blfR0h6kGnw4oJ92tZzghubreIkWbQJ4NVNqS688= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66/go.mod h1:7kTJVbY5+igob9Q5N6KO81EGEKDNI9FpjujB31uI/n0= github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos= github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 4a6da6b9b129..6117e3df1033 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -296,14 +296,14 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.18.0 // indirect github.com/gertd/go-pluralize v0.2.1 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/goccy/go-yaml v1.18.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 // indirect - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 // indirect + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 // indirect github.com/hashicorp/awspolicyequivalence v1.7.0 // indirect github.com/hashicorp/cli v1.1.7 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -357,10 +357,10 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/zclconf/go-cty v1.16.3 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0 // indirect - go.opentelemetry.io/otel v1.36.0 // indirect - go.opentelemetry.io/otel/metric v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect golang.org/x/crypto v0.41.0 // indirect golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect golang.org/x/mod v0.27.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 86fc7e27d027..a45d7bbd3502 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -600,8 +600,8 @@ github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60= github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= @@ -624,8 +624,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 h1:l16/Vrl0+x+HjHJWEjcKPwHYoxN9EC78gAFXKlH6m84= github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 h1:81+kWbE1yErFBMjME0I5k3x3kojjKsWtPYHEAutoPow= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65/go.mod h1:WtMzv9T++tfWVea+qB2MXoaqxw33S8bpJslzUike2mQ= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 h1:HA6blfR0h6kGnw4oJ92tZzghubreIkWbQJ4NVNqS688= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66/go.mod h1:7kTJVbY5+igob9Q5N6KO81EGEKDNI9FpjujB31uI/n0= github.com/hashicorp/awspolicyequivalence v1.7.0 h1:HxwPEw2/31BqQa73PinGciTfG2uJ/ATelvDG8X1gScU= github.com/hashicorp/awspolicyequivalence v1.7.0/go.mod h1:+oCTxQEYt+GcRalqrqTCBcJf100SQYiWQ4aENNYxYe0= github.com/hashicorp/cli v1.1.7 h1:/fZJ+hNdwfTSfsxMBa9WWMlfjUZbX8/LnUxgAd7lCVU= @@ -763,8 +763,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -787,18 +787,18 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0 h1:lR4WnQLBC9XyTwKrz0327rq2QnIdJNpaVIGuW2yMvME= -go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.61.0/go.mod h1:UK49mXgwqIWFUDH8ibqTswbhy4fuwjEjj4VKMC7krUQ= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0 h1:0W0GZvzQe514c3igO063tR0cFVStoABt1agKqlYToL8= +go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.63.0/go.mod h1:wIvTiRUU7Pbfqas/5JVjGZcftBeSAGSYVMOHWzWG0qE= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= From 73b4affd2f25d3b10cc18364dd361d21317246ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:29:24 -0400 Subject: [PATCH 1317/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - sfn. --- internal/service/sfn/activity_test.go | 7 +++---- internal/service/sfn/state_machine.go | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/service/sfn/activity_test.go b/internal/service/sfn/activity_test.go index 4695baf97d71..c7ad83496646 100644 --- a/internal/service/sfn/activity_test.go +++ b/internal/service/sfn/activity_test.go @@ -11,7 +11,6 @@ import ( "time" awstypes "github.com/aws/aws-sdk-go-v2/service/sfn/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -205,7 +204,7 @@ func testAccCheckActivityDestroy(ctx context.Context) resource.TestCheckFunc { } // Retrying as Read after Delete is not always consistent. - err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 1*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := tfsfn.FindActivityByARN(ctx, conn, rs.Primary.ID) if tfresource.NotFound(err) { @@ -213,10 +212,10 @@ func testAccCheckActivityDestroy(ctx context.Context) resource.TestCheckFunc { } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("Step Functions Activity still exists: %s", rs.Primary.ID)) + return tfresource.RetryableError(fmt.Errorf("Step Functions Activity still exists: %s", rs.Primary.ID)) }) return err diff --git a/internal/service/sfn/state_machine.go b/internal/service/sfn/state_machine.go index d017f4c5a839..917c67311a1b 100644 --- a/internal/service/sfn/state_machine.go +++ b/internal/service/sfn/state_machine.go @@ -359,11 +359,11 @@ func resourceStateMachineUpdate(ctx context.Context, d *schema.ResourceData, met } // Handle eventual consistency after update. - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { // nosemgrep:ci.helper-schema-retry-RetryContext-without-TimeoutError-check + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { output, err := findStateMachineByARN(ctx, conn, d.Id()) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if d.HasChange("definition") && !verify.JSONBytesEqual([]byte(aws.ToString(output.Definition)), []byte(d.Get("definition").(string))) || @@ -375,7 +375,7 @@ func resourceStateMachineUpdate(ctx context.Context, d *schema.ResourceData, met d.HasChange("encryption_configuration.0.kms_key_id") && output.EncryptionConfiguration != nil && output.EncryptionConfiguration.KmsKeyId != nil && aws.ToString(output.EncryptionConfiguration.KmsKeyId) != d.Get("encryption_configuration.0.kms_key_id") || d.HasChange("encryption_configuration.0.encryption_type") && output.EncryptionConfiguration != nil && string(output.EncryptionConfiguration.Type) != d.Get("encryption_configuration.0.encryption_type").(string) || d.HasChange("encryption_configuration.0.kms_data_key_reuse_period_seconds") && output.EncryptionConfiguration != nil && output.EncryptionConfiguration.KmsDataKeyReusePeriodSeconds != nil && aws.ToInt32(output.EncryptionConfiguration.KmsDataKeyReusePeriodSeconds) != int32(d.Get("encryption_configuration.0.kms_data_key_reuse_period_seconds").(int)) { - return retry.RetryableError(fmt.Errorf("Step Functions State Machine (%s) eventual consistency", d.Id())) + return tfresource.RetryableError(fmt.Errorf("Step Functions State Machine (%s) eventual consistency", d.Id())) } return nil From 92577aad058725474010d560ca3894dadbbf0724 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:38:08 -0400 Subject: [PATCH 1318/2115] Run 'make gen. --- .ci/.semgrep-service-name0.yml | 15 ++++++++ .ci/.semgrep-service-name1.yml | 33 ++++++++++-------- .ci/.semgrep-service-name2.yml | 64 ++++++++++++++++++++++++---------- .ci/.semgrep-service-name3.yml | 46 ------------------------ 4 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml index 3ac18b537d88..d99eadf90e22 100644 --- a/.ci/.semgrep-service-name0.yml +++ b/.ci/.semgrep-service-name0.yml @@ -4436,3 +4436,18 @@ rules: - focus-metavariable: $NAME - pattern-not: func $NAME($T *testing.T) severity: WARNING + - id: configservice-in-test-name + languages: + - go + message: Include "ConfigService" in test name + paths: + include: + - internal/service/configservice/*_test.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-not-regex: "^TestAccConfigService" + - pattern-regex: ^TestAcc.* + severity: WARNING diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml index b5c4a9d08d48..e9cfedc97e2e 100644 --- a/.ci/.semgrep-service-name1.yml +++ b/.ci/.semgrep-service-name1.yml @@ -1,20 +1,5 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: - - id: configservice-in-test-name - languages: - - go - message: Include "ConfigService" in test name - paths: - include: - - internal/service/configservice/*_test.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-not-regex: "^TestAccConfigService" - - pattern-regex: ^TestAcc.* - severity: WARNING - id: configservice-in-const-name languages: - go @@ -4442,3 +4427,21 @@ rules: patterns: - pattern-regex: "(?i)Invoicing" severity: WARNING + - id: iot-in-func-name + languages: + - go + message: Do not use "IoT" in func name inside iot package + paths: + include: + - internal/service/iot + exclude: + - internal/service/iot/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)IoT" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml index 3e40968a2f2e..b6c3c421b5f8 100644 --- a/.ci/.semgrep-service-name2.yml +++ b/.ci/.semgrep-service-name2.yml @@ -1,23 +1,5 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: - - id: iot-in-func-name - languages: - - go - message: Do not use "IoT" in func name inside iot package - paths: - include: - - internal/service/iot - exclude: - - internal/service/iot/list_pages_gen.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)IoT" - - focus-metavariable: $NAME - - pattern-not: func $NAME($T *testing.T) - severity: WARNING - id: iot-in-test-name languages: - go @@ -4431,3 +4413,49 @@ rules: patterns: - pattern-regex: "(?i)RDS" severity: WARNING + - id: recyclebin-in-func-name + languages: + - go + message: Do not use "recyclebin" in func name inside rbin package + paths: + include: + - internal/service/rbin + exclude: + - internal/service/rbin/list_pages_gen.go + patterns: + - pattern: func $NAME( ... ) + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)recyclebin" + - focus-metavariable: $NAME + - pattern-not: func $NAME($T *testing.T) + severity: WARNING + - id: recyclebin-in-const-name + languages: + - go + message: Do not use "recyclebin" in const name inside rbin package + paths: + include: + - internal/service/rbin + patterns: + - pattern: const $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)recyclebin" + severity: WARNING + - id: recyclebin-in-var-name + languages: + - go + message: Do not use "recyclebin" in var name inside rbin package + paths: + include: + - internal/service/rbin + patterns: + - pattern: var $NAME = ... + - metavariable-pattern: + metavariable: $NAME + patterns: + - pattern-regex: "(?i)recyclebin" + severity: WARNING diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml index ca3d386b1bef..7f884d3d36ff 100644 --- a/.ci/.semgrep-service-name3.yml +++ b/.ci/.semgrep-service-name3.yml @@ -1,51 +1,5 @@ # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT. rules: - - id: recyclebin-in-func-name - languages: - - go - message: Do not use "recyclebin" in func name inside rbin package - paths: - include: - - internal/service/rbin - exclude: - - internal/service/rbin/list_pages_gen.go - patterns: - - pattern: func $NAME( ... ) - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)recyclebin" - - focus-metavariable: $NAME - - pattern-not: func $NAME($T *testing.T) - severity: WARNING - - id: recyclebin-in-const-name - languages: - - go - message: Do not use "recyclebin" in const name inside rbin package - paths: - include: - - internal/service/rbin - patterns: - - pattern: const $NAME = ... - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)recyclebin" - severity: WARNING - - id: recyclebin-in-var-name - languages: - - go - message: Do not use "recyclebin" in var name inside rbin package - paths: - include: - - internal/service/rbin - patterns: - - pattern: var $NAME = ... - - metavariable-pattern: - metavariable: $NAME - patterns: - - pattern-regex: "(?i)recyclebin" - severity: WARNING - id: redshift-in-func-name languages: - go From 13301a8aab4fa9ef7de22079c7cf8a4c6309bba4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:43:52 -0400 Subject: [PATCH 1319/2115] Fix 'missing required field, ListResourcesInput.OrganizationId'. --- internal/service/workmail/service_endpoints_gen_test.go | 4 +++- names/data/names_data.hcl | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/service/workmail/service_endpoints_gen_test.go b/internal/service/workmail/service_endpoints_gen_test.go index 24f870ecb57b..7a5ea3fe0ca3 100644 --- a/internal/service/workmail/service_endpoints_gen_test.go +++ b/internal/service/workmail/service_endpoints_gen_test.go @@ -284,7 +284,9 @@ func callService(ctx context.Context, t *testing.T, meta *conns.AWSClient) apiCa var result apiCallParams - input := workmail.ListResourcesInput{} + input := workmail.ListResourcesInput{ + OrganizationId: aws.String("m-12345678901234567890123456789012"), + } _, err := client.ListResources(ctx, &input, func(opts *workmail.Options) { opts.APIOptions = append(opts.APIOptions, diff --git a/names/data/names_data.hcl b/names/data/names_data.hcl index b2d85630db68..034e4d4a24af 100644 --- a/names/data/names_data.hcl +++ b/names/data/names_data.hcl @@ -8967,7 +8967,8 @@ service "workmail" { } endpoint_info { - endpoint_api_call = "ListResources" + endpoint_api_call = "ListResources" + endpoint_api_params = "OrganizationId: aws.String(\"m-12345678901234567890123456789012\")" } resource_prefix { From f0b0975e34399145feec983184309f5b041c6248 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 10:49:45 -0400 Subject: [PATCH 1320/2115] workmail: Generate tagging code. --- internal/service/workmail/generate.go | 1 + internal/service/workmail/tags_gen.go | 146 ++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 internal/service/workmail/tags_gen.go diff --git a/internal/service/workmail/generate.go b/internal/service/workmail/generate.go index 92661d4afa51..568013754638 100644 --- a/internal/service/workmail/generate.go +++ b/internal/service/workmail/generate.go @@ -2,6 +2,7 @@ // SPDX-License-Identifier: MPL-2.0 //go:generate go run ../../generate/servicepackage/main.go +//go:generate go run ../../generate/tags/main.go -ServiceTagsSlice -ListTags -ListTagsInIDElem=ResourceARN -UpdateTags -TagInIDElem=ResourceARN // ONLY generate directives and package declaration! Do not add anything else to this file. package workmail diff --git a/internal/service/workmail/tags_gen.go b/internal/service/workmail/tags_gen.go new file mode 100644 index 000000000000..7e555869e7de --- /dev/null +++ b/internal/service/workmail/tags_gen.go @@ -0,0 +1,146 @@ +// Code generated by internal/generate/tags/main.go; DO NOT EDIT. +package workmail + +import ( + "context" + + "github.com/YakDriver/smarterr" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/workmail" + awstypes "github.com/aws/aws-sdk-go-v2/service/workmail/types" + "github.com/hashicorp/terraform-plugin-log/tflog" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/logging" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/types/option" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// listTags lists workmail 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 *workmail.Client, identifier string, optFns ...func(*workmail.Options)) (tftags.KeyValueTags, error) { + input := workmail.ListTagsForResourceInput{ + ResourceARN: aws.String(identifier), + } + + output, err := conn.ListTagsForResource(ctx, &input, optFns...) + + if err != nil { + return tftags.New(ctx, nil), smarterr.NewError(err) + } + + return keyValueTags(ctx, output.Tags), nil +} + +// ListTags lists workmail 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).WorkMailClient(ctx), identifier) + + if err != nil { + return smarterr.NewError(err) + } + + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(tags) + } + + return nil +} + +// []*SERVICE.Tag handling + +// svcTags returns workmail service tags. +func svcTags(tags tftags.KeyValueTags) []awstypes.Tag { + result := make([]awstypes.Tag, 0, len(tags)) + + for k, v := range tags.Map() { + tag := awstypes.Tag{ + Key: aws.String(k), + Value: aws.String(v), + } + + result = append(result, tag) + } + + return result +} + +// keyValueTags creates tftags.KeyValueTags from workmail service tags. +func keyValueTags(ctx context.Context, tags []awstypes.Tag) tftags.KeyValueTags { + m := make(map[string]*string, len(tags)) + + for _, tag := range tags { + m[aws.ToString(tag.Key)] = tag.Value + } + + return tftags.New(ctx, m) +} + +// getTagsIn returns workmail service tags from Context. +// nil is returned if there are no input tags. +func getTagsIn(ctx context.Context) []awstypes.Tag { + if inContext, ok := tftags.FromContext(ctx); ok { + if tags := svcTags(inContext.TagsIn.UnwrapOrDefault()); len(tags) > 0 { + return tags + } + } + + return nil +} + +// setTagsOut sets workmail service tags in Context. +func setTagsOut(ctx context.Context, tags []awstypes.Tag) { + if inContext, ok := tftags.FromContext(ctx); ok { + inContext.TagsOut = option.Some(keyValueTags(ctx, tags)) + } +} + +// updateTags updates workmail 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 *workmail.Client, identifier string, oldTagsMap, newTagsMap any, optFns ...func(*workmail.Options)) error { + oldTags := tftags.New(ctx, oldTagsMap) + newTags := tftags.New(ctx, newTagsMap) + + ctx = tflog.SetField(ctx, logging.KeyResourceId, identifier) + + removedTags := oldTags.Removed(newTags) + removedTags = removedTags.IgnoreSystem(names.WorkMail) + if len(removedTags) > 0 { + input := workmail.UntagResourceInput{ + ResourceARN: aws.String(identifier), + TagKeys: removedTags.Keys(), + } + + _, err := conn.UntagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + updatedTags := oldTags.Updated(newTags) + updatedTags = updatedTags.IgnoreSystem(names.WorkMail) + if len(updatedTags) > 0 { + input := workmail.TagResourceInput{ + ResourceARN: aws.String(identifier), + Tags: svcTags(updatedTags), + } + + _, err := conn.TagResource(ctx, &input, optFns...) + + if err != nil { + return smarterr.NewError(err) + } + } + + return nil +} + +// UpdateTags updates workmail 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).WorkMailClient(ctx), identifier, oldTags, newTags) +} From 98a88d218a8f01a349412de977ceace2ee5f3d4a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 11:06:53 -0400 Subject: [PATCH 1321/2115] Unit tests. --- internal/smithy/json_test.go | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 internal/smithy/json_test.go diff --git a/internal/smithy/json_test.go b/internal/smithy/json_test.go new file mode 100644 index 000000000000..479d0719e09b --- /dev/null +++ b/internal/smithy/json_test.go @@ -0,0 +1,67 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package smithy_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/document" + "github.com/google/go-cmp/cmp" + tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" +) + +func TestDocumentToFromJSONString(t *testing.T) { + t.Parallel() + + testCases := []struct { + testName string + input string + wantOutput string + wantInputErr bool + wantOutputErr bool + }{ + { + testName: "empty string", + input: ``, + wantOutput: `null`, + }, + { + testName: "empty JSON", + input: `{}`, + wantOutput: `{}`, + }, + { + testName: "valid JSON", + input: `{"Field1": 42}`, + wantOutput: `{"Field1":42}`, + }, + { + testName: "invalid JSON", + input: `{"Field1"=42}`, + wantInputErr: true, + }, + } + + for _, testCase := range testCases { + t.Run(testCase.testName, func(t *testing.T) { + t.Parallel() + + json, err := tfsmithy.DocumentFromJSONString(testCase.input, document.NewLazyDocument) + if got, want := err != nil, testCase.wantInputErr; !cmp.Equal(got, want) { + t.Errorf("DocumentFromJSONString(%s) err %t (%v), want %t", testCase.input, got, err, want) + } + if err == nil { + output, err := tfsmithy.DocumentToJSONString(json) + if got, want := err != nil, testCase.wantOutputErr; !cmp.Equal(got, want) { + t.Errorf("DocumentToJSONString err %t (%v), want %t", got, err, want) + } + if err == nil { + if diff := cmp.Diff(output, testCase.wantOutput); diff != "" { + t.Errorf("unexpected diff (+wanted, -got): %s", diff) + } + } + } + }) + } +} From 64de4f81d7d40ef9fb1dc6516fb164cf1526491e Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 3 Sep 2025 15:07:33 +0000 Subject: [PATCH 1322/2115] Update CHANGELOG.md for #44127 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c2ae97136f4..6fec2d7586f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ ENHANCEMENTS: * data-source/aws_instance: Add `placement_group_id` attribute ([#38527](https://github.com/hashicorp/terraform-provider-aws/issues/38527)) * data-source/aws_lambda_function: Add `source_kms_key_arn` attribute ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) * data-source/aws_launch_template: Add `placement.group_id` attribute ([#44097](https://github.com/hashicorp/terraform-provider-aws/issues/44097)) +* provider: Support `ap-southeast-6` as a valid AWS Region ([#44127](https://github.com/hashicorp/terraform-provider-aws/issues/44127)) +* resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` and change the attribute to Optional and Computed. This allow ECS to default to `ENABLED` for new resources compatible with *AvailabilityZoneRebalancing* and maintain an existing service's `availability_zone_rebalancing` value during update when not configured. If an existing service never had an `availability_zone_rebalancing` value configured and is updated, ECS will treat this as `DISABLED` ([#43241](https://github.com/hashicorp/terraform-provider-aws/issues/43241)) * resource/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` arguments to support IPv6 connectivity ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) * resource/aws_instance: Add `placement_group_id` argument ([#38527](https://github.com/hashicorp/terraform-provider-aws/issues/38527)) * resource/aws_instance: Add resource identity support ([#44068](https://github.com/hashicorp/terraform-provider-aws/issues/44068)) From 4a0ba59cf7c7fab8783ea41bb96b831adf076689 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 11:13:43 -0400 Subject: [PATCH 1323/2115] tfsmithy.DocumentToJSONString: Use 'document.MarshalSmithyDocument'. --- internal/framework/flex/auto_flatten.go | 14 +++++++------- internal/framework/flex/auto_flatten_test.go | 4 ++-- internal/framework/flex/logging_test.go | 6 +++--- internal/smithy/json.go | 13 +++---------- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/internal/framework/flex/auto_flatten.go b/internal/framework/flex/auto_flatten.go index 2955e76511e4..8aca49b42210 100644 --- a/internal/framework/flex/auto_flatten.go +++ b/internal/framework/flex/auto_flatten.go @@ -620,21 +620,21 @@ func (flattener autoFlattener) interface_(ctx context.Context, vFrom reflect.Val // // JSONStringer -> types.String-ish. // - if vFrom.Type().Implements(reflect.TypeFor[smithydocument.Unmarshaler]()) { - tflog.SubsystemInfo(ctx, subsystemName, "Source implements smithydocument.Unmarshaler") + if vFrom.Type().Implements(reflect.TypeFor[smithydocument.Marshaler]()) { + tflog.SubsystemInfo(ctx, subsystemName, "Source implements smithydocument.Marshaler") stringValue := types.StringNull() if vFrom.IsNil() { tflog.SubsystemTrace(ctx, subsystemName, "Flattening null value") } else { - doc := vFrom.Interface().(smithydocument.Unmarshaler) + doc := vFrom.Interface().(smithydocument.Marshaler) s, err := tfsmithy.DocumentToJSONString(doc) if err != nil { - tflog.SubsystemError(ctx, subsystemName, "Unmarshalling JSON document", map[string]any{ + tflog.SubsystemError(ctx, subsystemName, "Marshalling JSON document", map[string]any{ logAttrKeyError: err.Error(), }) - diags.Append(diagFlatteningUnmarshalSmithyDocument(reflect.TypeOf(doc), err)) + diags.Append(diagFlatteningMarshalSmithyDocument(reflect.TypeOf(doc), err)) return diags } stringValue = types.StringValue(s) @@ -1750,13 +1750,13 @@ func diagFlatteningNoMapBlockKey(sourceType reflect.Type) diag.ErrorDiagnostic { ) } -func diagFlatteningUnmarshalSmithyDocument(sourceType reflect.Type, err error) diag.ErrorDiagnostic { +func diagFlatteningMarshalSmithyDocument(sourceType reflect.Type, err error) diag.ErrorDiagnostic { return diag.NewErrorDiagnostic( "Incompatible Types", "An unexpected error occurred while flattening configuration. "+ "This is always an error in the provider. "+ "Please report the following to the provider developer:\n\n"+ - fmt.Sprintf("Unmarshalling JSON document of type %q failed: %s", fullTypeName(sourceType), err.Error()), + fmt.Sprintf("Marshalling JSON document of type %q failed: %s", fullTypeName(sourceType), err.Error()), ) } diff --git a/internal/framework/flex/auto_flatten_test.go b/internal/framework/flex/auto_flatten_test.go index c94efa6bf68f..4a442ca40d18 100644 --- a/internal/framework/flex/auto_flatten_test.go +++ b/internal/framework/flex/auto_flatten_test.go @@ -4429,7 +4429,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { }, Target: &tfSingleStringField{}, expectedDiags: diag.Diagnostics{ - diagFlatteningUnmarshalSmithyDocument(reflect.TypeFor[*testJSONDocumentError](), errUnmarshallSmithyDocument), + diagFlatteningMarshalSmithyDocument(reflect.TypeFor[*testJSONDocumentError](), errMarshallSmithyDocument), }, expectedLogLines: []map[string]any{ infoFlattening(reflect.TypeFor[*awsJSONStringer](), reflect.TypeFor[*tfSingleStringField]()), @@ -4438,7 +4438,7 @@ func TestFlattenInterfaceToStringTypable(t *testing.T) { infoConvertingWithPath("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[testJSONDocument](), "Field1", reflect.TypeFor[types.String]()), infoSourceImplementsJSONStringer("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String]()), // TODO: fix source type - errorUnmarshallingJSONDocument("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errUnmarshallSmithyDocument), + errorMarshallingJSONDocument("Field1", reflect.TypeFor[tfsmithy.JSONStringer](), "Field1", reflect.TypeFor[types.String](), errMarshallSmithyDocument), }, }, diff --git a/internal/framework/flex/logging_test.go b/internal/framework/flex/logging_test.go index bb928ab98610..461b0abb0964 100644 --- a/internal/framework/flex/logging_test.go +++ b/internal/framework/flex/logging_test.go @@ -477,7 +477,7 @@ func infoSourceImplementsJSONStringer(sourcePath string, sourceType reflect.Type return map[string]any{ "@level": hclog.Info.String(), "@module": logModule, - "@message": "Source implements smithydocument.Unmarshaler", + "@message": "Source implements smithydocument.Marshaler", logAttrKeySourcePath: sourcePath, logAttrKeySourceType: fullTypeName(sourceType), logAttrKeyTargetPath: targetPath, @@ -569,11 +569,11 @@ func errorTargetHasNoMapBlockKey(sourcePath string, sourceType reflect.Type, tar } } -func errorUnmarshallingJSONDocument(sourcePath string, sourceType reflect.Type, targetPath string, targetType reflect.Type, err error) map[string]any { +func errorMarshallingJSONDocument(sourcePath string, sourceType reflect.Type, targetPath string, targetType reflect.Type, err error) map[string]any { return map[string]any{ "@level": hclog.Error.String(), "@module": logModule, - "@message": "Unmarshalling JSON document", + "@message": "Marshalling JSON document", logAttrKeySourcePath: sourcePath, logAttrKeySourceType: fullTypeName(sourceType), logAttrKeyTargetPath: targetPath, diff --git a/internal/smithy/json.go b/internal/smithy/json.go index 144438ed7c54..71d5ef4f90e5 100644 --- a/internal/smithy/json.go +++ b/internal/smithy/json.go @@ -24,20 +24,13 @@ func DocumentFromJSONString[T any](s string, f func(any) T) (T, error) { } // DocumentToJSONString converts a [Smithy document](https://smithy.io/2.0/spec/simple-types.html#document) to a JSON string. -func DocumentToJSONString(document smithydocument.Unmarshaler) (string, error) { - var v any - - err := document.UnmarshalSmithyDocument(&v) - if err != nil { - return "", err - } - - s, err := tfjson.EncodeToString(v) +func DocumentToJSONString(document smithydocument.Marshaler) (string, error) { + bytes, err := document.MarshalSmithyDocument() if err != nil { return "", err } - return strings.TrimSpace(s), nil + return strings.TrimSpace(string(bytes)), nil } // JSONStringer interface is used to marshal and unmarshal JSON interface objects. From 513a871fa8bc600d2288ffd5cdb0f6fa2fbd758a Mon Sep 17 00:00:00 2001 From: Marc <157699+digitalfiz@users.noreply.github.com> Date: Wed, 3 Sep 2025 11:47:18 -0400 Subject: [PATCH 1324/2115] Be more explicit when linking to AWS documentation Co-authored-by: Justin Retzolk <44710313+justinretzolk@users.noreply.github.com> --- website/docs/r/api_gateway_gateway_response.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/api_gateway_gateway_response.html.markdown b/website/docs/r/api_gateway_gateway_response.html.markdown index 38f936f8a79a..77292bc81f72 100644 --- a/website/docs/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/r/api_gateway_gateway_response.html.markdown @@ -38,7 +38,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `rest_api_id` - (Required) String identifier of the associated REST API. -* `response_type` - (Required) [Response type](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) of the associated GatewayResponse. +* `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. * `status_code` - (Optional) HTTP status code of the Gateway Response. * `response_templates` - (Optional) Map of templates used to transform the response body. * `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. From cd5eecd186ecbae644ef2c1381b6eb8788ef2fa0 Mon Sep 17 00:00:00 2001 From: Robin Rodriguez Date: Wed, 3 Sep 2025 12:16:51 -0400 Subject: [PATCH 1325/2115] Update .changelog/44120.txt Co-authored-by: Kit Ewbank --- .changelog/44120.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44120.txt b/.changelog/44120.txt index 8d2eec772914..4ad7fca1fd2c 100644 --- a/.changelog/44120.txt +++ b/.changelog/44120.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_fsx_openzfs_file_system: Add support for >100 user and group quotas +resource/aws_fsx_openzfs_file_system: Remove maximum items limit on the `user_and_group_quotas` argument ``` \ No newline at end of file From c5861335a9dcdf0a1930da8cb634fe466622d59a Mon Sep 17 00:00:00 2001 From: Robin Rodriguez Date: Wed, 3 Sep 2025 12:17:14 -0400 Subject: [PATCH 1326/2115] Update .changelog/44118.txt Co-authored-by: Kit Ewbank --- .changelog/44118.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44118.txt b/.changelog/44118.txt index ee8b0cd40f67..f3923b9757cc 100644 --- a/.changelog/44118.txt +++ b/.changelog/44118.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_fsx_openzfs_volume: Add support for >100 user and group quotas +resource/aws_fsx_openzfs_volume: Remove maximum items limit on the `user_and_group_quotas` argument ``` \ No newline at end of file From f8e57836651fcf0d1f215e8d24b9270e34266aae Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 3 Sep 2025 16:34:33 +0000 Subject: [PATCH 1327/2115] Update CHANGELOG.md for #43956 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fec2d7586f4..1b5fe1045638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ ENHANCEMENTS: BUG FIXES: * resource/aws_s3tables_table_policy: Remove plan-time validation of `name` and `namespace` ([#44072](https://github.com/hashicorp/terraform-provider-aws/issues/44072)) +* resource/aws_servicecatalog_provisioned_product: Set `provisioning_parameters` and `provisioning_artifact_id` to the values from the last successful deployment when update fails ([#43956](https://github.com/hashicorp/terraform-provider-aws/issues/43956)) ## 6.11.0 (August 28, 2025) From facc4fb1fcc6e7c1d91f529fa6045805d8445362 Mon Sep 17 00:00:00 2001 From: Marc Seiler Date: Wed, 3 Sep 2025 12:59:22 -0400 Subject: [PATCH 1328/2115] Also changed wording for AWS documentation link for region --- .../r/api_gateway_gateway_response.html.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/docs/r/api_gateway_gateway_response.html.markdown b/website/docs/r/api_gateway_gateway_response.html.markdown index 77292bc81f72..861e673a9e0b 100644 --- a/website/docs/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/r/api_gateway_gateway_response.html.markdown @@ -36,12 +36,12 @@ resource "aws_api_gateway_gateway_response" "test" { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `rest_api_id` - (Required) String identifier of the associated REST API. -* `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. -* `status_code` - (Optional) HTTP status code of the Gateway Response. -* `response_templates` - (Optional) Map of templates used to transform the response body. -* `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. +- `region` - (Optional) Region where this resource will be manage. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +- `rest_api_id` - (Required) String identifier of the associated REST API. +- `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. +- `status_code` - (Optional) HTTP status code of the Gateway Response. +- `response_templates` - (Optional) Map of templates used to transform the response body. +- `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. ## Attribute Reference From 4346ed479451e5031376091ad1c419cd85e6fa6a Mon Sep 17 00:00:00 2001 From: Marc <157699+digitalfiz@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:11:50 -0400 Subject: [PATCH 1329/2115] Fix misspelled word Co-authored-by: Justin Retzolk <44710313+justinretzolk@users.noreply.github.com> --- website/docs/r/api_gateway_gateway_response.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/api_gateway_gateway_response.html.markdown b/website/docs/r/api_gateway_gateway_response.html.markdown index 861e673a9e0b..4b781b7d29b9 100644 --- a/website/docs/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/r/api_gateway_gateway_response.html.markdown @@ -36,7 +36,7 @@ resource "aws_api_gateway_gateway_response" "test" { This resource supports the following arguments: -- `region` - (Optional) Region where this resource will be manage. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +- `region` - (Optional) Region where this resource will be managed. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). - `rest_api_id` - (Required) String identifier of the associated REST API. - `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. - `status_code` - (Optional) HTTP status code of the Gateway Response. From ea4c6c3646cd370835289a890af7fad0a3ff610e Mon Sep 17 00:00:00 2001 From: Marc Seiler Date: Wed, 3 Sep 2025 13:39:50 -0400 Subject: [PATCH 1330/2115] fixed markdown auto format change --- .../r/api_gateway_gateway_response.html.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/website/docs/r/api_gateway_gateway_response.html.markdown b/website/docs/r/api_gateway_gateway_response.html.markdown index 4b781b7d29b9..a6cf7d03c7be 100644 --- a/website/docs/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/r/api_gateway_gateway_response.html.markdown @@ -36,12 +36,12 @@ resource "aws_api_gateway_gateway_response" "test" { This resource supports the following arguments: -- `region` - (Optional) Region where this resource will be managed. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -- `rest_api_id` - (Required) String identifier of the associated REST API. -- `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. -- `status_code` - (Optional) HTTP status code of the Gateway Response. -- `response_templates` - (Optional) Map of templates used to transform the response body. -- `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. +* `region` - (Optional) Region where this resource will be managed. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `rest_api_id` - (Required) String identifier of the associated REST API. +* `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. +* `status_code` - (Optional) HTTP status code of the Gateway Response. +* `response_templates` - (Optional) Map of templates used to transform the response body. +* `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. ## Attribute Reference From c015dbec647ec1f0f802e264458c83c250308bdf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 14:29:07 -0400 Subject: [PATCH 1331/2115] cognitoidp: New-style sweepers. --- internal/service/cognitoidp/sweep.go | 74 ++++++---------------------- 1 file changed, 16 insertions(+), 58 deletions(-) diff --git a/internal/service/cognitoidp/sweep.go b/internal/service/cognitoidp/sweep.go index c9526aeac9c7..8ebe3ebd9136 100644 --- a/internal/service/cognitoidp/sweep.go +++ b/internal/service/cognitoidp/sweep.go @@ -4,56 +4,36 @@ package cognitoidp import ( - "fmt" + "context" "log" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider" awstypes "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" "github.com/hashicorp/terraform-provider-aws/names" ) func RegisterSweepers() { - resource.AddTestSweepers("aws_cognito_user_pool_domain", &resource.Sweeper{ - Name: "aws_cognito_user_pool_domain", - F: sweepUserPoolDomains, - }) - - resource.AddTestSweepers("aws_cognito_user_pool", &resource.Sweeper{ - Name: "aws_cognito_user_pool", - F: sweepUserPools, - Dependencies: []string{ - "aws_cognito_user_pool_domain", - }, - }) + awsv2.Register("aws_cognito_user_pool_domain", sweepUserPoolDomains) + awsv2.Register("aws_cognito_user_pool", sweepUserPools, "aws_cognito_user_pool_domain") } -func sweepUserPoolDomains(region string) error { - ctx := sweep.Context(region) - client, err := sweep.SharedRegionalSweepClient(ctx, region) - if err != nil { - return fmt.Errorf("Error getting client: %s", err) - } - input := &cognitoidentityprovider.ListUserPoolsInput{ +func sweepUserPoolDomains(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { + conn := client.CognitoIDPClient(ctx) + input := cognitoidentityprovider.ListUserPoolsInput{ MaxResults: aws.Int32(50), } - conn := client.CognitoIDPClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - pages := cognitoidentityprovider.NewListUserPoolsPaginator(conn, input) + pages := cognitoidentityprovider.NewListUserPoolsPaginator(conn, &input) for pages.HasMorePages() { page, err := pages.NextPage(ctx) - if awsv2.SkipSweepError(err) { - log.Printf("[WARN] Skipping Cognito User Pool Domain sweep for %s: %s", region, err) - return nil - } - if err != nil { - return fmt.Errorf("error listing Cognito User Pools (%s): %w", region, err) + return nil, err } for _, v := range page.UserPools { @@ -75,38 +55,22 @@ func sweepUserPoolDomains(region string) error { } } - err = sweep.SweepOrchestrator(ctx, sweepResources) - - if err != nil { - return fmt.Errorf("error sweeping Cognito User Pool Domains (%s): %w", region, err) - } - - return nil + return sweepResources, nil } -func sweepUserPools(region string) error { - ctx := sweep.Context(region) - client, err := sweep.SharedRegionalSweepClient(ctx, region) - if err != nil { - return fmt.Errorf("Error getting client: %s", err) - } - input := &cognitoidentityprovider.ListUserPoolsInput{ +func sweepUserPools(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { + conn := client.CognitoIDPClient(ctx) + input := cognitoidentityprovider.ListUserPoolsInput{ MaxResults: aws.Int32(50), } - conn := client.CognitoIDPClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - pages := cognitoidentityprovider.NewListUserPoolsPaginator(conn, input) + pages := cognitoidentityprovider.NewListUserPoolsPaginator(conn, &input) for pages.HasMorePages() { page, err := pages.NextPage(ctx) - if awsv2.SkipSweepError(err) { - log.Printf("[WARN] Skipping Cognito User Pool sweep for %s: %s", region, err) - return nil - } - if err != nil { - return fmt.Errorf("error listing Cognito User Pools (%s): %w", region, err) + return nil, err } for _, v := range page.UserPools { @@ -130,11 +94,5 @@ func sweepUserPools(region string) error { } } - err = sweep.SweepOrchestrator(ctx, sweepResources) - - if err != nil { - return fmt.Errorf("error sweeping Cognito User Pools (%s): %w", region, err) - } - - return nil + return sweepResources, nil } From eaf080aa694d0cbd8967c81c76f8690e275e2bf3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 14:31:29 -0400 Subject: [PATCH 1332/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - bedrockagent. --- internal/service/bedrockagent/knowledge_base.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go index 8aeb2a7565f9..9d1384b53454 100644 --- a/internal/service/bedrockagent/knowledge_base.go +++ b/internal/service/bedrockagent/knowledge_base.go @@ -523,33 +523,29 @@ func (r *knowledgeBaseResource) Create(ctx context.Context, request resource.Cre var output *bedrockagent.CreateKnowledgeBaseOutput var err error - err = retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { output, err = conn.CreateKnowledgeBase(ctx, input) // IAM propagation if tfawserr.ErrMessageContains(err, errCodeValidationException, "cannot assume role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if tfawserr.ErrMessageContains(err, errCodeValidationException, "unable to assume the given role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // OpenSearch data access propagation if tfawserr.ErrMessageContains(err, errCodeValidationException, "storage configuration provided is invalid") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateKnowledgeBase(ctx, input) - } - if err != nil { response.Diagnostics.AddError("creating Bedrock Agent Knowledge Base", err.Error()) return From 0dad66a4402afab91c5b98b4de401434149ee7e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 14:32:59 -0400 Subject: [PATCH 1333/2115] Fix sdemgrep 'ci.semgrep.framework.manual-flattener-functions'. --- internal/service/cognitoidp/managed_login_branding.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 966ab14e741e..ac4ad62a6b4c 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -163,6 +163,14 @@ func (r *managedLoginBrandingResource) Create(ctx context.Context, request resou return } + // Additional fields. + settings, diags := data.Settings.ToSmithyDocument(ctx) + response.Diagnostics.Append(diags...) + if response.Diagnostics.HasError() { + return + } + input.Settings = settings + output, err := conn.CreateManagedLoginBranding(ctx, &input) if err != nil { @@ -408,7 +416,7 @@ type managedLoginBrandingResourceModel struct { UserPoolID types.String `tfsdk:"user_pool_id"` } -func flattenManagedLoginBrandingSettings(ctx context.Context, settings document.Interface) (fwtypes.SmithyJSON[document.Interface], diag.Diagnostics) { +func flattenManagedLoginBrandingSettings(ctx context.Context, settings document.Interface) (fwtypes.SmithyJSON[document.Interface], diag.Diagnostics) { // nosemgrep:ci.semgrep.framework.manual-flattener-functions var diags diag.Diagnostics if settings == nil { From f059444c5fd57c69b59789a8db25e91ba44d6e97 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 15:21:07 -0400 Subject: [PATCH 1334/2115] d/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region. --- .changelog/#####.txt | 3 +++ internal/service/elb/hosted_zone_id_data_source.go | 1 + 2 files changed, 4 insertions(+) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..254ed98dc2a2 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region +``` \ No newline at end of file diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index b8ed8b87105a..cd67a916981a 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -28,6 +28,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", + endpoints.ApSoutheast6RegionID: "Z023301818UFJ50CIO0MV", endpoints.ApSoutheast7RegionID: "Z0390008CMBRTHFGWBCB", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", From 724d28bc30ad0b78df88a82b1cf6865fba003610 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 15:23:13 -0400 Subject: [PATCH 1335/2115] d/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region. --- .changelog/#####.txt | 4 ++++ internal/service/elbv2/hosted_zone_id_data_source.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.changelog/#####.txt b/.changelog/#####.txt index 254ed98dc2a2..daa07466dc1f 100644 --- a/.changelog/#####.txt +++ b/.changelog/#####.txt @@ -1,3 +1,7 @@ ```release-note:enhancement data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region +``` + +```release-note:enhancement +data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ``` \ No newline at end of file diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index d770a9f07925..87fbec68b3e3 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -31,6 +31,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", + endpoints.ApSoutheast6RegionID: "Z023301818UFJ50CIO0MV", endpoints.ApSoutheast7RegionID: "Z0390008CMBRTHFGWBCB", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", @@ -72,6 +73,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV", endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB", + endpoints.ApSoutheast6RegionID: "Z01392953RKV2Q3RBP0KU", endpoints.ApSoutheast7RegionID: "Z054363131YWATEMWRG5L", endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT", endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9", From f55286b612690ab51909b037d2dd28ef246ce1d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 15:40:39 -0400 Subject: [PATCH 1336/2115] d/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions. --- .changelog/#####.txt | 4 ++ .../hosted_zone_data_source.go | 42 ++++++++++++------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.changelog/#####.txt b/.changelog/#####.txt index daa07466dc1f..0edecc348e50 100644 --- a/.changelog/#####.txt +++ b/.changelog/#####.txt @@ -4,4 +4,8 @@ data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS ```release-note:enhancement data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region +``` + +```release-note:enhancement +data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions ``` \ No newline at end of file diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 74046908d2d6..af852e779fc7 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -17,32 +17,44 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html var hostedZoneIDs = map[string]string{ - endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", - endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", - endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N", - endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8", - endpoints.ApEast1RegionID: "ZPWYUBWRU171A", + endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", + endpoints.ApEast1RegionID: "ZPWYUBWRU171A", + // endpoints.ApEast2RegionID: "", endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY", endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ", + // endpoints.ApSouth2RegionID: "", + endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", + endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N", + endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8", + // endpoints.ApSoutheast4RegionID: "", + endpoints.ApSoutheast5RegionID: "Z18NTBI3Y7N9TZ", + // endpoints.ApSoutheast6RegionID: "", + endpoints.ApSoutheast7RegionID: "Z1R25G3KIG2GBW", endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I", - endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", - endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", - endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", - endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", - endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", - endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", - endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", - // endpoints.MeCentral1RegionID: "", + // endpoints.CaWest1RegionID: "", + // endpoints.CnNorth1RegionID: "", + // endpoints.CnNorthwest1RegionID: "", + endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", + // endpoints.EuCentral2RegionID: "", + endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", + endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", + endpoints.EuSouth2RegionID: "Z23GO28BZ5AETM", + endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", + endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", + endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", + endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", + endpoints.MeCentral1RegionID: "Z10X7K2B4QSOFV", endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2", + // endpoints.MxCentral1RegionID: "", endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV", endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G", endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC", - endpoints.UsWest1RegionID: "Z1LQECGX5PH1X", - endpoints.UsWest2RegionID: "Z38NKT9BP95V3O", endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG", + endpoints.UsWest1RegionID: "Z1LQECGX5PH1X", + endpoints.UsWest2RegionID: "Z38NKT9BP95V3O", } // @SDKDataSource("aws_elastic_beanstalk_hosted_zone", name="Hosted Zone") From fafcbb299a465f4a567c1b03b7c216f5b3c4724d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:16:33 -0400 Subject: [PATCH 1337/2115] Add 'findManagedLoginBrandingByClient'. --- .../cognitoidp/managed_login_branding.go | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index ac4ad62a6b4c..9be771275897 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -259,6 +259,39 @@ func (r *managedLoginBrandingResource) Read(ctx context.Context, request resourc } data.SettingsAll = settingsAll + input := cognitoidentityprovider.ListUserPoolClientsInput{ + UserPoolId: aws.String(userPoolID), + } + pages := cognitoidentityprovider.NewListUserPoolClientsPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("listing Cognito User Pool (%s) Clients", userPoolID), err.Error()) + + return + } + + for _, v := range page.UserPoolClients { + clientID := aws.ToString(v.ClientId) + input := cognitoidentityprovider.DescribeManagedLoginBrandingByClientInput{ + ClientId: aws.String(clientID), + UserPoolId: aws.String(userPoolID), + } + mlb, err := findManagedLoginBrandingByClient(ctx, conn, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding by client (%s)", clientID), err.Error()) + + return + } + + if aws.ToString(mlb.ManagedLoginBrandingId) == managedLoginBrandingID { + data.ClientID = fwflex.StringValueToFramework(ctx, clientID) + } + } + } + response.Diagnostics.Append(response.State.Set(ctx, &data)...) } @@ -405,6 +438,27 @@ func findManagedLoginBranding(ctx context.Context, conn *cognitoidentityprovider return output.ManagedLoginBranding, nil } +func findManagedLoginBrandingByClient(ctx context.Context, conn *cognitoidentityprovider.Client, input *cognitoidentityprovider.DescribeManagedLoginBrandingByClientInput) (*awstypes.ManagedLoginBrandingType, error) { + output, err := conn.DescribeManagedLoginBrandingByClient(ctx, input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + + if err != nil { + return nil, err + } + + if output == nil || output.ManagedLoginBranding == nil { + return nil, tfresource.NewEmptyResultError(input) + } + + return output.ManagedLoginBranding, nil +} + type managedLoginBrandingResourceModel struct { framework.WithRegionModel Asset fwtypes.SetNestedObjectValueOf[assetTypeModel] `tfsdk:"asset"` From 18e32acb540605ad868379b199a1172d86f0599a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:17:18 -0400 Subject: [PATCH 1338/2115] r/aws_cognito_managed_login_branding: Initial acceptance test. --- internal/service/cognitoidp/exports_test.go | 1 + .../cognitoidp/managed_login_branding_test.go | 130 ++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 internal/service/cognitoidp/managed_login_branding_test.go diff --git a/internal/service/cognitoidp/exports_test.go b/internal/service/cognitoidp/exports_test.go index 5cf616ba1721..91cef05d91a0 100644 --- a/internal/service/cognitoidp/exports_test.go +++ b/internal/service/cognitoidp/exports_test.go @@ -22,6 +22,7 @@ var ( FindGroupUserByThreePartKey = findGroupUserByThreePartKey FindIdentityProviderByTwoPartKey = findIdentityProviderByTwoPartKey FindLogDeliveryConfigurationByUserPoolID = findLogDeliveryConfigurationByUserPoolID + FindManagedLoginBrandingByThreePartKey = findManagedLoginBrandingByThreePartKey FindResourceServerByTwoPartKey = findResourceServerByTwoPartKey FindRiskConfigurationByTwoPartKey = findRiskConfigurationByTwoPartKey FindUserByTwoPartKey = findUserByTwoPartKey diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go new file mode 100644 index 000000000000..8a1df4cd48e2 --- /dev/null +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -0,0 +1,130 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package cognitoidp_test + +import ( + "context" + "fmt" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider/types" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + tfcognitoidp "github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccCognitoIDPManagedLoginBranding_basic(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBranding_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("managed_login_branding_id"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings_all"), knownvalue.NotNull()), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + }, + }, + }) +} + +func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_cognito_managed_login_branding" { + continue + } + + _, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes["user_pool_id"], rs.Primary.Attributes["managed_login_branding_id"], false) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + return fmt.Errorf("Cognito Managed Login Branding %s still exists", rs.Primary.ID) + } + + return nil + } +} + +func testAccCheckManagedLoginBrandingExists(ctx context.Context, n string, v *awstypes.ManagedLoginBrandingType) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) + + output, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes["user_pool_id"], rs.Primary.Attributes["managed_login_branding_id"], false) + + if err != nil { + return err + } + + *v = *output + + return nil + } +} + +func testAccManagedLoginBranding_basic(rName string) string { + return fmt.Sprintf(` +resource "aws_cognito_user_pool" "test" { + name = %[1]q +} + +resource "aws_cognito_user_pool_client" "test" { + name = %[1]q + user_pool_id = aws_cognito_user_pool.test.id + explicit_auth_flows = ["ADMIN_NO_SRP_AUTH"] +} + +resource "aws_cognito_managed_login_branding" "test" { + client_id = aws_cognito_user_pool_client.test.id + user_pool_id = aws_cognito_user_pool.test.id + + use_cognito_provided_values = true +} +`, rName) +} From ea6acb228cb4dda3f127eb8fb607050ac83ccc48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:17:29 -0400 Subject: [PATCH 1339/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccCognitoIDPManagedLoginBranding_basic' PKG=cognitoidp make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/cognitoidp/... -v -count 1 -parallel 20 -run=TestAccCognitoIDPManagedLoginBranding_basic -timeout 360m -vet=off 2025/09/03 16:15:10 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/03 16:15:10 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccCognitoIDPManagedLoginBranding_basic === PAUSE TestAccCognitoIDPManagedLoginBranding_basic === CONT TestAccCognitoIDPManagedLoginBranding_basic --- PASS: TestAccCognitoIDPManagedLoginBranding_basic (20.83s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp 26.584s From 9b5eb9172c9f7626cc1804fc75eeecb9a91e0719 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:25:16 -0400 Subject: [PATCH 1340/2115] Add 'TestAccCognitoIDPManagedLoginBranding_disappears'. --- internal/service/cognitoidp/exports_test.go | 1 + .../cognitoidp/managed_login_branding_test.go | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/internal/service/cognitoidp/exports_test.go b/internal/service/cognitoidp/exports_test.go index 91cef05d91a0..b4d0013ecf04 100644 --- a/internal/service/cognitoidp/exports_test.go +++ b/internal/service/cognitoidp/exports_test.go @@ -7,6 +7,7 @@ package cognitoidp var ( ResourceIdentityProvider = resourceIdentityProvider ResourceLogDeliveryConfiguration = newLogDeliveryConfigurationResource + ResourceManagedLoginBranding = newManagedLoginBrandingResource ResourceManagedUserPoolClient = newManagedUserPoolClientResource ResourceResourceServer = resourceResourceServer ResourceRiskConfiguration = resourceRiskConfiguration diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 8a1df4cd48e2..940502e994dd 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -61,6 +61,30 @@ func TestAccCognitoIDPManagedLoginBranding_basic(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_disappears(t *testing.T) { + ctx := acctest.Context(t) + var client awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBranding_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &client), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfcognitoidp.ResourceManagedLoginBranding, resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) From 53e1516fe62aafe817a80542ed8495857136d0aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:31:44 -0400 Subject: [PATCH 1341/2115] Tweak 'TestAccCognitoIDPManagedLoginBranding_basic'. --- internal/service/cognitoidp/managed_login_branding_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 940502e994dd..896d2ac74e30 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -46,8 +46,11 @@ func TestAccCognitoIDPManagedLoginBranding_basic(t *testing.T) { }, }, ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("asset"), knownvalue.SetSizeExact(0)), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("managed_login_branding_id"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.Null()), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings_all"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)), }, }, { From c7303a7c35780f75ec885232758a439b5385074d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:37:48 -0400 Subject: [PATCH 1342/2115] Add 'TestAccCognitoIDPManagedLoginBranding_asset'. --- .../cognitoidp/managed_login_branding_test.go | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 896d2ac74e30..178ee997b90b 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -36,7 +36,7 @@ func TestAccCognitoIDPManagedLoginBranding_basic(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBranding_basic(rName), + Config: testAccManagedLoginBrandingConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -77,7 +77,7 @@ func TestAccCognitoIDPManagedLoginBranding_disappears(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBranding_basic(rName), + Config: testAccManagedLoginBrandingConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &client), acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfcognitoidp.ResourceManagedLoginBranding, resourceName), @@ -88,6 +88,43 @@ func TestAccCognitoIDPManagedLoginBranding_disappears(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_asset(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_asset(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("asset"), knownvalue.SetSizeExact(1)), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) @@ -135,7 +172,7 @@ func testAccCheckManagedLoginBrandingExists(ctx context.Context, n string, v *aw } } -func testAccManagedLoginBranding_basic(rName string) string { +func testAccManagedLoginBrandingConfig_base(rName string) string { return fmt.Sprintf(` resource "aws_cognito_user_pool" "test" { name = %[1]q @@ -146,12 +183,34 @@ resource "aws_cognito_user_pool_client" "test" { user_pool_id = aws_cognito_user_pool.test.id explicit_auth_flows = ["ADMIN_NO_SRP_AUTH"] } +`, rName) +} +func testAccManagedLoginBrandingConfig_basic(rName string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` resource "aws_cognito_managed_login_branding" "test" { client_id = aws_cognito_user_pool_client.test.id user_pool_id = aws_cognito_user_pool.test.id use_cognito_provided_values = true } -`, rName) +`) +} + +func testAccManagedLoginBrandingConfig_asset(rName string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` +resource "aws_cognito_managed_login_branding" "test" { + client_id = aws_cognito_user_pool_client.test.id + user_pool_id = aws_cognito_user_pool.test.id + + use_cognito_provided_values = true + + asset { + bytes = filebase64("test-fixtures/login_branding_asset.svg") + category = "PAGE_FOOTER_BACKGROUND" + color_mode = "DARK" + extension = "SVG" + } +} +`) } From ce4d7097100b6a6729dbca135c65ef111010f28b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:37:59 -0400 Subject: [PATCH 1343/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccCognitoIDPManagedLoginBranding_asset' PKG=cognitoidp make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/cognitoidp/... -v -count 1 -parallel 20 -run=TestAccCognitoIDPManagedLoginBranding_asset -timeout 360m -vet=off 2025/09/03 16:37:07 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/03 16:37:07 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccCognitoIDPManagedLoginBranding_asset === PAUSE TestAccCognitoIDPManagedLoginBranding_asset === CONT TestAccCognitoIDPManagedLoginBranding_asset --- PASS: TestAccCognitoIDPManagedLoginBranding_asset (20.76s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp 26.311s From 91393cb58cd1b31d1451a1b1c5d828f330275d32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:41:18 -0400 Subject: [PATCH 1344/2115] Add 'TestAccCognitoIDPManagedLoginBranding_settings'. --- .../cognitoidp/managed_login_branding_test.go | 500 ++++++++++++++++++ 1 file changed, 500 insertions(+) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 178ee997b90b..aee15cba3ce4 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -125,6 +125,44 @@ func TestAccCognitoIDPManagedLoginBranding_asset(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_settings(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)), + }, + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) @@ -214,3 +252,465 @@ resource "aws_cognito_managed_login_branding" "test" { } `) } + +func testAccManagedLoginBrandingConfig_settings(rName string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` +resource "aws_cognito_managed_login_branding" "test" { + client_id = aws_cognito_user_pool_client.test.id + user_pool_id = aws_cognito_user_pool.test.id + + settings = jsonencode({ + "categories" : { + "auth" : { + "authMethodOrder" : [ + [ + { + "display" : "BUTTON", + "type" : "FEDERATED" + }, + { + "display" : "INPUT", + "type" : "USERNAME_PASSWORD" + } + ] + ], + "federation" : { + "interfaceStyle" : "BUTTON_LIST", + "order" : [ + ] + } + }, + "form" : { + "displayGraphics" : true, + "instructions" : { + "enabled" : false + }, + "languageSelector" : { + "enabled" : false + }, + "location" : { + "horizontal" : "CENTER", + "vertical" : "CENTER" + }, + "sessionTimerDisplay" : "NONE" + }, + "global" : { + "colorSchemeMode" : "LIGHT", + "pageFooter" : { + "enabled" : false + }, + "pageHeader" : { + "enabled" : false + }, + "spacingDensity" : "REGULAR" + }, + "signUp" : { + "acceptanceElements" : [ + { + "enforcement" : "NONE", + "textKey" : "en" + } + ] + } + }, + "componentClasses" : { + "buttons" : { + "borderRadius" : 8.0 + }, + "divider" : { + "darkMode" : { + "borderColor" : "232b37ff" + }, + "lightMode" : { + "borderColor" : "ebebf0ff" + } + }, + "dropDown" : { + "borderRadius" : 8.0, + "darkMode" : { + "defaults" : { + "itemBackgroundColor" : "192534ff" + }, + "hover" : { + "itemBackgroundColor" : "081120ff", + "itemBorderColor" : "5f6b7aff", + "itemTextColor" : "e9ebedff" + }, + "match" : { + "itemBackgroundColor" : "d1d5dbff", + "itemTextColor" : "89bdeeff" + } + }, + "lightMode" : { + "defaults" : { + "itemBackgroundColor" : "ffffffff" + }, + "hover" : { + "itemBackgroundColor" : "f4f4f4ff", + "itemBorderColor" : "7d8998ff", + "itemTextColor" : "000716ff" + }, + "match" : { + "itemBackgroundColor" : "414d5cff", + "itemTextColor" : "0972d3ff" + } + } + }, + "focusState" : { + "darkMode" : { + "borderColor" : "539fe5ff" + }, + "lightMode" : { + "borderColor" : "0972d3ff" + } + }, + "idpButtons" : { + "icons" : { + "enabled" : true + } + }, + "input" : { + "borderRadius" : 8.0, + "darkMode" : { + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "5f6b7aff" + }, + "placeholderColor" : "8d99a8ff" + }, + "lightMode" : { + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "7d8998ff" + }, + "placeholderColor" : "5f6b7aff" + } + }, + "inputDescription" : { + "darkMode" : { + "textColor" : "8d99a8ff" + }, + "lightMode" : { + "textColor" : "5f6b7aff" + } + }, + "inputLabel" : { + "darkMode" : { + "textColor" : "d1d5dbff" + }, + "lightMode" : { + "textColor" : "000716ff" + } + }, + "link" : { + "darkMode" : { + "defaults" : { + "textColor" : "539fe5ff" + }, + "hover" : { + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "defaults" : { + "textColor" : "0972d3ff" + }, + "hover" : { + "textColor" : "033160ff" + } + } + }, + "optionControls" : { + "darkMode" : { + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "7d8998ff" + }, + "selected" : { + "backgroundColor" : "539fe5ff", + "foregroundColor" : "000716ff" + } + }, + "lightMode" : { + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "7d8998ff" + }, + "selected" : { + "backgroundColor" : "0972d3ff", + "foregroundColor" : "ffffffff" + } + } + }, + "statusIndicator" : { + "darkMode" : { + "error" : { + "backgroundColor" : "1a0000ff", + "borderColor" : "eb6f6fff", + "indicatorColor" : "eb6f6fff" + }, + "pending" : { + "indicatorColor" : "AAAAAAAA" + }, + "success" : { + "backgroundColor" : "001a02ff", + "borderColor" : "29ad32ff", + "indicatorColor" : "29ad32ff" + }, + "warning" : { + "backgroundColor" : "1d1906ff", + "borderColor" : "e0ca57ff", + "indicatorColor" : "e0ca57ff" + } + }, + "lightMode" : { + "error" : { + "backgroundColor" : "fff7f7ff", + "borderColor" : "d91515ff", + "indicatorColor" : "d91515ff" + }, + "pending" : { + "indicatorColor" : "AAAAAAAA" + }, + "success" : { + "backgroundColor" : "f2fcf3ff", + "borderColor" : "037f0cff", + "indicatorColor" : "037f0cff" + }, + "warning" : { + "backgroundColor" : "fffce9ff", + "borderColor" : "8d6605ff", + "indicatorColor" : "8d6605ff" + } + } + } + }, + "components" : { + "alert" : { + "borderRadius" : 12.0, + "darkMode" : { + "error" : { + "backgroundColor" : "1a0000ff", + "borderColor" : "eb6f6fff" + } + }, + "lightMode" : { + "error" : { + "backgroundColor" : "fff7f7ff", + "borderColor" : "d91515ff" + } + } + }, + "favicon" : { + "enabledTypes" : [ + "ICO", + "SVG" + ] + }, + "form" : { + "backgroundImage" : { + "enabled" : false + }, + "borderRadius" : 8.0, + "darkMode" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "424650ff" + }, + "lightMode" : { + "backgroundColor" : "ffffffff", + "borderColor" : "c6c6cdff" + }, + "logo" : { + "enabled" : false, + "formInclusion" : "IN", + "location" : "CENTER", + "position" : "TOP" + } + }, + "idpButton" : { + "custom" : { + }, + "standard" : { + "darkMode" : { + "active" : { + "backgroundColor" : "354150ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + }, + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "c6c6cdff", + "textColor" : "c6c6cdff" + }, + "hover" : { + "backgroundColor" : "192534ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "d3e7f9ff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + }, + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "424650ff", + "textColor" : "424650ff" + }, + "hover" : { + "backgroundColor" : "f2f8fdff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + } + } + } + }, + "pageBackground" : { + "darkMode" : { + "color" : "0f1b2aff" + }, + "image" : { + "enabled" : true + }, + "lightMode" : { + "color" : "ffffffff" + } + }, + "pageFooter" : { + "backgroundImage" : { + "enabled" : false + }, + "darkMode" : { + "background" : { + "color" : "0f141aff" + }, + "borderColor" : "424650ff" + }, + "lightMode" : { + "background" : { + "color" : "fafafaff" + }, + "borderColor" : "d5dbdbff" + }, + "logo" : { + "enabled" : false, + "location" : "START" + } + }, + "pageHeader" : { + "backgroundImage" : { + "enabled" : false + }, + "darkMode" : { + "background" : { + "color" : "0f141aff" + }, + "borderColor" : "424650ff" + }, + "lightMode" : { + "background" : { + "color" : "fafafaff" + }, + "borderColor" : "d5dbdbff" + }, + "logo" : { + "enabled" : false, + "location" : "START" + } + }, + "pageText" : { + "darkMode" : { + "bodyColor" : "b6bec9ff", + "descriptionColor" : "b6bec9ff", + "headingColor" : "d1d5dbff" + }, + "lightMode" : { + "bodyColor" : "414d5cff", + "descriptionColor" : "414d5cff", + "headingColor" : "000716ff" + } + }, + "phoneNumberSelector" : { + "displayType" : "TEXT" + }, + "primaryButton" : { + "darkMode" : { + "active" : { + "backgroundColor" : "539fe5ff", + "textColor" : "000716ff" + }, + "defaults" : { + "backgroundColor" : "539fe5ff", + "textColor" : "000716ff" + }, + "disabled" : { + "backgroundColor" : "ffffffff", + "borderColor" : "ffffffff" + }, + "hover" : { + "backgroundColor" : "89bdeeff", + "textColor" : "000716ff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "033160ff", + "textColor" : "ffffffff" + }, + "defaults" : { + "backgroundColor" : "0972d3ff", + "textColor" : "ffffffff" + }, + "disabled" : { + "backgroundColor" : "ffffffff", + "borderColor" : "ffffffff" + }, + "hover" : { + "backgroundColor" : "033160ff", + "textColor" : "ffffffff" + } + } + }, + "secondaryButton" : { + "darkMode" : { + "active" : { + "backgroundColor" : "354150ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + }, + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "539fe5ff", + "textColor" : "539fe5ff" + }, + "hover" : { + "backgroundColor" : "192534ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "d3e7f9ff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + }, + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "0972d3ff", + "textColor" : "0972d3ff" + }, + "hover" : { + "backgroundColor" : "f2f8fdff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + } + } + } + } + }) +} +`) +} From 50dcc805b1b376623990c0fa9ceb516704c6b44c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 3 Sep 2025 16:41:28 -0400 Subject: [PATCH 1345/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccCognitoIDPManagedLoginBranding_settings' PKG=cognitoidp make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/cognitoidp/... -v -count 1 -parallel 20 -run=TestAccCognitoIDPManagedLoginBranding_settings -timeout 360m -vet=off 2025/09/03 16:40:44 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/03 16:40:44 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccCognitoIDPManagedLoginBranding_settings === PAUSE TestAccCognitoIDPManagedLoginBranding_settings === CONT TestAccCognitoIDPManagedLoginBranding_settings --- PASS: TestAccCognitoIDPManagedLoginBranding_settings (20.11s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp 25.621s From 1b4ec688e99f81e29abf504f20f85fd3af0569f8 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 18:17:49 -0400 Subject: [PATCH 1346/2115] Add comments about undocumented restriction --- internal/service/dynamodb/table.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 3fe2c95e975d..1dcacd4cca56 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -127,6 +127,7 @@ func resourceTable() *schema.Resource { }), customdiff.ForceNewIfChange("warm_throughput.0.read_units_per_second", func(_ context.Context, old, new, meta any) bool { // warm_throughput can only be increased, not decreased + // i.e., "api error ValidationException: One or more parameter values were invalid: Requested ReadUnitsPerSecond for WarmThroughput for table is lower than current WarmThroughput, decreasing WarmThroughput is not supported" if old, new := old.(int), new.(int); new != 0 && new < old { return true } @@ -135,6 +136,7 @@ func resourceTable() *schema.Resource { }), customdiff.ForceNewIfChange("warm_throughput.0.write_units_per_second", func(_ context.Context, old, new, meta any) bool { // warm_throughput can only be increased, not decreased + // i.e., "api error ValidationException: One or more parameter values were invalid: Requested ReadUnitsPerSecond for WarmThroughput for table is lower than current WarmThroughput, decreasing WarmThroughput is not supported" if old, new := old.(int), new.(int); new != 0 && new < old { return true } From c74455ce5afc6497414cec33e35500a5713d35a3 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 18:18:03 -0400 Subject: [PATCH 1347/2115] Fix a test --- internal/service/dynamodb/table_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index aed9f042d851..32189d6ae52c 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -4889,7 +4889,7 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { ), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionDestroyBeforeCreate), }, }, }, From 0446a008a8f7ef97d96ccce2a1a025a287ff2d8a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 18:35:16 -0400 Subject: [PATCH 1348/2115] Add verify that increase/decrease of warm throughput updatable --- internal/service/dynamodb/table_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 32189d6ae52c..82279d3ec04e 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -5000,6 +5000,11 @@ func TestAccDynamoDBTable_gsiWarmThroughput_billingPayPerRequest(t *testing.T) { "warm_throughput.0.write_units_per_second": "4200", }), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, { Config: testAccTableConfig_gsiWarmThroughput_billingPayPerRequest(rName, 6, 6, 12300, 4300), @@ -5023,6 +5028,11 @@ func TestAccDynamoDBTable_gsiWarmThroughput_billingPayPerRequest(t *testing.T) { "warm_throughput.0.write_units_per_second": "4100", }), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, }, }, }) From c0dbbdfaa0a3e0917d279980138c7707d17fc5a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 22:52:16 +0000 Subject: [PATCH 1349/2115] Bump mvdan.cc/gofumpt from 0.8.0 to 0.9.0 in /.ci/tools Bumps [mvdan.cc/gofumpt](https://github.com/mvdan/gofumpt) from 0.8.0 to 0.9.0. - [Release notes](https://github.com/mvdan/gofumpt/releases) - [Changelog](https://github.com/mvdan/gofumpt/blob/master/CHANGELOG.md) - [Commits](https://github.com/mvdan/gofumpt/compare/v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: mvdan.cc/gofumpt dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .ci/tools/go.mod | 2 +- .ci/tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod index d5f015fdc226..dc3c3d14c947 100644 --- a/.ci/tools/go.mod +++ b/.ci/tools/go.mod @@ -13,7 +13,7 @@ require ( github.com/rhysd/actionlint v1.7.7 github.com/terraform-linters/tflint v0.58.1 golang.org/x/tools v0.36.0 - mvdan.cc/gofumpt v0.8.0 + mvdan.cc/gofumpt v0.9.0 ) require ( diff --git a/.ci/tools/go.sum b/.ci/tools/go.sum index 221fae86f11a..dc69ef68c495 100644 --- a/.ci/tools/go.sum +++ b/.ci/tools/go.sum @@ -2850,8 +2850,8 @@ modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= -mvdan.cc/gofumpt v0.8.0 h1:nZUCeC2ViFaerTcYKstMmfysj6uhQrA2vJe+2vwGU6k= -mvdan.cc/gofumpt v0.8.0/go.mod h1:vEYnSzyGPmjvFkqJWtXkh79UwPWP9/HMxQdGEXZHjpg= +mvdan.cc/gofumpt v0.9.0 h1:W0wNHMSvDBDIyZsm3nnGbVfgp5AknzBrGJnfLCy501w= +mvdan.cc/gofumpt v0.9.0/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw= mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 h1:WjUu4yQoT5BHT1w8Zu56SP8367OuBV5jvo+4Ulppyf8= mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4/go.mod h1:rthT7OuvRbaGcd5ginj6dA2oLE7YNlta9qhBNNdCaLE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 8ec8478502fa704cea3f03558b91b5590cd7cd2a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 19:08:39 -0400 Subject: [PATCH 1350/2115] Correct backwards recreate docs, table vs. index --- website/docs/r/dynamodb_table.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index 761e370f7bc7..df1daa62123c 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -323,8 +323,8 @@ The following arguments are optional: ### `warm_throughput` -* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table decreasing this value will force a new resource. For an index this value can be lowered, but that triggers recreation of the index. Minimum value of `12000`. -* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table decreasing this value will force a new resource. For an index this value can be lowered, but that triggers recreation of the index. Minimum value of `4000`. +* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `12000`. +* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `4000`. ## Attribute Reference From 0cf4779f1530bb721a5143fdf8d79d30a733c24a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 19:09:33 -0400 Subject: [PATCH 1351/2115] Avoid index panic, add validation --- internal/service/dynamodb/table.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 1dcacd4cca56..8e56d811282f 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -575,14 +575,16 @@ func warmThroughputSchema() *schema.Schema { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "read_units_per_second": { - Type: schema.TypeInt, - Optional: true, - Computed: true, + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntAtLeast(12000), }, "write_units_per_second": { - Type: schema.TypeInt, - Optional: true, - Computed: true, + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntAtLeast(4000), }, }, }, @@ -1930,7 +1932,7 @@ func updateReplica(ctx context.Context, conn *dynamodb.Client, d *schema.Resourc } func updateWarmThroughput(ctx context.Context, conn *dynamodb.Client, warmList []any, tableName string, timeout time.Duration) error { - if len(warmList) < 1 && warmList[0] == nil { + if len(warmList) < 1 || warmList[0] == nil { return nil } From f8e1d1e999aa08ef343d212e2be9447ff5366c71 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Wed, 3 Sep 2025 19:10:52 -0400 Subject: [PATCH 1352/2115] Test data source values instead of resource --- internal/service/dynamodb/table_data_source_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dynamodb/table_data_source_test.go b/internal/service/dynamodb/table_data_source_test.go index 3f5e9cb3ff89..6bb9187e55aa 100644 --- a/internal/service/dynamodb/table_data_source_test.go +++ b/internal/service/dynamodb/table_data_source_test.go @@ -44,9 +44,9 @@ func TestAccDynamoDBTableDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "point_in_time_recovery.0.enabled", resourceName, "point_in_time_recovery.0.enabled"), resource.TestCheckResourceAttrPair(datasourceName, "point_in_time_recovery.0.recovery_period_in_days", resourceName, "point_in_time_recovery.0.recovery_period_in_days"), resource.TestCheckResourceAttrPair(datasourceName, "table_class", resourceName, "table_class"), - resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.read_units_per_second", "12100"), - resource.TestCheckResourceAttr(resourceName, "warm_throughput.0.write_units_per_second", "4100"), - resource.TestCheckTypeSetElemNestedAttrs(resourceName, "global_secondary_index.*", map[string]string{ + resource.TestCheckResourceAttr(datasourceName, "warm_throughput.0.read_units_per_second", "12100"), + resource.TestCheckResourceAttr(datasourceName, "warm_throughput.0.write_units_per_second", "4100"), + resource.TestCheckTypeSetElemNestedAttrs(datasourceName, "global_secondary_index.*", map[string]string{ "warm_throughput.0.read_units_per_second": "12200", "warm_throughput.0.write_units_per_second": "4200", }), From ddc1f70c099e67c35165f188485ccb4e7baedf0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:49:05 +0000 Subject: [PATCH 1353/2115] Bump github.com/hashicorp/aws-sdk-go-base/v2 in /.ci/providerlint Bumps [github.com/hashicorp/aws-sdk-go-base/v2](https://github.com/hashicorp/aws-sdk-go-base) from 2.0.0-beta.65 to 2.0.0-beta.66. - [Release notes](https://github.com/hashicorp/aws-sdk-go-base/releases) - [Changelog](https://github.com/hashicorp/aws-sdk-go-base/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/aws-sdk-go-base/compare/v2.0.0-beta.65...v2.0.0-beta.66) --- updated-dependencies: - dependency-name: github.com/hashicorp/aws-sdk-go-base/v2 dependency-version: 2.0.0-beta.66 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .ci/providerlint/go.mod | 5 +++-- .ci/providerlint/go.sum | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.ci/providerlint/go.mod b/.ci/providerlint/go.mod index 4a3b91793ba5..328a1384f71e 100644 --- a/.ci/providerlint/go.mod +++ b/.ci/providerlint/go.mod @@ -4,7 +4,7 @@ go 1.24.6 require ( github.com/bflad/tfproviderlint v0.31.0 - github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 + github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 golang.org/x/tools v0.36.0 ) @@ -48,11 +48,12 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.1.0 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect - github.com/stretchr/testify v1.10.0 // indirect + github.com/stretchr/testify v1.11.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.16.2 // indirect + go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect golang.org/x/crypto v0.41.0 // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect diff --git a/.ci/providerlint/go.sum b/.ci/providerlint/go.sum index 034e4403758c..4d6b5323a34d 100644 --- a/.ci/providerlint/go.sum +++ b/.ci/providerlint/go.sum @@ -34,8 +34,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi60= github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= @@ -53,8 +53,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65 h1:81+kWbE1yErFBMjME0I5k3x3kojjKsWtPYHEAutoPow= -github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.65/go.mod h1:WtMzv9T++tfWVea+qB2MXoaqxw33S8bpJslzUike2mQ= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 h1:HA6blfR0h6kGnw4oJ92tZzghubreIkWbQJ4NVNqS688= +github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66/go.mod h1:7kTJVbY5+igob9Q5N6KO81EGEKDNI9FpjujB31uI/n0= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -148,8 +148,8 @@ github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnB github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= @@ -166,16 +166,16 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= -go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= -go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= From 0a0e7ce8bf06437ba17ea88e09090875b1e37e9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 11:49:46 +0000 Subject: [PATCH 1354/2115] Bump the aws-sdk-go-v2 group across 1 directory with 6 updates Bumps the aws-sdk-go-v2 group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/cleanrooms](https://github.com/aws/aws-sdk-go-v2) | `1.31.2` | `1.32.0` | | [github.com/aws/aws-sdk-go-v2/service/cloudfront](https://github.com/aws/aws-sdk-go-v2) | `1.53.2` | `1.54.0` | | [github.com/aws/aws-sdk-go-v2/service/mq](https://github.com/aws/aws-sdk-go-v2) | `1.33.2` | `1.34.0` | | [github.com/aws/aws-sdk-go-v2/service/rds](https://github.com/aws/aws-sdk-go-v2) | `1.104.1` | `1.105.0` | | [github.com/aws/aws-sdk-go-v2/service/route53](https://github.com/aws/aws-sdk-go-v2) | `1.57.2` | `1.58.0` | | [github.com/aws/aws-sdk-go-v2/service/route53domains](https://github.com/aws/aws-sdk-go-v2) | `1.33.1` | `1.34.0` | Updates `github.com/aws/aws-sdk-go-v2/service/cleanrooms` from 1.31.2 to 1.32.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.2...v1.32.0) Updates `github.com/aws/aws-sdk-go-v2/service/cloudfront` from 1.53.2 to 1.54.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.53.2...service/s3/v1.54.0) Updates `github.com/aws/aws-sdk-go-v2/service/mq` from 1.33.2 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/mq/v1.33.2...v1.34.0) Updates `github.com/aws/aws-sdk-go-v2/service/rds` from 1.104.1 to 1.105.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ec2/v1.105.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.104.1...service/ec2/v1.105.0) Updates `github.com/aws/aws-sdk-go-v2/service/route53` from 1.57.2 to 1.58.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ssm/v1.57.2...service/s3/v1.58.0) Updates `github.com/aws/aws-sdk-go-v2/service/route53domains` from 1.33.1 to 1.34.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.33.1...v1.34.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.32.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfront dependency-version: 1.54.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mq dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.105.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53 dependency-version: 1.58.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53domains dependency-version: 1.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 267eaa31435a..fddf9998dce3 100644 --- a/go.mod +++ b/go.mod @@ -52,11 +52,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 - github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 + github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 - github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 + github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 @@ -214,8 +214,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 diff --git a/go.sum b/go.sum index 7d152d797ea4..f742b97bbafe 100644 --- a/go.sum +++ b/go.sum @@ -115,16 +115,16 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4b github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLrPy1vwP8l7OSJGcwaKVd8oY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 h1:yDZarlgst5B+n3rXKlJPgKeGJfOG8p+K71t4A8N4DrI= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcDcf6Vc0MltrMFi08FCYCIaE= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9vLJwmS3a3G8XLg= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.0/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayP github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi2SJNpXcYbPX/mjyQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 h1:3syjHziAKP9cQBLKcABUTKqwb/y6oa0KfVeluIc69Ug= +github.com/aws/aws-sdk-go-v2/service/rds v1.105.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= @@ -449,10 +449,10 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THD github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99mFaHATfCJEVcYrnT24o4= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEkyS1tXU0k5iOj+TIUrXJI4zgpkSM= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= From 371610fda1a7811a3b9fc6efa49eb0c509d25354 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 4 Sep 2025 12:33:39 +0000 Subject: [PATCH 1355/2115] Update CHANGELOG.md for #44135 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b5fe1045638..f20e26217204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ ENHANCEMENTS: * provider: Support `ap-southeast-6` as a valid AWS Region ([#44127](https://github.com/hashicorp/terraform-provider-aws/issues/44127)) * resource/aws_ecs_service: Remove Terraform default for `availability_zone_rebalancing` and change the attribute to Optional and Computed. This allow ECS to default to `ENABLED` for new resources compatible with *AvailabilityZoneRebalancing* and maintain an existing service's `availability_zone_rebalancing` value during update when not configured. If an existing service never had an `availability_zone_rebalancing` value configured and is updated, ECS will treat this as `DISABLED` ([#43241](https://github.com/hashicorp/terraform-provider-aws/issues/43241)) * resource/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` arguments to support IPv6 connectivity ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) +* resource/aws_fsx_openzfs_file_system: Remove maximum items limit on the `user_and_group_quotas` argument ([#44120](https://github.com/hashicorp/terraform-provider-aws/issues/44120)) +* resource/aws_fsx_openzfs_volume: Remove maximum items limit on the `user_and_group_quotas` argument ([#44118](https://github.com/hashicorp/terraform-provider-aws/issues/44118)) * resource/aws_instance: Add `placement_group_id` argument ([#38527](https://github.com/hashicorp/terraform-provider-aws/issues/38527)) * resource/aws_instance: Add resource identity support ([#44068](https://github.com/hashicorp/terraform-provider-aws/issues/44068)) * resource/aws_lambda_function: Add `source_kms_key_arn` argument ([#44080](https://github.com/hashicorp/terraform-provider-aws/issues/44080)) From 39901a265c6ca9f6f075a9e0533d3481e8e4e90d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 08:54:54 -0400 Subject: [PATCH 1356/2115] Add 'TestAccCognitoIDPManagedLoginBranding_updateFromBasic'. --- .../cognitoidp/managed_login_branding.go | 23 ++++++---- .../cognitoidp/managed_login_branding_test.go | 46 +++++++++++++++++++ 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 9be771275897..5641587dd936 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -17,7 +17,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" @@ -78,11 +77,9 @@ func (r *managedLoginBrandingResource) Schema(ctx context.Context, request resou Validators: []validator.Bool{ boolvalidator.ExactlyOneOf( path.MatchRoot("settings"), + path.MatchRoot("use_cognito_provided_values"), ), }, - PlanModifiers: []planmodifier.Bool{ - boolplanmodifier.UseStateForUnknown(), - }, }, names.AttrUserPoolID: schema.StringAttribute{ Required: true, @@ -316,13 +313,20 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou } // Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api. - oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings) - patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) + var patch string + var err error + if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); oldSettings != "" { + patch, err = tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) - if err != nil { - response.Diagnostics.AddError("creating JSON merge patch", err.Error()) + if err != nil { + response.Diagnostics.AddError("creating JSON merge patch", err.Error()) - return + return + } + input.UseCognitoProvidedValues = false + } else if newSettings != "" { + patch = newSettings + input.UseCognitoProvidedValues = false } input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument) @@ -356,6 +360,7 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou return } new.SettingsAll = settingsAll + new.UseCognitoProvidedValues = fwflex.BoolValueToFramework(ctx, mlb.UseCognitoProvidedValues) response.Diagnostics.Append(response.State.Set(ctx, &new)...) } diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index aee15cba3ce4..8c585a7937d0 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -163,6 +163,52 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)), + }, + }, + { + Config: testAccManagedLoginBrandingConfig_settings(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)), + }, + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) From 40de4e2a3ee2fa6749a4ff0cc41fbef60d0d0837 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 09:15:13 -0400 Subject: [PATCH 1357/2115] Add 'TestAccCognitoIDPManagedLoginBranding_updateFromBasic'. --- .../cognitoidp/managed_login_branding.go | 47 +++++++++++-------- .../cognitoidp/managed_login_branding_test.go | 46 ++++++++++++++++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 5641587dd936..9ee5c56ad058 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -312,32 +312,41 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou return } - // Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api. - var patch string - var err error - if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); oldSettings != "" { - patch, err = tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) + if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); newSettings != oldSettings { + if oldSettings == "" { + var err error + input.Settings, err = tfsmithy.DocumentFromJSONString(newSettings, document.NewLazyDocument) - if err != nil { - response.Diagnostics.AddError("creating JSON merge patch", err.Error()) + if err != nil { + response.Diagnostics.AddError("creating Smithy document", err.Error()) - return - } - input.UseCognitoProvidedValues = false - } else if newSettings != "" { - patch = newSettings - input.UseCognitoProvidedValues = false - } + return + } - input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument) + input.UseCognitoProvidedValues = false + } else if newSettings != "" { + // Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api. + patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) - if err != nil { - response.Diagnostics.AddError("creating Smithy document", err.Error()) + if err != nil { + response.Diagnostics.AddError("creating JSON merge patch", err.Error()) - return + return + } + + input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument) + + if err != nil { + response.Diagnostics.AddError("creating Smithy document", err.Error()) + + return + } + + input.UseCognitoProvidedValues = false + } } - _, err = conn.UpdateManagedLoginBranding(ctx, &input) + _, err := conn.UpdateManagedLoginBranding(ctx, &input) if err != nil { response.Diagnostics.AddError(fmt.Sprintf("updating Cognito Managed Login Branding (%s)", managedLoginBrandingID), err.Error()) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 8c585a7937d0..656fcd582d01 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -209,6 +209,52 @@ func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_settings(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)), + }, + }, + { + Config: testAccManagedLoginBrandingConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.Null()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)), + }, + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) From 7b1821bf8d4068ed40cab9e336170db25837df07 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 10:02:31 -0400 Subject: [PATCH 1358/2115] Add 'TestAccCognitoIDPManagedLoginBranding_updateSettings'. --- .../cognitoidp/managed_login_branding.go | 38 +++--------- .../cognitoidp/managed_login_branding_test.go | 60 ++++++++++++++++--- 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 9ee5c56ad058..3092313d070a 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -30,7 +30,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" - tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" tfsmithy "github.com/hashicorp/terraform-provider-aws/internal/smithy" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" @@ -312,38 +311,17 @@ func (r *managedLoginBrandingResource) Update(ctx context.Context, request resou return } - if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); newSettings != oldSettings { - if oldSettings == "" { - var err error - input.Settings, err = tfsmithy.DocumentFromJSONString(newSettings, document.NewLazyDocument) + if oldSettings, newSettings := fwflex.StringValueFromFramework(ctx, old.Settings), fwflex.StringValueFromFramework(ctx, new.Settings); newSettings != oldSettings && newSettings != "" { + var err error + input.Settings, err = tfsmithy.DocumentFromJSONString(newSettings, document.NewLazyDocument) - if err != nil { - response.Diagnostics.AddError("creating Smithy document", err.Error()) - - return - } - - input.UseCognitoProvidedValues = false - } else if newSettings != "" { - // Updated settings work in a PATCH model: https://docs.aws.amazon.com/cognito/latest/developerguide/managed-login-brandingeditor.html#branding-designer-api. - patch, err := tfjson.CreateMergePatchFromStrings(oldSettings, newSettings) - - if err != nil { - response.Diagnostics.AddError("creating JSON merge patch", err.Error()) - - return - } - - input.Settings, err = tfsmithy.DocumentFromJSONString(patch, document.NewLazyDocument) - - if err != nil { - response.Diagnostics.AddError("creating Smithy document", err.Error()) - - return - } + if err != nil { + response.Diagnostics.AddError("creating Smithy document", err.Error()) - input.UseCognitoProvidedValues = false + return } + + input.UseCognitoProvidedValues = false } _, err := conn.UpdateManagedLoginBranding(ctx, &input) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 656fcd582d01..373e163092e5 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -138,7 +138,7 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBrandingConfig_settings(rName), + Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -191,7 +191,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(t *testing.T) { }, }, { - Config: testAccManagedLoginBrandingConfig_settings(rName), + Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -222,7 +222,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBrandingConfig_settings(rName), + Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -255,6 +255,52 @@ func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) { }) } +func TestAccCognitoIDPManagedLoginBranding_updateSettings(t *testing.T) { + ctx := acctest.Context(t) + var v awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_cognito_managed_login_branding.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)), + }, + }, + { + Config: testAccManagedLoginBrandingConfig_settings(rName, "DARK"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("settings"), knownvalue.NotNull()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(false)), + }, + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) @@ -345,8 +391,8 @@ resource "aws_cognito_managed_login_branding" "test" { `) } -func testAccManagedLoginBrandingConfig_settings(rName string) string { - return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` +func testAccManagedLoginBrandingConfig_settings(rName, colorScheme string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), fmt.Sprintf(` resource "aws_cognito_managed_login_branding" "test" { client_id = aws_cognito_user_pool_client.test.id user_pool_id = aws_cognito_user_pool.test.id @@ -387,7 +433,7 @@ resource "aws_cognito_managed_login_branding" "test" { "sessionTimerDisplay" : "NONE" }, "global" : { - "colorSchemeMode" : "LIGHT", + "colorSchemeMode" : %[1]q, "pageFooter" : { "enabled" : false }, @@ -804,5 +850,5 @@ resource "aws_cognito_managed_login_branding" "test" { } }) } -`) +`, colorScheme)) } From 27289e751f9339cc7ffffaf20d5bbb94cd9ab1e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 10:04:26 -0400 Subject: [PATCH 1359/2115] Add CHANGELOG entry. --- .changelog/43817.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/43817.txt diff --git a/.changelog/43817.txt b/.changelog/43817.txt new file mode 100644 index 000000000000..9919e55d102b --- /dev/null +++ b/.changelog/43817.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_cognito_managed_login_branding +``` \ No newline at end of file From e5605cc6689a162ddfa0d53cc5ac4289b0773244 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 10:09:21 -0400 Subject: [PATCH 1360/2115] Fix terrafmt errors. --- .../cognitoidp/managed_login_branding_test.go | 480 +++++++++++++++++- 1 file changed, 471 insertions(+), 9 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 373e163092e5..9f4740dd5b10 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -138,7 +138,7 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), + Config: testAccManagedLoginBrandingConfig_settings(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -191,7 +191,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateFromBasic(t *testing.T) { }, }, { - Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), + Config: testAccManagedLoginBrandingConfig_settings(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -222,7 +222,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateToBasic(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), + Config: testAccManagedLoginBrandingConfig_settings(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -268,7 +268,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateSettings(t *testing.T) { CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccManagedLoginBrandingConfig_settings(rName, "LIGHT"), + Config: testAccManagedLoginBrandingConfig_settings(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -283,7 +283,7 @@ func TestAccCognitoIDPManagedLoginBranding_updateSettings(t *testing.T) { }, }, { - Config: testAccManagedLoginBrandingConfig_settings(rName, "DARK"), + Config: testAccManagedLoginBrandingConfig_settingsUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckManagedLoginBrandingExists(ctx, resourceName, &v), ), @@ -391,8 +391,470 @@ resource "aws_cognito_managed_login_branding" "test" { `) } -func testAccManagedLoginBrandingConfig_settings(rName, colorScheme string) string { - return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), fmt.Sprintf(` +func testAccManagedLoginBrandingConfig_settings(rName string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` +resource "aws_cognito_managed_login_branding" "test" { + client_id = aws_cognito_user_pool_client.test.id + user_pool_id = aws_cognito_user_pool.test.id + + settings = jsonencode({ + "categories" : { + "auth" : { + "authMethodOrder" : [ + [ + { + "display" : "BUTTON", + "type" : "FEDERATED" + }, + { + "display" : "INPUT", + "type" : "USERNAME_PASSWORD" + } + ] + ], + "federation" : { + "interfaceStyle" : "BUTTON_LIST", + "order" : [ + ] + } + }, + "form" : { + "displayGraphics" : true, + "instructions" : { + "enabled" : false + }, + "languageSelector" : { + "enabled" : false + }, + "location" : { + "horizontal" : "CENTER", + "vertical" : "CENTER" + }, + "sessionTimerDisplay" : "NONE" + }, + "global" : { + "colorSchemeMode" : "LIGHT", + "pageFooter" : { + "enabled" : false + }, + "pageHeader" : { + "enabled" : false + }, + "spacingDensity" : "REGULAR" + }, + "signUp" : { + "acceptanceElements" : [ + { + "enforcement" : "NONE", + "textKey" : "en" + } + ] + } + }, + "componentClasses" : { + "buttons" : { + "borderRadius" : 8.0 + }, + "divider" : { + "darkMode" : { + "borderColor" : "232b37ff" + }, + "lightMode" : { + "borderColor" : "ebebf0ff" + } + }, + "dropDown" : { + "borderRadius" : 8.0, + "darkMode" : { + "defaults" : { + "itemBackgroundColor" : "192534ff" + }, + "hover" : { + "itemBackgroundColor" : "081120ff", + "itemBorderColor" : "5f6b7aff", + "itemTextColor" : "e9ebedff" + }, + "match" : { + "itemBackgroundColor" : "d1d5dbff", + "itemTextColor" : "89bdeeff" + } + }, + "lightMode" : { + "defaults" : { + "itemBackgroundColor" : "ffffffff" + }, + "hover" : { + "itemBackgroundColor" : "f4f4f4ff", + "itemBorderColor" : "7d8998ff", + "itemTextColor" : "000716ff" + }, + "match" : { + "itemBackgroundColor" : "414d5cff", + "itemTextColor" : "0972d3ff" + } + } + }, + "focusState" : { + "darkMode" : { + "borderColor" : "539fe5ff" + }, + "lightMode" : { + "borderColor" : "0972d3ff" + } + }, + "idpButtons" : { + "icons" : { + "enabled" : true + } + }, + "input" : { + "borderRadius" : 8.0, + "darkMode" : { + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "5f6b7aff" + }, + "placeholderColor" : "8d99a8ff" + }, + "lightMode" : { + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "7d8998ff" + }, + "placeholderColor" : "5f6b7aff" + } + }, + "inputDescription" : { + "darkMode" : { + "textColor" : "8d99a8ff" + }, + "lightMode" : { + "textColor" : "5f6b7aff" + } + }, + "inputLabel" : { + "darkMode" : { + "textColor" : "d1d5dbff" + }, + "lightMode" : { + "textColor" : "000716ff" + } + }, + "link" : { + "darkMode" : { + "defaults" : { + "textColor" : "539fe5ff" + }, + "hover" : { + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "defaults" : { + "textColor" : "0972d3ff" + }, + "hover" : { + "textColor" : "033160ff" + } + } + }, + "optionControls" : { + "darkMode" : { + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "7d8998ff" + }, + "selected" : { + "backgroundColor" : "539fe5ff", + "foregroundColor" : "000716ff" + } + }, + "lightMode" : { + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "7d8998ff" + }, + "selected" : { + "backgroundColor" : "0972d3ff", + "foregroundColor" : "ffffffff" + } + } + }, + "statusIndicator" : { + "darkMode" : { + "error" : { + "backgroundColor" : "1a0000ff", + "borderColor" : "eb6f6fff", + "indicatorColor" : "eb6f6fff" + }, + "pending" : { + "indicatorColor" : "AAAAAAAA" + }, + "success" : { + "backgroundColor" : "001a02ff", + "borderColor" : "29ad32ff", + "indicatorColor" : "29ad32ff" + }, + "warning" : { + "backgroundColor" : "1d1906ff", + "borderColor" : "e0ca57ff", + "indicatorColor" : "e0ca57ff" + } + }, + "lightMode" : { + "error" : { + "backgroundColor" : "fff7f7ff", + "borderColor" : "d91515ff", + "indicatorColor" : "d91515ff" + }, + "pending" : { + "indicatorColor" : "AAAAAAAA" + }, + "success" : { + "backgroundColor" : "f2fcf3ff", + "borderColor" : "037f0cff", + "indicatorColor" : "037f0cff" + }, + "warning" : { + "backgroundColor" : "fffce9ff", + "borderColor" : "8d6605ff", + "indicatorColor" : "8d6605ff" + } + } + } + }, + "components" : { + "alert" : { + "borderRadius" : 12.0, + "darkMode" : { + "error" : { + "backgroundColor" : "1a0000ff", + "borderColor" : "eb6f6fff" + } + }, + "lightMode" : { + "error" : { + "backgroundColor" : "fff7f7ff", + "borderColor" : "d91515ff" + } + } + }, + "favicon" : { + "enabledTypes" : [ + "ICO", + "SVG" + ] + }, + "form" : { + "backgroundImage" : { + "enabled" : false + }, + "borderRadius" : 8.0, + "darkMode" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "424650ff" + }, + "lightMode" : { + "backgroundColor" : "ffffffff", + "borderColor" : "c6c6cdff" + }, + "logo" : { + "enabled" : false, + "formInclusion" : "IN", + "location" : "CENTER", + "position" : "TOP" + } + }, + "idpButton" : { + "custom" : { + }, + "standard" : { + "darkMode" : { + "active" : { + "backgroundColor" : "354150ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + }, + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "c6c6cdff", + "textColor" : "c6c6cdff" + }, + "hover" : { + "backgroundColor" : "192534ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "d3e7f9ff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + }, + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "424650ff", + "textColor" : "424650ff" + }, + "hover" : { + "backgroundColor" : "f2f8fdff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + } + } + } + }, + "pageBackground" : { + "darkMode" : { + "color" : "0f1b2aff" + }, + "image" : { + "enabled" : true + }, + "lightMode" : { + "color" : "ffffffff" + } + }, + "pageFooter" : { + "backgroundImage" : { + "enabled" : false + }, + "darkMode" : { + "background" : { + "color" : "0f141aff" + }, + "borderColor" : "424650ff" + }, + "lightMode" : { + "background" : { + "color" : "fafafaff" + }, + "borderColor" : "d5dbdbff" + }, + "logo" : { + "enabled" : false, + "location" : "START" + } + }, + "pageHeader" : { + "backgroundImage" : { + "enabled" : false + }, + "darkMode" : { + "background" : { + "color" : "0f141aff" + }, + "borderColor" : "424650ff" + }, + "lightMode" : { + "background" : { + "color" : "fafafaff" + }, + "borderColor" : "d5dbdbff" + }, + "logo" : { + "enabled" : false, + "location" : "START" + } + }, + "pageText" : { + "darkMode" : { + "bodyColor" : "b6bec9ff", + "descriptionColor" : "b6bec9ff", + "headingColor" : "d1d5dbff" + }, + "lightMode" : { + "bodyColor" : "414d5cff", + "descriptionColor" : "414d5cff", + "headingColor" : "000716ff" + } + }, + "phoneNumberSelector" : { + "displayType" : "TEXT" + }, + "primaryButton" : { + "darkMode" : { + "active" : { + "backgroundColor" : "539fe5ff", + "textColor" : "000716ff" + }, + "defaults" : { + "backgroundColor" : "539fe5ff", + "textColor" : "000716ff" + }, + "disabled" : { + "backgroundColor" : "ffffffff", + "borderColor" : "ffffffff" + }, + "hover" : { + "backgroundColor" : "89bdeeff", + "textColor" : "000716ff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "033160ff", + "textColor" : "ffffffff" + }, + "defaults" : { + "backgroundColor" : "0972d3ff", + "textColor" : "ffffffff" + }, + "disabled" : { + "backgroundColor" : "ffffffff", + "borderColor" : "ffffffff" + }, + "hover" : { + "backgroundColor" : "033160ff", + "textColor" : "ffffffff" + } + } + }, + "secondaryButton" : { + "darkMode" : { + "active" : { + "backgroundColor" : "354150ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + }, + "defaults" : { + "backgroundColor" : "0f1b2aff", + "borderColor" : "539fe5ff", + "textColor" : "539fe5ff" + }, + "hover" : { + "backgroundColor" : "192534ff", + "borderColor" : "89bdeeff", + "textColor" : "89bdeeff" + } + }, + "lightMode" : { + "active" : { + "backgroundColor" : "d3e7f9ff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + }, + "defaults" : { + "backgroundColor" : "ffffffff", + "borderColor" : "0972d3ff", + "textColor" : "0972d3ff" + }, + "hover" : { + "backgroundColor" : "f2f8fdff", + "borderColor" : "033160ff", + "textColor" : "033160ff" + } + } + } + } + }) +} +`) +} + +func testAccManagedLoginBrandingConfig_settingsUpdated(rName string) string { + return acctest.ConfigCompose(testAccManagedLoginBrandingConfig_base(rName), ` resource "aws_cognito_managed_login_branding" "test" { client_id = aws_cognito_user_pool_client.test.id user_pool_id = aws_cognito_user_pool.test.id @@ -433,7 +895,7 @@ resource "aws_cognito_managed_login_branding" "test" { "sessionTimerDisplay" : "NONE" }, "global" : { - "colorSchemeMode" : %[1]q, + "colorSchemeMode" : "DARK", "pageFooter" : { "enabled" : false }, @@ -850,5 +1312,5 @@ resource "aws_cognito_managed_login_branding" "test" { } }) } -`, colorScheme)) +`) } From 9ba447f6809ce7518c5c35aa52f3fd687287faf2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 10:10:32 -0400 Subject: [PATCH 1361/2115] CreateMergePatchFromStrings' no longer used. --- go.mod | 3 +- internal/json/patch.go | 13 -------- internal/json/patch_test.go | 65 ------------------------------------- tools/tfsdk2fw/go.mod | 2 +- tools/tfsdk2fw/go.sum | 2 ++ 5 files changed, 4 insertions(+), 81 deletions(-) diff --git a/go.mod b/go.mod index abde085fd72a..267eaa31435a 100644 --- a/go.mod +++ b/go.mod @@ -276,7 +276,6 @@ require ( github.com/cedar-policy/cedar-go v1.2.6 github.com/davecgh/go-spew v1.1.1 github.com/dlclark/regexp2 v1.11.5 - github.com/evanphx/json-patch v0.5.2 github.com/gertd/go-pluralize v0.2.1 github.com/goccy/go-yaml v1.18.0 github.com/google/go-cmp v0.7.0 @@ -338,6 +337,7 @@ require ( github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect + github.com/evanphx/json-patch v0.5.2 // indirect github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -360,7 +360,6 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/posener/complete v1.2.3 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect diff --git a/internal/json/patch.go b/internal/json/patch.go index b1aba4c15282..2076c2bc5f5d 100644 --- a/internal/json/patch.go +++ b/internal/json/patch.go @@ -4,7 +4,6 @@ package json import ( - evanphxjsonpatch "github.com/evanphx/json-patch" mattbairdjsonpatch "github.com/mattbaird/jsonpatch" ) @@ -14,15 +13,3 @@ import ( func CreatePatchFromStrings(a, b string) ([]mattbairdjsonpatch.JsonPatchOperation, error) { return mattbairdjsonpatch.CreatePatch([]byte(a), []byte(b)) } - -// `CreateMergePatchFromStrings` creates an [RFC7396](https://datatracker.ietf.org/doc/html/rfc7396) JSON merge patch from two JSON strings. -// `a` is the original JSON document and `b` is the modified JSON document. -// The patch is returned as a JSON string. -func CreateMergePatchFromStrings(a, b string) (string, error) { - patch, err := evanphxjsonpatch.CreateMergePatch([]byte(a), []byte(b)) - if err != nil { - return "", err - } - - return string(patch), nil -} diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go index 81a95a2a6273..57830f900318 100644 --- a/internal/json/patch_test.go +++ b/internal/json/patch_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/terraform-provider-aws/internal/acctest/jsoncmp" tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" mattbairdjsonpatch "github.com/mattbaird/jsonpatch" ) @@ -84,67 +83,3 @@ func TestCreatePatchFromStrings(t *testing.T) { }) } } - -func TestCreateMergePatchFromStrings(t *testing.T) { - t.Parallel() - - testCases := []struct { - testName string - a, b string - wantPatch string - wantErr bool - }{ - { - testName: "invalid JSON", - a: `test`, - b: `{}`, - wantErr: true, - }, - { - testName: "empty patch, empty JSON", - a: `{}`, - b: `{}`, - wantPatch: `{}`, - }, - { - testName: "empty patch, non-empty JSON", - a: `{"A": "test1", "B": 42}`, - b: `{"B": 42, "A": "test1"}`, - wantPatch: `{}`, - }, - { - testName: "from empty JSON", - a: `{}`, - b: `{"A": "test1", "B": 42}`, - wantPatch: `{"A":"test1", "B":42}`, - }, - { - testName: "to empty JSON", - a: `{"A": "test1", "B": 42}`, - b: `{}`, - wantPatch: `{"A":null, "B":null}`, - }, - { - testName: "change values", - a: `{"A": "test1", "B": 42}`, - b: `{"A": ["test2"], "B": 42}`, - wantPatch: `{"A": ["test2"]}`, - }, - } - - for _, testCase := range testCases { - t.Run(testCase.testName, func(t *testing.T) { - t.Parallel() - - got, err := tfjson.CreateMergePatchFromStrings(testCase.a, testCase.b) - if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { - t.Errorf("CreateMergePatchFromStrings(%s, %s) err %t, want %t", testCase.a, testCase.b, got, want) - } - if err == nil { - if diff := jsoncmp.Diff(got, testCase.wantPatch); diff != "" { - t.Errorf("unexpected diff (+wanted, -got): %s", diff) - } - } - }) - } -} diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 6117e3df1033..b9aa03c3093a 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -285,6 +285,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 // indirect github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 // indirect @@ -345,7 +346,6 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/posener/complete v1.2.3 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/spf13/cast v1.3.1 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index a45d7bbd3502..4505b8414514 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -557,6 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcy github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= From b471f837d2f8539246180dfe2f4b9b8dfb76a0f3 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 09:39:25 -0500 Subject: [PATCH 1362/2115] aws_controltower_baseline: fixup --- internal/service/controltower/baseline.go | 347 ++++++++---------- .../service/controltower/baseline_test.go | 94 +---- .../controltower/service_package_gen.go | 5 +- 3 files changed, 170 insertions(+), 276 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index b63109657f90..c91e49811a07 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -10,27 +10,32 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/controltower" + "github.com/aws/aws-sdk-go-v2/service/controltower/document" awstypes "github.com/aws/aws-sdk-go-v2/service/controltower/types" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" "github.com/hashicorp/terraform-provider-aws/internal/framework" - "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) -// Function annotations are used for resource registration to the Provider. DO NOT EDIT. // @FrameworkResource("aws_controltower_baseline", name="Baseline") +// @Tags(identifierAttribute="arn") func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBaseline{} @@ -46,48 +51,58 @@ const ( ) type resourceBaseline struct { - framework.ResourceWithConfigure + framework.ResourceWithModel[resourceBaselineData] framework.WithTimeouts } -func (r *resourceBaseline) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) { - resp.TypeName = "aws_controltower_baseline" -} -func (r *resourceBaseline) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { - resp.Schema = schema.Schema{ +func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ names.AttrARN: framework.ARNAttributeComputedOnly(), "baseline_identifier": schema.StringAttribute{ Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, "baseline_version": schema.StringAttribute{ Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "operation_identifier": schema.StringAttribute{ + Computed: true, }, - names.AttrID: framework.IDAttribute(), names.AttrTags: tftags.TagsAttribute(), names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), "target_identifier": schema.StringAttribute{ Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, }, }, Blocks: map[string]schema.Block{ names.AttrParameters: schema.ListNestedBlock{ + CustomType: fwtypes.NewListNestedObjectTypeOf[parameters](ctx), Validators: []validator.List{ listvalidator.SizeAtMost(1), }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ - "key": schema.StringAttribute{ + names.AttrKey: schema.StringAttribute{ Required: true, }, - "value": schema.StringAttribute{ + names.AttrValue: schema.StringAttribute{ + //CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), Required: true, }, }, }, }, - "timeouts": timeouts.Block(ctx, timeouts.Opts{ + names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ Create: true, Update: true, Delete: true, @@ -96,199 +111,214 @@ func (r *resourceBaseline) Schema(ctx context.Context, req resource.SchemaReques } } -func (r *resourceBaseline) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { - +func (r *resourceBaseline) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { conn := r.Meta().ControlTowerClient(ctx) - // TIP: -- 2. Fetch the plan var plan resourceBaselineData - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.Plan.Get(ctx, &plan)...) + if response.Diagnostics.HasError() { return } - // TIP: -- 3. Populate a create input structure - in := &controltower.EnableBaselineInput{} + in := controltower.EnableBaselineInput{} - resp.Diagnostics.Append(fwflex.Expand(ctx, plan, in)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Expand(ctx, plan, &in)...) + if response.Diagnostics.HasError() { return } in.Tags = getTagsIn(ctx) - // TIP: -- 4. Call the AWS create function - out, err := conn.EnableBaseline(ctx, in) + + params, d := plan.Parameters.ToSlice(ctx) + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { + return + } + + var ebp []awstypes.EnabledBaselineParameter + for _, param := range params { + ebp = append(ebp, awstypes.EnabledBaselineParameter{ + Key: param.Key.ValueStringPointer(), + Value: document.NewLazyDocument(param.Value.String()), + }) + } + in.Parameters = ebp + + out, err := conn.EnableBaseline(ctx, &in) if err != nil { - // TIP: Since ID has not been set yet, you cannot use plan.ID.String() - // in error messages at this point. - resp.Diagnostics.AddError( + response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionCreating, ResNameBaseline, plan.BaselineIdentifier.String(), err), err.Error(), ) return } + if out == nil || out.OperationIdentifier == nil { - resp.Diagnostics.AddError( + response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionCreating, ResNameBaseline, plan.BaselineIdentifier.String(), nil), errors.New("empty output").Error(), ) return } - // TIP: -- 5. Using the output from the create function, set the minimum attributes - plan.ARN = flex.StringToFramework(ctx, out.Arn) - plan.ID = flex.StringToFramework(ctx, out.OperationIdentifier) - - // TIP: -- 6. Use a waiter to wait for create to complete + plan.ARN = fwflex.StringToFramework(ctx, out.Arn) createTimeout := r.CreateTimeout(ctx, plan.Timeouts) - _, err = waitBaselineCreated(ctx, conn, plan.ID.ValueString(), createTimeout) + _, err = waitBaselineReady(ctx, conn, plan.ARN.ValueString(), createTimeout) if err != nil { - resp.Diagnostics.AddError( + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrARN), plan.ARN.ValueString())...) + response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionWaitingForCreation, ResNameBaseline, plan.BaselineIdentifier.String(), err), err.Error(), ) return } - resp.Diagnostics.Append(resp.State.Set(ctx, plan)...) + response.Diagnostics.Append(fwflex.Flatten(ctx, out, &plan)...) + if response.Diagnostics.HasError() { + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &plan)...) } -func (r *resourceBaseline) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) { +func (r *resourceBaseline) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { conn := r.Meta().ControlTowerClient(ctx) var state resourceBaselineData - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.State.Get(ctx, &state)...) + if response.Diagnostics.HasError() { return } - // TIP: -- 3. Get the resource from AWS using an API Get, List, or Describe- - // type function, or, better yet, using a finder. out, err := findBaselineByID(ctx, conn, state.ARN.ValueString()) - // TIP: -- 4. Remove resource from state if it is not found - if tfresource.NotFound(err) { - resp.State.RemoveResource(ctx) + if retry.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) return } + if err != nil { - resp.Diagnostics.AddError( + response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionSetting, ResNameBaseline, state.ARN.String(), err), err.Error(), ) return } - resp.Diagnostics.Append(fwflex.Flatten(ctx, out, &state)...) - - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(fwflex.Flatten(ctx, out, &state)...) + if response.Diagnostics.HasError() { return } - resp.Diagnostics.Append(resp.State.Set(ctx, &state)...) + + if out.Parameters != nil { + var parameterList []parameters + for _, param := range out.Parameters { + var data any + err = param.Value.UnmarshalSmithyDocument(data) + if err != nil { + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionSetting, ResNameBaseline, state.ARN.String(), err), + err.Error(), + ) + return + } + + p := parameters{ + Key: fwflex.StringToFramework(ctx, param.Key), + Value: fwflex.StringValueToFramework(ctx, data.(string)), + } + parameterList = append(parameterList, p) + } + state.Parameters = fwtypes.NewListNestedObjectValueOfValueSliceMust(ctx, parameterList) + } else { + state.Parameters = fwtypes.NewListNestedObjectValueOfNull[parameters](ctx) + } + + response.Diagnostics.Append(response.State.Set(ctx, &state)...) } -func (r *resourceBaseline) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) { - // TIP: ==== RESOURCE UPDATE ==== - // Not all resources have Update functions. There are a few reasons: - // a. The AWS API does not support changing a resource - // b. All arguments have RequiresReplace() plan modifiers - // c. The AWS API uses a create call to modify an existing resource - // - // In the cases of a. and b., the resource will not have an update method - // defined. In the case of c., Update and Create can be refactored to call - // the same underlying function. - // - // The rest of the time, there should be an Update function and it should - // do the following things. Make sure there is a good reason if you don't - // do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the plan and state - // 3. Populate a modify input structure and check for changes - // 4. Call the AWS modify/update function - // 5. Use a waiter to wait for update to complete - // 6. Save the request plan to response state - // TIP: -- 1. Get a client connection to the relevant service +func (r *resourceBaseline) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) { conn := r.Meta().ControlTowerClient(ctx) - // TIP: -- 2. Fetch the plan var plan, state resourceBaselineData - resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.Plan.Get(ctx, &plan)...) + response.Diagnostics.Append(request.State.Get(ctx, &state)...) + if response.Diagnostics.HasError() { return } - // TIP: -- 3. Populate a modify input structure and check for changes - if !plan.BaselineVersion.Equal(state.BaselineVersion) { + diff, d := fwflex.Diff(ctx, plan, state) + response.Diagnostics.Append(d...) + if response.Diagnostics.HasError() { + return + } - in := &controltower.UpdateEnabledBaselineInput{ + if !diff.HasChanges() { + in := controltower.UpdateEnabledBaselineInput{ EnabledBaselineIdentifier: plan.ARN.ValueStringPointer(), } - resp.Diagnostics.Append(fwflex.Expand(ctx, plan, in)...) + response.Diagnostics.Append(fwflex.Expand(ctx, plan, &in)...) + if response.Diagnostics.HasError() { + return + } - out, err := conn.UpdateEnabledBaseline(ctx, in) + out, err := conn.UpdateEnabledBaseline(ctx, &in) if err != nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ID.String(), err), + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ARN.String(), err), err.Error(), ) return } + if out == nil || out.OperationIdentifier == nil { - resp.Diagnostics.AddError( - create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ID.String(), nil), + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionUpdating, ResNameBaseline, plan.ARN.String(), nil), errors.New("empty output").Error(), ) return } + updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) + _, err = waitBaselineReady(ctx, conn, plan.ARN.ValueString(), updateTimeout) + if err != nil { + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrARN), plan.ARN.ValueString())...) + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionWaitingForUpdate, ResNameBaseline, plan.ARN.String(), err), + err.Error(), + ) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, out, &plan)...) + if response.Diagnostics.HasError() { + return + } } - // TIP: -- 6. Save the request plan to response state - resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...) + response.Diagnostics.Append(response.State.Set(ctx, &plan)...) } -func (r *resourceBaseline) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) { - // TIP: ==== RESOURCE DELETE ==== - // Most resources have Delete functions. There are rare situations - // where you might not need a delete: - // a. The AWS API does not provide a way to delete the resource - // b. The point of your resource is to perform an action (e.g., reboot a - // server) and deleting serves no purpose. - // - // The Delete function should do the following things. Make sure there - // is a good reason if you don't do one of these. - // - // 1. Get a client connection to the relevant service - // 2. Fetch the state - // 3. Populate a delete input structure - // 4. Call the AWS delete function - // 5. Use a waiter to wait for delete to complete - // TIP: -- 1. Get a client connection to the relevant service +func (r *resourceBaseline) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { conn := r.Meta().ControlTowerClient(ctx) - // TIP: -- 2. Fetch the state var state resourceBaselineData - resp.Diagnostics.Append(req.State.Get(ctx, &state)...) - if resp.Diagnostics.HasError() { + response.Diagnostics.Append(request.State.Get(ctx, &state)...) + if response.Diagnostics.HasError() { return } - // TIP: -- 3. Populate a delete input structure in := &controltower.DisableBaselineInput{ - EnabledBaselineIdentifier: aws.String(state.ARN.ValueString()), + EnabledBaselineIdentifier: state.ARN.ValueStringPointer(), } - // TIP: -- 4. Call the AWS delete function _, err := conn.DisableBaseline(ctx, in) - // TIP: On rare occassions, the API returns a not found error after deleting a - // resource. If that happens, we don't want it to show up as an error. if err != nil { if errs.IsA[*awstypes.ResourceNotFoundException](err) { return } - resp.Diagnostics.AddError( + response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionDeleting, ResNameBaseline, state.ARN.String(), err), err.Error(), ) @@ -297,49 +327,15 @@ func (r *resourceBaseline) Delete(ctx context.Context, req resource.DeleteReques } -// TIP: ==== TERRAFORM IMPORTING ==== -// If Read can get all the information it needs from the Identifier -// (i.e., path.Root("id")), you can use the PassthroughID importer. Otherwise, -// you'll need a custom import function. -// -// See more: -// https://developer.hashicorp.com/terraform/plugin/framework/resources/import -func (r *resourceBaseline) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) +func (r *resourceBaseline) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), request, response) } -// TIP: ==== STATUS CONSTANTS ==== -// Create constants for states and statuses if the service does not -// already have suitable constants. We prefer that you use the constants -// provided in the service if available (e.g., awstypes.StatusInProgress). -const ( - statusChangePending = "Pending" - statusDeleting = "Deleting" - statusNormal = "Normal" - statusUpdated = "Updated" - statusSucceeded = "SUCCEEDED" - statusFailed = "FAILED" - statusUnderChange = "UNDER_CHANGE" -) - -// TIP: ==== WAITERS ==== -// Some resources of some services have waiters provided by the AWS API. -// Unless they do not work properly, use them rather than defining new ones -// here. -// -// Sometimes we define the wait, status, and find functions in separate -// files, wait.go, status.go, and find.go. Follow the pattern set out in the -// service and define these where it makes the most sense. -// -// If these functions are used in the _test.go file, they will need to be -// exported (i.e., capitalized). -// -// You will need to adjust the parameters and names to fit the service. -func waitBaselineCreated(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { +func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { stateConf := &retry.StateChangeConf{ - Pending: []string{}, - Target: []string{statusSucceeded}, - Refresh: statusBaseline(ctx, conn, id), + Pending: enum.Slice(awstypes.EnablementStatusUnderChange), + Target: enum.Slice(awstypes.EnablementStatusSucceeded), + Refresh: statusBaseline(conn, id), Timeout: timeout, NotFoundChecks: 20, ContinuousTargetOccurence: 2, @@ -353,17 +349,10 @@ func waitBaselineCreated(ctx context.Context, conn *controltower.Client, id stri return nil, err } -// TIP: ==== STATUS ==== -// The status function can return an actual status when that field is -// available from the API (e.g., out.Status). Otherwise, you can use custom -// statuses to communicate the states of the resource. -// -// Waiters consume the values returned by status functions. Design status so -// that it can be reused by a create, update, and delete waiter, if possible. -func statusBaseline(ctx context.Context, conn *controltower.Client, id string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { +func statusBaseline(conn *controltower.Client, id string) retry.StateRefreshFunc { + return func(ctx context.Context) (any, string, error) { out, err := findBaselineByID(ctx, conn, id) - if tfresource.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -384,8 +373,7 @@ func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) if err != nil { if errs.IsA[*awstypes.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: in, + LastError: err, } } @@ -399,28 +387,17 @@ func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) return out.EnabledBaselineDetails, nil } -// TIP: ==== DATA STRUCTURES ==== -// With Terraform Plugin-Framework configurations are deserialized into -// Go types, providing type safety without the need for type assertions. -// These structs should match the schema definition exactly, and the `tfsdk` -// tag value should match the attribute name. -// -// Nested objects are represented in their own data struct. These will -// also have a corresponding attribute type mapping for use inside flex -// functions. -// -// See more: -// https://developer.hashicorp.com/terraform/plugin/framework/handling-data/accessing-values type resourceBaselineData struct { - ARN types.String `tfsdk:"arn"` - BaselineIdentifier types.String `tfsdk:"baseline_identifier"` - BaselineVersion types.String `tfsdk:"baseline_version"` - ID types.String `tfsdk:"id"` - Parameters []parameters `tfsdk:"parameters"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` - TargetIdentifier types.String `tfsdk:"target_identifier"` - Timeouts timeouts.Value `tfsdk:"timeouts"` + framework.WithRegionModel + ARN types.String `tfsdk:"arn"` + BaselineIdentifier types.String `tfsdk:"baseline_identifier"` + BaselineVersion types.String `tfsdk:"baseline_version"` + OperationIdentifier types.String `tfsdk:"operation_identifier"` + Parameters fwtypes.ListNestedObjectValueOf[parameters] `tfsdk:"parameters"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TargetIdentifier types.String `tfsdk:"target_identifier"` + Timeouts timeouts.Value `tfsdk:"timeouts"` } type parameters struct { diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 44d7d13200a8..eb2b0b90cffe 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -25,94 +25,8 @@ import ( tfcontroltower "github.com/hashicorp/terraform-provider-aws/internal/service/controltower" ) -// TIP: File Structure. The basic outline for all test files should be as -// follows. Improve this resource's maintainability by following this -// outline. -// -// 1. Package declaration (add "_test" since this is a test file) -// 2. Imports -// 3. Unit tests -// 4. Basic test -// 5. Disappears test -// 6. All the other tests -// 7. Helper functions (exists, destroy, check, etc.) -// 8. Functions that return Terraform configurations - -// TIP: ==== UNIT TESTS ==== -// This is an example of a unit test. Its name is not prefixed with -// "TestAcc" like an acceptance test. -// -// Unlike acceptance tests, unit tests do not access AWS and are focused on a -// function (or method). Because of this, they are quick and cheap to run. -// -// In designing a resource's implementation, isolate complex bits from AWS bits -// so that they can be tested through a unit test. We encourage more unit tests -// in the provider. -// -// Cut and dry functions using well-used patterns, like typical flatteners and -// expanders, don't need unit testing. However, if they are complex or -// intricate, they should be unit tested. -// func TestBaselineExampleUnitTest(t *testing.T) { -// t.Parallel() - -// testCases := []struct { -// TestName string -// Input string -// Expected string -// Error bool -// }{ -// { -// TestName: "empty", -// Input: "", -// Expected: "", -// Error: true, -// }, -// { -// TestName: "descriptive name", -// Input: "some input", -// Expected: "some output", -// Error: false, -// }, -// { -// TestName: "another descriptive name", -// Input: "more input", -// Expected: "more output", -// Error: false, -// }, -// } - -// for _, testCase := range testCases { -// testCase := testCase -// t.Run(testCase.TestName, func(t *testing.T) { -// t.Parallel() -// got, err := tfcontroltower.FunctionFromResource(testCase.Input) - -// if err != nil && !testCase.Error { -// t.Errorf("got error (%s), expected no error", err) -// } - -// if err == nil && testCase.Error { -// t.Errorf("got (%s) and no error, expected error", got) -// } - -// if got != testCase.Expected { -// t.Errorf("got %s, expected %s", got, testCase.Expected) -// } -// }) -// } -// } - -// TIP: ==== ACCEPTANCE TESTS ==== -// This is an example of a basic acceptance test. This should test as much of -// standard functionality of the resource as possible, and test importing, if -// applicable. We prefix its name with "TestAcc", the service, and the -// resource name. -// -// Acceptance test access AWS and cost money to run. func TestAccControlTowerBaseline_basic(t *testing.T) { ctx := acctest.Context(t) - // TIP: This is a long-running test guard for tests that run longer than - // 300s (5 min) generally. if testing.Short() { t.Skip("skipping long-running test in short mode") } @@ -137,8 +51,7 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { testAccCheckBaselineExists(ctx, resourceName, &baseline), resource.TestCheckResourceAttr(resourceName, "baseline_version", "4.0"), resource.TestCheckResourceAttrSet(resourceName, "baseline_identifier"), - resource.TestCheckResourceAttrSet(resourceName, "arn"), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn", "controltower", regexache.MustCompile(`enabledbaseline:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "controltower", regexache.MustCompile(`enabledbaseline:+.`)), ), }, { @@ -221,9 +134,10 @@ func testAccCheckBaselineExists(ctx context.Context, name string, baseline *type } conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) - resp, err := conn.GetEnabledBaseline(ctx, &controltower.GetEnabledBaselineInput{ + input := controltower.GetEnabledBaselineInput{ EnabledBaselineIdentifier: aws.String(rs.Primary.Attributes[names.AttrARN]), - }) + } + resp, err := conn.GetEnabledBaseline(ctx, &input) if err != nil { return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, rs.Primary.ID, err) diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index 29eab1dcf581..47d3593928e0 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -27,7 +27,10 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Factory: newResourceBaseline, TypeName: "aws_controltower_baseline", Name: "Baseline", - Region: unique.Make(inttypes.ResourceRegionDefault()), + Tags: unique.Make(inttypes.ServicePackageResourceTags{ + IdentifierAttribute: names.AttrARN, + }), + Region: unique.Make(inttypes.ResourceRegionDefault()), }, } } From 8a06faec13b93a267aed31cee50e4d1a2542e8db Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 09:50:49 -0500 Subject: [PATCH 1363/2115] fmt tests --- internal/service/controltower/baseline_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index eb2b0b90cffe..1965a609a2ba 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -173,12 +173,12 @@ resource "aws_organizations_organizational_unit" "test" { } resource "aws_controltower_baseline" "test" { - baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" - baseline_version = "4.0" - target_identifier = aws_organizations_organizational_unit.test.arn + baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" + baseline_version = "4.0" + target_identifier = aws_organizations_organizational_unit.test.arn parameters { - key = "IdentityCenterEnabledBaselineArn" - value = "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" + key = "IdentityCenterEnabledBaselineArn" + value = "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" } } `, rName) From f70585b03838310461c7641f36f790a8905bea33 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 4 Sep 2025 11:13:52 -0400 Subject: [PATCH 1364/2115] chore: make clean-tidy --- tools/tfsdk2fw/go.mod | 13 +++++++------ tools/tfsdk2fw/go.sum | 26 ++++++++++++++------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 6117e3df1033..14a5af123b49 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -64,11 +64,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 // indirect github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 // indirect github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 // indirect @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 // indirect github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 // indirect github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 // indirect github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 // indirect @@ -221,7 +221,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 // indirect @@ -231,8 +231,8 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 // indirect github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 // indirect github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 // indirect github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 // indirect @@ -285,6 +285,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 // indirect github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 // indirect github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 // indirect github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 // indirect github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 // indirect github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index a45d7bbd3502..53e912cd24a5 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -115,16 +115,16 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4b github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2 h1:V2QpAhHq/SUAAN0KN0NLrPy1vwP8l7OSJGcwaKVd8oY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.31.2/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 h1:yDZarlgst5B+n3rXKlJPgKeGJfOG8p+K71t4A8N4DrI= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2 h1:8/tG0guchEzDCVPDXJLcDcf6Vc0MltrMFi08FCYCIaE= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.53.2/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.2 h1:tzFcfDSjBXVTtbZUGtFBLBh7u9Hx9vLJwmS3a3G8XLg= -github.com/aws/aws-sdk-go-v2/service/mq v1.33.2/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.0/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayP github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.1 h1:SWL25hSnSjpSyzhsImgS+JFfDsi2SJNpXcYbPX/mjyQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.104.1/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 h1:3syjHziAKP9cQBLKcABUTKqwb/y6oa0KfVeluIc69Ug= +github.com/aws/aws-sdk-go-v2/service/rds v1.105.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= @@ -449,10 +449,10 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THD github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2 h1:S3UZycqIGdXUDZkHQ/dTo99mFaHATfCJEVcYrnT24o4= -github.com/aws/aws-sdk-go-v2/service/route53 v1.57.2/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1 h1:ECXmK3bbh1DLmJEkyS1tXU0k5iOj+TIUrXJI4zgpkSM= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.33.1/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= @@ -557,6 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcy github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= From 03fb37bfe0c78c96467c4155fb1af76154ca4857 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 10:15:01 -0500 Subject: [PATCH 1365/2115] aws_controltower_baseline: remove hardcoded region and partition --- internal/service/controltower/baseline.go | 1 - internal/service/controltower/baseline_test.go | 7 +++++-- .../docs/r/controltower_baseline.html.markdown | 18 +++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index c91e49811a07..e39a353e926a 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -55,7 +55,6 @@ type resourceBaseline struct { framework.WithTimeouts } - func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { response.Schema = schema.Schema{ Attributes: map[string]schema.Attribute{ diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 1965a609a2ba..98acb06e8fcb 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -165,6 +165,9 @@ func testAccEnabledBaselinesPreCheck(ctx context.Context, t *testing.T) { func testAccBaselineConfig_basic(rName string) string { return fmt.Sprintf(` +data "aws_partition" "current" {} +data "aws_region" "current" {} + data "aws_organizations_organization" "current" {} resource "aws_organizations_organizational_unit" "test" { @@ -173,12 +176,12 @@ resource "aws_organizations_organizational_unit" "test" { } resource "aws_controltower_baseline" "test" { - baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" + baseline_identifier = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}::baseline/17BSJV3IGJ2QSGA2" baseline_version = "4.0" target_identifier = aws_organizations_organizational_unit.test.arn parameters { key = "IdentityCenterEnabledBaselineArn" - value = "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" + value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:664418989480:enabledbaseline/XALULM96QHI525UOC" } } `, rName) diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown index 68c5026e05a0..54c78bf81c88 100644 --- a/website/docs/r/controltower_baseline.html.markdown +++ b/website/docs/r/controltower_baseline.html.markdown @@ -5,14 +5,7 @@ page_title: "AWS: aws_controltower_baseline" description: |- Terraform resource for managing an AWS Control Tower Baseline. --- -` + # Resource: aws_controltower_baseline Terraform resource for managing an AWS Control Tower Baseline. @@ -22,7 +15,14 @@ Terraform resource for managing an AWS Control Tower Baseline. ### Basic Usage ```terraform -resource "aws_controltower_baseline" "example" { +resource "aws_controltower_baseline" "test" { + baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" + baseline_version = "4.0" + target_identifier = aws_organizations_organizational_unit.test.arn + parameters { + key = "IdentityCenterEnabledBaselineArn" + value = "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" + } } ``` From d150fa3a367ca4220494c4da6fcedfd400edcc44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 11:24:29 -0400 Subject: [PATCH 1366/2115] Run 'make fix-constants PKG=cognitoidp'. --- .../service/cognitoidp/managed_login_branding_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index 9f4740dd5b10..e96b63f8cda3 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -58,7 +58,7 @@ func TestAccCognitoIDPManagedLoginBranding_basic(t *testing.T) { ImportState: true, ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", - ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", names.AttrUserPoolID, "managed_login_branding_id"), }, }, }) @@ -119,7 +119,7 @@ func TestAccCognitoIDPManagedLoginBranding_asset(t *testing.T) { ImportState: true, ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", - ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", names.AttrUserPoolID, "managed_login_branding_id"), }, }, }) @@ -157,7 +157,7 @@ func TestAccCognitoIDPManagedLoginBranding_settings(t *testing.T) { ImportState: true, ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", - ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", "user_pool_id", "managed_login_branding_id"), + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resourceName, ",", names.AttrUserPoolID, "managed_login_branding_id"), }, }, }) @@ -310,7 +310,7 @@ func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestC continue } - _, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes["user_pool_id"], rs.Primary.Attributes["managed_login_branding_id"], false) + _, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes[names.AttrUserPoolID], rs.Primary.Attributes["managed_login_branding_id"], false) if tfresource.NotFound(err) { continue @@ -336,7 +336,7 @@ func testAccCheckManagedLoginBrandingExists(ctx context.Context, n string, v *aw conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) - output, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes["user_pool_id"], rs.Primary.Attributes["managed_login_branding_id"], false) + output, err := tfcognitoidp.FindManagedLoginBrandingByThreePartKey(ctx, conn, rs.Primary.Attributes[names.AttrUserPoolID], rs.Primary.Attributes["managed_login_branding_id"], false) if err != nil { return err From e3f229a826d240d2fdeab40ac867591813a1ec99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 11:25:59 -0400 Subject: [PATCH 1367/2115] Run 'make clean-tidy'. --- tools/tfsdk2fw/go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index b9aa03c3093a..6bcc734459e4 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -346,6 +346,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/oklog/run v1.0.0 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/posener/complete v1.2.3 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/spf13/cast v1.3.1 // indirect From 2688d94247d7b0e2f116b76720f9fc3d65895ae0 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 10:26:26 -0500 Subject: [PATCH 1368/2115] aws_controltower_baseline: add resource identity import --- internal/service/controltower/baseline.go | 6 ++---- internal/service/controltower/service_package_gen.go | 6 +++++- website/docs/r/controltower_baseline.html.markdown | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index e39a353e926a..e48b900a6c6c 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -36,6 +36,7 @@ import ( // @FrameworkResource("aws_controltower_baseline", name="Baseline") // @Tags(identifierAttribute="arn") +// @ArnIdentity func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBaseline{} @@ -53,6 +54,7 @@ const ( type resourceBaseline struct { framework.ResourceWithModel[resourceBaselineData] framework.WithTimeouts + framework.WithImportByIdentity } func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { @@ -326,10 +328,6 @@ func (r *resourceBaseline) Delete(ctx context.Context, request resource.DeleteRe } -func (r *resourceBaseline) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { - resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), request, response) -} - func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.EnablementStatusUnderChange), diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index 47d3593928e0..3ef37c89b5a9 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -30,7 +30,11 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalARNIdentity(), + Import: inttypes.FrameworkImport{ + WrappedImport: true, + }, }, } } diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown index 54c78bf81c88..07e44c3b9338 100644 --- a/website/docs/r/controltower_baseline.html.markdown +++ b/website/docs/r/controltower_baseline.html.markdown @@ -15,7 +15,7 @@ Terraform resource for managing an AWS Control Tower Baseline. ### Basic Usage ```terraform -resource "aws_controltower_baseline" "test" { +resource "aws_controltower_baseline" "example" { baseline_identifier = "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2" baseline_version = "4.0" target_identifier = aws_organizations_organizational_unit.test.arn From c49a51fab25878598a17cb1da1393235ca8055aa Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 10:32:29 -0500 Subject: [PATCH 1369/2115] fmt --- internal/service/controltower/baseline.go | 3 --- internal/service/controltower/baseline_test.go | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index e48b900a6c6c..d7082ea453cd 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -42,7 +42,6 @@ func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, err r.SetDefaultCreateTimeout(30 * time.Minute) r.SetDefaultUpdateTimeout(30 * time.Minute) - r.SetDefaultDeleteTimeout(30 * time.Minute) return r, nil } @@ -97,7 +96,6 @@ func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, Required: true, }, names.AttrValue: schema.StringAttribute{ - //CustomType: fwtypes.NewSmithyJSONType(ctx, document.NewLazyDocument), Required: true, }, }, @@ -106,7 +104,6 @@ func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ Create: true, Update: true, - Delete: true, }), }, } diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 98acb06e8fcb..944338d14f32 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -20,9 +20,8 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" "github.com/hashicorp/terraform-provider-aws/internal/errs" - "github.com/hashicorp/terraform-provider-aws/names" - tfcontroltower "github.com/hashicorp/terraform-provider-aws/internal/service/controltower" + "github.com/hashicorp/terraform-provider-aws/names" ) func TestAccControlTowerBaseline_basic(t *testing.T) { From 7f85b684fd845b5f087a4740c1ec722f39cbf083 Mon Sep 17 00:00:00 2001 From: djglaser Date: Thu, 4 Sep 2025 10:55:15 -0400 Subject: [PATCH 1370/2115] Remove TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_ acceptance tests --- internal/service/ecs/service_test.go | 112 +-------------------------- 1 file changed, 3 insertions(+), 109 deletions(-) diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 4e9f4b1ae94e..5a19955c806b 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -1106,7 +1106,7 @@ func TestAccECSService_BlueGreenDeployment_sigintRollback(t *testing.T) { Config: testAccServiceConfig_blueGreenDeployment_withHookBehavior(rName, false), PreConfig: func() { go func() { - _ = exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() //lintignore:XR007 + _ = exec.Command("go", "run", "test-fixtures/sigint_helper.go", "30").Start() // lintignore:XR007 }() }, ExpectError: regexache.MustCompile("execution halted|context canceled"), @@ -2656,7 +2656,7 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { CheckDestroy: testAccCheckServiceDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), ), @@ -2670,7 +2670,7 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { }, }, { - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), + Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), ), @@ -2729,112 +2729,6 @@ func TestAccECSService_AvailabilityZoneRebalancing(t *testing.T) { }) } -func TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_configured(t *testing.T) { - ctx := acctest.Context(t) - var service awstypes.Service - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_ecs_service.test" - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t) }, - ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), - CheckDestroy: testAccCheckServiceDestroy(ctx), - Steps: []resource.TestStep{ - { - ExternalProviders: map[string]resource.ExternalProvider{ - "aws": { - Source: "hashicorp/aws", - VersionConstraint: "6.8.0", - }, - }, - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), - Check: resource.ComposeTestCheckFunc( - testAccCheckServiceExists(ctx, resourceName, &service), - ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), - }, - }, - { - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, awstypes.AvailabilityZoneRebalancingEnabled), - Check: resource.ComposeTestCheckFunc( - testAccCheckServiceExists(ctx, resourceName, &service), - ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), - }, - PostApplyPostRefresh: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingEnabled)), - }, - }, - }, - }) -} - -func TestAccECSService_AvailabilityZoneRebalancing_UpgradeV6_8_0_unconfigured(t *testing.T) { - ctx := acctest.Context(t) - var service awstypes.Service - rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - resourceName := "aws_ecs_service.test" - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t) }, - ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), - CheckDestroy: testAccCheckServiceDestroy(ctx), - Steps: []resource.TestStep{ - { - ExternalProviders: map[string]resource.ExternalProvider{ - "aws": { - Source: "hashicorp/aws", - VersionConstraint: "6.8.0", - }, - }, - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), - Check: resource.ComposeTestCheckFunc( - testAccCheckServiceExists(ctx, resourceName, &service), - ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), - }, - }, - { - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - Config: testAccServiceConfig_availabilityZoneRebalancing(rName, "null"), - Check: resource.ComposeTestCheckFunc( - testAccCheckServiceExists(ctx, resourceName, &service), - ), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), - }, - PostApplyPostRefresh: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), - }, - }, - ConfigStateChecks: []statecheck.StateCheck{ - statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("availability_zone_rebalancing"), tfknownvalue.StringExact(awstypes.AvailabilityZoneRebalancingDisabled)), - }, - }, - }, - }) -} - func testAccCheckServiceDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) From 8604e3029c98d70833ee5c4866d21f425c9ca4b8 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 00:45:44 +0900 Subject: [PATCH 1371/2115] Make feature_name optional --- internal/service/rds/cluster_role_association.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/rds/cluster_role_association.go b/internal/service/rds/cluster_role_association.go index 858909645f1b..cce0c9620fc4 100644 --- a/internal/service/rds/cluster_role_association.go +++ b/internal/service/rds/cluster_role_association.go @@ -50,7 +50,7 @@ func resourceClusterRoleAssociation() *schema.Resource { }, "feature_name": { Type: schema.TypeString, - Required: true, + Optional: true, ForceNew: true, }, names.AttrRoleARN: { From cf0d497aac7dd996f83b0b292395493d5da332b0 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 00:46:17 +0900 Subject: [PATCH 1372/2115] Add an acctest to confirm feature_name is not always required --- .../rds/cluster_role_association_test.go | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/internal/service/rds/cluster_role_association_test.go b/internal/service/rds/cluster_role_association_test.go index 17b812790963..cc7958e5099e 100644 --- a/internal/service/rds/cluster_role_association_test.go +++ b/internal/service/rds/cluster_role_association_test.go @@ -52,6 +52,38 @@ func TestAccRDSClusterRoleAssociation_basic(t *testing.T) { }) } +func TestAccRDSClusterRoleAssociation_mysqlWithoutFeatureName(t *testing.T) { + ctx := acctest.Context(t) + var dbClusterRole types.DBClusterRole + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + dbClusterResourceName := "aws_rds_cluster.test" + iamRoleResourceName := "aws_iam_role.test" + resourceName := "aws_rds_cluster_role_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckClusterRoleAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccClusterRoleAssociationConfig_mysqlWithoutFeatureName(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckClusterRoleAssociationExists(ctx, resourceName, &dbClusterRole), + resource.TestCheckResourceAttrPair(resourceName, "db_cluster_identifier", dbClusterResourceName, names.AttrID), + resource.TestCheckResourceAttr(resourceName, "feature_name", ""), + resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, iamRoleResourceName, names.AttrARN), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccRDSClusterRoleAssociation_disappears(t *testing.T) { ctx := acctest.Context(t) var dbClusterRole types.DBClusterRole @@ -214,3 +246,44 @@ data "aws_iam_policy_document" "rds_assume_role_policy" { } `, rName)) } + +func testAccClusterRoleAssociationConfig_mysqlWithoutFeatureName(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigAvailableAZsNoOptIn(), + fmt.Sprintf(` +resource "aws_rds_cluster_role_association" "test" { + db_cluster_identifier = aws_rds_cluster.test.id + role_arn = aws_iam_role.test.arn +} + +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = "aurora-mysql" + availability_zones = [data.aws_availability_zones.available.names[0], data.aws_availability_zones.available.names[1], data.aws_availability_zones.available.names[2]] + database_name = "mydb" + master_username = "foo" + master_password = "foobarfoobarfoobar" + skip_final_snapshot = true +} + +resource "aws_iam_role" "test" { + assume_role_policy = data.aws_iam_policy_document.rds_assume_role_policy.json + name = %[1]q + + # ensure IAM role is created just before association to exercise IAM eventual consistency + depends_on = [aws_rds_cluster.test] +} + +data "aws_iam_policy_document" "rds_assume_role_policy" { + statement { + actions = ["sts:AssumeRole"] + effect = "Allow" + + principals { + identifiers = ["rds.amazonaws.com"] + type = "Service" + } + } +} +`, rName)) +} From 8058118cc2e0d1402084aa85a73783580f68da0d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 11:46:28 -0400 Subject: [PATCH 1373/2115] Tweak CHANGELOG entry. --- .changelog/42740.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/42740.txt b/.changelog/42740.txt index b627c91b9361..f402d54fdc46 100644 --- a/.changelog/42740.txt +++ b/.changelog/42740.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_wafv2_web_acl: Fix performance of update with `rule` ignored where the WebACL has a large number of rules. +resource/aws_wafv2_web_acl: Fix performance of update when the WebACL has a large number of rules ``` From a1ece38b20f6814be805ccde2c11fd1b11fc671e Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 00:47:06 +0900 Subject: [PATCH 1374/2115] Update the documentation to make feature_name Optional --- website/docs/r/rds_cluster_role_association.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/rds_cluster_role_association.html.markdown b/website/docs/r/rds_cluster_role_association.html.markdown index 08703daa707e..9dc9e8742891 100644 --- a/website/docs/r/rds_cluster_role_association.html.markdown +++ b/website/docs/r/rds_cluster_role_association.html.markdown @@ -29,7 +29,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `db_cluster_identifier` - (Required) DB Cluster Identifier to associate with the IAM Role. -* `feature_name` - (Required) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). +* `feature_name` - (Optional) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). * `role_arn` - (Required) Amazon Resource Name (ARN) of the IAM Role to associate with the DB Cluster. ## Attribute Reference From d4cb9d14d2b665dff381e82117362dc7d7963488 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 11:49:54 -0400 Subject: [PATCH 1375/2115] No need to check for changes in Computed-only or ForceNew attributes. --- internal/service/wafv2/web_acl.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/internal/service/wafv2/web_acl.go b/internal/service/wafv2/web_acl.go index 44ea9dd98ade..da1e87828573 100644 --- a/internal/service/wafv2/web_acl.go +++ b/internal/service/wafv2/web_acl.go @@ -384,24 +384,18 @@ func resourceWebACLUpdate(ctx context.Context, d *schema.ResourceData, meta any) var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFV2Client(ctx) - // HasChangesExcept can perform _very_ slowly when presented with a large number of unchanged (or ignored) - // attributes e.g. rule blocks in this case + // https://github.com/hashicorp/terraform-provider-aws/pull/42740. + // if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) { if d.HasChanges( - "application_integration_url", "association_config", - "capacity", "captcha_config", "challenge_config", "custom_response_body", "data_protection_config", names.AttrDefaultAction, names.AttrDescription, - "lock_token", - names.AttrName, - names.AttrNamePrefix, "rule_json", names.AttrRule, - names.AttrScope, "token_domains", "visibility_config", ) { From 5a977e5bcbe2c27f070f601bc16f471660d70c25 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 01:06:45 +0900 Subject: [PATCH 1376/2115] add changelog --- .changelog/44143.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44143.txt diff --git a/.changelog/44143.txt b/.changelog/44143.txt new file mode 100644 index 000000000000..b16554b767ab --- /dev/null +++ b/.changelog/44143.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_rds_cluster_role_association: Change `feature_name` argument from required to optional +``` From 669b5eddf90e3b4ef65589e1abaaff7e00410b22 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 11:27:06 -0500 Subject: [PATCH 1377/2115] aws_controltower_baseline: update documentation --- internal/service/controltower/baseline.go | 1 - .../r/controltower_baseline.html.markdown | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index d7082ea453cd..c83eca3ba14f 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -39,7 +39,6 @@ import ( // @ArnIdentity func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBaseline{} - r.SetDefaultCreateTimeout(30 * time.Minute) r.SetDefaultUpdateTimeout(30 * time.Minute) diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown index 07e44c3b9338..c32740d97902 100644 --- a/website/docs/r/controltower_baseline.html.markdown +++ b/website/docs/r/controltower_baseline.html.markdown @@ -30,26 +30,35 @@ resource "aws_controltower_baseline" "example" { The following arguments are required: -* `example_arg` - (Required) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `baseline_identifier` - (Required) The ARN of the baseline to be enabled. +* `baseline_version` - (Required) The version of the baseline to be enabled. +* `target_identifier` - (Required) The ARN of the target on which the baseline will be enabled. Only OUs are supported as targets. The following arguments are optional: -* `optional_arg` - (Optional) Concise argument description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `parameters` - (Optional) A list of key-value objects that specify enablement parameters, where key is a string and value is a document of any type. See [Parameter](#parameters) below for details. +* `tags` - (Optional) Tags to apply to the landing zone. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### parameters + +* `key` - (Required) The key of the parameter. +* `value` - (Required) The value of the parameter. ## Attribute Reference This resource exports the following attributes in addition to the arguments above: -* `arn` - ARN of the Baseline. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. -* `example_attribute` - Concise description. Do not begin the description with "An", "The", "Defines", "Indicates", or "Specifies," as these are verbose. In other words, "Indicates the amount of storage," can be rewritten as "Amount of storage," without losing any information. +* `arn` - ARN of the Baseline. +* `operaton_identifier` - The ID (in UUID format) of the asynchronous operation. +* `tags_all` - A map of tags assigned to the landing zone, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). ## Timeouts [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): -* `create` - (Default `60m`) -* `update` - (Default `180m`) -* `delete` - (Default `90m`) +* `create` - (Default `30m`) +* `update` - (Default `30m`) ## Import @@ -58,12 +67,12 @@ In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashico ```terraform import { to = aws_controltower_baseline.example - id = "baseline-id-12345678" + id = "arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC" } ``` -Using `terraform import`, import Control Tower Baseline using the `example_id_arg`. For example: +Using `terraform import`, import Control Tower Baseline using the `arn`. For example: ```console -% terraform import aws_controltower_baseline.example baseline-id-12345678 +% terraform import aws_controltower_baseline.example arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC ``` From 9e09838e8941ffee2faede71e4b9824e97ab3585 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 11:30:20 -0500 Subject: [PATCH 1378/2115] add CHANGELOG entry --- .changelog/42397.txt | 3 +++ website/docs/r/controltower_baseline.html.markdown | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .changelog/42397.txt diff --git a/.changelog/42397.txt b/.changelog/42397.txt new file mode 100644 index 000000000000..5be6003aa0dd --- /dev/null +++ b/.changelog/42397.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_controltower_baseline +``` \ No newline at end of file diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown index c32740d97902..2200ca337c25 100644 --- a/website/docs/r/controltower_baseline.html.markdown +++ b/website/docs/r/controltower_baseline.html.markdown @@ -62,7 +62,7 @@ This resource exports the following attributes in addition to the arguments abov ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Control Tower Baseline using the `example_id_arg`. For example: +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Control Tower Baseline using the `arn`. For example: ```terraform import { From 75125afd22e594c2f4ce41428144c4da1e840eb6 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 4 Sep 2025 16:41:41 +0000 Subject: [PATCH 1379/2115] Update CHANGELOG.md for #43817 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f20e26217204..49a1de50c1ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ NOTES: * resource/aws_s3_bucket_acl: The `access_control_policy.owner.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Owner.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. ([#44090](https://github.com/hashicorp/terraform-provider-aws/issues/44090)) * resource/aws_s3_bucket_logging: The `target_grant.grantee.display_name` attribute is deprecated. AWS has [ended support for this attribute](https://docs.aws.amazon.com/AmazonS3/latest/API/API_Grantee.html). API responses began inconsistently returning it on July 15, 2025, and will stop returning it entirely on November 21, 2025. This attribute will be removed in a future major version. ([#44090](https://github.com/hashicorp/terraform-provider-aws/issues/44090)) +FEATURES: + +* **New Resource:** `aws_cognito_managed_login_branding` ([#43817](https://github.com/hashicorp/terraform-provider-aws/issues/43817)) + ENHANCEMENTS: * data-source/aws_efs_mount_target: Add `ip_address_type` and `ipv6_address` attributes ([#44079](https://github.com/hashicorp/terraform-provider-aws/issues/44079)) @@ -33,6 +37,7 @@ BUG FIXES: * resource/aws_s3tables_table_policy: Remove plan-time validation of `name` and `namespace` ([#44072](https://github.com/hashicorp/terraform-provider-aws/issues/44072)) * resource/aws_servicecatalog_provisioned_product: Set `provisioning_parameters` and `provisioning_artifact_id` to the values from the last successful deployment when update fails ([#43956](https://github.com/hashicorp/terraform-provider-aws/issues/43956)) +* resource/aws_wafv2_web_acl: Fix performance of update when the WebACL has a large number of rules ([#42740](https://github.com/hashicorp/terraform-provider-aws/issues/42740)) ## 6.11.0 (August 28, 2025) From d7cd0776e952447a09c0f8da860542f3d4334701 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Thu, 4 Sep 2025 13:16:11 -0400 Subject: [PATCH 1380/2115] chore: `v6.12.0` release prep (#44142) --- CHANGELOG.md | 2 +- version/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a1de50c1ea..5bad2f2312fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 6.12.0 (Unreleased) +## 6.12.0 (September 4, 2025) NOTES: diff --git a/version/VERSION b/version/VERSION index c68232647cc1..d4e6cb42939b 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.11.1 \ No newline at end of file +6.12.0 From f4f792d4d379bc976ab52947bfa97accfcd40a14 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Thu, 4 Sep 2025 11:21:22 -0700 Subject: [PATCH 1381/2115] Bumped product version to 6.12.1. --- version/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/VERSION b/version/VERSION index d4e6cb42939b..5c3f3640cc97 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.12.0 +6.12.1 \ No newline at end of file From 2d241c5f5227699d4d4a1962be3b2538aab98b50 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 4 Sep 2025 18:22:47 +0000 Subject: [PATCH 1382/2115] Add changelog entry for v6.13.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bad2f2312fd..1912fade7a2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 6.13.0 (Unreleased) + ## 6.12.0 (September 4, 2025) NOTES: From 4d07aa1131cb09065b02e6c6d562173d0329df23 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 4 Sep 2025 13:22:57 -0500 Subject: [PATCH 1383/2115] linter fixes --- internal/service/controltower/baseline.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index c83eca3ba14f..01bceb0981cd 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -321,10 +321,9 @@ func (r *resourceBaseline) Delete(ctx context.Context, request resource.DeleteRe ) return } - } -func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { +func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.EnablementStatusUnderChange), Target: enum.Slice(awstypes.EnablementStatusSucceeded), From 82bc732f34de769a3679b25720e9b6728f2c5dbd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 15:24:40 -0400 Subject: [PATCH 1384/2115] appautoscaling: 'validPolicyImportInput' -> 'policyParseImportID'. --- .../service/appautoscaling/exports_test.go | 3 ++- internal/service/appautoscaling/policy.go | 20 +++++++++---------- .../service/appautoscaling/policy_test.go | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/internal/service/appautoscaling/exports_test.go b/internal/service/appautoscaling/exports_test.go index 0eed3b411ae4..78b70266e9f5 100644 --- a/internal/service/appautoscaling/exports_test.go +++ b/internal/service/appautoscaling/exports_test.go @@ -12,5 +12,6 @@ var ( FindScalingPolicyByFourPartKey = findScalingPolicyByFourPartKey FindScheduledActionByFourPartKey = findScheduledActionByFourPartKey FindTargetByThreePartKey = findTargetByThreePartKey - ValidPolicyImportInput = validPolicyImportInput + + PolicyParseImportID = policyParseImportID ) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index e80359dc1ccc..36744095e3f7 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -326,7 +326,7 @@ func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) d var diags diag.Diagnostics conn := meta.(*conns.AWSClient).AppAutoScalingClient(ctx) - outputRaw, err := tfresource.RetryWhenIsA[any, *awstypes.FailedResourceAccessException](ctx, propagationTimeout, func(ctx context.Context) (any, error) { + output, err := tfresource.RetryWhenIsA[*awstypes.ScalingPolicy, *awstypes.FailedResourceAccessException](ctx, propagationTimeout, func(ctx context.Context) (*awstypes.ScalingPolicy, error) { return findScalingPolicyByFourPartKey(ctx, conn, d.Get(names.AttrName).(string), d.Get("service_namespace").(string), d.Get(names.AttrResourceID).(string), d.Get("scalable_dimension").(string)) }) @@ -340,7 +340,6 @@ func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) d return sdkdiag.AppendErrorf(diags, "reading Application Auto Scaling Scaling Policy (%s): %s", d.Id(), err) } - output := outputRaw.(*awstypes.ScalingPolicy) d.Set("alarm_arns", tfslices.ApplyToAll(output.Alarms, func(v awstypes.Alarm) string { return aws.ToString(v.AlarmARN) })) @@ -364,13 +363,13 @@ func resourcePolicyDelete(ctx context.Context, d *schema.ResourceData, meta any) var diags diag.Diagnostics conn := meta.(*conns.AWSClient).AppAutoScalingClient(ctx) + log.Printf("[DEBUG] Deleting Application Auto Scaling Scaling Policy: %s", d.Id()) input := applicationautoscaling.DeleteScalingPolicyInput{ PolicyName: aws.String(d.Get(names.AttrName).(string)), ResourceId: aws.String(d.Get(names.AttrResourceID).(string)), ScalableDimension: awstypes.ScalableDimension(d.Get("scalable_dimension").(string)), ServiceNamespace: awstypes.ServiceNamespace(d.Get("service_namespace").(string)), } - _, err := tfresource.RetryWhenIsA[any, *awstypes.FailedResourceAccessException](ctx, propagationTimeout, func(ctx context.Context) (any, error) { return conn.DeleteScalingPolicy(ctx, &input) }) @@ -387,7 +386,7 @@ func resourcePolicyDelete(ctx context.Context, d *schema.ResourceData, meta any) } func resourcePolicyImport(ctx context.Context, d *schema.ResourceData, meta any) ([]*schema.ResourceData, error) { - parts, err := validPolicyImportInput(d.Id()) + parts, err := policyParseImportID(d.Id()) if err != nil { return nil, err } @@ -433,7 +432,6 @@ func findScalingPolicies(ctx context.Context, conn *applicationautoscaling.Clien var output []awstypes.ScalingPolicy pages := applicationautoscaling.NewDescribeScalingPoliciesPaginator(conn, input) - for pages.HasMorePages() { page, err := pages.NextPage(ctx) @@ -451,17 +449,19 @@ func findScalingPolicies(ctx context.Context, conn *applicationautoscaling.Clien return output, nil } -func validPolicyImportInput(id string) ([]string, error) { - idParts := strings.Split(id, "/") +func policyParseImportID(id string) ([]string, error) { + const ( + importIDSeparator = "/" + ) + idParts := strings.Split(id, importIDSeparator) if len(idParts) < 4 { - return nil, fmt.Errorf("unexpected format (%q), expected ///", id) + return nil, fmt.Errorf("unexpected format for ID (%[1]s), expected %[2]s%[2]s%[2]s", id, importIDSeparator) } var serviceNamespace, resourceID, scalableDimension, name string switch idParts[0] { case "dynamodb": serviceNamespace = idParts[0] - dimensionIdx := 3 // DynamoDB resource ID can be "/table/tableName" or "/table/tableName/index/indexName" if idParts[dimensionIdx] == "index" { @@ -487,7 +487,7 @@ func validPolicyImportInput(id string) ([]string, error) { } if serviceNamespace == "" || resourceID == "" || scalableDimension == "" || name == "" { - return nil, fmt.Errorf("unexpected format (%q), expected ///", id) + return nil, fmt.Errorf("unexpected format for ID (%[1]s), expected %[2]s%[2]s%[2]s", id, importIDSeparator) } return []string{serviceNamespace, resourceID, scalableDimension, name}, nil diff --git a/internal/service/appautoscaling/policy_test.go b/internal/service/appautoscaling/policy_test.go index 833313402a77..dfa318fc9e44 100644 --- a/internal/service/appautoscaling/policy_test.go +++ b/internal/service/appautoscaling/policy_test.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestValidatePolicyImportInput(t *testing.T) { +func TestPolicyParseImportID(t *testing.T) { t.Parallel() // lintignore:AWSAT003,AWSAT005 @@ -87,17 +87,17 @@ func TestValidatePolicyImportInput(t *testing.T) { } for _, tc := range testCases { - idParts, err := tfappautoscaling.ValidPolicyImportInput(tc.input) + idParts, err := tfappautoscaling.PolicyParseImportID(tc.input) if tc.errorExpected == false && err != nil { - t.Errorf("tfappautoscaling.ValidPolicyImportInput(%q): resulted in an unexpected error: %s", tc.input, err) + t.Errorf("tfappautoscaling.PolicyParseImportID(%q): resulted in an unexpected error: %s", tc.input, err) } if tc.errorExpected == true && err == nil { - t.Errorf("tfappautoscaling.ValidPolicyImportInput(%q): expected an error, but returned successfully", tc.input) + t.Errorf("tfappautoscaling.PolicyParseImportID(%q): expected an error, but returned successfully", tc.input) } if !reflect.DeepEqual(tc.expected, idParts) { - t.Errorf("tfappautoscaling.ValidPolicyImportInput(%q): expected %q, but got %q", tc.input, strings.Join(tc.expected, "/"), strings.Join(idParts, "/")) + t.Errorf("tfappautoscaling.PolicyParseImportID(%q): expected %q, but got %q", tc.input, strings.Join(tc.expected, "/"), strings.Join(idParts, "/")) } } } From 242fa2747fc6909a513a9dd0a135b8285ba44f28 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 15:36:14 -0400 Subject: [PATCH 1385/2115] Fix 'TestAccAppAutoScalingPolicy_TargetTrack_metricMath'. --- internal/service/appautoscaling/policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/appautoscaling/policy_test.go b/internal/service/appautoscaling/policy_test.go index dfa318fc9e44..68001439c4a5 100644 --- a/internal/service/appautoscaling/policy_test.go +++ b/internal/service/appautoscaling/policy_test.go @@ -633,7 +633,7 @@ resource "aws_ecs_service" "test" { cluster = aws_ecs_cluster.test.id deployment_maximum_percent = 200 deployment_minimum_healthy_percent = 50 - desired_count = 0 + desired_count = 2 name = %[1]q task_definition = aws_ecs_task_definition.test.arn } From 49bf82e70e9b3a95c12984af37cdc66b4205b108 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 15:40:54 -0400 Subject: [PATCH 1386/2115] Remove 'expandPutScalingPolicyInput'. --- internal/service/appautoscaling/policy.go | 110 ++++++++++------------ 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 36744095e3f7..e864baf119e8 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -305,7 +305,58 @@ func resourcePolicyPut(ctx context.Context, d *schema.ResourceData, meta any) di conn := meta.(*conns.AWSClient).AppAutoScalingClient(ctx) id := d.Get(names.AttrName).(string) - input := expandPutScalingPolicyInput(d) + input := applicationautoscaling.PutScalingPolicyInput{ + PolicyName: aws.String(d.Get(names.AttrName).(string)), + ResourceId: aws.String(d.Get(names.AttrResourceID).(string)), + } + + if v, ok := d.GetOk("policy_type"); ok { + input.PolicyType = awstypes.PolicyType(v.(string)) + } + + if v, ok := d.GetOk("scalable_dimension"); ok { + input.ScalableDimension = awstypes.ScalableDimension(v.(string)) + } + + if v, ok := d.GetOk("service_namespace"); ok { + input.ServiceNamespace = awstypes.ServiceNamespace(v.(string)) + } + + if v, ok := d.GetOk("step_scaling_policy_configuration"); ok { + input.StepScalingPolicyConfiguration = expandStepScalingPolicyConfiguration(v.([]any)) + } + + if l, ok := d.GetOk("target_tracking_scaling_policy_configuration"); ok { + v := l.([]any) + if len(v) == 1 { + ttspCfg := v[0].(map[string]any) + cfg := awstypes.TargetTrackingScalingPolicyConfiguration{ + TargetValue: aws.Float64(ttspCfg["target_value"].(float64)), + } + + if v, ok := ttspCfg["scale_in_cooldown"]; ok { + cfg.ScaleInCooldown = aws.Int32(int32(v.(int))) + } + + if v, ok := ttspCfg["scale_out_cooldown"]; ok { + cfg.ScaleOutCooldown = aws.Int32(int32(v.(int))) + } + + if v, ok := ttspCfg["disable_scale_in"]; ok { + cfg.DisableScaleIn = aws.Bool(v.(bool)) + } + + if v, ok := ttspCfg["customized_metric_specification"].([]any); ok && len(v) > 0 { + cfg.CustomizedMetricSpecification = expandCustomizedMetricSpecification(v) + } + + if v, ok := ttspCfg["predefined_metric_specification"].([]any); ok && len(v) > 0 { + cfg.PredefinedMetricSpecification = expandPredefinedMetricSpecification(v) + } + + input.TargetTrackingScalingPolicyConfiguration = &cfg + } + } _, err := tfresource.RetryWhenIsA[any, *awstypes.FailedResourceAccessException](ctx, propagationTimeout, func(ctx context.Context) (any, error) { return conn.PutScalingPolicy(ctx, &input) @@ -652,63 +703,6 @@ func expandPredefinedMetricSpecification(configured []any) *awstypes.PredefinedM return spec } -func expandPutScalingPolicyInput(d *schema.ResourceData) applicationautoscaling.PutScalingPolicyInput { - apiObject := applicationautoscaling.PutScalingPolicyInput{ - PolicyName: aws.String(d.Get(names.AttrName).(string)), - ResourceId: aws.String(d.Get(names.AttrResourceID).(string)), - } - - if v, ok := d.GetOk("policy_type"); ok { - apiObject.PolicyType = awstypes.PolicyType(v.(string)) - } - - if v, ok := d.GetOk("scalable_dimension"); ok { - apiObject.ScalableDimension = awstypes.ScalableDimension(v.(string)) - } - - if v, ok := d.GetOk("service_namespace"); ok { - apiObject.ServiceNamespace = awstypes.ServiceNamespace(v.(string)) - } - - if v, ok := d.GetOk("step_scaling_policy_configuration"); ok { - apiObject.StepScalingPolicyConfiguration = expandStepScalingPolicyConfiguration(v.([]any)) - } - - if l, ok := d.GetOk("target_tracking_scaling_policy_configuration"); ok { - v := l.([]any) - if len(v) == 1 { - ttspCfg := v[0].(map[string]any) - cfg := awstypes.TargetTrackingScalingPolicyConfiguration{ - TargetValue: aws.Float64(ttspCfg["target_value"].(float64)), - } - - if v, ok := ttspCfg["scale_in_cooldown"]; ok { - cfg.ScaleInCooldown = aws.Int32(int32(v.(int))) - } - - if v, ok := ttspCfg["scale_out_cooldown"]; ok { - cfg.ScaleOutCooldown = aws.Int32(int32(v.(int))) - } - - if v, ok := ttspCfg["disable_scale_in"]; ok { - cfg.DisableScaleIn = aws.Bool(v.(bool)) - } - - if v, ok := ttspCfg["customized_metric_specification"].([]any); ok && len(v) > 0 { - cfg.CustomizedMetricSpecification = expandCustomizedMetricSpecification(v) - } - - if v, ok := ttspCfg["predefined_metric_specification"].([]any); ok && len(v) > 0 { - cfg.PredefinedMetricSpecification = expandPredefinedMetricSpecification(v) - } - - apiObject.TargetTrackingScalingPolicyConfiguration = &cfg - } - } - - return apiObject -} - func expandStepScalingPolicyConfiguration(cfg []any) *awstypes.StepScalingPolicyConfiguration { if len(cfg) < 1 { return nil From 1d0571febd4995d6ad0a7febeda6fb55af0acfa6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 15:47:02 -0400 Subject: [PATCH 1387/2115] Add 'expandTargetTrackingScalingPolicyConfiguration'. --- internal/service/appautoscaling/policy.go | 65 ++++++++++++----------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index e864baf119e8..11477f313a8c 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -326,36 +326,8 @@ func resourcePolicyPut(ctx context.Context, d *schema.ResourceData, meta any) di input.StepScalingPolicyConfiguration = expandStepScalingPolicyConfiguration(v.([]any)) } - if l, ok := d.GetOk("target_tracking_scaling_policy_configuration"); ok { - v := l.([]any) - if len(v) == 1 { - ttspCfg := v[0].(map[string]any) - cfg := awstypes.TargetTrackingScalingPolicyConfiguration{ - TargetValue: aws.Float64(ttspCfg["target_value"].(float64)), - } - - if v, ok := ttspCfg["scale_in_cooldown"]; ok { - cfg.ScaleInCooldown = aws.Int32(int32(v.(int))) - } - - if v, ok := ttspCfg["scale_out_cooldown"]; ok { - cfg.ScaleOutCooldown = aws.Int32(int32(v.(int))) - } - - if v, ok := ttspCfg["disable_scale_in"]; ok { - cfg.DisableScaleIn = aws.Bool(v.(bool)) - } - - if v, ok := ttspCfg["customized_metric_specification"].([]any); ok && len(v) > 0 { - cfg.CustomizedMetricSpecification = expandCustomizedMetricSpecification(v) - } - - if v, ok := ttspCfg["predefined_metric_specification"].([]any); ok && len(v) > 0 { - cfg.PredefinedMetricSpecification = expandPredefinedMetricSpecification(v) - } - - input.TargetTrackingScalingPolicyConfiguration = &cfg - } + if v, ok := d.GetOk("target_tracking_scaling_policy_configuration"); ok { + input.TargetTrackingScalingPolicyConfiguration = expandTargetTrackingScalingPolicyConfiguration(v.([]any)) } _, err := tfresource.RetryWhenIsA[any, *awstypes.FailedResourceAccessException](ctx, propagationTimeout, func(ctx context.Context) (any, error) { @@ -544,6 +516,39 @@ func policyParseImportID(id string) ([]string, error) { return []string{serviceNamespace, resourceID, scalableDimension, name}, nil } +func expandTargetTrackingScalingPolicyConfiguration(tfList []any) *awstypes.TargetTrackingScalingPolicyConfiguration { + if len(tfList) < 1 || tfList[0] == nil { + return nil + } + + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.TargetTrackingScalingPolicyConfiguration{ + TargetValue: aws.Float64(tfMap["target_value"].(float64)), + } + + if v, ok := tfMap["customized_metric_specification"].([]any); ok && len(v) > 0 { + apiObject.CustomizedMetricSpecification = expandCustomizedMetricSpecification(v) + } + + if v, ok := tfMap["disable_scale_in"]; ok { + apiObject.DisableScaleIn = aws.Bool(v.(bool)) + } + + if v, ok := tfMap["predefined_metric_specification"].([]any); ok && len(v) > 0 { + apiObject.PredefinedMetricSpecification = expandPredefinedMetricSpecification(v) + } + + if v, ok := tfMap["scale_in_cooldown"]; ok { + apiObject.ScaleInCooldown = aws.Int32(int32(v.(int))) + } + + if v, ok := tfMap["scale_out_cooldown"]; ok { + apiObject.ScaleOutCooldown = aws.Int32(int32(v.(int))) + } + + return apiObject +} + // Takes the result of flatmap.Expand for an array of step adjustments and // returns a []*awstypes.StepAdjustment. func expandStepAdjustments(configured []any) ([]awstypes.StepAdjustment, error) { From ca65f0971a58afe08cf35bc6bf0738a22378eebb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 15:55:25 -0400 Subject: [PATCH 1388/2115] r/aws_appautoscaling_policy: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `step_scaling_policy_configuration` is empty. --- .changelog/#####.txt | 3 ++ internal/service/appautoscaling/policy.go | 34 +++++++++++++---------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..8780fbccc11e --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_appautoscaling_policy: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `step_scaling_policy_configuration` is empty +``` \ No newline at end of file diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 11477f313a8c..cc50ea084d36 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -708,31 +708,35 @@ func expandPredefinedMetricSpecification(configured []any) *awstypes.PredefinedM return spec } -func expandStepScalingPolicyConfiguration(cfg []any) *awstypes.StepScalingPolicyConfiguration { - if len(cfg) < 1 { +func expandStepScalingPolicyConfiguration(tfList []any) *awstypes.StepScalingPolicyConfiguration { + if len(tfList) < 1 || tfList[0] == nil { return nil } - out := &awstypes.StepScalingPolicyConfiguration{} + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.StepScalingPolicyConfiguration{} - m := cfg[0].(map[string]any) - if v, ok := m["adjustment_type"]; ok { - out.AdjustmentType = awstypes.AdjustmentType(v.(string)) + if v, ok := tfMap["adjustment_type"]; ok { + apiObject.AdjustmentType = awstypes.AdjustmentType(v.(string)) } - if v, ok := m["cooldown"]; ok { - out.Cooldown = aws.Int32(int32(v.(int))) + + if v, ok := tfMap["cooldown"]; ok { + apiObject.Cooldown = aws.Int32(int32(v.(int))) } - if v, ok := m["metric_aggregation_type"]; ok { - out.MetricAggregationType = awstypes.MetricAggregationType(v.(string)) + + if v, ok := tfMap["metric_aggregation_type"]; ok { + apiObject.MetricAggregationType = awstypes.MetricAggregationType(v.(string)) } - if v, ok := m["min_adjustment_magnitude"].(int); ok && v > 0 { - out.MinAdjustmentMagnitude = aws.Int32(int32(v)) + + if v, ok := tfMap["min_adjustment_magnitude"].(int); ok && v > 0 { + apiObject.MinAdjustmentMagnitude = aws.Int32(int32(v)) } - if v, ok := m["step_adjustment"].(*schema.Set); ok && v.Len() > 0 { - out.StepAdjustments, _ = expandStepAdjustments(v.List()) + + if v, ok := tfMap["step_adjustment"].(*schema.Set); ok && v.Len() > 0 { + apiObject.StepAdjustments, _ = expandStepAdjustments(v.List()) } - return out + return apiObject } func flattenStepScalingPolicyConfiguration(cfg *awstypes.StepScalingPolicyConfiguration) []any { From 42f0f810e480d7f77358c2575ae581aa9d2ec089 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Thu, 4 Sep 2025 16:42:32 -0400 Subject: [PATCH 1389/2115] Use 'nullable.TypeNullableFloat'. --- internal/service/appautoscaling/policy.go | 137 ++++++++-------------- 1 file changed, 52 insertions(+), 85 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index cc50ea084d36..abdd87d2a9f3 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -5,10 +5,8 @@ package appautoscaling import ( "context" - "errors" "fmt" "log" - "strconv" "strings" "github.com/aws/aws-sdk-go-v2/aws" @@ -21,6 +19,8 @@ import ( "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/sdkv2/types/nullable" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -105,12 +105,14 @@ func resourcePolicy() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "metric_interval_lower_bound": { - Type: schema.TypeString, - Optional: true, + Type: nullable.TypeNullableFloat, + Optional: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, "metric_interval_upper_bound": { - Type: schema.TypeString, - Optional: true, + Type: nullable.TypeNullableFloat, + Optional: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, "scaling_adjustment": { Type: schema.TypeInt, @@ -549,52 +551,31 @@ func expandTargetTrackingScalingPolicyConfiguration(tfList []any) *awstypes.Targ return apiObject } -// Takes the result of flatmap.Expand for an array of step adjustments and -// returns a []*awstypes.StepAdjustment. -func expandStepAdjustments(configured []any) ([]awstypes.StepAdjustment, error) { - var adjustments []awstypes.StepAdjustment - - // Loop over our configured step adjustments and create an array - // of aws-sdk-go compatible objects. We're forced to convert strings - // to floats here because there's no way to detect whether or not - // an uninitialized, optional schema element is "0.0" deliberately. - // With strings, we can test for "", which is definitely an empty - // struct value. - for _, raw := range configured { - data := raw.(map[string]any) - a := awstypes.StepAdjustment{ - ScalingAdjustment: aws.Int32(int32(data["scaling_adjustment"].(int))), +func expandStepAdjustments(tfList []any) []awstypes.StepAdjustment { + var apiObjects []awstypes.StepAdjustment + + for _, tfMapRaw := range tfList { + tfMap := tfMapRaw.(map[string]any) + apiObject := awstypes.StepAdjustment{ + ScalingAdjustment: aws.Int32(int32(tfMap["scaling_adjustment"].(int))), } - if data["metric_interval_lower_bound"] != "" { - bound := data["metric_interval_lower_bound"] - switch bound := bound.(type) { - case string: - f, err := strconv.ParseFloat(bound, 64) - if err != nil { - return nil, errors.New("metric_interval_lower_bound must be a float value represented as a string") - } - a.MetricIntervalLowerBound = aws.Float64(f) - default: - return nil, errors.New("metric_interval_lower_bound isn't a string") + + if v, ok := tfMap["metric_interval_lower_bound"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + apiObject.MetricIntervalLowerBound = aws.Float64(v) } } - if data["metric_interval_upper_bound"] != "" { - bound := data["metric_interval_upper_bound"] - switch bound := bound.(type) { - case string: - f, err := strconv.ParseFloat(bound, 64) - if err != nil { - return nil, errors.New("metric_interval_upper_bound must be a float value represented as a string") - } - a.MetricIntervalUpperBound = aws.Float64(f) - default: - return nil, errors.New("metric_interval_upper_bound isn't a string") + + if v, ok := tfMap["metric_interval_upper_bound"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + apiObject.MetricIntervalUpperBound = aws.Float64(v) } } - adjustments = append(adjustments, a) + + apiObjects = append(apiObjects, apiObject) } - return adjustments, nil + return apiObjects } func expandCustomizedMetricSpecification(configured []any) *awstypes.CustomizedMetricSpecification { @@ -733,72 +714,58 @@ func expandStepScalingPolicyConfiguration(tfList []any) *awstypes.StepScalingPol } if v, ok := tfMap["step_adjustment"].(*schema.Set); ok && v.Len() > 0 { - apiObject.StepAdjustments, _ = expandStepAdjustments(v.List()) + apiObject.StepAdjustments = expandStepAdjustments(v.List()) } return apiObject } -func flattenStepScalingPolicyConfiguration(cfg *awstypes.StepScalingPolicyConfiguration) []any { - if cfg == nil { +func flattenStepScalingPolicyConfiguration(apiObject *awstypes.StepScalingPolicyConfiguration) []any { + if apiObject == nil { return []any{} } - m := make(map[string]any) + tfMap := make(map[string]any) - m["adjustment_type"] = string(cfg.AdjustmentType) + tfMap["adjustment_type"] = string(apiObject.AdjustmentType) - if cfg.Cooldown != nil { - m["cooldown"] = aws.ToInt32(cfg.Cooldown) + if apiObject.Cooldown != nil { + tfMap["cooldown"] = aws.ToInt32(apiObject.Cooldown) } - m["metric_aggregation_type"] = string(cfg.MetricAggregationType) + tfMap["metric_aggregation_type"] = string(apiObject.MetricAggregationType) - if cfg.MinAdjustmentMagnitude != nil { - m["min_adjustment_magnitude"] = aws.ToInt32(cfg.MinAdjustmentMagnitude) + if apiObject.MinAdjustmentMagnitude != nil { + tfMap["min_adjustment_magnitude"] = aws.ToInt32(apiObject.MinAdjustmentMagnitude) } - if cfg.StepAdjustments != nil { - stepAdjustmentsResource := &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_interval_lower_bound": { - Type: schema.TypeString, - Optional: true, - }, - "metric_interval_upper_bound": { - Type: schema.TypeString, - Optional: true, - }, - "scaling_adjustment": { - Type: schema.TypeInt, - Required: true, - }, - }, - } - m["step_adjustment"] = schema.NewSet(schema.HashResource(stepAdjustmentsResource), flattenStepAdjustments(cfg.StepAdjustments)) + + if apiObject.StepAdjustments != nil { + tfMap["step_adjustment"] = flattenStepAdjustments(apiObject.StepAdjustments) } - return []any{m} + return []any{tfMap} } -func flattenStepAdjustments(adjs []awstypes.StepAdjustment) []any { - out := make([]any, len(adjs)) +func flattenStepAdjustments(apiObjects []awstypes.StepAdjustment) []any { + tfList := make([]any, len(apiObjects)) - for i, adj := range adjs { - m := make(map[string]any) + for i, apiObject := range apiObjects { + tfMap := make(map[string]any) - m["scaling_adjustment"] = int(aws.ToInt32(adj.ScalingAdjustment)) + tfMap["scaling_adjustment"] = aws.ToInt32(apiObject.ScalingAdjustment) - if adj.MetricIntervalLowerBound != nil { - m["metric_interval_lower_bound"] = fmt.Sprintf("%g", aws.ToFloat64(adj.MetricIntervalLowerBound)) + if apiObject.MetricIntervalLowerBound != nil { + tfMap["metric_interval_lower_bound"] = flex.Float64ToStringValue(apiObject.MetricIntervalLowerBound) } - if adj.MetricIntervalUpperBound != nil { - m["metric_interval_upper_bound"] = fmt.Sprintf("%g", aws.ToFloat64(adj.MetricIntervalUpperBound)) + + if apiObject.MetricIntervalUpperBound != nil { + tfMap["metric_interval_upper_bound"] = flex.Float64ToStringValue(apiObject.MetricIntervalUpperBound) } - out[i] = m + tfList[i] = tfMap } - return out + return tfList } func flattenTargetTrackingScalingPolicyConfiguration(cfg *awstypes.TargetTrackingScalingPolicyConfiguration) []any { From d6fcf29af36ad187179d858b97f9388ddeb403d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 09:41:50 -0400 Subject: [PATCH 1390/2115] Tweak CHANGELOG entry. --- .changelog/44143.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44143.txt b/.changelog/44143.txt index b16554b767ab..4d72412691a2 100644 --- a/.changelog/44143.txt +++ b/.changelog/44143.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_rds_cluster_role_association: Change `feature_name` argument from required to optional +resource/aws_rds_cluster_role_association: Make `feature_name` optional ``` From 7e086010751461083b72c63a32e5890a84e2d5b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 09:44:19 -0400 Subject: [PATCH 1391/2115] r/aws_rds_cluster_role_association: Only send 'feature_name' if it's configured. --- internal/service/rds/cluster_role_association.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/service/rds/cluster_role_association.go b/internal/service/rds/cluster_role_association.go index cce0c9620fc4..883416c3e982 100644 --- a/internal/service/rds/cluster_role_association.go +++ b/internal/service/rds/cluster_role_association.go @@ -72,10 +72,13 @@ func resourceClusterRoleAssociationCreate(ctx context.Context, d *schema.Resourc id := clusterRoleAssociationCreateResourceID(dbClusterID, roleARN) input := rds.AddRoleToDBClusterInput{ DBClusterIdentifier: aws.String(dbClusterID), - FeatureName: aws.String(d.Get("feature_name").(string)), RoleArn: aws.String(roleARN), } + if v, ok := d.GetOk("feature_name"); ok { + input.FeatureName = aws.String(v.(string)) + } + _, err := tfresource.RetryWhenIsA[any, *types.InvalidDBClusterStateFault](ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) (any, error) { return conn.AddRoleToDBCluster(ctx, &input) }) From e48613bea7f3ff4d48e46fa939bb660dd0a47207 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 22:58:29 +0900 Subject: [PATCH 1392/2115] Use transformer for cmp.Diff to sort in comparison --- internal/json/patch_test.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go index 57830f900318..b13fc63a8efc 100644 --- a/internal/json/patch_test.go +++ b/internal/json/patch_test.go @@ -4,6 +4,7 @@ package json_test import ( + "sort" "testing" "github.com/google/go-cmp/cmp" @@ -76,7 +77,19 @@ func TestCreatePatchFromStrings(t *testing.T) { t.Errorf("CreatePatchFromStrings(%s, %s) err %t, want %t", testCase.a, testCase.b, got, want) } if err == nil { - if diff := cmp.Diff(got, testCase.wantPatch); diff != "" { + sortTransformer := cmp.Transformer("SortPatchOps", func(ops []mattbairdjsonpatch.JsonPatchOperation) []mattbairdjsonpatch.JsonPatchOperation { + sorted := make([]mattbairdjsonpatch.JsonPatchOperation, len(ops)) + copy(sorted, ops) + sort.Slice(sorted, func(i, j int) bool { + if sorted[i].Operation != sorted[j].Operation { + return sorted[i].Operation < sorted[j].Operation + } + return sorted[i].Path < sorted[j].Path + }) + return sorted + }) + + if diff := cmp.Diff(got, testCase.wantPatch, sortTransformer); diff != "" { t.Errorf("unexpected diff (+wanted, -got): %s", diff) } } From 399cebe398acde472b1b0316ee5a5c85906d3c34 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 10:06:30 -0400 Subject: [PATCH 1393/2115] d/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region. --- .changelog/#####.txt | 4 ++++ internal/service/s3/hosted_zones.go | 1 + 2 files changed, 5 insertions(+) diff --git a/.changelog/#####.txt b/.changelog/#####.txt index 0edecc348e50..548444d0e8b4 100644 --- a/.changelog/#####.txt +++ b/.changelog/#####.txt @@ -8,4 +8,8 @@ data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS ```release-note:enhancement data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions +``` + +```release-note:enhancement +data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ``` \ No newline at end of file diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 89b67229d64a..8d744355993d 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -24,6 +24,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV", endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO", endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", + endpoints.ApSoutheast6RegionID: "Z05686083R66JX5C163TC", endpoints.ApSoutheast7RegionID: "Z0031014GXUMRZG6I14G", endpoints.CaCentral1RegionID: "Z1QDHH18159H29", endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL", From 1b55a6bebf0c7fc23df314642017dbc3ff1305b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 10:07:06 -0400 Subject: [PATCH 1394/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44132.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44132.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44132.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44132.txt From 1b2e7e15aaa73b5699661165e4ab557cf01f3a1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:07:32 -0400 Subject: [PATCH 1395/2115] Bump the aws-sdk-go-v2 group across 1 directory with 6 updates (#44152) * Bump the aws-sdk-go-v2 group across 1 directory with 6 updates Bumps the aws-sdk-go-v2 group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/cleanrooms](https://github.com/aws/aws-sdk-go-v2) | `1.32.0` | `1.33.0` | | [github.com/aws/aws-sdk-go-v2/service/cloudformation](https://github.com/aws/aws-sdk-go-v2) | `1.65.2` | `1.66.0` | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.250.0` | `1.251.0` | | [github.com/aws/aws-sdk-go-v2/service/opensearchserverless](https://github.com/aws/aws-sdk-go-v2) | `1.25.2` | `1.26.0` | | [github.com/aws/aws-sdk-go-v2/service/rds](https://github.com/aws/aws-sdk-go-v2) | `1.105.0` | `1.106.0` | | [github.com/aws/aws-sdk-go-v2/service/verifiedpermissions](https://github.com/aws/aws-sdk-go-v2) | `1.28.3` | `1.29.0` | Updates `github.com/aws/aws-sdk-go-v2/service/cleanrooms` from 1.32.0 to 1.33.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.32.0...v1.33.0) Updates `github.com/aws/aws-sdk-go-v2/service/cloudformation` from 1.65.2 to 1.66.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.65.2...service/s3/v1.66.0) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.250.0 to 1.251.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.250.0...service/ec2/v1.251.0) Updates `github.com/aws/aws-sdk-go-v2/service/opensearchserverless` from 1.25.2 to 1.26.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.25.2...v1.26.0) Updates `github.com/aws/aws-sdk-go-v2/service/rds` from 1.105.0 to 1.106.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ec2/v1.106.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ec2/v1.105.0...service/ec2/v1.106.0) Updates `github.com/aws/aws-sdk-go-v2/service/verifiedpermissions` from 1.28.3 to 1.29.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.28.3...v1.29.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.66.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.251.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearchserverless dependency-version: 1.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.106.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/verifiedpermissions dependency-version: 1.29.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ tools/tfsdk2fw/go.mod | 12 ++++++------ tools/tfsdk2fw/go.sum | 24 ++++++++++++------------ 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/go.mod b/go.mod index fddf9998dce3..9868d77f7711 100644 --- a/go.mod +++ b/go.mod @@ -52,10 +52,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 @@ -187,7 +187,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 - github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 @@ -261,7 +261,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 diff --git a/go.sum b/go.sum index f742b97bbafe..042b3d2dcb21 100644 --- a/go.sum +++ b/go.sum @@ -115,14 +115,14 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4b github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 h1:yDZarlgst5B+n3rXKlJPgKeGJfOG8p+K71t4A8N4DrI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGi github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 h1:aosVpDecA17GN0AmQRq/Ui3fEt5iQ3Y2QUCIyza6e7s= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= @@ -395,8 +395,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1McsL8kbGpDZcTAYAzkeeGJrVI78eUX+2sj0= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayP github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 h1:3syjHziAKP9cQBLKcABUTKqwb/y6oa0KfVeluIc69Ug= -github.com/aws/aws-sdk-go-v2/service/rds v1.105.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= @@ -545,8 +545,8 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2M github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 h1:YHkBeqmOTk9JaOXj5aBmv5osRkyR+GNGagoEM98bk90= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 14a5af123b49..857cb8fa4d41 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -64,10 +64,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 // indirect github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 // indirect github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 // indirect github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 // indirect @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 // indirect github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 // indirect github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 // indirect @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 // indirect github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 // indirect github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 // indirect github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 // indirect github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 // indirect @@ -221,7 +221,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 // indirect github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 // indirect @@ -279,7 +279,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 // indirect github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 // indirect github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 // indirect github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 // indirect github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 53e912cd24a5..0bddcb89ebc8 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -115,14 +115,14 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4b github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0 h1:yDZarlgst5B+n3rXKlJPgKeGJfOG8p+K71t4A8N4DrI= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.32.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2 h1:ACR184wcab0r+cS43gE8cwXCp3AtzsCZKTylzSuJW/k= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.65.2/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGi github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0 h1:aosVpDecA17GN0AmQRq/Ui3fEt5iQ3Y2QUCIyza6e7s= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.250.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= @@ -395,8 +395,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2 h1:Bz1SUFF1McsL8kbGpDZcTAYAzkeeGJrVI78eUX+2sj0= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.25.2/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayP github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.105.0 h1:3syjHziAKP9cQBLKcABUTKqwb/y6oa0KfVeluIc69Ug= -github.com/aws/aws-sdk-go-v2/service/rds v1.105.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= @@ -545,8 +545,8 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2M github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3 h1:YHkBeqmOTk9JaOXj5aBmv5osRkyR+GNGagoEM98bk90= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.28.3/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= From 9f49ee51b9e2cff7f43b3bf193783008e8ab3bce Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 23:22:38 +0900 Subject: [PATCH 1396/2115] Use slices.Sort insted of sort.Slice --- internal/json/patch_test.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go index b13fc63a8efc..adafeaed66b2 100644 --- a/internal/json/patch_test.go +++ b/internal/json/patch_test.go @@ -4,7 +4,7 @@ package json_test import ( - "sort" + "slices" "testing" "github.com/google/go-cmp/cmp" @@ -80,11 +80,20 @@ func TestCreatePatchFromStrings(t *testing.T) { sortTransformer := cmp.Transformer("SortPatchOps", func(ops []mattbairdjsonpatch.JsonPatchOperation) []mattbairdjsonpatch.JsonPatchOperation { sorted := make([]mattbairdjsonpatch.JsonPatchOperation, len(ops)) copy(sorted, ops) - sort.Slice(sorted, func(i, j int) bool { - if sorted[i].Operation != sorted[j].Operation { - return sorted[i].Operation < sorted[j].Operation + slices.SortFunc(sorted, func(a, b mattbairdjsonpatch.JsonPatchOperation) int { + if a.Operation != b.Operation { + if a.Operation < b.Operation { + return -1 + } + return 1 } - return sorted[i].Path < sorted[j].Path + if a.Path < b.Path { + return -1 + } + if a.Path > b.Path { + return 1 + } + return 0 }) return sorted }) From a44d3d31c2c8f400787bb9f0eaa87c81418f9864 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:22:39 -0400 Subject: [PATCH 1397/2115] Bump actions/labeler from 5.0.0 to 6.0.1 (#44151) Bumps [actions/labeler](https://github.com/actions/labeler) from 5.0.0 to 6.0.1. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](https://github.com/actions/labeler/compare/8558fd74291d67161a8a78ce36a881fa63b766a9...634933edcd8ababfe52f92936142cc22ac488b1b) --- updated-dependencies: - dependency-name: actions/labeler dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/triage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index fbe0d380e792..4c4e6b4e15ff 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -50,7 +50,7 @@ jobs: - name: Apply Pull Request Service Labels if: github.event_name == 'pull_request_target' - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1 with: configuration-path: .github/labeler-pr-triage.yml repo-token: ${{ secrets.GITHUB_TOKEN }} From 3c3210bc72c112707237012b16445727b2b4542d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:22:51 -0400 Subject: [PATCH 1398/2115] Bump actions/stale from 9.1.0 to 10.0.0 (#44136) Bumps [actions/stale](https://github.com/actions/stale) from 9.1.0 to 10.0.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/5bef64f19d7facfb25b37b414482c7164d639639...3a9db7e6a41a89f618792c92c0e97cc736e1b13f) --- updated-dependencies: - dependency-name: actions/stale dependency-version: 10.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 632dee7007b2..7c86fc0a099e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0 + - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 720 From 1624125f89d732f82e9c5385e4b5bdbd955c6b9e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 10:23:04 -0400 Subject: [PATCH 1399/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - datapipeline. --- internal/service/datapipeline/pipeline.go | 8 ++++---- .../service/datapipeline/pipeline_definition.go | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/internal/service/datapipeline/pipeline.go b/internal/service/datapipeline/pipeline.go index 8b49b84ff45d..938806efa8bc 100644 --- a/internal/service/datapipeline/pipeline.go +++ b/internal/service/datapipeline/pipeline.go @@ -14,12 +14,12 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/datapipeline/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -159,14 +159,14 @@ func waitForDeletion(ctx context.Context, conn *datapipeline.Client, pipelineID params := &datapipeline.DescribePipelinesInput{ PipelineIds: []string{pipelineID}, } - return retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError { + return tfresource.Retry(ctx, 10*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DescribePipelines(ctx, params) if errs.IsA[*awstypes.PipelineNotFoundException](err) || errs.IsA[*awstypes.PipelineDeletedException](err) { return nil } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("DataPipeline (%s) still exists", pipelineID)) + return tfresource.RetryableError(fmt.Errorf("DataPipeline (%s) still exists", pipelineID)) }) } diff --git a/internal/service/datapipeline/pipeline_definition.go b/internal/service/datapipeline/pipeline_definition.go index dc4a418e323f..45e8b283efb4 100644 --- a/internal/service/datapipeline/pipeline_definition.go +++ b/internal/service/datapipeline/pipeline_definition.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/datapipeline" awstypes "github.com/aws/aws-sdk-go-v2/service/datapipeline/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" @@ -156,29 +155,25 @@ func resourcePipelineDefinitionPut(ctx context.Context, d *schema.ResourceData, var err error var output *datapipeline.PutPipelineDefinitionOutput - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { output, err = conn.PutPipelineDefinition(ctx, input) if err != nil { if errs.IsA[*awstypes.InternalServiceError](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if output.Errored { errors := getValidationError(output.ValidationErrors) if strings.Contains(errors.Error(), names.AttrRole) { - return retry.RetryableError(fmt.Errorf("validating after creation DataPipeline Pipeline Definition (%s): %w", pipelineID, errors)) + return tfresource.RetryableError(fmt.Errorf("validating after creation DataPipeline Pipeline Definition (%s): %w", pipelineID, errors)) } } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.PutPipelineDefinition(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating DataPipeline Pipeline Definition (%s): %s", pipelineID, err) } From bfc2595f6000787e9e507272a9bcd3e96ab0b10f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 10:23:04 -0400 Subject: [PATCH 1400/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - datasync. --- internal/service/datasync/agent.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/internal/service/datasync/agent.go b/internal/service/datasync/agent.go index df36b7dff3e5..1bbddce66c6d 100644 --- a/internal/service/datasync/agent.go +++ b/internal/service/datasync/agent.go @@ -131,34 +131,34 @@ func resourceAgentCreate(ctx context.Context, d *schema.ResourceData, meta any) } var response *http.Response - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { response, err = client.Do(request) if errs.IsA[net.Error](err) { - return retry.RetryableError(fmt.Errorf("making HTTP request: %w", err)) + return tfresource.RetryableError(fmt.Errorf("making HTTP request: %w", err)) } if err != nil { - return retry.NonRetryableError(fmt.Errorf("making HTTP request: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("making HTTP request: %w", err)) } if response == nil { - return retry.NonRetryableError(fmt.Errorf("no response for activation key request")) + return tfresource.NonRetryableError(fmt.Errorf("no response for activation key request")) } log.Printf("[DEBUG] Received HTTP response: %#v", response) if expected := http.StatusFound; expected != response.StatusCode { - return retry.NonRetryableError(fmt.Errorf("expected HTTP status code %d, received: %d", expected, response.StatusCode)) + return tfresource.NonRetryableError(fmt.Errorf("expected HTTP status code %d, received: %d", expected, response.StatusCode)) } redirectURL, err := response.Location() if err != nil { - return retry.NonRetryableError(fmt.Errorf("extracting HTTP Location header: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("extracting HTTP Location header: %w", err)) } if errorType := redirectURL.Query().Get("errorType"); errorType == "PRIVATE_LINK_ENDPOINT_UNREACHABLE" { errMessage := fmt.Errorf("during activation: %s", errorType) - return retry.RetryableError(errMessage) + return tfresource.RetryableError(errMessage) } activationKey = redirectURL.Query().Get("activationKey") @@ -166,10 +166,6 @@ func resourceAgentCreate(ctx context.Context, d *schema.ResourceData, meta any) return nil }) - if tfresource.TimedOut(err) { - return sdkdiag.AppendErrorf(diags, "timeout retrieving activation key from IP Address (%s): %s", agentIpAddress, err) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "retrieving activation key from IP Address (%s): %s", agentIpAddress, err) } From 65acd1ea98683b9c23a57c0c26002784353afa0a Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 23:34:05 +0900 Subject: [PATCH 1401/2115] refactor: use cmp.Or and cmp.Compare --- internal/json/patch_test.go | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/internal/json/patch_test.go b/internal/json/patch_test.go index adafeaed66b2..e0c736a94f2e 100644 --- a/internal/json/patch_test.go +++ b/internal/json/patch_test.go @@ -4,10 +4,11 @@ package json_test import ( + "cmp" "slices" "testing" - "github.com/google/go-cmp/cmp" + gocmp "github.com/google/go-cmp/cmp" tfjson "github.com/hashicorp/terraform-provider-aws/internal/json" mattbairdjsonpatch "github.com/mattbaird/jsonpatch" ) @@ -73,32 +74,20 @@ func TestCreatePatchFromStrings(t *testing.T) { t.Parallel() got, err := tfjson.CreatePatchFromStrings(testCase.a, testCase.b) - if got, want := err != nil, testCase.wantErr; !cmp.Equal(got, want) { + if got, want := err != nil, testCase.wantErr; !gocmp.Equal(got, want) { t.Errorf("CreatePatchFromStrings(%s, %s) err %t, want %t", testCase.a, testCase.b, got, want) } if err == nil { - sortTransformer := cmp.Transformer("SortPatchOps", func(ops []mattbairdjsonpatch.JsonPatchOperation) []mattbairdjsonpatch.JsonPatchOperation { + sortTransformer := gocmp.Transformer("SortPatchOps", func(ops []mattbairdjsonpatch.JsonPatchOperation) []mattbairdjsonpatch.JsonPatchOperation { sorted := make([]mattbairdjsonpatch.JsonPatchOperation, len(ops)) copy(sorted, ops) slices.SortFunc(sorted, func(a, b mattbairdjsonpatch.JsonPatchOperation) int { - if a.Operation != b.Operation { - if a.Operation < b.Operation { - return -1 - } - return 1 - } - if a.Path < b.Path { - return -1 - } - if a.Path > b.Path { - return 1 - } - return 0 + return cmp.Or(cmp.Compare(a.Operation, b.Operation), cmp.Compare(a.Path, b.Path)) }) return sorted }) - if diff := cmp.Diff(got, testCase.wantPatch, sortTransformer); diff != "" { + if diff := gocmp.Diff(got, testCase.wantPatch, sortTransformer); diff != "" { t.Errorf("unexpected diff (+wanted, -got): %s", diff) } } From 7f6ff14bca3631079ffe83971e76abac30cf7ac7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 10:38:48 -0400 Subject: [PATCH 1402/2115] Bump actions/setup-go from 5.5.0 to 6.0.0 (#44139) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.5.0 to 6.0.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/d35c59abb061a4a6fb18e82ac0862c26744d6ab5...44694675825211faa026b3c33043df3e48a5fa00) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../acctest-terraform-embedded-lint.yml | 4 ++-- .github/workflows/acctest-terraform-lint.yml | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/changelog_misspell.yml | 2 +- .github/workflows/copyright.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/documentation.yml | 2 +- .github/workflows/examples.yml | 4 ++-- .github/workflows/generate_changelog.yml | 2 +- .github/workflows/golangci-lint.yml | 10 +++++----- .github/workflows/modern_go.yml | 2 +- .github/workflows/provider.yml | 16 ++++++++-------- .github/workflows/providerlint.yml | 2 +- .github/workflows/pull_request_target.yml | 2 +- .github/workflows/skaff.yml | 2 +- .github/workflows/smarterr.yml | 2 +- .github/workflows/website.yml | 6 +++--- .github/workflows/workflow-lint.yml | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/acctest-terraform-embedded-lint.yml b/.github/workflows/acctest-terraform-embedded-lint.yml index ccc3ece16b63..c17815f69856 100644 --- a/.github/workflows/acctest-terraform-embedded-lint.yml +++ b/.github/workflows/acctest-terraform-embedded-lint.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -52,7 +52,7 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/acctest-terraform-lint.yml b/.github/workflows/acctest-terraform-lint.yml index 076541dd38e9..2391fa67c039 100644 --- a/.github/workflows/acctest-terraform-lint.yml +++ b/.github/workflows/acctest-terraform-lint.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -42,7 +42,7 @@ jobs: steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e6b2532679b..55f5de20ccd7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: go-version: ${{ steps.get-go-version.outputs.go-version }} steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: 'go.mod' - name: Detect Go version diff --git a/.github/workflows/changelog_misspell.yml b/.github/workflows/changelog_misspell.yml index 83704d35c548..e6e5e50fbe53 100644 --- a/.github/workflows/changelog_misspell.yml +++ b/.github/workflows/changelog_misspell.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml index fdb1a58cc9d9..efaef89efd7a 100644 --- a/.github/workflows/copyright.yml +++ b/.github/workflows/copyright.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 7bea3f72e464..159053a92a31 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -41,7 +41,7 @@ jobs: with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - name: go env diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 359ff8babc5a..5a7f3e4b377e 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 16aabd1644f9..5579726237e9 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -31,7 +31,7 @@ jobs: with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }} - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod @@ -68,7 +68,7 @@ jobs: with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }} - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - name: go build diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml index ef6dd34034fe..09b4be9378ee 100644 --- a/.github/workflows/generate_changelog.yml +++ b/.github/workflows/generate_changelog.yml @@ -17,7 +17,7 @@ jobs: with: fetch-depth: 0 token: ${{ steps.app-token.outputs.token }} - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: .ci/tools/go.mod - run: cd .ci/tools && go install github.com/hashicorp/go-changelog/cmd/changelog-build diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 6e386cc9f46c..5bde7fe2e537 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -28,7 +28,7 @@ jobs: runs-on: custom-ubuntu-22.04-large steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod cache: false @@ -51,7 +51,7 @@ jobs: runs-on: custom-ubuntu-22.04-xl steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod cache: false @@ -79,7 +79,7 @@ jobs: runs-on: custom-ubuntu-22.04-xl steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod cache: false @@ -107,7 +107,7 @@ jobs: runs-on: custom-ubuntu-22.04-xl steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod cache: false @@ -135,7 +135,7 @@ jobs: runs-on: custom-ubuntu-22.04-xl steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod cache: false diff --git a/.github/workflows/modern_go.yml b/.github/workflows/modern_go.yml index 2037bb984776..46bd17d9400b 100644 --- a/.github/workflows/modern_go.yml +++ b/.github/workflows/modern_go.yml @@ -22,7 +22,7 @@ jobs: runs-on: custom-ubuntu-22.04-medium steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 diff --git a/.github/workflows/provider.yml b/.github/workflows/provider.yml index 6dfb8416cc60..bcb77747d5c9 100644 --- a/.github/workflows/provider.yml +++ b/.github/workflows/provider.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -65,7 +65,7 @@ jobs: path: terraform-plugin-dir key: ${{ runner.os }}-terraform-plugin-dir-${{ hashFiles('go.sum') }}-${{ hashFiles('internal/**') }} - if: steps.cache-terraform-plugin-dir.outputs.cache-hit != 'true' || steps.cache-terraform-plugin-dir.outcome == 'failure' - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 @@ -93,7 +93,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 @@ -128,7 +128,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 @@ -188,7 +188,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 @@ -279,7 +279,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd @@ -316,7 +316,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/providerlint.yml b/.github/workflows/providerlint.yml index 6cd160ee96a4..65ac3a25ad8b 100644 --- a/.github/workflows/providerlint.yml +++ b/.github/workflows/providerlint.yml @@ -24,7 +24,7 @@ jobs: runs-on: custom-ubuntu-22.04-medium steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - name: go env diff --git a/.github/workflows/pull_request_target.yml b/.github/workflows/pull_request_target.yml index 7648db878b6f..60ea4436cbff 100644 --- a/.github/workflows/pull_request_target.yml +++ b/.github/workflows/pull_request_target.yml @@ -33,7 +33,7 @@ jobs: with: fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod - name: go env diff --git a/.github/workflows/skaff.yml b/.github/workflows/skaff.yml index 990c86eb720b..2b95c6580d31 100644 --- a/.github/workflows/skaff.yml +++ b/.github/workflows/skaff.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: skaff/go.mod # See also: https://github.com/actions/setup-go/issues/54 diff --git a/.github/workflows/smarterr.yml b/.github/workflows/smarterr.yml index f552489feaf7..5634d7b4a26f 100644 --- a/.github/workflows/smarterr.yml +++ b/.github/workflows/smarterr.yml @@ -22,7 +22,7 @@ jobs: runs-on: custom-ubuntu-22.04-medium steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: go.mod # See also: https://github.com/actions/setup-go/issues/54 diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 74c12b1de310..de31e4441eec 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: .ci/tools/go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -103,7 +103,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: .ci/tools/go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 @@ -121,7 +121,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: .ci/tools/go.mod - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4 diff --git a/.github/workflows/workflow-lint.yml b/.github/workflows/workflow-lint.yml index 6b11aea1651b..0e2da7e9cad8 100644 --- a/.github/workflows/workflow-lint.yml +++ b/.github/workflows/workflow-lint.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 + - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0 with: go-version-file: .ci/tools/go.mod - name: Install actionlint From 1dbc41176e16d7ff6ad29cee311aeaeceb5117ca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 10:50:48 -0400 Subject: [PATCH 1403/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - dax. --- internal/service/dax/cluster.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/internal/service/dax/cluster.go b/internal/service/dax/cluster.go index 65c1893f9110..cf1de688f9bb 100644 --- a/internal/service/dax/cluster.go +++ b/internal/service/dax/cluster.go @@ -259,21 +259,18 @@ func resourceClusterCreate(ctx context.Context, d *schema.ResourceData, meta any // IAM roles take some time to propagate var resp *dax.CreateClusterOutput - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error resp, err = conn.CreateCluster(ctx, input) if errs.IsA[*awstypes.InvalidParameterValueException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - resp, err = conn.CreateCluster(ctx, input) - } if err != nil { return sdkdiag.AppendErrorf(diags, "creating DAX cluster: %s", err) } @@ -498,23 +495,19 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any req := &dax.DeleteClusterInput{ ClusterName: aws.String(d.Id()), } - err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteCluster(ctx, req) if errs.IsA[*awstypes.InvalidClusterStateFault](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteCluster(ctx, req) - } - if errs.IsA[*awstypes.ClusterNotFoundFault](err) { return diags } From 974d89f7fb446fcc5a5c53cd4da461a07865e8c4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:05:36 -0400 Subject: [PATCH 1404/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - dynamodb.aws_dynamodb_table, dynamodb.aws_dynamodb_table_replica. --- internal/service/dynamodb/table.go | 79 ++++++++-------------- internal/service/dynamodb/table_replica.go | 43 ++++-------- 2 files changed, 44 insertions(+), 78 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index b221d4ef9c06..a97e934b2071 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -21,7 +21,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -1436,31 +1435,27 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string MultiRegionConsistency: mrscInput, } - err := retry.RetryContext(ctx, max(replicaUpdateTimeout, timeout), func() *retry.RetryError { + err := tfresource.Retry(ctx, max(replicaUpdateTimeout, timeout), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input) if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created.") { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if tfawserr.ErrMessageContains(err, errCodeValidationException, "Replica specified in the Replica Update or Replica Delete action of the request was not found") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input) - } - if err != nil { return err } @@ -1533,31 +1528,27 @@ func createReplicas(ctx context.Context, conn *dynamodb.Client, tableName string } } - err := retry.RetryContext(ctx, max(replicaUpdateTimeout, timeout), func() *retry.RetryError { + err := tfresource.Retry(ctx, max(replicaUpdateTimeout, timeout), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input) if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created, updated, or deleted simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if tfawserr.ErrMessageContains(err, errCodeValidationException, "Replica specified in the Replica Update or Replica Delete action of the request was not found") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input) - } - // An update that doesn't (makes no changes) returns ValidationException // (same region_name and kms_key_arn as currently) throws unhelpfully worded exception: // ValidationException: One or more parameter values were invalid: KMSMasterKeyId must be specified for each replica. @@ -1667,22 +1658,18 @@ func updatePITR(ctx context.Context, conn *dynamodb.Client, tableName string, en optFn := func(o *dynamodb.Options) { o.Region = region } - err := retry.RetryContext(ctx, updateTableContinuousBackupsTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, updateTableContinuousBackupsTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateContinuousBackups(ctx, input, optFn) if err != nil { // Backups are still being enabled for this newly created table if errs.IsAErrorMessageContains[*awstypes.ContinuousBackupsUnavailableException](err, "Backups are being enabled") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateContinuousBackups(ctx, input, optFn) - } - if err != nil { return fmt.Errorf("updating PITR: %w", err) } @@ -2043,36 +2030,32 @@ func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string TableName: aws.String(tableName), ReplicaUpdates: replicaDeletes, } - err := retry.RetryContext(ctx, updateTableTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, updateTableTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input) notFoundRetries := 0 if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { notFoundRetries++ if notFoundRetries > 3 { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created, updated, or deleted simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input) - } - if err != nil && !errs.IsA[*awstypes.ResourceNotFoundException](err) { return fmt.Errorf("deleting replica(s): %w", err) } @@ -2118,36 +2101,32 @@ func deleteReplicas(ctx context.Context, conn *dynamodb.Client, tableName string }, } - err := retry.RetryContext(ctx, updateTableTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, updateTableTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input) notFoundRetries := 0 if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { notFoundRetries++ if notFoundRetries > 3 { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created, updated, or deleted simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input) - } - if err != nil && !errs.IsA[*awstypes.ResourceNotFoundException](err) { return fmt.Errorf("deleting replica (%s): %w", regionName, err) } diff --git a/internal/service/dynamodb/table_replica.go b/internal/service/dynamodb/table_replica.go index 05ff1460aa2d..a14bb59cffef 100644 --- a/internal/service/dynamodb/table_replica.go +++ b/internal/service/dynamodb/table_replica.go @@ -17,7 +17,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" "github.com/hashicorp/aws-sdk-go-base/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/create" @@ -142,28 +141,24 @@ func resourceTableReplicaCreate(ctx context.Context, d *schema.ResourceData, met }}, } - err = retry.RetryContext(ctx, max(replicaUpdateTimeout, d.Timeout(schema.TimeoutCreate)), func() *retry.RetryError { + err = tfresource.Retry(ctx, max(replicaUpdateTimeout, d.Timeout(schema.TimeoutCreate)), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input, optFn) if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input, optFn) - } - if err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, resNameTableReplica, d.Get("global_table_arn").(string), err) } @@ -358,28 +353,24 @@ func resourceTableReplicaUpdate(ctx context.Context, d *schema.ResourceData, met TableName: aws.String(tableName), } - err := retry.RetryContext(ctx, max(replicaUpdateTimeout, d.Timeout(schema.TimeoutUpdate)), func() *retry.RetryError { + err := tfresource.Retry(ctx, max(replicaUpdateTimeout, d.Timeout(schema.TimeoutUpdate)), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input, optFn) if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created, updated, or deleted simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input, optFn) - } - if err != nil && !tfawserr.ErrMessageContains(err, errCodeValidationException, "no actions specified") { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTableReplica, d.Id(), err) } @@ -450,28 +441,24 @@ func resourceTableReplicaDelete(ctx context.Context, d *schema.ResourceData, met }, } - err = retry.RetryContext(ctx, updateTableTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, updateTableTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTable(ctx, input, optFn) if err != nil { if tfawserr.ErrCodeEquals(err, errCodeThrottlingException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.LimitExceededException](err, "can be created, updated, or deleted simultaneously") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTable(ctx, input, optFn) - } - if tfawserr.ErrMessageContains(err, errCodeValidationException, "Replica specified in the Replica Update or Replica Delete action of the request was not found") { return diags } From 5e2230ec802f5f88f86a9a590283fcd10ddc8d8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:09:12 -0400 Subject: [PATCH 1405/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - ecrpublic.aws_ecrpublic_repository. --- internal/service/ecrpublic/repository.go | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/internal/service/ecrpublic/repository.go b/internal/service/ecrpublic/repository.go index 5513dd53ba93..f46c87e075ff 100644 --- a/internal/service/ecrpublic/repository.go +++ b/internal/service/ecrpublic/repository.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ecrpublic" awstypes "github.com/aws/aws-sdk-go-v2/service/ecrpublic/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" @@ -164,22 +163,18 @@ func resourceRepositoryRead(ctx context.Context, d *schema.ResourceData, meta an } var err error - err = retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError { + err = tfresource.Retry(ctx, 1*time.Minute, func(ctx context.Context) *tfresource.RetryError { out, err = conn.DescribeRepositories(ctx, input) if d.IsNewResource() && errs.IsA[*awstypes.RepositoryNotFoundException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - out, err = conn.DescribeRepositories(ctx, input) - } - if !d.IsNewResource() && errs.IsA[*awstypes.RepositoryNotFoundException](err) { log.Printf("[WARN] ECR Public Repository (%s) not found, removing from state", d.Id()) d.SetId("") @@ -263,22 +258,18 @@ func resourceRepositoryDelete(ctx context.Context, d *schema.ResourceData, meta input := &ecrpublic.DescribeRepositoriesInput{ RepositoryNames: []string{d.Id()}, } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err = conn.DescribeRepositories(ctx, input) if err != nil { if errs.IsA[*awstypes.RepositoryNotFoundException](err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("%q: Timeout while waiting for the ECR Public Repository to be deleted", d.Id())) + return tfresource.RetryableError(fmt.Errorf("%q: Timeout while waiting for the ECR Public Repository to be deleted", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = conn.DescribeRepositories(ctx, input) - } - if errs.IsA[*awstypes.RepositoryNotFoundException](err) { return diags } From 844171a3d4cecb11f7e813946dad2d755d5cedcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:11:16 -0400 Subject: [PATCH 1406/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - elasticache. --- internal/service/elasticache/cluster.go | 15 +++++---------- internal/service/elasticache/parameter_group.go | 8 +++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/internal/service/elasticache/cluster.go b/internal/service/elasticache/cluster.go index 44dc99f7b3ed..dfcc1227337a 100644 --- a/internal/service/elasticache/cluster.go +++ b/internal/service/elasticache/cluster.go @@ -20,7 +20,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff" - sdkretry "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" @@ -770,28 +769,24 @@ func deleteCacheCluster(ctx context.Context, conn *elasticache.Client, cacheClus input.FinalSnapshotIdentifier = aws.String(finalSnapshotID) } - // TODO: Migrate to retry.Operation log.Printf("[DEBUG] Deleting ElastiCache Cache Cluster: %s", cacheClusterID) - err := sdkretry.RetryContext(ctx, 5*time.Minute, func() *sdkretry.RetryError { + err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteCacheCluster(ctx, input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidCacheClusterStateFault](err, "serving as primary") { - return sdkretry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidCacheClusterStateFault](err, "only member of a replication group") { - return sdkretry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } // The cluster may be just snapshotting, so we retry until it's ready for deletion if errs.IsA[*awstypes.InvalidCacheClusterStateFault](err) { - return sdkretry.RetryableError(err) + return tfresource.RetryableError(err) } - return sdkretry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteCacheCluster(ctx, input) - } return err } diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go index a13e4addce92..36049f5fe438 100644 --- a/internal/service/elasticache/parameter_group.go +++ b/internal/service/elasticache/parameter_group.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/elasticache" awstypes "github.com/aws/aws-sdk-go-v2/service/elasticache/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" - sdkretry "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" @@ -361,14 +360,13 @@ func resourceResetParameterGroup(ctx context.Context, conn *elasticache.Client, ParameterNameValues: tfslices.Values(parameters), } - // TODO: Migrate to retry.Operation - return sdkretry.RetryContext(ctx, 30*time.Second, func() *sdkretry.RetryError { + return tfresource.Retry(ctx, 30*time.Second, func(ctx context.Context) *tfresource.RetryError { _, err := conn.ResetCacheParameterGroup(ctx, &input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidCacheParameterGroupStateFault](err, " has pending changes") { - return sdkretry.RetryableError(err) + return tfresource.RetryableError(err) } - return sdkretry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) From fbd9998b5ceaca187d76a97d88dd77693cc25f32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:15:16 -0400 Subject: [PATCH 1407/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_catalog_table_optimizer. --- internal/service/glue/catalog_table_optimizer.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/internal/service/glue/catalog_table_optimizer.go b/internal/service/glue/catalog_table_optimizer.go index 1727812a381b..ede1021e7be6 100644 --- a/internal/service/glue/catalog_table_optimizer.go +++ b/internal/service/glue/catalog_table_optimizer.go @@ -175,29 +175,25 @@ func (r *catalogTableOptimizerResource) Create(ctx context.Context, request reso return } - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.CreateTableOptimizer(ctx, &input) if err != nil { // Retry IAM propagation errors if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "does not have the correct trust policies and is unable to be assumed by our service") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "does not have the proper IAM permissions to call Glue APIs") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "is not authorized to perform") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.CreateTableOptimizer(ctx, &input) - } - if err != nil { id, _ := flex.FlattenResourceId([]string{ plan.CatalogID.ValueString(), From df43b3cbeabda3cef420e92a3425bf2d8bf15eb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:17:59 -0400 Subject: [PATCH 1408/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_crawler. --- internal/service/glue/crawler.go | 35 +++++++++++++------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index 74677b49acd0..aa1208c50885 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -438,40 +438,37 @@ func resourceCrawlerCreate(ctx context.Context, d *schema.ResourceData, meta any } // Retry for IAM eventual consistency - err = retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err = glueConn.CreateCrawler(ctx, crawlerInput) if err != nil { // InvalidInputException: Insufficient Lake Formation permission(s) on xxx if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Insufficient Lake Formation permission") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Service is unable to assume provided role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: com.amazonaws.services.glue.model.AccessDeniedException: You need to enable AWS Security Token Service for this region. . Please verify the role's TrustPolicy. if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Please verify the role's TrustPolicy") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: Unable to retrieve connection tf-acc-test-8656357591012534997: User: arn:aws:sts::*******:assumed-role/tf-acc-test-8656357591012534997/AWS-Crawler is not authorized to perform: glue:GetConnection on resource: * (Service: AmazonDataCatalog; Status Code: 400; Error Code: AccessDeniedException; Request ID: 4d72b66f-9c75-11e8-9faf-5b526c7be968) if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "is not authorized") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: SQS queue arn:aws:sqs:us-west-2:*******:tf-acc-test-4317277351691904203 does not exist or the role provided does not have access to it. if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "SQS queue") && errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "does not exist or the role provided does not have access to it") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = glueConn.CreateCrawler(ctx, crawlerInput) - } if err != nil { return sdkdiag.AppendErrorf(diags, "creating Glue Crawler (%s): %s", name, err) } @@ -585,42 +582,38 @@ func resourceCrawlerUpdate(ctx context.Context, d *schema.ResourceData, meta any } // Retry for IAM eventual consistency - err = retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := glueConn.UpdateCrawler(ctx, updateCrawlerInput) if err != nil { // InvalidInputException: Insufficient Lake Formation permission(s) on xxx if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Insufficient Lake Formation permission") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Service is unable to assume provided role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: com.amazonaws.services.glue.model.AccessDeniedException: You need to enable AWS Security Token Service for this region. . Please verify the role's TrustPolicy. if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Please verify the role's TrustPolicy") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: Unable to retrieve connection tf-acc-test-8656357591012534997: User: arn:aws:sts::*******:assumed-role/tf-acc-test-8656357591012534997/AWS-Crawler is not authorized to perform: glue:GetConnection on resource: * (Service: AmazonDataCatalog; Status Code: 400; Error Code: AccessDeniedException; Request ID: 4d72b66f-9c75-11e8-9faf-5b526c7be968) if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "is not authorized") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidInputException: SQS queue arn:aws:sqs:us-west-2:*******:tf-acc-test-4317277351691904203 does not exist or the role provided does not have access to it. if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "SQS queue") && errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "does not exist or the role provided does not have access to it") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = glueConn.UpdateCrawler(ctx, updateCrawlerInput) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Glue Crawler (%s): %s", d.Id(), err) } From f1c07613b773c9ff348c36ce8dcd28f14ee20e87 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:18:38 -0400 Subject: [PATCH 1409/2115] Add 'flex.Float64ValueToString'. --- internal/flex/flex.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/flex/flex.go b/internal/flex/flex.go index afc808d0b6fa..164b51c5629e 100644 --- a/internal/flex/flex.go +++ b/internal/flex/flex.go @@ -344,6 +344,11 @@ func Float64ToStringValue(v *float64) string { return strconv.FormatFloat(aws.ToFloat64(v), 'f', -1, 64) } +// Float64ValueToString converts a Go float64 value to a string pointer. +func Float64ValueToString(v float64) *string { + return aws.String(strconv.FormatFloat(v, 'f', -1, 64)) +} + // IntValueToString converts a Go int value to a string pointer. func IntValueToString(v int) *string { return aws.String(strconv.Itoa(v)) From dc7e2b7197849c8710fdb10c1fda6a40f54c9a72 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:20:20 -0400 Subject: [PATCH 1410/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_dev_endpoint. --- internal/service/glue/dev_endpoint.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go index 1a72ceedc64c..465741297b78 100644 --- a/internal/service/glue/dev_endpoint.go +++ b/internal/service/glue/dev_endpoint.go @@ -235,29 +235,25 @@ func resourceDevEndpointCreate(ctx context.Context, d *schema.ResourceData, meta } log.Printf("[DEBUG] Creating Glue Dev Endpoint: %#v", *input) - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.CreateDevEndpoint(ctx, input) if err != nil { // Retry for IAM eventual consistency if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "should be given assume role permissions for Glue Service") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "is not authorized to perform") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "S3 endpoint and NAT validation has failed for subnetId") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.CreateDevEndpoint(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Glue Dev Endpoint: %s", err) } @@ -466,22 +462,18 @@ func resourceDevEndpointUpdate(ctx context.Context, d *schema.ResourceData, meta if hasChanged { log.Printf("[DEBUG] Updating Glue Dev Endpoint: %+v", input) - err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateDevEndpoint(ctx, input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "another concurrent update operation") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateDevEndpoint(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Glue Dev Endpoint: %s", err) } From eae12ec9216bebe4200ac79a2cefdd33841dce44 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:22:00 -0400 Subject: [PATCH 1411/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - glue.aws_glue_trigger. --- internal/service/glue/trigger.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/service/glue/trigger.go b/internal/service/glue/trigger.go index 2d8de32bb27e..4ae3762564df 100644 --- a/internal/service/glue/trigger.go +++ b/internal/service/glue/trigger.go @@ -262,25 +262,22 @@ func resourceTriggerCreate(ctx context.Context, d *schema.ResourceData, meta any } log.Printf("[DEBUG] Creating Glue Trigger: %+v", input) - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.CreateTrigger(ctx, input) if err != nil { // Retry IAM propagation errors if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Service is unable to assume provided role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // Retry concurrent workflow modification errors if errs.IsAErrorMessageContains[*awstypes.ConcurrentModificationException](err, "was modified while adding trigger") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.CreateTrigger(ctx, input) - } if err != nil { return sdkdiag.AppendErrorf(diags, "creating Glue Trigger (%s): %s", name, err) } From 1092e1c2dbb74a48cb578c8292f5b482cab9dfdc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:30:14 -0400 Subject: [PATCH 1412/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aws_lakeformation_data_lake_settings. --- .../service/lakeformation/data_lake_settings.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/internal/service/lakeformation/data_lake_settings.go b/internal/service/lakeformation/data_lake_settings.go index fe0fd2df884f..022687bb3ff8 100644 --- a/internal/service/lakeformation/data_lake_settings.go +++ b/internal/service/lakeformation/data_lake_settings.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lakeformation" awstypes "github.com/aws/aws-sdk-go-v2/service/lakeformation/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/create" @@ -232,27 +231,23 @@ func resourceDataLakeSettingsCreate(ctx context.Context, d *schema.ResourceData, input.DataLakeSettings = settings var output *lakeformation.PutDataLakeSettingsOutput - err := retry.RetryContext(ctx, IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.PutDataLakeSettings(ctx, input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Invalid principal") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ConcurrentModificationException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("creating Lake Formation data lake settings: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("creating Lake Formation data lake settings: %w", err)) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.PutDataLakeSettings(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Lake Formation data lake settings: %s", err) } From 16ed52a56116e50a2533eb07ed1856232bb846e9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:33:03 -0400 Subject: [PATCH 1413/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aws_lakeformation_opt_in. --- internal/service/lakeformation/opt_in.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/service/lakeformation/opt_in.go b/internal/service/lakeformation/opt_in.go index c3d9633dd9fa..24171c749e9d 100644 --- a/internal/service/lakeformation/opt_in.go +++ b/internal/service/lakeformation/opt_in.go @@ -383,22 +383,18 @@ func (r *optInResource) Create(ctx context.Context, req resource.CreateRequest, } var output *lakeformation.CreateLakeFormationOptInOutput - err := retry.RetryContext(ctx, 2*IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, 2*IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreateLakeFormationOptIn(ctx, &in) if err != nil { if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "Insufficient Lake Formation permission(s) on Catalog") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateLakeFormationOptIn(ctx, &in) - } - if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.LakeFormation, create.ErrActionCreating, ResNameOptIn, principal.DataLakePrincipalIdentifier.ValueString(), err), From 99f57cd18a905d96ad1fce99282e2b130f15e0e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:35:14 -0400 Subject: [PATCH 1414/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aws_lakeformation_permissions. --- internal/service/lakeformation/permissions.go | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go index b25ad9208db2..bfcedb699209 100644 --- a/internal/service/lakeformation/permissions.go +++ b/internal/service/lakeformation/permissions.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lakeformation" awstypes "github.com/aws/aws-sdk-go-v2/service/lakeformation/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" @@ -470,35 +469,31 @@ func resourcePermissionsCreate(ctx context.Context, d *schema.ResourceData, meta } var output *lakeformation.GrantPermissionsOutput - err := retry.RetryContext(ctx, IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.GrantPermissions(ctx, input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Invalid principal") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Grantee has no permissions") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "register the S3 path") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ConcurrentModificationException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "is not authorized to access requested permissions") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("creating Lake Formation Permissions: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("creating Lake Formation Permissions: %w", err)) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.GrantPermissions(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Lake Formation Permissions (input: %v): %s", input, err) } @@ -791,29 +786,25 @@ func resourcePermissionsDelete(ctx context.Context, d *schema.ResourceData, meta return diags } - err := retry.RetryContext(ctx, permissionsDeleteRetryTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, permissionsDeleteRetryTimeout, func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.RevokePermissions(ctx, input) if err != nil { if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "register the S3 path") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ConcurrentModificationException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "is not authorized to access requested permissions") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("unable to revoke Lake Formation Permissions: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("unable to revoke Lake Formation Permissions: %w", err)) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.RevokePermissions(ctx, input) - } - if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "No permissions revoked. Grantee") { return diags } @@ -838,21 +829,17 @@ func resourcePermissionsDelete(ctx context.Context, d *schema.ResourceData, meta // You can't just wait until permissions = 0 because there could be many other unrelated permissions // on the resource and filtering is non-trivial for table with columns. - err = retry.RetryContext(ctx, permissionsDeleteRetryTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, permissionsDeleteRetryTimeout, func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.RevokePermissions(ctx, input) if !errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "No permissions revoked. Grantee has no") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.RevokePermissions(ctx, input) - } - if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "No permissions revoked. Grantee") { return diags } From c8645020778496487890c7f3b27bde9fbcc33d43 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:37:32 -0400 Subject: [PATCH 1415/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aws_lakeformation_resource_lf_tag. --- .../service/lakeformation/resource_lf_tag.go | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/internal/service/lakeformation/resource_lf_tag.go b/internal/service/lakeformation/resource_lf_tag.go index 097beb4eec9e..55fc4a404ce4 100644 --- a/internal/service/lakeformation/resource_lf_tag.go +++ b/internal/service/lakeformation/resource_lf_tag.go @@ -303,23 +303,19 @@ func (r *resourceLFTagResource) Create(ctx context.Context, req resource.CreateR } var output *lakeformation.AddLFTagsToResourceOutput - err := retry.RetryContext(ctx, IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.AddLFTagsToResource(ctx, in) if err != nil { if errs.IsA[*awstypes.ConcurrentModificationException](err) || errs.IsA[*awstypes.AccessDeniedException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.AddLFTagsToResource(ctx, in) - } - if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.LakeFormation, create.ErrActionCreating, ResNameResourceLFTag, prettify(in), err), @@ -465,27 +461,23 @@ func (r *resourceLFTagResource) Delete(ctx context.Context, req resource.DeleteR } deleteTimeout := r.DeleteTimeout(ctx, state.Timeouts) - err := retry.RetryContext(ctx, deleteTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, deleteTimeout, func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.RemoveLFTagsFromResource(ctx, in) if err != nil { if errs.IsA[*awstypes.ConcurrentModificationException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "is not authorized") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("removing Lake Formation LF-Tags: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("removing Lake Formation LF-Tags: %w", err)) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.RemoveLFTagsFromResource(ctx, in) - } - if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.LakeFormation, create.ErrActionWaitingForDeletion, ResNameResourceLFTag, state.ID.String(), err), From 360db5869bebd895009934451b86909d5ab7a854 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:39:10 -0400 Subject: [PATCH 1416/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation.aws_lakeformation_resource_lf_tags. --- .../service/lakeformation/resource_lf_tags.go | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/internal/service/lakeformation/resource_lf_tags.go b/internal/service/lakeformation/resource_lf_tags.go index 317ee9fe27c0..a98d37d175c1 100644 --- a/internal/service/lakeformation/resource_lf_tags.go +++ b/internal/service/lakeformation/resource_lf_tags.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lakeformation" awstypes "github.com/aws/aws-sdk-go-v2/service/lakeformation/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" @@ -249,23 +248,19 @@ func resourceResourceLFTagsCreate(ctx context.Context, d *schema.ResourceData, m input.Resource = tagger.ExpandResource(d) var output *lakeformation.AddLFTagsToResourceOutput - err := retry.RetryContext(ctx, IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.AddLFTagsToResource(ctx, input) if err != nil { if errs.IsA[*awstypes.ConcurrentModificationException](err) || errs.IsA[*awstypes.AccessDeniedException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.AddLFTagsToResource(ctx, input) - } - if err != nil { return create.AppendDiagError(diags, names.LakeFormation, create.ErrActionCreating, ResNameLFTags, prettify(input), err) } @@ -356,26 +351,22 @@ func resourceResourceLFTagsDelete(ctx context.Context, d *schema.ResourceData, m return create.AppendDiagWarningMessage(diags, names.LakeFormation, create.ErrActionSetting, ResNameLFTags, d.Id(), "no LF-Tags to remove") } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { var err error _, err = conn.RemoveLFTagsFromResource(ctx, input) if err != nil { if errs.IsA[*awstypes.ConcurrentModificationException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "is not authorized") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("removing Lake Formation LF-Tags: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("removing Lake Formation LF-Tags: %w", err)) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.RemoveLFTagsFromResource(ctx, input) - } - if err != nil { return create.AppendDiagError(diags, names.LakeFormation, create.ErrActionDeleting, ResNameLFTags, d.Id(), err) } From c4f94cc8e56635ecbd03134afaa9fa9d6f77c30f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:39:27 -0400 Subject: [PATCH 1417/2115] Use 'flex.Float64ToStringValue'. --- internal/service/apigateway/usage_plan.go | 22 ++++---- .../service/ec2/ec2_spot_fleet_request.go | 17 +++--- internal/service/logs/metric_filter.go | 3 +- internal/service/securityhub/insight.go | 42 +++++++-------- internal/verify/validate.go | 20 ------- internal/verify/validate_test.go | 54 ------------------- 6 files changed, 41 insertions(+), 117 deletions(-) diff --git a/internal/service/apigateway/usage_plan.go b/internal/service/apigateway/usage_plan.go index 95f825caebb2..dffc329ee5dd 100644 --- a/internal/service/apigateway/usage_plan.go +++ b/internal/service/apigateway/usage_plan.go @@ -7,7 +7,6 @@ import ( "context" "fmt" "log" - "strconv" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/arn" @@ -20,6 +19,7 @@ import ( "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" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -330,12 +330,12 @@ func resourceUsagePlanUpdate(ctx context.Context, d *schema.ResourceData, meta a operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String(fmt.Sprintf("/apiStages/%s/throttle/%s/rateLimit", id, th[names.AttrPath].(string))), - Value: aws.String(strconv.FormatFloat(th["rate_limit"].(float64), 'f', -1, 64)), + Value: flex.Float64ValueToString(th["rate_limit"].(float64)), }) operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String(fmt.Sprintf("/apiStages/%s/throttle/%s/burstLimit", id, th[names.AttrPath].(string))), - Value: aws.String(strconv.Itoa(th["burst_limit"].(int))), + Value: flex.IntValueToString(th["burst_limit"].(int)), }) } } @@ -363,12 +363,12 @@ func resourceUsagePlanUpdate(ctx context.Context, d *schema.ResourceData, meta a operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String("/throttle/rateLimit"), - Value: aws.String(strconv.FormatFloat(d["rate_limit"].(float64), 'f', -1, 64)), + Value: flex.Float64ValueToString(d["rate_limit"].(float64)), }) operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String("/throttle/burstLimit"), - Value: aws.String(strconv.Itoa(d["burst_limit"].(int))), + Value: flex.IntValueToString(d["burst_limit"].(int)), }) } @@ -377,12 +377,12 @@ func resourceUsagePlanUpdate(ctx context.Context, d *schema.ResourceData, meta a operations = append(operations, types.PatchOperation{ Op: types.OpAdd, Path: aws.String("/throttle/rateLimit"), - Value: aws.String(strconv.FormatFloat(d["rate_limit"].(float64), 'f', -1, 64)), + Value: flex.Float64ValueToString(d["rate_limit"].(float64)), }) operations = append(operations, types.PatchOperation{ Op: types.OpAdd, Path: aws.String("/throttle/burstLimit"), - Value: aws.String(strconv.Itoa(d["burst_limit"].(int))), + Value: flex.IntValueToString(d["burst_limit"].(int)), }) } } @@ -412,12 +412,12 @@ func resourceUsagePlanUpdate(ctx context.Context, d *schema.ResourceData, meta a operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String("/quota/limit"), - Value: aws.String(strconv.Itoa(d["limit"].(int))), + Value: flex.IntValueToString(d["limit"].(int)), }) operations = append(operations, types.PatchOperation{ Op: types.OpReplace, Path: aws.String("/quota/offset"), - Value: aws.String(strconv.Itoa(d["offset"].(int))), + Value: flex.IntValueToString(d["offset"].(int)), }) operations = append(operations, types.PatchOperation{ Op: types.OpReplace, @@ -431,12 +431,12 @@ func resourceUsagePlanUpdate(ctx context.Context, d *schema.ResourceData, meta a operations = append(operations, types.PatchOperation{ Op: types.OpAdd, Path: aws.String("/quota/limit"), - Value: aws.String(strconv.Itoa(d["limit"].(int))), + Value: flex.IntValueToString(d["limit"].(int)), }) operations = append(operations, types.PatchOperation{ Op: types.OpAdd, Path: aws.String("/quota/offset"), - Value: aws.String(strconv.Itoa(d["offset"].(int))), + Value: flex.IntValueToString(d["offset"].(int)), }) operations = append(operations, types.PatchOperation{ Op: types.OpAdd, diff --git a/internal/service/ec2/ec2_spot_fleet_request.go b/internal/service/ec2/ec2_spot_fleet_request.go index b488e0b0f3b8..9519d9fdbe67 100644 --- a/internal/service/ec2/ec2_spot_fleet_request.go +++ b/internal/service/ec2/ec2_spot_fleet_request.go @@ -8,7 +8,6 @@ import ( "context" "fmt" "log" - "strconv" "time" "github.com/aws/aws-sdk-go-v2/aws" @@ -354,9 +353,10 @@ func resourceSpotFleetRequest() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, "weighted_capacity": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: nullable.TypeNullableFloat, + Optional: true, + ForceNew: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, }, }, @@ -1268,9 +1268,10 @@ func buildSpotFleetLaunchSpecification(ctx context.Context, d map[string]any, me opts.KeyName = aws.String(v.(string)) } - if v, ok := d["weighted_capacity"]; ok && v != "" { - wc, _ := strconv.ParseFloat(v.(string), 64) - opts.WeightedCapacity = aws.Float64(wc) + if v, ok := d["weighted_capacity"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + opts.WeightedCapacity = aws.Float64(v) + } } var securityGroupIds []string @@ -1928,7 +1929,7 @@ func launchSpecToMap(ctx context.Context, l awstypes.SpotFleetLaunchSpecificatio m[names.AttrVPCSecurityGroupIDs] = securityGroupIds if l.WeightedCapacity != nil { - m["weighted_capacity"] = strconv.FormatFloat(*l.WeightedCapacity, 'f', 0, 64) + m["weighted_capacity"] = flex.Float64ToStringValue(l.WeightedCapacity) } if l.TagSpecifications != nil { diff --git a/internal/service/logs/metric_filter.go b/internal/service/logs/metric_filter.go index 35c6fe446e58..7523e4b8833f 100644 --- a/internal/service/logs/metric_filter.go +++ b/internal/service/logs/metric_filter.go @@ -7,7 +7,6 @@ import ( "context" "fmt" "log" - "strconv" "strings" "github.com/aws/aws-sdk-go-v2/aws" @@ -340,7 +339,7 @@ func flattenMetricTransformation(apiObject awstypes.MetricTransformation) map[st } if v := apiObject.DefaultValue; v != nil { - tfMap[names.AttrDefaultValue] = strconv.FormatFloat(aws.ToFloat64(v), 'f', -1, 64) + tfMap[names.AttrDefaultValue] = flex.Float64ToStringValue(v) } if v := apiObject.Dimensions; v != nil { diff --git a/internal/service/securityhub/insight.go b/internal/service/securityhub/insight.go index 7a335e620c56..3670cba68e4e 100644 --- a/internal/service/securityhub/insight.go +++ b/internal/service/securityhub/insight.go @@ -6,7 +6,6 @@ package securityhub import ( "context" "log" - "strconv" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/securityhub" @@ -18,6 +17,8 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/enum" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" + "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types/nullable" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" @@ -397,19 +398,19 @@ func numberFilterSchema() *schema.Schema { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "eq": { - Type: schema.TypeString, + Type: nullable.TypeNullableFloat, Optional: true, - ValidateFunc: verify.ValidTypeStringNullableFloat, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, "gte": { - Type: schema.TypeString, + Type: nullable.TypeNullableFloat, Optional: true, - ValidateFunc: verify.ValidTypeStringNullableFloat, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, "lte": { - Type: schema.TypeString, + Type: nullable.TypeNullableFloat, Optional: true, - ValidateFunc: verify.ValidTypeStringNullableFloat, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, }, }, @@ -966,24 +967,21 @@ func expandNumberFilters(l []any) []types.NumberFilter { nf := types.NumberFilter{} - if v, ok := tfMap["eq"].(string); ok && v != "" { - val, err := strconv.ParseFloat(v, 64) - if err == nil { - nf.Eq = aws.Float64(val) + if v, ok := tfMap["eq"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + nf.Eq = aws.Float64(v) } } - if v, ok := tfMap["gte"].(string); ok && v != "" { - val, err := strconv.ParseFloat(v, 64) - if err == nil { - nf.Gte = aws.Float64(val) + if v, ok := tfMap["gte"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + nf.Gte = aws.Float64(v) } } - if v, ok := tfMap["lte"].(string); ok && v != "" { - val, err := strconv.ParseFloat(v, 64) - if err == nil { - nf.Lte = aws.Float64(val) + if v, ok := tfMap["lte"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + nf.Lte = aws.Float64(v) } } @@ -1122,15 +1120,15 @@ func flattenNumberFilters(filters []types.NumberFilter) []any { m := map[string]any{} if filter.Eq != nil { - m["eq"] = strconv.FormatFloat(aws.ToFloat64(filter.Eq), 'f', -1, 64) + m["eq"] = flex.Float64ToStringValue(filter.Eq) } if filter.Gte != nil { - m["gte"] = strconv.FormatFloat(aws.ToFloat64(filter.Gte), 'f', -1, 64) + m["gte"] = flex.Float64ToStringValue(filter.Gte) } if filter.Lte != nil { - m["lte"] = strconv.FormatFloat(aws.ToFloat64(filter.Lte), 'f', -1, 64) + m["lte"] = flex.Float64ToStringValue(filter.Lte) } numFilters = append(numFilters, m) diff --git a/internal/verify/validate.go b/internal/verify/validate.go index 5406bccd2fc3..64ecda1ad049 100644 --- a/internal/verify/validate.go +++ b/internal/verify/validate.go @@ -421,26 +421,6 @@ func ValidStringIsJSONOrYAML(v any, k string) (ws []string, errors []error) { return } -// ValidTypeStringNullableFloat provides custom error messaging for TypeString floats -// Some arguments require a floating point value or an unspecified, empty field. -func ValidTypeStringNullableFloat(v any, k string) (ws []string, es []error) { - value, ok := v.(string) - if !ok { - es = append(es, fmt.Errorf("expected type of %s to be string", k)) - return - } - - if value == "" { - return - } - - if _, err := strconv.ParseFloat(value, 64); err != nil { - es = append(es, fmt.Errorf("%s: cannot parse '%s' as float: %s", k, value, err)) - } - - return -} - // ValidUTCTimestamp validates a string in UTC Format required by APIs including: // https://docs.aws.amazon.com/iot/latest/apireference/API_CloudwatchMetricAction.html // https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_RestoreDBInstanceToPointInTime.html diff --git a/internal/verify/validate_test.go b/internal/verify/validate_test.go index 0fb200e1eef0..7712b35aacb6 100644 --- a/internal/verify/validate_test.go +++ b/internal/verify/validate_test.go @@ -4,7 +4,6 @@ package verify import ( - "regexp" "strings" "testing" @@ -93,59 +92,6 @@ func TestValid4ByteASNString(t *testing.T) { } } -func TestValidTypeStringNullableFloat(t *testing.T) { - t.Parallel() - - testCases := []struct { - val any - expectedErr *regexp.Regexp - }{ - { - val: "", - }, - { - val: "0", - }, - { - val: "1", - }, - { - val: "42.0", - }, - { - val: "threeve", - expectedErr: regexache.MustCompile(`cannot parse`), - }, - } - - matchErr := func(errs []error, r *regexp.Regexp) bool { - // err must match one provided - for _, err := range errs { - if r.MatchString(err.Error()) { - return true - } - } - - return false - } - - for i, tc := range testCases { - _, errs := ValidTypeStringNullableFloat(tc.val, "test_property") - - if len(errs) == 0 && tc.expectedErr == nil { - continue - } - - if len(errs) != 0 && tc.expectedErr == nil { - t.Fatalf("expected test case %d to produce no errors, got %v", i, errs) - } - - if !matchErr(errs, tc.expectedErr) { - t.Fatalf("expected test case %d to produce error matching \"%s\", got %v", i, tc.expectedErr, errs) - } - } -} - func TestValidAccountID(t *testing.T) { t.Parallel() From 786ac1ce39e07271d1153047c8a74ffa71f5d9e7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:40:36 -0400 Subject: [PATCH 1418/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lakeformation tests. --- internal/service/lakeformation/permissions_test.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/lakeformation/permissions_test.go b/internal/service/lakeformation/permissions_test.go index f128e286f24f..b270ef8d0f62 100644 --- a/internal/service/lakeformation/permissions_test.go +++ b/internal/service/lakeformation/permissions_test.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lakeformation" awstypes "github.com/aws/aws-sdk-go-v2/service/lakeformation/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -1137,7 +1136,7 @@ func permissionCountForResource(ctx context.Context, conn *lakeformation.Client, log.Printf("[DEBUG] Reading Lake Formation permissions: %v", input) var allPermissions []awstypes.PrincipalResourcePermissions - err := retry.RetryContext(ctx, tflakeformation.IAMPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, tflakeformation.IAMPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { pages := lakeformation.NewListPermissionsPaginator(conn, input) for pages.HasMorePages() { @@ -1152,11 +1151,11 @@ func permissionCountForResource(ctx context.Context, conn *lakeformation.Client, } if errs.IsAErrorMessageContains[*awstypes.InvalidInputException](err, "Invalid principal") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(fmt.Errorf("acceptance test: error listing Lake Formation Permissions getting permission count: %w", err)) + return tfresource.NonRetryableError(fmt.Errorf("acceptance test: error listing Lake Formation Permissions getting permission count: %w", err)) } for _, permission := range page.PrincipalResourcePermissions { @@ -1171,10 +1170,6 @@ func permissionCountForResource(ctx context.Context, conn *lakeformation.Client, return nil }) - if tfresource.TimedOut(err) { - _, err = conn.ListPermissions(ctx, input) - } - if errs.IsA[*awstypes.EntityNotFoundException](err) { return 0, nil } From df88920d0b6f0773b80b03e3e1a3d156589bbb1a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:47:07 -0400 Subject: [PATCH 1419/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lexmodels.aws_lex_bot_alias. --- internal/service/lexmodels/bot_alias.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/internal/service/lexmodels/bot_alias.go b/internal/service/lexmodels/bot_alias.go index d46257056bcc..51d874c6f135 100644 --- a/internal/service/lexmodels/bot_alias.go +++ b/internal/service/lexmodels/bot_alias.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" awstypes "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/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" @@ -149,7 +148,7 @@ func resourceBotAliasCreate(ctx context.Context, d *schema.ResourceData, meta an input.ConversationLogs = conversationLogs } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { output, err := conn.PutBotAlias(ctx, input) if output != nil { @@ -157,20 +156,17 @@ func resourceBotAliasCreate(ctx context.Context, d *schema.ResourceData, meta an } // IAM eventual consistency if errs.IsAErrorMessageContains[*awstypes.BadRequestException](err, "Lex can't access your IAM role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ConflictException](err) { - return retry.RetryableError(fmt.Errorf("%q bot alias still creating, another operation is pending: %w", id, err)) + return tfresource.RetryableError(fmt.Errorf("%q bot alias still creating, another operation is pending: %w", id, err)) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { // nosemgrep:ci.helper-schema-TimeoutError-check-doesnt-return-output - _, err = conn.PutBotAlias(ctx, input) - } if err != nil { return sdkdiag.AppendErrorf(diags, "creating Lex Model Bot Alias (%s): %s", id, err) @@ -245,27 +241,23 @@ func resourceBotAliasUpdate(ctx context.Context, d *schema.ResourceData, meta an input.ConversationLogs = conversationLogs } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.PutBotAlias(ctx, input) // IAM eventual consistency if errs.IsAErrorMessageContains[*awstypes.BadRequestException](err, "Lex can't access your IAM role") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ConflictException](err) { - return retry.RetryableError(fmt.Errorf("%q bot alias still updating", d.Id())) + return tfresource.RetryableError(fmt.Errorf("%q bot alias still updating", d.Id())) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.PutBotAlias(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Lex Model Bot Alias (%s): %s", d.Id(), err) } From 209b8c649b71c2a865d5e5eeaa649dc0ead8ef99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:48:27 -0400 Subject: [PATCH 1420/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lexmodels.aws_lex_intent. --- internal/service/lexmodels/intent.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/lexmodels/intent.go b/internal/service/lexmodels/intent.go index 4e498d4758d8..b901e947d454 100644 --- a/internal/service/lexmodels/intent.go +++ b/internal/service/lexmodels/intent.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" awstypes "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/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" @@ -469,23 +468,19 @@ func resourceIntentUpdate(ctx context.Context, d *schema.ResourceData, meta any) input.Slots = expandSlots(v.(*schema.Set).List()) } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.PutIntent(ctx, input) if errs.IsA[*awstypes.ConflictException](err) { - return retry.RetryableError(fmt.Errorf("%q: intent still updating", d.Id())) + return tfresource.RetryableError(fmt.Errorf("%q: intent still updating", d.Id())) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.PutIntent(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating intent %s: %s", d.Id(), err) } From 36cec2ecc00f26a72719c5746eb43e4e159fd403 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:49:42 -0400 Subject: [PATCH 1421/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lexmodels tests. --- internal/service/lexmodels/intent_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/lexmodels/intent_test.go b/internal/service/lexmodels/intent_test.go index 0241f5e2a1dc..a068070964e8 100644 --- a/internal/service/lexmodels/intent_test.go +++ b/internal/service/lexmodels/intent_test.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice" awstypes "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -21,6 +20,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs" tflexmodels "github.com/hashicorp/terraform-provider-aws/internal/service/lexmodels" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -630,14 +630,14 @@ func TestAccLexModelsIntent_updateWithExternalChange(t *testing.T) { Type: awstypes.FulfillmentActivityType("ReturnIntent"), }, } - err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 1*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.PutIntent(ctx, input) if errs.IsA[*awstypes.ConflictException](err) { - return retry.RetryableError(fmt.Errorf("%q: intent still updating", resourceName)) + return tfresource.RetryableError(fmt.Errorf("%q: intent still updating", resourceName)) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil From a925e574ef6ea9f867bc531c3fe8d0aedf6ada59 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:53:10 -0400 Subject: [PATCH 1422/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - macie2.aws_macie2_account. --- internal/service/macie2/account.go | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/internal/service/macie2/account.go b/internal/service/macie2/account.go index 784e2849cf48..ee28ed3e415d 100644 --- a/internal/service/macie2/account.go +++ b/internal/service/macie2/account.go @@ -14,7 +14,6 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -81,23 +80,19 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, meta any input.Status = awstypes.MacieStatus(v.(string)) } - err := retry.RetryContext(ctx, 4*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 4*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.EnableMacie(ctx, input) if err != nil { if tfawserr.ErrCodeEquals(err, string(awstypes.ErrorCodeClientError)) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.EnableMacie(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "enabling Macie Account: %s", err) } @@ -166,11 +161,11 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, meta any input := &macie2.DisableMacieInput{} - err := retry.RetryContext(ctx, 4*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 4*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DisableMacie(ctx, input) if errs.IsAErrorMessageContains[*awstypes.ConflictException](err, "Cannot disable Macie while associated with an administrator account") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { @@ -178,16 +173,12 @@ func resourceAccountDelete(ctx context.Context, d *schema.ResourceData, meta any errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "Macie is not enabled") { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DisableMacie(ctx, input) - } - if err != nil { if errs.IsA[*awstypes.ResourceNotFoundException](err) || errs.IsAErrorMessageContains[*awstypes.AccessDeniedException](err, "Macie is not enabled") { From 5dd9c6988785bfa650e27477dc6068f324a0929c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:54:19 -0400 Subject: [PATCH 1423/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - macie2.aws_macie2_invitation_accepter. --- internal/service/macie2/invitation_accepter.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/internal/service/macie2/invitation_accepter.go b/internal/service/macie2/invitation_accepter.go index 65c83c6f93ee..4edff061c764 100644 --- a/internal/service/macie2/invitation_accepter.go +++ b/internal/service/macie2/invitation_accepter.go @@ -14,7 +14,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/macie2/types" "github.com/hashicorp/aws-sdk-go-base/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" @@ -61,27 +60,24 @@ func resourceInvitationAccepterCreate(ctx context.Context, d *schema.ResourceDat var invitationID string var err error - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { invitationID, err = findInvitationByAccount(ctx, conn, adminAccountID) if err != nil { if tfawserr.ErrCodeEquals(err, string(awstypes.ErrorCodeClientError)) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if invitationID == "" { - return retry.RetryableError(fmt.Errorf("unable to find pending Macie Invitation for administrator account ID (%s)", adminAccountID)) + return tfresource.RetryableError(fmt.Errorf("unable to find pending Macie Invitation for administrator account ID (%s)", adminAccountID)) } return nil }) - if tfresource.TimedOut(err) { - invitationID, err = findInvitationByAccount(ctx, conn, adminAccountID) - } if err != nil { return sdkdiag.AppendErrorf(diags, "listing Macie InvitationAccepter (%s): %s", d.Id(), err) } From deaf9ceefb5df8982102c07c30b0699c2571b5a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:56:04 -0400 Subject: [PATCH 1424/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - macie2.aws_macie2_organization_admin_account. --- internal/service/macie2/organization_admin_account.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/service/macie2/organization_admin_account.go b/internal/service/macie2/organization_admin_account.go index 2800d659ed1b..7e0623f00ebb 100644 --- a/internal/service/macie2/organization_admin_account.go +++ b/internal/service/macie2/organization_admin_account.go @@ -54,24 +54,20 @@ func resourceOrganizationAdminAccountCreate(ctx context.Context, d *schema.Resou } var err error - err = retry.RetryContext(ctx, 4*time.Minute, func() *retry.RetryError { + err = tfresource.Retry(ctx, 4*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.EnableOrganizationAdminAccount(ctx, input) if tfawserr.ErrCodeEquals(err, string(awstypes.ErrorCodeClientError)) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.EnableOrganizationAdminAccount(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Macie OrganizationAdminAccount: %s", err) } From 592c6c67aedb5057d9a98dfe145238143fc5eda1 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 11:56:20 -0400 Subject: [PATCH 1425/2115] Add branch name reminder for acctest output --- GNUmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index bb3e9f3e64bf..beae755376f1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -626,10 +626,13 @@ sweeper-unlinked: go-build ## [CI] Provider Checks / Sweeper Functions Not Linke (echo "Expected `strings` to detect no sweeper function names in provider binary."; exit 1) t: prereq-go fmt-check ## Run acceptance tests (similar to testacc) + @branch=$$(git rev-parse --abbrev-ref HEAD); \ + printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "$$branch" TF_ACC=1 $(GO_VER) test ./$(PKG_NAME)/... -v -count $(TEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(RUNARGS) $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -vet=off test: prereq-go fmt-check ## Run unit tests - @echo "make: Running unit tests..." + @branch=$$(git rev-parse --abbrev-ref HEAD); \ + printf "make: Running unit tests on branch: \033[1m%s\033[0m...\n" "$$branch" $(GO_VER) test $(TEST) -v -count $(TEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(RUNARGS) $(TESTARGS) -timeout 15m -vet=off test-compile: prereq-go ## Test package compilation @@ -641,6 +644,8 @@ test-compile: prereq-go ## Test package compilation $(GO_VER) test -c $(TEST) $(TESTARGS) -vet=off testacc: prereq-go fmt-check ## Run acceptance tests + @branch=$$(git rev-parse --abbrev-ref HEAD); \ + printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "$$branch" @if [ "$(TESTARGS)" = "-run=TestAccXXX" ]; then \ echo ""; \ echo "Error: Skipping example acceptance testing pattern. Update PKG and TESTS for the relevant *_test.go file."; \ From 461f6946d0d849122eb05c7e8c1c595a0fa975f7 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:34:41 +0900 Subject: [PATCH 1426/2115] Implement engine_version argument --- internal/service/opensearch/package.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/internal/service/opensearch/package.go b/internal/service/opensearch/package.go index 05f19c2625d4..c8f8a16f1b2a 100644 --- a/internal/service/opensearch/package.go +++ b/internal/service/opensearch/package.go @@ -7,6 +7,7 @@ import ( "context" "log" + "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/opensearch" awstypes "github.com/aws/aws-sdk-go-v2/service/opensearch/types" @@ -39,6 +40,12 @@ func resourcePackage() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "engine_version": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringMatch(regexache.MustCompile(`^Elasticsearch_[0-9]{1}\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\.[0-9]{1,2}$`), "must be in the format 'Elasticsearch_X.Y' or 'OpenSearch_X.Y'"), + }, "package_description": { Type: schema.TypeString, Optional: true, @@ -94,6 +101,10 @@ func resourcePackageCreate(ctx context.Context, d *schema.ResourceData, meta any PackageType: awstypes.PackageType(d.Get("package_type").(string)), } + if v, ok := d.GetOk("engine_version"); ok { + input.EngineVersion = aws.String(v.(string)) + } + if v, ok := d.GetOk("package_source"); ok { input.PackageSource = expandPackageSource(v.([]any)[0].(map[string]any)) } @@ -126,6 +137,7 @@ func resourcePackageRead(ctx context.Context, d *schema.ResourceData, meta any) } d.Set("available_package_version", pkg.AvailablePackageVersion) + d.Set("engine_version", pkg.EngineVersion) d.Set("package_description", pkg.PackageDescription) d.Set("package_id", pkg.PackageID) d.Set("package_name", pkg.PackageName) From 2559cbe2ca98242cf287b4ff4e97d41598b2ecdd Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:36:27 +0900 Subject: [PATCH 1427/2115] Add an acctest for engine_version argument --- internal/service/opensearch/package_test.go | 70 ++++++++++++++++++ .../example-dummy-opensearch-plugin.zip | Bin 0 -> 22728 bytes 2 files changed, 70 insertions(+) create mode 100644 internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index a41dbe6161f9..6ac44adb115f 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + awstypes "github.com/aws/aws-sdk-go-v2/service/opensearch/types" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -53,6 +54,43 @@ func TestAccOpenSearchPackage_basic(t *testing.T) { }) } +func TestAccOpenSearchPackage_packageTypeZipPlugin(t *testing.T) { + ctx := acctest.Context(t) + pkgName := testAccRandomDomainName() + resourceName := "aws_opensearch_package.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.OpenSearchServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPackageDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPackageConfig_packageTypeZipPlugin(pkgName, "OpenSearch_2.17"), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPackageExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, "available_package_version", "v1"), + resource.TestCheckResourceAttr(resourceName, "engine_version", "OpenSearch_2.17"), + resource.TestCheckResourceAttr(resourceName, "package_description", ""), + resource.TestCheckResourceAttrSet(resourceName, "package_id"), + resource.TestCheckResourceAttr(resourceName, "package_name", pkgName), + resource.TestCheckResourceAttr(resourceName, "package_source.#", "1"), + resource.TestCheckResourceAttr(resourceName, "package_type", string(awstypes.PackageTypeZipPlugin)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "available_package_version", + "package_source", // This isn't returned by the API + }, + }, + }, + }) +} + func TestAccOpenSearchPackage_disappears(t *testing.T) { ctx := acctest.Context(t) pkgName := testAccRandomDomainName() @@ -140,3 +178,35 @@ resource "aws_opensearch_package" "test" { } `, rName) } + +func testAccPackageConfig_packageTypeZipPlugin(rName, engineVersion string) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "test" { + bucket = %[1]q +} + + +# example-dummy-opensearch-plugin.zip was created from the sample repository provided by AWS using the following commands: +# > git clone https://github.com/aws-samples/kr-tech-blog-sample-code.git +# > cd kr-tech-blog-sample-code/opensearch_custom_plugin +# > gradele build +# > cp build/distributions/opensearch-custom-plugin-1.0.0.zip terraform-provider-aws/internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip + +resource "aws_s3_object" "test" { + bucket = aws_s3_bucket.test.bucket + key = %[1]q + source = "./test-fixtures/example-dummy-opensearch-plugin.zip" + etag = filemd5("./test-fixtures/example-dummy-opensearch-plugin.zip") +} + +resource "aws_opensearch_package" "test" { + engine_version = %[2]q + package_name = %[1]q + package_source { + s3_bucket_name = aws_s3_bucket.test.bucket + s3_key = aws_s3_object.test.key + } + package_type = "ZIP-PLUGIN" +} +`, rName, engineVersion) +} diff --git a/internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip b/internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip new file mode 100644 index 0000000000000000000000000000000000000000..bca46ca3343c68d50da4139ecf9e7846b5897018 GIT binary patch literal 22728 zcmV)6K*+yPO9KQH000OG0000%0H|(C2xJ2Q0FDO$02}}S0B~$|XK8LNWMy+>a%pgM zZ*neha&K^Da&&2BbA44!Z`?Kzz3W#DyobG5LhM6Z7;%Bb1)2a&VqkN~tr$t86$46C z_+e*_{`fwU(n`*kFBV9?H#2YE%&VKNpsY}{94a$98n_km23X%KN1f6_wUExSS_)$; z7I(4!Plq;f|EGn>G ziQAJJoq{+#6Q??MJHUCEz%_@9DP45NT%utd|HbC%E6_u)iUv zQYkJBL(~astX(R$>E6LMX4rbI$tN2RNE@=d89{@cjEnt9%6-m}rmog_%E&@j6S^gOwKbNA?9p;?0;r5ccp!KQz5?IGQ(iUsyj6GHx z`Dg2A0q!@!ww*w{`71l>fpbiQ>4C}Xpfu*~$moLyHehqadv|hPpkX%HDL2y(D_n97W!w3k1~67+NvK51DQ|)=rB50Z>Z= z1QY-O2nYZG06_q!n9TamLjV9pP5=NR0001QaAj_DWnpq-Xf0!Pb98TQEpTjgXK8LN zF)lDJFfM9ga+JCQaBk7EE*jgmZ5u1LZQFLTV%xTD+jg>I+gfq*vhTU|-q~m0v(LM; zYRu999Nkra&Fb&#ue+wa6fg)1000C8004jhz&|b^fd9B4f0m4hvH-1wtSCJ&fc!r> zj&aM;NCEyh{CK1MXGa+USqV`QC1pApQ5OXrxj+UKAM!nZmOBw6O$)@ z3Iv5K;L&$L8D=2?guVWA=|lA;H8y5AQ^4RjAT~Ye={U-n-%8>Pzpy)XM9Fw@QE!E{ zZyrOZG#!a0U*KFB;;OdTc%rSQf9LtMiCrpP!llzU27|f!ktm0EWxw+d_|GrD3q;4u z8Xf>ZhvvV$d}#?G5m_Y>I%jw1Eln+_jS*De=h{DxB}x`xCD|+%*eBujhauHM7Q*ee zWQn1qbp)+obz^h{5uZ=IsonlX#%^z_G9|1MmurnD_t`gD!3eppT8|Bzly|zR6;9{F z%yM5s8l^JiJvqH}Lp#Rol3oaUy}qB*iIJ{@bG;ri(jZrcjK2`b+U3^|eJY^lJGd1Cr2T)*%L zUfJ3ykmgfb1(2+tj|V3hGdQFEX}3N*$=Pc7XI!AKM2p(MptU%(3zrFWNtJCsLpYa$ z(bfIef-a;+LQ)=R8eqwh>e9sBivC=GMhU_~#ce)eF*FaXFSjcy4YkZh#*EZG zd_*^%D@`bSR;1fV0^X;&7cgRC6&5a@H_L;fsWS>W-6JVItCtD1eJ&_{K2pblAG#q! zLDH_X_l(qD?ii42Q$wOw@XVmkmil#y(`9da&013RIp-+Nhz#?Pcns#DRy@6U-$^E0#$9f1*r4^IceLMc#BO&*NEhWMDli8QQ zF5(CfP_qZgO&}=VO78Hj2thMLhfo)RJu$^bgPP7*$&v_D7%iG~biSWtvIrNbd61IV1guS`Y-7!O>E-ee*C zX4a-ckYNOnIunu*)rL3)GyNS(+*Mz^YanBqJovjgmdCk^^No6Zdr<98!i8DLzxDzCXCsVHOG$Vs@ozJbvoIl|snmRTZth>9#{ z7)nD=(6qFW1mNVOs$1P;`K;U>$F4H3#J3<$=ByTc;o5u5(0he}3bo6W+_IEZe1L1d zQPV`lF@VRM57D3vfhL12*ILEot~2Z}V=E2Cc!~xr%xKR76iu;oE{{)I!S>oaGhW{; zU`CV1&jLW7fnZInr(Xuhx$-b-IpH7@AvQvlyU(Rb^bJKA2v4xqTOfa255VdM1I2c6 zQFMwp%TJX2*@$rX^HKXJm9KNE(KrcE*kCGgO);3s@s8;SusQk1ph9`J<_ zc|^qgYfVC=KCP;6M|rQEJu9p95~eq56bkb}b2JVc_VNeMhRQW>N>qRc&_p@tFweP1 zPExSc7n{%*YqNz#-;Qoo+`aM9h~UkW?kl1Rs?`TO7C$XnJyu)Wrz*$Bw1H((K|>%J zCEXuH5aLvtCdM5wPKbk)p-UH5KOMmrz(=Neb&Qp3v72O;n}gBU8?tKDw%&mWd<`Zv zwOQp>0=V9bffVRfg7x_m-xi~TRvnOY#Rw;tKquhAce78kjtInZM;zku1@?5Rcx9eF zNBz)8OZI^n4OxS4?M|AL+}Z&AlhJ9eT6pf0|8@qHM(Oi6BpB@|0tFJqX&Ye&3U4m! z1KykqLQ5iigu1SL*qgc1>exdbL>bs_>Nh&V@E?C%WQRUvlUXQ8(}D3hkjuil%FB1K z4Vgv%#qo(S9o^=Jc&y9mS<_Hp>V&w>4n%hDG2N4*<)rLp&__tz=!N{hN8x^ZbosDs z+4rc3yYLti#!pR`?gAVLZf!m50dLaxB@?f-e@`RiFOCg03cro$4*|*9D5vk#X+eZt*o-VB)|rZl1zoahI0EK6j>Z^M0s}=u$zyF0MMW($Yt$=B4z<` zmO)fEUsbusDHEOG_SF0FX&F@z29>R`!u^?oO_$6h%~=#@a+mv37&1JP(@8jaGFoFTVU3S@!c|1do;-%u)226>6;|wD* zVZHbvQ{Ok)93y>!B%qd~5(O5`Stc9Oua@}dgk5;`)v)K!=#EM8ok7I6i1;Y*UbFXA zW5tB!B`fXx!QI~(7a&~@J&@h^qAE0)m1!Y|w?#@G;e&d2!#h`pAvDK#4s{sVDx7Q) z3yUO-W~z7DNnk{oOuyDP<g?g(2eOH%`^CRL{0+s=MO@=2it z!T&d0TsA0>%@Y#5M_A99Js&tMGZHjuK4kZf1A54di{7)u1sO{$xlM)ko{FFL~^kw50r&)~OUzzWxQby|6FYd8vJuf=Wf@2;1C>#1M%7 z-WPq_1IFT5pFtR)DMzL>OLag_xW{kY*n?Quho$ae4dmjQ0CQ^Ci*x`S*d8XeJOsZO zZ4;bv3*&0!6t9r}()sOlYGSm+E!6b4C^iwv%#4iTLF8(2zU;_y;d}cF>x@(sj`r#d z<-M^EhZJdLtOIkVl<@2c1#$+5vDT%_mrQ_b6=Y~s`D|6b3`^O)|Orp#!iCp zhv-4Z$f*#GHH?e#c@@LAwu3u@(DH4vT)uDi>hw~LB2zR5nt*aER9k$H&k2||itTNA zpEV5I2?m?irELRD!sShfqrP&@u~r6KjDK0WAanhIAS>20j;5MRju93dnURCI9K150JIx2Qvc zjYTeX6;Z0k;~YEfkgCwjtKnebw3fXta`a?zJR_ZG0=za3YtpPT-whgeYl9#7YHxqL zKkVsxYj1ARsy)CX|;EHk2Yjk96s6_x95DomZw#E_Zewo!74N>(pLD-z`3EZQu(`4#Q7APrm0; z25r;csI6N0`snYOY|>r#8Q^czUk_b{c5Y-ov8rkH&|2S`0zTdtD9Nk4@xUw25|tc(+Yt&AE#W5o0?#djei~QsliWPu5m7 z-&CIq5ocvW-MWa$R|8iIQj`j;U3+WG+vyV$1Y|g=1}U!ZUJ{A!sB8YqJgeP*o1>=1 z+bl+fXT`FMmCx3BJi}-xExva?+s!nj@^xr;e~tSt4;8PI5vNYesG{5Uer=DOVxr`R zR2DKGIjYQ^)`eNKMzo=PlrA2dD!^P{wanh_Og+dd2*ig#81!@^==USbFH(Zd+)YrcKO2 zCHV|zS-K62W2mlb)gW>Jm!kYj$>Gpb518}$n_mv4>u`Fs62OdXR>;oiri(9>D0eAp z5Zq(luN9y(fv@}T)VK&NY#96*ysm>;~GH z6D#QZT2a1L)}{j36EGeCh5vl7GqB3q%&jqv`WnFf3xi&;yxa^FfL!0;;5Hy4_pj5! z@BK%bQCMM2CRN+cFw?*J7@?KR(UP@QbFdb3Lwf_56k>r^L%WzO5ogn-ey^a*L4AvN zeA`-do1G(f(pZk-TGzKD8G(d4WM7WId-aCti`Y*+oG0I?d9MSDCOk_lUQk}4^Y?-9 z!)~;7ePf9P`2&9S9Zkm00!OcA+X+Ep83~I-5G$_Qv9Zu5CdTVP7;^^Me{WKk-uQRc zuB_4vm}uUU!hBL*@9l63F|LVUJ;IWAv5eunNBDooK5`@2F>Pp;heHvLg|GaY>YMMl zf&c_h0+oM=m_Ewr4#+Q$;c@GE1U-AWmdIJV-_`B}z)& zM@IaYNx*-e*MR&iJ4dsB8P)t}ANc?6V`pz->ttf!Xk`9x-O>Nm-PFR`*~HQ5--hA; z_hClnc1|v~|N1B2zC)2Ze&Sm|0RWi(=WwC_*hT->V>%;i11G0qWgR(W0Tf;#XlN5a z%CKL6h;@H~)q8KP5CsClODu`P=E0}ya5sXlY#X_)NbX`^@ZA{^Au=#>KNUu}Hx?+^ ze%~3mnq6;t&9pN=&&1~H^#H05e1d2qEF!GVN3ex7outC(9;s?z$eKf{VQe1FxaxzC zWVDiQg0~O{&(5*gb+%~hkC{P{4_8U*-A1JAtj^6a6mND{*aP?bR9YvsYe8kR=Qm~d zxerlqJ7tjO5$3bFFby%SJ;6EWYYD~1FrS*F@dezmDWYPiu0ad78q=(Pg&J)Y_(Xu77%G;rWaECE{BuQosAJly-LJ-+q4eN<&J;3YO+?APY~A{ zVKKvKelCRbKeU=9>Wdhkwnb43qd>GPmQUD(3`;jky@VDjx2-yBkK#0g*D8jiV&D-Z2Swr|m+i@66pz%a4drnol+zw56Nhud!wfl#7!T2adU17rKvbl~~EkpZAAv7Vqg3nh$<#C-CghH?+ zR18?8C}-noq)QaHT9 zAr3I?6*EL2ZW2xYf(31L01q==0vwvJq)PvbvI_o2O;7xcN$iF39mX>4j1>qj&U{Iz zRz_=jhRM^njMf!)GvrD^f))>tK+6EPOhze95Gyf7u!Rsu-VL=B9b?HoP+Hz1UBto{KAc8!PS70YGw zD!pVr^}?AzC_!b4;Q$10hT=K$bn8*$^K0q!Y>@YJ`i0Vf0RBFF((UXZVZ(mZXM?}n zYfiK6&r_E_Xy^t0GqMFHNuh>Fdw@d~WVQku#H&iCv@k4`Kb`+ZQ4~KeQNmomHQSX~ zztf1Hw6+|sW}B*XAq$awvTpvJFxR`vn|S2X^Ec^v9i~C{Sv;m#ya+Qa$E|BwqbkBC zLzB3{A~-GC_DW5Gm`A;@7yi?j2yfkbsEIrAxo8@!!u(K(4sksZ?5I8}RFb4n9g{Ve zacYE?G99cKb>P5HAp`TiJPjTi!(?PX8Pm#4rXuQ_KNn&?hF3XgxrXh0n&OJOmHZv@ zrpm>JCei22IY*A2n12a#@2o&L-k&=N_4D04XqpHNVSk)!sy#)5iUXz^1{pk7OeLs!)+Twl zd6z0?&OI<&*g6(#><~|2^tnC;X9y!+MbwOeNy%J*X$|_$Oa5b%b`@+=eMv?q zG(Zd3=winY8|r>!83h}hj)XskyF{9pkJ@XaaUAit0KpXWjM7>1GUXNH#W0u40Vw&L zi3j}+5SwS8q}eRa7^lMMf&Hs16L2B*!lr?}MRyD5T;G&|Gp`SO<67;TX(<&eQyE)Vy-gUb7DiEp8v)SF&lWDdDt zsVC*gs~9=>l@Gn{7>3MWSgcw;BY%e$13IY!OnT1eBzX?BHZ}JAtG}co8PgkuLiPrM z9Va*{&%+iX1o;xcgsu_}SB{BhQ_~*T+)~D*Hl77xp<$wbC_M9Fb^>p``4AmQ3IRHp zMpsgF+moVrP^vury= zz%*;B#D=9*@va58$xm#9t%F|#Ve!$H5F;;p8&`NI2LgrJ9YPpw8cBhz zES(^?;7h&$PtIp#8CUx~OrQbAGvn-Rdyrrd&h}EDM(LwhCiNAMjOv!DMWr2;)FbbJ z%K1@ozz2h{M8R-#bzZ1^)-dKzcxBP40?M@LU0M`I`|+6vQgO=be}U+Nn3nMN536VY zusZkuHN^gpyxywuP;XPM8qMab>RkuMO&{^Y>xK#td};EhiP9|xrp|69m$CsqPv~b# z0{!^Au}C+vssD@D_n6#{H=V9|ncojiR&M}Y?YW1LEMY;YIRd%%>Zc72;FHIbrwZ!l zj(_=}EQ}pethWEbJfcgC$6kk@xI7;!w@y{c#6>)pYns2tG;nV9qnfNFf=hB*AM&XE z)|LI?_3+_7ldfg0stD^JUcYY;oRVz)i)D_~f_{7B&EGCh=ITll?QXE2??X8$D#U_- zW<-bFK~6g%gc+SIP8QE($yb~klc~t`q*)mh`dz}xe5AxmkH#<|oo-*jY^7+j`RySB zk+T6TqJCjjs4KS+KM~@XbUWj@Bg(Xvm`-=^$ZT(vjf_Vtsf^t&roP+@FV?0s3?vv` zO1AlyiN2W^UvBpWuLd#gP1dQhM(o>(sMlh&z`l$xszP9}HmxLR0xHN+mq?>%&Ct5S zxqNdq0Ag(z{C%*m1$2kZKj{$N*b2b`tohvW%pPDghYrs<%J>MHIwy>M;_sB~Y+M(5=Wtybrsq32?sJPx^P-;LrmL5}wX8~u6BsF`bK=pwgtCwP@$N#_jA z{+e~OeZcPbZ}k1YVfLSlakex0KgsIo%SECeX0QJD%>Mtz|74u9oydO`)@!zlzfgD= zK{l~ke@&>SpqX1_qZqc-6{AQ(qCgPL%Y)FHpTpGmXI?@E@b99(fa}JYBM=bgyiyF| zlEZ45N4nSf__R7*XM3Gow8rKFPVL3S@ENlh!&(oRhKw`Vs`Ko(5YyCJME+9e+1;KT zlBv>skp@}SmWxO;c!(5{ww+?n-JK1h54M=;cfoZg@ZwhJh zW~Ed7KKM^jvwKngjU1zOVk11_IYITkad1LhRXLd)%JQ+!ybYAc=rBo)LQ}|u)V?Ho zOxkQ-+2{OO(G%QOyGV442@hc_47OG|iqMOLxx9m5=!+^f9!PHho<)#c)Zw?+4K0od*f#?IR61 zq8)@TMz(5#yU+$rt)T_;Kye_4X4XY^sRxao!9=o#i8!O4vBh2*7rtKPZhgPapAh96l1>-fsw~vC$3r40* zs<0XM=y>JdHN?j=-Z9=TQlTR9D#y~t;Ua^0fsjaSVo;*UpCe_KebO6rDfsmpR}i-+e{WH}o{|D744tX~>YqDmj+AKq@ z=%0uvgh2^tq6EOpK)jG7UZqKIbt}1&_xHR-K9=Y0!rzL8yO9&dt2+$qq_w+oJZE{$ z`g(ug9bx}QYpEO~)DtwoJdsCnH$3of8qGke-q)vq#XW~tjE9m#N*q(=cc_QbUhP?J zvJ)&l@R7CgCX)BI9BVrP`t-VD*3d1s65}>Ak7L;ov#c^MGbiAtJ1#snRM9USOOP%> zbyV$Gq|T?Q>-_C^@-A^GAK#eap+|MT&Wk0DRb3Ed$#tCY%V?p1OSNBq(jLWp;eqng zc{52hepM6E{n1X7S&7f|!4R;}g67%W+E6NRyk2*n|l0hu(G~d0Ep2 z?sQ(HGW@8qbn$0t!#_c2@h%gXQd3UP@H`Xd{tYwVEhk4ee_~&^pwzLnfQ4!ItU7cMrHV>KLT*e7C zZ;>;Z1C(Sr=Dh;)t=ocT$}4T>NHaw5oxd;K{QssX;QaRqW@%t!_b&y(OJ2!v@F#d0 z6aawre~6X*xe1#X+1c3JIhp)7qn1e^MTA#Xz%%f5P}JTC2vuno6=Z=Z9`leZarBnX z%&qcxaKEr`e{^L3yzsjBBp|1EOp!a`U=Xq$&g z3zMi@XW*EtMQXr>D%Cb{Naxlf#Lc4CMZ3q>f=dY$lES&se8e-TTw#x8ssR>|>U5?8 zTMdJJ-gW}bj>1zXX&T;%je4RZvMy`RcVu#dTK!WKl1p4e)Tz4HL*Se(PnqoDwqTCq zF>Z)e^4leDDMpA5JWO_=hx4~rrZtTx>g~}$IbnHWoX8K!RBW{;`gCi>5i?$q;8lg? zb$M9MNZz{q`Ly*J-0Rid7^X^~GCzRXaSPZU;NS6FoqCFjS;gQ z8K-icflDi*3SuxYhDAb5H=d{y_NG#Q+P@K&DD1SpWadXX)R8%hPE~@5f#i73j-zH* zk~o$)!HoMvyzJ&J*pO}Iw^~b;YR+XsC9s-(EFrDC+YZcx@&mI~tXq9?M=pp}w=SVH z;Q?k2X35|!>#I=?8Vy1r>4npN>x&A)6Qu)qlm7We8je;Mn9o)$Zwq2lFAIM+alKT{4K+f#?GE^8WtKr^qei7$q@Ap)SeVS6^7oOTTEV9ax}+BG+ySg+-g5OIZxBk;7~T-; z%G+{{gt=vDx&vvDTtJ0L=)pM+Nzt&>9qx@5el zPt9ZeM_(}7UARgLd*@0qkz?p__tHC+E7Ml#QV}^!F}Wo5b5y=p>yucD+S+=`4CPj1 z^vbU&(AePXyB4XlvU+vYbP~pl4GYlR;JtbNh-vHBwApCTs3oH>#aIlF$O|#c|I`VWR6WWs}!O274cqGddc{!>soHx&q(q7z6fL za2OG+OoJ0UQ~6L$lAiY+YlE^s>6f~;i5QmP#8=8h+!Iue`Q^p^feR zME<|x>>n{;=3=eq;%s64ucP%n9RkiqZ~y>vH~;{e{~`8AO#Da*l^^>*vN1YU%3gUC zHRKyFnni6Ns3SV4p9#nsXhEDnPvh8NFO)_6^fPT97=cYYT67_7J}M0pk|gWTNCfgI zobQmtC5Ho40#(B;kt`@DDz~z#hI_KI$xmmbVH|JWFgB4~u>Zlk)sXobi}+Juo`#2palDQz#Q(bn|El=ls&~yDzB`> zjTAsyN1m8%IW|SQ&>oZ;EyphH^yYm&<;|Bq!RqYMm~NnmDM&#z4EBf6x~U#A6ZG%4 zl|g8#t(07OG0;lX-2f}^bEB3MrkkU+c(QOh6vtU{f)pgHwn3pHtXeg!Q{nZ{zI=$+ z!e37(%WYt`mMu29Z@#4Y2TnQC$Gm7N9uj@>1*INf|2}n+pmTa$1Daf!lG3FN9X8hk zgPL?YG2_wrZa@1kEOGDUx9+R-dQgjWR9$Sm`7$jtTt zWCjKbS!~d-EXZhC=H1cY7P4CH(@f_EkXbyS#VkT-ZV4kHp=al`>*gexE%z{FHU+t- z6N2F~BGEd`(P$p$q%}?pIn4}ylNk|8{)kWEMLUBa(~$wl3{L1$^JChq63n_=oav_E zMwUpl5sL*hGV>8y1~W!0gN%~AVodClU%W}OB>U-W?b39Fb+yMc#GEdvMo@&bw|!TG z)eqxK!bDmj8YtyL{C32VS$!eiWK35kS`8X@3Iys(+-M5-X|46Yp@C$XRu$s%G7g6y z!mBb+%6W@%XxG&TNOiI7Vj@ha-fxihvk^1oGm;}~snK^3+)r)gyg!G~ZMuRcyJ%jc zz7+Bbj_KAacT;V=l|bneIVb3or)1veD+fPQqU{b;&Zqg;yPr|rn3ZCU$vFI+NH zof6Y8t9+4yp(_&hX``rzg}?R&PkkNpSli?t=yD`ta9I}a^) z1oyeBL^XFmW}}#Le=+C)Z`FCK^k-XGI&KSPmEpQZl)2)Q;k3;yIpCAwzAh_)%T0*k zE-POw#T<>cIKMy3I{0gK{+IHo%|V8jZj2II z%YGA4<^;D@WijtSl*I&hbs5EFQ&fg?)Mf$Yf%2x!CL;u=RcEp50L}{QuSLIu7i;v3 zbH4*OOEi~lX-Q)y*yX%B8x~m3@&Q%6hJ@Ku_=ApD&HpmeEpq`fGP9Zmkh^q4yyLdrLU!!zdHo zup*yW#q2D8&F-wuhQURoBSd@8C{%s#AcW{KCZEY;Sf;~<%|(~XvP786wnV7~<1!wW zZ@Xq%CWgnpM9mHRG;S;O*|0kI`;wi70vuMvWJ+Ed4jU_>FeKziLWtOLYOc(CWiE}! z=(On(COg?dC`TG2VzT^?STIuM&@*ua6ox3Ks7AA_yk{W}W?_)5lJ~5l_pE}q*~_Fx z#BAZq2xSk)FnhmPTHXs8We;V9UB|tz4(fzLY`OIKX>^4xXkJMoG zUD_^7%jcbRO>xp;@5%E3YVp6`0UB%}(so-=$8Udkcra+V)U`FVF}p&5->D-r;ZlOA zrBvhm;2U&t6-^`#py*6&!FSB&60CfG<1;BGFWZ9j>XTAH8VEsf z3#P&D>GUtz8Ne&izGiL7?eg+(^rl%CKBpc`l8s&^lgdyvZa68MmE3FhQ(Kj*qPw;Y z1nua%+c6cl+6SHS4BlM9c(YD#T`WYsS%^|HC6npJ-F>AlR<)UB06y7TEJWR9dNP)k z8G^P&$gtey5~6g)=+B4x=8*>Tee~33H6PcA2a`c%F18**`~2$uPKTXIgRQ8X(5fkD zs`yx%t#7Z`?2L$3Ig-+AUY1+6QMs~H>9(bQvO5eRdfEZ@)u!;{f93z@;{U8GY3z>x z0MJMb06_IW6#sun)BmsZSF1yND=(*i=X#Mdv+n_=`$LXIbwNS+LjV)Tfy5&~kbne` z03yXPkN`u%Fk6@g#A@ovXg2fpM`#KRcPL*p8Y1j;Zk<~;Z`Ii1YiYUE+q!IQx!_kT z27Tsw9Xp(u)?MGU-cM%Te9Ut0yw13NoxJy4Se52@0RD=$NBW|n=otdGv zT6L@x-O^Pfdttf?sGsSy+2&H|fv#PnIez1L+1^HxM6j#$MjUu_w2+L|c zrS_ssN29T(q$L<>6qX*lW|8l*h!SeYD5q@*-_NNbfn=+eki|meW*aYvB8Cw&A~rQB_Vwoql0Br zZ3Fil+J$VuXQc~^<|%Jwh>50DifKt|7U}j9Qsiw=W&?C4LzladaWu;kn0jpC09XzO z9|y@ z%fK%yMZB){zK|sEX#bWZ9&>#q$)5f`5z2H=t|A`yXjXFL@%LExZR7hR#m4yW`_A+^KO)T|hoDvAIGf`Q$f`8);JEvD_i_ zkn58emODjf=NNJ0x?_C2zJ4w+#!7%~65~%Ill8=sdwg)@mZ2V86t9;SnFs;-YlF*O z(XaB`>|^BQGjkiw3zv~&>7n*0zfq5RS*AYZGT-s&?uv2`K!(=Nd|Vfe)2F{!S(I@j z#axR!OPzv~eWCG_EK$}n<}1oole|)seaXtQc@~5}G5vl?yV7O8Bkq!2zl6JjS{*6K z&L0ZN5oRxTCqj`K0-c%O`_e|2b7XnG3=2W}^m)`Uam~?8VirGgSBfk*`$}IWd&Y_x zbAkSj^;%Equr$&!NZ0Wy*kk?dYz=`X?9jvK1Dsh%F@>(Pz)yk7S;(oHkA@3+su*2?GpW^e|Er$5JO()@h8(Fs!#EIt1f-G(Y+-3E#tRk~ev&Mw7|M z8uAwM2C8g_3U4--BhAWat8eJ%NFs9beR96J8VOGB0!HN3`OUPzC^M~fdlP$>(ObzZ zJemY*bG~>{J2~QUbLP`Lg;k6=1s?n;uOM>TTd?#KL~7s5Z0^LQe4++fj4>kY;UIaX z4n$XfP6&SEtYLD4TuQNqy95&cO&>Yw9VOcb`DO0KY3ll$-|S~F&Cct)5)iurnl*X~ zUND6ZT29LVqgebm%GAODMGD*nUm6*X>-8$@4)L`nk+r3K>-7q2sCvu;SX(3J73|BR;NgjZ-zElmO$-FIG+E}D z7)>x)R+t>KOm&+~_B~8>f|zZ;FxAUpsuaOgse#ccfoIjg=v2XU^I)_KV5$_r=v2Vy zl)&iJz$91SlP@BZE=DPHbBn!otGs<%?mfcqUqM`mVqFTxD-!KoN-AXYm(z8*g3{&G ztKPuBW`f6e%I)KAbQ`YWQ1$?$kX0xUsS)O+rRO3T6*5D{*LkED(c((&9D~bWLR)WR zQ)(Je*z3b-M^E<%vqpOfz9(K=fBUI?aPv35y89{tF}J_cU?>|HvgNMg@RhfF%RVq+ z=W}$=gO*1R`Ovs>kR2!E^*e7bEvoNVa)%^yu~8WJ2(SE!hYGK1CRRbxFcYgFT`&|w zlQ8ba<z8W(OZ`z0_MOw2KOOY^+#9gC^uXZhxA=${3*6g*;Dp{9x4zm?;9@>x}$|s75F>8g{jGje&kT zq+NmyC*LH>K}MDhLF>X8xE?y&nxJK79L#X~=ZTd=gTML(0~>-ie-tbTJB*P~yl3y4 zHHD%aM<%SuIjUKs|89waH9?yP26n_!;;iY<`O`nn;rTORL0aLAfcxdyuu&)qh4(PP z|4{bVbGk3iSOYpIu#XM%Vv%57gFf;-f^CsZCZ9A-~k4>da4XQsOH}M4M6p+`XNBIIL8d2X8bJ;xVgxH;XiJT zxOu3MQjQFs@H2ZiM;L*%4GZl7Yqydk1C?WUl@5$G{je`s*Mk5d3}bR-wFf%hz~6yZ zB7il>$oAb7qwFHQwg_7Gg<%I|4z#vt;P#O(e72~y`nB%Z??a<)GEN6tnvk}u$NIf3 zSt@EJB^6SQ-Ap=4yk&o4WHtHMS{Kpfa!nfO_b*zXTHfedo?71Nnx8s+^y;5Fy!D!& zT3&0MI}Dkun09TW1^_|q*U+eU7UYG=RUD*+EvbREt=9xW`2q;TvE3WE9+(7 zoIi#r`B-`DH9oDpf!TDs^w|CJr0uz|?w;dCa}rtQ(n7NZgY^n-s8 z-#LoMGyW#TJM-dM801+X=2<8_9X9HE9<>qcWb$AUApfB8Xp$>q)LW68HPqWs@V1(s zBHYwHqH^t)k1thg`?U4jCY+*iecd`j%~9+%gK$&B^yg+QX!?UO(5)hxZr$5x&_@fG z>sx6JvEzf&AUMJCMfn9+PsTm5|AKK*W@di&P&E>w?$K?m(V7;MBU18}g__=^2p{ZQwgi;(A&?wd7)F_l$UFY@a)d85coL|=!4fq&hgDGZD{vx z@z$4&*~H@!CoE6;vb;oO!>hRO^}=_U`hxcg2g6q>hA-D)(tNWwOnTz1()K}@E*Z1u z0Qd?-o6oHn&mPH}%U|maA;zZe1XRvx>DbC&+er;8Mz!fEz}WpZjP|m%rGtvsdqN;O z8I1gaXSG*F#;sZ_N;W%KwZ>*)%wVb9s! z6Pv>;p1UJg%P+dqW1*s$!oTpvAK-UfmN#RkrMp`83WqcLzUhU;`jL_l+35|6FF#TE z1@-|=%Fc?u=a$5?!W$iE+adcviq!?RU-1Zp3 z43 zL+*ob_Fl`k$>$gUXAGY^KK7m0Bz`f^76}NgX-Bbz#jJJ^Jgq5K6=ky7At$+iDGqdN zfp$m?xdNeV-)Hy}KOdiDHpdOe@`J=h@BFMB?+^g|=RV;l>&_r*0^addAHo-zkD`wv zn`t&HTTtp5K`KAJP$7&|t7;n za3|Pcf#9wImhamiyZct{Zg+Kcb#?W*zwfEjkFU2?#pEgFs!UCG)&fUx_0Oolzh&nj^*?9}}HTPE0_jGj<4O7wlm zNG0jK8|K2%%96}HUMUGBP^zu9tv%)jnv90c88+>9 z8?p*-?Dy5JrQMC_JLf?UcavpEdnSJzwe%K{p&0p6^F4m4C1Otg6|ZssavO8;6mp)8 zr>5~eQDlXjqi~vA~`T@-9=0<&{DB2U{+}wHfTu z0c#iGUv`z2LX}*8WaA-?&&{^HvK52((JpAC^E67z#|xRI)wD}TRzQhf8A>&whh`Rs z&aw&6>5k@ff}*ISJo7Zu9|e04jHsL$bA9+Zr9tAA@z}|xju+x=%F?)2j~))b(WP_@ z-P%nNgBFgZ;zPpNZw^$!!pEK3Iw!S|VdgNx3KgJ37FQ%+msRO_zdM0Ifi;28+LmB~ z6=QkL!Hfj`aB#;0O;xY*)40aM(&6Ib7vY+UNErvpFSa9&6M4665J4R4Al7InL*s_0 zW*W6UWZPNK=O7WsC9?HrbCGSKdPV#%^XJP?r@@ygtiQUjd5>z$#@L^)XLXg5r$)gb z0Dy=Y0El}LR307}S)P!84t}~z+8k=EOh`*bjdNAjX_p&>&#`R~vFdCEHDsfPAv)_o z&biTbTZXMc*3D5h&X2#Yz^r3?t?SM^Js96F6{w?@QD{_8@7BQYiT&qD{D^$tJSlye z{5U)2t=_!ae9ZJ!{7n5j0+61aw~T+<&kQ#)m5jYeUBbl@t^HbEM{8G&xi)#*OIrC* zb#)2%oeJ)tdv(B;T+;F{^4y#Z1A{=t816YbOp&9Bw2N{B%h)FKsHit~R$cvbVdbf! zV|6|_(38NhQF`fdOb5s6i5=cYNU-{VNqk$)D&L8R&H$ja5jP*%sb+*@u?g~PS&Vkg za@pL9*1Mff&QTPK@B4MBn_~{tt3WBoEealiQ~21P7z-$%8{$T2(&fge9feEN6&Y## zlAT;=D%`^n!=myD4n;_(mdRSjNqU}Y9LBc&Xezwn`~-ST24LvvB)Ry;ljZ-VRw@$bC!qhUfbiuzj`j21d~-v z$ne3lVI(Bm|L9xBga7JuaM4dX7mu!9^fw+ZYVIqa3OkNjyyi0Ixc|T&{EBTZ&!$q^ zc=7{#vCMB$d)7##jbwbTgsrFV^|EQW*c*$MZ(5L(NGvvsE&|{1)gja`rG4Glq5YUu zj0H!5@KPYwLC;gCwLO&lh6vn&BG2^ z?7mq2^4m+qzQ>`lTKaf(RqVAhnT~_%;O^&w1CymEEa_r(&Up1d%|e+F*y)^*`s#h@ zpS8AtlZmx}`zffWYj55=li&9mV;ZozjuNIbLGOv4UC!WYR)3fMmSKh*hd~Nkvp03w z68_8mOrzS4E1aG7_h$CzRi)jQ#CthPuIX1q=vSu!v)14rh6V@6JHK!q2DT~$JohN9 zR(;(9`l)XKuJVky;MMYJ$q+!FNgY9;1!0@uRf7Wvq*Tm^aFh0aN=;G%gk;&vD}OXp zQ-U6_#uTEWm~kP#PfepsNRF4`}i8VQiY>giZqe31q6> z$l+Ip!(2!n61inj_3;ETq0ii2m(#b)G-IwrrJzNuPHrtpv^3|fh|i(LIZ>TD2%Gz^ zvYAoN8^~=~`xx`Mg0jjwjZS%YAz3ske$({w@1;!kKf2u@(W&+|9g(gfU)koNlA98+ z81KY#fowG4!4OcPGR^Qoy9B*)r|;8iis{4+=>*O-;)`-3 zI`fe?e^(%?N?VwPyYN2PQ1FarkTY_lsLlhfvb!7nQMX8+)E7Bc-~n)WrDxBqj{H?%5l7D$|@J}ajh-? zDAIvw7T|;f0GP1@02r@DR9{P|>-@XQnz4!J${-=+wsy&*OveGaERWxTd@uIYR(M&)Wuo%vmy{Tnty$^k%&F38h(TD(u+RG0tt`>u^i24_AYpU2A0n$;@e zmb2%Flky*i)!+J8a^~kRApQ-;@xDU7TYV30K;Ok?Um*kP^{quDG4CIy8yg(KcOe_e zA+^7^l;_)K5t#RWb9D&v1%JtM6J6&2qF0ZPkn5${q^XiT@tXHW z_WR5gN>y{aRAx|lH6R02M1?J#*f(ML8J=`lMJ}BZP*QhjJSwN=nSg6~vL#0&k=2I9 zT*?E|bq~p^m)T6d?8m!Wyga8i@qwrW1A+Y5E`X|HoNhJ!RvKJc7hM#2W`PzDImSPE(BdObaDY&j{aa7xT?`C{ao$$U{H-s<24 zU~(ythv~4^L59Wfb_UK6UXo@OAL8}i);4;aNy zSP9O@b?jZYlcvfUZOmwKi5mrLiM)_rs!sX@v}o=bZS;LkiZ_gaoC)fx3_`$2_*}v& zKkW;jDJxKo2cYstMoHcjbsrfV68)y*dnwFP4V=*z@*|R+pz)fH69zcYY7#rb#DM!n zJLXR--nt)vBq|}zD*z78s&*@_h5*>anM0A?8@5rq#U@s|3)WSv$PovGW{NJ~Di5IF zcJD{;TUPhh44Y+QJmzuwl9GfpAb*8R&e9jN_h69c$sF8^)dX2u_b~xC*K+OBh@ zMPdl*J0r$bWt8BcSNgtn(27Zob77dSn9_?hMb4xNPVw?%V*g{Mr5>C2n8v({N=led zk#*x}(#Fw9JB7KPjPx~xMqsRv_16E1L%Oy0+)fOV zi@;;s@bm>Ps5jD>>{`+izd#eyAU_sSDau)<3U*tb&Q)JR0=&j@T0>m&*+#DG3s-Tag6V|~ruB6Te{Y7psp+W@$xu>4_NM@JYrSjTgx9L?azz)OqC{Y`Am0u* z#G#;|m+#|*#wC{US25`OJKQ{x=i@*KHKz`!xP04idCi%l(P)yV~lmqP-AQ zxhq`K8z*`?!*P9(E6asx-lV$DU5v$$bu{K*_T3Szn7bt^XI7uWF?p$XaJIS;JB41I z8p_h;5OP`w*=iF%$dz+Z(XZjkn&#mH=W|>mdUFtY5_M*VVUnq7P<6gDxSk)XWh9kB zkQIt3jk>SOp6CacEF;Xo-C>Re$^t?FL25r1hXvlw{-mE273P5iqE!#Me0S$XS;mb1 z{6p_d3E_JHHv{~=lECc~wF^lbhasHEf;B|}jak?wWVPG4jt=qth9c_K9oGI>>B6*7 zzTr-giTdRmB77t9<#SaLCMQdjCmzqK8ri8QiL(hLcAcjXG-Qq;ATu8GehY0IfmngS zCDoKSuqh2E&d^*l=D}WParm+j^(!*$^9wO>U@4Rm-@O~(b`l*8+&eObcvM_hb@Yh5 zqBa{kJ2Dz$X8xl-h3sg25*&@dmYTfUhASjGY`#}ApPu&v=?aZ9VW#M2H#T^avj|Ht z?}88)hC`xcbKQ94CnXH@ZRz|K_MrOuRqCGOWI(dpi$h{WdM=$IRzgxqJH4wilHFX*|{=Jz<27lUb$|JbDi5Mhimsk=qQO~O&k zBkHf->x+)CqCzk80Mq5)wcpzi!CSBnwW50@G=I)(I0)O4h%7A?Ww(@-Fw%Hp-l=g z@w5rN-@P|dc?h6cC#GOg69LIE!cZYQj(6TDh12Jo^$FWiEHvn2b-I)o)N4q+R;9^8 zgrr%8KuYbl`-XGWt&ieE$#KE4tvnx)NlQ#^W2U4tdaS>Qh-@DvqZ1eGH0o+3=$p~m z%e_1f;+Tn-)Nco+tyKmL z4Z%*%LxOj{#>4TC>HOm+j)KL9hrv*U_H)CXIO@*({qM02S*n(dL>cjYTJ6g?Oxw!D zNe=1iJ{v)5XjC=p-{t`bQ_`@ivgVq}z6x&<=up&67Q%Q??$)8DS6MYEIJKbEj|kd) z=4!blnH}!7jDZ6S=cw}6gyqNjhfpSMCt+RA{TwjDFZ~u~&xUoF1)#v{*HO$Z zG{0i0>R-yxTjimj(OnpK_>z`1G}x9r+tV4eI~187c0$tje!)e9R}7}s!$f=Flxf(U z$}&pspU0%av?NQ2FrxF6u&nZXotg*dx#t^Hj5dS-p>km<_h29?HL2^8wQNo7x~WntbUrJY(q@fU;HjN z%>zwW*EsZVp@%Z?YjrHixOtFCm83m*J~@(QqTb$=q>cIfF)v` z9(X^=Q`;>j&5JcxfU=m>Ev)a1H)aNTI#4ZV|(%SnQii$c6%;d z>Aw*xM_2@!-JuRxNUu7XkIu^Ph2U?xBbYiW44S}H9gVF0p=6shv21mqjNN+{jB z4{@57OYYx5!F8@oW|(T%G&!AD$tuwv?)f^MlL(9)HPK~gau20=uOtwr$=Fgo-T1u# zHQCXYt$CJI{2O*HV##L&)7mo^vG$;-2zV=~0h%JnuPmO}!`xodKDRY=UHDs5pk1Qg zyM^~10^%-SBiYvdnJHb&Z&i{(uw=FzfK26eO) z{EuJ#IK26czsc8E3~{EAvxeENBleg8FxOY9I=*`Vg-N0nr;1bwq zsdKJ4{6_Dn(T`vPc$X9%DGx;N`(qwVpGvxy|H8K5P(t7lbj0@}2G8EH5S)K9KouPh zyst!>2*2NYWTOP~3zA4=i}^^eD$9qbi1GFO3A~b5S+r@UP4Rqm#3kE$sKr&p|Crj@ z?={1rEPch#GTPfc8S&k2Mqrzd@!g*2a#>zwi({vwcyRL-Y$8bJVr!gXBtQL#!Z>b_XHJb zuQ_K{rb0={dcJ+vvrpPmHWQG0Z=%p7M*PlSl+xU|l@H&z4omj7wnn{zV@@$_M93mu zPP8?f)txI5KER~_2qX?R+rz7!?0g$C*-ij{&m>&Z6%}?!049*-_E}h5!Hwrk$krA6 z5SA<{uf9ur4EUyqB)V!oLAkbi3d>=tf3ugASs~o9A4a+m_h-C3_#SCKqI>pSeBFd| zwSDkhmCQrYx@!2D!%VL15L}=gN3;Mt&b`oAP`k~C>j^G}nXbYY?=G4?2 zl0+vh5hmHa3r(6tNLb8sl|du3mX(WpqrK=V$j_0MmSTo#BNE~EvdUI|8rojFu*fB4 zYka|g`NVRvxgjFMv#fZ0g~imtKTPcx7y6QPB?@%qT`{hRMW-E(U635>o^Crvg+oaP zj7t0d1s4>2qVGIWpA-l_r`A+~gC{`v-$A{vo%z2m|A^6l>iyG|_%FR0h5znR{PW#EjfVevhxcl5{5RV{Qw0h6Uzdol69WzaC^z`m G=|2E61+s+z literal 0 HcmV?d00001 From 5e11ffaf9ecd4bdcd163b099f29381cf502d7e65 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:37:43 +0900 Subject: [PATCH 1428/2115] refactor acctest: use awstypes --- internal/service/opensearch/package_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index 6ac44adb115f..6882c8441a23 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -38,7 +38,7 @@ func TestAccOpenSearchPackage_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "package_id"), resource.TestCheckResourceAttr(resourceName, "package_name", pkgName), resource.TestCheckResourceAttr(resourceName, "package_source.#", "1"), - resource.TestCheckResourceAttr(resourceName, "package_type", "TXT-DICTIONARY"), + resource.TestCheckResourceAttr(resourceName, "package_type", string(awstypes.PackageTypeTxtDictionary)), ), }, { From 9b9b984c5cea4c3a79f484aaf8e78e7d2458582a Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:38:08 +0900 Subject: [PATCH 1429/2115] Fixed the expected value in the acctest brought by the AWS API change --- internal/service/opensearch/package_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index 6882c8441a23..3ab4df715af6 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -33,7 +33,7 @@ func TestAccOpenSearchPackage_basic(t *testing.T) { Config: testAccPackageConfig_basic(pkgName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPackageExists(ctx, resourceName), - resource.TestCheckResourceAttr(resourceName, "available_package_version", ""), + resource.TestCheckResourceAttr(resourceName, "available_package_version", "v1"), resource.TestCheckResourceAttr(resourceName, "package_description", ""), resource.TestCheckResourceAttrSet(resourceName, "package_id"), resource.TestCheckResourceAttr(resourceName, "package_name", pkgName), From bd43654636183da54c4708383696cbbcdcfa246e Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:40:11 +0900 Subject: [PATCH 1430/2115] Implement waiter for package validation --- internal/service/opensearch/package.go | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/internal/service/opensearch/package.go b/internal/service/opensearch/package.go index c8f8a16f1b2a..fc085c2b41c2 100644 --- a/internal/service/opensearch/package.go +++ b/internal/service/opensearch/package.go @@ -5,7 +5,9 @@ package opensearch import ( "context" + "fmt" "log" + "time" "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws" @@ -117,6 +119,9 @@ func resourcePackageCreate(ctx context.Context, d *schema.ResourceData, meta any d.SetId(aws.ToString(output.PackageDetails.PackageID)) + if _, err := waitPackageValidationCompleted(ctx, conn, d.Id()); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for package validation (%s) completed: %s", d.Id(), err) + } return append(diags, resourcePackageRead(ctx, d, meta)...) } @@ -242,3 +247,46 @@ func expandPackageSource(v any) *awstypes.PackageSource { S3Key: aws.String(v.(map[string]any)["s3_key"].(string)), } } + +func waitPackageValidationCompleted(ctx context.Context, conn *opensearch.Client, id string) (*opensearch.DescribePackagesOutput, error) { + stateConf := &retry.StateChangeConf{ + Pending: []string{"COPYING", "VALIDATING"}, + Target: []string{"AVAILABLE"}, + Refresh: statusPackageValidation(ctx, conn, id), + Timeout: 20 * time.Minute, + MinTimeout: 15 * time.Second, + Delay: 30 * time.Second, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + + if output, ok := outputRaw.(*opensearch.DescribePackagesOutput); ok { + return output, err + } + + return nil, err +} + +func statusPackageValidation(ctx context.Context, conn *opensearch.Client, id string) retry.StateRefreshFunc { + return func() (any, string, error) { + output, err := findPackageByID(ctx, conn, id) + + if tfresource.NotFound(err) { + return nil, "", nil + } + + if err != nil { + return nil, "", err + } + + if output == nil { + return nil, "", nil + } + + if output.ErrorDetails != nil { + return nil, string(output.PackageStatus), fmt.Errorf("package validation failed: %s, %s, %s", string(output.PackageStatus), aws.ToString(output.ErrorDetails.ErrorType), aws.ToString(output.ErrorDetails.ErrorMessage)) + } + + return output, string(output.PackageStatus), nil + } +} From 043b4b59355698389a04fdc945c9cfbb7a203fa8 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:40:35 +0900 Subject: [PATCH 1431/2115] Add a test case where the validation fails due to incompatible engine_version --- internal/service/opensearch/package_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index 3ab4df715af6..615d03a4a831 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/opensearch/types" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -87,6 +88,11 @@ func TestAccOpenSearchPackage_packageTypeZipPlugin(t *testing.T) { "package_source", // This isn't returned by the API }, }, + { + // If engin_version is different from specified in the plugin zip file, it should return an error + Config: testAccPackageConfig_packageTypeZipPlugin(pkgName, "OpenSearch_2.11"), + ExpectError: regexache.MustCompile(`doesn't matches with the provided EngineVersion`), + }, }, }) } From 8dd6a3f4e9aacc8b5a9907f48881d856532354f0 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 19:50:40 +0900 Subject: [PATCH 1432/2115] Update the documentation to include description of engine_version --- website/docs/r/opensearch_package.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/r/opensearch_package.html.markdown b/website/docs/r/opensearch_package.html.markdown index fd71fe9fbbb3..f0fbf3dabdb0 100644 --- a/website/docs/r/opensearch_package.html.markdown +++ b/website/docs/r/opensearch_package.html.markdown @@ -41,8 +41,9 @@ resource "aws_opensearch_package" "example" { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `engine_version` - (Optional, Forces new resources) Engine version that the package is compatible with. This argument is required and only valid when `package_type` is `ZIP-PLUGIN`. Format: `OpenSearch_X.Y` or `Elasticsearch_X.Y`, where `X` and `Y` are the major and minor version numbers, respectively. * `package_name` - (Required, Forces new resource) Unique name for the package. -* `package_type` - (Required, Forces new resource) The type of package. +* `package_type` - (Required, Forces new resource) The type of package. Valid values are `TXT-DICTIONARY`, `ZIP-PLUGIN`, `PACKAGE-LICENSE` and `PACKAGE-CONFIG`. * `package_source` - (Required, Forces new resource) Configuration block for the package source options. * `package_description` - (Optional, Forces new resource) Description of the package. From dc9305b77d07006123b3e26ebc84ebd509477503 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 20:21:05 +0900 Subject: [PATCH 1433/2115] Remove an trailing space --- website/docs/r/opensearch_package.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/opensearch_package.html.markdown b/website/docs/r/opensearch_package.html.markdown index f0fbf3dabdb0..625d22cdcd4a 100644 --- a/website/docs/r/opensearch_package.html.markdown +++ b/website/docs/r/opensearch_package.html.markdown @@ -43,7 +43,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `engine_version` - (Optional, Forces new resources) Engine version that the package is compatible with. This argument is required and only valid when `package_type` is `ZIP-PLUGIN`. Format: `OpenSearch_X.Y` or `Elasticsearch_X.Y`, where `X` and `Y` are the major and minor version numbers, respectively. * `package_name` - (Required, Forces new resource) Unique name for the package. -* `package_type` - (Required, Forces new resource) The type of package. Valid values are `TXT-DICTIONARY`, `ZIP-PLUGIN`, `PACKAGE-LICENSE` and `PACKAGE-CONFIG`. +* `package_type` - (Required, Forces new resource) The type of package. Valid values are `TXT-DICTIONARY`, `ZIP-PLUGIN`, `PACKAGE-LICENSE` and `PACKAGE-CONFIG`. * `package_source` - (Required, Forces new resource) Configuration block for the package source options. * `package_description` - (Optional, Forces new resource) Description of the package. From 028b5f68a13c2e75f3683b41dfda3606ee8c5365 Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 20:23:58 +0900 Subject: [PATCH 1434/2115] add changelog --- .changelog/44155.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/44155.txt diff --git a/.changelog/44155.txt b/.changelog/44155.txt new file mode 100644 index 000000000000..b84347244f6e --- /dev/null +++ b/.changelog/44155.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +resource/aws_opensearch_package: Add `engine_version` argument +``` + +```release-note:enhancement +resource/aws_opensearch_package: Add waiter to ensure package validation completes +``` From 507d3eca0d2c5efa70a717fd6f607e01aa3d738f Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 20:35:42 +0900 Subject: [PATCH 1435/2115] Rename a zip file used in acc test --- internal/service/opensearch/package_test.go | 8 ++++---- ...rch-plugin.zip => example-opensearch-plugin.zip} | Bin 2 files changed, 4 insertions(+), 4 deletions(-) rename internal/service/opensearch/test-fixtures/{example-dummy-opensearch-plugin.zip => example-opensearch-plugin.zip} (100%) diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index 615d03a4a831..ce426f0f6b34 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -192,17 +192,17 @@ resource "aws_s3_bucket" "test" { } -# example-dummy-opensearch-plugin.zip was created from the sample repository provided by AWS using the following commands: +# example-opensearch-plugin.zip was created from the sample repository provided by AWS using the following commands: # > git clone https://github.com/aws-samples/kr-tech-blog-sample-code.git # > cd kr-tech-blog-sample-code/opensearch_custom_plugin # > gradele build -# > cp build/distributions/opensearch-custom-plugin-1.0.0.zip terraform-provider-aws/internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip +# > cp build/distributions/opensearch-custom-plugin-1.0.0.zip terraform-provider-aws/internal/service/opensearch/test-fixtures/example-opensearch-plugin.zip resource "aws_s3_object" "test" { bucket = aws_s3_bucket.test.bucket key = %[1]q - source = "./test-fixtures/example-dummy-opensearch-plugin.zip" - etag = filemd5("./test-fixtures/example-dummy-opensearch-plugin.zip") + source = "./test-fixtures/example-opensearch-plugin.zip" + etag = filemd5("./test-fixtures/example-opensearch-plugin.zip") } resource "aws_opensearch_package" "test" { diff --git a/internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip b/internal/service/opensearch/test-fixtures/example-opensearch-plugin.zip similarity index 100% rename from internal/service/opensearch/test-fixtures/example-dummy-opensearch-plugin.zip rename to internal/service/opensearch/test-fixtures/example-opensearch-plugin.zip From 1deb81cc783c38abc86f5e742767defcd989301b Mon Sep 17 00:00:00 2001 From: tabito Date: Fri, 5 Sep 2025 20:55:00 +0900 Subject: [PATCH 1436/2115] replace `engine_version` with names.AttrEngineVersion --- internal/service/opensearch/package.go | 6 +++--- internal/service/opensearch/package_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/opensearch/package.go b/internal/service/opensearch/package.go index fc085c2b41c2..45e63a30ce1b 100644 --- a/internal/service/opensearch/package.go +++ b/internal/service/opensearch/package.go @@ -42,7 +42,7 @@ func resourcePackage() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "engine_version": { + names.AttrEngineVersion: { Type: schema.TypeString, Optional: true, ForceNew: true, @@ -103,7 +103,7 @@ func resourcePackageCreate(ctx context.Context, d *schema.ResourceData, meta any PackageType: awstypes.PackageType(d.Get("package_type").(string)), } - if v, ok := d.GetOk("engine_version"); ok { + if v, ok := d.GetOk(names.AttrEngineVersion); ok { input.EngineVersion = aws.String(v.(string)) } @@ -142,7 +142,7 @@ func resourcePackageRead(ctx context.Context, d *schema.ResourceData, meta any) } d.Set("available_package_version", pkg.AvailablePackageVersion) - d.Set("engine_version", pkg.EngineVersion) + d.Set(names.AttrEngineVersion, pkg.EngineVersion) d.Set("package_description", pkg.PackageDescription) d.Set("package_id", pkg.PackageID) d.Set("package_name", pkg.PackageName) diff --git a/internal/service/opensearch/package_test.go b/internal/service/opensearch/package_test.go index ce426f0f6b34..f1ad8019f51f 100644 --- a/internal/service/opensearch/package_test.go +++ b/internal/service/opensearch/package_test.go @@ -71,7 +71,7 @@ func TestAccOpenSearchPackage_packageTypeZipPlugin(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPackageExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "available_package_version", "v1"), - resource.TestCheckResourceAttr(resourceName, "engine_version", "OpenSearch_2.17"), + resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "OpenSearch_2.17"), resource.TestCheckResourceAttr(resourceName, "package_description", ""), resource.TestCheckResourceAttrSet(resourceName, "package_id"), resource.TestCheckResourceAttr(resourceName, "package_name", pkgName), From 8874d808708c93806ee56c56fbd381f44108167d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 11:59:51 -0400 Subject: [PATCH 1437/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - mediapackage.aws_media_package_channel. --- internal/service/mediapackage/channel.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/service/mediapackage/channel.go b/internal/service/mediapackage/channel.go index 1ffa1c6e0c1b..5036619ae9ff 100644 --- a/internal/service/mediapackage/channel.go +++ b/internal/service/mediapackage/channel.go @@ -172,20 +172,18 @@ func resourceChannelDelete(ctx context.Context, d *schema.ResourceData, meta any dcinput := &mediapackage.DescribeChannelInput{ Id: aws.String(d.Id()), } - err = retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { + err = tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DescribeChannel(ctx, dcinput) if err != nil { var nfe *types.NotFoundException if errors.As(err, &nfe) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("MediaPackage Channel (%s) still exists", d.Id())) + return tfresource.RetryableError(fmt.Errorf("MediaPackage Channel (%s) still exists", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = conn.DescribeChannel(ctx, dcinput) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "waiting for MediaPackage Channel (%s) deletion: %s", d.Id(), err) } From 469ecac612585c23bff7d9a6aebfa6be3d59d2b6 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 12:06:22 -0400 Subject: [PATCH 1438/2115] Account for AWS unconfigured return value --- internal/service/dynamodb/table.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 8e56d811282f..8d78bd9ab5dc 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -2663,6 +2663,15 @@ func flattenTableWarmThroughput(apiObject *awstypes.TableWarmThroughputDescripti return []any{} } + // Only flatten warm throughput if it meets the minimum requirements + // AWS may return values below the minimum when warm throughput is not actually configured + readUnits := aws.ToInt64(apiObject.ReadUnitsPerSecond) + writeUnits := aws.ToInt64(apiObject.WriteUnitsPerSecond) + + if readUnits < 12000 || writeUnits < 4000 { + return []any{} + } + m := map[string]any{} if v := apiObject.ReadUnitsPerSecond; v != nil { @@ -2681,6 +2690,15 @@ func flattenGSIWarmThroughput(apiObject *awstypes.GlobalSecondaryIndexWarmThroug return []any{} } + // Only flatten warm throughput if it meets the minimum requirements + // AWS may return values below the minimum when warm throughput is not actually configured + readUnits := aws.ToInt64(apiObject.ReadUnitsPerSecond) + writeUnits := aws.ToInt64(apiObject.WriteUnitsPerSecond) + + if readUnits < 12000 || writeUnits < 4000 { + return []any{} + } + m := map[string]any{} if v := apiObject.ReadUnitsPerSecond; v != nil { From 91d37398d7639e735d6e1008309e5759c3253211 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:06:48 -0400 Subject: [PATCH 1439/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - route53recoveryreadiness.aws_route53recoveryreadiness_cell. --- internal/service/route53recoveryreadiness/cell.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/service/route53recoveryreadiness/cell.go b/internal/service/route53recoveryreadiness/cell.go index 1306bdce5575..974837fd1ac5 100644 --- a/internal/service/route53recoveryreadiness/cell.go +++ b/internal/service/route53recoveryreadiness/cell.go @@ -157,19 +157,17 @@ func resourceCellDelete(ctx context.Context, d *schema.ResourceData, meta any) d return sdkdiag.AppendErrorf(diags, "deleting Route53 Recovery Readiness Cell (%s): %s", d.Id(), err) } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err := findCellByName(ctx, conn, d.Id()) if err != nil { if tfresource.NotFound(err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Cell (%s) still exists", d.Id())) + return tfresource.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Cell (%s) still exists", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = findCellByName(ctx, conn, d.Id()) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Route 53 Recovery Readiness Cell (%s) deletion: %s", d.Id(), err) } From 242a63a8646771ce70838b526ceaad9da5bff9ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:06:52 -0400 Subject: [PATCH 1440/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - route53recoveryreadiness.aws_route53recoveryreadiness_readiness_check. --- .../route53recoveryreadiness/readiness_check.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/service/route53recoveryreadiness/readiness_check.go b/internal/service/route53recoveryreadiness/readiness_check.go index b61e40049493..58ef38c258b5 100644 --- a/internal/service/route53recoveryreadiness/readiness_check.go +++ b/internal/service/route53recoveryreadiness/readiness_check.go @@ -144,21 +144,17 @@ func resourceReadinessCheckDelete(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "deleting Route53 Recovery Readiness Readiness Check (%s): %s", d.Id(), err) } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err = findReadinessCheckByName(ctx, conn, d.Id()) if err != nil { if tfresource.NotFound(err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Readiness Check (%s) still exists", d.Id())) + return tfresource.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Readiness Check (%s) still exists", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = findReadinessCheckByName(ctx, conn, d.Id()) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Route 53 Recovery Readiness Readiness Check (%s) deletion: %s", d.Id(), err) } From c688104770921e33e0a74b21a7d62acb6468232c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:06:55 -0400 Subject: [PATCH 1441/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - route53recoveryreadiness.aws_route53recoveryreadiness_recovery_group. --- .../service/route53recoveryreadiness/recovery_group.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/internal/service/route53recoveryreadiness/recovery_group.go b/internal/service/route53recoveryreadiness/recovery_group.go index 44813642f753..e6ceca3624d1 100644 --- a/internal/service/route53recoveryreadiness/recovery_group.go +++ b/internal/service/route53recoveryreadiness/recovery_group.go @@ -148,21 +148,17 @@ func resourceRecoveryGroupDelete(ctx context.Context, d *schema.ResourceData, me return sdkdiag.AppendErrorf(diags, "deleting Route53 Recovery Readiness Recovery Group (%s): %s", d.Id(), err) } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err := findRecoveryGroupByName(ctx, conn, d.Id()) if err != nil { if tfresource.NotFound(err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("Route53 Recovery Readiness Recovery Group (%s) still exists", d.Id())) + return tfresource.RetryableError(fmt.Errorf("Route53 Recovery Readiness Recovery Group (%s) still exists", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = findRecoveryGroupByName(ctx, conn, d.Id()) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Route53 Recovery Readiness Recovery Group (%s) deletion: %s", d.Id(), err) } From fa4ea245db9d02380fa6367b8f2b5d2ccf0db9c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:06:59 -0400 Subject: [PATCH 1442/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - route53recoveryreadiness.aws_route53recoveryreadiness_resource_set. --- .../service/route53recoveryreadiness/resource_set.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/service/route53recoveryreadiness/resource_set.go b/internal/service/route53recoveryreadiness/resource_set.go index 3b63f7d60708..c27407397b4f 100644 --- a/internal/service/route53recoveryreadiness/resource_set.go +++ b/internal/service/route53recoveryreadiness/resource_set.go @@ -238,19 +238,17 @@ func resourceResourceSetDelete(ctx context.Context, d *schema.ResourceData, meta return sdkdiag.AppendErrorf(diags, "deleting Route53 Recovery Readiness Resource Set (%s): %s", d.Id(), err) } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err := findResourceSetByName(ctx, conn, d.Id()) if err != nil { if tfresource.NotFound(err) { return nil } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } - return retry.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Resource Set (%s) still exists", d.Id())) + return tfresource.RetryableError(fmt.Errorf("Route 53 Recovery Readiness Resource Set (%s) still exists", d.Id())) }) - if tfresource.TimedOut(err) { - _, err = findResourceSetByName(ctx, conn, d.Id()) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "waiting for Route 53 Recovery Readiness Resource Set (%s) deletion: %s", d.Id(), err) } From 6d0c497f64a33854fc098c0de13d04c9db55a7fa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:15:50 -0400 Subject: [PATCH 1443/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - sagemaker.aws_sagemaker_feature_group. --- internal/service/sagemaker/feature_group.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/service/sagemaker/feature_group.go b/internal/service/sagemaker/feature_group.go index ebcbe5a76afb..dbe2e3bf63fe 100644 --- a/internal/service/sagemaker/feature_group.go +++ b/internal/service/sagemaker/feature_group.go @@ -344,23 +344,20 @@ func resourceFeatureGroupCreate(ctx context.Context, d *schema.ResourceData, met } log.Printf("[DEBUG] SageMaker AI Feature Group create config: %#v", *input) - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.CreateFeatureGroup(ctx, input) if err != nil { if tfawserr.ErrMessageContains(err, "ValidationException", "The execution role ARN is invalid.") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if tfawserr.ErrMessageContains(err, "ValidationException", "Invalid S3Uri provided") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.CreateFeatureGroup(ctx, input) - } if err != nil { return sdkdiag.AppendErrorf(diags, "creating SageMaker AI Feature Group: %s", err) From e81f883a5ae33f3f032c4973f1bc3f584254e82d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:15:53 -0400 Subject: [PATCH 1444/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - sagemaker.aws_sagemaker_model. --- internal/service/sagemaker/model.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/service/sagemaker/model.go b/internal/service/sagemaker/model.go index 0f3588c90b6d..6ae9810e152f 100644 --- a/internal/service/sagemaker/model.go +++ b/internal/service/sagemaker/model.go @@ -514,7 +514,7 @@ func resourceModelDelete(ctx context.Context, d *schema.ResourceData, meta any) } log.Printf("[INFO] Deleting SageMaker AI model: %s", d.Id()) - err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteModel(ctx, deleteOpts) if err != nil { @@ -523,17 +523,15 @@ func resourceModelDelete(ctx context.Context, d *schema.ResourceData, meta any) } if errs.IsA[*awstypes.ResourceNotFound](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteModel(ctx, deleteOpts) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "deleting sagemaker model: %s", err) } From 752b6e3f054c2b813fba0a4ce34f0aa05ab7b6c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:15:57 -0400 Subject: [PATCH 1445/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - sagemaker.aws_sagemaker_notebook_instance. --- internal/service/sagemaker/notebook_instance.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/internal/service/sagemaker/notebook_instance.go b/internal/service/sagemaker/notebook_instance.go index 919c89e21e18..2457e989cdb0 100644 --- a/internal/service/sagemaker/notebook_instance.go +++ b/internal/service/sagemaker/notebook_instance.go @@ -417,29 +417,22 @@ func startNotebookInstance(ctx context.Context, conn *sagemaker.Client, id strin } // StartNotebookInstance sometimes doesn't take so we'll check for a state change and if // it doesn't change we'll send another request - err := retry.RetryContext(ctx, 5*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.StartNotebookInstance(ctx, startOpts) if err != nil { - return retry.NonRetryableError(fmt.Errorf("starting: %s", err)) + return tfresource.NonRetryableError(fmt.Errorf("starting: %s", err)) } err = waitNotebookInstanceStarted(ctx, conn, id) if err != nil { - return retry.RetryableError(fmt.Errorf("starting: waiting for completion: %s", err)) + return tfresource.RetryableError(fmt.Errorf("starting: waiting for completion: %s", err)) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.StartNotebookInstance(ctx, startOpts) - if err != nil { - return fmt.Errorf("starting: %s", err) - } - err = waitNotebookInstanceStarted(ctx, conn, id) - if err != nil { - return fmt.Errorf("starting: waiting for completion: %s", err) - } + if err != nil { + return fmt.Errorf("starting: %s", err) } if err := waitNotebookInstanceInService(ctx, conn, id); err != nil { From ca6a0b0cd31d9a30f251ed484f22f2312c9a1126 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 01:16:36 +0900 Subject: [PATCH 1446/2115] Update the documentation to reflect that agent_arns is optional --- website/docs/r/datasync_location_object_storage.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/datasync_location_object_storage.html.markdown b/website/docs/r/datasync_location_object_storage.html.markdown index 579e4ec3bb73..7b5614258910 100644 --- a/website/docs/r/datasync_location_object_storage.html.markdown +++ b/website/docs/r/datasync_location_object_storage.html.markdown @@ -27,7 +27,7 @@ resource "aws_datasync_location_object_storage" "example" { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `agent_arns` - (Required) A list of DataSync Agent ARNs with which this location will be associated. +* `agent_arns` - (Optional) A list of DataSync Agent ARNs with which this location will be associated. For agentless cross-cloud transfers, this parameter does not need to be specified. * `access_key` - (Optional) The access key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `access_key` and `secret_key` to provide the user name and password, respectively. * `bucket_name` - (Required) The bucket on the self-managed object storage server that is used to read data from. * `secret_key` - (Optional) The secret key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `access_key` and `secret_key` to provide the user name and password, respectively. From 31df05a51c666ca28e3fe331066bf36a7fd24bbe Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 12:16:49 -0400 Subject: [PATCH 1447/2115] Emphasize branch in message --- GNUmakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index beae755376f1..1a29d65342b7 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -627,12 +627,12 @@ sweeper-unlinked: go-build ## [CI] Provider Checks / Sweeper Functions Not Linke t: prereq-go fmt-check ## Run acceptance tests (similar to testacc) @branch=$$(git rev-parse --abbrev-ref HEAD); \ - printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "$$branch" + printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "🌿 $$branch 🌿" TF_ACC=1 $(GO_VER) test ./$(PKG_NAME)/... -v -count $(TEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(RUNARGS) $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -vet=off test: prereq-go fmt-check ## Run unit tests @branch=$$(git rev-parse --abbrev-ref HEAD); \ - printf "make: Running unit tests on branch: \033[1m%s\033[0m...\n" "$$branch" + printf "make: Running unit tests on branch: \033[1m%s\033[0m...\n" "🌿 $$branch 🌿" $(GO_VER) test $(TEST) -v -count $(TEST_COUNT) -parallel $(ACCTEST_PARALLELISM) $(RUNARGS) $(TESTARGS) -timeout 15m -vet=off test-compile: prereq-go ## Test package compilation @@ -645,7 +645,7 @@ test-compile: prereq-go ## Test package compilation testacc: prereq-go fmt-check ## Run acceptance tests @branch=$$(git rev-parse --abbrev-ref HEAD); \ - printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "$$branch" + printf "make: Running acceptance tests on branch: \033[1m%s\033[0m...\n" "🌿 $$branch 🌿" @if [ "$(TESTARGS)" = "-run=TestAccXXX" ]; then \ echo ""; \ echo "Error: Skipping example acceptance testing pattern. Update PKG and TESTS for the relevant *_test.go file."; \ From e89c2e152c5a4876465218976788d5cc2b67ac51 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:27:59 -0400 Subject: [PATCH 1448/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_budget_resource_association. --- .../servicecatalog/budget_resource_association.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/servicecatalog/budget_resource_association.go b/internal/service/servicecatalog/budget_resource_association.go index 0cee3875f5e8..27b3eba0cfee 100644 --- a/internal/service/servicecatalog/budget_resource_association.go +++ b/internal/service/servicecatalog/budget_resource_association.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/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" @@ -61,26 +60,22 @@ func resourceBudgetResourceAssociationCreate(ctx context.Context, d *schema.Reso } var output *servicecatalog.AssociateBudgetWithResourceOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.AssociateBudgetWithResource(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.AssociateBudgetWithResource(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "associating Service Catalog Budget with Resource: %s", err) } From 69ac4a19974f26e2d0c9abbef7900d47e75f0df4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:04 -0400 Subject: [PATCH 1449/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_constraint. --- internal/service/servicecatalog/constraint.go | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/internal/service/servicecatalog/constraint.go b/internal/service/servicecatalog/constraint.go index 41c08c672867..91f9ea208972 100644 --- a/internal/service/servicecatalog/constraint.go +++ b/internal/service/servicecatalog/constraint.go @@ -12,7 +12,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -108,30 +107,26 @@ func resourceConstraintCreate(ctx context.Context, d *schema.ResourceData, meta } var output *servicecatalog.CreateConstraintOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreateConstraint(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateConstraint(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Service Catalog Constraint: %s", err) } @@ -207,24 +202,20 @@ func resourceConstraintUpdate(ctx context.Context, d *schema.ResourceData, meta input.Parameters = aws.String(d.Get(names.AttrParameters).(string)) } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateConstraint(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateConstraint(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Constraint (%s): %s", d.Id(), err) } From a368dd6dca3fa33711802e1c9ee1802989cb2d27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:07 -0400 Subject: [PATCH 1450/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_portfolio_share. --- .../service/servicecatalog/portfolio_share.go | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/internal/service/servicecatalog/portfolio_share.go b/internal/service/servicecatalog/portfolio_share.go index 1d41b90e8987..dd07b022a1fe 100644 --- a/internal/service/servicecatalog/portfolio_share.go +++ b/internal/service/servicecatalog/portfolio_share.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/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" @@ -133,26 +132,22 @@ func resourcePortfolioShareCreate(ctx context.Context, d *schema.ResourceData, m } var output *servicecatalog.CreatePortfolioShareOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreatePortfolioShare(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreatePortfolioShare(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Service Catalog Portfolio Share: %s", err) } @@ -253,24 +248,20 @@ func resourcePortfolioShareUpdate(ctx context.Context, d *schema.ResourceData, m input.OrganizationNode = orgNode } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdatePortfolioShare(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdatePortfolioShare(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Portfolio Share (%s): %s", d.Id(), err) } From 6e9770659740a61d72b9c0629409ded025369bcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:11 -0400 Subject: [PATCH 1451/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_product_portfolio_association. --- .../servicecatalog/product_portfolio_association.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/servicecatalog/product_portfolio_association.go b/internal/service/servicecatalog/product_portfolio_association.go index e8b2918e8e98..1001cb36a445 100644 --- a/internal/service/servicecatalog/product_portfolio_association.go +++ b/internal/service/servicecatalog/product_portfolio_association.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/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" @@ -81,25 +80,21 @@ func resourceProductPortfolioAssociationCreate(ctx context.Context, d *schema.Re } var output *servicecatalog.AssociateProductWithPortfolioOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.AssociateProductWithPortfolio(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.AssociateProductWithPortfolio(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "associating Service Catalog Product with Portfolio: %s", err) } From f8a1f7d834d6c001805107484280e9817c392673 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:15 -0400 Subject: [PATCH 1452/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_provisioned_product. --- .../servicecatalog/provisioned_product.go | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 0694b1512b82..68ffd5261dd0 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -329,30 +328,26 @@ func resourceProvisionedProductCreate(ctx context.Context, d *schema.ResourceDat var output *servicecatalog.ProvisionProductOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.ProvisionProduct(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if errs.IsA[*awstypes.ResourceNotFoundException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.ProvisionProduct(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "provisioning Service Catalog Product: %s", err) } @@ -531,24 +526,20 @@ func resourceProvisionedProductUpdate(ctx context.Context, d *schema.ResourceDat // to provisioned AWS objects during update if the tags don't change. input.Tags = getTagsIn(ctx) - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateProvisionedProduct(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateProvisionedProduct(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Provisioned Product (%s): %s", d.Id(), err) } From 42ada3243683b7362f131040b884e08ece9fd55e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:19 -0400 Subject: [PATCH 1453/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_provisioning_artifact. --- .../servicecatalog/provisioning_artifact.go | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/internal/service/servicecatalog/provisioning_artifact.go b/internal/service/servicecatalog/provisioning_artifact.go index 1793be1e7aa5..ac0100a04d9c 100644 --- a/internal/service/servicecatalog/provisioning_artifact.go +++ b/internal/service/servicecatalog/provisioning_artifact.go @@ -13,7 +13,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -139,26 +138,22 @@ func resourceProvisioningArtifactCreate(ctx context.Context, d *schema.ResourceD } var output *servicecatalog.CreateProvisioningArtifactOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreateProvisioningArtifact(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateProvisioningArtifact(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Service Catalog Provisioning Artifact: %s", err) } @@ -258,24 +253,20 @@ func resourceProvisioningArtifactUpdate(ctx context.Context, d *schema.ResourceD input.Name = aws.String(v.(string)) } - err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err = tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateProvisioningArtifact(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateProvisioningArtifact(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Provisioning Artifact (%s): %s", d.Id(), err) } From 3154fb8fc2fe3cebd041801c6274ded1c8ae870c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:22 -0400 Subject: [PATCH 1454/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_service_action. --- .../service/servicecatalog/service_action.go | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/internal/service/servicecatalog/service_action.go b/internal/service/servicecatalog/service_action.go index e85c7706e018..08691e11aca6 100644 --- a/internal/service/servicecatalog/service_action.go +++ b/internal/service/servicecatalog/service_action.go @@ -12,7 +12,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/types" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -115,26 +114,22 @@ func resourceServiceActionCreate(ctx context.Context, d *schema.ResourceData, me } var output *servicecatalog.CreateServiceActionOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreateServiceAction(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateServiceAction(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Service Catalog Service Action: %s", err) } @@ -206,24 +201,20 @@ func resourceServiceActionUpdate(ctx context.Context, d *schema.ResourceData, me input.Name = aws.String(d.Get(names.AttrName).(string)) } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateServiceAction(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateServiceAction(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Service Action (%s): %s", d.Id(), err) } @@ -239,24 +230,20 @@ func resourceServiceActionDelete(ctx context.Context, d *schema.ResourceData, me Id: aws.String(d.Id()), } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutDelete), func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteServiceAction(ctx, input) if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteServiceAction(ctx, input) - } - if errs.IsA[*awstypes.ResourceNotFoundException](err) { log.Printf("[INFO] Attempted to delete Service Action (%s) but does not exist", d.Id()) return diags From bc5824528df861ea4f345d0e6ac4480ac65b81b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:27 -0400 Subject: [PATCH 1455/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_tag_option. --- internal/service/servicecatalog/tag_option.go | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/internal/service/servicecatalog/tag_option.go b/internal/service/servicecatalog/tag_option.go index 2828d91d4886..cbb61af619fb 100644 --- a/internal/service/servicecatalog/tag_option.go +++ b/internal/service/servicecatalog/tag_option.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/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" @@ -71,26 +70,22 @@ func resourceTagOptionCreate(ctx context.Context, d *schema.ResourceData, meta a } var output *servicecatalog.CreateTagOptionOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.CreateTagOption(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.CreateTagOption(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "creating Service Catalog Tag Option: %s", err) } @@ -165,24 +160,20 @@ func resourceTagOptionUpdate(ctx context.Context, d *schema.ResourceData, meta a input.Value = aws.String(d.Get(names.AttrValue).(string)) } - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError { _, err := conn.UpdateTagOption(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.UpdateTagOption(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "updating Service Catalog Tag Option (%s): %s", d.Id(), err) } From 4186fbd6608e30749aa549e65790af5bb8aeafca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:28:31 -0400 Subject: [PATCH 1456/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - servicecatalog.aws_servicecatalog_tag_option_resource_association. --- .../servicecatalog/tag_option_resource_association.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/internal/service/servicecatalog/tag_option_resource_association.go b/internal/service/servicecatalog/tag_option_resource_association.go index e2a31cf734ed..0848c9d8b873 100644 --- a/internal/service/servicecatalog/tag_option_resource_association.go +++ b/internal/service/servicecatalog/tag_option_resource_association.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicecatalog" awstypes "github.com/aws/aws-sdk-go-v2/service/servicecatalog/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" @@ -78,26 +77,22 @@ func resourceTagOptionResourceAssociationCreate(ctx context.Context, d *schema.R } var output *servicecatalog.AssociateTagOptionWithResourceOutput - err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *retry.RetryError { + err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.AssociateTagOptionWithResource(ctx, input) if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.AssociateTagOptionWithResource(ctx, input) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "associating Service Catalog Tag Option with Resource: %s", err) } From fb147e9d4c64d39644cfe8d2530ea916b8be6660 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:33:26 -0400 Subject: [PATCH 1457/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - inspector.aws_inspector_assessment_target. --- internal/service/inspector/assessment_target.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/service/inspector/assessment_target.go b/internal/service/inspector/assessment_target.go index 06c39c8126bd..89f8290c5299 100644 --- a/internal/service/inspector/assessment_target.go +++ b/internal/service/inspector/assessment_target.go @@ -125,22 +125,19 @@ func resourceAssessmentTargetDelete(ctx context.Context, d *schema.ResourceData, input := &inspector.DeleteAssessmentTargetInput{ AssessmentTargetArn: aws.String(d.Id()), } - err := retry.RetryContext(ctx, 60*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 60*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteAssessmentTarget(ctx, input) if errs.IsA[*awstypes.AssessmentRunInProgressException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteAssessmentTarget(ctx, input) - } if err != nil { return sdkdiag.AppendErrorf(diags, "deleting Inspector Classic Assessment Target: %s", err) } From 399225c41ab8defc60078bc9b7f8e7ff8d3ece56 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 12:40:42 -0400 Subject: [PATCH 1458/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - guardduty.aws_guardduty_member. --- internal/service/guardduty/member.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/internal/service/guardduty/member.go b/internal/service/guardduty/member.go index 3626d55f1582..c045a671a875 100644 --- a/internal/service/guardduty/member.go +++ b/internal/service/guardduty/member.go @@ -14,7 +14,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/guardduty" awstypes "github.com/aws/aws-sdk-go-v2/service/guardduty/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" @@ -253,34 +252,25 @@ func inviteMemberWaiter(ctx context.Context, accountID, detectorID string, timeo // wait until e-mail verification finishes var out *guardduty.GetMembersOutput - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { log.Printf("[DEBUG] Reading GuardDuty Member: %+v", input) var err error out, err = conn.GetMembers(ctx, &input) if err != nil { - return retry.NonRetryableError(fmt.Errorf("reading GuardDuty Member %q: %s", accountID, err)) + return tfresource.NonRetryableError(fmt.Errorf("reading GuardDuty Member %q: %s", accountID, err)) } retryable, err := memberInvited(out, accountID) if err != nil { if retryable { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - out, err = conn.GetMembers(ctx, &input) - - if err != nil { - return fmt.Errorf("reading GuardDuty member: %w", err) - } - _, err = memberInvited(out, accountID) - return err - } if err != nil { return fmt.Errorf("waiting for GuardDuty email verification: %w", err) } From 84cfa1985bbd3a7c694fa7bb4cb1c9acb0d97261 Mon Sep 17 00:00:00 2001 From: Kyler Middleton Date: Fri, 5 Sep 2025 11:54:04 -0500 Subject: [PATCH 1459/2115] Add AppConfig multi-variate example --- ...hosted_configuration_version.html.markdown | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/website/docs/r/appconfig_hosted_configuration_version.html.markdown b/website/docs/r/appconfig_hosted_configuration_version.html.markdown index b56be04fdb8f..a8d9a91919a7 100644 --- a/website/docs/r/appconfig_hosted_configuration_version.html.markdown +++ b/website/docs/r/appconfig_hosted_configuration_version.html.markdown @@ -79,6 +79,42 @@ resource "aws_appconfig_hosted_configuration_version" "example" { } ``` +### Multi-variate Feature Flags + +```terraform +resource "aws_appconfig_hosted_configuration_version" "example" { + application_id = aws_appconfig_application.example.id + configuration_profile_id = aws_appconfig_configuration_profile.example.configuration_profile_id + description = "Example Multi-variate Feature Flag Configuration Version" + content_type = "application/json" + + content = jsonencode({ + flags = { + loggingenabled = { + name = "loggingEnabled" + } + }, + values = { + loggingenabled = { + _variants = concat([ + for user_id in var.appcfg_enableLogging_userIds : { + enabled = true, + name = "usersWithLoggingEnabled_${user_id}", + rule = "(or (eq $userId \"${user_id}\"))" + } + ], [ + { + enabled = false, + name = "Default" + } + ]) + } + }, + version = "1" + }) +} +``` + ## Argument Reference This resource supports the following arguments: From f1e6e5366b4d0a27cd537a1f003a362384e926cc Mon Sep 17 00:00:00 2001 From: Kyler Middleton Date: Fri, 5 Sep 2025 11:58:23 -0500 Subject: [PATCH 1460/2115] Add AppConfig multi-variate example --- .../r/appconfig_hosted_configuration_version.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/appconfig_hosted_configuration_version.html.markdown b/website/docs/r/appconfig_hosted_configuration_version.html.markdown index a8d9a91919a7..18a7ffab23c1 100644 --- a/website/docs/r/appconfig_hosted_configuration_version.html.markdown +++ b/website/docs/r/appconfig_hosted_configuration_version.html.markdown @@ -79,13 +79,13 @@ resource "aws_appconfig_hosted_configuration_version" "example" { } ``` -### Multi-variate Feature Flags +### Multi-variant Feature Flags ```terraform resource "aws_appconfig_hosted_configuration_version" "example" { application_id = aws_appconfig_application.example.id configuration_profile_id = aws_appconfig_configuration_profile.example.configuration_profile_id - description = "Example Multi-variate Feature Flag Configuration Version" + description = "Example Multi-variant Feature Flag Configuration Version" content_type = "application/json" content = jsonencode({ @@ -97,7 +97,7 @@ resource "aws_appconfig_hosted_configuration_version" "example" { values = { loggingenabled = { _variants = concat([ - for user_id in var.appcfg_enableLogging_userIds : { + for user_id in var.appcfg_enableLogging_userIds : { # Flat list of userIds enabled = true, name = "usersWithLoggingEnabled_${user_id}", rule = "(or (eq $userId \"${user_id}\"))" From 30fc4a9995b35ddf87fd5e11c62194c09dd19376 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 13:02:18 -0400 Subject: [PATCH 1461/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - kinesisanalytics.waitIAMPropagation. --- internal/service/kinesisanalytics/wait.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/internal/service/kinesisanalytics/wait.go b/internal/service/kinesisanalytics/wait.go index e8f088dd16df..f56645459fce 100644 --- a/internal/service/kinesisanalytics/wait.go +++ b/internal/service/kinesisanalytics/wait.go @@ -98,42 +98,38 @@ func waitApplicationUpdated(ctx context.Context, conn *kinesisanalytics.Client, func waitIAMPropagation(ctx context.Context, f func() (any, error)) (any, error) { var output any - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = f() // Kinesis Stream: https://github.com/hashicorp/terraform-provider-aws/issues/7032 if errs.IsAErrorMessageContains[*awstypes.InvalidArgumentException](err, "Kinesis Analytics service doesn't have sufficient privileges") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // Kinesis Firehose: https://github.com/hashicorp/terraform-provider-aws/issues/7394 if errs.IsAErrorMessageContains[*awstypes.InvalidArgumentException](err, "Kinesis Analytics doesn't have sufficient privileges") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // InvalidArgumentException: Given IAM role arn : arn:aws:iam::123456789012:role/xxx does not provide Invoke permissions on the Lambda resource : arn:aws:lambda:us-west-2:123456789012:function:yyy if errs.IsAErrorMessageContains[*awstypes.InvalidArgumentException](err, "does not provide Invoke permissions on the Lambda resource") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } // S3: https://github.com/hashicorp/terraform-provider-aws/issues/16104 if errs.IsAErrorMessageContains[*awstypes.InvalidArgumentException](err, "Please check the role provided or validity of S3 location you provided") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = f() - } - if err != nil { return nil, err } From d33e5d6ed581618c8a3faa8dbc8706f99e5ae058 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 13:37:21 -0400 Subject: [PATCH 1462/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - kms.aws_kms_grant. --- internal/service/kms/grant.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/internal/service/kms/grant.go b/internal/service/kms/grant.go index c110d7d73676..615f748dc53a 100644 --- a/internal/service/kms/grant.go +++ b/internal/service/kms/grant.go @@ -328,26 +328,26 @@ func findGrantByTwoPartKey(ctx context.Context, conn *kms.Client, keyID, grantID func findGrantByTwoPartKeyWithRetry(ctx context.Context, conn *kms.Client, keyID, grantID string, timeout time.Duration) (*awstypes.GrantListEntry, error) { var output *awstypes.GrantListEntry - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { grant, err := findGrantByTwoPartKey(ctx, conn, keyID, grantID) if tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if principal := aws.ToString(grant.GranteePrincipal); principal != "" { if !arn.IsARN(principal) && !verify.IsServicePrincipal(principal) { - return retry.RetryableError(fmt.Errorf("grantee principal (%s) is invalid. Perhaps the principal has been deleted or recreated", principal)) + return tfresource.RetryableError(fmt.Errorf("grantee principal (%s) is invalid. Perhaps the principal has been deleted or recreated", principal)) } } if principal := aws.ToString(grant.RetiringPrincipal); principal != "" { if !arn.IsARN(principal) && !verify.IsServicePrincipal(principal) { - return retry.RetryableError(fmt.Errorf("retiring principal (%s) is invalid. Perhaps the principal has been deleted or recreated", principal)) + return tfresource.RetryableError(fmt.Errorf("retiring principal (%s) is invalid. Perhaps the principal has been deleted or recreated", principal)) } } @@ -356,10 +356,6 @@ func findGrantByTwoPartKeyWithRetry(ctx context.Context, conn *kms.Client, keyID return nil }) - if tfresource.TimedOut(err) { - output, err = findGrantByTwoPartKey(ctx, conn, keyID, grantID) - } - if err != nil { return nil, err } From a12258d9ff321a0949d52e9d283902ddb7897a16 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 13:42:31 -0400 Subject: [PATCH 1463/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - s3.aws_s3_bucket_lifecycle_configuration, s3.aws_s3_bucket_replication_configuration. --- internal/service/s3/bucket_lifecycle_configuration.go | 10 +++++----- .../service/s3/bucket_lifecycle_configuration_test.go | 11 ++++------- .../service/s3/bucket_replication_configuration.go | 10 +++++----- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/internal/service/s3/bucket_lifecycle_configuration.go b/internal/service/s3/bucket_lifecycle_configuration.go index 3bb4bdc8a09d..764ed695fc84 100644 --- a/internal/service/s3/bucket_lifecycle_configuration.go +++ b/internal/service/s3/bucket_lifecycle_configuration.go @@ -469,23 +469,23 @@ func (r *bucketLifecycleConfigurationResource) Read(ctx context.Context, request lifecycleConfigurationRulesSteadyTimeout = 2 * time.Minute ) var lastOutput, output *s3.GetBucketLifecycleConfigurationOutput - err := retry.RetryContext(ctx, lifecycleConfigurationRulesSteadyTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, lifecycleConfigurationRulesSteadyTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = findBucketLifecycleConfiguration(ctx, conn, bucket, expectedBucketOwner) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if lastOutput == nil || !lifecycleConfigEqual(lastOutput.TransitionDefaultMinimumObjectSize, lastOutput.Rules, output.TransitionDefaultMinimumObjectSize, output.Rules) { lastOutput = output - return retry.RetryableError(fmt.Errorf("S3 Bucket Lifecycle Configuration (%s) has not stablized; retrying", bucket)) + return tfresource.RetryableError(fmt.Errorf("S3 Bucket Lifecycle Configuration (%s) has not stablized; retrying", bucket)) } return nil }) - if tfresource.TimedOut(err) { - output, err = findBucketLifecycleConfiguration(ctx, conn, bucket, expectedBucketOwner) + if err != nil { + return } if tfresource.NotFound(err) { response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) diff --git a/internal/service/s3/bucket_lifecycle_configuration_test.go b/internal/service/s3/bucket_lifecycle_configuration_test.go index 22d7562e8638..4a5814e92bf9 100644 --- a/internal/service/s3/bucket_lifecycle_configuration_test.go +++ b/internal/service/s3/bucket_lifecycle_configuration_test.go @@ -3978,27 +3978,24 @@ func testAccCheckBucketLifecycleConfigurationExists(ctx context.Context, n strin lifecycleConfigurationRulesSteadyTimeout = 2 * time.Minute ) var lastOutput, output *s3.GetBucketLifecycleConfigurationOutput - err = retry.RetryContext(ctx, lifecycleConfigurationRulesSteadyTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, lifecycleConfigurationRulesSteadyTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = tfs3.FindBucketLifecycleConfiguration(ctx, conn, bucket, expectedBucketOwner) if tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if lastOutput == nil || !tfs3.LifecycleConfigEqual(lastOutput.TransitionDefaultMinimumObjectSize, lastOutput.Rules, output.TransitionDefaultMinimumObjectSize, output.Rules) { lastOutput = output - return retry.RetryableError(fmt.Errorf("S3 Bucket Lifecycle Configuration (%s) has not stablized; retrying", bucket)) + return tfresource.RetryableError(fmt.Errorf("S3 Bucket Lifecycle Configuration (%s) has not stablized; retrying", bucket)) } return nil }) - if tfresource.TimedOut(err) { - output, err = tfs3.FindBucketLifecycleConfiguration(ctx, conn, bucket, expectedBucketOwner) - } return err } diff --git a/internal/service/s3/bucket_replication_configuration.go b/internal/service/s3/bucket_replication_configuration.go index a18d6541aaa1..ff3b0877257a 100644 --- a/internal/service/s3/bucket_replication_configuration.go +++ b/internal/service/s3/bucket_replication_configuration.go @@ -332,22 +332,22 @@ func resourceBucketReplicationConfigurationCreate(ctx context.Context, d *schema input.Token = aws.String(v.(string)) } - err := retry.RetryContext(ctx, bucketPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, bucketPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.PutBucketReplication(ctx, input) if tfawserr.ErrCodeEquals(err, errCodeNoSuchBucket) || tfawserr.ErrMessageContains(err, errCodeInvalidRequest, "Versioning must be 'Enabled' on the bucket") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.PutBucketReplication(ctx, input) + if err != nil { + return sdkdiag.AppendErrorf(diags, "creating S3 Bucket (%s) Replication Configuration: %s", bucket, err) } if tfawserr.ErrMessageContains(err, errCodeInvalidArgument, "ReplicationConfiguration is not valid, expected CreateBucketConfiguration") { From 87e3a579a1f4dead77707f9eded5b0ebbd1438b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:06:19 -0400 Subject: [PATCH 1464/2115] Fix compilation error. --- internal/service/s3/bucket_lifecycle_configuration_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/s3/bucket_lifecycle_configuration_test.go b/internal/service/s3/bucket_lifecycle_configuration_test.go index 4a5814e92bf9..3e530ae6d88e 100644 --- a/internal/service/s3/bucket_lifecycle_configuration_test.go +++ b/internal/service/s3/bucket_lifecycle_configuration_test.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/compare" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" From 83a790b7e8380a81fdcc48fc2a76f4b28148574d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:22:27 -0400 Subject: [PATCH 1465/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - ec2. --- internal/service/ec2/ec2_instance.go | 38 +++++++------------ internal/service/ec2/sweep.go | 8 ++-- .../service/ec2/vpc_peering_connection.go | 9 ++--- internal/service/ec2/vpc_route_table_test.go | 9 ++--- 4 files changed, 25 insertions(+), 39 deletions(-) diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index d22ecb87b544..e55dc7bb9a80 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -1672,19 +1672,17 @@ func resourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, meta an return sdkdiag.AppendErrorf(diags, "updating EC2 Instance (%s): %s", d.Id(), err) } } else { - err := retry.RetryContext(ctx, iamPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, iamPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.ReplaceIamInstanceProfileAssociation(ctx, &input) if err != nil { if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "Invalid IAM Instance Profile") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.ReplaceIamInstanceProfileAssociation(ctx, &input) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "updating EC2 Instance (%s): replacing instance profile: %s", d.Id(), err) } @@ -2560,22 +2558,21 @@ func associateInstanceProfile(ctx context.Context, d *schema.ResourceData, conn Name: aws.String(d.Get("iam_instance_profile").(string)), }, } - err := retry.RetryContext(ctx, iamPropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, iamPropagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.AssociateIamInstanceProfile(ctx, &input) if err != nil { if tfawserr.ErrMessageContains(err, "InvalidParameterValue", "Invalid IAM Instance Profile") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.AssociateIamInstanceProfile(ctx, &input) - } + if err != nil { return fmt.Errorf("associating instance profile: %s", err) } + return nil } @@ -2987,16 +2984,16 @@ func getInstancePasswordData(ctx context.Context, instanceID string, conn *ec2.C input := ec2.GetPasswordDataInput{ InstanceId: aws.String(instanceID), } - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error resp, err = conn.GetPasswordData(ctx, &input) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if resp.PasswordData == nil || aws.ToString(resp.PasswordData) == "" { - return retry.RetryableError(fmt.Errorf("Password data is blank for instance ID: %s", instanceID)) + return tfresource.RetryableError(fmt.Errorf("Password data is blank for instance ID: %s", instanceID)) } passwordData = strings.TrimSpace(aws.ToString(resp.PasswordData)) @@ -3004,16 +3001,7 @@ func getInstancePasswordData(ctx context.Context, instanceID string, conn *ec2.C log.Printf("[INFO] Password data read for instance %s", instanceID) return nil }) - if tfresource.TimedOut(err) { - resp, err = conn.GetPasswordData(ctx, &input) - if err != nil { - return "", fmt.Errorf("getting password data: %s", err) - } - if resp.PasswordData == nil || aws.ToString(resp.PasswordData) == "" { - return "", errors.New("password data is blank") - } - passwordData = strings.TrimSpace(aws.ToString(resp.PasswordData)) - } + if err != nil { return "", err } diff --git a/internal/service/ec2/sweep.go b/internal/service/ec2/sweep.go index 726b90eee8a1..1b5b6b609af9 100644 --- a/internal/service/ec2/sweep.go +++ b/internal/service/ec2/sweep.go @@ -15,12 +15,12 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" "github.com/hashicorp/terraform-provider-aws/internal/sweep/framework" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -1675,14 +1675,14 @@ func sweepSecurityGroups(region string) error { } // Handle EC2 eventual consistency - err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 1*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteSecurityGroup(ctx, &input) if tfawserr.ErrCodeEquals(err, "DependencyViolation") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) diff --git a/internal/service/ec2/vpc_peering_connection.go b/internal/service/ec2/vpc_peering_connection.go index 8223b715c999..029719b7d2a9 100644 --- a/internal/service/ec2/vpc_peering_connection.go +++ b/internal/service/ec2/vpc_peering_connection.go @@ -15,7 +15,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/hashicorp/aws-sdk-go-base/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/sdkdiag" @@ -325,22 +324,22 @@ func modifyVPCPeeringConnectionOptions(ctx context.Context, conn *ec2.Client, d // Retry reading back the modified options to deal with eventual consistency. // Often this is to do with a delay transitioning from pending-acceptance to active. - err := retry.RetryContext(ctx, ec2PropagationTimeout, func() *retry.RetryError { // nosemgrep:ci.helper-schema-retry-RetryContext-without-TimeoutError-check + err := tfresource.Retry(ctx, ec2PropagationTimeout, func(ctx context.Context) *tfresource.RetryError { vpcPeeringConnection, err := findVPCPeeringConnectionByID(ctx, conn, d.Id()) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if v := vpcPeeringConnection.AccepterVpcInfo; v != nil && v.PeeringOptions != nil && accepterPeeringConnectionOptions != nil { if !vpcPeeringConnectionOptionsEqual(v.PeeringOptions, accepterPeeringConnectionOptions) { - return retry.RetryableError(errors.New("Accepter Options not stable")) + return tfresource.RetryableError(errors.New("Accepter Options not stable")) } } if v := vpcPeeringConnection.RequesterVpcInfo; v != nil && v.PeeringOptions != nil && requesterPeeringConnectionOptions != nil { if !vpcPeeringConnectionOptionsEqual(v.PeeringOptions, requesterPeeringConnectionOptions) { - return retry.RetryableError(errors.New("Requester Options not stable")) + return tfresource.RetryableError(errors.New("Requester Options not stable")) } } diff --git a/internal/service/ec2/vpc_route_table_test.go b/internal/service/ec2/vpc_route_table_test.go index 09fa726147e2..a255cad82aca 100644 --- a/internal/service/ec2/vpc_route_table_test.go +++ b/internal/service/ec2/vpc_route_table_test.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -1312,16 +1311,16 @@ func testAccCheckRouteTableWaitForVPCEndpointRoute(ctx context.Context, routeTab plId := aws.ToString(resp.PrefixLists[0].PrefixListId) - err = retry.RetryContext(ctx, 3*time.Minute, func() *retry.RetryError { + err = tfresource.Retry(ctx, 3*time.Minute, func(ctx context.Context) *tfresource.RetryError { input := ec2.DescribeRouteTablesInput{ RouteTableIds: []string{aws.ToString(routeTable.RouteTableId)}, } resp, err := conn.DescribeRouteTables(ctx, &input) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if resp == nil || len(resp.RouteTables) == 0 { - return retry.NonRetryableError(fmt.Errorf("Route Table not found")) + return tfresource.NonRetryableError(fmt.Errorf("Route Table not found")) } for _, route := range resp.RouteTables[0].Routes { @@ -1330,7 +1329,7 @@ func testAccCheckRouteTableWaitForVPCEndpointRoute(ctx context.Context, routeTab } } - return retry.RetryableError(fmt.Errorf("Route not found")) + return tfresource.RetryableError(fmt.Errorf("Route not found")) }) return err From 28c97c8f6e862c0753231a87a23fea7f4a130d49 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:22:27 -0400 Subject: [PATCH 1466/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - ecs. --- internal/service/ecs/service.go | 14 +++++--------- internal/service/ecs/service_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index abace1f92358..81c13ed85c3d 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -2048,34 +2048,30 @@ func (e *expectServiceActiveError) Error() string { func findServiceByTwoPartKeyWaitForActive(ctx context.Context, conn *ecs.Client, serviceName, clusterNameOrARN string) (*awstypes.Service, error) { var service *awstypes.Service - // Use the retry.RetryContext function instead of WaitForState() because we don't want the timeout error, if any. + // Use the tfresource.Retry function instead of WaitForState() because we don't want the timeout error, if any. const ( timeout = 2 * time.Minute ) - err := retry.RetryContext(ctx, timeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, timeout, func(ctx context.Context) *tfresource.RetryError { var err error service, err = findServiceByTwoPartKey(ctx, conn, serviceName, clusterNameOrARN) if tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } if status := aws.ToString(service.Status); status != serviceStatusActive { - return retry.RetryableError(newExpectServiceActiveError(status)) + return tfresource.RetryableError(newExpectServiceActiveError(status)) } return nil }) - if tfresource.TimedOut(err) { - service, err = findServiceByTwoPartKey(ctx, conn, serviceName, clusterNameOrARN) - } - if errs.IsA[*expectServiceActiveError](err) { return nil, &retry.NotFoundError{ LastError: err, diff --git a/internal/service/ecs/service_test.go b/internal/service/ecs/service_test.go index 093b7a90c8e7..ecf98c168cba 100644 --- a/internal/service/ecs/service_test.go +++ b/internal/service/ecs/service_test.go @@ -15,7 +15,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ecs" awstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/compare" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -2726,20 +2725,21 @@ func testAccCheckServiceExists(ctx context.Context, name string, service *awstyp conn := acctest.Provider.Meta().(*conns.AWSClient).ECSClient(ctx) var output *awstypes.Service - err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 1*time.Minute, func(ctx context.Context) *tfresource.RetryError { var err error output, err = tfecs.FindServiceNoTagsByTwoPartKey(ctx, conn, rs.Primary.ID, rs.Primary.Attributes["cluster"]) if tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) + if err != nil { return err } From 3fd62714f937e3bf7c21efae0b11c16891a74343 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:22:31 -0400 Subject: [PATCH 1467/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - iam. --- internal/service/iam/group_membership.go | 26 +++---------------- .../iam/session_context_data_source.go | 11 +++----- internal/service/iam/user.go | 10 +++---- internal/service/iam/user_group_membership.go | 23 +++------------- internal/service/iam/user_login_profile.go | 22 +++++----------- .../service/iam/user_login_profile_test.go | 14 +++++----- 6 files changed, 26 insertions(+), 80 deletions(-) diff --git a/internal/service/iam/group_membership.go b/internal/service/iam/group_membership.go index ccc2e182ad69..d319226c5460 100644 --- a/internal/service/iam/group_membership.go +++ b/internal/service/iam/group_membership.go @@ -12,7 +12,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/hashicorp/aws-sdk-go-base/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" @@ -80,17 +79,17 @@ func resourceGroupMembershipRead(ctx context.Context, d *schema.ResourceData, me var ul []string - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { pages := iam.NewGetGroupPaginator(conn, input) for pages.HasMorePages() { page, err := pages.NextPage(ctx) if d.IsNewResource() && errs.IsA[*awstypes.NoSuchEntityException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } for _, user := range page.Users { @@ -101,25 +100,6 @@ func resourceGroupMembershipRead(ctx context.Context, d *schema.ResourceData, me return nil }) - if tfresource.TimedOut(err) { - pages := iam.NewGetGroupPaginator(conn, input) - for pages.HasMorePages() { - page, err := pages.NextPage(ctx) - - if d.IsNewResource() && errs.IsA[*awstypes.NoSuchEntityException](err) { - return sdkdiag.AppendFromErr(diags, err) - } - - if err != nil { - return sdkdiag.AppendFromErr(diags, err) - } - - for _, user := range page.Users { - ul = append(ul, aws.ToString(user.UserName)) - } - } - } - var noSuchEntityException *awstypes.NoSuchEntityException if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, noSuchEntityException.ErrorCode()) { log.Printf("[WARN] IAM Group Membership (%s) not found, removing from state", group) diff --git a/internal/service/iam/session_context_data_source.go b/internal/service/iam/session_context_data_source.go index 1fd5a453ed7b..ad34b716e37e 100644 --- a/internal/service/iam/session_context_data_source.go +++ b/internal/service/iam/session_context_data_source.go @@ -11,7 +11,6 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" awstypes "github.com/aws/aws-sdk-go-v2/service/iam/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/sdkdiag" @@ -73,26 +72,22 @@ func dataSourceSessionContextRead(ctx context.Context, d *schema.ResourceData, m var role *awstypes.Role - err = retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error role, err = findRoleByName(ctx, conn, roleName) if !d.IsNewResource() && tfresource.NotFound(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - role, err = findRoleByName(ctx, conn, roleName) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "unable to get role (%s): %s", roleName, err) } diff --git a/internal/service/iam/user.go b/internal/service/iam/user.go index cfbff910ab25..12b1b7da2cb6 100644 --- a/internal/service/iam/user.go +++ b/internal/service/iam/user.go @@ -431,7 +431,7 @@ func deleteUserLoginProfile(ctx context.Context, conn *iam.Client, username stri input := &iam.DeleteLoginProfileInput{ UserName: aws.String(username), } - err = retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err = conn.DeleteLoginProfile(ctx, input) if err != nil { var errNoSuchEntityException *awstypes.NoSuchEntityException @@ -441,15 +441,13 @@ func deleteUserLoginProfile(ctx context.Context, conn *iam.Client, username stri // EntityTemporarilyUnmodifiable: Login Profile for User XXX cannot be modified while login profile is being created. var etu *awstypes.EntityTemporarilyUnmodifiableException if tfawserr.ErrCodeEquals(err, etu.ErrorCode()) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn.DeleteLoginProfile(ctx, input) - } + if err != nil { return fmt.Errorf("deleting Account Login Profile: %w", err) } diff --git a/internal/service/iam/user_group_membership.go b/internal/service/iam/user_group_membership.go index 3190e85f560d..8c537e2b941b 100644 --- a/internal/service/iam/user_group_membership.go +++ b/internal/service/iam/user_group_membership.go @@ -15,7 +15,6 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" - "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" @@ -82,7 +81,7 @@ func resourceUserGroupMembershipRead(ctx context.Context, d *schema.ResourceData var gl []string - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { err := listGroupsForUserPages(ctx, conn, input, func(page *iam.ListGroupsForUserOutput, lastPage bool) bool { if page == nil { return !lastPage @@ -98,32 +97,16 @@ func resourceUserGroupMembershipRead(ctx context.Context, d *schema.ResourceData }) if d.IsNewResource() && errs.IsA[*awstypes.NoSuchEntityException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - err = listGroupsForUserPages(ctx, conn, input, func(page *iam.ListGroupsForUserOutput, lastPage bool) bool { - if page == nil { - return !lastPage - } - - for _, group := range page.Groups { - if groups.Contains(aws.ToString(group.GroupName)) { - gl = append(gl, aws.ToString(group.GroupName)) - } - } - - return !lastPage - }) - } - var nse *awstypes.NoSuchEntityException if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, nse.ErrorCode()) { log.Printf("[WARN] IAM User Group Membership (%s) not found, removing from state", user) diff --git a/internal/service/iam/user_login_profile.go b/internal/service/iam/user_login_profile.go index bb3836e83c5d..f22ed9950f54 100644 --- a/internal/service/iam/user_login_profile.go +++ b/internal/service/iam/user_login_profile.go @@ -16,7 +16,6 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/hashicorp/aws-sdk-go-base/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" @@ -191,26 +190,22 @@ func resourceUserLoginProfileRead(ctx context.Context, d *schema.ResourceData, m var output *iam.GetLoginProfileOutput - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.GetLoginProfile(ctx, input) if d.IsNewResource() && errs.IsA[*awstypes.NoSuchEntityException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - output, err = conn.GetLoginProfile(ctx, input) - } - if !d.IsNewResource() && errs.IsA[*awstypes.NoSuchEntityException](err) { log.Printf("[WARN] IAM User Login Profile (%s) not found, removing from state", d.Id()) d.SetId("") @@ -239,7 +234,7 @@ func resourceUserLoginProfileDelete(ctx context.Context, d *schema.ResourceData, log.Printf("[DEBUG] Deleting IAM User Login Profile (%s): %v", d.Id(), input) // Handle IAM eventual consistency - err := retry.RetryContext(ctx, propagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, propagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn.DeleteLoginProfile(ctx, input) var nse *awstypes.NoSuchEntityException @@ -250,21 +245,16 @@ func resourceUserLoginProfileDelete(ctx context.Context, d *schema.ResourceData, // EntityTemporarilyUnmodifiable: Login Profile for User XXX cannot be modified while login profile is being created. var etu *awstypes.EntityTemporarilyUnmodifiableException if tfawserr.ErrCodeEquals(err, etu.ErrorCode()) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - // Handle AWS Go SDK automatic retries - if tfresource.TimedOut(err) { - _, err = conn.DeleteLoginProfile(ctx, input) - } - if errs.IsA[*awstypes.NoSuchEntityException](err) { return diags } diff --git a/internal/service/iam/user_login_profile_test.go b/internal/service/iam/user_login_profile_test.go index 7ad7315fcba4..df93026585b1 100644 --- a/internal/service/iam/user_login_profile_test.go +++ b/internal/service/iam/user_login_profile_test.go @@ -17,7 +17,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/iam" awstypes "github.com/aws/aws-sdk-go-v2/service/iam/types" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -25,6 +24,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs" tfiam "github.com/hashicorp/terraform-provider-aws/internal/service/iam" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/vault/helper/pgpkeys" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -393,11 +393,11 @@ func testDecryptPasswordAndTest(ctx context.Context, nProfile, nAccessKey, key s return fmt.Errorf("creating session: %s", err) } - return retry.RetryContext(ctx, 2*time.Minute, func() *retry.RetryError { + return tfresource.Retry(ctx, 2*time.Minute, func(ctx context.Context) *tfresource.RetryError { iamAsCreatedUser := iam.NewFromConfig(iamAsCreatedUserSession) newPassword, err := tfiam.GeneratePassword(20) if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } _, err = iamAsCreatedUser.ChangePassword(ctx, &iam.ChangePasswordInput{ OldPassword: aws.String(decryptedPassword.String()), @@ -406,16 +406,16 @@ func testDecryptPasswordAndTest(ctx context.Context, nProfile, nAccessKey, key s if err != nil { // EntityTemporarilyUnmodifiable: Login Profile for User XXX cannot be modified while login profile is being created. if errs.IsA[*awstypes.EntityTemporarilyUnmodifiableException](err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if tfawserr.ErrCodeEquals(err, "InvalidClientTokenId") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if tfawserr.ErrMessageContains(err, "AccessDenied", "not authorized to perform: iam:ChangePassword") { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(fmt.Errorf("changing decrypted password: %s", err)) + return tfresource.NonRetryableError(fmt.Errorf("changing decrypted password: %s", err)) } return nil From b6cf60998b9a7bac18968d2e62294ea7b96be141 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:22:34 -0400 Subject: [PATCH 1468/2115] Replace 'retry.RetryContext' by 'tfresource.Retry' - lambda. --- .../service/lambda/event_source_mapping_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/internal/service/lambda/event_source_mapping_test.go b/internal/service/lambda/event_source_mapping_test.go index df5561f821f8..d0a6ff64cfa1 100644 --- a/internal/service/lambda/event_source_mapping_test.go +++ b/internal/service/lambda/event_source_mapping_test.go @@ -17,7 +17,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/mq" "github.com/aws/aws-sdk-go-v2/service/secretsmanager" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -1546,7 +1545,7 @@ func testAccCheckEventSourceMappingIsBeingDisabled(ctx context.Context, v *lambd return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).LambdaClient(ctx) // Disable enabled state - err := retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError { + err := tfresource.Retry(ctx, 10*time.Minute, func(ctx context.Context) *tfresource.RetryError { input := &lambda.UpdateEventSourceMappingInput{ Enabled: aws.Bool(false), UUID: v.UUID, @@ -1555,12 +1554,12 @@ func testAccCheckEventSourceMappingIsBeingDisabled(ctx context.Context, v *lambd _, err := conn.UpdateEventSourceMapping(ctx, input) if errs.IsA[*awstypes.ResourceInUseException](err) { - return retry.RetryableError(fmt.Errorf( + return tfresource.RetryableError(fmt.Errorf( "Waiting for Lambda Event Source Mapping to be ready to be updated: %v", v.UUID)) } if err != nil { - return retry.NonRetryableError( + return tfresource.NonRetryableError( fmt.Errorf("Error updating Lambda Event Source Mapping: %w", err)) } @@ -1572,16 +1571,16 @@ func testAccCheckEventSourceMappingIsBeingDisabled(ctx context.Context, v *lambd } // wait for state to be propagated - return retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError { + return tfresource.Retry(ctx, 10*time.Minute, func(ctx context.Context) *tfresource.RetryError { output, err := tflambda.FindEventSourceMappingByID(ctx, conn, aws.ToString(v.UUID)) if err != nil { - return retry.NonRetryableError( + return tfresource.NonRetryableError( fmt.Errorf("Error getting Lambda Event Source Mapping: %s", err)) } if state := aws.ToString(output.State); state != "Disabled" { - return retry.RetryableError(fmt.Errorf( + return tfresource.RetryableError(fmt.Errorf( "Waiting to get Lambda Event Source Mapping to be fully enabled, it's currently %s: %v", state, v.UUID)) } From 527101da4026a6a4f191afff27d5f4ea525b1af0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 13:58:30 -0400 Subject: [PATCH 1469/2115] r/aws_appautoscaling_policy:: Tidy up flex. --- internal/service/appautoscaling/policy.go | 373 ++++++++++++---------- 1 file changed, 202 insertions(+), 171 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index abdd87d2a9f3..994b3078d23f 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -578,115 +578,137 @@ func expandStepAdjustments(tfList []any) []awstypes.StepAdjustment { return apiObjects } -func expandCustomizedMetricSpecification(configured []any) *awstypes.CustomizedMetricSpecification { - spec := &awstypes.CustomizedMetricSpecification{} - - for _, raw := range configured { - data := raw.(map[string]any) - if val, ok := data["metrics"].(*schema.Set); ok && val.Len() > 0 { - spec.Metrics = expandTargetTrackingMetricDataQueries(val.List()) - } else { - if v, ok := data[names.AttrMetricName]; ok { - spec.MetricName = aws.String(v.(string)) - } +func expandCustomizedMetricSpecification(tfList []any) *awstypes.CustomizedMetricSpecification { + if len(tfList) < 1 || tfList[0] == nil { + return nil + } - if v, ok := data[names.AttrNamespace]; ok { - spec.Namespace = aws.String(v.(string)) - } + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.CustomizedMetricSpecification{} - if v, ok := data[names.AttrUnit].(string); ok && v != "" { - spec.Unit = aws.String(v) + if v, ok := tfMap["metrics"].(*schema.Set); ok && v.Len() > 0 { + apiObject.Metrics = expandTargetTrackingMetricDataQueries(v.List()) + } else { + if v, ok := tfMap["dimensions"].(*schema.Set); ok && v.Len() > 0 { + dimensions := make([]awstypes.MetricDimension, v.Len()) + + for i, tfMapRaw := range v.List() { + tfMap := tfMapRaw.(map[string]any) + dimensions[i] = awstypes.MetricDimension{ + Name: aws.String(tfMap[names.AttrName].(string)), + Value: aws.String(tfMap[names.AttrValue].(string)), + } } - if v, ok := data["statistic"]; ok { - spec.Statistic = awstypes.MetricStatistic(v.(string)) - } + apiObject.Dimensions = dimensions + } - if s, ok := data["dimensions"].(*schema.Set); ok && s.Len() > 0 { - dimensions := make([]awstypes.MetricDimension, s.Len()) - for i, d := range s.List() { - dimension := d.(map[string]any) - dimensions[i] = awstypes.MetricDimension{ - Name: aws.String(dimension[names.AttrName].(string)), - Value: aws.String(dimension[names.AttrValue].(string)), - } - } - spec.Dimensions = dimensions - } + if v, ok := tfMap[names.AttrMetricName]; ok { + apiObject.MetricName = aws.String(v.(string)) + } + + if v, ok := tfMap[names.AttrNamespace]; ok { + apiObject.Namespace = aws.String(v.(string)) + } + + if v, ok := tfMap["statistic"]; ok { + apiObject.Statistic = awstypes.MetricStatistic(v.(string)) + } + + if v, ok := tfMap[names.AttrUnit].(string); ok && v != "" { + apiObject.Unit = aws.String(v) } } - return spec + + return apiObject } -func expandTargetTrackingMetricDataQueries(metricDataQuerySlices []any) []awstypes.TargetTrackingMetricDataQuery { - if len(metricDataQuerySlices) < 1 { +func expandTargetTrackingMetricDataQueries(tfList []any) []awstypes.TargetTrackingMetricDataQuery { + if len(tfList) < 1 { return nil } - metricDataQueries := make([]awstypes.TargetTrackingMetricDataQuery, len(metricDataQuerySlices)) - for i := range metricDataQueries { - metricDataQueryFlat := metricDataQuerySlices[i].(map[string]any) - metricDataQuery := awstypes.TargetTrackingMetricDataQuery{ - Id: aws.String(metricDataQueryFlat[names.AttrID].(string)), + apiObjects := make([]awstypes.TargetTrackingMetricDataQuery, len(tfList)) + + for i, tfMapRaw := range tfList { + tfMap := tfMapRaw.(map[string]any) + apiObject := awstypes.TargetTrackingMetricDataQuery{ + Id: aws.String(tfMap[names.AttrID].(string)), } - if val, ok := metricDataQueryFlat["metric_stat"]; ok && len(val.([]any)) > 0 { - metricStatSpec := val.([]any)[0].(map[string]any) - metricSpec := metricStatSpec["metric"].([]any)[0].(map[string]any) - metric := &awstypes.TargetTrackingMetric{ - MetricName: aws.String(metricSpec[names.AttrMetricName].(string)), - Namespace: aws.String(metricSpec[names.AttrNamespace].(string)), - } - if v, ok := metricSpec["dimensions"]; ok { - dims := v.(*schema.Set).List() - dimList := make([]awstypes.TargetTrackingMetricDimension, len(dims)) - for i := range dimList { - dim := dims[i].(map[string]any) - md := awstypes.TargetTrackingMetricDimension{ - Name: aws.String(dim[names.AttrName].(string)), - Value: aws.String(dim[names.AttrValue].(string)), + + if v, ok := tfMap[names.AttrExpression]; ok && v.(string) != "" { + apiObject.Expression = aws.String(v.(string)) + } + + if v, ok := tfMap["label"]; ok && v.(string) != "" { + apiObject.Label = aws.String(v.(string)) + } + + if v, ok := tfMap["metric_stat"]; ok && len(v.([]any)) > 0 { + apiObject.MetricStat = &awstypes.TargetTrackingMetricStat{} + tfMap := v.([]any)[0].(map[string]any) + + if v, ok := tfMap["metric"]; ok && len(v.([]any)) > 0 { + tfMap := v.([]any)[0].(map[string]any) + + metric := &awstypes.TargetTrackingMetric{ + MetricName: aws.String(tfMap[names.AttrMetricName].(string)), + Namespace: aws.String(tfMap[names.AttrNamespace].(string)), + } + + if v, ok := tfMap["dimensions"].(*schema.Set); ok && v.Len() > 0 { + dimensions := make([]awstypes.TargetTrackingMetricDimension, v.Len()) + + for i, tfMapRaw := range v.List() { + tfMap := tfMapRaw.(map[string]any) + dimensions[i] = awstypes.TargetTrackingMetricDimension{ + Name: aws.String(tfMap[names.AttrName].(string)), + Value: aws.String(tfMap[names.AttrValue].(string)), + } } - dimList[i] = md + + metric.Dimensions = dimensions } - metric.Dimensions = dimList + + apiObject.MetricStat.Metric = metric } - metricStat := &awstypes.TargetTrackingMetricStat{ - Metric: metric, - Stat: aws.String(metricStatSpec["stat"].(string)), + + if v, ok := tfMap["stat"].(string); ok && v != "" { + apiObject.MetricStat.Stat = aws.String(v) } - if v, ok := metricStatSpec[names.AttrUnit]; ok && len(v.(string)) > 0 { - metricStat.Unit = aws.String(v.(string)) + + if v, ok := tfMap[names.AttrUnit].(string); ok && v != "" { + apiObject.MetricStat.Unit = aws.String(v) } - metricDataQuery.MetricStat = metricStat - } - if val, ok := metricDataQueryFlat[names.AttrExpression]; ok && val.(string) != "" { - metricDataQuery.Expression = aws.String(val.(string)) } - if val, ok := metricDataQueryFlat["label"]; ok && val.(string) != "" { - metricDataQuery.Label = aws.String(val.(string)) - } - if val, ok := metricDataQueryFlat["return_data"]; ok { - metricDataQuery.ReturnData = aws.Bool(val.(bool)) + + if v, ok := tfMap["return_data"]; ok { + apiObject.ReturnData = aws.Bool(v.(bool)) } - metricDataQueries[i] = metricDataQuery + + apiObjects[i] = apiObject } - return metricDataQueries + + return apiObjects } -func expandPredefinedMetricSpecification(configured []any) *awstypes.PredefinedMetricSpecification { - spec := &awstypes.PredefinedMetricSpecification{} +func expandPredefinedMetricSpecification(tfList []any) *awstypes.PredefinedMetricSpecification { + if len(tfList) < 1 || tfList[0] == nil { + return nil + } - for _, raw := range configured { - data := raw.(map[string]any) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.PredefinedMetricSpecification{} - if v, ok := data["predefined_metric_type"]; ok { - spec.PredefinedMetricType = awstypes.MetricType(v.(string)) - } + if v, ok := tfMap["predefined_metric_type"].(string); ok && v != "" { + apiObject.PredefinedMetricType = awstypes.MetricType(v) + } - if v, ok := data["resource_label"].(string); ok && v != "" { - spec.ResourceLabel = aws.String(v) - } + if v, ok := tfMap["resource_label"].(string); ok && v != "" { + apiObject.ResourceLabel = aws.String(v) } - return spec + + return apiObject } func expandStepScalingPolicyConfiguration(tfList []any) *awstypes.StepScalingPolicyConfiguration { @@ -727,13 +749,13 @@ func flattenStepScalingPolicyConfiguration(apiObject *awstypes.StepScalingPolicy tfMap := make(map[string]any) - tfMap["adjustment_type"] = string(apiObject.AdjustmentType) + tfMap["adjustment_type"] = apiObject.AdjustmentType if apiObject.Cooldown != nil { tfMap["cooldown"] = aws.ToInt32(apiObject.Cooldown) } - tfMap["metric_aggregation_type"] = string(apiObject.MetricAggregationType) + tfMap["metric_aggregation_type"] = apiObject.MetricAggregationType if apiObject.MinAdjustmentMagnitude != nil { tfMap["min_adjustment_magnitude"] = aws.ToInt32(apiObject.MinAdjustmentMagnitude) @@ -768,151 +790,160 @@ func flattenStepAdjustments(apiObjects []awstypes.StepAdjustment) []any { return tfList } -func flattenTargetTrackingScalingPolicyConfiguration(cfg *awstypes.TargetTrackingScalingPolicyConfiguration) []any { - if cfg == nil { +func flattenTargetTrackingScalingPolicyConfiguration(apiObject *awstypes.TargetTrackingScalingPolicyConfiguration) []any { + if apiObject == nil { return []any{} } - m := make(map[string]any) + tfMap := make(map[string]any) - if v := cfg.CustomizedMetricSpecification; v != nil { - m["customized_metric_specification"] = flattenCustomizedMetricSpecification(v) + if v := apiObject.CustomizedMetricSpecification; v != nil { + tfMap["customized_metric_specification"] = flattenCustomizedMetricSpecification(v) } - if v := cfg.DisableScaleIn; v != nil { - m["disable_scale_in"] = aws.ToBool(v) + if v := apiObject.DisableScaleIn; v != nil { + tfMap["disable_scale_in"] = aws.ToBool(v) } - if v := cfg.PredefinedMetricSpecification; v != nil { - m["predefined_metric_specification"] = flattenPredefinedMetricSpecification(v) + if v := apiObject.PredefinedMetricSpecification; v != nil { + tfMap["predefined_metric_specification"] = flattenPredefinedMetricSpecification(v) } - if v := cfg.ScaleInCooldown; v != nil { - m["scale_in_cooldown"] = aws.ToInt32(v) + if v := apiObject.ScaleInCooldown; v != nil { + tfMap["scale_in_cooldown"] = aws.ToInt32(v) } - if v := cfg.ScaleOutCooldown; v != nil { - m["scale_out_cooldown"] = aws.ToInt32(v) + if v := apiObject.ScaleOutCooldown; v != nil { + tfMap["scale_out_cooldown"] = aws.ToInt32(v) } - if v := cfg.TargetValue; v != nil { - m["target_value"] = aws.ToFloat64(v) + if v := apiObject.TargetValue; v != nil { + tfMap["target_value"] = aws.ToFloat64(v) } - return []any{m} + return []any{tfMap} } -func flattenCustomizedMetricSpecification(cfg *awstypes.CustomizedMetricSpecification) []any { - if cfg == nil { +func flattenCustomizedMetricSpecification(apiObject *awstypes.CustomizedMetricSpecification) []any { + if apiObject == nil { return []any{} } - m := map[string]any{} + tfMap := map[string]any{} - if cfg.Metrics != nil { - m["metrics"] = flattenTargetTrackingMetricDataQueries(cfg.Metrics) + if apiObject.Metrics != nil { + tfMap["metrics"] = flattenTargetTrackingMetricDataQueries(apiObject.Metrics) } else { - if v := cfg.Dimensions; len(v) > 0 { - m["dimensions"] = flattenMetricDimensions(cfg.Dimensions) + if v := apiObject.Dimensions; len(v) > 0 { + tfMap["dimensions"] = flattenMetricDimensions(apiObject.Dimensions) } - if v := cfg.MetricName; v != nil { - m[names.AttrMetricName] = aws.ToString(v) + if v := apiObject.MetricName; v != nil { + tfMap[names.AttrMetricName] = aws.ToString(v) } - if v := cfg.Namespace; v != nil { - m[names.AttrNamespace] = aws.ToString(v) + if v := apiObject.Namespace; v != nil { + tfMap[names.AttrNamespace] = aws.ToString(v) } - m["statistic"] = string(cfg.Statistic) + tfMap["statistic"] = apiObject.Statistic - if v := cfg.Unit; v != nil { - m[names.AttrUnit] = aws.ToString(v) + if v := apiObject.Unit; v != nil { + tfMap[names.AttrUnit] = aws.ToString(v) } } - return []any{m} + return []any{tfMap} } -func flattenTargetTrackingMetricDataQueries(metricDataQueries []awstypes.TargetTrackingMetricDataQuery) []any { - metricDataQueriesSpec := make([]any, len(metricDataQueries)) - for i := range metricDataQueriesSpec { - metricDataQuery := map[string]any{} - rawMetricDataQuery := metricDataQueries[i] - metricDataQuery[names.AttrID] = aws.ToString(rawMetricDataQuery.Id) - if rawMetricDataQuery.Expression != nil { - metricDataQuery[names.AttrExpression] = aws.ToString(rawMetricDataQuery.Expression) +func flattenTargetTrackingMetricDataQueries(apiObjects []awstypes.TargetTrackingMetricDataQuery) []any { + tfList := make([]any, len(apiObjects)) + + for i, apiObject := range apiObjects { + tfMap := map[string]any{ + names.AttrID: aws.ToString(apiObject.Id), } - if rawMetricDataQuery.Label != nil { - metricDataQuery["label"] = aws.ToString(rawMetricDataQuery.Label) + + if apiObject.Expression != nil { + tfMap[names.AttrExpression] = aws.ToString(apiObject.Expression) + } + + if apiObject.Label != nil { + tfMap["label"] = aws.ToString(apiObject.Label) } - if rawMetricDataQuery.MetricStat != nil { - metricStatSpec := map[string]any{} - rawMetricStat := rawMetricDataQuery.MetricStat - rawMetric := rawMetricStat.Metric - metricSpec := map[string]any{} - if rawMetric.Dimensions != nil { - dimSpec := make([]any, len(rawMetric.Dimensions)) - for i := range dimSpec { - dim := map[string]any{} - rawDim := rawMetric.Dimensions[i] - dim[names.AttrName] = aws.ToString(rawDim.Name) - dim[names.AttrValue] = aws.ToString(rawDim.Value) - dimSpec[i] = dim + + if apiObject := apiObject.MetricStat; apiObject != nil { + tfMapMetricStat := map[string]any{ + "stat": aws.ToString(apiObject.Stat), + } + + if apiObject := apiObject.Metric; apiObject != nil { + tfMapMetric := map[string]any{ + names.AttrMetricName: aws.ToString(apiObject.MetricName), + names.AttrNamespace: aws.ToString(apiObject.Namespace), + } + + tfList := make([]any, len(apiObject.Dimensions)) + for i, apiObject := range apiObject.Dimensions { + tfList[i] = map[string]any{ + names.AttrName: aws.ToString(apiObject.Name), + names.AttrValue: aws.ToString(apiObject.Value), + } } - metricSpec["dimensions"] = dimSpec + + tfMapMetric["dimensions"] = tfList + tfMapMetricStat["metric"] = []map[string]any{tfMapMetric} } - metricSpec[names.AttrMetricName] = aws.ToString(rawMetric.MetricName) - metricSpec[names.AttrNamespace] = aws.ToString(rawMetric.Namespace) - metricStatSpec["metric"] = []map[string]any{metricSpec} - metricStatSpec["stat"] = aws.ToString(rawMetricStat.Stat) - if rawMetricStat.Unit != nil { - metricStatSpec[names.AttrUnit] = aws.ToString(rawMetricStat.Unit) + + if apiObject.Unit != nil { + tfMapMetricStat[names.AttrUnit] = aws.ToString(apiObject.Unit) } - metricDataQuery["metric_stat"] = []map[string]any{metricStatSpec} + + tfMap["metric_stat"] = []map[string]any{tfMapMetricStat} } - if rawMetricDataQuery.ReturnData != nil { - metricDataQuery["return_data"] = aws.ToBool(rawMetricDataQuery.ReturnData) + + if apiObject.ReturnData != nil { + tfMap["return_data"] = aws.ToBool(apiObject.ReturnData) } - metricDataQueriesSpec[i] = metricDataQuery + + tfList[i] = tfMap } - return metricDataQueriesSpec + + return tfList } -func flattenMetricDimensions(ds []awstypes.MetricDimension) []any { - l := make([]any, len(ds)) - for i, d := range ds { - if ds == nil { - continue - } +func flattenMetricDimensions(apiObjects []awstypes.MetricDimension) []any { + tfList := make([]any, len(apiObjects)) - m := map[string]any{} + for i, apiObject := range apiObjects { + tfMap := map[string]any{} - if v := d.Name; v != nil { - m[names.AttrName] = aws.ToString(v) + if v := apiObject.Name; v != nil { + tfMap[names.AttrName] = aws.ToString(v) } - if v := d.Value; v != nil { - m[names.AttrValue] = aws.ToString(v) + if v := apiObject.Value; v != nil { + tfMap[names.AttrValue] = aws.ToString(v) } - l[i] = m + tfList[i] = tfMap } - return l + + return tfList } -func flattenPredefinedMetricSpecification(cfg *awstypes.PredefinedMetricSpecification) []any { - if cfg == nil { +func flattenPredefinedMetricSpecification(apiObject *awstypes.PredefinedMetricSpecification) []any { + if apiObject == nil { return []any{} } - m := map[string]any{} - - m["predefined_metric_type"] = string(cfg.PredefinedMetricType) + tfMap := map[string]any{ + "predefined_metric_type": apiObject.PredefinedMetricType, + } - if v := cfg.ResourceLabel; v != nil { - m["resource_label"] = aws.ToString(v) + if v := apiObject.ResourceLabel; v != nil { + tfMap["resource_label"] = aws.ToString(v) } - return []any{m} + return []any{tfMap} } From a84578b80a12a6f671b384693b37dc9fd6cd7e63 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:30:35 -0400 Subject: [PATCH 1470/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccAppAutoScalingPolicy_' PKG=appautoscaling ACCTEST_PARALLELISM=3 make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/appautoscaling/... -v -count 1 -parallel 3 -run=TestAccAppAutoScalingPolicy_ -timeout 360m -vet=off 2025/09/05 14:25:07 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/05 14:25:07 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccAppAutoScalingPolicy_basic === PAUSE TestAccAppAutoScalingPolicy_basic === RUN TestAccAppAutoScalingPolicy_disappears === PAUSE TestAccAppAutoScalingPolicy_disappears === RUN TestAccAppAutoScalingPolicy_scaleOutAndIn === PAUSE TestAccAppAutoScalingPolicy_scaleOutAndIn === RUN TestAccAppAutoScalingPolicy_spotFleetRequest === PAUSE TestAccAppAutoScalingPolicy_spotFleetRequest === RUN TestAccAppAutoScalingPolicy_DynamoDB_table === PAUSE TestAccAppAutoScalingPolicy_DynamoDB_table === RUN TestAccAppAutoScalingPolicy_DynamoDB_index === PAUSE TestAccAppAutoScalingPolicy_DynamoDB_index === RUN TestAccAppAutoScalingPolicy_multiplePoliciesSameName === PAUSE TestAccAppAutoScalingPolicy_multiplePoliciesSameName === RUN TestAccAppAutoScalingPolicy_multiplePoliciesSameResource === PAUSE TestAccAppAutoScalingPolicy_multiplePoliciesSameResource === RUN TestAccAppAutoScalingPolicy_ResourceID_forceNew === PAUSE TestAccAppAutoScalingPolicy_ResourceID_forceNew === RUN TestAccAppAutoScalingPolicy_TargetTrack_metricMath === PAUSE TestAccAppAutoScalingPolicy_TargetTrack_metricMath === CONT TestAccAppAutoScalingPolicy_basic === CONT TestAccAppAutoScalingPolicy_DynamoDB_index === CONT TestAccAppAutoScalingPolicy_spotFleetRequest --- PASS: TestAccAppAutoScalingPolicy_DynamoDB_index (35.75s) === CONT TestAccAppAutoScalingPolicy_scaleOutAndIn --- PASS: TestAccAppAutoScalingPolicy_basic (76.88s) === CONT TestAccAppAutoScalingPolicy_ResourceID_forceNew --- PASS: TestAccAppAutoScalingPolicy_scaleOutAndIn (69.15s) === CONT TestAccAppAutoScalingPolicy_TargetTrack_metricMath --- PASS: TestAccAppAutoScalingPolicy_spotFleetRequest (127.22s) === CONT TestAccAppAutoScalingPolicy_DynamoDB_table --- PASS: TestAccAppAutoScalingPolicy_ResourceID_forceNew (66.70s) === CONT TestAccAppAutoScalingPolicy_multiplePoliciesSameResource --- PASS: TestAccAppAutoScalingPolicy_DynamoDB_table (27.80s) === CONT TestAccAppAutoScalingPolicy_multiplePoliciesSameName --- PASS: TestAccAppAutoScalingPolicy_TargetTrack_metricMath (66.88s) === CONT TestAccAppAutoScalingPolicy_disappears --- PASS: TestAccAppAutoScalingPolicy_multiplePoliciesSameResource (31.61s) --- PASS: TestAccAppAutoScalingPolicy_multiplePoliciesSameName (33.63s) --- PASS: TestAccAppAutoScalingPolicy_disappears (75.37s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/appautoscaling 252.819s From 4cdf543581d5fe7a56bde518cf296b87ccc31aaa Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 02:50:32 +0900 Subject: [PATCH 1471/2115] Implement response_completion_timeout --- internal/service/cloudfront/distribution.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/internal/service/cloudfront/distribution.go b/internal/service/cloudfront/distribution.go index 7a1b732ba0cc..aeea1682441a 100644 --- a/internal/service/cloudfront/distribution.go +++ b/internal/service/cloudfront/distribution.go @@ -694,6 +694,15 @@ func resourceDistribution() *schema.Resource { }, }, }, + "response_completion_timeout": { + Type: schema.TypeInt, + Optional: true, + Default: 0, // Zero equals to unspecified + ValidateFunc: validation.Any( + validation.IntAtLeast(30), + validation.IntInSlice([]int{0}), + ), + }, "s3_origin_config": { Type: schema.TypeList, Optional: true, @@ -2144,6 +2153,12 @@ func expandOrigin(tfMap map[string]any) *awstypes.Origin { } } + if v, ok := tfMap["response_completion_timeout"]; ok { + if v := v.(int); v > 0 { + apiObject.ResponseCompletionTimeout = aws.Int32(int32(v)) + } + } + if v, ok := tfMap["s3_origin_config"]; ok { if v := v.([]any); len(v) > 0 { apiObject.S3OriginConfig = expandS3OriginConfig(v[0].(map[string]any)) @@ -2204,6 +2219,10 @@ func flattenOrigin(apiObject *awstypes.Origin) map[string]any { tfMap["origin_shield"] = []any{flattenOriginShield(apiObject.OriginShield)} } + if apiObject.ResponseCompletionTimeout != nil { + tfMap["response_completion_timeout"] = aws.ToInt32(apiObject.ResponseCompletionTimeout) + } + if apiObject.S3OriginConfig != nil && aws.ToString(apiObject.S3OriginConfig.OriginAccessIdentity) != "" { tfMap["s3_origin_config"] = []any{flattenS3OriginConfig(apiObject.S3OriginConfig)} } From 832a0631a3fdc2a8b81a4c70eb5d8cd58ffa57ca Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 02:51:17 +0900 Subject: [PATCH 1472/2115] Add an acceptance test for response_completion_timeout --- .../service/cloudfront/distribution_test.go | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/internal/service/cloudfront/distribution_test.go b/internal/service/cloudfront/distribution_test.go index fd50ff4db292..4c20587564ab 100644 --- a/internal/service/cloudfront/distribution_test.go +++ b/internal/service/cloudfront/distribution_test.go @@ -1498,6 +1498,78 @@ func TestAccCloudFrontDistribution_vpcOriginConfig(t *testing.T) { }) } +func TestAccCloudFrontDistribution_responseCompletionTimeout(t *testing.T) { + ctx := acctest.Context(t) + var distribution awstypes.Distribution + resourceName := "aws_cloudfront_distribution.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.CloudFrontEndpointID) }, + ErrorCheck: acctest.ErrorCheck(t, names.CloudFrontServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckDistributionDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccDistributionConfig_responseCompletionTimeout(false, false, 60), + Check: resource.ComposeTestCheckFunc( + testAccCheckDistributionExists(ctx, resourceName, &distribution), + resource.TestCheckResourceAttr(resourceName, "origin.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "origin.*", map[string]string{ + "custom_header.#": "0", + "custom_origin_config.#": "1", + "origin_id": "test", + "origin_shield.#": "0", + "s3_origin_config.#": "0", + "vpc_origin_config.#": "0", + "response_completion_timeout": "60", + }), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{ + "retain_on_delete", + "wait_for_deployment", + }, + }, + { + Config: testAccDistributionConfig_responseCompletionTimeout(false, false, 30), + Check: resource.ComposeTestCheckFunc( + testAccCheckDistributionExists(ctx, resourceName, &distribution), + resource.TestCheckResourceAttr(resourceName, "origin.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "origin.*", map[string]string{ + "custom_header.#": "0", + "custom_origin_config.#": "1", + "origin_id": "test", + "origin_shield.#": "0", + "s3_origin_config.#": "0", + "vpc_origin_config.#": "0", + "response_completion_timeout": "30", + }), + ), + }, + { + Config: testAccDistributionConfig_enabled(false, false), + Check: resource.ComposeTestCheckFunc( + testAccCheckDistributionExists(ctx, resourceName, &distribution), + resource.TestCheckResourceAttr(resourceName, "origin.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "origin.*", map[string]string{ + "custom_header.#": "0", + "custom_origin_config.#": "1", + "origin_id": "test", + "origin_shield.#": "0", + "s3_origin_config.#": "0", + "vpc_origin_config.#": "0", + "response_completion_timeout": "0", + }), + ), + }, + }, + }) +} + func TestAccCloudFrontDistribution_grpcConfig(t *testing.T) { ctx := acctest.Context(t) var distribution awstypes.Distribution @@ -4588,6 +4660,54 @@ resource "aws_cloudfront_distribution" "test" { `) } +func testAccDistributionConfig_responseCompletionTimeout(enabled, retainOnDelete bool, responseCompletionTimeout int) string { + return fmt.Sprintf(` +resource "aws_cloudfront_distribution" "test" { + enabled = %[1]t + retain_on_delete = %[2]t + + default_cache_behavior { + allowed_methods = ["GET", "HEAD"] + cached_methods = ["GET", "HEAD"] + target_origin_id = "test" + viewer_protocol_policy = "allow-all" + + forwarded_values { + query_string = false + + cookies { + forward = "all" + } + } + } + + origin { + domain_name = "www.example.com" + origin_id = "test" + + response_completion_timeout = %[3]d + + custom_origin_config { + http_port = 80 + https_port = 443 + origin_protocol_policy = "https-only" + origin_ssl_protocols = ["TLSv1.2"] + } + } + + restrictions { + geo_restriction { + restriction_type = "none" + } + } + + viewer_certificate { + cloudfront_default_certificate = true + } +} +`, enabled, retainOnDelete, responseCompletionTimeout) +} + func testAccDistributionConfig_grpcConfig() string { return ` resource "aws_cloudfront_distribution" "test" { From d1a8fc1234f92908b183439e7b1c516ace14d8a7 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 02:51:42 +0900 Subject: [PATCH 1473/2115] Add checks of response_completion_timeout to the basic acctest --- internal/service/cloudfront/distribution_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/service/cloudfront/distribution_test.go b/internal/service/cloudfront/distribution_test.go index 4c20587564ab..1ba78e3b72ab 100644 --- a/internal/service/cloudfront/distribution_test.go +++ b/internal/service/cloudfront/distribution_test.go @@ -39,6 +39,8 @@ func TestAccCloudFrontDistribution_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDistributionExists(ctx, resourceName, &distribution), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + resource.TestCheckResourceAttr(resourceName, "origin.#", "1"), + resource.TestCheckResourceAttr(resourceName, "origin.0.response_completion_timeout", "0"), ), }, { From ddce73e1c74d7d079273a576cd9ff05706b5ae34 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 02:52:25 +0900 Subject: [PATCH 1474/2115] Update the documentation to include response_completion_timeout --- website/docs/r/cloudfront_distribution.html.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index dd60ea8bd36e..4d2110371737 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -486,8 +486,9 @@ argument should not be specified. * `origin_id` (Required) - Unique identifier for the origin. * `origin_path` (Optional) - Optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin. * `origin_shield` - (Optional) [CloudFront Origin Shield](#origin-shield-arguments) configuration information. Using Origin Shield can help reduce the load on your origin. For more information, see [Using Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) in the Amazon CloudFront Developer Guide. +* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. Valid values are integers greater than or equal to `30`, or `0` (default). * `s3_origin_config` - (Optional) [CloudFront S3 origin](#s3-origin-config-arguments) configuration information. If a custom origin is required, use `custom_origin_config` instead. -* `vpc_origin_config` - (Optional) The VPC origin configuration. +* `vpc_origin_config` - (Optional) The [VPC origin configuration](#vpc-origin-config-arguments). ##### Custom Origin Config Arguments From 05413bffb311e16f60c05ae4b40a1de6fbb22f54 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 03:19:50 +0900 Subject: [PATCH 1475/2115] add changelog --- .changelog/44163.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44163.txt diff --git a/.changelog/44163.txt b/.changelog/44163.txt new file mode 100644 index 000000000000..a912f9f69a89 --- /dev/null +++ b/.changelog/44163.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument +``` From 13ba8fad8891c5bab87b80eb60b0387d9569cb9c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:43:41 -0400 Subject: [PATCH 1476/2115] Remove unnecessary calls to 'tfresource.TimedOut' - chime. --- internal/service/chime/voice_connector.go | 4 ---- internal/service/chime/voice_connector_group.go | 4 ---- internal/service/chime/voice_connector_logging.go | 4 ---- internal/service/chime/voice_connector_origination.go | 4 ---- internal/service/chime/voice_connector_termination.go | 4 ---- .../service/chime/voice_connector_termination_credentials.go | 4 ---- 6 files changed, 24 deletions(-) diff --git a/internal/service/chime/voice_connector.go b/internal/service/chime/voice_connector.go index 67fbb23520ac..8e7dd85f8909 100644 --- a/internal/service/chime/voice_connector.go +++ b/internal/service/chime/voice_connector.go @@ -111,10 +111,6 @@ func resourceVoiceConnectorRead(ctx context.Context, d *schema.ResourceData, met return findVoiceConnectorByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - resp, err = findVoiceConnectorByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Chime Voice connector %s not found", d.Id()) d.SetId("") diff --git a/internal/service/chime/voice_connector_group.go b/internal/service/chime/voice_connector_group.go index 16181bebfbf6..c9f4c1189c13 100644 --- a/internal/service/chime/voice_connector_group.go +++ b/internal/service/chime/voice_connector_group.go @@ -93,10 +93,6 @@ func resourceVoiceConnectorGroupRead(ctx context.Context, d *schema.ResourceData return findVoiceConnectorGroupByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - resp, err = findVoiceConnectorGroupByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && errs.IsA[*awstypes.NotFoundException](err) { log.Printf("[WARN] Chime Voice conector group %s not found", d.Id()) d.SetId("") diff --git a/internal/service/chime/voice_connector_logging.go b/internal/service/chime/voice_connector_logging.go index 24feef9ab02d..e89ad56b23ed 100644 --- a/internal/service/chime/voice_connector_logging.go +++ b/internal/service/chime/voice_connector_logging.go @@ -82,10 +82,6 @@ func resourceVoiceConnectorLoggingRead(ctx context.Context, d *schema.ResourceDa return findVoiceConnectorLoggingByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - resp, err = findVoiceConnectorLoggingByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Chime Voice Connector logging configuration %s not found", d.Id()) d.SetId("") diff --git a/internal/service/chime/voice_connector_origination.go b/internal/service/chime/voice_connector_origination.go index 9ad0f5127638..aba76abbc686 100644 --- a/internal/service/chime/voice_connector_origination.go +++ b/internal/service/chime/voice_connector_origination.go @@ -120,10 +120,6 @@ func resourceVoiceConnectorOriginationRead(ctx context.Context, d *schema.Resour return findVoiceConnectorOriginationByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - resp, err = findVoiceConnectorOriginationByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Chime Voice Connector (%s) origination not found, removing from state", d.Id()) d.SetId("") diff --git a/internal/service/chime/voice_connector_termination.go b/internal/service/chime/voice_connector_termination.go index f6c46ce53b6e..77d8a386e39a 100644 --- a/internal/service/chime/voice_connector_termination.go +++ b/internal/service/chime/voice_connector_termination.go @@ -125,10 +125,6 @@ func resourceVoiceConnectorTerminationRead(ctx context.Context, d *schema.Resour return findVoiceConnectorTerminationByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - resp, err = findVoiceConnectorTerminationByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Chime Voice Connector (%s) termination not found, removing from state", d.Id()) d.SetId("") diff --git a/internal/service/chime/voice_connector_termination_credentials.go b/internal/service/chime/voice_connector_termination_credentials.go index 3510e0e0dd0f..5dc2b4d26409 100644 --- a/internal/service/chime/voice_connector_termination_credentials.go +++ b/internal/service/chime/voice_connector_termination_credentials.go @@ -94,10 +94,6 @@ func resourceVoiceConnectorTerminationCredentialsRead(ctx context.Context, d *sc return findVoiceConnectorTerminationCredentialsByID(ctx, conn, d.Id()) }) - if tfresource.TimedOut(err) { - _, err = findVoiceConnectorTerminationCredentialsByID(ctx, conn, d.Id()) - } - if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Chime Voice Connector (%s) termination credentials not found, removing from state", d.Id()) d.SetId("") From 2f7d6603004848c61bbc6def9ae8cb093b75e3fc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:43:45 -0400 Subject: [PATCH 1477/2115] Remove unnecessary calls to 'tfresource.TimedOut' - comprehend. --- internal/service/comprehend/document_classifier.go | 4 +--- internal/service/comprehend/entity_recognizer.go | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/service/comprehend/document_classifier.go b/internal/service/comprehend/document_classifier.go index e51897dbb1f4..4b8fdaa00404 100644 --- a/internal/service/comprehend/document_classifier.go +++ b/internal/service/comprehend/document_classifier.go @@ -514,9 +514,7 @@ func documentClassifierPublishVersion(ctx context.Context, conn *comprehend.Clie return nil }, tfresource.WithPollInterval(documentClassifierPollInterval)) - if tfresource.TimedOut(err) { - out, err = conn.CreateDocumentClassifier(ctx, in) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "%s Amazon Comprehend Document Classifier (%s): %s", action, d.Get(names.AttrName).(string), err) } diff --git a/internal/service/comprehend/entity_recognizer.go b/internal/service/comprehend/entity_recognizer.go index 371ad1335d76..e6216c8148b3 100644 --- a/internal/service/comprehend/entity_recognizer.go +++ b/internal/service/comprehend/entity_recognizer.go @@ -541,9 +541,7 @@ func entityRecognizerPublishVersion(ctx context.Context, conn *comprehend.Client return nil }, tfresource.WithPollInterval(entityRegcognizerPollInterval)) - if tfresource.TimedOut(err) { - out, err = conn.CreateEntityRecognizer(ctx, in) - } + if err != nil { return sdkdiag.AppendErrorf(diags, "%s Amazon Comprehend Entity Recognizer (%s): %s", action, d.Get(names.AttrName).(string), err) } From 98bd5bd08d926913e84e1a5e575d07f989976994 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:43:54 -0400 Subject: [PATCH 1478/2115] Remove unnecessary calls to 'tfresource.TimedOut' - inspector2. --- internal/service/inspector2/enabler.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/service/inspector2/enabler.go b/internal/service/inspector2/enabler.go index 1b9a6738c7ee..f0f0d26280e6 100644 --- a/internal/service/inspector2/enabler.go +++ b/internal/service/inspector2/enabler.go @@ -147,9 +147,7 @@ func resourceEnablerCreate(ctx context.Context, d *schema.ResourceData, meta any return tfresource.NonRetryableError(err) }) - if tfresource.TimedOut(err) { - out, err = conn.Enable(ctx, in) - } + if err != nil { return create.AppendDiagError(diags, names.Inspector2, create.ErrActionCreating, ResNameEnabler, id, err) } From 1d639aa73e6682964f6da36c611ace5976fc0854 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:44:01 -0400 Subject: [PATCH 1479/2115] Remove unnecessary calls to 'tfresource.TimedOut' - opensearch. --- internal/service/opensearch/wait.go | 33 ++--------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/internal/service/opensearch/wait.go b/internal/service/opensearch/wait.go index bd5a4789208b..7026599181fd 100644 --- a/internal/service/opensearch/wait.go +++ b/internal/service/opensearch/wait.go @@ -60,18 +60,10 @@ func waitForDomainCreation(ctx context.Context, conn *opensearch.Client, domainN fmt.Errorf("%q: Timeout while waiting for OpenSearch Domain to be created", domainName)) }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) - if tfresource.TimedOut(err) { - out, err = findDomainByName(ctx, conn, domainName) - if err != nil { - return fmt.Errorf("describing OpenSearch Domain: %w", err) - } - if !aws.ToBool(out.Processing) && (out.Endpoint != nil || out.Endpoints != nil) { - return nil - } - } if err != nil { return fmt.Errorf("waiting for OpenSearch Domain to be created: %w", err) } + return nil } @@ -92,18 +84,10 @@ func waitForDomainUpdate(ctx context.Context, conn *opensearch.Client, domainNam fmt.Errorf("%q: Timeout while waiting for changes to be processed", domainName)) }, tfresource.WithDelay(1*time.Minute), tfresource.WithPollInterval(10*time.Second)) - if tfresource.TimedOut(err) { - out, err = findDomainByName(ctx, conn, domainName) - if err != nil { - return fmt.Errorf("describing OpenSearch Domain: %w", err) - } - if !aws.ToBool(out.Processing) { - return nil - } - } if err != nil { return fmt.Errorf("waiting for OpenSearch Domain changes to be processed: %w", err) } + return nil } @@ -127,19 +111,6 @@ func waitForDomainDelete(ctx context.Context, conn *opensearch.Client, domainNam return tfresource.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch Domain %q to be deleted", domainName)) }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) - if tfresource.TimedOut(err) { - out, err = findDomainByName(ctx, conn, domainName) - if err != nil { - if tfresource.NotFound(err) { - return nil - } - return fmt.Errorf("describing OpenSearch Domain: %s", err) - } - if out != nil && !aws.ToBool(out.Processing) { - return nil - } - } - if err != nil { return fmt.Errorf("waiting for OpenSearch Domain to be deleted: %s", err) } From c51defc7c031593a1e394d9a7ef44751db95580d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:44:02 -0400 Subject: [PATCH 1480/2115] Remove unnecessary calls to 'tfresource.TimedOut' - pinpoint. --- internal/service/pinpoint/event_stream.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/service/pinpoint/event_stream.go b/internal/service/pinpoint/event_stream.go index cda7c17dca77..986c0531b1aa 100644 --- a/internal/service/pinpoint/event_stream.go +++ b/internal/service/pinpoint/event_stream.go @@ -73,10 +73,6 @@ func resourceEventStreamUpsert(ctx context.Context, d *schema.ResourceData, meta return conn.PutEventStream(ctx, &req) }, "make sure the IAM Role is configured correctly") - if tfresource.TimedOut(err) { // nosemgrep:ci.helper-schema-TimeoutError-check-doesnt-return-output - _, err = conn.PutEventStream(ctx, &req) - } - if err != nil { return sdkdiag.AppendErrorf(diags, "putting Pinpoint Event Stream for application %s: %s", applicationId, err) } From 1d57822e92055331dabb91733c7891c5ddf403b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 14:44:03 -0400 Subject: [PATCH 1481/2115] Remove unnecessary calls to 'tfresource.TimedOut' - ram. --- internal/service/ram/resource_share_accepter.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/service/ram/resource_share_accepter.go b/internal/service/ram/resource_share_accepter.go index f90d1f6462fc..7c83d51936b1 100644 --- a/internal/service/ram/resource_share_accepter.go +++ b/internal/service/ram/resource_share_accepter.go @@ -309,10 +309,6 @@ func findMaybeResourceShareInvitationRetry(ctx context.Context, conn *ram.Client return nil }) - if tfresource.TimedOut(err) { - output, err = findMaybeResourceShareInvitation(ctx, conn, input, filter) - } - if errors.Is(err, errNotFound) { output, err = option.None[awstypes.ResourceShareInvitation](), nil } From 0422d0672db5dd5a6d49836a7aa8732546ff9773 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 5 Sep 2025 18:57:47 +0000 Subject: [PATCH 1482/2115] Update CHANGELOG.md for #44132 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1912fade7a2c..6efe65b02c76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ ## 6.13.0 (Unreleased) +ENHANCEMENTS: + +* data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) +* resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) + +BUG FIXES: + +* resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) + ## 6.12.0 (September 4, 2025) NOTES: From 15e932fb00a6e36c9d9cb15ca8e40e58740e728a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 15:54:24 -0400 Subject: [PATCH 1483/2115] Tweak diff logic for warm throughput --- internal/service/dynamodb/table.go | 70 +++++++++++++++++++++++-- internal/service/dynamodb/table_test.go | 28 ++++++++++ 2 files changed, 94 insertions(+), 4 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 8d78bd9ab5dc..46dfdcaa80b7 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -143,6 +143,7 @@ func resourceTable() *schema.Resource { return false }), + validateWarmThroughputCustomDiff, validateTTLCustomDiff, ), @@ -2663,12 +2664,13 @@ func flattenTableWarmThroughput(apiObject *awstypes.TableWarmThroughputDescripti return []any{} } - // Only flatten warm throughput if it meets the minimum requirements // AWS may return values below the minimum when warm throughput is not actually configured + // Also treat exact minimum values as defaults since AWS sets these automatically readUnits := aws.ToInt64(apiObject.ReadUnitsPerSecond) writeUnits := aws.ToInt64(apiObject.WriteUnitsPerSecond) - if readUnits < 12000 || writeUnits < 4000 { + // Return empty if values are below minimums OR exactly at minimums (AWS defaults) + if (readUnits < 12000 && writeUnits < 4000) || (readUnits == 12000 && writeUnits == 4000) { return []any{} } @@ -2690,12 +2692,13 @@ func flattenGSIWarmThroughput(apiObject *awstypes.GlobalSecondaryIndexWarmThroug return []any{} } - // Only flatten warm throughput if it meets the minimum requirements // AWS may return values below the minimum when warm throughput is not actually configured + // Also treat exact minimum values as defaults since AWS sets these automatically readUnits := aws.ToInt64(apiObject.ReadUnitsPerSecond) writeUnits := aws.ToInt64(apiObject.WriteUnitsPerSecond) - if readUnits < 12000 || writeUnits < 4000 { + // Return empty if values are below minimums OR exactly at minimums (AWS defaults) + if (readUnits < 12000 && writeUnits < 4000) || (readUnits == 12000 && writeUnits == 4000) { return []any{} } @@ -3121,6 +3124,65 @@ func validateProvisionedThroughputField(diff *schema.ResourceDiff, key string) e return nil } +func validateWarmThroughputCustomDiff(ctx context.Context, d *schema.ResourceDiff, meta any) error { + configRaw := d.GetRawConfig() + if !configRaw.IsKnown() || configRaw.IsNull() { + return nil + } + + // Handle table-level warm throughput suppression + if err := suppressTableWarmThroughputDefaults(d, configRaw); err != nil { + return err + } + + // Handle GSI warm throughput suppression + if err := suppressGSIWarmThroughputDefaults(d, configRaw); err != nil { + return err + } + + return nil +} + +func suppressTableWarmThroughputDefaults(d *schema.ResourceDiff, configRaw cty.Value) error { + // If warm throughput is explicitly configured, don't suppress any diffs + if warmThroughput := configRaw.GetAttr("warm_throughput"); warmThroughput.IsKnown() && !warmThroughput.IsNull() && warmThroughput.LengthInt() > 0 { + return nil + } + + // If warm throughput is not explicitly configured, suppress AWS default values + if !d.HasChange("warm_throughput") { + return nil + } + + _, new := d.GetChange("warm_throughput") + newList, ok := new.([]interface{}) + if !ok || len(newList) == 0 { + return nil + } + + newMap, ok := newList[0].(map[string]interface{}) + if !ok { + return nil + } + + readUnits := newMap["read_units_per_second"] + writeUnits := newMap["write_units_per_second"] + + // If AWS returns default values and no explicit config, suppress the diff + if (readUnits == 1 && writeUnits == 1) || (readUnits == 12000 && writeUnits == 4000) { + return d.Clear("warm_throughput") + } + + return nil +} + +func suppressGSIWarmThroughputDefaults(d *schema.ResourceDiff, configRaw cty.Value) error { + // GSI warm throughput defaults are now handled in the flattenGSIWarmThroughput function + // by filtering out AWS default values during the read operation. + // This approach is more reliable than trying to suppress diffs on Set-based fields. + return nil +} + func validateTTLCustomDiff(ctx context.Context, d *schema.ResourceDiff, meta any) error { var diags diag.Diagnostics diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 82279d3ec04e..0a4df0781696 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -4897,6 +4897,34 @@ func TestAccDynamoDBTable_warmThroughput(t *testing.T) { }) } +func TestAccDynamoDBTable_warmThroughputDefault(t *testing.T) { + ctx := acctest.Context(t) + var conf awstypes.TableDescription + resourceName := "aws_dynamodb_table.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.DynamoDBServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckTableDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccTableConfig_warmThroughput(rName, 5, 5, 12000, 4000), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckInitialTableExists(ctx, resourceName, &conf), + resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func TestAccDynamoDBTable_gsiWarmThroughput_billingProvisioned(t *testing.T) { ctx := acctest.Context(t) var conf awstypes.TableDescription From b5482b9d9e6d6ea00e9d619b4ee6ae15917b1194 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 16:22:42 -0400 Subject: [PATCH 1484/2115] Update semgrep config to anchor paths --- internal/generate/acctestconsts/semgrep.gtpl | 2 +- internal/generate/attrconsts/semgrep.gtpl | 2 +- internal/generate/servicesemgrep/cae.tmpl | 34 +++++++++---------- internal/generate/servicesemgrep/configs.tmpl | 8 ++--- internal/generate/servicesemgrep/service.tmpl | 10 +++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/generate/acctestconsts/semgrep.gtpl b/internal/generate/acctestconsts/semgrep.gtpl index 8ba6cf0c18a1..d12c35c12351 100644 --- a/internal/generate/acctestconsts/semgrep.gtpl +++ b/internal/generate/acctestconsts/semgrep.gtpl @@ -6,7 +6,7 @@ rules: message: Use the constant `acctest.Ct{{ .Constant }}` for the string literal "{{ .Literal }}" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" {{- if .AltLiteral }} pattern-either: - pattern: '"{{ .Literal }}"' diff --git a/internal/generate/attrconsts/semgrep.gtpl b/internal/generate/attrconsts/semgrep.gtpl index 1462ff310f45..228639355f78 100644 --- a/internal/generate/attrconsts/semgrep.gtpl +++ b/internal/generate/attrconsts/semgrep.gtpl @@ -7,7 +7,7 @@ rules: message: Use the constant `names.Attr{{ .Constant }}` for the string literal "{{ .Literal }}" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"{{ .Literal }}"' - pattern-not-regex: '"{{ .Literal }}":\s+test\w+,' diff --git a/internal/generate/servicesemgrep/cae.tmpl b/internal/generate/servicesemgrep/cae.tmpl index 913af928a588..39ce8cc86edc 100644 --- a/internal/generate/servicesemgrep/cae.tmpl +++ b/internal/generate/servicesemgrep/cae.tmpl @@ -6,11 +6,11 @@ rules: message: Do not use "AWS" in func name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/securitylake/aws_log_source_test.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/securitylake/aws_log_source_test.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -25,10 +25,10 @@ rules: message: Do not use "AWS" in const name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -43,11 +43,11 @@ rules: message: Do not use "AWS" in var name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/securitylake/exports_test.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/securitylake/exports_test.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -63,7 +63,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -78,7 +78,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -92,7 +92,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -107,7 +107,7 @@ rules: message: Do not use "EC2" in func name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -123,7 +123,7 @@ rules: message: Do not use "EC2" in const name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -137,7 +137,7 @@ rules: message: Do not use "EC2" in var name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: var $NAME = ... - metavariable-pattern: diff --git a/internal/generate/servicesemgrep/configs.tmpl b/internal/generate/servicesemgrep/configs.tmpl index 821176b03bc9..6023bd7c57fa 100644 --- a/internal/generate/servicesemgrep/configs.tmpl +++ b/internal/generate/servicesemgrep/configs.tmpl @@ -6,7 +6,7 @@ rules: message: "Config funcs should follow form testAccConfig_" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY:$VALUE, ...}" @@ -28,7 +28,7 @@ rules: message: "Config funcs should follow form testAccConfig_" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY: acctest.ConfigCompose(..., $VALUE, ...), ...}" @@ -49,7 +49,7 @@ rules: message: "Config funcs should not begin with 'testAccCheck'" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY:$VALUE, ...}" @@ -69,7 +69,7 @@ rules: message: "Config funcs should not begin with 'testAccCheck'" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY: acctest.ConfigCompose(..., $VALUE, ...), ...}" diff --git a/internal/generate/servicesemgrep/service.tmpl b/internal/generate/servicesemgrep/service.tmpl index fc6b2e6aebd2..6648736c1511 100644 --- a/internal/generate/servicesemgrep/service.tmpl +++ b/internal/generate/servicesemgrep/service.tmpl @@ -6,9 +6,9 @@ message: Do not use "{{ .ServiceAlias }}" in func name inside {{ .ProviderPackage }} package paths: include: - - internal/service/{{ .ProviderPackage }} + - "/internal/service/{{ .ProviderPackage }}" exclude: - - internal/service/{{ .ProviderPackage }}/list_pages_gen.go + - "/internal/service/{{ .ProviderPackage }}/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -49,7 +49,7 @@ message: Include "{{ .ServiceAlias }}" in test name paths: include: - - internal/service/{{ .ProviderPackage }}/{{ .FilePrefix }}*_test.go + - "/internal/service/{{ .ProviderPackage }}/{{ .FilePrefix }}*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -66,7 +66,7 @@ message: Do not use "{{ .ServiceAlias }}" in const name inside {{ .ProviderPackage }} package paths: include: - - internal/service/{{ .ProviderPackage }} + - "/internal/service/{{ .ProviderPackage }}" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -92,7 +92,7 @@ message: Do not use "{{ .ServiceAlias }}" in var name inside {{ .ProviderPackage }} package paths: include: - - internal/service/{{ .ProviderPackage }} + - "/internal/service/{{ .ProviderPackage }}" patterns: - pattern: var $NAME = ... - metavariable-pattern: From 937f87244903a6459256d6f8cb5391e50e305d62 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 16:23:35 -0400 Subject: [PATCH 1485/2115] Update semgrep configs for anchored paths --- .ci/semgrep/acctest/checks/planonly.yml | 2 +- .ci/semgrep/acctest/naming/naming.yml | 8 +- .ci/semgrep/aws/go-sdk-v1.yml | 12 +- .ci/semgrep/aws/go-sdk.yml | 30 +- .ci/semgrep/aws/input-on-heap.yml | 680 +++++++++--------- .ci/semgrep/aws/waiter.yml | 2 +- .ci/semgrep/errors/msgfmt.yml | 14 +- .ci/semgrep/framework/flex.yml | 94 +-- .../framework/import-passthrough-id.yml | 2 +- .ci/semgrep/framework/metadata_method.yml | 4 +- .ci/semgrep/migrate/context.yml | 14 +- .ci/semgrep/pluginsdk/customdiff.yml | 8 +- .ci/semgrep/pluginsdk/diags.yml | 4 +- .ci/semgrep/pluginsdk/isnewresource.yml | 4 +- .ci/semgrep/pluginsdk/quicksight/schema.yml | 16 +- .ci/semgrep/smarterr/enforce.yml | 24 +- .ci/semgrep/stdlib/exp.yml | 2 +- .ci/semgrep/tags/ds-tags-all.yml | 2 +- .ci/semgrep/tags/update.yml | 2 +- 19 files changed, 462 insertions(+), 462 deletions(-) diff --git a/.ci/semgrep/acctest/checks/planonly.yml b/.ci/semgrep/acctest/checks/planonly.yml index 55bf4ff4299d..43ae2a724005 100644 --- a/.ci/semgrep/acctest/checks/planonly.yml +++ b/.ci/semgrep/acctest/checks/planonly.yml @@ -4,7 +4,7 @@ rules: message: Replace `PlanOnly` acceptance test steps with `plancheck`s paths: include: - - "internal/service/*/*_test.go" + - "/internal/service/*/*_test.go" patterns: - pattern: | { diff --git a/.ci/semgrep/acctest/naming/naming.yml b/.ci/semgrep/acctest/naming/naming.yml index 0a38f741748f..6376d4db5438 100644 --- a/.ci/semgrep/acctest/naming/naming.yml +++ b/.ci/semgrep/acctest/naming/naming.yml @@ -4,7 +4,7 @@ rules: message: The check destroy function should match the pattern "testAccCheckDestroy". See https://hashicorp.github.io/terraform-provider-aws/naming/#test-support-functions paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" patterns: - pattern: func $FUNCNAME(...) { ... } - metavariable-regex: @@ -18,7 +18,7 @@ rules: message: The check destroy with provider function should match the pattern "testAccCheckDestroyWithProvider". paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" patterns: - pattern: func $FUNCNAME(...) { ... } - metavariable-regex: @@ -31,7 +31,7 @@ rules: message: The check destroy with region function should match the pattern "testAccCheckDestroyWithRegion". paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" patterns: - pattern: func $FUNCNAME(...) { ... } - metavariable-regex: @@ -44,7 +44,7 @@ rules: message: The check destroy function should have the correct signature paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" patterns: - pattern: func $FUNCNAME(...) { ... } - metavariable-regex: diff --git a/.ci/semgrep/aws/go-sdk-v1.yml b/.ci/semgrep/aws/go-sdk-v1.yml index fd96c53d2331..d3ed7d7488e2 100644 --- a/.ci/semgrep/aws/go-sdk-v1.yml +++ b/.ci/semgrep/aws/go-sdk-v1.yml @@ -4,10 +4,10 @@ rules: message: Do not use AWS SDK for Go v1 paths: include: - - internal/ + - "/internal" exclude: - - "internal/service/simpledb/*.go" - - "internal/conns/awsclient.go" + - "/internal/service/simpledb/*.go" + - "/internal/conns/awsclient.go" patterns: - pattern: | import ("$X") @@ -22,10 +22,10 @@ rules: message: Do not use aws-sdk-go-base AWS SDK for Go v1 shims paths: include: - - internal/ + - "/internal" exclude: - - "internal/service/simpledb/*.go" - - "internal/conns/config.go" + - "/internal/service/simpledb/*.go" + - "/internal/conns/config.go" patterns: - pattern: | import ("$X") diff --git a/.ci/semgrep/aws/go-sdk.yml b/.ci/semgrep/aws/go-sdk.yml index ab63b1186d60..b3817159ef6f 100644 --- a/.ci/semgrep/aws/go-sdk.yml +++ b/.ci/semgrep/aws/go-sdk.yml @@ -4,12 +4,12 @@ rules: message: Resources should not implement multiple AWS Go SDK service functionality paths: include: - - internal/ + - "/internal" exclude: - - "internal/service/**/*_test.go" - - "internal/service/**/sweep.go" - - "internal/acctest/acctest.go" - - "internal/conns/**/*.go" + - "/internal/service/**/*_test.go" + - "/internal/service/**/sweep.go" + - "/internal/acctest/acctest.go" + - "/internal/conns/**/*.go" patterns: - pattern: | import ("$X") @@ -27,11 +27,11 @@ rules: message: Prefer AWS Go SDK pointer conversion functions for dereferencing during assignment, e.g. aws.ToString() paths: include: - - internal/service + - "/internal/service" exclude: - - "internal/service/**/*_test.go" - - "internal/service/*/service_package.go" - - "internal/service/*/service_package_gen.go" + - "/internal/service/**/*_test.go" + - "/internal/service/*/service_package.go" + - "/internal/service/*/service_package_gen.go" patterns: - pattern: "$LHS = *$RHS" - pattern-not: "*$LHS2 = *$RHS" @@ -42,9 +42,9 @@ rules: message: Prefer AWS Go SDK pointer conversion functions for dereferencing during conditionals, e.g. aws.ToString() paths: include: - - internal/service + - "/internal/service" exclude: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" patterns: - pattern-either: - pattern: "$LHS == *$RHS" @@ -67,7 +67,7 @@ rules: message: Using AWS Go SDK pointer conversion, e.g. aws.String(), with immediate dereferencing is extraneous paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: "*aws.Bool($VALUE)" @@ -83,7 +83,7 @@ rules: message: Prefer AWS Go SDK pointer conversion aws.ToString() function for dereferencing during d.SetId() paths: include: - - internal/ + - "/internal" pattern: "d.SetId(*$VALUE)" severity: WARNING @@ -93,7 +93,7 @@ rules: message: AWS Go SDK pointer conversion function for `d.Set()` value is extraneous paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: d.Set($ATTRIBUTE, aws.ToBool($APIOBJECT)) @@ -113,6 +113,6 @@ rules: message: Prefer AWS Go SDK pointer conversion functions for dereferencing when converting int64 to int paths: include: - - internal/ + - "/internal" pattern: int(*$VALUE) severity: WARNING diff --git a/.ci/semgrep/aws/input-on-heap.yml b/.ci/semgrep/aws/input-on-heap.yml index 5a56a0c98ad6..fa98dceb30d5 100644 --- a/.ci/semgrep/aws/input-on-heap.yml +++ b/.ci/semgrep/aws/input-on-heap.yml @@ -4,229 +4,229 @@ rules: message: Create the $PKG.$INPUT struct on the stack instead of on the heap paths: exclude: - - "internal/service/apigatewayv2" - - "internal/service/appconfig" - - "internal/service/appfabric" - - "internal/service/appflow" - - "internal/service/appintegrations" - - "internal/service/applicationinsights" - - "internal/service/appmesh" - - "internal/service/apprunner" - - "internal/service/appstream" - - "internal/service/appsync" - - "internal/service/athena" - - "internal/service/auditmanager" - - "internal/service/autoscaling" - - "internal/service/backup" - - "internal/service/batch" - - "internal/service/bedrock" - - "internal/service/bedrockagent" - - "internal/service/budgets" - - "internal/service/ce" - - "internal/service/chatbot" - - "internal/service/chime" - - "internal/service/chimesdkmediapipelines" - - "internal/service/chimesdkvoice" - - "internal/service/cleanrooms" - - "internal/service/cloud9" - - "internal/service/cloudcontrol" - - "internal/service/cloudformation" - - "internal/service/cloudfront" - - "internal/service/cloudfrontkeyvaluestore" - - "internal/service/cloudhsmv2" - - "internal/service/cloudsearch" - - "internal/service/cloudtrail" - - "internal/service/cloudwatch" - - "internal/service/codeartifact" - - "internal/service/codebuild" - - "internal/service/codecatalyst" - - "internal/service/codecommit" - - "internal/service/codeconnections" - - "internal/service/codeguruprofiler" - - "internal/service/codegurureviewer" - - "internal/service/codepipeline" - - "internal/service/codestarconnections" - - "internal/service/codestarnotifications" - - "internal/service/cognitoidentity" - - "internal/service/cognitoidp" - - "internal/service/comprehend" - - "internal/service/computeoptimizer" - - "internal/service/configservice" - - "internal/service/controltower" - - "internal/service/connect" - - "internal/service/costoptimizationhub" - - "internal/service/cur" - - "internal/service/customerprofiles" - - "internal/service/dataexchange" - - "internal/service/datapipeline" - - "internal/service/datasync" - - "internal/service/datazone" - - "internal/service/dax" - - "internal/service/deploy" - - "internal/service/detective" - - "internal/service/devicefarm" - - "internal/service/devopsguru" - - "internal/service/directconnect" - - "internal/service/dlm" - - "internal/service/dms" - - "internal/service/docdb" - - "internal/service/docdbelastic" - - "internal/service/drs" - - "internal/service/ds" - - "internal/service/dynamodb" - - "internal/service/ec2/ipam_*" - - "internal/service/ec2/outposts_*" - - "internal/service/ec2/transitgateway_*" - - "internal/service/ec2/verifiedaccess_*" - - "internal/service/ec2/vpc_*" - - "internal/service/ec2/vpnclient_*" - - "internal/service/ecr" - - "internal/service/ecrpublic" - - "internal/service/ecs" - - "internal/service/efs" - - "internal/service/eks" - - "internal/service/elasticache" - - "internal/service/elasticbeanstalk" - - "internal/service/elasticsearch" - - "internal/service/elastictranscoder" - - "internal/service/elb" - - "internal/service/elbv2" - - "internal/service/emr" - - "internal/service/emrcontainers" - - "internal/service/emrserverless" - - "internal/service/events" - - "internal/service/evidently" - - "internal/service/finspace" - - "internal/service/firehose" - - "internal/service/fis" - - "internal/service/fms" - - "internal/service/fsx" - - "internal/service/gamelift" - - "internal/service/glacier" - - "internal/service/globalaccelerator" - - "internal/service/glue" - - "internal/service/grafana" - - "internal/service/guardduty" - - "internal/service/iam" - - "internal/service/identitystore" - - "internal/service/imagebuilder" - - "internal/service/inspector" - - "internal/service/inspector2" - - "internal/service/internetmonitor" - - "internal/service/iot" - - "internal/service/ivs" - - "internal/service/ivschat" - - "internal/service/kafka" - - "internal/service/kafkaconnect" - - "internal/service/kendra" - - "internal/service/keyspaces" - - "internal/service/kinesis" - - "internal/service/kinesisanalytics" - - "internal/service/kinesisanalyticsv2" - - "internal/service/kinesisvideo" - - "internal/service/kms" - - "internal/service/lakeformation" - - "internal/service/lambda" - - "internal/service/lexmodels" - - "internal/service/lexv2models" - - "internal/service/licensemanager" - - "internal/service/lightsail" - - "internal/service/location" - - "internal/service/logs" - - "internal/service/m2" - - "internal/service/macie2" - - "internal/service/mediaconvert" - - "internal/service/medialive" - - "internal/service/mediapackage" - - "internal/service/mediapackagev2" - - "internal/service/mediastore" - - "internal/service/memorydb" - - "internal/service/meta" - - "internal/service/mq" - - "internal/service/mwaa" - - "internal/service/neptune" - - "internal/service/networkfirewall" - - "internal/service/networkmanager" - - "internal/service/networkmonitor" - - "internal/service/oam" - - "internal/service/opensearch" - - "internal/service/opensearchserverless" - - "internal/service/opsworks" - - "internal/service/organizations" - - "internal/service/osis" - - "internal/service/outposts" - - "internal/service/paymentcryptography" - - "internal/service/pinpoint" - - "internal/service/pinpointsmsvoicev2" - - "internal/service/pipes" - - "internal/service/polly" - - "internal/service/pricing" - - "internal/service/qbusiness" - - "internal/service/qldb" - - "internal/service/quicksight" - - "internal/service/ram" - - "internal/service/rbin" - - "internal/service/rds" - - "internal/service/redshift" - - "internal/service/redshiftdata" - - "internal/service/redshiftserverless" - - "internal/service/rekognition" - - "internal/service/resiliencehub" - - "internal/service/resourceexplorer2" - - "internal/service/resourcegroups" - - "internal/service/resourcegroupstaggingapi" - - "internal/service/rolesanywhere" - - "internal/service/route53" - - "internal/service/route53domains" - - "internal/service/route53profiles" - - "internal/service/route53recoverycontrolconfig" - - "internal/service/route53recoveryreadiness" - - "internal/service/route53resolver" - - "internal/service/rum" - - "internal/service/s3" - - "internal/service/s3control" - - "internal/service/s3outposts" - - "internal/service/s3tables" - - "internal/service/sagemaker" - - "internal/service/scheduler" - - "internal/service/schemas" - - "internal/service/secretsmanager" - - "internal/service/securityhub" - - "internal/service/securitylake" - - "internal/service/serverlessrepo" - - "internal/service/servicecatalog" - - "internal/service/servicecatalogappregistry" - - "internal/service/servicediscovery" - - "internal/service/servicequotas" - - "internal/service/ses" - - "internal/service/sesv2" - - "internal/service/sfn" - - "internal/service/shield" - - "internal/service/signer" - - "internal/service/simpledb" - - "internal/service/sns" - - "internal/service/sqs" - - "internal/service/ssm" - - "internal/service/ssmcontacts" - - "internal/service/ssmincidents" - - "internal/service/ssmquicksetup" - - "internal/service/ssoadmin" - - "internal/service/storagegateway" - - "internal/service/sts" - - "internal/service/swf" - - "internal/service/synthetics" - - "internal/service/timestreaminfluxdb" - - "internal/service/timestreamquery" - - "internal/service/timestreamwrite" - - "internal/service/transcribe" - - "internal/service/transfer" - - "internal/service/verifiedpermissions" - - "internal/service/vpclattice" - - "internal/service/wafregional" - - "internal/service/waf" - - "internal/service/wafv2" - - "internal/service/worklink" - - "internal/service/workspaces" + - "/internal/service/apigatewayv2" + - "/internal/service/appconfig" + - "/internal/service/appfabric" + - "/internal/service/appflow" + - "/internal/service/appintegrations" + - "/internal/service/applicationinsights" + - "/internal/service/appmesh" + - "/internal/service/apprunner" + - "/internal/service/appstream" + - "/internal/service/appsync" + - "/internal/service/athena" + - "/internal/service/auditmanager" + - "/internal/service/autoscaling" + - "/internal/service/backup" + - "/internal/service/batch" + - "/internal/service/bedrock" + - "/internal/service/bedrockagent" + - "/internal/service/budgets" + - "/internal/service/ce" + - "/internal/service/chatbot" + - "/internal/service/chime" + - "/internal/service/chimesdkmediapipelines" + - "/internal/service/chimesdkvoice" + - "/internal/service/cleanrooms" + - "/internal/service/cloud9" + - "/internal/service/cloudcontrol" + - "/internal/service/cloudformation" + - "/internal/service/cloudfront" + - "/internal/service/cloudfrontkeyvaluestore" + - "/internal/service/cloudhsmv2" + - "/internal/service/cloudsearch" + - "/internal/service/cloudtrail" + - "/internal/service/cloudwatch" + - "/internal/service/codeartifact" + - "/internal/service/codebuild" + - "/internal/service/codecatalyst" + - "/internal/service/codecommit" + - "/internal/service/codeconnections" + - "/internal/service/codeguruprofiler" + - "/internal/service/codegurureviewer" + - "/internal/service/codepipeline" + - "/internal/service/codestarconnections" + - "/internal/service/codestarnotifications" + - "/internal/service/cognitoidentity" + - "/internal/service/cognitoidp" + - "/internal/service/comprehend" + - "/internal/service/computeoptimizer" + - "/internal/service/configservice" + - "/internal/service/controltower" + - "/internal/service/connect" + - "/internal/service/costoptimizationhub" + - "/internal/service/cur" + - "/internal/service/customerprofiles" + - "/internal/service/dataexchange" + - "/internal/service/datapipeline" + - "/internal/service/datasync" + - "/internal/service/datazone" + - "/internal/service/dax" + - "/internal/service/deploy" + - "/internal/service/detective" + - "/internal/service/devicefarm" + - "/internal/service/devopsguru" + - "/internal/service/directconnect" + - "/internal/service/dlm" + - "/internal/service/dms" + - "/internal/service/docdb" + - "/internal/service/docdbelastic" + - "/internal/service/drs" + - "/internal/service/ds" + - "/internal/service/dynamodb" + - "/internal/service/ec2/ipam_*" + - "/internal/service/ec2/outposts_*" + - "/internal/service/ec2/transitgateway_*" + - "/internal/service/ec2/verifiedaccess_*" + - "/internal/service/ec2/vpc_*" + - "/internal/service/ec2/vpnclient_*" + - "/internal/service/ecr" + - "/internal/service/ecrpublic" + - "/internal/service/ecs" + - "/internal/service/efs" + - "/internal/service/eks" + - "/internal/service/elasticache" + - "/internal/service/elasticbeanstalk" + - "/internal/service/elasticsearch" + - "/internal/service/elastictranscoder" + - "/internal/service/elb" + - "/internal/service/elbv2" + - "/internal/service/emr" + - "/internal/service/emrcontainers" + - "/internal/service/emrserverless" + - "/internal/service/events" + - "/internal/service/evidently" + - "/internal/service/finspace" + - "/internal/service/firehose" + - "/internal/service/fis" + - "/internal/service/fms" + - "/internal/service/fsx" + - "/internal/service/gamelift" + - "/internal/service/glacier" + - "/internal/service/globalaccelerator" + - "/internal/service/glue" + - "/internal/service/grafana" + - "/internal/service/guardduty" + - "/internal/service/iam" + - "/internal/service/identitystore" + - "/internal/service/imagebuilder" + - "/internal/service/inspector" + - "/internal/service/inspector2" + - "/internal/service/internetmonitor" + - "/internal/service/iot" + - "/internal/service/ivs" + - "/internal/service/ivschat" + - "/internal/service/kafka" + - "/internal/service/kafkaconnect" + - "/internal/service/kendra" + - "/internal/service/keyspaces" + - "/internal/service/kinesis" + - "/internal/service/kinesisanalytics" + - "/internal/service/kinesisanalyticsv2" + - "/internal/service/kinesisvideo" + - "/internal/service/kms" + - "/internal/service/lakeformation" + - "/internal/service/lambda" + - "/internal/service/lexmodels" + - "/internal/service/lexv2models" + - "/internal/service/licensemanager" + - "/internal/service/lightsail" + - "/internal/service/location" + - "/internal/service/logs" + - "/internal/service/m2" + - "/internal/service/macie2" + - "/internal/service/mediaconvert" + - "/internal/service/medialive" + - "/internal/service/mediapackage" + - "/internal/service/mediapackagev2" + - "/internal/service/mediastore" + - "/internal/service/memorydb" + - "/internal/service/meta" + - "/internal/service/mq" + - "/internal/service/mwaa" + - "/internal/service/neptune" + - "/internal/service/networkfirewall" + - "/internal/service/networkmanager" + - "/internal/service/networkmonitor" + - "/internal/service/oam" + - "/internal/service/opensearch" + - "/internal/service/opensearchserverless" + - "/internal/service/opsworks" + - "/internal/service/organizations" + - "/internal/service/osis" + - "/internal/service/outposts" + - "/internal/service/paymentcryptography" + - "/internal/service/pinpoint" + - "/internal/service/pinpointsmsvoicev2" + - "/internal/service/pipes" + - "/internal/service/polly" + - "/internal/service/pricing" + - "/internal/service/qbusiness" + - "/internal/service/qldb" + - "/internal/service/quicksight" + - "/internal/service/ram" + - "/internal/service/rbin" + - "/internal/service/rds" + - "/internal/service/redshift" + - "/internal/service/redshiftdata" + - "/internal/service/redshiftserverless" + - "/internal/service/rekognition" + - "/internal/service/resiliencehub" + - "/internal/service/resourceexplorer2" + - "/internal/service/resourcegroups" + - "/internal/service/resourcegroupstaggingapi" + - "/internal/service/rolesanywhere" + - "/internal/service/route53" + - "/internal/service/route53domains" + - "/internal/service/route53profiles" + - "/internal/service/route53recoverycontrolconfig" + - "/internal/service/route53recoveryreadiness" + - "/internal/service/route53resolver" + - "/internal/service/rum" + - "/internal/service/s3" + - "/internal/service/s3control" + - "/internal/service/s3outposts" + - "/internal/service/s3tables" + - "/internal/service/sagemaker" + - "/internal/service/scheduler" + - "/internal/service/schemas" + - "/internal/service/secretsmanager" + - "/internal/service/securityhub" + - "/internal/service/securitylake" + - "/internal/service/serverlessrepo" + - "/internal/service/servicecatalog" + - "/internal/service/servicecatalogappregistry" + - "/internal/service/servicediscovery" + - "/internal/service/servicequotas" + - "/internal/service/ses" + - "/internal/service/sesv2" + - "/internal/service/sfn" + - "/internal/service/shield" + - "/internal/service/signer" + - "/internal/service/simpledb" + - "/internal/service/sns" + - "/internal/service/sqs" + - "/internal/service/ssm" + - "/internal/service/ssmcontacts" + - "/internal/service/ssmincidents" + - "/internal/service/ssmquicksetup" + - "/internal/service/ssoadmin" + - "/internal/service/storagegateway" + - "/internal/service/sts" + - "/internal/service/swf" + - "/internal/service/synthetics" + - "/internal/service/timestreaminfluxdb" + - "/internal/service/timestreamquery" + - "/internal/service/timestreamwrite" + - "/internal/service/transcribe" + - "/internal/service/transfer" + - "/internal/service/verifiedpermissions" + - "/internal/service/vpclattice" + - "/internal/service/wafregional" + - "/internal/service/waf" + - "/internal/service/wafv2" + - "/internal/service/worklink" + - "/internal/service/workspaces" patterns: - pattern: | $X := &$PKG.$INPUT{ ... } @@ -240,123 +240,123 @@ rules: message: Create the $PKG.$INPUT struct on the stack instead of on the heap paths: exclude: - - "internal/service/auditmanager" - - "internal/service/ecr" - - "internal/service/ecrpublic" - - "internal/service/ecs" - - "internal/service/efs" - - "internal/service/eks" - - "internal/service/elasticache" - - "internal/service/elasticbeanstalk" - - "internal/service/elasticsearch" - - "internal/service/elastictranscoder" - - "internal/service/elb" - - "internal/service/elbv2" - - "internal/service/emr" - - "internal/service/emrcontainers" - - "internal/service/emrserverless" - - "internal/service/events" - - "internal/service/evidently" - - "internal/service/finspace" - - "internal/service/firehose" - - "internal/service/fis" - - "internal/service/fms" - - "internal/service/fsx" - - "internal/service/gamelift" - - "internal/service/glacier" - - "internal/service/globalaccelerator" - - "internal/service/glue" - - "internal/service/grafana" - - "internal/service/guardduty" - - "internal/service/iam" - - "internal/service/identitystore" - - "internal/service/imagebuilder" - - "internal/service/inspector" - - "internal/service/inspector2" - - "internal/service/internetmonitor" - - "internal/service/iot" - - "internal/service/ivs" - - "internal/service/ivschat" - - "internal/service/kafka" - - "internal/service/kafkaconnect" - - "internal/service/kendra" - - "internal/service/keyspaces" - - "internal/service/kinesis" - - "internal/service/kinesisanalytics" - - "internal/service/kinesisanalyticsv2" - - "internal/service/kinesisvideo" - - "internal/service/kms" - - "internal/service/lakeformation" - - "internal/service/lambda" - - "internal/service/lexmodels" - - "internal/service/lexv2models" - - "internal/service/licensemanager" - - "internal/service/lightsail" - - "internal/service/location" - - "internal/service/logs" - - "internal/service/m2" - - "internal/service/macie2" - - "internal/service/mediaconvert" - - "internal/service/medialive" - - "internal/service/memorydb" - - "internal/service/mq" - - "internal/service/mwaa" - - "internal/service/neptune" - - "internal/service/networkfirewall" - - "internal/service/networkmanager" - - "internal/service/networkmonitor" - - "internal/service/oam" - - "internal/service/opensearch" - - "internal/service/opensearchserverless" - - "internal/service/opsworks" - - "internal/service/organizations" - - "internal/service/paymentcryptography" - - "internal/service/pinpoint" - - "internal/service/pinpointsmsvoicev2" - - "internal/service/pipes" - - "internal/service/quicksight" - - "internal/service/ram" - - "internal/service/rbin" - - "internal/service/rds" - - "internal/service/redshift" - - "internal/service/redshiftserverless" - - "internal/service/resiliencehub" - - "internal/service/resourceexplorer2" - - "internal/service/resourcegroups" - - "internal/service/rolesanywhere" - - "internal/service/route53" - - "internal/service/route53domains" - - "internal/service/route53recoverycontrolconfig" - - "internal/service/route53recoveryreadiness" - - "internal/service/route53resolver" - - "internal/service/rum" - - "internal/service/s3" - - "internal/service/s3control" - - "internal/service/s3outposts" - - "internal/service/s3tables" - - "internal/service/sagemaker" - - "internal/service/scheduler" - - "internal/service/schemas" - - "internal/service/secretsmanager" - - "internal/service/securityhub" - - "internal/service/servicecatalog" - - "internal/service/servicediscovery" - - "internal/service/servicequotas" - - "internal/service/ses" - - "internal/service/sesv2" - - "internal/service/sfn" - - "internal/service/shield" - - "internal/service/signer" - - "internal/service/simpledb" - - "internal/service/sns" - - "internal/service/sqs" - - "internal/service/ssm" - - "internal/service/ssmcontacts" - - "internal/service/ssmincidents" - - "internal/service/ssoadmin" - - "internal/service/storagegateway" - - "internal/service/swf" - - "internal/service/synthetics" + - "/internal/service/auditmanager" + - "/internal/service/ecr" + - "/internal/service/ecrpublic" + - "/internal/service/ecs" + - "/internal/service/efs" + - "/internal/service/eks" + - "/internal/service/elasticache" + - "/internal/service/elasticbeanstalk" + - "/internal/service/elasticsearch" + - "/internal/service/elastictranscoder" + - "/internal/service/elb" + - "/internal/service/elbv2" + - "/internal/service/emr" + - "/internal/service/emrcontainers" + - "/internal/service/emrserverless" + - "/internal/service/events" + - "/internal/service/evidently" + - "/internal/service/finspace" + - "/internal/service/firehose" + - "/internal/service/fis" + - "/internal/service/fms" + - "/internal/service/fsx" + - "/internal/service/gamelift" + - "/internal/service/glacier" + - "/internal/service/globalaccelerator" + - "/internal/service/glue" + - "/internal/service/grafana" + - "/internal/service/guardduty" + - "/internal/service/iam" + - "/internal/service/identitystore" + - "/internal/service/imagebuilder" + - "/internal/service/inspector" + - "/internal/service/inspector2" + - "/internal/service/internetmonitor" + - "/internal/service/iot" + - "/internal/service/ivs" + - "/internal/service/ivschat" + - "/internal/service/kafka" + - "/internal/service/kafkaconnect" + - "/internal/service/kendra" + - "/internal/service/keyspaces" + - "/internal/service/kinesis" + - "/internal/service/kinesisanalytics" + - "/internal/service/kinesisanalyticsv2" + - "/internal/service/kinesisvideo" + - "/internal/service/kms" + - "/internal/service/lakeformation" + - "/internal/service/lambda" + - "/internal/service/lexmodels" + - "/internal/service/lexv2models" + - "/internal/service/licensemanager" + - "/internal/service/lightsail" + - "/internal/service/location" + - "/internal/service/logs" + - "/internal/service/m2" + - "/internal/service/macie2" + - "/internal/service/mediaconvert" + - "/internal/service/medialive" + - "/internal/service/memorydb" + - "/internal/service/mq" + - "/internal/service/mwaa" + - "/internal/service/neptune" + - "/internal/service/networkfirewall" + - "/internal/service/networkmanager" + - "/internal/service/networkmonitor" + - "/internal/service/oam" + - "/internal/service/opensearch" + - "/internal/service/opensearchserverless" + - "/internal/service/opsworks" + - "/internal/service/organizations" + - "/internal/service/paymentcryptography" + - "/internal/service/pinpoint" + - "/internal/service/pinpointsmsvoicev2" + - "/internal/service/pipes" + - "/internal/service/quicksight" + - "/internal/service/ram" + - "/internal/service/rbin" + - "/internal/service/rds" + - "/internal/service/redshift" + - "/internal/service/redshiftserverless" + - "/internal/service/resiliencehub" + - "/internal/service/resourceexplorer2" + - "/internal/service/resourcegroups" + - "/internal/service/rolesanywhere" + - "/internal/service/route53" + - "/internal/service/route53domains" + - "/internal/service/route53recoverycontrolconfig" + - "/internal/service/route53recoveryreadiness" + - "/internal/service/route53resolver" + - "/internal/service/rum" + - "/internal/service/s3" + - "/internal/service/s3control" + - "/internal/service/s3outposts" + - "/internal/service/s3tables" + - "/internal/service/sagemaker" + - "/internal/service/scheduler" + - "/internal/service/schemas" + - "/internal/service/secretsmanager" + - "/internal/service/securityhub" + - "/internal/service/servicecatalog" + - "/internal/service/servicediscovery" + - "/internal/service/servicequotas" + - "/internal/service/ses" + - "/internal/service/sesv2" + - "/internal/service/sfn" + - "/internal/service/shield" + - "/internal/service/signer" + - "/internal/service/simpledb" + - "/internal/service/sns" + - "/internal/service/sqs" + - "/internal/service/ssm" + - "/internal/service/ssmcontacts" + - "/internal/service/ssmincidents" + - "/internal/service/ssoadmin" + - "/internal/service/storagegateway" + - "/internal/service/swf" + - "/internal/service/synthetics" patterns: - pattern-either: - pattern: | diff --git a/.ci/semgrep/aws/waiter.yml b/.ci/semgrep/aws/waiter.yml index d9cbe83b1f3d..f149c5a5f72f 100644 --- a/.ci/semgrep/aws/waiter.yml +++ b/.ci/semgrep/aws/waiter.yml @@ -4,7 +4,7 @@ rules: message: Don't use AWS SDK for Go v2 waiters paths: exclude: - - "sweep.go" + - "**/sweep.go" patterns: - pattern: | $PKG.$FUNC($CONN) diff --git a/.ci/semgrep/errors/msgfmt.yml b/.ci/semgrep/errors/msgfmt.yml index 3a042b091a97..c89ac48fd9c8 100644 --- a/.ci/semgrep/errors/msgfmt.yml +++ b/.ci/semgrep/errors/msgfmt.yml @@ -10,7 +10,7 @@ rules: message: Use diag.Errorf(...) instead of diag.FromErr(fmt.Errorf(...)) paths: include: - - internal/ + - "/internal" patterns: - pattern-regex: diag.FromErr\(fmt.Errorf\( severity: ERROR @@ -23,7 +23,7 @@ rules: message: Remove leading 'error ' from diag.Errorf("error ...") paths: include: - - internal/ + - "/internal" patterns: - pattern-regex: 'diag.Errorf\("\s*[Ee]rror ' severity: ERROR @@ -36,7 +36,7 @@ rules: message: Remove leading 'Error ' from AppendErrorf(diags, "Error ...") paths: include: - - internal/ + - "/internal" patterns: - pattern-regex: 'AppendErrorf\(diags, "\s*[Ee]rror ' severity: ERROR @@ -49,11 +49,11 @@ rules: message: Remove leading 'error ' from fmt.Errorf("error ...") paths: include: - - internal/ + - "/internal" exclude: - - "internal/service/**/*_test.go" - - "internal/service/**/sweep.go" - - "internal/acctest/acctest.go" + - "/internal/service/**/*_test.go" + - "/internal/service/**/sweep.go" + - "/internal/acctest/acctest.go" patterns: - pattern-regex: 'fmt.Errorf\("\s*[Ee]rror ' severity: ERROR diff --git a/.ci/semgrep/framework/flex.yml b/.ci/semgrep/framework/flex.yml index 5fcd47251965..5950f2d58dc8 100644 --- a/.ci/semgrep/framework/flex.yml +++ b/.ci/semgrep/framework/flex.yml @@ -15,26 +15,26 @@ rules: message: Prefer `flex.Expand` to manually creating expand functions paths: exclude: - - internal/framework/flex/ + - "/internal/framework/flex/" # TODO: Remove the following exclusions - - internal/service/appfabric/ingestion_destination.go - - internal/service/auditmanager/assessment.go - - internal/service/auditmanager/control.go - - internal/service/auditmanager/framework.go - - internal/service/batch/job_queue.go - - internal/service/cognitoidp/user_pool_client.go - - internal/service/lexv2models/bot.go - - internal/service/lexv2models/bot_locale.go - - internal/service/lightsail/flex.go - - internal/service/opensearchserverless/security_config.go - - internal/service/quicksight/iam_policy_assignment.go - - internal/service/quicksight/refresh_schedule.go - - internal/service/securitylake/subscriber.go - - internal/service/securitylake/subscriber_notification.go - - internal/service/ssmcontacts/rotation.go - - internal/service/ssoadmin/application.go - - internal/service/ssoadmin/trusted_token_issuer.go - - internal/service/verifiedpermissions/schema.go + - "/internal/service/appfabric/ingestion_destination.go" + - "/internal/service/auditmanager/assessment.go" + - "/internal/service/auditmanager/control.go" + - "/internal/service/auditmanager/framework.go" + - "/internal/service/batch/job_queue.go" + - "/internal/service/cognitoidp/user_pool_client.go" + - "/internal/service/lexv2models/bot.go" + - "/internal/service/lexv2models/bot_locale.go" + - "/internal/service/lightsail/flex.go" + - "/internal/service/opensearchserverless/security_config.go" + - "/internal/service/quicksight/iam_policy_assignment.go" + - "/internal/service/quicksight/refresh_schedule.go" + - "/internal/service/securitylake/subscriber.go" + - "/internal/service/securitylake/subscriber_notification.go" + - "/internal/service/ssmcontacts/rotation.go" + - "/internal/service/ssoadmin/application.go" + - "/internal/service/ssoadmin/trusted_token_issuer.go" + - "/internal/service/verifiedpermissions/schema.go" patterns: - pattern: func $FUNC(ctx context.Context, ...) - metavariable-comparison: @@ -50,35 +50,35 @@ rules: message: Prefer `flex.Flatten` to manually creating flatten functions paths: exclude: - - internal/framework/flex/ + - "/internal/framework/flex/" # TODO: Remove the following exclusions - - internal/service/appconfig/environment.go - - internal/service/appfabric/ingestion_destination.go - - internal/service/auditmanager/assessment.go - - internal/service/auditmanager/control.go - - internal/service/auditmanager/framework.go - - internal/service/batch/job_queue.go - - internal/service/cognitoidp/user_pool_client.go - - internal/service/datazone/domain.go - - internal/service/datazone/environment_blueprint_configuration.go - - internal/service/ec2/vpc_security_group_ingress_rule.go - - internal/service/emr/supported_instance_types_data_source.go - - internal/service/lexv2models/bot.go - - internal/service/lexv2models/bot_locale.go - - internal/service/medialive/multiplex_program.go - - internal/service/networkfirewall/tls_inspection_configuration.go - - internal/service/opensearchserverless/security_config.go - - internal/service/quicksight/iam_policy_assignment.go - - internal/service/quicksight/refresh_schedule.go - - internal/service/securitylake/subscriber.go - - internal/service/servicequotas/templates_data_source.go - - internal/service/ssmcontacts/rotation.go - - internal/service/ssmcontacts/rotation_data_source.go - - internal/service/ssoadmin/application.go - - internal/service/ssoadmin/application_providers_data_source.go - - internal/service/ssoadmin/trusted_token_issuer.go - - internal/service/verifiedpermissions/identity_source.go - - internal/service/verifiedpermissions/schema.go + - "/internal/service/appconfig/environment.go" + - "/internal/service/appfabric/ingestion_destination.go" + - "/internal/service/auditmanager/assessment.go" + - "/internal/service/auditmanager/control.go" + - "/internal/service/auditmanager/framework.go" + - "/internal/service/batch/job_queue.go" + - "/internal/service/cognitoidp/user_pool_client.go" + - "/internal/service/datazone/domain.go" + - "/internal/service/datazone/environment_blueprint_configuration.go" + - "/internal/service/ec2/vpc_security_group_ingress_rule.go" + - "/internal/service/emr/supported_instance_types_data_source.go" + - "/internal/service/lexv2models/bot.go" + - "/internal/service/lexv2models/bot_locale.go" + - "/internal/service/medialive/multiplex_program.go" + - "/internal/service/networkfirewall/tls_inspection_configuration.go" + - "/internal/service/opensearchserverless/security_config.go" + - "/internal/service/quicksight/iam_policy_assignment.go" + - "/internal/service/quicksight/refresh_schedule.go" + - "/internal/service/securitylake/subscriber.go" + - "/internal/service/servicequotas/templates_data_source.go" + - "/internal/service/ssmcontacts/rotation.go" + - "/internal/service/ssmcontacts/rotation_data_source.go" + - "/internal/service/ssoadmin/application.go" + - "/internal/service/ssoadmin/application_providers_data_source.go" + - "/internal/service/ssoadmin/trusted_token_issuer.go" + - "/internal/service/verifiedpermissions/identity_source.go" + - "/internal/service/verifiedpermissions/schema.go" patterns: - pattern: func $FUNC(ctx context.Context, ...) - metavariable-comparison: diff --git a/.ci/semgrep/framework/import-passthrough-id.yml b/.ci/semgrep/framework/import-passthrough-id.yml index f3783af6eaae..d5a18bbc9eef 100644 --- a/.ci/semgrep/framework/import-passthrough-id.yml +++ b/.ci/semgrep/framework/import-passthrough-id.yml @@ -4,7 +4,7 @@ rules: message: Prefer `resource.ImportStatePassthroughID` to directly setting attribute paths: include: - - internal/service/ + - "/internal/service" pattern: $RESP.Diagnostics.Append($RESP.State.SetAttribute(ctx, path.Root($X), $REQ.ID)...) severity: WARNING fix: resource.ImportStatePassthroughID(ctx, path.Root($X), $REQ, $RESP) diff --git a/.ci/semgrep/framework/metadata_method.yml b/.ci/semgrep/framework/metadata_method.yml index a3ffdcfe7cca..0dfc09f0a61a 100644 --- a/.ci/semgrep/framework/metadata_method.yml +++ b/.ci/semgrep/framework/metadata_method.yml @@ -4,9 +4,9 @@ rules: message: Don't implement a Metadata method paths: include: - - "internal/service/*/*.go" + - "/internal/service/*/*.go" exclude: - - "internal/service/*/*_test.go" + - "/internal/service/*/*_test.go" patterns: - pattern: func $FUNC(...) { ... } - metavariable-regex: diff --git a/.ci/semgrep/migrate/context.yml b/.ci/semgrep/migrate/context.yml index d7f0cb015fb6..0316210e46a2 100644 --- a/.ci/semgrep/migrate/context.yml +++ b/.ci/semgrep/migrate/context.yml @@ -4,8 +4,8 @@ rules: message: Should not use `context.TODO()` paths: include: - - internal/service/* - - internal/acctest/* + - "/internal/service" + - "/internal/acctest" pattern: context.TODO() severity: ERROR - id: schema-noop @@ -13,8 +13,8 @@ rules: message: Should use `schema.NoopContext` instead of `schema.Noop` paths: include: - - internal/service/* - - internal/acctest/* + - "/internal/service" + - "/internal/acctest" pattern: schema.Noop severity: ERROR - id: direct-CRUD-calls @@ -22,10 +22,10 @@ rules: message: Avoid direct calls to `schema.Resource` CRUD calls paths: include: - - internal/service/* - - internal/acctest/* + - "/internal/service" + - "/internal/acctest" exclude: - - internal/service/*/sweep.go + - "/internal/service/*/sweep.go" patterns: - pattern-either: - pattern: $D.Create($DATA, $META) diff --git a/.ci/semgrep/pluginsdk/customdiff.yml b/.ci/semgrep/pluginsdk/customdiff.yml index 80c552ced531..103a24d21443 100644 --- a/.ci/semgrep/pluginsdk/customdiff.yml +++ b/.ci/semgrep/pluginsdk/customdiff.yml @@ -4,9 +4,9 @@ rules: message: Simplify CustomizeDiff All paths: include: - - "internal/service/*/*.go" + - "/internal/service/*/*.go" exclude: - - "internal/service/*/*_test.go" + - "/internal/service/*/*_test.go" patterns: - pattern-regex: CustomizeDiff:\s+customdiff\.All\(\s*[a-zA-Z0-9]+,?\s*\) severity: WARNING @@ -16,9 +16,9 @@ rules: message: Simplify CustomizeDiff Sequence paths: include: - - "internal/service/*/*.go" + - "/internal/service/*/*.go" exclude: - - "internal/service/*/*_test.go" + - "/internal/service/*/*_test.go" patterns: - pattern-regex: CustomizeDiff:\s+customdiff\.Sequence\(\s*[a-zA-Z0-9]+,?\s*\) severity: WARNING diff --git a/.ci/semgrep/pluginsdk/diags.yml b/.ci/semgrep/pluginsdk/diags.yml index 10549eded987..5153122255e2 100644 --- a/.ci/semgrep/pluginsdk/diags.yml +++ b/.ci/semgrep/pluginsdk/diags.yml @@ -70,9 +70,9 @@ rules: message: Return diags instead of nil paths: include: - - internal/service + - "/internal/service" exclude: - - internal/service/o* + - "/internal/service/o*" patterns: - pattern: return nil - pattern-not-inside: | diff --git a/.ci/semgrep/pluginsdk/isnewresource.yml b/.ci/semgrep/pluginsdk/isnewresource.yml index 2b5ae07080e9..33647f0bd524 100644 --- a/.ci/semgrep/pluginsdk/isnewresource.yml +++ b/.ci/semgrep/pluginsdk/isnewresource.yml @@ -4,9 +4,9 @@ rules: message: Calling `d.SetId("")` should ensure `!d.IsNewResource()` is also checked. See https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/error-handling.md#disnewresource-checks paths: include: - - internal/service + - "/internal/service" exclude: - - internal/service/**/*_data_source.go + - "/internal/service/**/*_data_source.go" patterns: - pattern-either: - pattern: | diff --git a/.ci/semgrep/pluginsdk/quicksight/schema.yml b/.ci/semgrep/pluginsdk/quicksight/schema.yml index 4cb1c97a78c2..638945afc46a 100644 --- a/.ci/semgrep/pluginsdk/quicksight/schema.yml +++ b/.ci/semgrep/pluginsdk/quicksight/schema.yml @@ -4,7 +4,7 @@ rules: message: String attributes with length validation should use stringLenBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | @@ -21,7 +21,7 @@ rules: message: String attributes with length validation should use stringLenBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | @@ -38,7 +38,7 @@ rules: message: String attributes with length validation should use stringLenBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern-either: @@ -64,7 +64,7 @@ rules: message: String attributes with enum validation should use stringEnumSchema[]() paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern-either: @@ -102,7 +102,7 @@ rules: message: Int attributes with between validation should use intBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | @@ -119,7 +119,7 @@ rules: message: Int attributes with between validation should use intBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | @@ -136,7 +136,7 @@ rules: message: Float attributes with between validation should use floatBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | @@ -153,7 +153,7 @@ rules: message: Float attributes with between validation should use floatBetweenSchema paths: include: - - internal/service/quicksight/schema + - "/internal/service/quicksight/schema" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | diff --git a/.ci/semgrep/smarterr/enforce.yml b/.ci/semgrep/smarterr/enforce.yml index 9e3933fe32e0..05d2c0b823ee 100644 --- a/.ci/semgrep/smarterr/enforce.yml +++ b/.ci/semgrep/smarterr/enforce.yml @@ -7,7 +7,7 @@ rules: fix: smerr.Append(ctx, $DIAGS, $ERR) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-sdkdiag-appenderrorf languages: [go] @@ -18,7 +18,7 @@ rules: - pattern: sdkdiag.AppendErrorf($DIAGS, $FMT, $ERR) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-create-appenddiagerror languages: [go] @@ -27,7 +27,7 @@ rules: pattern: create.AppendDiagError($DIAGS, ...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-diagnostics-adderror languages: [go] @@ -40,7 +40,7 @@ rules: - pattern-not-inside: smerr.AddError(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-create-adderror languages: [go] @@ -49,7 +49,7 @@ rules: pattern: create.AddError(&$RESP.Diagnostics, ...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-direct-diag-adderror languages: [go] @@ -60,7 +60,7 @@ rules: - pattern-not-inside: smerr.AddError(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-direct-diag-appenderrorf languages: [go] @@ -69,7 +69,7 @@ rules: pattern: diag.AppendErrorf(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-direct-diag-appendfromerr languages: [go] @@ -78,7 +78,7 @@ rules: pattern: diag.AppendFromErr(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-direct-diag-append languages: [go] @@ -89,7 +89,7 @@ rules: - pattern-not-inside: smerr.EnrichAppend(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-bare-return-err languages: [go] @@ -102,7 +102,7 @@ rules: return nil, smarterr.NewError(...) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-bare-assertsinglevalueresult languages: [go] @@ -114,7 +114,7 @@ rules: - pattern-not-inside: smarterr.Assert(tfresource.AssertSingleValueResult(...)) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" - id: go-no-bare-empty-result-error languages: [go] @@ -126,4 +126,4 @@ rules: - pattern-not-inside: smarterr.NewError(tfresource.NewEmptyResultError(...)) paths: include: - - internal/service/cloudwatch/ + - "/internal/service/cloudwatch/" diff --git a/.ci/semgrep/stdlib/exp.yml b/.ci/semgrep/stdlib/exp.yml index d8d9db1b3c45..30e965319e53 100644 --- a/.ci/semgrep/stdlib/exp.yml +++ b/.ci/semgrep/stdlib/exp.yml @@ -4,7 +4,7 @@ rules: message: Use Go standard library maps and slices packages instead of the golang.org/x/exp packages paths: include: - - internal/ + - "/internal" patterns: - pattern: | import ("$X") diff --git a/.ci/semgrep/tags/ds-tags-all.yml b/.ci/semgrep/tags/ds-tags-all.yml index e0e2456256ce..d64845b41543 100644 --- a/.ci/semgrep/tags/ds-tags-all.yml +++ b/.ci/semgrep/tags/ds-tags-all.yml @@ -4,7 +4,7 @@ rules: message: Data sources should not have a `tags_all` attribute paths: include: - - internal/service/**/*_data_source.go + - "/internal/service/**/*_data_source.go" patterns: - pattern-either: - pattern-regex: '"tags_all":\s*tftags.TagsSchemaComputed' diff --git a/.ci/semgrep/tags/update.yml b/.ci/semgrep/tags/update.yml index a7d491934026..e2c13078d5d0 100644 --- a/.ci/semgrep/tags/update.yml +++ b/.ci/semgrep/tags/update.yml @@ -4,7 +4,7 @@ rules: message: Do not call `UpdateTags` inside a resource create function, use `createTags` instead paths: include: - - internal/service/ + - "/internal/service/" patterns: - pattern: | func $FUNC(...) { From 1f765df0fa6459fb78e6da08678d2e1388706fc4 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 16:23:40 -0400 Subject: [PATCH 1486/2115] Update semgrep configs for anchored paths --- .ci/.semgrep-caps-aws-ec2.yml | 64 +-- .ci/.semgrep-configs.yml | 8 +- .ci/.semgrep-constants.yml | 458 ++++++++++---------- .ci/.semgrep-service-name0.yml | 736 ++++++++++++++++---------------- .ci/.semgrep-service-name1.yml | 732 +++++++++++++++---------------- .ci/.semgrep-service-name2.yml | 734 +++++++++++++++---------------- .ci/.semgrep-service-name3.yml | 728 +++++++++++++++---------------- .ci/.semgrep-test-constants.yml | 74 ++-- .ci/.semgrep.yml | 122 +++--- 9 files changed, 1828 insertions(+), 1828 deletions(-) diff --git a/.ci/.semgrep-caps-aws-ec2.yml b/.ci/.semgrep-caps-aws-ec2.yml index e7040b8e6091..577b03af8057 100644 --- a/.ci/.semgrep-caps-aws-ec2.yml +++ b/.ci/.semgrep-caps-aws-ec2.yml @@ -6,11 +6,11 @@ rules: message: Do not use "AWS" in func name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/securitylake/aws_log_source_test.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/securitylake/aws_log_source_test.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -25,10 +25,10 @@ rules: message: Do not use "AWS" in const name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -43,11 +43,11 @@ rules: message: Do not use "AWS" in var name inside AWS Provider paths: include: - - internal + - "/internal" exclude: - - internal/service/securitylake/aws_log_source.go - - internal/service/securitylake/exports_test.go - - internal/service/*/service_endpoints_gen_test.go + - "/internal/service/securitylake/aws_log_source.go" + - "/internal/service/securitylake/exports_test.go" + - "/internal/service/*/service_endpoints_gen_test.go" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -62,7 +62,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -77,7 +77,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -91,7 +91,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -105,7 +105,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -120,7 +120,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -134,7 +134,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -148,7 +148,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -163,7 +163,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -177,7 +177,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -191,7 +191,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -206,7 +206,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -220,7 +220,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -234,7 +234,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -249,7 +249,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -263,7 +263,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -277,7 +277,7 @@ rules: message: Use correct caps in func name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: func $NAME( ... ) { ... } - metavariable-pattern: @@ -292,7 +292,7 @@ rules: message: Use correct caps in const name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -306,7 +306,7 @@ rules: message: Use correct caps in var name (i.e., HTTPS or https, not Https) (see list at https://github.com/hashicorp/terraform-provider-aws/blob/main/names/caps.md) paths: include: - - internal + - "/internal" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -320,7 +320,7 @@ rules: message: Do not use "EC2" in func name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -336,7 +336,7 @@ rules: message: Do not use "EC2" in const name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -350,7 +350,7 @@ rules: message: Do not use "EC2" in var name inside ec2 package paths: include: - - internal/service/ec2 + - "/internal/service/ec2" patterns: - pattern: var $NAME = ... - metavariable-pattern: diff --git a/.ci/.semgrep-configs.yml b/.ci/.semgrep-configs.yml index 821176b03bc9..6023bd7c57fa 100644 --- a/.ci/.semgrep-configs.yml +++ b/.ci/.semgrep-configs.yml @@ -6,7 +6,7 @@ rules: message: "Config funcs should follow form testAccConfig_" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY:$VALUE, ...}" @@ -28,7 +28,7 @@ rules: message: "Config funcs should follow form testAccConfig_" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY: acctest.ConfigCompose(..., $VALUE, ...), ...}" @@ -49,7 +49,7 @@ rules: message: "Config funcs should not begin with 'testAccCheck'" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY:$VALUE, ...}" @@ -69,7 +69,7 @@ rules: message: "Config funcs should not begin with 'testAccCheck'" paths: include: - - internal/service/**/*_test.go + - "/internal/service/**/*_test.go" patterns: - pattern-inside: "[]resource.TestStep{ ... }" - pattern: "{..., $KEY: acctest.ConfigCompose(..., $VALUE, ...), ...}" diff --git a/.ci/.semgrep-constants.yml b/.ci/.semgrep-constants.yml index 5ef2012983af..81e93813c178 100644 --- a/.ci/.semgrep-constants.yml +++ b/.ci/.semgrep-constants.yml @@ -6,7 +6,7 @@ rules: message: Use the constant `names.AttrARN` for the string literal "arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"arn"' - pattern-not-regex: '"arn":\s+test\w+,' @@ -24,7 +24,7 @@ rules: message: Use the constant `names.AttrARNs` for the string literal "arns" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"arns"' - pattern-not-regex: '"arns":\s+test\w+,' @@ -42,7 +42,7 @@ rules: message: Use the constant `names.AttrAWSAccountID` for the string literal "aws_account_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"aws_account_id"' - pattern-not-regex: '"aws_account_id":\s+test\w+,' @@ -60,7 +60,7 @@ rules: message: Use the constant `names.AttrAccessKey` for the string literal "access_key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"access_key"' - pattern-not-regex: '"access_key":\s+test\w+,' @@ -78,7 +78,7 @@ rules: message: Use the constant `names.AttrAccountID` for the string literal "account_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"account_id"' - pattern-not-regex: '"account_id":\s+test\w+,' @@ -96,7 +96,7 @@ rules: message: Use the constant `names.AttrAction` for the string literal "action" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"action"' - pattern-not-regex: '"action":\s+test\w+,' @@ -114,7 +114,7 @@ rules: message: Use the constant `names.AttrActions` for the string literal "actions" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"actions"' - pattern-not-regex: '"actions":\s+test\w+,' @@ -132,7 +132,7 @@ rules: message: Use the constant `names.AttrAddress` for the string literal "address" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"address"' - pattern-not-regex: '"address":\s+test\w+,' @@ -150,7 +150,7 @@ rules: message: Use the constant `names.AttrAlias` for the string literal "alias" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"alias"' - pattern-not-regex: '"alias":\s+test\w+,' @@ -168,7 +168,7 @@ rules: message: Use the constant `names.AttrAllocatedStorage` for the string literal "allocated_storage" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"allocated_storage"' - pattern-not-regex: '"allocated_storage":\s+test\w+,' @@ -186,7 +186,7 @@ rules: message: Use the constant `names.AttrAllowMajorVersionUpgrade` for the string literal "allow_major_version_upgrade" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"allow_major_version_upgrade"' - pattern-not-regex: '"allow_major_version_upgrade":\s+test\w+,' @@ -204,7 +204,7 @@ rules: message: Use the constant `names.AttrApplicationID` for the string literal "application_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"application_id"' - pattern-not-regex: '"application_id":\s+test\w+,' @@ -222,7 +222,7 @@ rules: message: Use the constant `names.AttrApplyImmediately` for the string literal "apply_immediately" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"apply_immediately"' - pattern-not-regex: '"apply_immediately":\s+test\w+,' @@ -240,7 +240,7 @@ rules: message: Use the constant `names.AttrAssociationID` for the string literal "association_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"association_id"' - pattern-not-regex: '"association_id":\s+test\w+,' @@ -258,7 +258,7 @@ rules: message: Use the constant `names.AttrAttributes` for the string literal "attributes" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"attributes"' - pattern-not-regex: '"attributes":\s+test\w+,' @@ -276,7 +276,7 @@ rules: message: Use the constant `names.AttrAutoMinorVersionUpgrade` for the string literal "auto_minor_version_upgrade" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"auto_minor_version_upgrade"' - pattern-not-regex: '"auto_minor_version_upgrade":\s+test\w+,' @@ -294,7 +294,7 @@ rules: message: Use the constant `names.AttrAvailabilityZone` for the string literal "availability_zone" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"availability_zone"' - pattern-not-regex: '"availability_zone":\s+test\w+,' @@ -312,7 +312,7 @@ rules: message: Use the constant `names.AttrAvailabilityZones` for the string literal "availability_zones" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"availability_zones"' - pattern-not-regex: '"availability_zones":\s+test\w+,' @@ -330,7 +330,7 @@ rules: message: Use the constant `names.AttrBucket` for the string literal "bucket" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"bucket"' - pattern-not-regex: '"bucket":\s+test\w+,' @@ -348,7 +348,7 @@ rules: message: Use the constant `names.AttrBucketName` for the string literal "bucket_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"bucket_name"' - pattern-not-regex: '"bucket_name":\s+test\w+,' @@ -366,7 +366,7 @@ rules: message: Use the constant `names.AttrBucketPrefix` for the string literal "bucket_prefix" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"bucket_prefix"' - pattern-not-regex: '"bucket_prefix":\s+test\w+,' @@ -384,7 +384,7 @@ rules: message: Use the constant `names.AttrCIDRBlock` for the string literal "cidr_block" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"cidr_block"' - pattern-not-regex: '"cidr_block":\s+test\w+,' @@ -402,7 +402,7 @@ rules: message: Use the constant `names.AttrCapacityProviderStrategy` for the string literal "capacity_provider_strategy" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"capacity_provider_strategy"' - pattern-not-regex: '"capacity_provider_strategy":\s+test\w+,' @@ -420,7 +420,7 @@ rules: message: Use the constant `names.AttrCatalogID` for the string literal "catalog_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"catalog_id"' - pattern-not-regex: '"catalog_id":\s+test\w+,' @@ -438,7 +438,7 @@ rules: message: Use the constant `names.AttrCertificate` for the string literal "certificate" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"certificate"' - pattern-not-regex: '"certificate":\s+test\w+,' @@ -456,7 +456,7 @@ rules: message: Use the constant `names.AttrCertificateARN` for the string literal "certificate_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"certificate_arn"' - pattern-not-regex: '"certificate_arn":\s+test\w+,' @@ -474,7 +474,7 @@ rules: message: Use the constant `names.AttrCertificateChain` for the string literal "certificate_chain" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"certificate_chain"' - pattern-not-regex: '"certificate_chain":\s+test\w+,' @@ -492,7 +492,7 @@ rules: message: Use the constant `names.AttrClientID` for the string literal "client_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"client_id"' - pattern-not-regex: '"client_id":\s+test\w+,' @@ -510,7 +510,7 @@ rules: message: Use the constant `names.AttrClientSecret` for the string literal "client_secret" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"client_secret"' - pattern-not-regex: '"client_secret":\s+test\w+,' @@ -528,7 +528,7 @@ rules: message: Use the constant `names.AttrCloudWatchLogGroupARN` for the string literal "cloudwatch_log_group_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"cloudwatch_log_group_arn"' - pattern-not-regex: '"cloudwatch_log_group_arn":\s+test\w+,' @@ -546,7 +546,7 @@ rules: message: Use the constant `names.AttrCloudWatchLogs` for the string literal "cloudwatch_logs" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"cloudwatch_logs"' - pattern-not-regex: '"cloudwatch_logs":\s+test\w+,' @@ -564,7 +564,7 @@ rules: message: Use the constant `names.AttrClusterIdentifier` for the string literal "cluster_identifier" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"cluster_identifier"' - pattern-not-regex: '"cluster_identifier":\s+test\w+,' @@ -582,7 +582,7 @@ rules: message: Use the constant `names.AttrClusterName` for the string literal "cluster_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"cluster_name"' - pattern-not-regex: '"cluster_name":\s+test\w+,' @@ -600,7 +600,7 @@ rules: message: Use the constant `names.AttrComment` for the string literal "comment" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"comment"' - pattern-not-regex: '"comment":\s+test\w+,' @@ -618,7 +618,7 @@ rules: message: Use the constant `names.AttrCondition` for the string literal "condition" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"condition"' - pattern-not-regex: '"condition":\s+test\w+,' @@ -636,7 +636,7 @@ rules: message: Use the constant `names.AttrConfiguration` for the string literal "configuration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"configuration"' - pattern-not-regex: '"configuration":\s+test\w+,' @@ -654,7 +654,7 @@ rules: message: Use the constant `names.AttrConnectionID` for the string literal "connection_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"connection_id"' - pattern-not-regex: '"connection_id":\s+test\w+,' @@ -672,7 +672,7 @@ rules: message: Use the constant `names.AttrContent` for the string literal "content" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"content"' - pattern-not-regex: '"content":\s+test\w+,' @@ -690,7 +690,7 @@ rules: message: Use the constant `names.AttrContentType` for the string literal "content_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"content_type"' - pattern-not-regex: '"content_type":\s+test\w+,' @@ -708,7 +708,7 @@ rules: message: Use the constant `names.AttrCreateTime` for the string literal "create_time" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"create_time"' - pattern-not-regex: '"create_time":\s+test\w+,' @@ -726,7 +726,7 @@ rules: message: Use the constant `names.AttrCreatedAt` for the string literal "created_at" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"created_at"' - pattern-not-regex: '"created_at":\s+test\w+,' @@ -744,7 +744,7 @@ rules: message: Use the constant `names.AttrCreatedDate` for the string literal "created_date" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"created_date"' - pattern-not-regex: '"created_date":\s+test\w+,' @@ -762,7 +762,7 @@ rules: message: Use the constant `names.AttrCreatedTime` for the string literal "created_time" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"created_time"' - pattern-not-regex: '"created_time":\s+test\w+,' @@ -780,7 +780,7 @@ rules: message: Use the constant `names.AttrCreationDate` for the string literal "creation_date" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"creation_date"' - pattern-not-regex: '"creation_date":\s+test\w+,' @@ -798,7 +798,7 @@ rules: message: Use the constant `names.AttrCreationTime` for the string literal "creation_time" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"creation_time"' - pattern-not-regex: '"creation_time":\s+test\w+,' @@ -816,7 +816,7 @@ rules: message: Use the constant `names.AttrDNSName` for the string literal "dns_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"dns_name"' - pattern-not-regex: '"dns_name":\s+test\w+,' @@ -834,7 +834,7 @@ rules: message: Use the constant `names.AttrDatabase` for the string literal "database" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"database"' - pattern-not-regex: '"database":\s+test\w+,' @@ -852,7 +852,7 @@ rules: message: Use the constant `names.AttrDatabaseName` for the string literal "database_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"database_name"' - pattern-not-regex: '"database_name":\s+test\w+,' @@ -870,7 +870,7 @@ rules: message: Use the constant `names.AttrDefaultAction` for the string literal "default_action" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"default_action"' - pattern-not-regex: '"default_action":\s+test\w+,' @@ -888,7 +888,7 @@ rules: message: Use the constant `names.AttrDefaultValue` for the string literal "default_value" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"default_value"' - pattern-not-regex: '"default_value":\s+test\w+,' @@ -906,7 +906,7 @@ rules: message: Use the constant `names.AttrDeleteOnTermination` for the string literal "delete_on_termination" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"delete_on_termination"' - pattern-not-regex: '"delete_on_termination":\s+test\w+,' @@ -924,7 +924,7 @@ rules: message: Use the constant `names.AttrDeletionProtection` for the string literal "deletion_protection" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"deletion_protection"' - pattern-not-regex: '"deletion_protection":\s+test\w+,' @@ -942,7 +942,7 @@ rules: message: Use the constant `names.AttrDescription` for the string literal "description" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"description"' - pattern-not-regex: '"description":\s+test\w+,' @@ -960,7 +960,7 @@ rules: message: Use the constant `names.AttrDestination` for the string literal "destination" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"destination"' - pattern-not-regex: '"destination":\s+test\w+,' @@ -978,7 +978,7 @@ rules: message: Use the constant `names.AttrDestinationARN` for the string literal "destination_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"destination_arn"' - pattern-not-regex: '"destination_arn":\s+test\w+,' @@ -996,7 +996,7 @@ rules: message: Use the constant `names.AttrDeviceName` for the string literal "device_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"device_name"' - pattern-not-regex: '"device_name":\s+test\w+,' @@ -1014,7 +1014,7 @@ rules: message: Use the constant `names.AttrDisplayName` for the string literal "display_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"display_name"' - pattern-not-regex: '"display_name":\s+test\w+,' @@ -1032,7 +1032,7 @@ rules: message: Use the constant `names.AttrDomain` for the string literal "domain" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"domain"' - pattern-not-regex: '"domain":\s+test\w+,' @@ -1050,7 +1050,7 @@ rules: message: Use the constant `names.AttrDomainName` for the string literal "domain_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"domain_name"' - pattern-not-regex: '"domain_name":\s+test\w+,' @@ -1068,7 +1068,7 @@ rules: message: Use the constant `names.AttrDuration` for the string literal "duration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"duration"' - pattern-not-regex: '"duration":\s+test\w+,' @@ -1086,7 +1086,7 @@ rules: message: Use the constant `names.AttrEmail` for the string literal "email" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"email"' - pattern-not-regex: '"email":\s+test\w+,' @@ -1104,7 +1104,7 @@ rules: message: Use the constant `names.AttrEnabled` for the string literal "enabled" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"enabled"' - pattern-not-regex: '"enabled":\s+test\w+,' @@ -1122,7 +1122,7 @@ rules: message: Use the constant `names.AttrEncrypted` for the string literal "encrypted" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"encrypted"' - pattern-not-regex: '"encrypted":\s+test\w+,' @@ -1140,7 +1140,7 @@ rules: message: Use the constant `names.AttrEncryptionConfiguration` for the string literal "encryption_configuration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"encryption_configuration"' - pattern-not-regex: '"encryption_configuration":\s+test\w+,' @@ -1158,7 +1158,7 @@ rules: message: Use the constant `names.AttrEndpoint` for the string literal "endpoint" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"endpoint"' - pattern-not-regex: '"endpoint":\s+test\w+,' @@ -1176,7 +1176,7 @@ rules: message: Use the constant `names.AttrEndpointType` for the string literal "endpoint_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"endpoint_type"' - pattern-not-regex: '"endpoint_type":\s+test\w+,' @@ -1194,7 +1194,7 @@ rules: message: Use the constant `names.AttrEndpoints` for the string literal "endpoints" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"endpoints"' - pattern-not-regex: '"endpoints":\s+test\w+,' @@ -1212,7 +1212,7 @@ rules: message: Use the constant `names.AttrEngine` for the string literal "engine" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"engine"' - pattern-not-regex: '"engine":\s+test\w+,' @@ -1230,7 +1230,7 @@ rules: message: Use the constant `names.AttrEngineVersion` for the string literal "engine_version" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"engine_version"' - pattern-not-regex: '"engine_version":\s+test\w+,' @@ -1248,7 +1248,7 @@ rules: message: Use the constant `names.AttrEnvironment` for the string literal "environment" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"environment"' - pattern-not-regex: '"environment":\s+test\w+,' @@ -1266,7 +1266,7 @@ rules: message: Use the constant `names.AttrExecutionRoleARN` for the string literal "execution_role_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"execution_role_arn"' - pattern-not-regex: '"execution_role_arn":\s+test\w+,' @@ -1284,7 +1284,7 @@ rules: message: Use the constant `names.AttrExpectedBucketOwner` for the string literal "expected_bucket_owner" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"expected_bucket_owner"' - pattern-not-regex: '"expected_bucket_owner":\s+test\w+,' @@ -1302,7 +1302,7 @@ rules: message: Use the constant `names.AttrExpression` for the string literal "expression" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"expression"' - pattern-not-regex: '"expression":\s+test\w+,' @@ -1320,7 +1320,7 @@ rules: message: Use the constant `names.AttrExternalID` for the string literal "external_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"external_id"' - pattern-not-regex: '"external_id":\s+test\w+,' @@ -1338,7 +1338,7 @@ rules: message: Use the constant `names.AttrFamily` for the string literal "family" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"family"' - pattern-not-regex: '"family":\s+test\w+,' @@ -1356,7 +1356,7 @@ rules: message: Use the constant `names.AttrField` for the string literal "field" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"field"' - pattern-not-regex: '"field":\s+test\w+,' @@ -1374,7 +1374,7 @@ rules: message: Use the constant `names.AttrFileSystemID` for the string literal "file_system_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"file_system_id"' - pattern-not-regex: '"file_system_id":\s+test\w+,' @@ -1392,7 +1392,7 @@ rules: message: Use the constant `names.AttrFilter` for the string literal "filter" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"filter"' - pattern-not-regex: '"filter":\s+test\w+,' @@ -1410,7 +1410,7 @@ rules: message: Use the constant `names.AttrFinalSnapshotIdentifier` for the string literal "final_snapshot_identifier" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"final_snapshot_identifier"' - pattern-not-regex: '"final_snapshot_identifier":\s+test\w+,' @@ -1428,7 +1428,7 @@ rules: message: Use the constant `names.AttrForceDelete` for the string literal "force_delete" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"force_delete"' - pattern-not-regex: '"force_delete":\s+test\w+,' @@ -1446,7 +1446,7 @@ rules: message: Use the constant `names.AttrForceDestroy` for the string literal "force_destroy" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"force_destroy"' - pattern-not-regex: '"force_destroy":\s+test\w+,' @@ -1464,7 +1464,7 @@ rules: message: Use the constant `names.AttrFormat` for the string literal "format" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"format"' - pattern-not-regex: '"format":\s+test\w+,' @@ -1482,7 +1482,7 @@ rules: message: Use the constant `names.AttrFunctionARN` for the string literal "function_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"function_arn"' - pattern-not-regex: '"function_arn":\s+test\w+,' @@ -1500,7 +1500,7 @@ rules: message: Use the constant `names.AttrGroupName` for the string literal "group_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"group_name"' - pattern-not-regex: '"group_name":\s+test\w+,' @@ -1518,7 +1518,7 @@ rules: message: Use the constant `names.AttrHeader` for the string literal "header" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"header"' - pattern-not-regex: '"header":\s+test\w+,' @@ -1536,7 +1536,7 @@ rules: message: Use the constant `names.AttrHealthCheck` for the string literal "health_check" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"health_check"' - pattern-not-regex: '"health_check":\s+test\w+,' @@ -1554,7 +1554,7 @@ rules: message: Use the constant `names.AttrHostedZoneID` for the string literal "hosted_zone_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"hosted_zone_id"' - pattern-not-regex: '"hosted_zone_id":\s+test\w+,' @@ -1572,7 +1572,7 @@ rules: message: Use the constant `names.AttrIAMRoleARN` for the string literal "iam_role_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"iam_role_arn"' - pattern-not-regex: '"iam_role_arn":\s+test\w+,' @@ -1590,7 +1590,7 @@ rules: message: Use the constant `names.AttrID` for the string literal "id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"id"' - pattern-not-regex: '"id":\s+test\w+,' @@ -1608,7 +1608,7 @@ rules: message: Use the constant `names.AttrIDs` for the string literal "ids" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"ids"' - pattern-not-regex: '"ids":\s+test\w+,' @@ -1626,7 +1626,7 @@ rules: message: Use the constant `names.AttrIOPS` for the string literal "iops" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"iops"' - pattern-not-regex: '"iops":\s+test\w+,' @@ -1644,7 +1644,7 @@ rules: message: Use the constant `names.AttrIPAddress` for the string literal "ip_address" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"ip_address"' - pattern-not-regex: '"ip_address":\s+test\w+,' @@ -1662,7 +1662,7 @@ rules: message: Use the constant `names.AttrIPAddressType` for the string literal "ip_address_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"ip_address_type"' - pattern-not-regex: '"ip_address_type":\s+test\w+,' @@ -1680,7 +1680,7 @@ rules: message: Use the constant `names.AttrIPAddresses` for the string literal "ip_addresses" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"ip_addresses"' - pattern-not-regex: '"ip_addresses":\s+test\w+,' @@ -1698,7 +1698,7 @@ rules: message: Use the constant `names.AttrIdentifier` for the string literal "identifier" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"identifier"' - pattern-not-regex: '"identifier":\s+test\w+,' @@ -1716,7 +1716,7 @@ rules: message: Use the constant `names.AttrInstanceCount` for the string literal "instance_count" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"instance_count"' - pattern-not-regex: '"instance_count":\s+test\w+,' @@ -1734,7 +1734,7 @@ rules: message: Use the constant `names.AttrInstanceID` for the string literal "instance_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"instance_id"' - pattern-not-regex: '"instance_id":\s+test\w+,' @@ -1752,7 +1752,7 @@ rules: message: Use the constant `names.AttrInstanceType` for the string literal "instance_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"instance_type"' - pattern-not-regex: '"instance_type":\s+test\w+,' @@ -1770,7 +1770,7 @@ rules: message: Use the constant `names.AttrInterval` for the string literal "interval" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"interval"' - pattern-not-regex: '"interval":\s+test\w+,' @@ -1788,7 +1788,7 @@ rules: message: Use the constant `names.AttrIssuer` for the string literal "issuer" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"issuer"' - pattern-not-regex: '"issuer":\s+test\w+,' @@ -1806,7 +1806,7 @@ rules: message: Use the constant `names.AttrJSON` for the string literal "json" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"json"' - pattern-not-regex: '"json":\s+test\w+,' @@ -1824,7 +1824,7 @@ rules: message: Use the constant `names.AttrKMSKey` for the string literal "kms_key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"kms_key"' - pattern-not-regex: '"kms_key":\s+test\w+,' @@ -1842,7 +1842,7 @@ rules: message: Use the constant `names.AttrKMSKeyARN` for the string literal "kms_key_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"kms_key_arn"' - pattern-not-regex: '"kms_key_arn":\s+test\w+,' @@ -1860,7 +1860,7 @@ rules: message: Use the constant `names.AttrKMSKeyID` for the string literal "kms_key_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"kms_key_id"' - pattern-not-regex: '"kms_key_id":\s+test\w+,' @@ -1878,7 +1878,7 @@ rules: message: Use the constant `names.AttrKey` for the string literal "key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"key"' - pattern-not-regex: '"key":\s+test\w+,' @@ -1896,7 +1896,7 @@ rules: message: Use the constant `names.AttrKeyID` for the string literal "key_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"key_id"' - pattern-not-regex: '"key_id":\s+test\w+,' @@ -1914,7 +1914,7 @@ rules: message: Use the constant `names.AttrLanguageCode` for the string literal "language_code" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"language_code"' - pattern-not-regex: '"language_code":\s+test\w+,' @@ -1932,7 +1932,7 @@ rules: message: Use the constant `names.AttrLastUpdatedDate` for the string literal "last_updated_date" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"last_updated_date"' - pattern-not-regex: '"last_updated_date":\s+test\w+,' @@ -1950,7 +1950,7 @@ rules: message: Use the constant `names.AttrLastUpdatedTime` for the string literal "last_updated_time" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"last_updated_time"' - pattern-not-regex: '"last_updated_time":\s+test\w+,' @@ -1968,7 +1968,7 @@ rules: message: Use the constant `names.AttrLaunchTemplate` for the string literal "launch_template" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"launch_template"' - pattern-not-regex: '"launch_template":\s+test\w+,' @@ -1986,7 +1986,7 @@ rules: message: Use the constant `names.AttrLocation` for the string literal "location" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"location"' - pattern-not-regex: '"location":\s+test\w+,' @@ -2004,7 +2004,7 @@ rules: message: Use the constant `names.AttrLogGroupName` for the string literal "log_group_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"log_group_name"' - pattern-not-regex: '"log_group_name":\s+test\w+,' @@ -2022,7 +2022,7 @@ rules: message: Use the constant `names.AttrLoggingConfiguration` for the string literal "logging_configuration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"logging_configuration"' - pattern-not-regex: '"logging_configuration":\s+test\w+,' @@ -2040,7 +2040,7 @@ rules: message: Use the constant `names.AttrMax` for the string literal "max" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"max"' - pattern-not-regex: '"max":\s+test\w+,' @@ -2058,7 +2058,7 @@ rules: message: Use the constant `names.AttrMaxCapacity` for the string literal "max_capacity" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"max_capacity"' - pattern-not-regex: '"max_capacity":\s+test\w+,' @@ -2076,7 +2076,7 @@ rules: message: Use the constant `names.AttrMessage` for the string literal "message" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"message"' - pattern-not-regex: '"message":\s+test\w+,' @@ -2094,7 +2094,7 @@ rules: message: Use the constant `names.AttrMetricName` for the string literal "metric_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"metric_name"' - pattern-not-regex: '"metric_name":\s+test\w+,' @@ -2112,7 +2112,7 @@ rules: message: Use the constant `names.AttrMin` for the string literal "min" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"min"' - pattern-not-regex: '"min":\s+test\w+,' @@ -2130,7 +2130,7 @@ rules: message: Use the constant `names.AttrMode` for the string literal "mode" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"mode"' - pattern-not-regex: '"mode":\s+test\w+,' @@ -2148,7 +2148,7 @@ rules: message: Use the constant `names.AttrMostRecent` for the string literal "most_recent" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"most_recent"' - pattern-not-regex: '"most_recent":\s+test\w+,' @@ -2166,7 +2166,7 @@ rules: message: Use the constant `names.AttrName` for the string literal "name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"name"' - pattern-not-regex: '"name":\s+test\w+,' @@ -2184,7 +2184,7 @@ rules: message: Use the constant `names.AttrNamePrefix` for the string literal "name_prefix" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"name_prefix"' - pattern-not-regex: '"name_prefix":\s+test\w+,' @@ -2202,7 +2202,7 @@ rules: message: Use the constant `names.AttrNames` for the string literal "names" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"names"' - pattern-not-regex: '"names":\s+test\w+,' @@ -2220,7 +2220,7 @@ rules: message: Use the constant `names.AttrNamespace` for the string literal "namespace" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"namespace"' - pattern-not-regex: '"namespace":\s+test\w+,' @@ -2238,7 +2238,7 @@ rules: message: Use the constant `names.AttrNetworkConfiguration` for the string literal "network_configuration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"network_configuration"' - pattern-not-regex: '"network_configuration":\s+test\w+,' @@ -2256,7 +2256,7 @@ rules: message: Use the constant `names.AttrNetworkInterfaceID` for the string literal "network_interface_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"network_interface_id"' - pattern-not-regex: '"network_interface_id":\s+test\w+,' @@ -2274,7 +2274,7 @@ rules: message: Use the constant `names.AttrOwner` for the string literal "owner" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"owner"' - pattern-not-regex: '"owner":\s+test\w+,' @@ -2292,7 +2292,7 @@ rules: message: Use the constant `names.AttrOwnerAccountID` for the string literal "owner_account_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"owner_account_id"' - pattern-not-regex: '"owner_account_id":\s+test\w+,' @@ -2310,7 +2310,7 @@ rules: message: Use the constant `names.AttrOwnerID` for the string literal "owner_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"owner_id"' - pattern-not-regex: '"owner_id":\s+test\w+,' @@ -2328,7 +2328,7 @@ rules: message: Use the constant `names.AttrParameter` for the string literal "parameter" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"parameter"' - pattern-not-regex: '"parameter":\s+test\w+,' @@ -2346,7 +2346,7 @@ rules: message: Use the constant `names.AttrParameterGroupName` for the string literal "parameter_group_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"parameter_group_name"' - pattern-not-regex: '"parameter_group_name":\s+test\w+,' @@ -2364,7 +2364,7 @@ rules: message: Use the constant `names.AttrParameters` for the string literal "parameters" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"parameters"' - pattern-not-regex: '"parameters":\s+test\w+,' @@ -2382,7 +2382,7 @@ rules: message: Use the constant `names.AttrPassword` for the string literal "password" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"password"' - pattern-not-regex: '"password":\s+test\w+,' @@ -2400,7 +2400,7 @@ rules: message: Use the constant `names.AttrPath` for the string literal "path" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"path"' - pattern-not-regex: '"path":\s+test\w+,' @@ -2418,7 +2418,7 @@ rules: message: Use the constant `names.AttrPermissions` for the string literal "permissions" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"permissions"' - pattern-not-regex: '"permissions":\s+test\w+,' @@ -2436,7 +2436,7 @@ rules: message: Use the constant `names.AttrPolicy` for the string literal "policy" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"policy"' - pattern-not-regex: '"policy":\s+test\w+,' @@ -2454,7 +2454,7 @@ rules: message: Use the constant `names.AttrPort` for the string literal "port" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"port"' - pattern-not-regex: '"port":\s+test\w+,' @@ -2472,7 +2472,7 @@ rules: message: Use the constant `names.AttrPreferredMaintenanceWindow` for the string literal "preferred_maintenance_window" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"preferred_maintenance_window"' - pattern-not-regex: '"preferred_maintenance_window":\s+test\w+,' @@ -2490,7 +2490,7 @@ rules: message: Use the constant `names.AttrPrefix` for the string literal "prefix" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"prefix"' - pattern-not-regex: '"prefix":\s+test\w+,' @@ -2508,7 +2508,7 @@ rules: message: Use the constant `names.AttrPrincipal` for the string literal "principal" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"principal"' - pattern-not-regex: '"principal":\s+test\w+,' @@ -2526,7 +2526,7 @@ rules: message: Use the constant `names.AttrPriority` for the string literal "priority" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"priority"' - pattern-not-regex: '"priority":\s+test\w+,' @@ -2544,7 +2544,7 @@ rules: message: Use the constant `names.AttrPrivateKey` for the string literal "private_key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"private_key"' - pattern-not-regex: '"private_key":\s+test\w+,' @@ -2562,7 +2562,7 @@ rules: message: Use the constant `names.AttrProfile` for the string literal "profile" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"profile"' - pattern-not-regex: '"profile":\s+test\w+,' @@ -2580,7 +2580,7 @@ rules: message: Use the constant `names.AttrPropagateTags` for the string literal "propagate_tags" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"propagate_tags"' - pattern-not-regex: '"propagate_tags":\s+test\w+,' @@ -2598,7 +2598,7 @@ rules: message: Use the constant `names.AttrProperties` for the string literal "properties" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"properties"' - pattern-not-regex: '"properties":\s+test\w+,' @@ -2616,7 +2616,7 @@ rules: message: Use the constant `names.AttrProtocol` for the string literal "protocol" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"protocol"' - pattern-not-regex: '"protocol":\s+test\w+,' @@ -2634,7 +2634,7 @@ rules: message: Use the constant `names.AttrProviderName` for the string literal "provider_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"provider_name"' - pattern-not-regex: '"provider_name":\s+test\w+,' @@ -2652,7 +2652,7 @@ rules: message: Use the constant `names.AttrPublicKey` for the string literal "public_key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"public_key"' - pattern-not-regex: '"public_key":\s+test\w+,' @@ -2670,7 +2670,7 @@ rules: message: Use the constant `names.AttrPubliclyAccessible` for the string literal "publicly_accessible" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"publicly_accessible"' - pattern-not-regex: '"publicly_accessible":\s+test\w+,' @@ -2688,7 +2688,7 @@ rules: message: Use the constant `names.AttrRegion` for the string literal "region" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"region"' - pattern-not-regex: '"region":\s+test\w+,' @@ -2706,7 +2706,7 @@ rules: message: Use the constant `names.AttrRepositoryName` for the string literal "repository_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"repository_name"' - pattern-not-regex: '"repository_name":\s+test\w+,' @@ -2724,7 +2724,7 @@ rules: message: Use the constant `names.AttrResourceARN` for the string literal "resource_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resource_arn"' - pattern-not-regex: '"resource_arn":\s+test\w+,' @@ -2742,7 +2742,7 @@ rules: message: Use the constant `names.AttrResourceID` for the string literal "resource_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resource_id"' - pattern-not-regex: '"resource_id":\s+test\w+,' @@ -2760,7 +2760,7 @@ rules: message: Use the constant `names.AttrResourceOwner` for the string literal "resource_owner" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resource_owner"' - pattern-not-regex: '"resource_owner":\s+test\w+,' @@ -2778,7 +2778,7 @@ rules: message: Use the constant `names.AttrResourceTags` for the string literal "resource_tags" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resource_tags"' - pattern-not-regex: '"resource_tags":\s+test\w+,' @@ -2796,7 +2796,7 @@ rules: message: Use the constant `names.AttrResourceType` for the string literal "resource_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resource_type"' - pattern-not-regex: '"resource_type":\s+test\w+,' @@ -2814,7 +2814,7 @@ rules: message: Use the constant `names.AttrResources` for the string literal "resources" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"resources"' - pattern-not-regex: '"resources":\s+test\w+,' @@ -2832,7 +2832,7 @@ rules: message: Use the constant `names.AttrRetentionPeriod` for the string literal "retention_period" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"retention_period"' - pattern-not-regex: '"retention_period":\s+test\w+,' @@ -2850,7 +2850,7 @@ rules: message: Use the constant `names.AttrRole` for the string literal "role" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"role"' - pattern-not-regex: '"role":\s+test\w+,' @@ -2868,7 +2868,7 @@ rules: message: Use the constant `names.AttrRoleARN` for the string literal "role_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"role_arn"' - pattern-not-regex: '"role_arn":\s+test\w+,' @@ -2886,7 +2886,7 @@ rules: message: Use the constant `names.AttrRule` for the string literal "rule" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"rule"' - pattern-not-regex: '"rule":\s+test\w+,' @@ -2904,7 +2904,7 @@ rules: message: Use the constant `names.AttrS3Bucket` for the string literal "s3_bucket" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"s3_bucket"' - pattern-not-regex: '"s3_bucket":\s+test\w+,' @@ -2922,7 +2922,7 @@ rules: message: Use the constant `names.AttrS3BucketName` for the string literal "s3_bucket_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"s3_bucket_name"' - pattern-not-regex: '"s3_bucket_name":\s+test\w+,' @@ -2940,7 +2940,7 @@ rules: message: Use the constant `names.AttrS3KeyPrefix` for the string literal "s3_key_prefix" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"s3_key_prefix"' - pattern-not-regex: '"s3_key_prefix":\s+test\w+,' @@ -2958,7 +2958,7 @@ rules: message: Use the constant `names.AttrSNSTopicARN` for the string literal "sns_topic_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"sns_topic_arn"' - pattern-not-regex: '"sns_topic_arn":\s+test\w+,' @@ -2976,7 +2976,7 @@ rules: message: Use the constant `names.AttrSchedule` for the string literal "schedule" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"schedule"' - pattern-not-regex: '"schedule":\s+test\w+,' @@ -2994,7 +2994,7 @@ rules: message: Use the constant `names.AttrScheduleExpression` for the string literal "schedule_expression" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"schedule_expression"' - pattern-not-regex: '"schedule_expression":\s+test\w+,' @@ -3012,7 +3012,7 @@ rules: message: Use the constant `names.AttrSchema` for the string literal "schema" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"schema"' - pattern-not-regex: '"schema":\s+test\w+,' @@ -3030,7 +3030,7 @@ rules: message: Use the constant `names.AttrScope` for the string literal "scope" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"scope"' - pattern-not-regex: '"scope":\s+test\w+,' @@ -3048,7 +3048,7 @@ rules: message: Use the constant `names.AttrSecretKey` for the string literal "secret_key" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"secret_key"' - pattern-not-regex: '"secret_key":\s+test\w+,' @@ -3066,7 +3066,7 @@ rules: message: Use the constant `names.AttrSecurityGroupIDs` for the string literal "security_group_ids" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"security_group_ids"' - pattern-not-regex: '"security_group_ids":\s+test\w+,' @@ -3084,7 +3084,7 @@ rules: message: Use the constant `names.AttrSecurityGroups` for the string literal "security_groups" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"security_groups"' - pattern-not-regex: '"security_groups":\s+test\w+,' @@ -3102,7 +3102,7 @@ rules: message: Use the constant `names.AttrServiceName` for the string literal "service_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"service_name"' - pattern-not-regex: '"service_name":\s+test\w+,' @@ -3120,7 +3120,7 @@ rules: message: Use the constant `names.AttrServiceRole` for the string literal "service_role" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"service_role"' - pattern-not-regex: '"service_role":\s+test\w+,' @@ -3138,7 +3138,7 @@ rules: message: Use the constant `names.AttrServiceRoleARN` for the string literal "service_role_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"service_role_arn"' - pattern-not-regex: '"service_role_arn":\s+test\w+,' @@ -3156,7 +3156,7 @@ rules: message: Use the constant `names.AttrSession` for the string literal "session" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"session"' - pattern-not-regex: '"session":\s+test\w+,' @@ -3174,7 +3174,7 @@ rules: message: Use the constant `names.AttrSharedConfigFiles` for the string literal "shared_config_files" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"shared_config_files"' - pattern-not-regex: '"shared_config_files":\s+test\w+,' @@ -3192,7 +3192,7 @@ rules: message: Use the constant `names.AttrSize` for the string literal "size" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"size"' - pattern-not-regex: '"size":\s+test\w+,' @@ -3210,7 +3210,7 @@ rules: message: Use the constant `names.AttrSkipCredentialsValidation` for the string literal "skip_credentials_validation" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"skip_credentials_validation"' - pattern-not-regex: '"skip_credentials_validation":\s+test\w+,' @@ -3228,7 +3228,7 @@ rules: message: Use the constant `names.AttrSkipDestroy` for the string literal "skip_destroy" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"skip_destroy"' - pattern-not-regex: '"skip_destroy":\s+test\w+,' @@ -3246,7 +3246,7 @@ rules: message: Use the constant `names.AttrSkipRequestingAccountID` for the string literal "skip_requesting_account_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"skip_requesting_account_id"' - pattern-not-regex: '"skip_requesting_account_id":\s+test\w+,' @@ -3264,7 +3264,7 @@ rules: message: Use the constant `names.AttrSnapshotID` for the string literal "snapshot_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"snapshot_id"' - pattern-not-regex: '"snapshot_id":\s+test\w+,' @@ -3282,7 +3282,7 @@ rules: message: Use the constant `names.AttrSource` for the string literal "source" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"source"' - pattern-not-regex: '"source":\s+test\w+,' @@ -3300,7 +3300,7 @@ rules: message: Use the constant `names.AttrSourceType` for the string literal "source_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"source_type"' - pattern-not-regex: '"source_type":\s+test\w+,' @@ -3318,7 +3318,7 @@ rules: message: Use the constant `names.AttrStage` for the string literal "stage" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"stage"' - pattern-not-regex: '"stage":\s+test\w+,' @@ -3336,7 +3336,7 @@ rules: message: Use the constant `names.AttrStartTime` for the string literal "start_time" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"start_time"' - pattern-not-regex: '"start_time":\s+test\w+,' @@ -3354,7 +3354,7 @@ rules: message: Use the constant `names.AttrState` for the string literal "state" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"state"' - pattern-not-regex: '"state":\s+test\w+,' @@ -3372,7 +3372,7 @@ rules: message: Use the constant `names.AttrStatus` for the string literal "status" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"status"' - pattern-not-regex: '"status":\s+test\w+,' @@ -3390,7 +3390,7 @@ rules: message: Use the constant `names.AttrStatusCode` for the string literal "status_code" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"status_code"' - pattern-not-regex: '"status_code":\s+test\w+,' @@ -3408,7 +3408,7 @@ rules: message: Use the constant `names.AttrStatusMessage` for the string literal "status_message" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"status_message"' - pattern-not-regex: '"status_message":\s+test\w+,' @@ -3426,7 +3426,7 @@ rules: message: Use the constant `names.AttrStatusReason` for the string literal "status_reason" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"status_reason"' - pattern-not-regex: '"status_reason":\s+test\w+,' @@ -3444,7 +3444,7 @@ rules: message: Use the constant `names.AttrStorageClass` for the string literal "storage_class" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"storage_class"' - pattern-not-regex: '"storage_class":\s+test\w+,' @@ -3462,7 +3462,7 @@ rules: message: Use the constant `names.AttrStorageEncrypted` for the string literal "storage_encrypted" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"storage_encrypted"' - pattern-not-regex: '"storage_encrypted":\s+test\w+,' @@ -3480,7 +3480,7 @@ rules: message: Use the constant `names.AttrStorageType` for the string literal "storage_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"storage_type"' - pattern-not-regex: '"storage_type":\s+test\w+,' @@ -3498,7 +3498,7 @@ rules: message: Use the constant `names.AttrStreamARN` for the string literal "stream_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"stream_arn"' - pattern-not-regex: '"stream_arn":\s+test\w+,' @@ -3516,7 +3516,7 @@ rules: message: Use the constant `names.AttrSubnetID` for the string literal "subnet_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"subnet_id"' - pattern-not-regex: '"subnet_id":\s+test\w+,' @@ -3534,7 +3534,7 @@ rules: message: Use the constant `names.AttrSubnetIDs` for the string literal "subnet_ids" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"subnet_ids"' - pattern-not-regex: '"subnet_ids":\s+test\w+,' @@ -3552,7 +3552,7 @@ rules: message: Use the constant `names.AttrSubnets` for the string literal "subnets" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"subnets"' - pattern-not-regex: '"subnets":\s+test\w+,' @@ -3570,7 +3570,7 @@ rules: message: Use the constant `names.AttrTableName` for the string literal "table_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"table_name"' - pattern-not-regex: '"table_name":\s+test\w+,' @@ -3588,7 +3588,7 @@ rules: message: Use the constant `names.AttrTags` for the string literal "tags" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"tags"' - pattern-not-regex: '"tags":\s+test\w+,' @@ -3606,7 +3606,7 @@ rules: message: Use the constant `names.AttrTagsAll` for the string literal "tags_all" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"tags_all"' - pattern-not-regex: '"tags_all":\s+test\w+,' @@ -3624,7 +3624,7 @@ rules: message: Use the constant `names.AttrTarget` for the string literal "target" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"target"' - pattern-not-regex: '"target":\s+test\w+,' @@ -3642,7 +3642,7 @@ rules: message: Use the constant `names.AttrTargetARN` for the string literal "target_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"target_arn"' - pattern-not-regex: '"target_arn":\s+test\w+,' @@ -3660,7 +3660,7 @@ rules: message: Use the constant `names.AttrThroughput` for the string literal "throughput" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"throughput"' - pattern-not-regex: '"throughput":\s+test\w+,' @@ -3678,7 +3678,7 @@ rules: message: Use the constant `names.AttrTimeout` for the string literal "timeout" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"timeout"' - pattern-not-regex: '"timeout":\s+test\w+,' @@ -3696,7 +3696,7 @@ rules: message: Use the constant `names.AttrTimeouts` for the string literal "timeouts" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"timeouts"' - pattern-not-regex: '"timeouts":\s+test\w+,' @@ -3714,7 +3714,7 @@ rules: message: Use the constant `names.AttrTopicARN` for the string literal "topic_arn" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"topic_arn"' - pattern-not-regex: '"topic_arn":\s+test\w+,' @@ -3732,7 +3732,7 @@ rules: message: Use the constant `names.AttrTransitGatewayAttachmentID` for the string literal "transit_gateway_attachment_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"transit_gateway_attachment_id"' - pattern-not-regex: '"transit_gateway_attachment_id":\s+test\w+,' @@ -3750,7 +3750,7 @@ rules: message: Use the constant `names.AttrTransitGatewayID` for the string literal "transit_gateway_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"transit_gateway_id"' - pattern-not-regex: '"transit_gateway_id":\s+test\w+,' @@ -3768,7 +3768,7 @@ rules: message: Use the constant `names.AttrTriggers` for the string literal "triggers" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"triggers"' - pattern-not-regex: '"triggers":\s+test\w+,' @@ -3786,7 +3786,7 @@ rules: message: Use the constant `names.AttrType` for the string literal "type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"type"' - pattern-not-regex: '"type":\s+test\w+,' @@ -3804,7 +3804,7 @@ rules: message: Use the constant `names.AttrURI` for the string literal "uri" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"uri"' - pattern-not-regex: '"uri":\s+test\w+,' @@ -3822,7 +3822,7 @@ rules: message: Use the constant `names.AttrURL` for the string literal "url" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"url"' - pattern-not-regex: '"url":\s+test\w+,' @@ -3840,7 +3840,7 @@ rules: message: Use the constant `names.AttrUnit` for the string literal "unit" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"unit"' - pattern-not-regex: '"unit":\s+test\w+,' @@ -3858,7 +3858,7 @@ rules: message: Use the constant `names.AttrUserName` for the string literal "user_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"user_name"' - pattern-not-regex: '"user_name":\s+test\w+,' @@ -3876,7 +3876,7 @@ rules: message: Use the constant `names.AttrUserPoolID` for the string literal "user_pool_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"user_pool_id"' - pattern-not-regex: '"user_pool_id":\s+test\w+,' @@ -3894,7 +3894,7 @@ rules: message: Use the constant `names.AttrUsername` for the string literal "username" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"username"' - pattern-not-regex: '"username":\s+test\w+,' @@ -3912,7 +3912,7 @@ rules: message: Use the constant `names.AttrVPCConfig` for the string literal "vpc_config" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"vpc_config"' - pattern-not-regex: '"vpc_config":\s+test\w+,' @@ -3930,7 +3930,7 @@ rules: message: Use the constant `names.AttrVPCConfiguration` for the string literal "vpc_configuration" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"vpc_configuration"' - pattern-not-regex: '"vpc_configuration":\s+test\w+,' @@ -3948,7 +3948,7 @@ rules: message: Use the constant `names.AttrVPCEndpointID` for the string literal "vpc_endpoint_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"vpc_endpoint_id"' - pattern-not-regex: '"vpc_endpoint_id":\s+test\w+,' @@ -3966,7 +3966,7 @@ rules: message: Use the constant `names.AttrVPCID` for the string literal "vpc_id" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"vpc_id"' - pattern-not-regex: '"vpc_id":\s+test\w+,' @@ -3984,7 +3984,7 @@ rules: message: Use the constant `names.AttrVPCSecurityGroupIDs` for the string literal "vpc_security_group_ids" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"vpc_security_group_ids"' - pattern-not-regex: '"vpc_security_group_ids":\s+test\w+,' @@ -4002,7 +4002,7 @@ rules: message: Use the constant `names.AttrValue` for the string literal "value" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"value"' - pattern-not-regex: '"value":\s+test\w+,' @@ -4020,7 +4020,7 @@ rules: message: Use the constant `names.AttrValues` for the string literal "values" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"values"' - pattern-not-regex: '"values":\s+test\w+,' @@ -4038,7 +4038,7 @@ rules: message: Use the constant `names.AttrVersion` for the string literal "version" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"version"' - pattern-not-regex: '"version":\s+test\w+,' @@ -4056,7 +4056,7 @@ rules: message: Use the constant `names.AttrVirtualName` for the string literal "virtual_name" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"virtual_name"' - pattern-not-regex: '"virtual_name":\s+test\w+,' @@ -4074,7 +4074,7 @@ rules: message: Use the constant `names.AttrVolumeSize` for the string literal "volume_size" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"volume_size"' - pattern-not-regex: '"volume_size":\s+test\w+,' @@ -4092,7 +4092,7 @@ rules: message: Use the constant `names.AttrVolumeType` for the string literal "volume_type" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"volume_type"' - pattern-not-regex: '"volume_type":\s+test\w+,' @@ -4110,7 +4110,7 @@ rules: message: Use the constant `names.AttrWeight` for the string literal "weight" paths: include: - - "internal/service/**/*.go" + - "/internal/service/**/*.go" patterns: - pattern: '"weight"' - pattern-not-regex: '"weight":\s+test\w+,' diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml index d99eadf90e22..c87b94b7ce5a 100644 --- a/.ci/.semgrep-service-name0.yml +++ b/.ci/.semgrep-service-name0.yml @@ -6,9 +6,9 @@ rules: message: Do not use "AccessAnalyzer" in func name inside accessanalyzer package paths: include: - - internal/service/accessanalyzer + - "/internal/service/accessanalyzer" exclude: - - internal/service/accessanalyzer/list_pages_gen.go + - "/internal/service/accessanalyzer/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -24,7 +24,7 @@ rules: message: Include "AccessAnalyzer" in test name paths: include: - - internal/service/accessanalyzer/*_test.go + - "/internal/service/accessanalyzer/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -39,7 +39,7 @@ rules: message: Do not use "AccessAnalyzer" in const name inside accessanalyzer package paths: include: - - internal/service/accessanalyzer + - "/internal/service/accessanalyzer" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -53,7 +53,7 @@ rules: message: Do not use "AccessAnalyzer" in var name inside accessanalyzer package paths: include: - - internal/service/accessanalyzer + - "/internal/service/accessanalyzer" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -67,9 +67,9 @@ rules: message: Do not use "Account" in func name inside account package paths: include: - - internal/service/account + - "/internal/service/account" exclude: - - internal/service/account/list_pages_gen.go + - "/internal/service/account/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -85,7 +85,7 @@ rules: message: Include "Account" in test name paths: include: - - internal/service/account/*_test.go + - "/internal/service/account/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -100,7 +100,7 @@ rules: message: Do not use "Account" in const name inside account package paths: include: - - internal/service/account + - "/internal/service/account" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -114,7 +114,7 @@ rules: message: Do not use "Account" in var name inside account package paths: include: - - internal/service/account + - "/internal/service/account" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -128,9 +128,9 @@ rules: message: Do not use "ACM" in func name inside acm package paths: include: - - internal/service/acm + - "/internal/service/acm" exclude: - - internal/service/acm/list_pages_gen.go + - "/internal/service/acm/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -146,7 +146,7 @@ rules: message: Include "ACM" in test name paths: include: - - internal/service/acm/*_test.go + - "/internal/service/acm/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -161,7 +161,7 @@ rules: message: Do not use "ACM" in const name inside acm package paths: include: - - internal/service/acm + - "/internal/service/acm" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -175,7 +175,7 @@ rules: message: Do not use "ACM" in var name inside acm package paths: include: - - internal/service/acm + - "/internal/service/acm" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -189,9 +189,9 @@ rules: message: Do not use "ACMPCA" in func name inside acmpca package paths: include: - - internal/service/acmpca + - "/internal/service/acmpca" exclude: - - internal/service/acmpca/list_pages_gen.go + - "/internal/service/acmpca/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -207,7 +207,7 @@ rules: message: Include "ACMPCA" in test name paths: include: - - internal/service/acmpca/*_test.go + - "/internal/service/acmpca/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -222,7 +222,7 @@ rules: message: Do not use "ACMPCA" in const name inside acmpca package paths: include: - - internal/service/acmpca + - "/internal/service/acmpca" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -236,7 +236,7 @@ rules: message: Do not use "ACMPCA" in var name inside acmpca package paths: include: - - internal/service/acmpca + - "/internal/service/acmpca" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -250,9 +250,9 @@ rules: message: Do not use "amg" in func name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" exclude: - - internal/service/grafana/list_pages_gen.go + - "/internal/service/grafana/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -268,7 +268,7 @@ rules: message: Do not use "amg" in const name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -282,7 +282,7 @@ rules: message: Do not use "amg" in var name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -296,9 +296,9 @@ rules: message: Do not use "AMP" in func name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" exclude: - - internal/service/amp/list_pages_gen.go + - "/internal/service/amp/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -314,7 +314,7 @@ rules: message: Include "AMP" in test name paths: include: - - internal/service/amp/*_test.go + - "/internal/service/amp/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -329,7 +329,7 @@ rules: message: Do not use "AMP" in const name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -343,7 +343,7 @@ rules: message: Do not use "AMP" in var name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -357,9 +357,9 @@ rules: message: Do not use "Amplify" in func name inside amplify package paths: include: - - internal/service/amplify + - "/internal/service/amplify" exclude: - - internal/service/amplify/list_pages_gen.go + - "/internal/service/amplify/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -375,7 +375,7 @@ rules: message: Include "Amplify" in test name paths: include: - - internal/service/amplify/*_test.go + - "/internal/service/amplify/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -390,7 +390,7 @@ rules: message: Do not use "Amplify" in const name inside amplify package paths: include: - - internal/service/amplify + - "/internal/service/amplify" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -404,7 +404,7 @@ rules: message: Do not use "Amplify" in var name inside amplify package paths: include: - - internal/service/amplify + - "/internal/service/amplify" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -418,9 +418,9 @@ rules: message: Do not use "APIGateway" in func name inside apigateway package paths: include: - - internal/service/apigateway + - "/internal/service/apigateway" exclude: - - internal/service/apigateway/list_pages_gen.go + - "/internal/service/apigateway/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -436,7 +436,7 @@ rules: message: Include "APIGateway" in test name paths: include: - - internal/service/apigateway/*_test.go + - "/internal/service/apigateway/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -451,7 +451,7 @@ rules: message: Do not use "APIGateway" in const name inside apigateway package paths: include: - - internal/service/apigateway + - "/internal/service/apigateway" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -465,7 +465,7 @@ rules: message: Do not use "APIGateway" in var name inside apigateway package paths: include: - - internal/service/apigateway + - "/internal/service/apigateway" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -479,9 +479,9 @@ rules: message: Do not use "APIGatewayV2" in func name inside apigatewayv2 package paths: include: - - internal/service/apigatewayv2 + - "/internal/service/apigatewayv2" exclude: - - internal/service/apigatewayv2/list_pages_gen.go + - "/internal/service/apigatewayv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -497,7 +497,7 @@ rules: message: Include "APIGatewayV2" in test name paths: include: - - internal/service/apigatewayv2/*_test.go + - "/internal/service/apigatewayv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -512,7 +512,7 @@ rules: message: Do not use "APIGatewayV2" in const name inside apigatewayv2 package paths: include: - - internal/service/apigatewayv2 + - "/internal/service/apigatewayv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -526,7 +526,7 @@ rules: message: Do not use "APIGatewayV2" in var name inside apigatewayv2 package paths: include: - - internal/service/apigatewayv2 + - "/internal/service/apigatewayv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -540,9 +540,9 @@ rules: message: Do not use "AppAutoScaling" in func name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" exclude: - - internal/service/appautoscaling/list_pages_gen.go + - "/internal/service/appautoscaling/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -558,7 +558,7 @@ rules: message: Include "AppAutoScaling" in test name paths: include: - - internal/service/appautoscaling/*_test.go + - "/internal/service/appautoscaling/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -573,7 +573,7 @@ rules: message: Do not use "AppAutoScaling" in const name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -587,7 +587,7 @@ rules: message: Do not use "AppAutoScaling" in var name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -601,9 +601,9 @@ rules: message: Do not use "AppConfig" in func name inside appconfig package paths: include: - - internal/service/appconfig + - "/internal/service/appconfig" exclude: - - internal/service/appconfig/list_pages_gen.go + - "/internal/service/appconfig/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -619,7 +619,7 @@ rules: message: Include "AppConfig" in test name paths: include: - - internal/service/appconfig/*_test.go + - "/internal/service/appconfig/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -634,7 +634,7 @@ rules: message: Do not use "AppConfig" in const name inside appconfig package paths: include: - - internal/service/appconfig + - "/internal/service/appconfig" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -648,7 +648,7 @@ rules: message: Do not use "AppConfig" in var name inside appconfig package paths: include: - - internal/service/appconfig + - "/internal/service/appconfig" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -662,9 +662,9 @@ rules: message: Do not use "AppFabric" in func name inside appfabric package paths: include: - - internal/service/appfabric + - "/internal/service/appfabric" exclude: - - internal/service/appfabric/list_pages_gen.go + - "/internal/service/appfabric/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -680,7 +680,7 @@ rules: message: Include "AppFabric" in test name paths: include: - - internal/service/appfabric/*_test.go + - "/internal/service/appfabric/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -695,7 +695,7 @@ rules: message: Do not use "AppFabric" in const name inside appfabric package paths: include: - - internal/service/appfabric + - "/internal/service/appfabric" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -709,7 +709,7 @@ rules: message: Do not use "AppFabric" in var name inside appfabric package paths: include: - - internal/service/appfabric + - "/internal/service/appfabric" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -723,9 +723,9 @@ rules: message: Do not use "AppFlow" in func name inside appflow package paths: include: - - internal/service/appflow + - "/internal/service/appflow" exclude: - - internal/service/appflow/list_pages_gen.go + - "/internal/service/appflow/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -741,7 +741,7 @@ rules: message: Include "AppFlow" in test name paths: include: - - internal/service/appflow/*_test.go + - "/internal/service/appflow/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -756,7 +756,7 @@ rules: message: Do not use "AppFlow" in const name inside appflow package paths: include: - - internal/service/appflow + - "/internal/service/appflow" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -770,7 +770,7 @@ rules: message: Do not use "AppFlow" in var name inside appflow package paths: include: - - internal/service/appflow + - "/internal/service/appflow" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -784,9 +784,9 @@ rules: message: Do not use "AppIntegrations" in func name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" exclude: - - internal/service/appintegrations/list_pages_gen.go + - "/internal/service/appintegrations/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -802,7 +802,7 @@ rules: message: Include "AppIntegrations" in test name paths: include: - - internal/service/appintegrations/*_test.go + - "/internal/service/appintegrations/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -817,7 +817,7 @@ rules: message: Do not use "AppIntegrations" in const name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -831,7 +831,7 @@ rules: message: Do not use "AppIntegrations" in var name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -845,9 +845,9 @@ rules: message: Do not use "appintegrationsservice" in func name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" exclude: - - internal/service/appintegrations/list_pages_gen.go + - "/internal/service/appintegrations/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -863,7 +863,7 @@ rules: message: Do not use "appintegrationsservice" in const name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -877,7 +877,7 @@ rules: message: Do not use "appintegrationsservice" in var name inside appintegrations package paths: include: - - internal/service/appintegrations + - "/internal/service/appintegrations" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -891,9 +891,9 @@ rules: message: Do not use "applicationautoscaling" in func name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" exclude: - - internal/service/appautoscaling/list_pages_gen.go + - "/internal/service/appautoscaling/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -909,7 +909,7 @@ rules: message: Do not use "applicationautoscaling" in const name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -923,7 +923,7 @@ rules: message: Do not use "applicationautoscaling" in var name inside appautoscaling package paths: include: - - internal/service/appautoscaling + - "/internal/service/appautoscaling" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -937,9 +937,9 @@ rules: message: Do not use "ApplicationInsights" in func name inside applicationinsights package paths: include: - - internal/service/applicationinsights + - "/internal/service/applicationinsights" exclude: - - internal/service/applicationinsights/list_pages_gen.go + - "/internal/service/applicationinsights/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -955,7 +955,7 @@ rules: message: Include "ApplicationInsights" in test name paths: include: - - internal/service/applicationinsights/*_test.go + - "/internal/service/applicationinsights/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -970,7 +970,7 @@ rules: message: Do not use "ApplicationInsights" in const name inside applicationinsights package paths: include: - - internal/service/applicationinsights + - "/internal/service/applicationinsights" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -984,7 +984,7 @@ rules: message: Do not use "ApplicationInsights" in var name inside applicationinsights package paths: include: - - internal/service/applicationinsights + - "/internal/service/applicationinsights" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -998,9 +998,9 @@ rules: message: Do not use "ApplicationSignals" in func name inside applicationsignals package paths: include: - - internal/service/applicationsignals + - "/internal/service/applicationsignals" exclude: - - internal/service/applicationsignals/list_pages_gen.go + - "/internal/service/applicationsignals/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1016,7 +1016,7 @@ rules: message: Include "ApplicationSignals" in test name paths: include: - - internal/service/applicationsignals/*_test.go + - "/internal/service/applicationsignals/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1031,7 +1031,7 @@ rules: message: Do not use "ApplicationSignals" in const name inside applicationsignals package paths: include: - - internal/service/applicationsignals + - "/internal/service/applicationsignals" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1045,7 +1045,7 @@ rules: message: Do not use "ApplicationSignals" in var name inside applicationsignals package paths: include: - - internal/service/applicationsignals + - "/internal/service/applicationsignals" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1059,9 +1059,9 @@ rules: message: Do not use "AppMesh" in func name inside appmesh package paths: include: - - internal/service/appmesh + - "/internal/service/appmesh" exclude: - - internal/service/appmesh/list_pages_gen.go + - "/internal/service/appmesh/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1077,7 +1077,7 @@ rules: message: Include "AppMesh" in test name paths: include: - - internal/service/appmesh/*_test.go + - "/internal/service/appmesh/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1092,7 +1092,7 @@ rules: message: Do not use "AppMesh" in const name inside appmesh package paths: include: - - internal/service/appmesh + - "/internal/service/appmesh" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1106,7 +1106,7 @@ rules: message: Do not use "AppMesh" in var name inside appmesh package paths: include: - - internal/service/appmesh + - "/internal/service/appmesh" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1120,9 +1120,9 @@ rules: message: Do not use "appregistry" in func name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" exclude: - - internal/service/servicecatalogappregistry/list_pages_gen.go + - "/internal/service/servicecatalogappregistry/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1138,7 +1138,7 @@ rules: message: Do not use "appregistry" in const name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1152,7 +1152,7 @@ rules: message: Do not use "appregistry" in var name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1166,9 +1166,9 @@ rules: message: Do not use "AppRunner" in func name inside apprunner package paths: include: - - internal/service/apprunner + - "/internal/service/apprunner" exclude: - - internal/service/apprunner/list_pages_gen.go + - "/internal/service/apprunner/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1184,7 +1184,7 @@ rules: message: Include "AppRunner" in test name paths: include: - - internal/service/apprunner/*_test.go + - "/internal/service/apprunner/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1199,7 +1199,7 @@ rules: message: Do not use "AppRunner" in const name inside apprunner package paths: include: - - internal/service/apprunner + - "/internal/service/apprunner" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1213,7 +1213,7 @@ rules: message: Do not use "AppRunner" in var name inside apprunner package paths: include: - - internal/service/apprunner + - "/internal/service/apprunner" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1227,9 +1227,9 @@ rules: message: Do not use "AppStream" in func name inside appstream package paths: include: - - internal/service/appstream + - "/internal/service/appstream" exclude: - - internal/service/appstream/list_pages_gen.go + - "/internal/service/appstream/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1245,7 +1245,7 @@ rules: message: Include "AppStream" in test name paths: include: - - internal/service/appstream/*_test.go + - "/internal/service/appstream/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1260,7 +1260,7 @@ rules: message: Do not use "AppStream" in const name inside appstream package paths: include: - - internal/service/appstream + - "/internal/service/appstream" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1274,7 +1274,7 @@ rules: message: Do not use "AppStream" in var name inside appstream package paths: include: - - internal/service/appstream + - "/internal/service/appstream" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1288,9 +1288,9 @@ rules: message: Do not use "AppSync" in func name inside appsync package paths: include: - - internal/service/appsync + - "/internal/service/appsync" exclude: - - internal/service/appsync/list_pages_gen.go + - "/internal/service/appsync/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1306,7 +1306,7 @@ rules: message: Include "AppSync" in test name paths: include: - - internal/service/appsync/*_test.go + - "/internal/service/appsync/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1321,7 +1321,7 @@ rules: message: Do not use "AppSync" in const name inside appsync package paths: include: - - internal/service/appsync + - "/internal/service/appsync" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1335,7 +1335,7 @@ rules: message: Do not use "AppSync" in var name inside appsync package paths: include: - - internal/service/appsync + - "/internal/service/appsync" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1349,9 +1349,9 @@ rules: message: Do not use "ARCRegionSwitch" in func name inside arcregionswitch package paths: include: - - internal/service/arcregionswitch + - "/internal/service/arcregionswitch" exclude: - - internal/service/arcregionswitch/list_pages_gen.go + - "/internal/service/arcregionswitch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1367,7 +1367,7 @@ rules: message: Include "ARCRegionSwitch" in test name paths: include: - - internal/service/arcregionswitch/*_test.go + - "/internal/service/arcregionswitch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1382,7 +1382,7 @@ rules: message: Do not use "ARCRegionSwitch" in const name inside arcregionswitch package paths: include: - - internal/service/arcregionswitch + - "/internal/service/arcregionswitch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1396,7 +1396,7 @@ rules: message: Do not use "ARCRegionSwitch" in var name inside arcregionswitch package paths: include: - - internal/service/arcregionswitch + - "/internal/service/arcregionswitch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1410,9 +1410,9 @@ rules: message: Do not use "Athena" in func name inside athena package paths: include: - - internal/service/athena + - "/internal/service/athena" exclude: - - internal/service/athena/list_pages_gen.go + - "/internal/service/athena/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1428,7 +1428,7 @@ rules: message: Include "Athena" in test name paths: include: - - internal/service/athena/*_test.go + - "/internal/service/athena/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1443,7 +1443,7 @@ rules: message: Do not use "Athena" in const name inside athena package paths: include: - - internal/service/athena + - "/internal/service/athena" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1457,7 +1457,7 @@ rules: message: Do not use "Athena" in var name inside athena package paths: include: - - internal/service/athena + - "/internal/service/athena" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1471,9 +1471,9 @@ rules: message: Do not use "AuditManager" in func name inside auditmanager package paths: include: - - internal/service/auditmanager + - "/internal/service/auditmanager" exclude: - - internal/service/auditmanager/list_pages_gen.go + - "/internal/service/auditmanager/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1489,7 +1489,7 @@ rules: message: Include "AuditManager" in test name paths: include: - - internal/service/auditmanager/*_test.go + - "/internal/service/auditmanager/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1504,7 +1504,7 @@ rules: message: Do not use "AuditManager" in const name inside auditmanager package paths: include: - - internal/service/auditmanager + - "/internal/service/auditmanager" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1518,7 +1518,7 @@ rules: message: Do not use "AuditManager" in var name inside auditmanager package paths: include: - - internal/service/auditmanager + - "/internal/service/auditmanager" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1532,9 +1532,9 @@ rules: message: Do not use "AutoScaling" in func name inside autoscaling package paths: include: - - internal/service/autoscaling + - "/internal/service/autoscaling" exclude: - - internal/service/autoscaling/list_pages_gen.go + - "/internal/service/autoscaling/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1550,7 +1550,7 @@ rules: message: Include "AutoScaling" in test name paths: include: - - internal/service/autoscaling/*_test.go + - "/internal/service/autoscaling/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1565,7 +1565,7 @@ rules: message: Do not use "AutoScaling" in const name inside autoscaling package paths: include: - - internal/service/autoscaling + - "/internal/service/autoscaling" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1579,7 +1579,7 @@ rules: message: Do not use "AutoScaling" in var name inside autoscaling package paths: include: - - internal/service/autoscaling + - "/internal/service/autoscaling" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1593,9 +1593,9 @@ rules: message: Do not use "AutoScalingPlans" in func name inside autoscalingplans package paths: include: - - internal/service/autoscalingplans + - "/internal/service/autoscalingplans" exclude: - - internal/service/autoscalingplans/list_pages_gen.go + - "/internal/service/autoscalingplans/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1611,7 +1611,7 @@ rules: message: Include "AutoScalingPlans" in test name paths: include: - - internal/service/autoscalingplans/*_test.go + - "/internal/service/autoscalingplans/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1626,7 +1626,7 @@ rules: message: Do not use "AutoScalingPlans" in const name inside autoscalingplans package paths: include: - - internal/service/autoscalingplans + - "/internal/service/autoscalingplans" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1640,7 +1640,7 @@ rules: message: Do not use "AutoScalingPlans" in var name inside autoscalingplans package paths: include: - - internal/service/autoscalingplans + - "/internal/service/autoscalingplans" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1654,9 +1654,9 @@ rules: message: Do not use "Backup" in func name inside backup package paths: include: - - internal/service/backup + - "/internal/service/backup" exclude: - - internal/service/backup/list_pages_gen.go + - "/internal/service/backup/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1672,7 +1672,7 @@ rules: message: Include "Backup" in test name paths: include: - - internal/service/backup/*_test.go + - "/internal/service/backup/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1687,7 +1687,7 @@ rules: message: Do not use "Backup" in const name inside backup package paths: include: - - internal/service/backup + - "/internal/service/backup" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1701,7 +1701,7 @@ rules: message: Do not use "Backup" in var name inside backup package paths: include: - - internal/service/backup + - "/internal/service/backup" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1715,9 +1715,9 @@ rules: message: Do not use "Batch" in func name inside batch package paths: include: - - internal/service/batch + - "/internal/service/batch" exclude: - - internal/service/batch/list_pages_gen.go + - "/internal/service/batch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1733,7 +1733,7 @@ rules: message: Include "Batch" in test name paths: include: - - internal/service/batch/*_test.go + - "/internal/service/batch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1748,7 +1748,7 @@ rules: message: Do not use "Batch" in const name inside batch package paths: include: - - internal/service/batch + - "/internal/service/batch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1762,7 +1762,7 @@ rules: message: Do not use "Batch" in var name inside batch package paths: include: - - internal/service/batch + - "/internal/service/batch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1776,9 +1776,9 @@ rules: message: Do not use "BCMDataExports" in func name inside bcmdataexports package paths: include: - - internal/service/bcmdataexports + - "/internal/service/bcmdataexports" exclude: - - internal/service/bcmdataexports/list_pages_gen.go + - "/internal/service/bcmdataexports/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1794,7 +1794,7 @@ rules: message: Include "BCMDataExports" in test name paths: include: - - internal/service/bcmdataexports/*_test.go + - "/internal/service/bcmdataexports/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1809,7 +1809,7 @@ rules: message: Do not use "BCMDataExports" in const name inside bcmdataexports package paths: include: - - internal/service/bcmdataexports + - "/internal/service/bcmdataexports" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1823,7 +1823,7 @@ rules: message: Do not use "BCMDataExports" in var name inside bcmdataexports package paths: include: - - internal/service/bcmdataexports + - "/internal/service/bcmdataexports" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1837,9 +1837,9 @@ rules: message: Do not use "beanstalk" in func name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" exclude: - - internal/service/elasticbeanstalk/list_pages_gen.go + - "/internal/service/elasticbeanstalk/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1855,7 +1855,7 @@ rules: message: Do not use "beanstalk" in const name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1869,7 +1869,7 @@ rules: message: Do not use "beanstalk" in var name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1883,9 +1883,9 @@ rules: message: Do not use "Bedrock" in func name inside bedrock package paths: include: - - internal/service/bedrock + - "/internal/service/bedrock" exclude: - - internal/service/bedrock/list_pages_gen.go + - "/internal/service/bedrock/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1901,7 +1901,7 @@ rules: message: Include "Bedrock" in test name paths: include: - - internal/service/bedrock/*_test.go + - "/internal/service/bedrock/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1916,7 +1916,7 @@ rules: message: Do not use "Bedrock" in const name inside bedrock package paths: include: - - internal/service/bedrock + - "/internal/service/bedrock" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1930,7 +1930,7 @@ rules: message: Do not use "Bedrock" in var name inside bedrock package paths: include: - - internal/service/bedrock + - "/internal/service/bedrock" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1944,9 +1944,9 @@ rules: message: Do not use "BedrockAgent" in func name inside bedrockagent package paths: include: - - internal/service/bedrockagent + - "/internal/service/bedrockagent" exclude: - - internal/service/bedrockagent/list_pages_gen.go + - "/internal/service/bedrockagent/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1962,7 +1962,7 @@ rules: message: Include "BedrockAgent" in test name paths: include: - - internal/service/bedrockagent/*_test.go + - "/internal/service/bedrockagent/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1977,7 +1977,7 @@ rules: message: Do not use "BedrockAgent" in const name inside bedrockagent package paths: include: - - internal/service/bedrockagent + - "/internal/service/bedrockagent" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1991,7 +1991,7 @@ rules: message: Do not use "BedrockAgent" in var name inside bedrockagent package paths: include: - - internal/service/bedrockagent + - "/internal/service/bedrockagent" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2005,9 +2005,9 @@ rules: message: Do not use "BedrockAgentCore" in func name inside bedrockagentcore package paths: include: - - internal/service/bedrockagentcore + - "/internal/service/bedrockagentcore" exclude: - - internal/service/bedrockagentcore/list_pages_gen.go + - "/internal/service/bedrockagentcore/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2023,7 +2023,7 @@ rules: message: Include "BedrockAgentCore" in test name paths: include: - - internal/service/bedrockagentcore/*_test.go + - "/internal/service/bedrockagentcore/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2038,7 +2038,7 @@ rules: message: Do not use "BedrockAgentCore" in const name inside bedrockagentcore package paths: include: - - internal/service/bedrockagentcore + - "/internal/service/bedrockagentcore" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2052,7 +2052,7 @@ rules: message: Do not use "BedrockAgentCore" in var name inside bedrockagentcore package paths: include: - - internal/service/bedrockagentcore + - "/internal/service/bedrockagentcore" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2066,9 +2066,9 @@ rules: message: Do not use "Billing" in func name inside billing package paths: include: - - internal/service/billing + - "/internal/service/billing" exclude: - - internal/service/billing/list_pages_gen.go + - "/internal/service/billing/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2084,7 +2084,7 @@ rules: message: Include "Billing" in test name paths: include: - - internal/service/billing/*_test.go + - "/internal/service/billing/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2099,7 +2099,7 @@ rules: message: Do not use "Billing" in const name inside billing package paths: include: - - internal/service/billing + - "/internal/service/billing" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2113,7 +2113,7 @@ rules: message: Do not use "Billing" in var name inside billing package paths: include: - - internal/service/billing + - "/internal/service/billing" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2127,9 +2127,9 @@ rules: message: Do not use "Budgets" in func name inside budgets package paths: include: - - internal/service/budgets + - "/internal/service/budgets" exclude: - - internal/service/budgets/list_pages_gen.go + - "/internal/service/budgets/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2145,7 +2145,7 @@ rules: message: Include "Budgets" in test name paths: include: - - internal/service/budgets/*_test.go + - "/internal/service/budgets/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2160,7 +2160,7 @@ rules: message: Do not use "Budgets" in const name inside budgets package paths: include: - - internal/service/budgets + - "/internal/service/budgets" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2174,7 +2174,7 @@ rules: message: Do not use "Budgets" in var name inside budgets package paths: include: - - internal/service/budgets + - "/internal/service/budgets" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2188,9 +2188,9 @@ rules: message: Do not use "CE" in func name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" exclude: - - internal/service/ce/list_pages_gen.go + - "/internal/service/ce/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2209,7 +2209,7 @@ rules: message: Include "CE" in test name paths: include: - - internal/service/ce/*_test.go + - "/internal/service/ce/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2224,7 +2224,7 @@ rules: message: Do not use "CE" in const name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2239,7 +2239,7 @@ rules: message: Do not use "CE" in var name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2255,9 +2255,9 @@ rules: message: Do not use "Chatbot" in func name inside chatbot package paths: include: - - internal/service/chatbot + - "/internal/service/chatbot" exclude: - - internal/service/chatbot/list_pages_gen.go + - "/internal/service/chatbot/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2273,7 +2273,7 @@ rules: message: Include "Chatbot" in test name paths: include: - - internal/service/chatbot/*_test.go + - "/internal/service/chatbot/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2288,7 +2288,7 @@ rules: message: Do not use "Chatbot" in const name inside chatbot package paths: include: - - internal/service/chatbot + - "/internal/service/chatbot" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2302,7 +2302,7 @@ rules: message: Do not use "Chatbot" in var name inside chatbot package paths: include: - - internal/service/chatbot + - "/internal/service/chatbot" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2316,9 +2316,9 @@ rules: message: Do not use "Chime" in func name inside chime package paths: include: - - internal/service/chime + - "/internal/service/chime" exclude: - - internal/service/chime/list_pages_gen.go + - "/internal/service/chime/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2334,7 +2334,7 @@ rules: message: Include "Chime" in test name paths: include: - - internal/service/chime/*_test.go + - "/internal/service/chime/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2349,7 +2349,7 @@ rules: message: Do not use "Chime" in const name inside chime package paths: include: - - internal/service/chime + - "/internal/service/chime" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2363,7 +2363,7 @@ rules: message: Do not use "Chime" in var name inside chime package paths: include: - - internal/service/chime + - "/internal/service/chime" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2377,9 +2377,9 @@ rules: message: Do not use "ChimeSDKMediaPipelines" in func name inside chimesdkmediapipelines package paths: include: - - internal/service/chimesdkmediapipelines + - "/internal/service/chimesdkmediapipelines" exclude: - - internal/service/chimesdkmediapipelines/list_pages_gen.go + - "/internal/service/chimesdkmediapipelines/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2395,7 +2395,7 @@ rules: message: Include "ChimeSDKMediaPipelines" in test name paths: include: - - internal/service/chimesdkmediapipelines/*_test.go + - "/internal/service/chimesdkmediapipelines/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2410,7 +2410,7 @@ rules: message: Do not use "ChimeSDKMediaPipelines" in const name inside chimesdkmediapipelines package paths: include: - - internal/service/chimesdkmediapipelines + - "/internal/service/chimesdkmediapipelines" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2424,7 +2424,7 @@ rules: message: Do not use "ChimeSDKMediaPipelines" in var name inside chimesdkmediapipelines package paths: include: - - internal/service/chimesdkmediapipelines + - "/internal/service/chimesdkmediapipelines" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2438,9 +2438,9 @@ rules: message: Do not use "ChimeSDKVoice" in func name inside chimesdkvoice package paths: include: - - internal/service/chimesdkvoice + - "/internal/service/chimesdkvoice" exclude: - - internal/service/chimesdkvoice/list_pages_gen.go + - "/internal/service/chimesdkvoice/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2456,7 +2456,7 @@ rules: message: Include "ChimeSDKVoice" in test name paths: include: - - internal/service/chimesdkvoice/*_test.go + - "/internal/service/chimesdkvoice/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2471,7 +2471,7 @@ rules: message: Do not use "ChimeSDKVoice" in const name inside chimesdkvoice package paths: include: - - internal/service/chimesdkvoice + - "/internal/service/chimesdkvoice" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2485,7 +2485,7 @@ rules: message: Do not use "ChimeSDKVoice" in var name inside chimesdkvoice package paths: include: - - internal/service/chimesdkvoice + - "/internal/service/chimesdkvoice" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2499,9 +2499,9 @@ rules: message: Do not use "CleanRooms" in func name inside cleanrooms package paths: include: - - internal/service/cleanrooms + - "/internal/service/cleanrooms" exclude: - - internal/service/cleanrooms/list_pages_gen.go + - "/internal/service/cleanrooms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2517,7 +2517,7 @@ rules: message: Include "CleanRooms" in test name paths: include: - - internal/service/cleanrooms/*_test.go + - "/internal/service/cleanrooms/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2532,7 +2532,7 @@ rules: message: Do not use "CleanRooms" in const name inside cleanrooms package paths: include: - - internal/service/cleanrooms + - "/internal/service/cleanrooms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2546,7 +2546,7 @@ rules: message: Do not use "CleanRooms" in var name inside cleanrooms package paths: include: - - internal/service/cleanrooms + - "/internal/service/cleanrooms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2560,9 +2560,9 @@ rules: message: Do not use "Cloud9" in func name inside cloud9 package paths: include: - - internal/service/cloud9 + - "/internal/service/cloud9" exclude: - - internal/service/cloud9/list_pages_gen.go + - "/internal/service/cloud9/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2578,7 +2578,7 @@ rules: message: Include "Cloud9" in test name paths: include: - - internal/service/cloud9/*_test.go + - "/internal/service/cloud9/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2593,7 +2593,7 @@ rules: message: Do not use "Cloud9" in const name inside cloud9 package paths: include: - - internal/service/cloud9 + - "/internal/service/cloud9" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2607,7 +2607,7 @@ rules: message: Do not use "Cloud9" in var name inside cloud9 package paths: include: - - internal/service/cloud9 + - "/internal/service/cloud9" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2621,9 +2621,9 @@ rules: message: Do not use "CloudControl" in func name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" exclude: - - internal/service/cloudcontrol/list_pages_gen.go + - "/internal/service/cloudcontrol/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2639,7 +2639,7 @@ rules: message: Include "CloudControl" in test name paths: include: - - internal/service/cloudcontrol/*_test.go + - "/internal/service/cloudcontrol/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2654,7 +2654,7 @@ rules: message: Do not use "CloudControl" in const name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2668,7 +2668,7 @@ rules: message: Do not use "CloudControl" in var name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2682,9 +2682,9 @@ rules: message: Do not use "cloudcontrolapi" in func name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" exclude: - - internal/service/cloudcontrol/list_pages_gen.go + - "/internal/service/cloudcontrol/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2700,7 +2700,7 @@ rules: message: Do not use "cloudcontrolapi" in const name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2714,7 +2714,7 @@ rules: message: Do not use "cloudcontrolapi" in var name inside cloudcontrol package paths: include: - - internal/service/cloudcontrol + - "/internal/service/cloudcontrol" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2728,9 +2728,9 @@ rules: message: Do not use "CloudFormation" in func name inside cloudformation package paths: include: - - internal/service/cloudformation + - "/internal/service/cloudformation" exclude: - - internal/service/cloudformation/list_pages_gen.go + - "/internal/service/cloudformation/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2746,7 +2746,7 @@ rules: message: Include "CloudFormation" in test name paths: include: - - internal/service/cloudformation/*_test.go + - "/internal/service/cloudformation/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2761,7 +2761,7 @@ rules: message: Do not use "CloudFormation" in const name inside cloudformation package paths: include: - - internal/service/cloudformation + - "/internal/service/cloudformation" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2775,7 +2775,7 @@ rules: message: Do not use "CloudFormation" in var name inside cloudformation package paths: include: - - internal/service/cloudformation + - "/internal/service/cloudformation" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2789,9 +2789,9 @@ rules: message: Do not use "CloudFront" in func name inside cloudfront package paths: include: - - internal/service/cloudfront + - "/internal/service/cloudfront" exclude: - - internal/service/cloudfront/list_pages_gen.go + - "/internal/service/cloudfront/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2807,7 +2807,7 @@ rules: message: Include "CloudFront" in test name paths: include: - - internal/service/cloudfront/*_test.go + - "/internal/service/cloudfront/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2822,7 +2822,7 @@ rules: message: Do not use "CloudFront" in const name inside cloudfront package paths: include: - - internal/service/cloudfront + - "/internal/service/cloudfront" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2836,7 +2836,7 @@ rules: message: Do not use "CloudFront" in var name inside cloudfront package paths: include: - - internal/service/cloudfront + - "/internal/service/cloudfront" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2850,9 +2850,9 @@ rules: message: Do not use "CloudFrontKeyValueStore" in func name inside cloudfrontkeyvaluestore package paths: include: - - internal/service/cloudfrontkeyvaluestore + - "/internal/service/cloudfrontkeyvaluestore" exclude: - - internal/service/cloudfrontkeyvaluestore/list_pages_gen.go + - "/internal/service/cloudfrontkeyvaluestore/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2868,7 +2868,7 @@ rules: message: Include "CloudFrontKeyValueStore" in test name paths: include: - - internal/service/cloudfrontkeyvaluestore/*_test.go + - "/internal/service/cloudfrontkeyvaluestore/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2883,7 +2883,7 @@ rules: message: Do not use "CloudFrontKeyValueStore" in const name inside cloudfrontkeyvaluestore package paths: include: - - internal/service/cloudfrontkeyvaluestore + - "/internal/service/cloudfrontkeyvaluestore" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2897,7 +2897,7 @@ rules: message: Do not use "CloudFrontKeyValueStore" in var name inside cloudfrontkeyvaluestore package paths: include: - - internal/service/cloudfrontkeyvaluestore + - "/internal/service/cloudfrontkeyvaluestore" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2911,9 +2911,9 @@ rules: message: Do not use "cloudhsm" in func name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" exclude: - - internal/service/cloudhsmv2/list_pages_gen.go + - "/internal/service/cloudhsmv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2929,7 +2929,7 @@ rules: message: Do not use "cloudhsm" in const name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2943,7 +2943,7 @@ rules: message: Do not use "cloudhsm" in var name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2957,9 +2957,9 @@ rules: message: Do not use "CloudHSMV2" in func name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" exclude: - - internal/service/cloudhsmv2/list_pages_gen.go + - "/internal/service/cloudhsmv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2975,7 +2975,7 @@ rules: message: Include "CloudHSMV2" in test name paths: include: - - internal/service/cloudhsmv2/*_test.go + - "/internal/service/cloudhsmv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2990,7 +2990,7 @@ rules: message: Do not use "CloudHSMV2" in const name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3004,7 +3004,7 @@ rules: message: Do not use "CloudHSMV2" in var name inside cloudhsmv2 package paths: include: - - internal/service/cloudhsmv2 + - "/internal/service/cloudhsmv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3018,9 +3018,9 @@ rules: message: Do not use "CloudSearch" in func name inside cloudsearch package paths: include: - - internal/service/cloudsearch + - "/internal/service/cloudsearch" exclude: - - internal/service/cloudsearch/list_pages_gen.go + - "/internal/service/cloudsearch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3036,7 +3036,7 @@ rules: message: Include "CloudSearch" in test name paths: include: - - internal/service/cloudsearch/*_test.go + - "/internal/service/cloudsearch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3051,7 +3051,7 @@ rules: message: Do not use "CloudSearch" in const name inside cloudsearch package paths: include: - - internal/service/cloudsearch + - "/internal/service/cloudsearch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3065,7 +3065,7 @@ rules: message: Do not use "CloudSearch" in var name inside cloudsearch package paths: include: - - internal/service/cloudsearch + - "/internal/service/cloudsearch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3079,9 +3079,9 @@ rules: message: Do not use "CloudTrail" in func name inside cloudtrail package paths: include: - - internal/service/cloudtrail + - "/internal/service/cloudtrail" exclude: - - internal/service/cloudtrail/list_pages_gen.go + - "/internal/service/cloudtrail/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3098,7 +3098,7 @@ rules: message: Include "CloudTrail" in test name paths: include: - - internal/service/cloudtrail/*_test.go + - "/internal/service/cloudtrail/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3113,7 +3113,7 @@ rules: message: Do not use "CloudTrail" in const name inside cloudtrail package paths: include: - - internal/service/cloudtrail + - "/internal/service/cloudtrail" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3127,7 +3127,7 @@ rules: message: Do not use "CloudTrail" in var name inside cloudtrail package paths: include: - - internal/service/cloudtrail + - "/internal/service/cloudtrail" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3141,9 +3141,9 @@ rules: message: Do not use "CloudWatch" in func name inside cloudwatch package paths: include: - - internal/service/cloudwatch + - "/internal/service/cloudwatch" exclude: - - internal/service/cloudwatch/list_pages_gen.go + - "/internal/service/cloudwatch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3159,7 +3159,7 @@ rules: message: Include "CloudWatch" in test name paths: include: - - internal/service/cloudwatch/*_test.go + - "/internal/service/cloudwatch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3174,7 +3174,7 @@ rules: message: Do not use "CloudWatch" in const name inside cloudwatch package paths: include: - - internal/service/cloudwatch + - "/internal/service/cloudwatch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3188,7 +3188,7 @@ rules: message: Do not use "CloudWatch" in var name inside cloudwatch package paths: include: - - internal/service/cloudwatch + - "/internal/service/cloudwatch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3202,9 +3202,9 @@ rules: message: Do not use "cloudwatchevents" in func name inside events package paths: include: - - internal/service/events + - "/internal/service/events" exclude: - - internal/service/events/list_pages_gen.go + - "/internal/service/events/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3220,7 +3220,7 @@ rules: message: Do not use "cloudwatchevents" in const name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3234,7 +3234,7 @@ rules: message: Do not use "cloudwatchevents" in var name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3248,9 +3248,9 @@ rules: message: Do not use "cloudwatchevidently" in func name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" exclude: - - internal/service/evidently/list_pages_gen.go + - "/internal/service/evidently/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3266,7 +3266,7 @@ rules: message: Do not use "cloudwatchevidently" in const name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3280,7 +3280,7 @@ rules: message: Do not use "cloudwatchevidently" in var name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3294,9 +3294,9 @@ rules: message: Do not use "cloudwatchlog" in func name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" exclude: - - internal/service/logs/list_pages_gen.go + - "/internal/service/logs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3312,7 +3312,7 @@ rules: message: Do not use "cloudwatchlog" in const name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3326,7 +3326,7 @@ rules: message: Do not use "cloudwatchlog" in var name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3340,9 +3340,9 @@ rules: message: Do not use "cloudwatchlogs" in func name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" exclude: - - internal/service/logs/list_pages_gen.go + - "/internal/service/logs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3358,7 +3358,7 @@ rules: message: Do not use "cloudwatchlogs" in const name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3372,7 +3372,7 @@ rules: message: Do not use "cloudwatchlogs" in var name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3386,9 +3386,9 @@ rules: message: Do not use "cloudwatchobservabilityaccessmanager" in func name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" exclude: - - internal/service/oam/list_pages_gen.go + - "/internal/service/oam/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3404,7 +3404,7 @@ rules: message: Do not use "cloudwatchobservabilityaccessmanager" in const name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3418,7 +3418,7 @@ rules: message: Do not use "cloudwatchobservabilityaccessmanager" in var name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3432,9 +3432,9 @@ rules: message: Do not use "cloudwatchrum" in func name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" exclude: - - internal/service/rum/list_pages_gen.go + - "/internal/service/rum/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3450,7 +3450,7 @@ rules: message: Do not use "cloudwatchrum" in const name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3464,7 +3464,7 @@ rules: message: Do not use "cloudwatchrum" in var name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3478,9 +3478,9 @@ rules: message: Do not use "CodeArtifact" in func name inside codeartifact package paths: include: - - internal/service/codeartifact + - "/internal/service/codeartifact" exclude: - - internal/service/codeartifact/list_pages_gen.go + - "/internal/service/codeartifact/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3496,7 +3496,7 @@ rules: message: Include "CodeArtifact" in test name paths: include: - - internal/service/codeartifact/*_test.go + - "/internal/service/codeartifact/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3511,7 +3511,7 @@ rules: message: Do not use "CodeArtifact" in const name inside codeartifact package paths: include: - - internal/service/codeartifact + - "/internal/service/codeartifact" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3525,7 +3525,7 @@ rules: message: Do not use "CodeArtifact" in var name inside codeartifact package paths: include: - - internal/service/codeartifact + - "/internal/service/codeartifact" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3539,9 +3539,9 @@ rules: message: Do not use "CodeBuild" in func name inside codebuild package paths: include: - - internal/service/codebuild + - "/internal/service/codebuild" exclude: - - internal/service/codebuild/list_pages_gen.go + - "/internal/service/codebuild/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3557,7 +3557,7 @@ rules: message: Include "CodeBuild" in test name paths: include: - - internal/service/codebuild/*_test.go + - "/internal/service/codebuild/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3572,7 +3572,7 @@ rules: message: Do not use "CodeBuild" in const name inside codebuild package paths: include: - - internal/service/codebuild + - "/internal/service/codebuild" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3586,7 +3586,7 @@ rules: message: Do not use "CodeBuild" in var name inside codebuild package paths: include: - - internal/service/codebuild + - "/internal/service/codebuild" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3600,9 +3600,9 @@ rules: message: Do not use "CodeCatalyst" in func name inside codecatalyst package paths: include: - - internal/service/codecatalyst + - "/internal/service/codecatalyst" exclude: - - internal/service/codecatalyst/list_pages_gen.go + - "/internal/service/codecatalyst/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3618,7 +3618,7 @@ rules: message: Include "CodeCatalyst" in test name paths: include: - - internal/service/codecatalyst/*_test.go + - "/internal/service/codecatalyst/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3633,7 +3633,7 @@ rules: message: Do not use "CodeCatalyst" in const name inside codecatalyst package paths: include: - - internal/service/codecatalyst + - "/internal/service/codecatalyst" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3647,7 +3647,7 @@ rules: message: Do not use "CodeCatalyst" in var name inside codecatalyst package paths: include: - - internal/service/codecatalyst + - "/internal/service/codecatalyst" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3661,9 +3661,9 @@ rules: message: Do not use "CodeCommit" in func name inside codecommit package paths: include: - - internal/service/codecommit + - "/internal/service/codecommit" exclude: - - internal/service/codecommit/list_pages_gen.go + - "/internal/service/codecommit/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3679,7 +3679,7 @@ rules: message: Include "CodeCommit" in test name paths: include: - - internal/service/codecommit/*_test.go + - "/internal/service/codecommit/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3694,7 +3694,7 @@ rules: message: Do not use "CodeCommit" in const name inside codecommit package paths: include: - - internal/service/codecommit + - "/internal/service/codecommit" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3708,7 +3708,7 @@ rules: message: Do not use "CodeCommit" in var name inside codecommit package paths: include: - - internal/service/codecommit + - "/internal/service/codecommit" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3722,9 +3722,9 @@ rules: message: Do not use "CodeConnections" in func name inside codeconnections package paths: include: - - internal/service/codeconnections + - "/internal/service/codeconnections" exclude: - - internal/service/codeconnections/list_pages_gen.go + - "/internal/service/codeconnections/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3740,7 +3740,7 @@ rules: message: Include "CodeConnections" in test name paths: include: - - internal/service/codeconnections/*_test.go + - "/internal/service/codeconnections/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3755,7 +3755,7 @@ rules: message: Do not use "CodeConnections" in const name inside codeconnections package paths: include: - - internal/service/codeconnections + - "/internal/service/codeconnections" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3769,7 +3769,7 @@ rules: message: Do not use "CodeConnections" in var name inside codeconnections package paths: include: - - internal/service/codeconnections + - "/internal/service/codeconnections" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3783,9 +3783,9 @@ rules: message: Do not use "codedeploy" in func name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" exclude: - - internal/service/deploy/list_pages_gen.go + - "/internal/service/deploy/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3801,7 +3801,7 @@ rules: message: Do not use "codedeploy" in const name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3815,7 +3815,7 @@ rules: message: Do not use "codedeploy" in var name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3829,9 +3829,9 @@ rules: message: Do not use "CodeGuruProfiler" in func name inside codeguruprofiler package paths: include: - - internal/service/codeguruprofiler + - "/internal/service/codeguruprofiler" exclude: - - internal/service/codeguruprofiler/list_pages_gen.go + - "/internal/service/codeguruprofiler/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3847,7 +3847,7 @@ rules: message: Include "CodeGuruProfiler" in test name paths: include: - - internal/service/codeguruprofiler/*_test.go + - "/internal/service/codeguruprofiler/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3862,7 +3862,7 @@ rules: message: Do not use "CodeGuruProfiler" in const name inside codeguruprofiler package paths: include: - - internal/service/codeguruprofiler + - "/internal/service/codeguruprofiler" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3876,7 +3876,7 @@ rules: message: Do not use "CodeGuruProfiler" in var name inside codeguruprofiler package paths: include: - - internal/service/codeguruprofiler + - "/internal/service/codeguruprofiler" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3890,9 +3890,9 @@ rules: message: Do not use "CodeGuruReviewer" in func name inside codegurureviewer package paths: include: - - internal/service/codegurureviewer + - "/internal/service/codegurureviewer" exclude: - - internal/service/codegurureviewer/list_pages_gen.go + - "/internal/service/codegurureviewer/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3908,7 +3908,7 @@ rules: message: Include "CodeGuruReviewer" in test name paths: include: - - internal/service/codegurureviewer/*_test.go + - "/internal/service/codegurureviewer/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3923,7 +3923,7 @@ rules: message: Do not use "CodeGuruReviewer" in const name inside codegurureviewer package paths: include: - - internal/service/codegurureviewer + - "/internal/service/codegurureviewer" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3937,7 +3937,7 @@ rules: message: Do not use "CodeGuruReviewer" in var name inside codegurureviewer package paths: include: - - internal/service/codegurureviewer + - "/internal/service/codegurureviewer" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3951,9 +3951,9 @@ rules: message: Do not use "CodePipeline" in func name inside codepipeline package paths: include: - - internal/service/codepipeline + - "/internal/service/codepipeline" exclude: - - internal/service/codepipeline/list_pages_gen.go + - "/internal/service/codepipeline/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3969,7 +3969,7 @@ rules: message: Include "CodePipeline" in test name paths: include: - - internal/service/codepipeline/*_test.go + - "/internal/service/codepipeline/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3984,7 +3984,7 @@ rules: message: Do not use "CodePipeline" in const name inside codepipeline package paths: include: - - internal/service/codepipeline + - "/internal/service/codepipeline" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3998,7 +3998,7 @@ rules: message: Do not use "CodePipeline" in var name inside codepipeline package paths: include: - - internal/service/codepipeline + - "/internal/service/codepipeline" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4012,9 +4012,9 @@ rules: message: Do not use "CodeStarConnections" in func name inside codestarconnections package paths: include: - - internal/service/codestarconnections + - "/internal/service/codestarconnections" exclude: - - internal/service/codestarconnections/list_pages_gen.go + - "/internal/service/codestarconnections/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4030,7 +4030,7 @@ rules: message: Include "CodeStarConnections" in test name paths: include: - - internal/service/codestarconnections/*_test.go + - "/internal/service/codestarconnections/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4045,7 +4045,7 @@ rules: message: Do not use "CodeStarConnections" in const name inside codestarconnections package paths: include: - - internal/service/codestarconnections + - "/internal/service/codestarconnections" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4059,7 +4059,7 @@ rules: message: Do not use "CodeStarConnections" in var name inside codestarconnections package paths: include: - - internal/service/codestarconnections + - "/internal/service/codestarconnections" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4073,9 +4073,9 @@ rules: message: Do not use "CodeStarNotifications" in func name inside codestarnotifications package paths: include: - - internal/service/codestarnotifications + - "/internal/service/codestarnotifications" exclude: - - internal/service/codestarnotifications/list_pages_gen.go + - "/internal/service/codestarnotifications/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4091,7 +4091,7 @@ rules: message: Include "CodeStarNotifications" in test name paths: include: - - internal/service/codestarnotifications/*_test.go + - "/internal/service/codestarnotifications/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4106,7 +4106,7 @@ rules: message: Do not use "CodeStarNotifications" in const name inside codestarnotifications package paths: include: - - internal/service/codestarnotifications + - "/internal/service/codestarnotifications" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4120,7 +4120,7 @@ rules: message: Do not use "CodeStarNotifications" in var name inside codestarnotifications package paths: include: - - internal/service/codestarnotifications + - "/internal/service/codestarnotifications" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4134,9 +4134,9 @@ rules: message: Do not use "CognitoIdentity" in func name inside cognitoidentity package paths: include: - - internal/service/cognitoidentity + - "/internal/service/cognitoidentity" exclude: - - internal/service/cognitoidentity/list_pages_gen.go + - "/internal/service/cognitoidentity/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4152,7 +4152,7 @@ rules: message: Include "CognitoIdentity" in test name paths: include: - - internal/service/cognitoidentity/*_test.go + - "/internal/service/cognitoidentity/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4167,7 +4167,7 @@ rules: message: Do not use "CognitoIdentity" in const name inside cognitoidentity package paths: include: - - internal/service/cognitoidentity + - "/internal/service/cognitoidentity" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4181,7 +4181,7 @@ rules: message: Do not use "CognitoIdentity" in var name inside cognitoidentity package paths: include: - - internal/service/cognitoidentity + - "/internal/service/cognitoidentity" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4195,9 +4195,9 @@ rules: message: Do not use "cognitoidentityprovider" in func name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" exclude: - - internal/service/cognitoidp/list_pages_gen.go + - "/internal/service/cognitoidp/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4213,7 +4213,7 @@ rules: message: Do not use "cognitoidentityprovider" in const name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4227,7 +4227,7 @@ rules: message: Do not use "cognitoidentityprovider" in var name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4241,9 +4241,9 @@ rules: message: Do not use "CognitoIDP" in func name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" exclude: - - internal/service/cognitoidp/list_pages_gen.go + - "/internal/service/cognitoidp/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4259,7 +4259,7 @@ rules: message: Include "CognitoIDP" in test name paths: include: - - internal/service/cognitoidp/*_test.go + - "/internal/service/cognitoidp/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4274,7 +4274,7 @@ rules: message: Do not use "CognitoIDP" in const name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4288,7 +4288,7 @@ rules: message: Do not use "CognitoIDP" in var name inside cognitoidp package paths: include: - - internal/service/cognitoidp + - "/internal/service/cognitoidp" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4302,9 +4302,9 @@ rules: message: Do not use "Comprehend" in func name inside comprehend package paths: include: - - internal/service/comprehend + - "/internal/service/comprehend" exclude: - - internal/service/comprehend/list_pages_gen.go + - "/internal/service/comprehend/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4320,7 +4320,7 @@ rules: message: Include "Comprehend" in test name paths: include: - - internal/service/comprehend/*_test.go + - "/internal/service/comprehend/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4335,7 +4335,7 @@ rules: message: Do not use "Comprehend" in const name inside comprehend package paths: include: - - internal/service/comprehend + - "/internal/service/comprehend" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4349,7 +4349,7 @@ rules: message: Do not use "Comprehend" in var name inside comprehend package paths: include: - - internal/service/comprehend + - "/internal/service/comprehend" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4363,9 +4363,9 @@ rules: message: Do not use "ComputeOptimizer" in func name inside computeoptimizer package paths: include: - - internal/service/computeoptimizer + - "/internal/service/computeoptimizer" exclude: - - internal/service/computeoptimizer/list_pages_gen.go + - "/internal/service/computeoptimizer/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4381,7 +4381,7 @@ rules: message: Include "ComputeOptimizer" in test name paths: include: - - internal/service/computeoptimizer/*_test.go + - "/internal/service/computeoptimizer/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4396,7 +4396,7 @@ rules: message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package paths: include: - - internal/service/computeoptimizer + - "/internal/service/computeoptimizer" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4410,7 +4410,7 @@ rules: message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package paths: include: - - internal/service/computeoptimizer + - "/internal/service/computeoptimizer" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4424,9 +4424,9 @@ rules: message: Do not use "ConfigService" in func name inside configservice package paths: include: - - internal/service/configservice + - "/internal/service/configservice" exclude: - - internal/service/configservice/list_pages_gen.go + - "/internal/service/configservice/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4442,7 +4442,7 @@ rules: message: Include "ConfigService" in test name paths: include: - - internal/service/configservice/*_test.go + - "/internal/service/configservice/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml index e9cfedc97e2e..dd4188e2c05f 100644 --- a/.ci/.semgrep-service-name1.yml +++ b/.ci/.semgrep-service-name1.yml @@ -6,7 +6,7 @@ rules: message: Do not use "ConfigService" in const name inside configservice package paths: include: - - internal/service/configservice + - "/internal/service/configservice" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -20,7 +20,7 @@ rules: message: Do not use "ConfigService" in var name inside configservice package paths: include: - - internal/service/configservice + - "/internal/service/configservice" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -34,9 +34,9 @@ rules: message: Do not use "Connect" in func name inside connect package paths: include: - - internal/service/connect + - "/internal/service/connect" exclude: - - internal/service/connect/list_pages_gen.go + - "/internal/service/connect/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -53,7 +53,7 @@ rules: message: Include "Connect" in test name paths: include: - - internal/service/connect/*_test.go + - "/internal/service/connect/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -68,7 +68,7 @@ rules: message: Do not use "Connect" in const name inside connect package paths: include: - - internal/service/connect + - "/internal/service/connect" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -83,7 +83,7 @@ rules: message: Do not use "Connect" in var name inside connect package paths: include: - - internal/service/connect + - "/internal/service/connect" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -98,9 +98,9 @@ rules: message: Do not use "ConnectCases" in func name inside connectcases package paths: include: - - internal/service/connectcases + - "/internal/service/connectcases" exclude: - - internal/service/connectcases/list_pages_gen.go + - "/internal/service/connectcases/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -116,7 +116,7 @@ rules: message: Include "ConnectCases" in test name paths: include: - - internal/service/connectcases/*_test.go + - "/internal/service/connectcases/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -131,7 +131,7 @@ rules: message: Do not use "ConnectCases" in const name inside connectcases package paths: include: - - internal/service/connectcases + - "/internal/service/connectcases" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -145,7 +145,7 @@ rules: message: Do not use "ConnectCases" in var name inside connectcases package paths: include: - - internal/service/connectcases + - "/internal/service/connectcases" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -159,9 +159,9 @@ rules: message: Do not use "ControlTower" in func name inside controltower package paths: include: - - internal/service/controltower + - "/internal/service/controltower" exclude: - - internal/service/controltower/list_pages_gen.go + - "/internal/service/controltower/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -177,7 +177,7 @@ rules: message: Include "ControlTower" in test name paths: include: - - internal/service/controltower/*_test.go + - "/internal/service/controltower/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -192,7 +192,7 @@ rules: message: Do not use "ControlTower" in const name inside controltower package paths: include: - - internal/service/controltower + - "/internal/service/controltower" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -206,7 +206,7 @@ rules: message: Do not use "ControlTower" in var name inside controltower package paths: include: - - internal/service/controltower + - "/internal/service/controltower" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -220,9 +220,9 @@ rules: message: Do not use "costandusagereportservice" in func name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" exclude: - - internal/service/cur/list_pages_gen.go + - "/internal/service/cur/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -238,7 +238,7 @@ rules: message: Do not use "costandusagereportservice" in const name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -252,7 +252,7 @@ rules: message: Do not use "costandusagereportservice" in var name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -266,9 +266,9 @@ rules: message: Do not use "costexplorer" in func name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" exclude: - - internal/service/ce/list_pages_gen.go + - "/internal/service/ce/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -284,7 +284,7 @@ rules: message: Do not use "costexplorer" in const name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -298,7 +298,7 @@ rules: message: Do not use "costexplorer" in var name inside ce package paths: include: - - internal/service/ce + - "/internal/service/ce" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -312,9 +312,9 @@ rules: message: Do not use "CostOptimizationHub" in func name inside costoptimizationhub package paths: include: - - internal/service/costoptimizationhub + - "/internal/service/costoptimizationhub" exclude: - - internal/service/costoptimizationhub/list_pages_gen.go + - "/internal/service/costoptimizationhub/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -330,7 +330,7 @@ rules: message: Include "CostOptimizationHub" in test name paths: include: - - internal/service/costoptimizationhub/*_test.go + - "/internal/service/costoptimizationhub/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -345,7 +345,7 @@ rules: message: Do not use "CostOptimizationHub" in const name inside costoptimizationhub package paths: include: - - internal/service/costoptimizationhub + - "/internal/service/costoptimizationhub" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -359,7 +359,7 @@ rules: message: Do not use "CostOptimizationHub" in var name inside costoptimizationhub package paths: include: - - internal/service/costoptimizationhub + - "/internal/service/costoptimizationhub" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -373,9 +373,9 @@ rules: message: Do not use "CUR" in func name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" exclude: - - internal/service/cur/list_pages_gen.go + - "/internal/service/cur/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -391,7 +391,7 @@ rules: message: Include "CUR" in test name paths: include: - - internal/service/cur/*_test.go + - "/internal/service/cur/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -406,7 +406,7 @@ rules: message: Do not use "CUR" in const name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -420,7 +420,7 @@ rules: message: Do not use "CUR" in var name inside cur package paths: include: - - internal/service/cur + - "/internal/service/cur" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -434,9 +434,9 @@ rules: message: Do not use "CustomerProfiles" in func name inside customerprofiles package paths: include: - - internal/service/customerprofiles + - "/internal/service/customerprofiles" exclude: - - internal/service/customerprofiles/list_pages_gen.go + - "/internal/service/customerprofiles/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -452,7 +452,7 @@ rules: message: Include "CustomerProfiles" in test name paths: include: - - internal/service/customerprofiles/*_test.go + - "/internal/service/customerprofiles/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -467,7 +467,7 @@ rules: message: Do not use "CustomerProfiles" in const name inside customerprofiles package paths: include: - - internal/service/customerprofiles + - "/internal/service/customerprofiles" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -481,7 +481,7 @@ rules: message: Do not use "CustomerProfiles" in var name inside customerprofiles package paths: include: - - internal/service/customerprofiles + - "/internal/service/customerprofiles" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -495,9 +495,9 @@ rules: message: Do not use "databasemigration" in func name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" exclude: - - internal/service/dms/list_pages_gen.go + - "/internal/service/dms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -513,7 +513,7 @@ rules: message: Do not use "databasemigration" in const name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -527,7 +527,7 @@ rules: message: Do not use "databasemigration" in var name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -541,9 +541,9 @@ rules: message: Do not use "databasemigrationservice" in func name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" exclude: - - internal/service/dms/list_pages_gen.go + - "/internal/service/dms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -559,7 +559,7 @@ rules: message: Do not use "databasemigrationservice" in const name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -573,7 +573,7 @@ rules: message: Do not use "databasemigrationservice" in var name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -587,9 +587,9 @@ rules: message: Do not use "DataBrew" in func name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" exclude: - - internal/service/databrew/list_pages_gen.go + - "/internal/service/databrew/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -605,7 +605,7 @@ rules: message: Include "DataBrew" in test name paths: include: - - internal/service/databrew/*_test.go + - "/internal/service/databrew/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -620,7 +620,7 @@ rules: message: Do not use "DataBrew" in const name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -634,7 +634,7 @@ rules: message: Do not use "DataBrew" in var name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -648,9 +648,9 @@ rules: message: Do not use "DataExchange" in func name inside dataexchange package paths: include: - - internal/service/dataexchange + - "/internal/service/dataexchange" exclude: - - internal/service/dataexchange/list_pages_gen.go + - "/internal/service/dataexchange/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -666,7 +666,7 @@ rules: message: Include "DataExchange" in test name paths: include: - - internal/service/dataexchange/*_test.go + - "/internal/service/dataexchange/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -681,7 +681,7 @@ rules: message: Do not use "DataExchange" in const name inside dataexchange package paths: include: - - internal/service/dataexchange + - "/internal/service/dataexchange" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -695,7 +695,7 @@ rules: message: Do not use "DataExchange" in var name inside dataexchange package paths: include: - - internal/service/dataexchange + - "/internal/service/dataexchange" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -709,9 +709,9 @@ rules: message: Do not use "DataPipeline" in func name inside datapipeline package paths: include: - - internal/service/datapipeline + - "/internal/service/datapipeline" exclude: - - internal/service/datapipeline/list_pages_gen.go + - "/internal/service/datapipeline/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -727,7 +727,7 @@ rules: message: Include "DataPipeline" in test name paths: include: - - internal/service/datapipeline/*_test.go + - "/internal/service/datapipeline/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -742,7 +742,7 @@ rules: message: Do not use "DataPipeline" in const name inside datapipeline package paths: include: - - internal/service/datapipeline + - "/internal/service/datapipeline" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -756,7 +756,7 @@ rules: message: Do not use "DataPipeline" in var name inside datapipeline package paths: include: - - internal/service/datapipeline + - "/internal/service/datapipeline" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -770,9 +770,9 @@ rules: message: Do not use "DataSync" in func name inside datasync package paths: include: - - internal/service/datasync + - "/internal/service/datasync" exclude: - - internal/service/datasync/list_pages_gen.go + - "/internal/service/datasync/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -788,7 +788,7 @@ rules: message: Include "DataSync" in test name paths: include: - - internal/service/datasync/*_test.go + - "/internal/service/datasync/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -803,7 +803,7 @@ rules: message: Do not use "DataSync" in const name inside datasync package paths: include: - - internal/service/datasync + - "/internal/service/datasync" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -817,7 +817,7 @@ rules: message: Do not use "DataSync" in var name inside datasync package paths: include: - - internal/service/datasync + - "/internal/service/datasync" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -831,9 +831,9 @@ rules: message: Do not use "DataZone" in func name inside datazone package paths: include: - - internal/service/datazone + - "/internal/service/datazone" exclude: - - internal/service/datazone/list_pages_gen.go + - "/internal/service/datazone/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -849,7 +849,7 @@ rules: message: Include "DataZone" in test name paths: include: - - internal/service/datazone/*_test.go + - "/internal/service/datazone/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -864,7 +864,7 @@ rules: message: Do not use "DataZone" in const name inside datazone package paths: include: - - internal/service/datazone + - "/internal/service/datazone" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -878,7 +878,7 @@ rules: message: Do not use "DataZone" in var name inside datazone package paths: include: - - internal/service/datazone + - "/internal/service/datazone" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -892,9 +892,9 @@ rules: message: Do not use "DAX" in func name inside dax package paths: include: - - internal/service/dax + - "/internal/service/dax" exclude: - - internal/service/dax/list_pages_gen.go + - "/internal/service/dax/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -910,7 +910,7 @@ rules: message: Include "DAX" in test name paths: include: - - internal/service/dax/*_test.go + - "/internal/service/dax/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -925,7 +925,7 @@ rules: message: Do not use "DAX" in const name inside dax package paths: include: - - internal/service/dax + - "/internal/service/dax" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -939,7 +939,7 @@ rules: message: Do not use "DAX" in var name inside dax package paths: include: - - internal/service/dax + - "/internal/service/dax" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -953,9 +953,9 @@ rules: message: Do not use "Deploy" in func name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" exclude: - - internal/service/deploy/list_pages_gen.go + - "/internal/service/deploy/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -972,7 +972,7 @@ rules: message: Include "Deploy" in test name paths: include: - - internal/service/deploy/*_test.go + - "/internal/service/deploy/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -987,7 +987,7 @@ rules: message: Do not use "Deploy" in const name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1001,7 +1001,7 @@ rules: message: Do not use "Deploy" in var name inside deploy package paths: include: - - internal/service/deploy + - "/internal/service/deploy" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1015,9 +1015,9 @@ rules: message: Do not use "Detective" in func name inside detective package paths: include: - - internal/service/detective + - "/internal/service/detective" exclude: - - internal/service/detective/list_pages_gen.go + - "/internal/service/detective/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1033,7 +1033,7 @@ rules: message: Include "Detective" in test name paths: include: - - internal/service/detective/*_test.go + - "/internal/service/detective/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1048,7 +1048,7 @@ rules: message: Do not use "Detective" in const name inside detective package paths: include: - - internal/service/detective + - "/internal/service/detective" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1062,7 +1062,7 @@ rules: message: Do not use "Detective" in var name inside detective package paths: include: - - internal/service/detective + - "/internal/service/detective" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1076,9 +1076,9 @@ rules: message: Do not use "DeviceFarm" in func name inside devicefarm package paths: include: - - internal/service/devicefarm + - "/internal/service/devicefarm" exclude: - - internal/service/devicefarm/list_pages_gen.go + - "/internal/service/devicefarm/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1094,7 +1094,7 @@ rules: message: Include "DeviceFarm" in test name paths: include: - - internal/service/devicefarm/*_test.go + - "/internal/service/devicefarm/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1109,7 +1109,7 @@ rules: message: Do not use "DeviceFarm" in const name inside devicefarm package paths: include: - - internal/service/devicefarm + - "/internal/service/devicefarm" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1123,7 +1123,7 @@ rules: message: Do not use "DeviceFarm" in var name inside devicefarm package paths: include: - - internal/service/devicefarm + - "/internal/service/devicefarm" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1137,9 +1137,9 @@ rules: message: Do not use "DevOpsGuru" in func name inside devopsguru package paths: include: - - internal/service/devopsguru + - "/internal/service/devopsguru" exclude: - - internal/service/devopsguru/list_pages_gen.go + - "/internal/service/devopsguru/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1155,7 +1155,7 @@ rules: message: Include "DevOpsGuru" in test name paths: include: - - internal/service/devopsguru/*_test.go + - "/internal/service/devopsguru/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1170,7 +1170,7 @@ rules: message: Do not use "DevOpsGuru" in const name inside devopsguru package paths: include: - - internal/service/devopsguru + - "/internal/service/devopsguru" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1184,7 +1184,7 @@ rules: message: Do not use "DevOpsGuru" in var name inside devopsguru package paths: include: - - internal/service/devopsguru + - "/internal/service/devopsguru" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1198,9 +1198,9 @@ rules: message: Do not use "DirectConnect" in func name inside directconnect package paths: include: - - internal/service/directconnect + - "/internal/service/directconnect" exclude: - - internal/service/directconnect/list_pages_gen.go + - "/internal/service/directconnect/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1216,7 +1216,7 @@ rules: message: Include "DirectConnect" in test name paths: include: - - internal/service/directconnect/*_test.go + - "/internal/service/directconnect/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1231,7 +1231,7 @@ rules: message: Do not use "DirectConnect" in const name inside directconnect package paths: include: - - internal/service/directconnect + - "/internal/service/directconnect" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1245,7 +1245,7 @@ rules: message: Do not use "DirectConnect" in var name inside directconnect package paths: include: - - internal/service/directconnect + - "/internal/service/directconnect" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1259,9 +1259,9 @@ rules: message: Do not use "directoryservice" in func name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" exclude: - - internal/service/ds/list_pages_gen.go + - "/internal/service/ds/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1277,7 +1277,7 @@ rules: message: Do not use "directoryservice" in const name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1291,7 +1291,7 @@ rules: message: Do not use "directoryservice" in var name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1305,9 +1305,9 @@ rules: message: Do not use "DLM" in func name inside dlm package paths: include: - - internal/service/dlm + - "/internal/service/dlm" exclude: - - internal/service/dlm/list_pages_gen.go + - "/internal/service/dlm/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1323,7 +1323,7 @@ rules: message: Include "DLM" in test name paths: include: - - internal/service/dlm/*_test.go + - "/internal/service/dlm/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1338,7 +1338,7 @@ rules: message: Do not use "DLM" in const name inside dlm package paths: include: - - internal/service/dlm + - "/internal/service/dlm" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1352,7 +1352,7 @@ rules: message: Do not use "DLM" in var name inside dlm package paths: include: - - internal/service/dlm + - "/internal/service/dlm" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1366,9 +1366,9 @@ rules: message: Do not use "DMS" in func name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" exclude: - - internal/service/dms/list_pages_gen.go + - "/internal/service/dms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1384,7 +1384,7 @@ rules: message: Include "DMS" in test name paths: include: - - internal/service/dms/*_test.go + - "/internal/service/dms/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1399,7 +1399,7 @@ rules: message: Do not use "DMS" in const name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1413,7 +1413,7 @@ rules: message: Do not use "DMS" in var name inside dms package paths: include: - - internal/service/dms + - "/internal/service/dms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1427,9 +1427,9 @@ rules: message: Do not use "DocDB" in func name inside docdb package paths: include: - - internal/service/docdb + - "/internal/service/docdb" exclude: - - internal/service/docdb/list_pages_gen.go + - "/internal/service/docdb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1445,7 +1445,7 @@ rules: message: Include "DocDB" in test name paths: include: - - internal/service/docdb/*_test.go + - "/internal/service/docdb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1460,7 +1460,7 @@ rules: message: Do not use "DocDB" in const name inside docdb package paths: include: - - internal/service/docdb + - "/internal/service/docdb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1474,7 +1474,7 @@ rules: message: Do not use "DocDB" in var name inside docdb package paths: include: - - internal/service/docdb + - "/internal/service/docdb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1488,9 +1488,9 @@ rules: message: Do not use "DocDBElastic" in func name inside docdbelastic package paths: include: - - internal/service/docdbelastic + - "/internal/service/docdbelastic" exclude: - - internal/service/docdbelastic/list_pages_gen.go + - "/internal/service/docdbelastic/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1506,7 +1506,7 @@ rules: message: Include "DocDBElastic" in test name paths: include: - - internal/service/docdbelastic/*_test.go + - "/internal/service/docdbelastic/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1521,7 +1521,7 @@ rules: message: Do not use "DocDBElastic" in const name inside docdbelastic package paths: include: - - internal/service/docdbelastic + - "/internal/service/docdbelastic" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1535,7 +1535,7 @@ rules: message: Do not use "DocDBElastic" in var name inside docdbelastic package paths: include: - - internal/service/docdbelastic + - "/internal/service/docdbelastic" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1549,9 +1549,9 @@ rules: message: Do not use "DRS" in func name inside drs package paths: include: - - internal/service/drs + - "/internal/service/drs" exclude: - - internal/service/drs/list_pages_gen.go + - "/internal/service/drs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1567,7 +1567,7 @@ rules: message: Include "DRS" in test name paths: include: - - internal/service/drs/*_test.go + - "/internal/service/drs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1582,7 +1582,7 @@ rules: message: Do not use "DRS" in const name inside drs package paths: include: - - internal/service/drs + - "/internal/service/drs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1596,7 +1596,7 @@ rules: message: Do not use "DRS" in var name inside drs package paths: include: - - internal/service/drs + - "/internal/service/drs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1610,9 +1610,9 @@ rules: message: Do not use "DS" in func name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" exclude: - - internal/service/ds/list_pages_gen.go + - "/internal/service/ds/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1628,7 +1628,7 @@ rules: message: Include "DS" in test name paths: include: - - internal/service/ds/*_test.go + - "/internal/service/ds/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1643,7 +1643,7 @@ rules: message: Do not use "DS" in const name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1657,7 +1657,7 @@ rules: message: Do not use "DS" in var name inside ds package paths: include: - - internal/service/ds + - "/internal/service/ds" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1671,9 +1671,9 @@ rules: message: Do not use "DSQL" in func name inside dsql package paths: include: - - internal/service/dsql + - "/internal/service/dsql" exclude: - - internal/service/dsql/list_pages_gen.go + - "/internal/service/dsql/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1689,7 +1689,7 @@ rules: message: Include "DSQL" in test name paths: include: - - internal/service/dsql/*_test.go + - "/internal/service/dsql/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1704,7 +1704,7 @@ rules: message: Do not use "DSQL" in const name inside dsql package paths: include: - - internal/service/dsql + - "/internal/service/dsql" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1718,7 +1718,7 @@ rules: message: Do not use "DSQL" in var name inside dsql package paths: include: - - internal/service/dsql + - "/internal/service/dsql" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1732,9 +1732,9 @@ rules: message: Do not use "DynamoDB" in func name inside dynamodb package paths: include: - - internal/service/dynamodb + - "/internal/service/dynamodb" exclude: - - internal/service/dynamodb/list_pages_gen.go + - "/internal/service/dynamodb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1750,7 +1750,7 @@ rules: message: Include "DynamoDB" in test name paths: include: - - internal/service/dynamodb/*_test.go + - "/internal/service/dynamodb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1765,7 +1765,7 @@ rules: message: Do not use "DynamoDB" in const name inside dynamodb package paths: include: - - internal/service/dynamodb + - "/internal/service/dynamodb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1779,7 +1779,7 @@ rules: message: Do not use "DynamoDB" in var name inside dynamodb package paths: include: - - internal/service/dynamodb + - "/internal/service/dynamodb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1793,7 +1793,7 @@ rules: message: Include "EC2" in test name paths: include: - - internal/service/ec2/ec2_*_test.go + - "/internal/service/ec2/ec2_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1808,7 +1808,7 @@ rules: message: Include "EC2EBS" in test name paths: include: - - internal/service/ec2/ebs_*_test.go + - "/internal/service/ec2/ebs_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1823,7 +1823,7 @@ rules: message: Include "EC2Outposts" in test name paths: include: - - internal/service/ec2/outposts_*_test.go + - "/internal/service/ec2/outposts_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1838,9 +1838,9 @@ rules: message: Do not use "ECR" in func name inside ecr package paths: include: - - internal/service/ecr + - "/internal/service/ecr" exclude: - - internal/service/ecr/list_pages_gen.go + - "/internal/service/ecr/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1857,7 +1857,7 @@ rules: message: Include "ECR" in test name paths: include: - - internal/service/ecr/*_test.go + - "/internal/service/ecr/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1872,7 +1872,7 @@ rules: message: Do not use "ECR" in const name inside ecr package paths: include: - - internal/service/ecr + - "/internal/service/ecr" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1886,7 +1886,7 @@ rules: message: Do not use "ECR" in var name inside ecr package paths: include: - - internal/service/ecr + - "/internal/service/ecr" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1900,9 +1900,9 @@ rules: message: Do not use "ECRPublic" in func name inside ecrpublic package paths: include: - - internal/service/ecrpublic + - "/internal/service/ecrpublic" exclude: - - internal/service/ecrpublic/list_pages_gen.go + - "/internal/service/ecrpublic/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1918,7 +1918,7 @@ rules: message: Include "ECRPublic" in test name paths: include: - - internal/service/ecrpublic/*_test.go + - "/internal/service/ecrpublic/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1933,7 +1933,7 @@ rules: message: Do not use "ECRPublic" in const name inside ecrpublic package paths: include: - - internal/service/ecrpublic + - "/internal/service/ecrpublic" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1947,7 +1947,7 @@ rules: message: Do not use "ECRPublic" in var name inside ecrpublic package paths: include: - - internal/service/ecrpublic + - "/internal/service/ecrpublic" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1961,9 +1961,9 @@ rules: message: Do not use "ECS" in func name inside ecs package paths: include: - - internal/service/ecs + - "/internal/service/ecs" exclude: - - internal/service/ecs/list_pages_gen.go + - "/internal/service/ecs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1979,7 +1979,7 @@ rules: message: Include "ECS" in test name paths: include: - - internal/service/ecs/*_test.go + - "/internal/service/ecs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1994,7 +1994,7 @@ rules: message: Do not use "ECS" in const name inside ecs package paths: include: - - internal/service/ecs + - "/internal/service/ecs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2008,7 +2008,7 @@ rules: message: Do not use "ECS" in var name inside ecs package paths: include: - - internal/service/ecs + - "/internal/service/ecs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2022,9 +2022,9 @@ rules: message: Do not use "EFS" in func name inside efs package paths: include: - - internal/service/efs + - "/internal/service/efs" exclude: - - internal/service/efs/list_pages_gen.go + - "/internal/service/efs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2040,7 +2040,7 @@ rules: message: Include "EFS" in test name paths: include: - - internal/service/efs/*_test.go + - "/internal/service/efs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2055,7 +2055,7 @@ rules: message: Do not use "EFS" in const name inside efs package paths: include: - - internal/service/efs + - "/internal/service/efs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2069,7 +2069,7 @@ rules: message: Do not use "EFS" in var name inside efs package paths: include: - - internal/service/efs + - "/internal/service/efs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2083,9 +2083,9 @@ rules: message: Do not use "EKS" in func name inside eks package paths: include: - - internal/service/eks + - "/internal/service/eks" exclude: - - internal/service/eks/list_pages_gen.go + - "/internal/service/eks/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2101,7 +2101,7 @@ rules: message: Include "EKS" in test name paths: include: - - internal/service/eks/*_test.go + - "/internal/service/eks/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2116,7 +2116,7 @@ rules: message: Do not use "EKS" in const name inside eks package paths: include: - - internal/service/eks + - "/internal/service/eks" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2130,7 +2130,7 @@ rules: message: Do not use "EKS" in var name inside eks package paths: include: - - internal/service/eks + - "/internal/service/eks" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2144,9 +2144,9 @@ rules: message: Do not use "ElastiCache" in func name inside elasticache package paths: include: - - internal/service/elasticache + - "/internal/service/elasticache" exclude: - - internal/service/elasticache/list_pages_gen.go + - "/internal/service/elasticache/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2162,7 +2162,7 @@ rules: message: Include "ElastiCache" in test name paths: include: - - internal/service/elasticache/*_test.go + - "/internal/service/elasticache/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2177,7 +2177,7 @@ rules: message: Do not use "ElastiCache" in const name inside elasticache package paths: include: - - internal/service/elasticache + - "/internal/service/elasticache" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2191,7 +2191,7 @@ rules: message: Do not use "ElastiCache" in var name inside elasticache package paths: include: - - internal/service/elasticache + - "/internal/service/elasticache" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2205,9 +2205,9 @@ rules: message: Do not use "ElasticBeanstalk" in func name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" exclude: - - internal/service/elasticbeanstalk/list_pages_gen.go + - "/internal/service/elasticbeanstalk/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2223,7 +2223,7 @@ rules: message: Include "ElasticBeanstalk" in test name paths: include: - - internal/service/elasticbeanstalk/*_test.go + - "/internal/service/elasticbeanstalk/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2238,7 +2238,7 @@ rules: message: Do not use "ElasticBeanstalk" in const name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2252,7 +2252,7 @@ rules: message: Do not use "ElasticBeanstalk" in var name inside elasticbeanstalk package paths: include: - - internal/service/elasticbeanstalk + - "/internal/service/elasticbeanstalk" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2266,9 +2266,9 @@ rules: message: Do not use "elasticloadbalancing" in func name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" exclude: - - internal/service/elb/list_pages_gen.go + - "/internal/service/elb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2284,7 +2284,7 @@ rules: message: Do not use "elasticloadbalancing" in const name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2298,7 +2298,7 @@ rules: message: Do not use "elasticloadbalancing" in var name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2312,9 +2312,9 @@ rules: message: Do not use "elasticloadbalancingv2" in func name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" exclude: - - internal/service/elbv2/list_pages_gen.go + - "/internal/service/elbv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2330,7 +2330,7 @@ rules: message: Do not use "elasticloadbalancingv2" in const name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2344,7 +2344,7 @@ rules: message: Do not use "elasticloadbalancingv2" in var name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2358,9 +2358,9 @@ rules: message: Do not use "Elasticsearch" in func name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" exclude: - - internal/service/elasticsearch/list_pages_gen.go + - "/internal/service/elasticsearch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2376,7 +2376,7 @@ rules: message: Include "Elasticsearch" in test name paths: include: - - internal/service/elasticsearch/*_test.go + - "/internal/service/elasticsearch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2391,7 +2391,7 @@ rules: message: Do not use "Elasticsearch" in const name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2405,7 +2405,7 @@ rules: message: Do not use "Elasticsearch" in var name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2419,9 +2419,9 @@ rules: message: Do not use "elasticsearchservice" in func name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" exclude: - - internal/service/elasticsearch/list_pages_gen.go + - "/internal/service/elasticsearch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2437,7 +2437,7 @@ rules: message: Do not use "elasticsearchservice" in const name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2451,7 +2451,7 @@ rules: message: Do not use "elasticsearchservice" in var name inside elasticsearch package paths: include: - - internal/service/elasticsearch + - "/internal/service/elasticsearch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2465,9 +2465,9 @@ rules: message: Do not use "ElasticTranscoder" in func name inside elastictranscoder package paths: include: - - internal/service/elastictranscoder + - "/internal/service/elastictranscoder" exclude: - - internal/service/elastictranscoder/list_pages_gen.go + - "/internal/service/elastictranscoder/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2483,7 +2483,7 @@ rules: message: Include "ElasticTranscoder" in test name paths: include: - - internal/service/elastictranscoder/*_test.go + - "/internal/service/elastictranscoder/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2498,7 +2498,7 @@ rules: message: Do not use "ElasticTranscoder" in const name inside elastictranscoder package paths: include: - - internal/service/elastictranscoder + - "/internal/service/elastictranscoder" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2512,7 +2512,7 @@ rules: message: Do not use "ElasticTranscoder" in var name inside elastictranscoder package paths: include: - - internal/service/elastictranscoder + - "/internal/service/elastictranscoder" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2526,9 +2526,9 @@ rules: message: Do not use "ELB" in func name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" exclude: - - internal/service/elb/list_pages_gen.go + - "/internal/service/elb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2544,7 +2544,7 @@ rules: message: Include "ELB" in test name paths: include: - - internal/service/elb/*_test.go + - "/internal/service/elb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2559,7 +2559,7 @@ rules: message: Do not use "ELB" in const name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2573,7 +2573,7 @@ rules: message: Do not use "ELB" in var name inside elb package paths: include: - - internal/service/elb + - "/internal/service/elb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2587,9 +2587,9 @@ rules: message: Do not use "ELBV2" in func name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" exclude: - - internal/service/elbv2/list_pages_gen.go + - "/internal/service/elbv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2605,7 +2605,7 @@ rules: message: Include "ELBV2" in test name paths: include: - - internal/service/elbv2/*_test.go + - "/internal/service/elbv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2620,7 +2620,7 @@ rules: message: Do not use "ELBV2" in const name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2634,7 +2634,7 @@ rules: message: Do not use "ELBV2" in var name inside elbv2 package paths: include: - - internal/service/elbv2 + - "/internal/service/elbv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2648,9 +2648,9 @@ rules: message: Do not use "EMR" in func name inside emr package paths: include: - - internal/service/emr + - "/internal/service/emr" exclude: - - internal/service/emr/list_pages_gen.go + - "/internal/service/emr/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2666,7 +2666,7 @@ rules: message: Include "EMR" in test name paths: include: - - internal/service/emr/*_test.go + - "/internal/service/emr/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2681,7 +2681,7 @@ rules: message: Do not use "EMR" in const name inside emr package paths: include: - - internal/service/emr + - "/internal/service/emr" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2695,7 +2695,7 @@ rules: message: Do not use "EMR" in var name inside emr package paths: include: - - internal/service/emr + - "/internal/service/emr" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2709,9 +2709,9 @@ rules: message: Do not use "EMRContainers" in func name inside emrcontainers package paths: include: - - internal/service/emrcontainers + - "/internal/service/emrcontainers" exclude: - - internal/service/emrcontainers/list_pages_gen.go + - "/internal/service/emrcontainers/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2727,7 +2727,7 @@ rules: message: Include "EMRContainers" in test name paths: include: - - internal/service/emrcontainers/*_test.go + - "/internal/service/emrcontainers/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2742,7 +2742,7 @@ rules: message: Do not use "EMRContainers" in const name inside emrcontainers package paths: include: - - internal/service/emrcontainers + - "/internal/service/emrcontainers" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2756,7 +2756,7 @@ rules: message: Do not use "EMRContainers" in var name inside emrcontainers package paths: include: - - internal/service/emrcontainers + - "/internal/service/emrcontainers" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2770,9 +2770,9 @@ rules: message: Do not use "EMRServerless" in func name inside emrserverless package paths: include: - - internal/service/emrserverless + - "/internal/service/emrserverless" exclude: - - internal/service/emrserverless/list_pages_gen.go + - "/internal/service/emrserverless/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2788,7 +2788,7 @@ rules: message: Include "EMRServerless" in test name paths: include: - - internal/service/emrserverless/*_test.go + - "/internal/service/emrserverless/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2803,7 +2803,7 @@ rules: message: Do not use "EMRServerless" in const name inside emrserverless package paths: include: - - internal/service/emrserverless + - "/internal/service/emrserverless" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2817,7 +2817,7 @@ rules: message: Do not use "EMRServerless" in var name inside emrserverless package paths: include: - - internal/service/emrserverless + - "/internal/service/emrserverless" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2831,9 +2831,9 @@ rules: message: Do not use "eventbridge" in func name inside events package paths: include: - - internal/service/events + - "/internal/service/events" exclude: - - internal/service/events/list_pages_gen.go + - "/internal/service/events/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2849,7 +2849,7 @@ rules: message: Do not use "eventbridge" in const name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2863,7 +2863,7 @@ rules: message: Do not use "eventbridge" in var name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2877,9 +2877,9 @@ rules: message: Do not use "Events" in func name inside events package paths: include: - - internal/service/events + - "/internal/service/events" exclude: - - internal/service/events/list_pages_gen.go + - "/internal/service/events/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2895,7 +2895,7 @@ rules: message: Include "Events" in test name paths: include: - - internal/service/events/*_test.go + - "/internal/service/events/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2910,7 +2910,7 @@ rules: message: Do not use "Events" in const name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2924,7 +2924,7 @@ rules: message: Do not use "Events" in var name inside events package paths: include: - - internal/service/events + - "/internal/service/events" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2938,9 +2938,9 @@ rules: message: Do not use "Evidently" in func name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" exclude: - - internal/service/evidently/list_pages_gen.go + - "/internal/service/evidently/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2956,7 +2956,7 @@ rules: message: Include "Evidently" in test name paths: include: - - internal/service/evidently/*_test.go + - "/internal/service/evidently/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2971,7 +2971,7 @@ rules: message: Do not use "Evidently" in const name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2985,7 +2985,7 @@ rules: message: Do not use "Evidently" in var name inside evidently package paths: include: - - internal/service/evidently + - "/internal/service/evidently" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2999,9 +2999,9 @@ rules: message: Do not use "EVS" in func name inside evs package paths: include: - - internal/service/evs + - "/internal/service/evs" exclude: - - internal/service/evs/list_pages_gen.go + - "/internal/service/evs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3017,7 +3017,7 @@ rules: message: Include "EVS" in test name paths: include: - - internal/service/evs/*_test.go + - "/internal/service/evs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3032,7 +3032,7 @@ rules: message: Do not use "EVS" in const name inside evs package paths: include: - - internal/service/evs + - "/internal/service/evs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3046,7 +3046,7 @@ rules: message: Do not use "EVS" in var name inside evs package paths: include: - - internal/service/evs + - "/internal/service/evs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3060,9 +3060,9 @@ rules: message: Do not use "FinSpace" in func name inside finspace package paths: include: - - internal/service/finspace + - "/internal/service/finspace" exclude: - - internal/service/finspace/list_pages_gen.go + - "/internal/service/finspace/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3078,7 +3078,7 @@ rules: message: Include "FinSpace" in test name paths: include: - - internal/service/finspace/*_test.go + - "/internal/service/finspace/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3093,7 +3093,7 @@ rules: message: Do not use "FinSpace" in const name inside finspace package paths: include: - - internal/service/finspace + - "/internal/service/finspace" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3107,7 +3107,7 @@ rules: message: Do not use "FinSpace" in var name inside finspace package paths: include: - - internal/service/finspace + - "/internal/service/finspace" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3121,9 +3121,9 @@ rules: message: Do not use "Firehose" in func name inside firehose package paths: include: - - internal/service/firehose + - "/internal/service/firehose" exclude: - - internal/service/firehose/list_pages_gen.go + - "/internal/service/firehose/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3139,7 +3139,7 @@ rules: message: Include "Firehose" in test name paths: include: - - internal/service/firehose/*_test.go + - "/internal/service/firehose/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3154,7 +3154,7 @@ rules: message: Do not use "Firehose" in const name inside firehose package paths: include: - - internal/service/firehose + - "/internal/service/firehose" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3168,7 +3168,7 @@ rules: message: Do not use "Firehose" in var name inside firehose package paths: include: - - internal/service/firehose + - "/internal/service/firehose" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3182,9 +3182,9 @@ rules: message: Do not use "FIS" in func name inside fis package paths: include: - - internal/service/fis + - "/internal/service/fis" exclude: - - internal/service/fis/list_pages_gen.go + - "/internal/service/fis/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3200,7 +3200,7 @@ rules: message: Include "FIS" in test name paths: include: - - internal/service/fis/*_test.go + - "/internal/service/fis/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3215,7 +3215,7 @@ rules: message: Do not use "FIS" in const name inside fis package paths: include: - - internal/service/fis + - "/internal/service/fis" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3229,7 +3229,7 @@ rules: message: Do not use "FIS" in var name inside fis package paths: include: - - internal/service/fis + - "/internal/service/fis" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3243,9 +3243,9 @@ rules: message: Do not use "FMS" in func name inside fms package paths: include: - - internal/service/fms + - "/internal/service/fms" exclude: - - internal/service/fms/list_pages_gen.go + - "/internal/service/fms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3261,7 +3261,7 @@ rules: message: Include "FMS" in test name paths: include: - - internal/service/fms/*_test.go + - "/internal/service/fms/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3276,7 +3276,7 @@ rules: message: Do not use "FMS" in const name inside fms package paths: include: - - internal/service/fms + - "/internal/service/fms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3290,7 +3290,7 @@ rules: message: Do not use "FMS" in var name inside fms package paths: include: - - internal/service/fms + - "/internal/service/fms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3304,9 +3304,9 @@ rules: message: Do not use "FSx" in func name inside fsx package paths: include: - - internal/service/fsx + - "/internal/service/fsx" exclude: - - internal/service/fsx/list_pages_gen.go + - "/internal/service/fsx/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3322,7 +3322,7 @@ rules: message: Include "FSx" in test name paths: include: - - internal/service/fsx/*_test.go + - "/internal/service/fsx/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3337,7 +3337,7 @@ rules: message: Do not use "FSx" in const name inside fsx package paths: include: - - internal/service/fsx + - "/internal/service/fsx" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3351,7 +3351,7 @@ rules: message: Do not use "FSx" in var name inside fsx package paths: include: - - internal/service/fsx + - "/internal/service/fsx" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3365,9 +3365,9 @@ rules: message: Do not use "GameLift" in func name inside gamelift package paths: include: - - internal/service/gamelift + - "/internal/service/gamelift" exclude: - - internal/service/gamelift/list_pages_gen.go + - "/internal/service/gamelift/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3383,7 +3383,7 @@ rules: message: Include "GameLift" in test name paths: include: - - internal/service/gamelift/*_test.go + - "/internal/service/gamelift/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3398,7 +3398,7 @@ rules: message: Do not use "GameLift" in const name inside gamelift package paths: include: - - internal/service/gamelift + - "/internal/service/gamelift" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3412,7 +3412,7 @@ rules: message: Do not use "GameLift" in var name inside gamelift package paths: include: - - internal/service/gamelift + - "/internal/service/gamelift" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3426,9 +3426,9 @@ rules: message: Do not use "Glacier" in func name inside glacier package paths: include: - - internal/service/glacier + - "/internal/service/glacier" exclude: - - internal/service/glacier/list_pages_gen.go + - "/internal/service/glacier/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3444,7 +3444,7 @@ rules: message: Include "Glacier" in test name paths: include: - - internal/service/glacier/*_test.go + - "/internal/service/glacier/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3459,7 +3459,7 @@ rules: message: Do not use "Glacier" in const name inside glacier package paths: include: - - internal/service/glacier + - "/internal/service/glacier" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3473,7 +3473,7 @@ rules: message: Do not use "Glacier" in var name inside glacier package paths: include: - - internal/service/glacier + - "/internal/service/glacier" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3487,9 +3487,9 @@ rules: message: Do not use "GlobalAccelerator" in func name inside globalaccelerator package paths: include: - - internal/service/globalaccelerator + - "/internal/service/globalaccelerator" exclude: - - internal/service/globalaccelerator/list_pages_gen.go + - "/internal/service/globalaccelerator/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3505,7 +3505,7 @@ rules: message: Include "GlobalAccelerator" in test name paths: include: - - internal/service/globalaccelerator/*_test.go + - "/internal/service/globalaccelerator/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3520,7 +3520,7 @@ rules: message: Do not use "GlobalAccelerator" in const name inside globalaccelerator package paths: include: - - internal/service/globalaccelerator + - "/internal/service/globalaccelerator" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3534,7 +3534,7 @@ rules: message: Do not use "GlobalAccelerator" in var name inside globalaccelerator package paths: include: - - internal/service/globalaccelerator + - "/internal/service/globalaccelerator" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3548,9 +3548,9 @@ rules: message: Do not use "Glue" in func name inside glue package paths: include: - - internal/service/glue + - "/internal/service/glue" exclude: - - internal/service/glue/list_pages_gen.go + - "/internal/service/glue/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3566,7 +3566,7 @@ rules: message: Include "Glue" in test name paths: include: - - internal/service/glue/*_test.go + - "/internal/service/glue/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3581,7 +3581,7 @@ rules: message: Do not use "Glue" in const name inside glue package paths: include: - - internal/service/glue + - "/internal/service/glue" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3595,7 +3595,7 @@ rules: message: Do not use "Glue" in var name inside glue package paths: include: - - internal/service/glue + - "/internal/service/glue" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3609,9 +3609,9 @@ rules: message: Do not use "gluedatabrew" in func name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" exclude: - - internal/service/databrew/list_pages_gen.go + - "/internal/service/databrew/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3627,7 +3627,7 @@ rules: message: Do not use "gluedatabrew" in const name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3641,7 +3641,7 @@ rules: message: Do not use "gluedatabrew" in var name inside databrew package paths: include: - - internal/service/databrew + - "/internal/service/databrew" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3655,9 +3655,9 @@ rules: message: Do not use "Grafana" in func name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" exclude: - - internal/service/grafana/list_pages_gen.go + - "/internal/service/grafana/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3673,7 +3673,7 @@ rules: message: Include "Grafana" in test name paths: include: - - internal/service/grafana/*_test.go + - "/internal/service/grafana/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3688,7 +3688,7 @@ rules: message: Do not use "Grafana" in const name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3702,7 +3702,7 @@ rules: message: Do not use "Grafana" in var name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3716,9 +3716,9 @@ rules: message: Do not use "Greengrass" in func name inside greengrass package paths: include: - - internal/service/greengrass + - "/internal/service/greengrass" exclude: - - internal/service/greengrass/list_pages_gen.go + - "/internal/service/greengrass/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3734,7 +3734,7 @@ rules: message: Include "Greengrass" in test name paths: include: - - internal/service/greengrass/*_test.go + - "/internal/service/greengrass/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3749,7 +3749,7 @@ rules: message: Do not use "Greengrass" in const name inside greengrass package paths: include: - - internal/service/greengrass + - "/internal/service/greengrass" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3763,7 +3763,7 @@ rules: message: Do not use "Greengrass" in var name inside greengrass package paths: include: - - internal/service/greengrass + - "/internal/service/greengrass" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3777,9 +3777,9 @@ rules: message: Do not use "GroundStation" in func name inside groundstation package paths: include: - - internal/service/groundstation + - "/internal/service/groundstation" exclude: - - internal/service/groundstation/list_pages_gen.go + - "/internal/service/groundstation/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3795,7 +3795,7 @@ rules: message: Include "GroundStation" in test name paths: include: - - internal/service/groundstation/*_test.go + - "/internal/service/groundstation/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3810,7 +3810,7 @@ rules: message: Do not use "GroundStation" in const name inside groundstation package paths: include: - - internal/service/groundstation + - "/internal/service/groundstation" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3824,7 +3824,7 @@ rules: message: Do not use "GroundStation" in var name inside groundstation package paths: include: - - internal/service/groundstation + - "/internal/service/groundstation" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3838,9 +3838,9 @@ rules: message: Do not use "GuardDuty" in func name inside guardduty package paths: include: - - internal/service/guardduty + - "/internal/service/guardduty" exclude: - - internal/service/guardduty/list_pages_gen.go + - "/internal/service/guardduty/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3856,7 +3856,7 @@ rules: message: Include "GuardDuty" in test name paths: include: - - internal/service/guardduty/*_test.go + - "/internal/service/guardduty/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3871,7 +3871,7 @@ rules: message: Do not use "GuardDuty" in const name inside guardduty package paths: include: - - internal/service/guardduty + - "/internal/service/guardduty" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3885,7 +3885,7 @@ rules: message: Do not use "GuardDuty" in var name inside guardduty package paths: include: - - internal/service/guardduty + - "/internal/service/guardduty" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3899,9 +3899,9 @@ rules: message: Do not use "HealthLake" in func name inside healthlake package paths: include: - - internal/service/healthlake + - "/internal/service/healthlake" exclude: - - internal/service/healthlake/list_pages_gen.go + - "/internal/service/healthlake/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3917,7 +3917,7 @@ rules: message: Include "HealthLake" in test name paths: include: - - internal/service/healthlake/*_test.go + - "/internal/service/healthlake/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3932,7 +3932,7 @@ rules: message: Do not use "HealthLake" in const name inside healthlake package paths: include: - - internal/service/healthlake + - "/internal/service/healthlake" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3946,7 +3946,7 @@ rules: message: Do not use "HealthLake" in var name inside healthlake package paths: include: - - internal/service/healthlake + - "/internal/service/healthlake" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3960,9 +3960,9 @@ rules: message: Do not use "IAM" in func name inside iam package paths: include: - - internal/service/iam + - "/internal/service/iam" exclude: - - internal/service/iam/list_pages_gen.go + - "/internal/service/iam/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3978,7 +3978,7 @@ rules: message: Include "IAM" in test name paths: include: - - internal/service/iam/*_test.go + - "/internal/service/iam/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3993,7 +3993,7 @@ rules: message: Do not use "IAM" in const name inside iam package paths: include: - - internal/service/iam + - "/internal/service/iam" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4007,7 +4007,7 @@ rules: message: Do not use "IAM" in var name inside iam package paths: include: - - internal/service/iam + - "/internal/service/iam" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4021,9 +4021,9 @@ rules: message: Do not use "IdentityStore" in func name inside identitystore package paths: include: - - internal/service/identitystore + - "/internal/service/identitystore" exclude: - - internal/service/identitystore/list_pages_gen.go + - "/internal/service/identitystore/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4039,7 +4039,7 @@ rules: message: Include "IdentityStore" in test name paths: include: - - internal/service/identitystore/*_test.go + - "/internal/service/identitystore/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4054,7 +4054,7 @@ rules: message: Do not use "IdentityStore" in const name inside identitystore package paths: include: - - internal/service/identitystore + - "/internal/service/identitystore" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4068,7 +4068,7 @@ rules: message: Do not use "IdentityStore" in var name inside identitystore package paths: include: - - internal/service/identitystore + - "/internal/service/identitystore" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4082,9 +4082,9 @@ rules: message: Do not use "ImageBuilder" in func name inside imagebuilder package paths: include: - - internal/service/imagebuilder + - "/internal/service/imagebuilder" exclude: - - internal/service/imagebuilder/list_pages_gen.go + - "/internal/service/imagebuilder/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4100,7 +4100,7 @@ rules: message: Include "ImageBuilder" in test name paths: include: - - internal/service/imagebuilder/*_test.go + - "/internal/service/imagebuilder/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4115,7 +4115,7 @@ rules: message: Do not use "ImageBuilder" in const name inside imagebuilder package paths: include: - - internal/service/imagebuilder + - "/internal/service/imagebuilder" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4129,7 +4129,7 @@ rules: message: Do not use "ImageBuilder" in var name inside imagebuilder package paths: include: - - internal/service/imagebuilder + - "/internal/service/imagebuilder" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4143,9 +4143,9 @@ rules: message: Do not use "Inspector" in func name inside inspector package paths: include: - - internal/service/inspector + - "/internal/service/inspector" exclude: - - internal/service/inspector/list_pages_gen.go + - "/internal/service/inspector/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4161,7 +4161,7 @@ rules: message: Include "Inspector" in test name paths: include: - - internal/service/inspector/*_test.go + - "/internal/service/inspector/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4176,7 +4176,7 @@ rules: message: Do not use "Inspector" in const name inside inspector package paths: include: - - internal/service/inspector + - "/internal/service/inspector" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4190,7 +4190,7 @@ rules: message: Do not use "Inspector" in var name inside inspector package paths: include: - - internal/service/inspector + - "/internal/service/inspector" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4204,9 +4204,9 @@ rules: message: Do not use "Inspector2" in func name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" exclude: - - internal/service/inspector2/list_pages_gen.go + - "/internal/service/inspector2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4222,7 +4222,7 @@ rules: message: Include "Inspector2" in test name paths: include: - - internal/service/inspector2/*_test.go + - "/internal/service/inspector2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4237,7 +4237,7 @@ rules: message: Do not use "Inspector2" in const name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4251,7 +4251,7 @@ rules: message: Do not use "Inspector2" in var name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4265,9 +4265,9 @@ rules: message: Do not use "inspectorv2" in func name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" exclude: - - internal/service/inspector2/list_pages_gen.go + - "/internal/service/inspector2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4283,7 +4283,7 @@ rules: message: Do not use "inspectorv2" in const name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4297,7 +4297,7 @@ rules: message: Do not use "inspectorv2" in var name inside inspector2 package paths: include: - - internal/service/inspector2 + - "/internal/service/inspector2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4311,9 +4311,9 @@ rules: message: Do not use "InternetMonitor" in func name inside internetmonitor package paths: include: - - internal/service/internetmonitor + - "/internal/service/internetmonitor" exclude: - - internal/service/internetmonitor/list_pages_gen.go + - "/internal/service/internetmonitor/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4329,7 +4329,7 @@ rules: message: Include "InternetMonitor" in test name paths: include: - - internal/service/internetmonitor/*_test.go + - "/internal/service/internetmonitor/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4344,7 +4344,7 @@ rules: message: Do not use "InternetMonitor" in const name inside internetmonitor package paths: include: - - internal/service/internetmonitor + - "/internal/service/internetmonitor" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4358,7 +4358,7 @@ rules: message: Do not use "InternetMonitor" in var name inside internetmonitor package paths: include: - - internal/service/internetmonitor + - "/internal/service/internetmonitor" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4372,9 +4372,9 @@ rules: message: Do not use "Invoicing" in func name inside invoicing package paths: include: - - internal/service/invoicing + - "/internal/service/invoicing" exclude: - - internal/service/invoicing/list_pages_gen.go + - "/internal/service/invoicing/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4390,7 +4390,7 @@ rules: message: Include "Invoicing" in test name paths: include: - - internal/service/invoicing/*_test.go + - "/internal/service/invoicing/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4405,7 +4405,7 @@ rules: message: Do not use "Invoicing" in const name inside invoicing package paths: include: - - internal/service/invoicing + - "/internal/service/invoicing" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4419,7 +4419,7 @@ rules: message: Do not use "Invoicing" in var name inside invoicing package paths: include: - - internal/service/invoicing + - "/internal/service/invoicing" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4433,9 +4433,9 @@ rules: message: Do not use "IoT" in func name inside iot package paths: include: - - internal/service/iot + - "/internal/service/iot" exclude: - - internal/service/iot/list_pages_gen.go + - "/internal/service/iot/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml index b6c3c421b5f8..5819dadca7e8 100644 --- a/.ci/.semgrep-service-name2.yml +++ b/.ci/.semgrep-service-name2.yml @@ -6,7 +6,7 @@ rules: message: Include "IoT" in test name paths: include: - - internal/service/iot/*_test.go + - "/internal/service/iot/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -21,7 +21,7 @@ rules: message: Do not use "IoT" in const name inside iot package paths: include: - - internal/service/iot + - "/internal/service/iot" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -35,7 +35,7 @@ rules: message: Do not use "IoT" in var name inside iot package paths: include: - - internal/service/iot + - "/internal/service/iot" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -49,7 +49,7 @@ rules: message: Include "IPAM" in test name paths: include: - - internal/service/ec2/ipam_*_test.go + - "/internal/service/ec2/ipam_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -64,9 +64,9 @@ rules: message: Do not use "IVS" in func name inside ivs package paths: include: - - internal/service/ivs + - "/internal/service/ivs" exclude: - - internal/service/ivs/list_pages_gen.go + - "/internal/service/ivs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -82,7 +82,7 @@ rules: message: Include "IVS" in test name paths: include: - - internal/service/ivs/*_test.go + - "/internal/service/ivs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -97,7 +97,7 @@ rules: message: Do not use "IVS" in const name inside ivs package paths: include: - - internal/service/ivs + - "/internal/service/ivs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -111,7 +111,7 @@ rules: message: Do not use "IVS" in var name inside ivs package paths: include: - - internal/service/ivs + - "/internal/service/ivs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -125,9 +125,9 @@ rules: message: Do not use "IVSChat" in func name inside ivschat package paths: include: - - internal/service/ivschat + - "/internal/service/ivschat" exclude: - - internal/service/ivschat/list_pages_gen.go + - "/internal/service/ivschat/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -143,7 +143,7 @@ rules: message: Include "IVSChat" in test name paths: include: - - internal/service/ivschat/*_test.go + - "/internal/service/ivschat/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -158,7 +158,7 @@ rules: message: Do not use "IVSChat" in const name inside ivschat package paths: include: - - internal/service/ivschat + - "/internal/service/ivschat" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -172,7 +172,7 @@ rules: message: Do not use "IVSChat" in var name inside ivschat package paths: include: - - internal/service/ivschat + - "/internal/service/ivschat" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -186,9 +186,9 @@ rules: message: Do not use "Kafka" in func name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" exclude: - - internal/service/kafka/list_pages_gen.go + - "/internal/service/kafka/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -204,7 +204,7 @@ rules: message: Include "Kafka" in test name paths: include: - - internal/service/kafka/*_test.go + - "/internal/service/kafka/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -219,7 +219,7 @@ rules: message: Do not use "Kafka" in const name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -233,7 +233,7 @@ rules: message: Do not use "Kafka" in var name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -247,9 +247,9 @@ rules: message: Do not use "KafkaConnect" in func name inside kafkaconnect package paths: include: - - internal/service/kafkaconnect + - "/internal/service/kafkaconnect" exclude: - - internal/service/kafkaconnect/list_pages_gen.go + - "/internal/service/kafkaconnect/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -265,7 +265,7 @@ rules: message: Include "KafkaConnect" in test name paths: include: - - internal/service/kafkaconnect/*_test.go + - "/internal/service/kafkaconnect/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -280,7 +280,7 @@ rules: message: Do not use "KafkaConnect" in const name inside kafkaconnect package paths: include: - - internal/service/kafkaconnect + - "/internal/service/kafkaconnect" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -294,7 +294,7 @@ rules: message: Do not use "KafkaConnect" in var name inside kafkaconnect package paths: include: - - internal/service/kafkaconnect + - "/internal/service/kafkaconnect" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -308,9 +308,9 @@ rules: message: Do not use "Kendra" in func name inside kendra package paths: include: - - internal/service/kendra + - "/internal/service/kendra" exclude: - - internal/service/kendra/list_pages_gen.go + - "/internal/service/kendra/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -326,7 +326,7 @@ rules: message: Include "Kendra" in test name paths: include: - - internal/service/kendra/*_test.go + - "/internal/service/kendra/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -341,7 +341,7 @@ rules: message: Do not use "Kendra" in const name inside kendra package paths: include: - - internal/service/kendra + - "/internal/service/kendra" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -355,7 +355,7 @@ rules: message: Do not use "Kendra" in var name inside kendra package paths: include: - - internal/service/kendra + - "/internal/service/kendra" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -369,9 +369,9 @@ rules: message: Do not use "Keyspaces" in func name inside keyspaces package paths: include: - - internal/service/keyspaces + - "/internal/service/keyspaces" exclude: - - internal/service/keyspaces/list_pages_gen.go + - "/internal/service/keyspaces/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -387,7 +387,7 @@ rules: message: Include "Keyspaces" in test name paths: include: - - internal/service/keyspaces/*_test.go + - "/internal/service/keyspaces/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -402,7 +402,7 @@ rules: message: Do not use "Keyspaces" in const name inside keyspaces package paths: include: - - internal/service/keyspaces + - "/internal/service/keyspaces" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -416,7 +416,7 @@ rules: message: Do not use "Keyspaces" in var name inside keyspaces package paths: include: - - internal/service/keyspaces + - "/internal/service/keyspaces" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -430,9 +430,9 @@ rules: message: Do not use "Kinesis" in func name inside kinesis package paths: include: - - internal/service/kinesis + - "/internal/service/kinesis" exclude: - - internal/service/kinesis/list_pages_gen.go + - "/internal/service/kinesis/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -448,7 +448,7 @@ rules: message: Include "Kinesis" in test name paths: include: - - internal/service/kinesis/*_test.go + - "/internal/service/kinesis/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -463,7 +463,7 @@ rules: message: Do not use "Kinesis" in const name inside kinesis package paths: include: - - internal/service/kinesis + - "/internal/service/kinesis" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -477,7 +477,7 @@ rules: message: Do not use "Kinesis" in var name inside kinesis package paths: include: - - internal/service/kinesis + - "/internal/service/kinesis" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -491,9 +491,9 @@ rules: message: Do not use "KinesisAnalytics" in func name inside kinesisanalytics package paths: include: - - internal/service/kinesisanalytics + - "/internal/service/kinesisanalytics" exclude: - - internal/service/kinesisanalytics/list_pages_gen.go + - "/internal/service/kinesisanalytics/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -509,7 +509,7 @@ rules: message: Include "KinesisAnalytics" in test name paths: include: - - internal/service/kinesisanalytics/*_test.go + - "/internal/service/kinesisanalytics/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -524,7 +524,7 @@ rules: message: Do not use "KinesisAnalytics" in const name inside kinesisanalytics package paths: include: - - internal/service/kinesisanalytics + - "/internal/service/kinesisanalytics" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -538,7 +538,7 @@ rules: message: Do not use "KinesisAnalytics" in var name inside kinesisanalytics package paths: include: - - internal/service/kinesisanalytics + - "/internal/service/kinesisanalytics" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -552,9 +552,9 @@ rules: message: Do not use "KinesisAnalyticsV2" in func name inside kinesisanalyticsv2 package paths: include: - - internal/service/kinesisanalyticsv2 + - "/internal/service/kinesisanalyticsv2" exclude: - - internal/service/kinesisanalyticsv2/list_pages_gen.go + - "/internal/service/kinesisanalyticsv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -570,7 +570,7 @@ rules: message: Include "KinesisAnalyticsV2" in test name paths: include: - - internal/service/kinesisanalyticsv2/*_test.go + - "/internal/service/kinesisanalyticsv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -585,7 +585,7 @@ rules: message: Do not use "KinesisAnalyticsV2" in const name inside kinesisanalyticsv2 package paths: include: - - internal/service/kinesisanalyticsv2 + - "/internal/service/kinesisanalyticsv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -599,7 +599,7 @@ rules: message: Do not use "KinesisAnalyticsV2" in var name inside kinesisanalyticsv2 package paths: include: - - internal/service/kinesisanalyticsv2 + - "/internal/service/kinesisanalyticsv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -613,9 +613,9 @@ rules: message: Do not use "KinesisVideo" in func name inside kinesisvideo package paths: include: - - internal/service/kinesisvideo + - "/internal/service/kinesisvideo" exclude: - - internal/service/kinesisvideo/list_pages_gen.go + - "/internal/service/kinesisvideo/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -631,7 +631,7 @@ rules: message: Include "KinesisVideo" in test name paths: include: - - internal/service/kinesisvideo/*_test.go + - "/internal/service/kinesisvideo/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -646,7 +646,7 @@ rules: message: Do not use "KinesisVideo" in const name inside kinesisvideo package paths: include: - - internal/service/kinesisvideo + - "/internal/service/kinesisvideo" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -660,7 +660,7 @@ rules: message: Do not use "KinesisVideo" in var name inside kinesisvideo package paths: include: - - internal/service/kinesisvideo + - "/internal/service/kinesisvideo" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -674,9 +674,9 @@ rules: message: Do not use "KMS" in func name inside kms package paths: include: - - internal/service/kms + - "/internal/service/kms" exclude: - - internal/service/kms/list_pages_gen.go + - "/internal/service/kms/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -692,7 +692,7 @@ rules: message: Include "KMS" in test name paths: include: - - internal/service/kms/*_test.go + - "/internal/service/kms/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -707,7 +707,7 @@ rules: message: Do not use "KMS" in const name inside kms package paths: include: - - internal/service/kms + - "/internal/service/kms" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -721,7 +721,7 @@ rules: message: Do not use "KMS" in var name inside kms package paths: include: - - internal/service/kms + - "/internal/service/kms" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -735,9 +735,9 @@ rules: message: Do not use "LakeFormation" in func name inside lakeformation package paths: include: - - internal/service/lakeformation + - "/internal/service/lakeformation" exclude: - - internal/service/lakeformation/list_pages_gen.go + - "/internal/service/lakeformation/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -753,7 +753,7 @@ rules: message: Include "LakeFormation" in test name paths: include: - - internal/service/lakeformation/*_test.go + - "/internal/service/lakeformation/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -768,7 +768,7 @@ rules: message: Do not use "LakeFormation" in const name inside lakeformation package paths: include: - - internal/service/lakeformation + - "/internal/service/lakeformation" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -782,7 +782,7 @@ rules: message: Do not use "LakeFormation" in var name inside lakeformation package paths: include: - - internal/service/lakeformation + - "/internal/service/lakeformation" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -796,9 +796,9 @@ rules: message: Do not use "Lambda" in func name inside lambda package paths: include: - - internal/service/lambda + - "/internal/service/lambda" exclude: - - internal/service/lambda/list_pages_gen.go + - "/internal/service/lambda/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -814,7 +814,7 @@ rules: message: Include "Lambda" in test name paths: include: - - internal/service/lambda/*_test.go + - "/internal/service/lambda/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -829,7 +829,7 @@ rules: message: Do not use "Lambda" in const name inside lambda package paths: include: - - internal/service/lambda + - "/internal/service/lambda" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -843,7 +843,7 @@ rules: message: Do not use "Lambda" in var name inside lambda package paths: include: - - internal/service/lambda + - "/internal/service/lambda" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -857,9 +857,9 @@ rules: message: Do not use "LaunchWizard" in func name inside launchwizard package paths: include: - - internal/service/launchwizard + - "/internal/service/launchwizard" exclude: - - internal/service/launchwizard/list_pages_gen.go + - "/internal/service/launchwizard/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -875,7 +875,7 @@ rules: message: Include "LaunchWizard" in test name paths: include: - - internal/service/launchwizard/*_test.go + - "/internal/service/launchwizard/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -890,7 +890,7 @@ rules: message: Do not use "LaunchWizard" in const name inside launchwizard package paths: include: - - internal/service/launchwizard + - "/internal/service/launchwizard" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -904,7 +904,7 @@ rules: message: Do not use "LaunchWizard" in var name inside launchwizard package paths: include: - - internal/service/launchwizard + - "/internal/service/launchwizard" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -918,9 +918,9 @@ rules: message: Do not use "lex" in func name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" exclude: - - internal/service/lexmodels/list_pages_gen.go + - "/internal/service/lexmodels/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -936,7 +936,7 @@ rules: message: Do not use "lex" in const name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -950,7 +950,7 @@ rules: message: Do not use "lex" in var name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -964,9 +964,9 @@ rules: message: Do not use "lexmodelbuilding" in func name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" exclude: - - internal/service/lexmodels/list_pages_gen.go + - "/internal/service/lexmodels/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -982,7 +982,7 @@ rules: message: Do not use "lexmodelbuilding" in const name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -996,7 +996,7 @@ rules: message: Do not use "lexmodelbuilding" in var name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1010,9 +1010,9 @@ rules: message: Do not use "lexmodelbuildingservice" in func name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" exclude: - - internal/service/lexmodels/list_pages_gen.go + - "/internal/service/lexmodels/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1028,7 +1028,7 @@ rules: message: Do not use "lexmodelbuildingservice" in const name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1042,7 +1042,7 @@ rules: message: Do not use "lexmodelbuildingservice" in var name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1056,9 +1056,9 @@ rules: message: Do not use "LexModels" in func name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" exclude: - - internal/service/lexmodels/list_pages_gen.go + - "/internal/service/lexmodels/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1074,7 +1074,7 @@ rules: message: Include "LexModels" in test name paths: include: - - internal/service/lexmodels/*_test.go + - "/internal/service/lexmodels/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1089,7 +1089,7 @@ rules: message: Do not use "LexModels" in const name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1103,7 +1103,7 @@ rules: message: Do not use "LexModels" in var name inside lexmodels package paths: include: - - internal/service/lexmodels + - "/internal/service/lexmodels" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1117,9 +1117,9 @@ rules: message: Do not use "lexmodelsv2" in func name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" exclude: - - internal/service/lexv2models/list_pages_gen.go + - "/internal/service/lexv2models/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1135,7 +1135,7 @@ rules: message: Do not use "lexmodelsv2" in const name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1149,7 +1149,7 @@ rules: message: Do not use "lexmodelsv2" in var name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1163,9 +1163,9 @@ rules: message: Do not use "LexV2Models" in func name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" exclude: - - internal/service/lexv2models/list_pages_gen.go + - "/internal/service/lexv2models/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1181,7 +1181,7 @@ rules: message: Include "LexV2Models" in test name paths: include: - - internal/service/lexv2models/*_test.go + - "/internal/service/lexv2models/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1196,7 +1196,7 @@ rules: message: Do not use "LexV2Models" in const name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1210,7 +1210,7 @@ rules: message: Do not use "LexV2Models" in var name inside lexv2models package paths: include: - - internal/service/lexv2models + - "/internal/service/lexv2models" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1224,9 +1224,9 @@ rules: message: Do not use "LicenseManager" in func name inside licensemanager package paths: include: - - internal/service/licensemanager + - "/internal/service/licensemanager" exclude: - - internal/service/licensemanager/list_pages_gen.go + - "/internal/service/licensemanager/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1242,7 +1242,7 @@ rules: message: Include "LicenseManager" in test name paths: include: - - internal/service/licensemanager/*_test.go + - "/internal/service/licensemanager/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1257,7 +1257,7 @@ rules: message: Do not use "LicenseManager" in const name inside licensemanager package paths: include: - - internal/service/licensemanager + - "/internal/service/licensemanager" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1271,7 +1271,7 @@ rules: message: Do not use "LicenseManager" in var name inside licensemanager package paths: include: - - internal/service/licensemanager + - "/internal/service/licensemanager" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1285,9 +1285,9 @@ rules: message: Do not use "Lightsail" in func name inside lightsail package paths: include: - - internal/service/lightsail + - "/internal/service/lightsail" exclude: - - internal/service/lightsail/list_pages_gen.go + - "/internal/service/lightsail/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1303,7 +1303,7 @@ rules: message: Include "Lightsail" in test name paths: include: - - internal/service/lightsail/*_test.go + - "/internal/service/lightsail/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1318,7 +1318,7 @@ rules: message: Do not use "Lightsail" in const name inside lightsail package paths: include: - - internal/service/lightsail + - "/internal/service/lightsail" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1332,7 +1332,7 @@ rules: message: Do not use "Lightsail" in var name inside lightsail package paths: include: - - internal/service/lightsail + - "/internal/service/lightsail" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1346,9 +1346,9 @@ rules: message: Do not use "Location" in func name inside location package paths: include: - - internal/service/location + - "/internal/service/location" exclude: - - internal/service/location/list_pages_gen.go + - "/internal/service/location/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1364,7 +1364,7 @@ rules: message: Include "Location" in test name paths: include: - - internal/service/location/*_test.go + - "/internal/service/location/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1379,7 +1379,7 @@ rules: message: Do not use "Location" in const name inside location package paths: include: - - internal/service/location + - "/internal/service/location" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1393,7 +1393,7 @@ rules: message: Do not use "Location" in var name inside location package paths: include: - - internal/service/location + - "/internal/service/location" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1407,9 +1407,9 @@ rules: message: Do not use "locationservice" in func name inside location package paths: include: - - internal/service/location + - "/internal/service/location" exclude: - - internal/service/location/list_pages_gen.go + - "/internal/service/location/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1425,7 +1425,7 @@ rules: message: Do not use "locationservice" in const name inside location package paths: include: - - internal/service/location + - "/internal/service/location" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1439,7 +1439,7 @@ rules: message: Do not use "locationservice" in var name inside location package paths: include: - - internal/service/location + - "/internal/service/location" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1453,9 +1453,9 @@ rules: message: Do not use "Logs" in func name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" exclude: - - internal/service/logs/list_pages_gen.go + - "/internal/service/logs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1471,7 +1471,7 @@ rules: message: Include "Logs" in test name paths: include: - - internal/service/logs/*_test.go + - "/internal/service/logs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1486,7 +1486,7 @@ rules: message: Do not use "Logs" in const name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1500,7 +1500,7 @@ rules: message: Do not use "Logs" in var name inside logs package paths: include: - - internal/service/logs + - "/internal/service/logs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1514,9 +1514,9 @@ rules: message: Do not use "LookoutMetrics" in func name inside lookoutmetrics package paths: include: - - internal/service/lookoutmetrics + - "/internal/service/lookoutmetrics" exclude: - - internal/service/lookoutmetrics/list_pages_gen.go + - "/internal/service/lookoutmetrics/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1532,7 +1532,7 @@ rules: message: Include "LookoutMetrics" in test name paths: include: - - internal/service/lookoutmetrics/*_test.go + - "/internal/service/lookoutmetrics/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1547,7 +1547,7 @@ rules: message: Do not use "LookoutMetrics" in const name inside lookoutmetrics package paths: include: - - internal/service/lookoutmetrics + - "/internal/service/lookoutmetrics" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1561,7 +1561,7 @@ rules: message: Do not use "LookoutMetrics" in var name inside lookoutmetrics package paths: include: - - internal/service/lookoutmetrics + - "/internal/service/lookoutmetrics" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1575,9 +1575,9 @@ rules: message: Do not use "M2" in func name inside m2 package paths: include: - - internal/service/m2 + - "/internal/service/m2" exclude: - - internal/service/m2/list_pages_gen.go + - "/internal/service/m2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1593,7 +1593,7 @@ rules: message: Include "M2" in test name paths: include: - - internal/service/m2/*_test.go + - "/internal/service/m2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1608,7 +1608,7 @@ rules: message: Do not use "M2" in const name inside m2 package paths: include: - - internal/service/m2 + - "/internal/service/m2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1622,7 +1622,7 @@ rules: message: Do not use "M2" in var name inside m2 package paths: include: - - internal/service/m2 + - "/internal/service/m2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1636,9 +1636,9 @@ rules: message: Do not use "Macie2" in func name inside macie2 package paths: include: - - internal/service/macie2 + - "/internal/service/macie2" exclude: - - internal/service/macie2/list_pages_gen.go + - "/internal/service/macie2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1654,7 +1654,7 @@ rules: message: Include "Macie2" in test name paths: include: - - internal/service/macie2/*_test.go + - "/internal/service/macie2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1669,7 +1669,7 @@ rules: message: Do not use "Macie2" in const name inside macie2 package paths: include: - - internal/service/macie2 + - "/internal/service/macie2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1683,7 +1683,7 @@ rules: message: Do not use "Macie2" in var name inside macie2 package paths: include: - - internal/service/macie2 + - "/internal/service/macie2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1697,9 +1697,9 @@ rules: message: Do not use "managedgrafana" in func name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" exclude: - - internal/service/grafana/list_pages_gen.go + - "/internal/service/grafana/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1715,7 +1715,7 @@ rules: message: Do not use "managedgrafana" in const name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1729,7 +1729,7 @@ rules: message: Do not use "managedgrafana" in var name inside grafana package paths: include: - - internal/service/grafana + - "/internal/service/grafana" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1743,9 +1743,9 @@ rules: message: Do not use "MediaConnect" in func name inside mediaconnect package paths: include: - - internal/service/mediaconnect + - "/internal/service/mediaconnect" exclude: - - internal/service/mediaconnect/list_pages_gen.go + - "/internal/service/mediaconnect/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1761,7 +1761,7 @@ rules: message: Include "MediaConnect" in test name paths: include: - - internal/service/mediaconnect/*_test.go + - "/internal/service/mediaconnect/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1776,7 +1776,7 @@ rules: message: Do not use "MediaConnect" in const name inside mediaconnect package paths: include: - - internal/service/mediaconnect + - "/internal/service/mediaconnect" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1790,7 +1790,7 @@ rules: message: Do not use "MediaConnect" in var name inside mediaconnect package paths: include: - - internal/service/mediaconnect + - "/internal/service/mediaconnect" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1804,9 +1804,9 @@ rules: message: Do not use "MediaConvert" in func name inside mediaconvert package paths: include: - - internal/service/mediaconvert + - "/internal/service/mediaconvert" exclude: - - internal/service/mediaconvert/list_pages_gen.go + - "/internal/service/mediaconvert/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1822,7 +1822,7 @@ rules: message: Include "MediaConvert" in test name paths: include: - - internal/service/mediaconvert/*_test.go + - "/internal/service/mediaconvert/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1837,7 +1837,7 @@ rules: message: Do not use "MediaConvert" in const name inside mediaconvert package paths: include: - - internal/service/mediaconvert + - "/internal/service/mediaconvert" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1851,7 +1851,7 @@ rules: message: Do not use "MediaConvert" in var name inside mediaconvert package paths: include: - - internal/service/mediaconvert + - "/internal/service/mediaconvert" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1865,9 +1865,9 @@ rules: message: Do not use "MediaLive" in func name inside medialive package paths: include: - - internal/service/medialive + - "/internal/service/medialive" exclude: - - internal/service/medialive/list_pages_gen.go + - "/internal/service/medialive/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1883,7 +1883,7 @@ rules: message: Include "MediaLive" in test name paths: include: - - internal/service/medialive/*_test.go + - "/internal/service/medialive/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1898,7 +1898,7 @@ rules: message: Do not use "MediaLive" in const name inside medialive package paths: include: - - internal/service/medialive + - "/internal/service/medialive" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1912,7 +1912,7 @@ rules: message: Do not use "MediaLive" in var name inside medialive package paths: include: - - internal/service/medialive + - "/internal/service/medialive" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1926,9 +1926,9 @@ rules: message: Do not use "MediaPackage" in func name inside mediapackage package paths: include: - - internal/service/mediapackage + - "/internal/service/mediapackage" exclude: - - internal/service/mediapackage/list_pages_gen.go + - "/internal/service/mediapackage/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1944,7 +1944,7 @@ rules: message: Include "MediaPackage" in test name paths: include: - - internal/service/mediapackage/*_test.go + - "/internal/service/mediapackage/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1959,7 +1959,7 @@ rules: message: Do not use "MediaPackage" in const name inside mediapackage package paths: include: - - internal/service/mediapackage + - "/internal/service/mediapackage" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1973,7 +1973,7 @@ rules: message: Do not use "MediaPackage" in var name inside mediapackage package paths: include: - - internal/service/mediapackage + - "/internal/service/mediapackage" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1987,9 +1987,9 @@ rules: message: Do not use "MediaPackageV2" in func name inside mediapackagev2 package paths: include: - - internal/service/mediapackagev2 + - "/internal/service/mediapackagev2" exclude: - - internal/service/mediapackagev2/list_pages_gen.go + - "/internal/service/mediapackagev2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2005,7 +2005,7 @@ rules: message: Include "MediaPackageV2" in test name paths: include: - - internal/service/mediapackagev2/*_test.go + - "/internal/service/mediapackagev2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2020,7 +2020,7 @@ rules: message: Do not use "MediaPackageV2" in const name inside mediapackagev2 package paths: include: - - internal/service/mediapackagev2 + - "/internal/service/mediapackagev2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2034,7 +2034,7 @@ rules: message: Do not use "MediaPackageV2" in var name inside mediapackagev2 package paths: include: - - internal/service/mediapackagev2 + - "/internal/service/mediapackagev2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2048,9 +2048,9 @@ rules: message: Do not use "MediaPackageVOD" in func name inside mediapackagevod package paths: include: - - internal/service/mediapackagevod + - "/internal/service/mediapackagevod" exclude: - - internal/service/mediapackagevod/list_pages_gen.go + - "/internal/service/mediapackagevod/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2066,7 +2066,7 @@ rules: message: Include "MediaPackageVOD" in test name paths: include: - - internal/service/mediapackagevod/*_test.go + - "/internal/service/mediapackagevod/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2081,7 +2081,7 @@ rules: message: Do not use "MediaPackageVOD" in const name inside mediapackagevod package paths: include: - - internal/service/mediapackagevod + - "/internal/service/mediapackagevod" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2095,7 +2095,7 @@ rules: message: Do not use "MediaPackageVOD" in var name inside mediapackagevod package paths: include: - - internal/service/mediapackagevod + - "/internal/service/mediapackagevod" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2109,9 +2109,9 @@ rules: message: Do not use "MediaStore" in func name inside mediastore package paths: include: - - internal/service/mediastore + - "/internal/service/mediastore" exclude: - - internal/service/mediastore/list_pages_gen.go + - "/internal/service/mediastore/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2127,7 +2127,7 @@ rules: message: Include "MediaStore" in test name paths: include: - - internal/service/mediastore/*_test.go + - "/internal/service/mediastore/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2142,7 +2142,7 @@ rules: message: Do not use "MediaStore" in const name inside mediastore package paths: include: - - internal/service/mediastore + - "/internal/service/mediastore" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2156,7 +2156,7 @@ rules: message: Do not use "MediaStore" in var name inside mediastore package paths: include: - - internal/service/mediastore + - "/internal/service/mediastore" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2170,9 +2170,9 @@ rules: message: Do not use "MemoryDB" in func name inside memorydb package paths: include: - - internal/service/memorydb + - "/internal/service/memorydb" exclude: - - internal/service/memorydb/list_pages_gen.go + - "/internal/service/memorydb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2188,7 +2188,7 @@ rules: message: Include "MemoryDB" in test name paths: include: - - internal/service/memorydb/*_test.go + - "/internal/service/memorydb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2203,7 +2203,7 @@ rules: message: Do not use "MemoryDB" in const name inside memorydb package paths: include: - - internal/service/memorydb + - "/internal/service/memorydb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2217,7 +2217,7 @@ rules: message: Do not use "MemoryDB" in var name inside memorydb package paths: include: - - internal/service/memorydb + - "/internal/service/memorydb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2231,9 +2231,9 @@ rules: message: Do not use "Meta" in func name inside meta package paths: include: - - internal/service/meta + - "/internal/service/meta" exclude: - - internal/service/meta/list_pages_gen.go + - "/internal/service/meta/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2249,7 +2249,7 @@ rules: message: Include "Meta" in test name paths: include: - - internal/service/meta/*_test.go + - "/internal/service/meta/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2264,7 +2264,7 @@ rules: message: Do not use "Meta" in const name inside meta package paths: include: - - internal/service/meta + - "/internal/service/meta" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2278,7 +2278,7 @@ rules: message: Do not use "Meta" in var name inside meta package paths: include: - - internal/service/meta + - "/internal/service/meta" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2292,9 +2292,9 @@ rules: message: Do not use "Mgn" in func name inside mgn package paths: include: - - internal/service/mgn + - "/internal/service/mgn" exclude: - - internal/service/mgn/list_pages_gen.go + - "/internal/service/mgn/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2310,7 +2310,7 @@ rules: message: Include "Mgn" in test name paths: include: - - internal/service/mgn/*_test.go + - "/internal/service/mgn/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2325,7 +2325,7 @@ rules: message: Do not use "Mgn" in const name inside mgn package paths: include: - - internal/service/mgn + - "/internal/service/mgn" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2339,7 +2339,7 @@ rules: message: Do not use "Mgn" in var name inside mgn package paths: include: - - internal/service/mgn + - "/internal/service/mgn" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2353,9 +2353,9 @@ rules: message: Do not use "MQ" in func name inside mq package paths: include: - - internal/service/mq + - "/internal/service/mq" exclude: - - internal/service/mq/list_pages_gen.go + - "/internal/service/mq/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2371,7 +2371,7 @@ rules: message: Include "MQ" in test name paths: include: - - internal/service/mq/*_test.go + - "/internal/service/mq/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2386,7 +2386,7 @@ rules: message: Do not use "MQ" in const name inside mq package paths: include: - - internal/service/mq + - "/internal/service/mq" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2400,7 +2400,7 @@ rules: message: Do not use "MQ" in var name inside mq package paths: include: - - internal/service/mq + - "/internal/service/mq" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2414,9 +2414,9 @@ rules: message: Do not use "msk" in func name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" exclude: - - internal/service/kafka/list_pages_gen.go + - "/internal/service/kafka/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2432,7 +2432,7 @@ rules: message: Do not use "msk" in const name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2446,7 +2446,7 @@ rules: message: Do not use "msk" in var name inside kafka package paths: include: - - internal/service/kafka + - "/internal/service/kafka" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2460,9 +2460,9 @@ rules: message: Do not use "MWAA" in func name inside mwaa package paths: include: - - internal/service/mwaa + - "/internal/service/mwaa" exclude: - - internal/service/mwaa/list_pages_gen.go + - "/internal/service/mwaa/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2478,7 +2478,7 @@ rules: message: Include "MWAA" in test name paths: include: - - internal/service/mwaa/*_test.go + - "/internal/service/mwaa/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2493,7 +2493,7 @@ rules: message: Do not use "MWAA" in const name inside mwaa package paths: include: - - internal/service/mwaa + - "/internal/service/mwaa" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2507,7 +2507,7 @@ rules: message: Do not use "MWAA" in var name inside mwaa package paths: include: - - internal/service/mwaa + - "/internal/service/mwaa" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2521,9 +2521,9 @@ rules: message: Do not use "Neptune" in func name inside neptune package paths: include: - - internal/service/neptune + - "/internal/service/neptune" exclude: - - internal/service/neptune/list_pages_gen.go + - "/internal/service/neptune/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2539,7 +2539,7 @@ rules: message: Include "Neptune" in test name paths: include: - - internal/service/neptune/*_test.go + - "/internal/service/neptune/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2554,7 +2554,7 @@ rules: message: Do not use "Neptune" in const name inside neptune package paths: include: - - internal/service/neptune + - "/internal/service/neptune" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2568,7 +2568,7 @@ rules: message: Do not use "Neptune" in var name inside neptune package paths: include: - - internal/service/neptune + - "/internal/service/neptune" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2582,9 +2582,9 @@ rules: message: Do not use "NeptuneGraph" in func name inside neptunegraph package paths: include: - - internal/service/neptunegraph + - "/internal/service/neptunegraph" exclude: - - internal/service/neptunegraph/list_pages_gen.go + - "/internal/service/neptunegraph/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2600,7 +2600,7 @@ rules: message: Include "NeptuneGraph" in test name paths: include: - - internal/service/neptunegraph/*_test.go + - "/internal/service/neptunegraph/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2615,7 +2615,7 @@ rules: message: Do not use "NeptuneGraph" in const name inside neptunegraph package paths: include: - - internal/service/neptunegraph + - "/internal/service/neptunegraph" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2629,7 +2629,7 @@ rules: message: Do not use "NeptuneGraph" in var name inside neptunegraph package paths: include: - - internal/service/neptunegraph + - "/internal/service/neptunegraph" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2643,9 +2643,9 @@ rules: message: Do not use "NetworkFirewall" in func name inside networkfirewall package paths: include: - - internal/service/networkfirewall + - "/internal/service/networkfirewall" exclude: - - internal/service/networkfirewall/list_pages_gen.go + - "/internal/service/networkfirewall/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2661,7 +2661,7 @@ rules: message: Include "NetworkFirewall" in test name paths: include: - - internal/service/networkfirewall/*_test.go + - "/internal/service/networkfirewall/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2676,7 +2676,7 @@ rules: message: Do not use "NetworkFirewall" in const name inside networkfirewall package paths: include: - - internal/service/networkfirewall + - "/internal/service/networkfirewall" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2690,7 +2690,7 @@ rules: message: Do not use "NetworkFirewall" in var name inside networkfirewall package paths: include: - - internal/service/networkfirewall + - "/internal/service/networkfirewall" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2704,9 +2704,9 @@ rules: message: Do not use "NetworkManager" in func name inside networkmanager package paths: include: - - internal/service/networkmanager + - "/internal/service/networkmanager" exclude: - - internal/service/networkmanager/list_pages_gen.go + - "/internal/service/networkmanager/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2722,7 +2722,7 @@ rules: message: Include "NetworkManager" in test name paths: include: - - internal/service/networkmanager/*_test.go + - "/internal/service/networkmanager/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2737,7 +2737,7 @@ rules: message: Do not use "NetworkManager" in const name inside networkmanager package paths: include: - - internal/service/networkmanager + - "/internal/service/networkmanager" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2751,7 +2751,7 @@ rules: message: Do not use "NetworkManager" in var name inside networkmanager package paths: include: - - internal/service/networkmanager + - "/internal/service/networkmanager" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2765,9 +2765,9 @@ rules: message: Do not use "NetworkMonitor" in func name inside networkmonitor package paths: include: - - internal/service/networkmonitor + - "/internal/service/networkmonitor" exclude: - - internal/service/networkmonitor/list_pages_gen.go + - "/internal/service/networkmonitor/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2783,7 +2783,7 @@ rules: message: Include "NetworkMonitor" in test name paths: include: - - internal/service/networkmonitor/*_test.go + - "/internal/service/networkmonitor/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2798,7 +2798,7 @@ rules: message: Do not use "NetworkMonitor" in const name inside networkmonitor package paths: include: - - internal/service/networkmonitor + - "/internal/service/networkmonitor" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2812,7 +2812,7 @@ rules: message: Do not use "NetworkMonitor" in var name inside networkmonitor package paths: include: - - internal/service/networkmonitor + - "/internal/service/networkmonitor" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2826,9 +2826,9 @@ rules: message: Do not use "Notifications" in func name inside notifications package paths: include: - - internal/service/notifications + - "/internal/service/notifications" exclude: - - internal/service/notifications/list_pages_gen.go + - "/internal/service/notifications/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2844,7 +2844,7 @@ rules: message: Include "Notifications" in test name paths: include: - - internal/service/notifications/*_test.go + - "/internal/service/notifications/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2859,7 +2859,7 @@ rules: message: Do not use "Notifications" in const name inside notifications package paths: include: - - internal/service/notifications + - "/internal/service/notifications" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2873,7 +2873,7 @@ rules: message: Do not use "Notifications" in var name inside notifications package paths: include: - - internal/service/notifications + - "/internal/service/notifications" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2887,9 +2887,9 @@ rules: message: Do not use "NotificationsContacts" in func name inside notificationscontacts package paths: include: - - internal/service/notificationscontacts + - "/internal/service/notificationscontacts" exclude: - - internal/service/notificationscontacts/list_pages_gen.go + - "/internal/service/notificationscontacts/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2905,7 +2905,7 @@ rules: message: Include "NotificationsContacts" in test name paths: include: - - internal/service/notificationscontacts/*_test.go + - "/internal/service/notificationscontacts/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2920,7 +2920,7 @@ rules: message: Do not use "NotificationsContacts" in const name inside notificationscontacts package paths: include: - - internal/service/notificationscontacts + - "/internal/service/notificationscontacts" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2934,7 +2934,7 @@ rules: message: Do not use "NotificationsContacts" in var name inside notificationscontacts package paths: include: - - internal/service/notificationscontacts + - "/internal/service/notificationscontacts" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2948,9 +2948,9 @@ rules: message: Do not use "ObservabilityAccessManager" in func name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" exclude: - - internal/service/oam/list_pages_gen.go + - "/internal/service/oam/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2966,7 +2966,7 @@ rules: message: Include "ObservabilityAccessManager" in test name paths: include: - - internal/service/oam/*_test.go + - "/internal/service/oam/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2981,7 +2981,7 @@ rules: message: Do not use "ObservabilityAccessManager" in const name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2995,7 +2995,7 @@ rules: message: Do not use "ObservabilityAccessManager" in var name inside oam package paths: include: - - internal/service/oam + - "/internal/service/oam" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3009,9 +3009,9 @@ rules: message: Do not use "ODB" in func name inside odb package paths: include: - - internal/service/odb + - "/internal/service/odb" exclude: - - internal/service/odb/list_pages_gen.go + - "/internal/service/odb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3027,7 +3027,7 @@ rules: message: Include "ODB" in test name paths: include: - - internal/service/odb/*_test.go + - "/internal/service/odb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3042,7 +3042,7 @@ rules: message: Do not use "ODB" in const name inside odb package paths: include: - - internal/service/odb + - "/internal/service/odb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3056,7 +3056,7 @@ rules: message: Do not use "ODB" in var name inside odb package paths: include: - - internal/service/odb + - "/internal/service/odb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3070,9 +3070,9 @@ rules: message: Do not use "OpenSearch" in func name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" exclude: - - internal/service/opensearch/list_pages_gen.go + - "/internal/service/opensearch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3088,7 +3088,7 @@ rules: message: Include "OpenSearch" in test name paths: include: - - internal/service/opensearch/*_test.go + - "/internal/service/opensearch/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3103,7 +3103,7 @@ rules: message: Do not use "OpenSearch" in const name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3117,7 +3117,7 @@ rules: message: Do not use "OpenSearch" in var name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3131,9 +3131,9 @@ rules: message: Do not use "opensearchingestion" in func name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" exclude: - - internal/service/osis/list_pages_gen.go + - "/internal/service/osis/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3149,7 +3149,7 @@ rules: message: Do not use "opensearchingestion" in const name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3163,7 +3163,7 @@ rules: message: Do not use "opensearchingestion" in var name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3177,9 +3177,9 @@ rules: message: Do not use "OpenSearchServerless" in func name inside opensearchserverless package paths: include: - - internal/service/opensearchserverless + - "/internal/service/opensearchserverless" exclude: - - internal/service/opensearchserverless/list_pages_gen.go + - "/internal/service/opensearchserverless/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3195,7 +3195,7 @@ rules: message: Include "OpenSearchServerless" in test name paths: include: - - internal/service/opensearchserverless/*_test.go + - "/internal/service/opensearchserverless/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3210,7 +3210,7 @@ rules: message: Do not use "OpenSearchServerless" in const name inside opensearchserverless package paths: include: - - internal/service/opensearchserverless + - "/internal/service/opensearchserverless" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3224,7 +3224,7 @@ rules: message: Do not use "OpenSearchServerless" in var name inside opensearchserverless package paths: include: - - internal/service/opensearchserverless + - "/internal/service/opensearchserverless" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3238,9 +3238,9 @@ rules: message: Do not use "opensearchservice" in func name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" exclude: - - internal/service/opensearch/list_pages_gen.go + - "/internal/service/opensearch/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3256,7 +3256,7 @@ rules: message: Do not use "opensearchservice" in const name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3270,7 +3270,7 @@ rules: message: Do not use "opensearchservice" in var name inside opensearch package paths: include: - - internal/service/opensearch + - "/internal/service/opensearch" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3284,9 +3284,9 @@ rules: message: Do not use "Organizations" in func name inside organizations package paths: include: - - internal/service/organizations + - "/internal/service/organizations" exclude: - - internal/service/organizations/list_pages_gen.go + - "/internal/service/organizations/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3302,7 +3302,7 @@ rules: message: Include "Organizations" in test name paths: include: - - internal/service/organizations/*_test.go + - "/internal/service/organizations/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3317,7 +3317,7 @@ rules: message: Do not use "Organizations" in const name inside organizations package paths: include: - - internal/service/organizations + - "/internal/service/organizations" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3331,7 +3331,7 @@ rules: message: Do not use "Organizations" in var name inside organizations package paths: include: - - internal/service/organizations + - "/internal/service/organizations" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3345,9 +3345,9 @@ rules: message: Do not use "OpenSearchIngestion" in func name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" exclude: - - internal/service/osis/list_pages_gen.go + - "/internal/service/osis/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3363,7 +3363,7 @@ rules: message: Include "OpenSearchIngestion" in test name paths: include: - - internal/service/osis/*_test.go + - "/internal/service/osis/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3378,7 +3378,7 @@ rules: message: Do not use "OpenSearchIngestion" in const name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3392,7 +3392,7 @@ rules: message: Do not use "OpenSearchIngestion" in var name inside osis package paths: include: - - internal/service/osis + - "/internal/service/osis" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3406,9 +3406,9 @@ rules: message: Do not use "Outposts" in func name inside outposts package paths: include: - - internal/service/outposts + - "/internal/service/outposts" exclude: - - internal/service/outposts/list_pages_gen.go + - "/internal/service/outposts/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3424,7 +3424,7 @@ rules: message: Include "Outposts" in test name paths: include: - - internal/service/outposts/*_test.go + - "/internal/service/outposts/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3439,7 +3439,7 @@ rules: message: Do not use "Outposts" in const name inside outposts package paths: include: - - internal/service/outposts + - "/internal/service/outposts" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3453,7 +3453,7 @@ rules: message: Do not use "Outposts" in var name inside outposts package paths: include: - - internal/service/outposts + - "/internal/service/outposts" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3467,9 +3467,9 @@ rules: message: Do not use "PaymentCryptography" in func name inside paymentcryptography package paths: include: - - internal/service/paymentcryptography + - "/internal/service/paymentcryptography" exclude: - - internal/service/paymentcryptography/list_pages_gen.go + - "/internal/service/paymentcryptography/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3485,7 +3485,7 @@ rules: message: Include "PaymentCryptography" in test name paths: include: - - internal/service/paymentcryptography/*_test.go + - "/internal/service/paymentcryptography/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3500,7 +3500,7 @@ rules: message: Do not use "PaymentCryptography" in const name inside paymentcryptography package paths: include: - - internal/service/paymentcryptography + - "/internal/service/paymentcryptography" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3514,7 +3514,7 @@ rules: message: Do not use "PaymentCryptography" in var name inside paymentcryptography package paths: include: - - internal/service/paymentcryptography + - "/internal/service/paymentcryptography" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3528,9 +3528,9 @@ rules: message: Do not use "PCAConnectorAD" in func name inside pcaconnectorad package paths: include: - - internal/service/pcaconnectorad + - "/internal/service/pcaconnectorad" exclude: - - internal/service/pcaconnectorad/list_pages_gen.go + - "/internal/service/pcaconnectorad/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3546,7 +3546,7 @@ rules: message: Include "PCAConnectorAD" in test name paths: include: - - internal/service/pcaconnectorad/*_test.go + - "/internal/service/pcaconnectorad/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3561,7 +3561,7 @@ rules: message: Do not use "PCAConnectorAD" in const name inside pcaconnectorad package paths: include: - - internal/service/pcaconnectorad + - "/internal/service/pcaconnectorad" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3575,7 +3575,7 @@ rules: message: Do not use "PCAConnectorAD" in var name inside pcaconnectorad package paths: include: - - internal/service/pcaconnectorad + - "/internal/service/pcaconnectorad" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3589,9 +3589,9 @@ rules: message: Do not use "PCS" in func name inside pcs package paths: include: - - internal/service/pcs + - "/internal/service/pcs" exclude: - - internal/service/pcs/list_pages_gen.go + - "/internal/service/pcs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3607,7 +3607,7 @@ rules: message: Include "PCS" in test name paths: include: - - internal/service/pcs/*_test.go + - "/internal/service/pcs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3622,7 +3622,7 @@ rules: message: Do not use "PCS" in const name inside pcs package paths: include: - - internal/service/pcs + - "/internal/service/pcs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3636,7 +3636,7 @@ rules: message: Do not use "PCS" in var name inside pcs package paths: include: - - internal/service/pcs + - "/internal/service/pcs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3650,9 +3650,9 @@ rules: message: Do not use "Pinpoint" in func name inside pinpoint package paths: include: - - internal/service/pinpoint + - "/internal/service/pinpoint" exclude: - - internal/service/pinpoint/list_pages_gen.go + - "/internal/service/pinpoint/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3668,7 +3668,7 @@ rules: message: Include "Pinpoint" in test name paths: include: - - internal/service/pinpoint/*_test.go + - "/internal/service/pinpoint/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3683,7 +3683,7 @@ rules: message: Do not use "Pinpoint" in const name inside pinpoint package paths: include: - - internal/service/pinpoint + - "/internal/service/pinpoint" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3697,7 +3697,7 @@ rules: message: Do not use "Pinpoint" in var name inside pinpoint package paths: include: - - internal/service/pinpoint + - "/internal/service/pinpoint" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3711,9 +3711,9 @@ rules: message: Do not use "PinpointSMSVoiceV2" in func name inside pinpointsmsvoicev2 package paths: include: - - internal/service/pinpointsmsvoicev2 + - "/internal/service/pinpointsmsvoicev2" exclude: - - internal/service/pinpointsmsvoicev2/list_pages_gen.go + - "/internal/service/pinpointsmsvoicev2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3729,7 +3729,7 @@ rules: message: Include "PinpointSMSVoiceV2" in test name paths: include: - - internal/service/pinpointsmsvoicev2/*_test.go + - "/internal/service/pinpointsmsvoicev2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3744,7 +3744,7 @@ rules: message: Do not use "PinpointSMSVoiceV2" in const name inside pinpointsmsvoicev2 package paths: include: - - internal/service/pinpointsmsvoicev2 + - "/internal/service/pinpointsmsvoicev2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3758,7 +3758,7 @@ rules: message: Do not use "PinpointSMSVoiceV2" in var name inside pinpointsmsvoicev2 package paths: include: - - internal/service/pinpointsmsvoicev2 + - "/internal/service/pinpointsmsvoicev2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3772,9 +3772,9 @@ rules: message: Do not use "Pipes" in func name inside pipes package paths: include: - - internal/service/pipes + - "/internal/service/pipes" exclude: - - internal/service/pipes/list_pages_gen.go + - "/internal/service/pipes/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3791,7 +3791,7 @@ rules: message: Include "Pipes" in test name paths: include: - - internal/service/pipes/*_test.go + - "/internal/service/pipes/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3806,7 +3806,7 @@ rules: message: Do not use "Pipes" in const name inside pipes package paths: include: - - internal/service/pipes + - "/internal/service/pipes" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3821,7 +3821,7 @@ rules: message: Do not use "Pipes" in var name inside pipes package paths: include: - - internal/service/pipes + - "/internal/service/pipes" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3836,9 +3836,9 @@ rules: message: Do not use "Polly" in func name inside polly package paths: include: - - internal/service/polly + - "/internal/service/polly" exclude: - - internal/service/polly/list_pages_gen.go + - "/internal/service/polly/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3854,7 +3854,7 @@ rules: message: Include "Polly" in test name paths: include: - - internal/service/polly/*_test.go + - "/internal/service/polly/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3869,7 +3869,7 @@ rules: message: Do not use "Polly" in const name inside polly package paths: include: - - internal/service/polly + - "/internal/service/polly" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3883,7 +3883,7 @@ rules: message: Do not use "Polly" in var name inside polly package paths: include: - - internal/service/polly + - "/internal/service/polly" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3897,9 +3897,9 @@ rules: message: Do not use "Pricing" in func name inside pricing package paths: include: - - internal/service/pricing + - "/internal/service/pricing" exclude: - - internal/service/pricing/list_pages_gen.go + - "/internal/service/pricing/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3915,7 +3915,7 @@ rules: message: Include "Pricing" in test name paths: include: - - internal/service/pricing/*_test.go + - "/internal/service/pricing/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3930,7 +3930,7 @@ rules: message: Do not use "Pricing" in const name inside pricing package paths: include: - - internal/service/pricing + - "/internal/service/pricing" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3944,7 +3944,7 @@ rules: message: Do not use "Pricing" in var name inside pricing package paths: include: - - internal/service/pricing + - "/internal/service/pricing" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3958,9 +3958,9 @@ rules: message: Do not use "prometheus" in func name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" exclude: - - internal/service/amp/list_pages_gen.go + - "/internal/service/amp/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3976,7 +3976,7 @@ rules: message: Do not use "prometheus" in const name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3990,7 +3990,7 @@ rules: message: Do not use "prometheus" in var name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4004,9 +4004,9 @@ rules: message: Do not use "prometheusservice" in func name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" exclude: - - internal/service/amp/list_pages_gen.go + - "/internal/service/amp/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4022,7 +4022,7 @@ rules: message: Do not use "prometheusservice" in const name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4036,7 +4036,7 @@ rules: message: Do not use "prometheusservice" in var name inside amp package paths: include: - - internal/service/amp + - "/internal/service/amp" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4050,9 +4050,9 @@ rules: message: Do not use "QBusiness" in func name inside qbusiness package paths: include: - - internal/service/qbusiness + - "/internal/service/qbusiness" exclude: - - internal/service/qbusiness/list_pages_gen.go + - "/internal/service/qbusiness/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4068,7 +4068,7 @@ rules: message: Include "QBusiness" in test name paths: include: - - internal/service/qbusiness/*_test.go + - "/internal/service/qbusiness/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4083,7 +4083,7 @@ rules: message: Do not use "QBusiness" in const name inside qbusiness package paths: include: - - internal/service/qbusiness + - "/internal/service/qbusiness" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4097,7 +4097,7 @@ rules: message: Do not use "QBusiness" in var name inside qbusiness package paths: include: - - internal/service/qbusiness + - "/internal/service/qbusiness" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4111,9 +4111,9 @@ rules: message: Do not use "QLDB" in func name inside qldb package paths: include: - - internal/service/qldb + - "/internal/service/qldb" exclude: - - internal/service/qldb/list_pages_gen.go + - "/internal/service/qldb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4129,7 +4129,7 @@ rules: message: Include "QLDB" in test name paths: include: - - internal/service/qldb/*_test.go + - "/internal/service/qldb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4144,7 +4144,7 @@ rules: message: Do not use "QLDB" in const name inside qldb package paths: include: - - internal/service/qldb + - "/internal/service/qldb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4158,7 +4158,7 @@ rules: message: Do not use "QLDB" in var name inside qldb package paths: include: - - internal/service/qldb + - "/internal/service/qldb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4172,9 +4172,9 @@ rules: message: Do not use "QuickSight" in func name inside quicksight package paths: include: - - internal/service/quicksight + - "/internal/service/quicksight" exclude: - - internal/service/quicksight/list_pages_gen.go + - "/internal/service/quicksight/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4190,7 +4190,7 @@ rules: message: Include "QuickSight" in test name paths: include: - - internal/service/quicksight/*_test.go + - "/internal/service/quicksight/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4205,7 +4205,7 @@ rules: message: Do not use "QuickSight" in const name inside quicksight package paths: include: - - internal/service/quicksight + - "/internal/service/quicksight" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4219,7 +4219,7 @@ rules: message: Do not use "QuickSight" in var name inside quicksight package paths: include: - - internal/service/quicksight + - "/internal/service/quicksight" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4233,9 +4233,9 @@ rules: message: Do not use "RAM" in func name inside ram package paths: include: - - internal/service/ram + - "/internal/service/ram" exclude: - - internal/service/ram/list_pages_gen.go + - "/internal/service/ram/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4252,7 +4252,7 @@ rules: message: Include "RAM" in test name paths: include: - - internal/service/ram/*_test.go + - "/internal/service/ram/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4267,7 +4267,7 @@ rules: message: Do not use "RAM" in const name inside ram package paths: include: - - internal/service/ram + - "/internal/service/ram" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4282,7 +4282,7 @@ rules: message: Do not use "RAM" in var name inside ram package paths: include: - - internal/service/ram + - "/internal/service/ram" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4297,9 +4297,9 @@ rules: message: Do not use "RBin" in func name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" exclude: - - internal/service/rbin/list_pages_gen.go + - "/internal/service/rbin/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4315,7 +4315,7 @@ rules: message: Include "RBin" in test name paths: include: - - internal/service/rbin/*_test.go + - "/internal/service/rbin/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4330,7 +4330,7 @@ rules: message: Do not use "RBin" in const name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4344,7 +4344,7 @@ rules: message: Do not use "RBin" in var name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4358,9 +4358,9 @@ rules: message: Do not use "RDS" in func name inside rds package paths: include: - - internal/service/rds + - "/internal/service/rds" exclude: - - internal/service/rds/list_pages_gen.go + - "/internal/service/rds/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4376,7 +4376,7 @@ rules: message: Include "RDS" in test name paths: include: - - internal/service/rds/*_test.go + - "/internal/service/rds/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4391,7 +4391,7 @@ rules: message: Do not use "RDS" in const name inside rds package paths: include: - - internal/service/rds + - "/internal/service/rds" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4405,7 +4405,7 @@ rules: message: Do not use "RDS" in var name inside rds package paths: include: - - internal/service/rds + - "/internal/service/rds" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4419,9 +4419,9 @@ rules: message: Do not use "recyclebin" in func name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" exclude: - - internal/service/rbin/list_pages_gen.go + - "/internal/service/rbin/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4437,7 +4437,7 @@ rules: message: Do not use "recyclebin" in const name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4451,7 +4451,7 @@ rules: message: Do not use "recyclebin" in var name inside rbin package paths: include: - - internal/service/rbin + - "/internal/service/rbin" patterns: - pattern: var $NAME = ... - metavariable-pattern: diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml index 7f884d3d36ff..833fcb162182 100644 --- a/.ci/.semgrep-service-name3.yml +++ b/.ci/.semgrep-service-name3.yml @@ -6,9 +6,9 @@ rules: message: Do not use "Redshift" in func name inside redshift package paths: include: - - internal/service/redshift + - "/internal/service/redshift" exclude: - - internal/service/redshift/list_pages_gen.go + - "/internal/service/redshift/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -24,7 +24,7 @@ rules: message: Include "Redshift" in test name paths: include: - - internal/service/redshift/*_test.go + - "/internal/service/redshift/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -39,7 +39,7 @@ rules: message: Do not use "Redshift" in const name inside redshift package paths: include: - - internal/service/redshift + - "/internal/service/redshift" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -53,7 +53,7 @@ rules: message: Do not use "Redshift" in var name inside redshift package paths: include: - - internal/service/redshift + - "/internal/service/redshift" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -67,9 +67,9 @@ rules: message: Do not use "RedshiftData" in func name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" exclude: - - internal/service/redshiftdata/list_pages_gen.go + - "/internal/service/redshiftdata/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -85,7 +85,7 @@ rules: message: Include "RedshiftData" in test name paths: include: - - internal/service/redshiftdata/*_test.go + - "/internal/service/redshiftdata/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -100,7 +100,7 @@ rules: message: Do not use "RedshiftData" in const name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -114,7 +114,7 @@ rules: message: Do not use "RedshiftData" in var name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -128,9 +128,9 @@ rules: message: Do not use "redshiftdataapiservice" in func name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" exclude: - - internal/service/redshiftdata/list_pages_gen.go + - "/internal/service/redshiftdata/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -146,7 +146,7 @@ rules: message: Do not use "redshiftdataapiservice" in const name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -160,7 +160,7 @@ rules: message: Do not use "redshiftdataapiservice" in var name inside redshiftdata package paths: include: - - internal/service/redshiftdata + - "/internal/service/redshiftdata" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -174,9 +174,9 @@ rules: message: Do not use "RedshiftServerless" in func name inside redshiftserverless package paths: include: - - internal/service/redshiftserverless + - "/internal/service/redshiftserverless" exclude: - - internal/service/redshiftserverless/list_pages_gen.go + - "/internal/service/redshiftserverless/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -192,7 +192,7 @@ rules: message: Include "RedshiftServerless" in test name paths: include: - - internal/service/redshiftserverless/*_test.go + - "/internal/service/redshiftserverless/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -207,7 +207,7 @@ rules: message: Do not use "RedshiftServerless" in const name inside redshiftserverless package paths: include: - - internal/service/redshiftserverless + - "/internal/service/redshiftserverless" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -221,7 +221,7 @@ rules: message: Do not use "RedshiftServerless" in var name inside redshiftserverless package paths: include: - - internal/service/redshiftserverless + - "/internal/service/redshiftserverless" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -235,9 +235,9 @@ rules: message: Do not use "Rekognition" in func name inside rekognition package paths: include: - - internal/service/rekognition + - "/internal/service/rekognition" exclude: - - internal/service/rekognition/list_pages_gen.go + - "/internal/service/rekognition/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -253,7 +253,7 @@ rules: message: Include "Rekognition" in test name paths: include: - - internal/service/rekognition/*_test.go + - "/internal/service/rekognition/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -268,7 +268,7 @@ rules: message: Do not use "Rekognition" in const name inside rekognition package paths: include: - - internal/service/rekognition + - "/internal/service/rekognition" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -282,7 +282,7 @@ rules: message: Do not use "Rekognition" in var name inside rekognition package paths: include: - - internal/service/rekognition + - "/internal/service/rekognition" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -296,9 +296,9 @@ rules: message: Do not use "ResilienceHub" in func name inside resiliencehub package paths: include: - - internal/service/resiliencehub + - "/internal/service/resiliencehub" exclude: - - internal/service/resiliencehub/list_pages_gen.go + - "/internal/service/resiliencehub/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -314,7 +314,7 @@ rules: message: Include "ResilienceHub" in test name paths: include: - - internal/service/resiliencehub/*_test.go + - "/internal/service/resiliencehub/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -329,7 +329,7 @@ rules: message: Do not use "ResilienceHub" in const name inside resiliencehub package paths: include: - - internal/service/resiliencehub + - "/internal/service/resiliencehub" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -343,7 +343,7 @@ rules: message: Do not use "ResilienceHub" in var name inside resiliencehub package paths: include: - - internal/service/resiliencehub + - "/internal/service/resiliencehub" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -357,9 +357,9 @@ rules: message: Do not use "ResourceExplorer2" in func name inside resourceexplorer2 package paths: include: - - internal/service/resourceexplorer2 + - "/internal/service/resourceexplorer2" exclude: - - internal/service/resourceexplorer2/list_pages_gen.go + - "/internal/service/resourceexplorer2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -375,7 +375,7 @@ rules: message: Include "ResourceExplorer2" in test name paths: include: - - internal/service/resourceexplorer2/*_test.go + - "/internal/service/resourceexplorer2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -390,7 +390,7 @@ rules: message: Do not use "ResourceExplorer2" in const name inside resourceexplorer2 package paths: include: - - internal/service/resourceexplorer2 + - "/internal/service/resourceexplorer2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -404,7 +404,7 @@ rules: message: Do not use "ResourceExplorer2" in var name inside resourceexplorer2 package paths: include: - - internal/service/resourceexplorer2 + - "/internal/service/resourceexplorer2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -418,9 +418,9 @@ rules: message: Do not use "ResourceGroups" in func name inside resourcegroups package paths: include: - - internal/service/resourcegroups + - "/internal/service/resourcegroups" exclude: - - internal/service/resourcegroups/list_pages_gen.go + - "/internal/service/resourcegroups/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -436,7 +436,7 @@ rules: message: Include "ResourceGroups" in test name paths: include: - - internal/service/resourcegroups/*_test.go + - "/internal/service/resourcegroups/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -451,7 +451,7 @@ rules: message: Do not use "ResourceGroups" in const name inside resourcegroups package paths: include: - - internal/service/resourcegroups + - "/internal/service/resourcegroups" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -465,7 +465,7 @@ rules: message: Do not use "ResourceGroups" in var name inside resourcegroups package paths: include: - - internal/service/resourcegroups + - "/internal/service/resourcegroups" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -479,9 +479,9 @@ rules: message: Do not use "resourcegroupstagging" in func name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" exclude: - - internal/service/resourcegroupstaggingapi/list_pages_gen.go + - "/internal/service/resourcegroupstaggingapi/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -497,7 +497,7 @@ rules: message: Do not use "resourcegroupstagging" in const name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -511,7 +511,7 @@ rules: message: Do not use "resourcegroupstagging" in var name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -525,9 +525,9 @@ rules: message: Do not use "ResourceGroupsTaggingAPI" in func name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" exclude: - - internal/service/resourcegroupstaggingapi/list_pages_gen.go + - "/internal/service/resourcegroupstaggingapi/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -543,7 +543,7 @@ rules: message: Include "ResourceGroupsTaggingAPI" in test name paths: include: - - internal/service/resourcegroupstaggingapi/*_test.go + - "/internal/service/resourcegroupstaggingapi/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -558,7 +558,7 @@ rules: message: Do not use "ResourceGroupsTaggingAPI" in const name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -572,7 +572,7 @@ rules: message: Do not use "ResourceGroupsTaggingAPI" in var name inside resourcegroupstaggingapi package paths: include: - - internal/service/resourcegroupstaggingapi + - "/internal/service/resourcegroupstaggingapi" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -586,9 +586,9 @@ rules: message: Do not use "RolesAnywhere" in func name inside rolesanywhere package paths: include: - - internal/service/rolesanywhere + - "/internal/service/rolesanywhere" exclude: - - internal/service/rolesanywhere/list_pages_gen.go + - "/internal/service/rolesanywhere/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -604,7 +604,7 @@ rules: message: Include "RolesAnywhere" in test name paths: include: - - internal/service/rolesanywhere/*_test.go + - "/internal/service/rolesanywhere/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -619,7 +619,7 @@ rules: message: Do not use "RolesAnywhere" in const name inside rolesanywhere package paths: include: - - internal/service/rolesanywhere + - "/internal/service/rolesanywhere" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -633,7 +633,7 @@ rules: message: Do not use "RolesAnywhere" in var name inside rolesanywhere package paths: include: - - internal/service/rolesanywhere + - "/internal/service/rolesanywhere" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -647,9 +647,9 @@ rules: message: Do not use "Route53" in func name inside route53 package paths: include: - - internal/service/route53 + - "/internal/service/route53" exclude: - - internal/service/route53/list_pages_gen.go + - "/internal/service/route53/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -665,7 +665,7 @@ rules: message: Include "Route53" in test name paths: include: - - internal/service/route53/*_test.go + - "/internal/service/route53/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -680,7 +680,7 @@ rules: message: Do not use "Route53" in const name inside route53 package paths: include: - - internal/service/route53 + - "/internal/service/route53" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -694,7 +694,7 @@ rules: message: Do not use "Route53" in var name inside route53 package paths: include: - - internal/service/route53 + - "/internal/service/route53" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -708,9 +708,9 @@ rules: message: Do not use "Route53Domains" in func name inside route53domains package paths: include: - - internal/service/route53domains + - "/internal/service/route53domains" exclude: - - internal/service/route53domains/list_pages_gen.go + - "/internal/service/route53domains/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -726,7 +726,7 @@ rules: message: Include "Route53Domains" in test name paths: include: - - internal/service/route53domains/*_test.go + - "/internal/service/route53domains/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -741,7 +741,7 @@ rules: message: Do not use "Route53Domains" in const name inside route53domains package paths: include: - - internal/service/route53domains + - "/internal/service/route53domains" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -755,7 +755,7 @@ rules: message: Do not use "Route53Domains" in var name inside route53domains package paths: include: - - internal/service/route53domains + - "/internal/service/route53domains" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -769,9 +769,9 @@ rules: message: Do not use "Route53Profiles" in func name inside route53profiles package paths: include: - - internal/service/route53profiles + - "/internal/service/route53profiles" exclude: - - internal/service/route53profiles/list_pages_gen.go + - "/internal/service/route53profiles/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -787,7 +787,7 @@ rules: message: Include "Route53Profiles" in test name paths: include: - - internal/service/route53profiles/*_test.go + - "/internal/service/route53profiles/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -802,7 +802,7 @@ rules: message: Do not use "Route53Profiles" in const name inside route53profiles package paths: include: - - internal/service/route53profiles + - "/internal/service/route53profiles" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -816,7 +816,7 @@ rules: message: Do not use "Route53Profiles" in var name inside route53profiles package paths: include: - - internal/service/route53profiles + - "/internal/service/route53profiles" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -830,9 +830,9 @@ rules: message: Do not use "Route53RecoveryControlConfig" in func name inside route53recoverycontrolconfig package paths: include: - - internal/service/route53recoverycontrolconfig + - "/internal/service/route53recoverycontrolconfig" exclude: - - internal/service/route53recoverycontrolconfig/list_pages_gen.go + - "/internal/service/route53recoverycontrolconfig/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -848,7 +848,7 @@ rules: message: Include "Route53RecoveryControlConfig" in test name paths: include: - - internal/service/route53recoverycontrolconfig/*_test.go + - "/internal/service/route53recoverycontrolconfig/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -863,7 +863,7 @@ rules: message: Do not use "Route53RecoveryControlConfig" in const name inside route53recoverycontrolconfig package paths: include: - - internal/service/route53recoverycontrolconfig + - "/internal/service/route53recoverycontrolconfig" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -877,7 +877,7 @@ rules: message: Do not use "Route53RecoveryControlConfig" in var name inside route53recoverycontrolconfig package paths: include: - - internal/service/route53recoverycontrolconfig + - "/internal/service/route53recoverycontrolconfig" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -891,9 +891,9 @@ rules: message: Do not use "Route53RecoveryReadiness" in func name inside route53recoveryreadiness package paths: include: - - internal/service/route53recoveryreadiness + - "/internal/service/route53recoveryreadiness" exclude: - - internal/service/route53recoveryreadiness/list_pages_gen.go + - "/internal/service/route53recoveryreadiness/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -909,7 +909,7 @@ rules: message: Include "Route53RecoveryReadiness" in test name paths: include: - - internal/service/route53recoveryreadiness/*_test.go + - "/internal/service/route53recoveryreadiness/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -924,7 +924,7 @@ rules: message: Do not use "Route53RecoveryReadiness" in const name inside route53recoveryreadiness package paths: include: - - internal/service/route53recoveryreadiness + - "/internal/service/route53recoveryreadiness" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -938,7 +938,7 @@ rules: message: Do not use "Route53RecoveryReadiness" in var name inside route53recoveryreadiness package paths: include: - - internal/service/route53recoveryreadiness + - "/internal/service/route53recoveryreadiness" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -952,9 +952,9 @@ rules: message: Do not use "Route53Resolver" in func name inside route53resolver package paths: include: - - internal/service/route53resolver + - "/internal/service/route53resolver" exclude: - - internal/service/route53resolver/list_pages_gen.go + - "/internal/service/route53resolver/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -970,7 +970,7 @@ rules: message: Include "Route53Resolver" in test name paths: include: - - internal/service/route53resolver/*_test.go + - "/internal/service/route53resolver/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -985,7 +985,7 @@ rules: message: Do not use "Route53Resolver" in const name inside route53resolver package paths: include: - - internal/service/route53resolver + - "/internal/service/route53resolver" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -999,7 +999,7 @@ rules: message: Do not use "Route53Resolver" in var name inside route53resolver package paths: include: - - internal/service/route53resolver + - "/internal/service/route53resolver" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1013,9 +1013,9 @@ rules: message: Do not use "RUM" in func name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" exclude: - - internal/service/rum/list_pages_gen.go + - "/internal/service/rum/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1031,7 +1031,7 @@ rules: message: Include "RUM" in test name paths: include: - - internal/service/rum/*_test.go + - "/internal/service/rum/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1046,7 +1046,7 @@ rules: message: Do not use "RUM" in const name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1060,7 +1060,7 @@ rules: message: Do not use "RUM" in var name inside rum package paths: include: - - internal/service/rum + - "/internal/service/rum" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1074,9 +1074,9 @@ rules: message: Do not use "S3" in func name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" exclude: - - internal/service/s3/list_pages_gen.go + - "/internal/service/s3/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1092,7 +1092,7 @@ rules: message: Include "S3" in test name paths: include: - - internal/service/s3/*_test.go + - "/internal/service/s3/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1107,7 +1107,7 @@ rules: message: Do not use "S3" in const name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1121,7 +1121,7 @@ rules: message: Do not use "S3" in var name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1135,9 +1135,9 @@ rules: message: Do not use "s3api" in func name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" exclude: - - internal/service/s3/list_pages_gen.go + - "/internal/service/s3/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1153,7 +1153,7 @@ rules: message: Do not use "s3api" in const name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1167,7 +1167,7 @@ rules: message: Do not use "s3api" in var name inside s3 package paths: include: - - internal/service/s3 + - "/internal/service/s3" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1181,9 +1181,9 @@ rules: message: Do not use "S3Control" in func name inside s3control package paths: include: - - internal/service/s3control + - "/internal/service/s3control" exclude: - - internal/service/s3control/list_pages_gen.go + - "/internal/service/s3control/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1199,7 +1199,7 @@ rules: message: Include "S3Control" in test name paths: include: - - internal/service/s3control/*_test.go + - "/internal/service/s3control/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1214,7 +1214,7 @@ rules: message: Do not use "S3Control" in const name inside s3control package paths: include: - - internal/service/s3control + - "/internal/service/s3control" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1228,7 +1228,7 @@ rules: message: Do not use "S3Control" in var name inside s3control package paths: include: - - internal/service/s3control + - "/internal/service/s3control" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1242,9 +1242,9 @@ rules: message: Do not use "S3Outposts" in func name inside s3outposts package paths: include: - - internal/service/s3outposts + - "/internal/service/s3outposts" exclude: - - internal/service/s3outposts/list_pages_gen.go + - "/internal/service/s3outposts/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1260,7 +1260,7 @@ rules: message: Include "S3Outposts" in test name paths: include: - - internal/service/s3outposts/*_test.go + - "/internal/service/s3outposts/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1275,7 +1275,7 @@ rules: message: Do not use "S3Outposts" in const name inside s3outposts package paths: include: - - internal/service/s3outposts + - "/internal/service/s3outposts" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1289,7 +1289,7 @@ rules: message: Do not use "S3Outposts" in var name inside s3outposts package paths: include: - - internal/service/s3outposts + - "/internal/service/s3outposts" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1303,9 +1303,9 @@ rules: message: Do not use "S3Tables" in func name inside s3tables package paths: include: - - internal/service/s3tables + - "/internal/service/s3tables" exclude: - - internal/service/s3tables/list_pages_gen.go + - "/internal/service/s3tables/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1321,7 +1321,7 @@ rules: message: Include "S3Tables" in test name paths: include: - - internal/service/s3tables/*_test.go + - "/internal/service/s3tables/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1336,7 +1336,7 @@ rules: message: Do not use "S3Tables" in const name inside s3tables package paths: include: - - internal/service/s3tables + - "/internal/service/s3tables" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1350,7 +1350,7 @@ rules: message: Do not use "S3Tables" in var name inside s3tables package paths: include: - - internal/service/s3tables + - "/internal/service/s3tables" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1364,9 +1364,9 @@ rules: message: Do not use "S3Vectors" in func name inside s3vectors package paths: include: - - internal/service/s3vectors + - "/internal/service/s3vectors" exclude: - - internal/service/s3vectors/list_pages_gen.go + - "/internal/service/s3vectors/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1382,7 +1382,7 @@ rules: message: Include "S3Vectors" in test name paths: include: - - internal/service/s3vectors/*_test.go + - "/internal/service/s3vectors/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1397,7 +1397,7 @@ rules: message: Do not use "S3Vectors" in const name inside s3vectors package paths: include: - - internal/service/s3vectors + - "/internal/service/s3vectors" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1411,7 +1411,7 @@ rules: message: Do not use "S3Vectors" in var name inside s3vectors package paths: include: - - internal/service/s3vectors + - "/internal/service/s3vectors" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1425,9 +1425,9 @@ rules: message: Do not use "SageMaker" in func name inside sagemaker package paths: include: - - internal/service/sagemaker + - "/internal/service/sagemaker" exclude: - - internal/service/sagemaker/list_pages_gen.go + - "/internal/service/sagemaker/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1443,7 +1443,7 @@ rules: message: Include "SageMaker" in test name paths: include: - - internal/service/sagemaker/*_test.go + - "/internal/service/sagemaker/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1458,7 +1458,7 @@ rules: message: Do not use "SageMaker" in const name inside sagemaker package paths: include: - - internal/service/sagemaker + - "/internal/service/sagemaker" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1472,7 +1472,7 @@ rules: message: Do not use "SageMaker" in var name inside sagemaker package paths: include: - - internal/service/sagemaker + - "/internal/service/sagemaker" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1486,9 +1486,9 @@ rules: message: Do not use "Scheduler" in func name inside scheduler package paths: include: - - internal/service/scheduler + - "/internal/service/scheduler" exclude: - - internal/service/scheduler/list_pages_gen.go + - "/internal/service/scheduler/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1504,7 +1504,7 @@ rules: message: Include "Scheduler" in test name paths: include: - - internal/service/scheduler/*_test.go + - "/internal/service/scheduler/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1519,7 +1519,7 @@ rules: message: Do not use "Scheduler" in const name inside scheduler package paths: include: - - internal/service/scheduler + - "/internal/service/scheduler" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1533,7 +1533,7 @@ rules: message: Do not use "Scheduler" in var name inside scheduler package paths: include: - - internal/service/scheduler + - "/internal/service/scheduler" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1547,9 +1547,9 @@ rules: message: Do not use "Schemas" in func name inside schemas package paths: include: - - internal/service/schemas + - "/internal/service/schemas" exclude: - - internal/service/schemas/list_pages_gen.go + - "/internal/service/schemas/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1565,7 +1565,7 @@ rules: message: Include "Schemas" in test name paths: include: - - internal/service/schemas/*_test.go + - "/internal/service/schemas/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1580,7 +1580,7 @@ rules: message: Do not use "Schemas" in const name inside schemas package paths: include: - - internal/service/schemas + - "/internal/service/schemas" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1594,7 +1594,7 @@ rules: message: Do not use "Schemas" in var name inside schemas package paths: include: - - internal/service/schemas + - "/internal/service/schemas" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1608,9 +1608,9 @@ rules: message: Do not use "SecretsManager" in func name inside secretsmanager package paths: include: - - internal/service/secretsmanager + - "/internal/service/secretsmanager" exclude: - - internal/service/secretsmanager/list_pages_gen.go + - "/internal/service/secretsmanager/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1626,7 +1626,7 @@ rules: message: Include "SecretsManager" in test name paths: include: - - internal/service/secretsmanager/*_test.go + - "/internal/service/secretsmanager/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1641,7 +1641,7 @@ rules: message: Do not use "SecretsManager" in const name inside secretsmanager package paths: include: - - internal/service/secretsmanager + - "/internal/service/secretsmanager" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1655,7 +1655,7 @@ rules: message: Do not use "SecretsManager" in var name inside secretsmanager package paths: include: - - internal/service/secretsmanager + - "/internal/service/secretsmanager" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1669,9 +1669,9 @@ rules: message: Do not use "SecurityHub" in func name inside securityhub package paths: include: - - internal/service/securityhub + - "/internal/service/securityhub" exclude: - - internal/service/securityhub/list_pages_gen.go + - "/internal/service/securityhub/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1687,7 +1687,7 @@ rules: message: Include "SecurityHub" in test name paths: include: - - internal/service/securityhub/*_test.go + - "/internal/service/securityhub/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1702,7 +1702,7 @@ rules: message: Do not use "SecurityHub" in const name inside securityhub package paths: include: - - internal/service/securityhub + - "/internal/service/securityhub" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1716,7 +1716,7 @@ rules: message: Do not use "SecurityHub" in var name inside securityhub package paths: include: - - internal/service/securityhub + - "/internal/service/securityhub" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1730,9 +1730,9 @@ rules: message: Do not use "SecurityLake" in func name inside securitylake package paths: include: - - internal/service/securitylake + - "/internal/service/securitylake" exclude: - - internal/service/securitylake/list_pages_gen.go + - "/internal/service/securitylake/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1748,7 +1748,7 @@ rules: message: Include "SecurityLake" in test name paths: include: - - internal/service/securitylake/*_test.go + - "/internal/service/securitylake/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1763,7 +1763,7 @@ rules: message: Do not use "SecurityLake" in const name inside securitylake package paths: include: - - internal/service/securitylake + - "/internal/service/securitylake" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1777,7 +1777,7 @@ rules: message: Do not use "SecurityLake" in var name inside securitylake package paths: include: - - internal/service/securitylake + - "/internal/service/securitylake" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1791,9 +1791,9 @@ rules: message: Do not use "serverlessapplicationrepository" in func name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" exclude: - - internal/service/serverlessrepo/list_pages_gen.go + - "/internal/service/serverlessrepo/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1809,7 +1809,7 @@ rules: message: Do not use "serverlessapplicationrepository" in const name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1823,7 +1823,7 @@ rules: message: Do not use "serverlessapplicationrepository" in var name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1837,9 +1837,9 @@ rules: message: Do not use "serverlessapprepo" in func name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" exclude: - - internal/service/serverlessrepo/list_pages_gen.go + - "/internal/service/serverlessrepo/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1855,7 +1855,7 @@ rules: message: Do not use "serverlessapprepo" in const name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1869,7 +1869,7 @@ rules: message: Do not use "serverlessapprepo" in var name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1883,9 +1883,9 @@ rules: message: Do not use "ServerlessRepo" in func name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" exclude: - - internal/service/serverlessrepo/list_pages_gen.go + - "/internal/service/serverlessrepo/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1901,7 +1901,7 @@ rules: message: Include "ServerlessRepo" in test name paths: include: - - internal/service/serverlessrepo/*_test.go + - "/internal/service/serverlessrepo/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1916,7 +1916,7 @@ rules: message: Do not use "ServerlessRepo" in const name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1930,7 +1930,7 @@ rules: message: Do not use "ServerlessRepo" in var name inside serverlessrepo package paths: include: - - internal/service/serverlessrepo + - "/internal/service/serverlessrepo" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -1944,9 +1944,9 @@ rules: message: Do not use "ServiceCatalog" in func name inside servicecatalog package paths: include: - - internal/service/servicecatalog + - "/internal/service/servicecatalog" exclude: - - internal/service/servicecatalog/list_pages_gen.go + - "/internal/service/servicecatalog/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1962,7 +1962,7 @@ rules: message: Include "ServiceCatalog" in test name paths: include: - - internal/service/servicecatalog/*_test.go + - "/internal/service/servicecatalog/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -1977,7 +1977,7 @@ rules: message: Do not use "ServiceCatalog" in const name inside servicecatalog package paths: include: - - internal/service/servicecatalog + - "/internal/service/servicecatalog" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -1991,7 +1991,7 @@ rules: message: Do not use "ServiceCatalog" in var name inside servicecatalog package paths: include: - - internal/service/servicecatalog + - "/internal/service/servicecatalog" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2005,9 +2005,9 @@ rules: message: Do not use "ServiceCatalogAppRegistry" in func name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" exclude: - - internal/service/servicecatalogappregistry/list_pages_gen.go + - "/internal/service/servicecatalogappregistry/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2023,7 +2023,7 @@ rules: message: Include "ServiceCatalogAppRegistry" in test name paths: include: - - internal/service/servicecatalogappregistry/*_test.go + - "/internal/service/servicecatalogappregistry/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2038,7 +2038,7 @@ rules: message: Do not use "ServiceCatalogAppRegistry" in const name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2052,7 +2052,7 @@ rules: message: Do not use "ServiceCatalogAppRegistry" in var name inside servicecatalogappregistry package paths: include: - - internal/service/servicecatalogappregistry + - "/internal/service/servicecatalogappregistry" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2066,9 +2066,9 @@ rules: message: Do not use "ServiceDiscovery" in func name inside servicediscovery package paths: include: - - internal/service/servicediscovery + - "/internal/service/servicediscovery" exclude: - - internal/service/servicediscovery/list_pages_gen.go + - "/internal/service/servicediscovery/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2084,7 +2084,7 @@ rules: message: Include "ServiceDiscovery" in test name paths: include: - - internal/service/servicediscovery/*_test.go + - "/internal/service/servicediscovery/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2099,7 +2099,7 @@ rules: message: Do not use "ServiceDiscovery" in const name inside servicediscovery package paths: include: - - internal/service/servicediscovery + - "/internal/service/servicediscovery" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2113,7 +2113,7 @@ rules: message: Do not use "ServiceDiscovery" in var name inside servicediscovery package paths: include: - - internal/service/servicediscovery + - "/internal/service/servicediscovery" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2127,9 +2127,9 @@ rules: message: Do not use "ServiceQuotas" in func name inside servicequotas package paths: include: - - internal/service/servicequotas + - "/internal/service/servicequotas" exclude: - - internal/service/servicequotas/list_pages_gen.go + - "/internal/service/servicequotas/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2145,7 +2145,7 @@ rules: message: Include "ServiceQuotas" in test name paths: include: - - internal/service/servicequotas/*_test.go + - "/internal/service/servicequotas/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2160,7 +2160,7 @@ rules: message: Do not use "ServiceQuotas" in const name inside servicequotas package paths: include: - - internal/service/servicequotas + - "/internal/service/servicequotas" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2174,7 +2174,7 @@ rules: message: Do not use "ServiceQuotas" in var name inside servicequotas package paths: include: - - internal/service/servicequotas + - "/internal/service/servicequotas" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2188,9 +2188,9 @@ rules: message: Do not use "SES" in func name inside ses package paths: include: - - internal/service/ses + - "/internal/service/ses" exclude: - - internal/service/ses/list_pages_gen.go + - "/internal/service/ses/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2206,7 +2206,7 @@ rules: message: Include "SES" in test name paths: include: - - internal/service/ses/*_test.go + - "/internal/service/ses/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2221,7 +2221,7 @@ rules: message: Do not use "SES" in const name inside ses package paths: include: - - internal/service/ses + - "/internal/service/ses" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2235,7 +2235,7 @@ rules: message: Do not use "SES" in var name inside ses package paths: include: - - internal/service/ses + - "/internal/service/ses" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2249,9 +2249,9 @@ rules: message: Do not use "SESV2" in func name inside sesv2 package paths: include: - - internal/service/sesv2 + - "/internal/service/sesv2" exclude: - - internal/service/sesv2/list_pages_gen.go + - "/internal/service/sesv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2267,7 +2267,7 @@ rules: message: Include "SESV2" in test name paths: include: - - internal/service/sesv2/*_test.go + - "/internal/service/sesv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2282,7 +2282,7 @@ rules: message: Do not use "SESV2" in const name inside sesv2 package paths: include: - - internal/service/sesv2 + - "/internal/service/sesv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2296,7 +2296,7 @@ rules: message: Do not use "SESV2" in var name inside sesv2 package paths: include: - - internal/service/sesv2 + - "/internal/service/sesv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2310,9 +2310,9 @@ rules: message: Do not use "SFN" in func name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" exclude: - - internal/service/sfn/list_pages_gen.go + - "/internal/service/sfn/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2328,7 +2328,7 @@ rules: message: Include "SFN" in test name paths: include: - - internal/service/sfn/*_test.go + - "/internal/service/sfn/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2343,7 +2343,7 @@ rules: message: Do not use "SFN" in const name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2357,7 +2357,7 @@ rules: message: Do not use "SFN" in var name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2371,9 +2371,9 @@ rules: message: Do not use "Shield" in func name inside shield package paths: include: - - internal/service/shield + - "/internal/service/shield" exclude: - - internal/service/shield/list_pages_gen.go + - "/internal/service/shield/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2389,7 +2389,7 @@ rules: message: Include "Shield" in test name paths: include: - - internal/service/shield/*_test.go + - "/internal/service/shield/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2404,7 +2404,7 @@ rules: message: Do not use "Shield" in const name inside shield package paths: include: - - internal/service/shield + - "/internal/service/shield" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2418,7 +2418,7 @@ rules: message: Do not use "Shield" in var name inside shield package paths: include: - - internal/service/shield + - "/internal/service/shield" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2432,9 +2432,9 @@ rules: message: Do not use "Signer" in func name inside signer package paths: include: - - internal/service/signer + - "/internal/service/signer" exclude: - - internal/service/signer/list_pages_gen.go + - "/internal/service/signer/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2450,7 +2450,7 @@ rules: message: Include "Signer" in test name paths: include: - - internal/service/signer/*_test.go + - "/internal/service/signer/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2465,7 +2465,7 @@ rules: message: Do not use "Signer" in const name inside signer package paths: include: - - internal/service/signer + - "/internal/service/signer" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2479,7 +2479,7 @@ rules: message: Do not use "Signer" in var name inside signer package paths: include: - - internal/service/signer + - "/internal/service/signer" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2493,9 +2493,9 @@ rules: message: Do not use "SNS" in func name inside sns package paths: include: - - internal/service/sns + - "/internal/service/sns" exclude: - - internal/service/sns/list_pages_gen.go + - "/internal/service/sns/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2511,7 +2511,7 @@ rules: message: Include "SNS" in test name paths: include: - - internal/service/sns/*_test.go + - "/internal/service/sns/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2526,7 +2526,7 @@ rules: message: Do not use "SNS" in const name inside sns package paths: include: - - internal/service/sns + - "/internal/service/sns" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2540,7 +2540,7 @@ rules: message: Do not use "SNS" in var name inside sns package paths: include: - - internal/service/sns + - "/internal/service/sns" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2554,9 +2554,9 @@ rules: message: Do not use "SQS" in func name inside sqs package paths: include: - - internal/service/sqs + - "/internal/service/sqs" exclude: - - internal/service/sqs/list_pages_gen.go + - "/internal/service/sqs/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2572,7 +2572,7 @@ rules: message: Include "SQS" in test name paths: include: - - internal/service/sqs/*_test.go + - "/internal/service/sqs/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2587,7 +2587,7 @@ rules: message: Do not use "SQS" in const name inside sqs package paths: include: - - internal/service/sqs + - "/internal/service/sqs" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2601,7 +2601,7 @@ rules: message: Do not use "SQS" in var name inside sqs package paths: include: - - internal/service/sqs + - "/internal/service/sqs" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2615,9 +2615,9 @@ rules: message: Do not use "SSM" in func name inside ssm package paths: include: - - internal/service/ssm + - "/internal/service/ssm" exclude: - - internal/service/ssm/list_pages_gen.go + - "/internal/service/ssm/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2633,7 +2633,7 @@ rules: message: Include "SSM" in test name paths: include: - - internal/service/ssm/*_test.go + - "/internal/service/ssm/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2648,7 +2648,7 @@ rules: message: Do not use "SSM" in const name inside ssm package paths: include: - - internal/service/ssm + - "/internal/service/ssm" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2662,7 +2662,7 @@ rules: message: Do not use "SSM" in var name inside ssm package paths: include: - - internal/service/ssm + - "/internal/service/ssm" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2676,9 +2676,9 @@ rules: message: Do not use "SSMContacts" in func name inside ssmcontacts package paths: include: - - internal/service/ssmcontacts + - "/internal/service/ssmcontacts" exclude: - - internal/service/ssmcontacts/list_pages_gen.go + - "/internal/service/ssmcontacts/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2694,7 +2694,7 @@ rules: message: Include "SSMContacts" in test name paths: include: - - internal/service/ssmcontacts/*_test.go + - "/internal/service/ssmcontacts/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2709,7 +2709,7 @@ rules: message: Do not use "SSMContacts" in const name inside ssmcontacts package paths: include: - - internal/service/ssmcontacts + - "/internal/service/ssmcontacts" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2723,7 +2723,7 @@ rules: message: Do not use "SSMContacts" in var name inside ssmcontacts package paths: include: - - internal/service/ssmcontacts + - "/internal/service/ssmcontacts" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2737,9 +2737,9 @@ rules: message: Do not use "SSMIncidents" in func name inside ssmincidents package paths: include: - - internal/service/ssmincidents + - "/internal/service/ssmincidents" exclude: - - internal/service/ssmincidents/list_pages_gen.go + - "/internal/service/ssmincidents/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2755,7 +2755,7 @@ rules: message: Include "SSMIncidents" in test name paths: include: - - internal/service/ssmincidents/*_test.go + - "/internal/service/ssmincidents/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2770,7 +2770,7 @@ rules: message: Do not use "SSMIncidents" in const name inside ssmincidents package paths: include: - - internal/service/ssmincidents + - "/internal/service/ssmincidents" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2784,7 +2784,7 @@ rules: message: Do not use "SSMIncidents" in var name inside ssmincidents package paths: include: - - internal/service/ssmincidents + - "/internal/service/ssmincidents" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2798,9 +2798,9 @@ rules: message: Do not use "SSMQuickSetup" in func name inside ssmquicksetup package paths: include: - - internal/service/ssmquicksetup + - "/internal/service/ssmquicksetup" exclude: - - internal/service/ssmquicksetup/list_pages_gen.go + - "/internal/service/ssmquicksetup/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2816,7 +2816,7 @@ rules: message: Include "SSMQuickSetup" in test name paths: include: - - internal/service/ssmquicksetup/*_test.go + - "/internal/service/ssmquicksetup/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2831,7 +2831,7 @@ rules: message: Do not use "SSMQuickSetup" in const name inside ssmquicksetup package paths: include: - - internal/service/ssmquicksetup + - "/internal/service/ssmquicksetup" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2845,7 +2845,7 @@ rules: message: Do not use "SSMQuickSetup" in var name inside ssmquicksetup package paths: include: - - internal/service/ssmquicksetup + - "/internal/service/ssmquicksetup" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2859,9 +2859,9 @@ rules: message: Do not use "SSMSAP" in func name inside ssmsap package paths: include: - - internal/service/ssmsap + - "/internal/service/ssmsap" exclude: - - internal/service/ssmsap/list_pages_gen.go + - "/internal/service/ssmsap/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2877,7 +2877,7 @@ rules: message: Include "SSMSAP" in test name paths: include: - - internal/service/ssmsap/*_test.go + - "/internal/service/ssmsap/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2892,7 +2892,7 @@ rules: message: Do not use "SSMSAP" in const name inside ssmsap package paths: include: - - internal/service/ssmsap + - "/internal/service/ssmsap" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2906,7 +2906,7 @@ rules: message: Do not use "SSMSAP" in var name inside ssmsap package paths: include: - - internal/service/ssmsap + - "/internal/service/ssmsap" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2920,9 +2920,9 @@ rules: message: Do not use "SSO" in func name inside sso package paths: include: - - internal/service/sso + - "/internal/service/sso" exclude: - - internal/service/sso/list_pages_gen.go + - "/internal/service/sso/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2938,7 +2938,7 @@ rules: message: Include "SSO" in test name paths: include: - - internal/service/sso/*_test.go + - "/internal/service/sso/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2953,7 +2953,7 @@ rules: message: Do not use "SSO" in const name inside sso package paths: include: - - internal/service/sso + - "/internal/service/sso" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -2967,7 +2967,7 @@ rules: message: Do not use "SSO" in var name inside sso package paths: include: - - internal/service/sso + - "/internal/service/sso" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -2981,9 +2981,9 @@ rules: message: Do not use "SSOAdmin" in func name inside ssoadmin package paths: include: - - internal/service/ssoadmin + - "/internal/service/ssoadmin" exclude: - - internal/service/ssoadmin/list_pages_gen.go + - "/internal/service/ssoadmin/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -2999,7 +2999,7 @@ rules: message: Include "SSOAdmin" in test name paths: include: - - internal/service/ssoadmin/*_test.go + - "/internal/service/ssoadmin/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3014,7 +3014,7 @@ rules: message: Do not use "SSOAdmin" in const name inside ssoadmin package paths: include: - - internal/service/ssoadmin + - "/internal/service/ssoadmin" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3028,7 +3028,7 @@ rules: message: Do not use "SSOAdmin" in var name inside ssoadmin package paths: include: - - internal/service/ssoadmin + - "/internal/service/ssoadmin" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3042,9 +3042,9 @@ rules: message: Do not use "stepfunctions" in func name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" exclude: - - internal/service/sfn/list_pages_gen.go + - "/internal/service/sfn/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3060,7 +3060,7 @@ rules: message: Do not use "stepfunctions" in const name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3074,7 +3074,7 @@ rules: message: Do not use "stepfunctions" in var name inside sfn package paths: include: - - internal/service/sfn + - "/internal/service/sfn" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3088,9 +3088,9 @@ rules: message: Do not use "StorageGateway" in func name inside storagegateway package paths: include: - - internal/service/storagegateway + - "/internal/service/storagegateway" exclude: - - internal/service/storagegateway/list_pages_gen.go + - "/internal/service/storagegateway/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3106,7 +3106,7 @@ rules: message: Include "StorageGateway" in test name paths: include: - - internal/service/storagegateway/*_test.go + - "/internal/service/storagegateway/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3121,7 +3121,7 @@ rules: message: Do not use "StorageGateway" in const name inside storagegateway package paths: include: - - internal/service/storagegateway + - "/internal/service/storagegateway" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3135,7 +3135,7 @@ rules: message: Do not use "StorageGateway" in var name inside storagegateway package paths: include: - - internal/service/storagegateway + - "/internal/service/storagegateway" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3149,9 +3149,9 @@ rules: message: Do not use "STS" in func name inside sts package paths: include: - - internal/service/sts + - "/internal/service/sts" exclude: - - internal/service/sts/list_pages_gen.go + - "/internal/service/sts/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3167,7 +3167,7 @@ rules: message: Include "STS" in test name paths: include: - - internal/service/sts/*_test.go + - "/internal/service/sts/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3182,7 +3182,7 @@ rules: message: Do not use "STS" in const name inside sts package paths: include: - - internal/service/sts + - "/internal/service/sts" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3196,7 +3196,7 @@ rules: message: Do not use "STS" in var name inside sts package paths: include: - - internal/service/sts + - "/internal/service/sts" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3210,9 +3210,9 @@ rules: message: Do not use "SWF" in func name inside swf package paths: include: - - internal/service/swf + - "/internal/service/swf" exclude: - - internal/service/swf/list_pages_gen.go + - "/internal/service/swf/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3228,7 +3228,7 @@ rules: message: Include "SWF" in test name paths: include: - - internal/service/swf/*_test.go + - "/internal/service/swf/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3243,7 +3243,7 @@ rules: message: Do not use "SWF" in const name inside swf package paths: include: - - internal/service/swf + - "/internal/service/swf" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3257,7 +3257,7 @@ rules: message: Do not use "SWF" in var name inside swf package paths: include: - - internal/service/swf + - "/internal/service/swf" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3271,9 +3271,9 @@ rules: message: Do not use "Synthetics" in func name inside synthetics package paths: include: - - internal/service/synthetics + - "/internal/service/synthetics" exclude: - - internal/service/synthetics/list_pages_gen.go + - "/internal/service/synthetics/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3289,7 +3289,7 @@ rules: message: Include "Synthetics" in test name paths: include: - - internal/service/synthetics/*_test.go + - "/internal/service/synthetics/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3304,7 +3304,7 @@ rules: message: Do not use "Synthetics" in const name inside synthetics package paths: include: - - internal/service/synthetics + - "/internal/service/synthetics" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3318,7 +3318,7 @@ rules: message: Do not use "Synthetics" in var name inside synthetics package paths: include: - - internal/service/synthetics + - "/internal/service/synthetics" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3332,9 +3332,9 @@ rules: message: Do not use "TaxSettings" in func name inside taxsettings package paths: include: - - internal/service/taxsettings + - "/internal/service/taxsettings" exclude: - - internal/service/taxsettings/list_pages_gen.go + - "/internal/service/taxsettings/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3350,7 +3350,7 @@ rules: message: Include "TaxSettings" in test name paths: include: - - internal/service/taxsettings/*_test.go + - "/internal/service/taxsettings/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3365,7 +3365,7 @@ rules: message: Do not use "TaxSettings" in const name inside taxsettings package paths: include: - - internal/service/taxsettings + - "/internal/service/taxsettings" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3379,7 +3379,7 @@ rules: message: Do not use "TaxSettings" in var name inside taxsettings package paths: include: - - internal/service/taxsettings + - "/internal/service/taxsettings" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3393,9 +3393,9 @@ rules: message: Do not use "TimestreamInfluxDB" in func name inside timestreaminfluxdb package paths: include: - - internal/service/timestreaminfluxdb + - "/internal/service/timestreaminfluxdb" exclude: - - internal/service/timestreaminfluxdb/list_pages_gen.go + - "/internal/service/timestreaminfluxdb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3411,7 +3411,7 @@ rules: message: Include "TimestreamInfluxDB" in test name paths: include: - - internal/service/timestreaminfluxdb/*_test.go + - "/internal/service/timestreaminfluxdb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3426,7 +3426,7 @@ rules: message: Do not use "TimestreamInfluxDB" in const name inside timestreaminfluxdb package paths: include: - - internal/service/timestreaminfluxdb + - "/internal/service/timestreaminfluxdb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3440,7 +3440,7 @@ rules: message: Do not use "TimestreamInfluxDB" in var name inside timestreaminfluxdb package paths: include: - - internal/service/timestreaminfluxdb + - "/internal/service/timestreaminfluxdb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3454,9 +3454,9 @@ rules: message: Do not use "TimestreamQuery" in func name inside timestreamquery package paths: include: - - internal/service/timestreamquery + - "/internal/service/timestreamquery" exclude: - - internal/service/timestreamquery/list_pages_gen.go + - "/internal/service/timestreamquery/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3472,7 +3472,7 @@ rules: message: Include "TimestreamQuery" in test name paths: include: - - internal/service/timestreamquery/*_test.go + - "/internal/service/timestreamquery/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3487,7 +3487,7 @@ rules: message: Do not use "TimestreamQuery" in const name inside timestreamquery package paths: include: - - internal/service/timestreamquery + - "/internal/service/timestreamquery" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3501,7 +3501,7 @@ rules: message: Do not use "TimestreamQuery" in var name inside timestreamquery package paths: include: - - internal/service/timestreamquery + - "/internal/service/timestreamquery" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3515,9 +3515,9 @@ rules: message: Do not use "TimestreamWrite" in func name inside timestreamwrite package paths: include: - - internal/service/timestreamwrite + - "/internal/service/timestreamwrite" exclude: - - internal/service/timestreamwrite/list_pages_gen.go + - "/internal/service/timestreamwrite/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3533,7 +3533,7 @@ rules: message: Include "TimestreamWrite" in test name paths: include: - - internal/service/timestreamwrite/*_test.go + - "/internal/service/timestreamwrite/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3548,7 +3548,7 @@ rules: message: Do not use "TimestreamWrite" in const name inside timestreamwrite package paths: include: - - internal/service/timestreamwrite + - "/internal/service/timestreamwrite" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3562,7 +3562,7 @@ rules: message: Do not use "TimestreamWrite" in var name inside timestreamwrite package paths: include: - - internal/service/timestreamwrite + - "/internal/service/timestreamwrite" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3576,9 +3576,9 @@ rules: message: Do not use "Transcribe" in func name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" exclude: - - internal/service/transcribe/list_pages_gen.go + - "/internal/service/transcribe/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3594,7 +3594,7 @@ rules: message: Include "Transcribe" in test name paths: include: - - internal/service/transcribe/*_test.go + - "/internal/service/transcribe/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3609,7 +3609,7 @@ rules: message: Do not use "Transcribe" in const name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3623,7 +3623,7 @@ rules: message: Do not use "Transcribe" in var name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3637,9 +3637,9 @@ rules: message: Do not use "transcribeservice" in func name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" exclude: - - internal/service/transcribe/list_pages_gen.go + - "/internal/service/transcribe/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3655,7 +3655,7 @@ rules: message: Do not use "transcribeservice" in const name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3669,7 +3669,7 @@ rules: message: Do not use "transcribeservice" in var name inside transcribe package paths: include: - - internal/service/transcribe + - "/internal/service/transcribe" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3683,9 +3683,9 @@ rules: message: Do not use "Transfer" in func name inside transfer package paths: include: - - internal/service/transfer + - "/internal/service/transfer" exclude: - - internal/service/transfer/list_pages_gen.go + - "/internal/service/transfer/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3701,7 +3701,7 @@ rules: message: Include "Transfer" in test name paths: include: - - internal/service/transfer/*_test.go + - "/internal/service/transfer/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3716,7 +3716,7 @@ rules: message: Do not use "Transfer" in const name inside transfer package paths: include: - - internal/service/transfer + - "/internal/service/transfer" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3730,7 +3730,7 @@ rules: message: Do not use "Transfer" in var name inside transfer package paths: include: - - internal/service/transfer + - "/internal/service/transfer" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3744,7 +3744,7 @@ rules: message: Include "TransitGateway" in test name paths: include: - - internal/service/ec2/transitgateway_*_test.go + - "/internal/service/ec2/transitgateway_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3759,7 +3759,7 @@ rules: message: Include "VerifiedAccess" in test name paths: include: - - internal/service/ec2/verifiedaccess_*_test.go + - "/internal/service/ec2/verifiedaccess_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3774,9 +3774,9 @@ rules: message: Do not use "VerifiedPermissions" in func name inside verifiedpermissions package paths: include: - - internal/service/verifiedpermissions + - "/internal/service/verifiedpermissions" exclude: - - internal/service/verifiedpermissions/list_pages_gen.go + - "/internal/service/verifiedpermissions/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3792,7 +3792,7 @@ rules: message: Include "VerifiedPermissions" in test name paths: include: - - internal/service/verifiedpermissions/*_test.go + - "/internal/service/verifiedpermissions/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3807,7 +3807,7 @@ rules: message: Do not use "VerifiedPermissions" in const name inside verifiedpermissions package paths: include: - - internal/service/verifiedpermissions + - "/internal/service/verifiedpermissions" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3821,7 +3821,7 @@ rules: message: Do not use "VerifiedPermissions" in var name inside verifiedpermissions package paths: include: - - internal/service/verifiedpermissions + - "/internal/service/verifiedpermissions" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3835,7 +3835,7 @@ rules: message: Include "VPC" in test name paths: include: - - internal/service/ec2/vpc_*_test.go + - "/internal/service/ec2/vpc_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3850,9 +3850,9 @@ rules: message: Do not use "VPCLattice" in func name inside vpclattice package paths: include: - - internal/service/vpclattice + - "/internal/service/vpclattice" exclude: - - internal/service/vpclattice/list_pages_gen.go + - "/internal/service/vpclattice/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3868,7 +3868,7 @@ rules: message: Include "VPCLattice" in test name paths: include: - - internal/service/vpclattice/*_test.go + - "/internal/service/vpclattice/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3883,7 +3883,7 @@ rules: message: Do not use "VPCLattice" in const name inside vpclattice package paths: include: - - internal/service/vpclattice + - "/internal/service/vpclattice" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3897,7 +3897,7 @@ rules: message: Do not use "VPCLattice" in var name inside vpclattice package paths: include: - - internal/service/vpclattice + - "/internal/service/vpclattice" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -3911,7 +3911,7 @@ rules: message: Include "ClientVPN" in test name paths: include: - - internal/service/ec2/vpnclient_*_test.go + - "/internal/service/ec2/vpnclient_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3926,7 +3926,7 @@ rules: message: Include "SiteVPN" in test name paths: include: - - internal/service/ec2/vpnsite_*_test.go + - "/internal/service/ec2/vpnsite_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3941,9 +3941,9 @@ rules: message: Do not use "WAF" in func name inside waf package paths: include: - - internal/service/waf + - "/internal/service/waf" exclude: - - internal/service/waf/list_pages_gen.go + - "/internal/service/waf/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3959,7 +3959,7 @@ rules: message: Include "WAF" in test name paths: include: - - internal/service/waf/*_test.go + - "/internal/service/waf/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -3974,7 +3974,7 @@ rules: message: Do not use "WAF" in const name inside waf package paths: include: - - internal/service/waf + - "/internal/service/waf" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -3988,7 +3988,7 @@ rules: message: Do not use "WAF" in var name inside waf package paths: include: - - internal/service/waf + - "/internal/service/waf" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4002,9 +4002,9 @@ rules: message: Do not use "WAFRegional" in func name inside wafregional package paths: include: - - internal/service/wafregional + - "/internal/service/wafregional" exclude: - - internal/service/wafregional/list_pages_gen.go + - "/internal/service/wafregional/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4020,7 +4020,7 @@ rules: message: Include "WAFRegional" in test name paths: include: - - internal/service/wafregional/*_test.go + - "/internal/service/wafregional/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4035,7 +4035,7 @@ rules: message: Do not use "WAFRegional" in const name inside wafregional package paths: include: - - internal/service/wafregional + - "/internal/service/wafregional" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4049,7 +4049,7 @@ rules: message: Do not use "WAFRegional" in var name inside wafregional package paths: include: - - internal/service/wafregional + - "/internal/service/wafregional" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4063,9 +4063,9 @@ rules: message: Do not use "WAFV2" in func name inside wafv2 package paths: include: - - internal/service/wafv2 + - "/internal/service/wafv2" exclude: - - internal/service/wafv2/list_pages_gen.go + - "/internal/service/wafv2/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4081,7 +4081,7 @@ rules: message: Include "WAFV2" in test name paths: include: - - internal/service/wafv2/*_test.go + - "/internal/service/wafv2/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4096,7 +4096,7 @@ rules: message: Do not use "WAFV2" in const name inside wafv2 package paths: include: - - internal/service/wafv2 + - "/internal/service/wafv2" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4110,7 +4110,7 @@ rules: message: Do not use "WAFV2" in var name inside wafv2 package paths: include: - - internal/service/wafv2 + - "/internal/service/wafv2" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4124,7 +4124,7 @@ rules: message: Include "Wavelength" in test name paths: include: - - internal/service/ec2/wavelength_*_test.go + - "/internal/service/ec2/wavelength_*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4139,9 +4139,9 @@ rules: message: Do not use "WellArchitected" in func name inside wellarchitected package paths: include: - - internal/service/wellarchitected + - "/internal/service/wellarchitected" exclude: - - internal/service/wellarchitected/list_pages_gen.go + - "/internal/service/wellarchitected/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4157,7 +4157,7 @@ rules: message: Include "WellArchitected" in test name paths: include: - - internal/service/wellarchitected/*_test.go + - "/internal/service/wellarchitected/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4172,7 +4172,7 @@ rules: message: Do not use "WellArchitected" in const name inside wellarchitected package paths: include: - - internal/service/wellarchitected + - "/internal/service/wellarchitected" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4186,7 +4186,7 @@ rules: message: Do not use "WellArchitected" in var name inside wellarchitected package paths: include: - - internal/service/wellarchitected + - "/internal/service/wellarchitected" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4200,9 +4200,9 @@ rules: message: Do not use "WorkMail" in func name inside workmail package paths: include: - - internal/service/workmail + - "/internal/service/workmail" exclude: - - internal/service/workmail/list_pages_gen.go + - "/internal/service/workmail/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4218,7 +4218,7 @@ rules: message: Include "WorkMail" in test name paths: include: - - internal/service/workmail/*_test.go + - "/internal/service/workmail/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4233,7 +4233,7 @@ rules: message: Do not use "WorkMail" in const name inside workmail package paths: include: - - internal/service/workmail + - "/internal/service/workmail" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4247,7 +4247,7 @@ rules: message: Do not use "WorkMail" in var name inside workmail package paths: include: - - internal/service/workmail + - "/internal/service/workmail" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4261,9 +4261,9 @@ rules: message: Do not use "WorkSpaces" in func name inside workspaces package paths: include: - - internal/service/workspaces + - "/internal/service/workspaces" exclude: - - internal/service/workspaces/list_pages_gen.go + - "/internal/service/workspaces/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4279,7 +4279,7 @@ rules: message: Include "WorkSpaces" in test name paths: include: - - internal/service/workspaces/*_test.go + - "/internal/service/workspaces/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4294,7 +4294,7 @@ rules: message: Do not use "WorkSpaces" in const name inside workspaces package paths: include: - - internal/service/workspaces + - "/internal/service/workspaces" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4308,7 +4308,7 @@ rules: message: Do not use "WorkSpaces" in var name inside workspaces package paths: include: - - internal/service/workspaces + - "/internal/service/workspaces" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4322,9 +4322,9 @@ rules: message: Do not use "WorkSpacesWeb" in func name inside workspacesweb package paths: include: - - internal/service/workspacesweb + - "/internal/service/workspacesweb" exclude: - - internal/service/workspacesweb/list_pages_gen.go + - "/internal/service/workspacesweb/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4340,7 +4340,7 @@ rules: message: Include "WorkSpacesWeb" in test name paths: include: - - internal/service/workspacesweb/*_test.go + - "/internal/service/workspacesweb/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4355,7 +4355,7 @@ rules: message: Do not use "WorkSpacesWeb" in const name inside workspacesweb package paths: include: - - internal/service/workspacesweb + - "/internal/service/workspacesweb" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4369,7 +4369,7 @@ rules: message: Do not use "WorkSpacesWeb" in var name inside workspacesweb package paths: include: - - internal/service/workspacesweb + - "/internal/service/workspacesweb" patterns: - pattern: var $NAME = ... - metavariable-pattern: @@ -4383,9 +4383,9 @@ rules: message: Do not use "XRay" in func name inside xray package paths: include: - - internal/service/xray + - "/internal/service/xray" exclude: - - internal/service/xray/list_pages_gen.go + - "/internal/service/xray/list_pages_gen.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4401,7 +4401,7 @@ rules: message: Include "XRay" in test name paths: include: - - internal/service/xray/*_test.go + - "/internal/service/xray/*_test.go" patterns: - pattern: func $NAME( ... ) - metavariable-pattern: @@ -4416,7 +4416,7 @@ rules: message: Do not use "XRay" in const name inside xray package paths: include: - - internal/service/xray + - "/internal/service/xray" patterns: - pattern: const $NAME = ... - metavariable-pattern: @@ -4430,7 +4430,7 @@ rules: message: Do not use "XRay" in var name inside xray package paths: include: - - internal/service/xray + - "/internal/service/xray" patterns: - pattern: var $NAME = ... - metavariable-pattern: diff --git a/.ci/.semgrep-test-constants.yml b/.ci/.semgrep-test-constants.yml index 60bffe939bbb..6d3a4ee0f0c7 100644 --- a/.ci/.semgrep-test-constants.yml +++ b/.ci/.semgrep-test-constants.yml @@ -5,7 +5,7 @@ rules: message: Use the constant `acctest.Ct12Digit` for the string literal "123456789012" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"123456789012"' severity: ERROR fix: "acctest.Ct12Digit" @@ -17,7 +17,7 @@ rules: message: Use the constant `acctest.CtBasic` for the string literal "basic" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"basic"' severity: ERROR fix: "acctest.CtBasic" @@ -29,7 +29,7 @@ rules: message: Use the constant `acctest.CtCertificatePEM` for the string literal "certificate_pem" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"certificate_pem"' severity: ERROR fix: "acctest.CtCertificatePEM" @@ -41,7 +41,7 @@ rules: message: Use the constant `acctest.CtDisappears` for the string literal "disappears" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"disappears"' severity: ERROR fix: "acctest.CtDisappears" @@ -53,7 +53,7 @@ rules: message: Use the constant `acctest.CtFalse` for the string literal "false" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"false"' severity: ERROR fix: "acctest.CtFalse" @@ -65,7 +65,7 @@ rules: message: Use the constant `acctest.CtFalseCaps` for the string literal "FALSE" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"FALSE"' severity: ERROR fix: "acctest.CtFalseCaps" @@ -77,7 +77,7 @@ rules: message: Use the constant `acctest.CtKey1` for the string literal "key1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"key1"' severity: ERROR fix: "acctest.CtKey1" @@ -89,7 +89,7 @@ rules: message: Use the constant `acctest.CtKey2` for the string literal "key2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"key2"' severity: ERROR fix: "acctest.CtKey2" @@ -101,7 +101,7 @@ rules: message: Use the constant `acctest.CtName` for the string literal "name" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"name"' severity: ERROR fix: "acctest.CtName" @@ -113,7 +113,7 @@ rules: message: Use the constant `acctest.CtOverlapKey1` for the string literal "overlapkey1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"overlapkey1"' severity: ERROR fix: "acctest.CtOverlapKey1" @@ -125,7 +125,7 @@ rules: message: Use the constant `acctest.CtOverlapKey2` for the string literal "overlapkey2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"overlapkey2"' severity: ERROR fix: "acctest.CtOverlapKey2" @@ -137,7 +137,7 @@ rules: message: Use the constant `acctest.CtPrivateKeyPEM` for the string literal "private_key_pem" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"private_key_pem"' severity: ERROR fix: "acctest.CtPrivateKeyPEM" @@ -149,7 +149,7 @@ rules: message: Use the constant `acctest.CtProviderKey1` for the string literal "providerkey1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"providerkey1"' severity: ERROR fix: "acctest.CtProviderKey1" @@ -161,7 +161,7 @@ rules: message: Use the constant `acctest.CtProviderTags` for the string literal "provider_tags" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"provider_tags"' severity: ERROR fix: "acctest.CtProviderTags" @@ -173,7 +173,7 @@ rules: message: Use the constant `acctest.CtProviderValue1` for the string literal "providervalue1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"providervalue1"' severity: ERROR fix: "acctest.CtProviderValue1" @@ -185,7 +185,7 @@ rules: message: Use the constant `acctest.CtProviderValue1Again` for the string literal "providervalue1again" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"providervalue1again"' severity: ERROR fix: "acctest.CtProviderValue1Again" @@ -197,7 +197,7 @@ rules: message: Use the constant `acctest.CtProviderValue1Updated` for the string literal "providervalue1updated" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"providervalue1updated"' severity: ERROR fix: "acctest.CtProviderValue1Updated" @@ -209,7 +209,7 @@ rules: message: Use the constant `acctest.CtRName` for the string literal "rName" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"rName"' severity: ERROR fix: "acctest.CtRName" @@ -221,7 +221,7 @@ rules: message: Use the constant `acctest.CtResourceKey1` for the string literal "resourcekey1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcekey1"' severity: ERROR fix: "acctest.CtResourceKey1" @@ -233,7 +233,7 @@ rules: message: Use the constant `acctest.CtResourceKey2` for the string literal "resourcekey2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcekey2"' severity: ERROR fix: "acctest.CtResourceKey2" @@ -245,7 +245,7 @@ rules: message: Use the constant `acctest.CtResourceOwner` for the string literal "resource_owner" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resource_owner"' severity: ERROR fix: "acctest.CtResourceOwner" @@ -257,7 +257,7 @@ rules: message: Use the constant `acctest.CtResourceTags` for the string literal "resource_tags" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resource_tags"' severity: ERROR fix: "acctest.CtResourceTags" @@ -269,7 +269,7 @@ rules: message: Use the constant `acctest.CtResourceValue1` for the string literal "resourcevalue1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcevalue1"' severity: ERROR fix: "acctest.CtResourceValue1" @@ -281,7 +281,7 @@ rules: message: Use the constant `acctest.CtResourceValue1Again` for the string literal "resourcevalue1again" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcevalue1again"' severity: ERROR fix: "acctest.CtResourceValue1Again" @@ -293,7 +293,7 @@ rules: message: Use the constant `acctest.CtResourceValue1Updated` for the string literal "resourcevalue1updated" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcevalue1updated"' severity: ERROR fix: "acctest.CtResourceValue1Updated" @@ -305,7 +305,7 @@ rules: message: Use the constant `acctest.CtResourceValue2` for the string literal "resourcevalue2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcevalue2"' severity: ERROR fix: "acctest.CtResourceValue2" @@ -317,7 +317,7 @@ rules: message: Use the constant `acctest.CtResourceValue2Updated` for the string literal "resourcevalue2updated" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"resourcevalue2updated"' severity: ERROR fix: "acctest.CtResourceValue2Updated" @@ -329,7 +329,7 @@ rules: message: Use the constant `acctest.CtRulePound` for the string literal "rule.#" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"rule.#"' severity: ERROR fix: "acctest.CtRulePound" @@ -341,7 +341,7 @@ rules: message: Use the constant `acctest.CtTagsAllPercent` for the string literal "tags_all.%" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"tags_all.%"' severity: ERROR fix: "acctest.CtTagsAllPercent" @@ -353,7 +353,7 @@ rules: message: Use the constant `acctest.CtTagsKey1` for the string literal "tags.key1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"tags.key1"' severity: ERROR fix: "acctest.CtTagsKey1" @@ -365,7 +365,7 @@ rules: message: Use the constant `acctest.CtTagsKey2` for the string literal "tags.key2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"tags.key2"' severity: ERROR fix: "acctest.CtTagsKey2" @@ -377,7 +377,7 @@ rules: message: Use the constant `acctest.CtTagsPercent` for the string literal "tags.%" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"tags.%"' severity: ERROR fix: "acctest.CtTagsPercent" @@ -389,7 +389,7 @@ rules: message: Use the constant `acctest.CtTrue` for the string literal "true" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"true"' severity: ERROR fix: "acctest.CtTrue" @@ -401,7 +401,7 @@ rules: message: Use the constant `acctest.CtTrueCaps` for the string literal "TRUE" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"TRUE"' severity: ERROR fix: "acctest.CtTrueCaps" @@ -413,7 +413,7 @@ rules: message: Use the constant `acctest.CtValue1` for the string literal "value1" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"value1"' severity: ERROR fix: "acctest.CtValue1" @@ -425,7 +425,7 @@ rules: message: Use the constant `acctest.CtValue1Updated` for the string literal "value1updated" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"value1updated"' severity: ERROR fix: "acctest.CtValue1Updated" @@ -437,7 +437,7 @@ rules: message: Use the constant `acctest.CtValue2` for the string literal "value2" in test files paths: include: - - "internal/service/**/*_test.go" + - "/internal/service/**/*_test.go" pattern: '"value2"' severity: ERROR fix: "acctest.CtValue2" diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index d24e4537c4ea..931ae93882a9 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -4,7 +4,7 @@ rules: message: Prefer naming acceptance tests with _disappears_Parent suffix paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" patterns: - pattern: func $FUNCNAME(t *testing.T) { ... } - metavariable-regex: @@ -18,7 +18,7 @@ rules: message: Calling a resource's Read method from within a data-source is discouraged paths: include: - - internal/service/**/*_data_source.go + - "/internal/service/**/*_data_source.go" patterns: - pattern-regex: "(resource.+Read|flatten.+Resource)" - pattern-inside: func $FUNCNAME(...) $RETURNTYPE { ... } @@ -36,7 +36,7 @@ rules: message: Using `acctest.RandInt()` in constant or variable declaration will execute during compilation and not randomize, pass into string generating function instead paths: include: - - internal/ + - "/internal/" patterns: - pattern-either: - pattern: const $CONST = fmt.Sprintf(..., <... acctest.RandInt() ...>, ...) @@ -48,7 +48,7 @@ rules: message: Using `acctest.RandString()` in constant or variable declaration will execute during compilation and not randomize, pass into string generating function instead paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: const $CONST = fmt.Sprintf(..., <... acctest.RandString(...) ...>, ...) @@ -60,7 +60,7 @@ rules: message: Using `acctest.RandomWithPrefix()` in constant or variable declaration will execute during compilation and not randomize, pass into string generating function instead paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: const $CONST = fmt.Sprintf(..., <... acctest.RandomWithPrefix(...) ...>, ...) @@ -72,9 +72,9 @@ rules: message: Elem must be either a *schema.Schema or *schema.Resource type paths: include: - - internal/service/**/*.go + - "/internal/service/**/*.go" exclude: - - internal/service/**/*_data_source.go + - "/internal/service/**/*_data_source.go" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern-regex: "Elem:[ ]*schema.Type[a-zA-Z]*," @@ -85,7 +85,7 @@ rules: message: Prefer `flex.FlattenStringSet()` or `flex.FlattenStringValueSet()` paths: include: - - internal/ + - "/internal" patterns: - pattern: schema.NewSet(schema.HashString, flex.FlattenStringList($APIOBJECT)) - pattern: schema.NewSet(schema.HashString, flex.FlattenStringValueList($APIOBJECT)) @@ -96,7 +96,7 @@ rules: message: Prefer `flex.ExpandStringSet()` or `flex.ExpandStringValueSet()` paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: flex.ExpandStringList($SET.List()) @@ -116,7 +116,7 @@ rules: message: Zero value conditional check after `d.GetOk()` is extraneous paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: if $VALUE, $OK := d.GetOk($KEY); $OK && $VALUE.(bool) { $BODY } @@ -131,7 +131,7 @@ rules: message: Nil value check before `d.Set()` is extraneous paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: | @@ -180,9 +180,9 @@ rules: message: (schema.ResourceData).Set() call with the tags key should be preceded by a call to IgnoreConfig paths: include: - - internal/service/**/*.go + - "/internal/service/**/*.go" exclude: - - internal/service/**/*_data_source.go + - "/internal/service/**/*_data_source.go" patterns: - pattern-inside: func $READMETHOD(...) $ERRORTYPE { ... } - pattern-either: @@ -210,10 +210,10 @@ rules: message: Check retry.RetryContext() errors with tfresource.TimedOut() paths: exclude: - - "*_test.go" - - sweep.go + - "**/*_test.go" + - "**/sweep.go" include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: | @@ -257,7 +257,7 @@ rules: exclude: - "*_test.go" include: - - internal/ + - "/internal" patterns: - pattern-either: - patterns: @@ -293,7 +293,7 @@ rules: message: Check for retry.NotFoundError errors with tfresource.NotFound() paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - patterns: @@ -317,7 +317,7 @@ rules: message: Use time.Equal() instead of == paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: | @@ -343,7 +343,7 @@ rules: message: Use lastPage for bool variable in pagination functions paths: include: - - internal/ + - "/internal" patterns: - pattern: | $X.$Z(..., func(..., $Y bool) { @@ -367,10 +367,10 @@ rules: message: Do not call `fmt.Print` and variant paths: include: - - internal/ + - "/internal" exclude: - - .ci/providerlint/vendor/ - - internal/generate/ + - "/.ci/providerlint/vendor/" + - "/internal/generate/" patterns: - pattern-either: - pattern: | @@ -386,9 +386,9 @@ rules: message: Do not call `regexp.MustCompile` directly, use `regexache.MustCompile` instead paths: include: - - internal/ + - "/internal" exclude: - - .ci/providerlint/vendor/ + - "/.ci/providerlint/vendor/" patterns: - pattern: 'regexp.MustCompile($X)' severity: WARNING @@ -399,22 +399,22 @@ rules: message: Domain names should be in the namespaces defined in RFC 6761 (https://datatracker.ietf.org/doc/html/rfc6761) as reserved for testing paths: include: - - internal/service + - "/internal/service" exclude: - - internal/service/firehose/delivery_stream_test.go - - internal/service/fsx/windows_file_system_test.go - - internal/service/iam/openid_connect_provider_test.go - - internal/service/mq/broker_test.go - - internal/service/mq/forge_test.go - - internal/service/route53/sweep.go - - internal/service/s3/bucket_test.go - - internal/service/s3/object_test.go - - internal/service/storagegateway/cached_iscsi_volume.go - - internal/service/storagegateway/cached_iscsi_volume_test.go - - internal/service/storagegateway/stored_iscsi_volume_test.go - - internal/service/transfer/access_test.go - - internal/service/transfer/server_test.go - - "internal/service/**/*_test.go" + - "/internal/service/firehose/delivery_stream_test.go" + - "/internal/service/fsx/windows_file_system_test.go" + - "/internal/service/iam/openid_connect_provider_test.go" + - "/internal/service/mq/broker_test.go" + - "/internal/service/mq/forge_test.go" + - "/internal/service/route53/sweep.go" + - "/internal/service/s3/bucket_test.go" + - "/internal/service/s3/object_test.go" + - "/internal/service/storagegateway/cached_iscsi_volume.go" + - "/internal/service/storagegateway/cached_iscsi_volume_test.go" + - "/internal/service/storagegateway/stored_iscsi_volume_test.go" + - "/internal/service/transfer/access_test.go" + - "/internal/service/transfer/server_test.go" + - "/internal/service/**/*_test.go" patterns: - patterns: - pattern-regex: '(([-a-zA-Z0-9]{2,}\.)|(%[sdftq]))+(com|net|org)\b' @@ -445,9 +445,9 @@ rules: message: Use default email address or generate a random email address. https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/running-and-writing-acceptance-tests.md#hardcoded-email-addresses paths: include: - - internal/ + - "/internal" exclude: - - internal/service/route53domains/registered_domain_test.go + - "/internal/service/route53domains/registered_domain_test.go" patterns: - pattern-regex: '[-_A-Za-z0-9.+]+@([-A-Za-z0-9]+\.)(com|net|org)' - pattern-not-regex: 'no-reply@hashicorp\.com' @@ -459,9 +459,9 @@ rules: message: Generate random SSH keys using acctest.RandSSHKeyPair() or RandSSHKeyPairSize(). https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/running-and-writing-acceptance-tests.md#hardcoded-ssh-key paths: include: - - internal/ + - "/internal" exclude: - - .ci/providerlint/vendor/ + - "/.ci/providerlint/vendor/" patterns: # This isn't technically the correct regex, but for some reason adding a '+' causes the regex to # miss some SSH keys. AFAICT, this is good enough. @@ -474,7 +474,7 @@ rules: message: Incorrect form of non-tags change detection. https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/contribution-checklists.md#resource-tagging-code-implementation paths: include: - - internal/ + - "/internal" patterns: - pattern: 'if d.HasChangeExcept("tags_all") {...}' severity: WARNING @@ -484,7 +484,7 @@ rules: message: Literal numbers do not need type conversions paths: include: - - internal/ + - "/internal" patterns: - pattern: "aws.Int64(int64($X))" - metavariable-regex: @@ -498,7 +498,7 @@ rules: message: Do not call `d.SetId("")` inside a resource create function paths: include: - - internal/service/ + - "/internal/service/" patterns: - pattern: | func $FUNC(...) { @@ -515,7 +515,7 @@ rules: message: Do not call `d.SetId("")` inside a resource update function paths: include: - - internal/service/ + - "/internal/service/" patterns: - pattern: | func $FUNC(...) { @@ -532,7 +532,7 @@ rules: message: Do not call `d.SetId(...)` inside a resource delete function paths: include: - - internal/service/ + - "/internal/service/" patterns: - pattern: | func $FUNC(...) { @@ -549,7 +549,7 @@ rules: message: Empty strings should not be included in validation paths: include: - - internal/ + - "/internal" patterns: - pattern: validation.Any(..., validation.StringIsEmpty, ...) severity: ERROR @@ -559,7 +559,7 @@ rules: message: Use tfawserr.ErrCodeEquals() when message parameter is empty string paths: include: - - internal/ + - "/internal" patterns: - pattern: tfawserr.ErrMessageContains(err, ..., "") severity: ERROR @@ -569,9 +569,9 @@ rules: message: Use constant in the same package rather than importing iam for a constant paths: include: - - internal/ + - "/internal" exclude: - - internal/service/iam + - "/internal/service/iam" patterns: - pattern: tfiam.PropagationTimeout severity: ERROR @@ -581,7 +581,7 @@ rules: message: Use acctest.ProtoV5ProviderFactories, not acctest.Providers or acctest.ProviderFactories paths: include: - - "internal/**/*_test.go" + - "/internal/**/*_test.go" pattern-either: - pattern-regex: Providers:\s+(acctest\.)?Providers, - pattern-regex: ProviderFactories:\s+(acctest\.)?ProviderFactories, @@ -592,7 +592,7 @@ rules: message: Prefer `err` with `%w` format verb instead of `err.Code()` or `err.Message()` paths: include: - - internal/ + - "/internal" patterns: - pattern-either: - pattern: fmt.Errorf(..., $ERR.Code(), ...) @@ -604,7 +604,7 @@ rules: message: Prefer using `enum.Slice()` to convert a slice of typed string enums to a slice of strings paths: include: - - internal/ + - "/internal" patterns: - pattern: "[]string{..., string($X), ...}" severity: WARNING @@ -614,7 +614,7 @@ rules: message: Prefer using WithoutTimeout CRUD handlers instead of Context variants paths: include: - - internal/service + - "/internal/service" patterns: - pattern-regex: "(Create|Read|Update|Delete)Context:" severity: ERROR @@ -624,7 +624,7 @@ rules: message: Calls to `sdkdiag.AppendErrorf()` should be returned or set to the `diags` variable paths: include: - - internal/ + - "/internal" patterns: - pattern: | if err != nil { @@ -649,7 +649,7 @@ rules: message: Avoid use of `errs.Must()` in service packages, handle errors explicitly instead. paths: include: - - internal/service + - "/internal/service" patterns: - pattern-either: - pattern: errs.Must(...) @@ -660,7 +660,7 @@ rules: message: Avoid use of `SingleNestedBlock` in schema definitions. Use `ListNestedBlock` with a size validator instead. paths: include: - - internal/service + - "/internal/service" patterns: - pattern: schema.SingleNestedBlock{ ... } severity: ERROR @@ -670,7 +670,7 @@ rules: message: Deprecation messages should begin with `argument_name is deprecated`. paths: include: - - internal/service + - "/internal/service" patterns: - pattern-inside: "Schema: map[string]*schema.Schema{ ... }" - pattern: | From 773d8f6a328bfc381f3af946fe24dd7d0c2d8c0d Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Fri, 5 Sep 2025 16:01:51 -0500 Subject: [PATCH 1487/2115] aws_control_tower_baseline: cutom expand/flatten for parameters --- internal/service/controltower/baseline.go | 80 +++++++++++------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 01bceb0981cd..c989c73d29b5 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -14,6 +14,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/controltower/types" "github.com/hashicorp/terraform-plugin-framework-timeouts/resource/timeouts" "github.com/hashicorp/terraform-plugin-framework-validators/listvalidator" + "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -118,7 +119,6 @@ func (r *resourceBaseline) Create(ctx context.Context, request resource.CreateRe } in := controltower.EnableBaselineInput{} - response.Diagnostics.Append(fwflex.Expand(ctx, plan, &in)...) if response.Diagnostics.HasError() { return @@ -126,21 +126,6 @@ func (r *resourceBaseline) Create(ctx context.Context, request resource.CreateRe in.Tags = getTagsIn(ctx) - params, d := plan.Parameters.ToSlice(ctx) - response.Diagnostics.Append(d...) - if response.Diagnostics.HasError() { - return - } - - var ebp []awstypes.EnabledBaselineParameter - for _, param := range params { - ebp = append(ebp, awstypes.EnabledBaselineParameter{ - Key: param.Key.ValueStringPointer(), - Value: document.NewLazyDocument(param.Value.String()), - }) - } - in.Parameters = ebp - out, err := conn.EnableBaseline(ctx, &in) if err != nil { response.Diagnostics.AddError( @@ -207,30 +192,6 @@ func (r *resourceBaseline) Read(ctx context.Context, request resource.ReadReques return } - if out.Parameters != nil { - var parameterList []parameters - for _, param := range out.Parameters { - var data any - err = param.Value.UnmarshalSmithyDocument(data) - if err != nil { - response.Diagnostics.AddError( - create.ProblemStandardMessage(names.ControlTower, create.ErrActionSetting, ResNameBaseline, state.ARN.String(), err), - err.Error(), - ) - return - } - - p := parameters{ - Key: fwflex.StringToFramework(ctx, param.Key), - Value: fwflex.StringValueToFramework(ctx, data.(string)), - } - parameterList = append(parameterList, p) - } - state.Parameters = fwtypes.NewListNestedObjectValueOfValueSliceMust(ctx, parameterList) - } else { - state.Parameters = fwtypes.NewListNestedObjectValueOfNull[parameters](ctx) - } - response.Diagnostics.Append(response.State.Set(ctx, &state)...) } @@ -396,3 +357,42 @@ type parameters struct { Key types.String `tfsdk:"key"` Value types.String `tfsdk:"value"` } + +func (p parameters) Expand(ctx context.Context) (any, diag.Diagnostics) { + var diags diag.Diagnostics + var r awstypes.EnabledBaselineParameter + if !p.Key.IsNull() { + r.Key = fwflex.StringFromFramework(ctx, p.Key) + } + + if !p.Value.IsNull() { + r.Value = document.NewLazyDocument(fwflex.StringValueFromFramework(ctx, p.Value)) + } + + return &r, diags +} + +func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { + var diags diag.Diagnostics + + switch v.(type) { + case awstypes.EnabledBaselineParameter: + param := v.(awstypes.EnabledBaselineParameter) + p.Key = fwflex.StringToFramework(ctx, param.Key) + if param.Value != nil { + var value any + err := param.Value.UnmarshalSmithyDocument(&value) + if err != nil { + diags.AddError( + "Error Reading Control Tower Baseline Parameter", + "Could not read Control Tower Baseline Parameter: "+err.Error(), + ) + return diags + } + p.Value = fwflex.StringValueToFramework(ctx, value.(string)) + } else { + p.Value = types.StringNull() + } + } + return diags +} From 94c4a6fc927855caed8027f5c7f6e3b8f96a2afa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 5 Sep 2025 17:13:47 -0400 Subject: [PATCH 1488/2115] Fix golangci-lint 'S1021: should merge variable declaration with assignment on next line'. --- internal/service/macie2/organization_admin_account.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/service/macie2/organization_admin_account.go b/internal/service/macie2/organization_admin_account.go index 7e0623f00ebb..9ce95eedfb67 100644 --- a/internal/service/macie2/organization_admin_account.go +++ b/internal/service/macie2/organization_admin_account.go @@ -53,8 +53,7 @@ func resourceOrganizationAdminAccountCreate(ctx context.Context, d *schema.Resou ClientToken: aws.String(id.UniqueId()), } - var err error - err = tfresource.Retry(ctx, 4*time.Minute, func(ctx context.Context) *tfresource.RetryError { + err := tfresource.Retry(ctx, 4*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.EnableOrganizationAdminAccount(ctx, input) if tfawserr.ErrCodeEquals(err, string(awstypes.ErrorCodeClientError)) { From ff01dc905e0069f9419b4f7c1ca7936c859ea078 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 17:15:45 -0400 Subject: [PATCH 1489/2115] Note to users about diff --- website/docs/r/dynamodb_table.html.markdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website/docs/r/dynamodb_table.html.markdown b/website/docs/r/dynamodb_table.html.markdown index df1daa62123c..6df6124189d2 100644 --- a/website/docs/r/dynamodb_table.html.markdown +++ b/website/docs/r/dynamodb_table.html.markdown @@ -323,8 +323,10 @@ The following arguments are optional: ### `warm_throughput` -* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `12000`. -* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `4000`. +~> **Note:** Explicitly configuring both `read_units_per_second` and `write_units_per_second` to the default/minimum values will cause Terraform to report differences. + +* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `12000` (default). +* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `4000` (default). ## Attribute Reference From 5bc9b1e39c2d099afa2d33d514f88ddf2a8d8837 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 17:15:54 -0400 Subject: [PATCH 1490/2115] New test --- internal/service/dynamodb/table_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 0a4df0781696..e4750e90f261 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -4910,7 +4910,7 @@ func TestAccDynamoDBTable_warmThroughputDefault(t *testing.T) { CheckDestroy: testAccCheckTableDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccTableConfig_warmThroughput(rName, 5, 5, 12000, 4000), + Config: testAccTableConfig_warmThroughput(rName, 5, 5, 12000, 4100), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "billing_mode", string(awstypes.BillingModePayPerRequest)), From b3c927f4e20b5d17e633da3ea41cee7299319c2f Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 5 Sep 2025 17:50:53 -0400 Subject: [PATCH 1491/2115] Modernize code --- internal/service/dynamodb/table.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index 46dfdcaa80b7..aa20cee5d0c6 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -3155,12 +3155,12 @@ func suppressTableWarmThroughputDefaults(d *schema.ResourceDiff, configRaw cty.V } _, new := d.GetChange("warm_throughput") - newList, ok := new.([]interface{}) + newList, ok := new.([]any) if !ok || len(newList) == 0 { return nil } - newMap, ok := newList[0].(map[string]interface{}) + newMap, ok := newList[0].(map[string]any) if !ok { return nil } From bbb446d8754bfe007de1913cf80791c8693cca55 Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 08:57:03 +0900 Subject: [PATCH 1492/2115] Remove validation of the lower limits --- internal/service/cloudfront/distribution.go | 6 +----- website/docs/r/cloudfront_distribution.html.markdown | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfront/distribution.go b/internal/service/cloudfront/distribution.go index aeea1682441a..90d595d08def 100644 --- a/internal/service/cloudfront/distribution.go +++ b/internal/service/cloudfront/distribution.go @@ -697,11 +697,7 @@ func resourceDistribution() *schema.Resource { "response_completion_timeout": { Type: schema.TypeInt, Optional: true, - Default: 0, // Zero equals to unspecified - ValidateFunc: validation.Any( - validation.IntAtLeast(30), - validation.IntInSlice([]int{0}), - ), + Default: 0, // Zero is equivalent to unspecified }, "s3_origin_config": { Type: schema.TypeList, diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index 4d2110371737..a30322d54ae5 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -486,7 +486,7 @@ argument should not be specified. * `origin_id` (Required) - Unique identifier for the origin. * `origin_path` (Optional) - Optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin. * `origin_shield` - (Optional) [CloudFront Origin Shield](#origin-shield-arguments) configuration information. Using Origin Shield can help reduce the load on your origin. For more information, see [Using Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) in the Amazon CloudFront Developer Guide. -* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. Valid values are integers greater than or equal to `30`, or `0` (default). +* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be integer greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. Defaults to `0`. * `s3_origin_config` - (Optional) [CloudFront S3 origin](#s3-origin-config-arguments) configuration information. If a custom origin is required, use `custom_origin_config` instead. * `vpc_origin_config` - (Optional) The [VPC origin configuration](#vpc-origin-config-arguments). From ad5a28857a333e84fa01a1b847d2eb66581811df Mon Sep 17 00:00:00 2001 From: tabito Date: Sat, 6 Sep 2025 17:03:53 +0900 Subject: [PATCH 1493/2115] Remove Default for response_completion_time and mark it as Computed --- internal/service/cloudfront/distribution.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/service/cloudfront/distribution.go b/internal/service/cloudfront/distribution.go index 90d595d08def..9ebf8837c4c2 100644 --- a/internal/service/cloudfront/distribution.go +++ b/internal/service/cloudfront/distribution.go @@ -697,7 +697,7 @@ func resourceDistribution() *schema.Resource { "response_completion_timeout": { Type: schema.TypeInt, Optional: true, - Default: 0, // Zero is equivalent to unspecified + Computed: true, }, "s3_origin_config": { Type: schema.TypeList, @@ -2217,6 +2217,8 @@ func flattenOrigin(apiObject *awstypes.Origin) map[string]any { if apiObject.ResponseCompletionTimeout != nil { tfMap["response_completion_timeout"] = aws.ToInt32(apiObject.ResponseCompletionTimeout) + } else { + tfMap["response_completion_timeout"] = 0 } if apiObject.S3OriginConfig != nil && aws.ToString(apiObject.S3OriginConfig.OriginAccessIdentity) != "" { From 2cbe70a549f27d2be74370fbeb232679da08fd87 Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Sat, 6 Sep 2025 10:27:50 +0200 Subject: [PATCH 1494/2115] feat: allow configuration of dualStackIPv6 in ECS default settings --- .../service/ecs/account_setting_default.go | 9 +++--- .../ecs/account_setting_default_test.go | 30 +++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/internal/service/ecs/account_setting_default.go b/internal/service/ecs/account_setting_default.go index 3de03833e67c..6893a7eb5b76 100644 --- a/internal/service/ecs/account_setting_default.go +++ b/internal/service/ecs/account_setting_default.go @@ -12,6 +12,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ecs/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" @@ -34,10 +35,10 @@ func resourceAccountSettingDefault() *schema.Resource { Schema: map[string]*schema.Schema{ names.AttrName: { - Type: schema.TypeString, - ForceNew: true, - Required: true, - ValidateDiagFunc: enum.Validate[awstypes.SettingName](), + Type: schema.TypeString, + ForceNew: true, + Required: true, + ValidateFunc: validation.StringInSlice(append(enum.Values[awstypes.SettingName](), "dualStackIPv6"), false), }, "principal_arn": { Type: schema.TypeString, diff --git a/internal/service/ecs/account_setting_default_test.go b/internal/service/ecs/account_setting_default_test.go index 3b3edfc45578..72c620ce0031 100644 --- a/internal/service/ecs/account_setting_default_test.go +++ b/internal/service/ecs/account_setting_default_test.go @@ -31,6 +31,7 @@ func TestAccECSAccountSettingDefault_serial(t *testing.T) { "vpcTrunking": testAccAccountSettingDefault_vpcTrunking, "containerInsights": testAccAccountSettingDefault_containerInsights, "fargateTaskRetirementWaitPeriod": testAccAccountSettingDefault_fargateTaskRetirementWaitPeriod, + "dualStackIPv6": testAccAccountSettingDefault_dualStackIPv6, } acctest.RunSerialTests1Level(t, testCases, 0) @@ -104,6 +105,35 @@ func testAccAccountSettingDefault_defaultLogDriverMode(t *testing.T) { }) } +func testAccAccountSettingDefault_dualStackIPv6(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_ecs_account_setting_default.test" + settingName := "dualStackIPv6" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.ECSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckAccountSettingDefaultDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccAccountSettingDefaultConfig_basic(settingName, names.AttrEnabled), + Check: resource.ComposeTestCheckFunc( + testAccCheckAccountSettingDefaultExists(ctx, resourceName), + resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), + resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccAccountSettingDefault_serviceLongARNFormat(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_ecs_account_setting_default.test" From ef873f979355e624dcbb0f601800bb4ec86cf22b Mon Sep 17 00:00:00 2001 From: Stefan Freitag Date: Sat, 6 Sep 2025 12:20:50 +0200 Subject: [PATCH 1495/2115] chore: add changelog --- .changelog/44165.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44165.txt diff --git a/.changelog/44165.txt b/.changelog/44165.txt new file mode 100644 index 000000000000..7003b455cdd9 --- /dev/null +++ b/.changelog/44165.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_ecs_account_setting_default: Add support for `dualStackIPv6` value in `Name` argument +``` \ No newline at end of file From 032daebc4a4a2ae2ca092d43024d8df54ac3f7c5 Mon Sep 17 00:00:00 2001 From: tabito Date: Mon, 8 Sep 2025 01:48:16 +0900 Subject: [PATCH 1496/2115] doc: Remove description of the default for response_completion_timeout --- website/docs/r/cloudfront_distribution.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index a30322d54ae5..a36da0052c1c 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -486,7 +486,7 @@ argument should not be specified. * `origin_id` (Required) - Unique identifier for the origin. * `origin_path` (Optional) - Optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin. * `origin_shield` - (Optional) [CloudFront Origin Shield](#origin-shield-arguments) configuration information. Using Origin Shield can help reduce the load on your origin. For more information, see [Using Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) in the Amazon CloudFront Developer Guide. -* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be integer greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. Defaults to `0`. +* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be integer greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. * `s3_origin_config` - (Optional) [CloudFront S3 origin](#s3-origin-config-arguments) configuration information. If a custom origin is required, use `custom_origin_config` instead. * `vpc_origin_config` - (Optional) The [VPC origin configuration](#vpc-origin-config-arguments). From ca406e5b3d57b611a21e254d03a0f03dc8f61a18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 06:26:54 +0000 Subject: [PATCH 1497/2115] Bump the aws-sdk-go-v2 group across 1 directory with 3 updates Bumps the aws-sdk-go-v2 group with 3 updates in the / directory: [github.com/aws/aws-sdk-go-v2/service/ecs](https://github.com/aws/aws-sdk-go-v2), [github.com/aws/aws-sdk-go-v2/service/pcs](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/sagemaker](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/service/ecs` from 1.63.4 to 1.63.5 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.63.4...service/ecs/v1.63.5) Updates `github.com/aws/aws-sdk-go-v2/service/pcs` from 1.12.1 to 1.12.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/m2/v1.12.1...service/m2/v1.12.2) Updates `github.com/aws/aws-sdk-go-v2/service/sagemaker` from 1.213.1 to 1.214.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/sagemaker/v1.213.1...service/ec2/v1.214.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-version: 1.63.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcs dependency-version: 1.12.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.214.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 9868d77f7711..164579938836 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 @@ -193,7 +193,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 @@ -226,7 +226,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 diff --git a/go.sum b/go.sum index 042b3d2dcb21..e3c8d9eb62ea 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZKp3nA4pqgIODScw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= @@ -407,8 +407,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3UDvkawNLu8yJRPPg= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcsdGnspIkS9TNwRf6vf1JVxM= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= From 2e306acd49f202166d51503d1f4f429b68f853df Mon Sep 17 00:00:00 2001 From: team-tf-cdk <84392119+team-tf-cdk@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:08:19 +0200 Subject: [PATCH 1498/2115] =?UTF-8?q?cdktf:=20update=20index.html.markdown?= =?UTF-8?q?,r/xray=5Fsampling=5Frule.html.markdown,r/xray=5Fresource=5Fpol?= =?UTF-8?q?icy.html.markdown,r/xray=5Fgroup.html.markdown,r/xray=5Fencrypt?= =?UTF-8?q?ion=5Fconfig.html.markdown,r/workspacesweb=5Fuser=5Fsettings=5F?= =?UTF-8?q?association.html.markdown,r/workspacesweb=5Fuser=5Fsettings.htm?= =?UTF-8?q?l.markdown,r/workspacesweb=5Fuser=5Faccess=5Flogging=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fuser=5Faccess=5F?= =?UTF-8?q?logging=5Fsettings.html.markdown,r/workspacesweb=5Ftrust=5Fstor?= =?UTF-8?q?e=5Fassociation.html.markdown,r/workspacesweb=5Ftrust=5Fstore.h?= =?UTF-8?q?tml.markdown,r/workspacesweb=5Fsession=5Flogger=5Fassociation.h?= =?UTF-8?q?tml.markdown,r/workspacesweb=5Fsession=5Flogger.html.markdown,r?= =?UTF-8?q?/workspacesweb=5Fportal.html.markdown,r/workspacesweb=5Fnetwork?= =?UTF-8?q?=5Fsettings=5Fassociation.html.markdown,r/workspacesweb=5Fnetwo?= =?UTF-8?q?rk=5Fsettings.html.markdown,r/workspacesweb=5Fip=5Faccess=5Fset?= =?UTF-8?q?tings=5Fassociation.html.markdown,r/workspacesweb=5Fip=5Faccess?= =?UTF-8?q?=5Fsettings.html.markdown,r/workspacesweb=5Fidentity=5Fprovider?= =?UTF-8?q?.html.markdown,r/workspacesweb=5Fdata=5Fprotection=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fdata=5Fprotectio?= =?UTF-8?q?n=5Fsettings.html.markdown,r/workspacesweb=5Fbrowser=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fbrowser=5Fsettin?= =?UTF-8?q?gs.html.markdown,r/workspaces=5Fworkspace.html.markdown,r/works?= =?UTF-8?q?paces=5Fip=5Fgroup.html.markdown,r/workspaces=5Fdirectory.html.?= =?UTF-8?q?markdown,r/workspaces=5Fconnection=5Falias.html.markdown,r/wafv?= =?UTF-8?q?2=5Fweb=5Facl=5Frule=5Fgroup=5Fassociation.html.markdown,r/wafv?= =?UTF-8?q?2=5Fweb=5Facl=5Flogging=5Fconfiguration.html.markdown,r/wafv2?= =?UTF-8?q?=5Fweb=5Facl=5Fassociation.html.markdown,r/wafv2=5Fweb=5Facl.ht?= =?UTF-8?q?ml.markdown,r/wafv2=5Frule=5Fgroup.html.markdown,r/wafv2=5Frege?= =?UTF-8?q?x=5Fpattern=5Fset.html.markdown,r/wafv2=5Fip=5Fset.html.markdow?= =?UTF-8?q?n,r/wafv2=5Fapi=5Fkey.html.markdown,r/wafregional=5Fxss=5Fmatch?= =?UTF-8?q?=5Fset.html.markdown,r/wafregional=5Fweb=5Facl=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/wafregional=5Fweb=5Facl.html.markdown,r/wafregion?= =?UTF-8?q?al=5Fsql=5Finjection=5Fmatch=5Fset.html.markdown,r/wafregional?= =?UTF-8?q?=5Fsize=5Fconstraint=5Fset.html.markdown,r/wafregional=5Frule?= =?UTF-8?q?=5Fgroup.html.markdown,r/wafregional=5Frule.html.markdown,r/waf?= =?UTF-8?q?regional=5Fregex=5Fpattern=5Fset.html.markdown,r/wafregional=5F?= =?UTF-8?q?regex=5Fmatch=5Fset.html.markdown,r/wafregional=5Frate=5Fbased?= =?UTF-8?q?=5Frule.html.markdown,r/wafregional=5Fipset.html.markdown,r/waf?= =?UTF-8?q?regional=5Fgeo=5Fmatch=5Fset.html.markdown,r/wafregional=5Fbyte?= =?UTF-8?q?=5Fmatch=5Fset.html.markdown,r/waf=5Fxss=5Fmatch=5Fset.html.mar?= =?UTF-8?q?kdown,r/waf=5Fweb=5Facl.html.markdown,r/waf=5Fsql=5Finjection?= =?UTF-8?q?=5Fmatch=5Fset.html.markdown,r/waf=5Fsize=5Fconstraint=5Fset.ht?= =?UTF-8?q?ml.markdown,r/waf=5Frule=5Fgroup.html.markdown,r/waf=5Frule.htm?= =?UTF-8?q?l.markdown,r/waf=5Fregex=5Fpattern=5Fset.html.markdown,r/waf=5F?= =?UTF-8?q?regex=5Fmatch=5Fset.html.markdown,r/waf=5Frate=5Fbased=5Frule.h?= =?UTF-8?q?tml.markdown,r/waf=5Fipset.html.markdown,r/waf=5Fgeo=5Fmatch=5F?= =?UTF-8?q?set.html.markdown,r/waf=5Fbyte=5Fmatch=5Fset.html.markdown,r/vp?= =?UTF-8?q?n=5Fgateway=5Froute=5Fpropagation.html.markdown,r/vpn=5Fgateway?= =?UTF-8?q?=5Fattachment.html.markdown,r/vpn=5Fgateway.html.markdown,r/vpn?= =?UTF-8?q?=5Fconnection=5Froute.html.markdown,r/vpn=5Fconnection.html.mar?= =?UTF-8?q?kdown,r/vpclattice=5Ftarget=5Fgroup=5Fattachment.html.markdown,?= =?UTF-8?q?r/vpclattice=5Ftarget=5Fgroup.html.markdown,r/vpclattice=5Fserv?= =?UTF-8?q?ice=5Fnetwork=5Fvpc=5Fassociation.html.markdown,r/vpclattice=5F?= =?UTF-8?q?service=5Fnetwork=5Fservice=5Fassociation.html.markdown,r/vpcla?= =?UTF-8?q?ttice=5Fservice=5Fnetwork=5Fresource=5Fassociation.html.markdow?= =?UTF-8?q?n,r/vpclattice=5Fservice=5Fnetwork.html.markdown,r/vpclattice?= =?UTF-8?q?=5Fservice.html.markdown,r/vpclattice=5Fresource=5Fpolicy.html.?= =?UTF-8?q?markdown,r/vpclattice=5Fresource=5Fgateway.html.markdown,r/vpcl?= =?UTF-8?q?attice=5Fresource=5Fconfiguration.html.markdown,r/vpclattice=5F?= =?UTF-8?q?listener=5Frule.html.markdown,r/vpclattice=5Flistener.html.mark?= =?UTF-8?q?down,r/vpclattice=5Fauth=5Fpolicy.html.markdown,r/vpclattice=5F?= =?UTF-8?q?access=5Flog=5Fsubscription.html.markdown,r/vpc=5Fsecurity=5Fgr?= =?UTF-8?q?oup=5Fvpc=5Fassociation.html.markdown,r/vpc=5Fsecurity=5Fgroup?= =?UTF-8?q?=5Fingress=5Frule.html.markdown,r/vpc=5Fsecurity=5Fgroup=5Fegre?= =?UTF-8?q?ss=5Frule.html.markdown,r/vpc=5Froute=5Fserver=5Fvpc=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/vpc=5Froute=5Fserver=5Fpropagation.html.mar?= =?UTF-8?q?kdown,r/vpc=5Froute=5Fserver=5Fpeer.html.markdown,r/vpc=5Froute?= =?UTF-8?q?=5Fserver=5Fendpoint.html.markdown,r/vpc=5Froute=5Fserver.html.?= =?UTF-8?q?markdown,r/vpc=5Fpeering=5Fconnection=5Foptions.html.markdown,r?= =?UTF-8?q?/vpc=5Fpeering=5Fconnection=5Faccepter.html.markdown,r/vpc=5Fpe?= =?UTF-8?q?ering=5Fconnection.html.markdown,r/vpc=5Fnetwork=5Fperformance?= =?UTF-8?q?=5Fmetric=5Fsubscription.html.markdown,r/vpc=5Fipv6=5Fcidr=5Fbl?= =?UTF-8?q?ock=5Fassociation.html.markdown,r/vpc=5Fipv4=5Fcidr=5Fblock=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/vpc=5Fipam=5Fscope.html.markdown,r/v?= =?UTF-8?q?pc=5Fipam=5Fresource=5Fdiscovery=5Fassociation.html.markdown,r/?= =?UTF-8?q?vpc=5Fipam=5Fresource=5Fdiscovery.html.markdown,r/vpc=5Fipam=5F?= =?UTF-8?q?preview=5Fnext=5Fcidr.html.markdown,r/vpc=5Fipam=5Fpool=5Fcidr?= =?UTF-8?q?=5Fallocation.html.markdown,r/vpc=5Fipam=5Fpool=5Fcidr.html.mar?= =?UTF-8?q?kdown,r/vpc=5Fipam=5Fpool.html.markdown,r/vpc=5Fipam=5Forganiza?= =?UTF-8?q?tion=5Fadmin=5Faccount.html.markdown,r/vpc=5Fipam.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fsubnet=5Fassociation.html.markdown,r/vpc=5F?= =?UTF-8?q?endpoint=5Fservice=5Fprivate=5Fdns=5Fverification.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fservice=5Fallowed=5Fprincipal.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fservice.html.markdown,r/vpc=5Fendpoint=5Fse?= =?UTF-8?q?curity=5Fgroup=5Fassociation.html.markdown,r/vpc=5Fendpoint=5Fr?= =?UTF-8?q?oute=5Ftable=5Fassociation.html.markdown,r/vpc=5Fendpoint=5Fpri?= =?UTF-8?q?vate=5Fdns.html.markdown,r/vpc=5Fendpoint=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/vpc=5Fendpoint=5Fconnection=5Fnotification.html.markdown,r/?= =?UTF-8?q?vpc=5Fendpoint=5Fconnection=5Faccepter.html.markdown,r/vpc=5Fen?= =?UTF-8?q?dpoint.html.markdown,r/vpc=5Fdhcp=5Foptions=5Fassociation.html.?= =?UTF-8?q?markdown,r/vpc=5Fdhcp=5Foptions.html.markdown,r/vpc=5Fblock=5Fp?= =?UTF-8?q?ublic=5Faccess=5Foptions.html.markdown,r/vpc=5Fblock=5Fpublic?= =?UTF-8?q?=5Faccess=5Fexclusion.html.markdown,r/vpc.html.markdown,r/volum?= =?UTF-8?q?e=5Fattachment.html.markdown,r/verifiedpermissions=5Fschema.htm?= =?UTF-8?q?l.markdown,r/verifiedpermissions=5Fpolicy=5Ftemplate.html.markd?= =?UTF-8?q?own,r/verifiedpermissions=5Fpolicy=5Fstore.html.markdown,r/veri?= =?UTF-8?q?fiedpermissions=5Fpolicy.html.markdown,r/verifiedpermissions=5F?= =?UTF-8?q?identity=5Fsource.html.markdown,r/verifiedaccess=5Ftrust=5Fprov?= =?UTF-8?q?ider.html.markdown,r/verifiedaccess=5Finstance=5Ftrust=5Fprovid?= =?UTF-8?q?er=5Fattachment.html.markdown,r/verifiedaccess=5Finstance=5Flog?= =?UTF-8?q?ging=5Fconfiguration.html.markdown,r/verifiedaccess=5Finstance.?= =?UTF-8?q?html.markdown,r/verifiedaccess=5Fgroup.html.markdown,r/verified?= =?UTF-8?q?access=5Fendpoint.html.markdown,r/transfer=5Fworkflow.html.mark?= =?UTF-8?q?down,r/transfer=5Fuser.html.markdown,r/transfer=5Ftag.html.mark?= =?UTF-8?q?down,r/transfer=5Fssh=5Fkey.html.markdown,r/transfer=5Fserver.h?= =?UTF-8?q?tml.markdown,r/transfer=5Fprofile.html.markdown,r/transfer=5Fco?= =?UTF-8?q?nnector.html.markdown,r/transfer=5Fcertificate.html.markdown,r/?= =?UTF-8?q?transfer=5Fagreement.html.markdown,r/transfer=5Faccess.html.mar?= =?UTF-8?q?kdown,r/transcribe=5Fvocabulary=5Ffilter.html.markdown,r/transc?= =?UTF-8?q?ribe=5Fvocabulary.html.markdown,r/transcribe=5Fmedical=5Fvocabu?= =?UTF-8?q?lary.html.markdown,r/transcribe=5Flanguage=5Fmodel.html.markdow?= =?UTF-8?q?n,r/timestreamwrite=5Ftable.html.markdown,r/timestreamwrite=5Fd?= =?UTF-8?q?atabase.html.markdown,r/timestreamquery=5Fscheduled=5Fquery.htm?= =?UTF-8?q?l.markdown,r/timestreaminfluxdb=5Fdb=5Finstance.html.markdown,r?= =?UTF-8?q?/timestreaminfluxdb=5Fdb=5Fcluster.html.markdown,r/synthetics?= =?UTF-8?q?=5Fgroup=5Fassociation.html.markdown,r/synthetics=5Fgroup.html.?= =?UTF-8?q?markdown,r/synthetics=5Fcanary.html.markdown,r/swf=5Fdomain.htm?= =?UTF-8?q?l.markdown,r/subnet.html.markdown,r/storagegateway=5Fworking=5F?= =?UTF-8?q?storage.html.markdown,r/storagegateway=5Fupload=5Fbuffer.html.m?= =?UTF-8?q?arkdown,r/storagegateway=5Ftape=5Fpool.html.markdown,r/storageg?= =?UTF-8?q?ateway=5Fstored=5Fiscsi=5Fvolume.html.markdown,r/storagegateway?= =?UTF-8?q?=5Fsmb=5Ffile=5Fshare.html.markdown,r/storagegateway=5Fnfs=5Ffi?= =?UTF-8?q?le=5Fshare.html.markdown,r/storagegateway=5Fgateway.html.markdo?= =?UTF-8?q?wn,r/storagegateway=5Ffile=5Fsystem=5Fassociation.html.markdown?= =?UTF-8?q?,r/storagegateway=5Fcached=5Fiscsi=5Fvolume.html.markdown,r/sto?= =?UTF-8?q?ragegateway=5Fcache.html.markdown,r/ssoadmin=5Ftrusted=5Ftoken?= =?UTF-8?q?=5Fissuer.html.markdown,r/ssoadmin=5Fpermissions=5Fboundary=5Fa?= =?UTF-8?q?ttachment.html.markdown,r/ssoadmin=5Fpermission=5Fset=5Finline?= =?UTF-8?q?=5Fpolicy.html.markdown,r/ssoadmin=5Fpermission=5Fset.html.mark?= =?UTF-8?q?down,r/ssoadmin=5Fmanaged=5Fpolicy=5Fattachment.html.markdown,r?= =?UTF-8?q?/ssoadmin=5Finstance=5Faccess=5Fcontrol=5Fattributes.html.markd?= =?UTF-8?q?own,r/ssoadmin=5Fcustomer=5Fmanaged=5Fpolicy=5Fattachment.html.?= =?UTF-8?q?markdown,r/ssoadmin=5Fapplication=5Fassignment=5Fconfiguration.?= =?UTF-8?q?html.markdown,r/ssoadmin=5Fapplication=5Fassignment.html.markdo?= =?UTF-8?q?wn,r/ssoadmin=5Fapplication=5Faccess=5Fscope.html.markdown,r/ss?= =?UTF-8?q?oadmin=5Fapplication.html.markdown,r/ssoadmin=5Faccount=5Fassig?= =?UTF-8?q?nment.html.markdown,r/ssmquicksetup=5Fconfiguration=5Fmanager.h?= =?UTF-8?q?tml.markdown,r/ssmincidents=5Fresponse=5Fplan.html.markdown,r/s?= =?UTF-8?q?smincidents=5Freplication=5Fset.html.markdown,r/ssmcontacts=5Fr?= =?UTF-8?q?otation.html.markdown,r/ssmcontacts=5Fplan.html.markdown,r/ssmc?= =?UTF-8?q?ontacts=5Fcontact=5Fchannel.html.markdown,r/ssmcontacts=5Fconta?= =?UTF-8?q?ct.html.markdown,r/ssm=5Fservice=5Fsetting.html.markdown,r/ssm?= =?UTF-8?q?=5Fresource=5Fdata=5Fsync.html.markdown,r/ssm=5Fpatch=5Fgroup.h?= =?UTF-8?q?tml.markdown,r/ssm=5Fpatch=5Fbaseline.html.markdown,r/ssm=5Fpar?= =?UTF-8?q?ameter.html.markdown,r/ssm=5Fmaintenance=5Fwindow=5Ftask.html.m?= =?UTF-8?q?arkdown,r/ssm=5Fmaintenance=5Fwindow=5Ftarget.html.markdown,r/s?= =?UTF-8?q?sm=5Fmaintenance=5Fwindow.html.markdown,r/ssm=5Fdocument.html.m?= =?UTF-8?q?arkdown,r/ssm=5Fdefault=5Fpatch=5Fbaseline.html.markdown,r/ssm?= =?UTF-8?q?=5Fassociation.html.markdown,r/ssm=5Factivation.html.markdown,r?= =?UTF-8?q?/sqs=5Fqueue=5Fredrive=5Fpolicy.html.markdown,r/sqs=5Fqueue=5Fr?= =?UTF-8?q?edrive=5Fallow=5Fpolicy.html.markdown,r/sqs=5Fqueue=5Fpolicy.ht?= =?UTF-8?q?ml.markdown,r/sqs=5Fqueue.html.markdown,r/spot=5Finstance=5Freq?= =?UTF-8?q?uest.html.markdown,r/spot=5Ffleet=5Frequest.html.markdown,r/spo?= =?UTF-8?q?t=5Fdatafeed=5Fsubscription.html.markdown,r/sns=5Ftopic=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/sns=5Ftopic=5Fpolicy.html.markdown,r/sn?= =?UTF-8?q?s=5Ftopic=5Fdata=5Fprotection=5Fpolicy.html.markdown,r/sns=5Fto?= =?UTF-8?q?pic.html.markdown,r/sns=5Fsms=5Fpreferences.html.markdown,r/sns?= =?UTF-8?q?=5Fplatform=5Fapplication.html.markdown,r/snapshot=5Fcreate=5Fv?= =?UTF-8?q?olume=5Fpermission.html.markdown,r/signer=5Fsigning=5Fprofile?= =?UTF-8?q?=5Fpermission.html.markdown,r/signer=5Fsigning=5Fprofile.html.m?= =?UTF-8?q?arkdown,r/signer=5Fsigning=5Fjob.html.markdown,r/shield=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/shield=5Fprotection=5Fhealth=5Fcheck=5F?= =?UTF-8?q?association.html.markdown,r/shield=5Fprotection=5Fgroup.html.ma?= =?UTF-8?q?rkdown,r/shield=5Fprotection.html.markdown,r/shield=5Fproactive?= =?UTF-8?q?=5Fengagement.html.markdown,r/shield=5Fdrt=5Faccess=5Frole=5Far?= =?UTF-8?q?n=5Fassociation.html.markdown,r/shield=5Fdrt=5Faccess=5Flog=5Fb?= =?UTF-8?q?ucket=5Fassociation.html.markdown,r/shield=5Fapplication=5Flaye?= =?UTF-8?q?r=5Fautomatic=5Fresponse.html.markdown,r/sfn=5Fstate=5Fmachine.?= =?UTF-8?q?html.markdown,r/sfn=5Falias.html.markdown,r/sfn=5Factivity.html?= =?UTF-8?q?.markdown,r/sesv2=5Femail=5Fidentity=5Fpolicy.html.markdown,r/s?= =?UTF-8?q?esv2=5Femail=5Fidentity=5Fmail=5Ffrom=5Fattributes.html.markdow?= =?UTF-8?q?n,r/sesv2=5Femail=5Fidentity=5Ffeedback=5Fattributes.html.markd?= =?UTF-8?q?own,r/sesv2=5Femail=5Fidentity.html.markdown,r/sesv2=5Fdedicate?= =?UTF-8?q?d=5Fip=5Fpool.html.markdown,r/sesv2=5Fdedicated=5Fip=5Fassignme?= =?UTF-8?q?nt.html.markdown,r/sesv2=5Fcontact=5Flist.html.markdown,r/sesv2?= =?UTF-8?q?=5Fconfiguration=5Fset=5Fevent=5Fdestination.html.markdown,r/se?= =?UTF-8?q?sv2=5Fconfiguration=5Fset.html.markdown,r/sesv2=5Faccount=5Fvdm?= =?UTF-8?q?=5Fattributes.html.markdown,r/sesv2=5Faccount=5Fsuppression=5Fa?= =?UTF-8?q?ttributes.html.markdown,r/ses=5Ftemplate.html.markdown,r/ses=5F?= =?UTF-8?q?receipt=5Frule=5Fset.html.markdown,r/ses=5Freceipt=5Frule.html.?= =?UTF-8?q?markdown,r/ses=5Freceipt=5Ffilter.html.markdown,r/ses=5Fidentit?= =?UTF-8?q?y=5Fpolicy.html.markdown,r/ses=5Fidentity=5Fnotification=5Ftopi?= =?UTF-8?q?c.html.markdown,r/ses=5Fevent=5Fdestination.html.markdown,r/ses?= =?UTF-8?q?=5Femail=5Fidentity.html.markdown,r/ses=5Fdomain=5Fmail=5Ffrom.?= =?UTF-8?q?html.markdown,r/ses=5Fdomain=5Fidentity=5Fverification.html.mar?= =?UTF-8?q?kdown,r/ses=5Fdomain=5Fidentity.html.markdown,r/ses=5Fdomain=5F?= =?UTF-8?q?dkim.html.markdown,r/ses=5Fconfiguration=5Fset.html.markdown,r/?= =?UTF-8?q?ses=5Factive=5Freceipt=5Frule=5Fset.html.markdown,r/servicequot?= =?UTF-8?q?as=5Ftemplate=5Fassociation.html.markdown,r/servicequotas=5Ftem?= =?UTF-8?q?plate.html.markdown,r/servicequotas=5Fservice=5Fquota.html.mark?= =?UTF-8?q?down,r/servicecatalogappregistry=5Fattribute=5Fgroup=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/servicecatalogappregistry=5Fattribute=5Fgro?= =?UTF-8?q?up.html.markdown,r/servicecatalogappregistry=5Fapplication.html?= =?UTF-8?q?.markdown,r/servicecatalog=5Ftag=5Foption=5Fresource=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/servicecatalog=5Ftag=5Foption.html.markdown?= =?UTF-8?q?,r/servicecatalog=5Fservice=5Faction.html.markdown,r/servicecat?= =?UTF-8?q?alog=5Fprovisioning=5Fartifact.html.markdown,r/servicecatalog?= =?UTF-8?q?=5Fprovisioned=5Fproduct.html.markdown,r/servicecatalog=5Fprodu?= =?UTF-8?q?ct=5Fportfolio=5Fassociation.html.markdown,r/servicecatalog=5Fp?= =?UTF-8?q?roduct.html.markdown,r/servicecatalog=5Fprincipal=5Fportfolio?= =?UTF-8?q?=5Fassociation.html.markdown,r/servicecatalog=5Fportfolio=5Fsha?= =?UTF-8?q?re.html.markdown,r/servicecatalog=5Fportfolio.html.markdown,r/s?= =?UTF-8?q?ervicecatalog=5Forganizations=5Faccess.html.markdown,r/servicec?= =?UTF-8?q?atalog=5Fconstraint.html.markdown,r/servicecatalog=5Fbudget=5Fr?= =?UTF-8?q?esource=5Fassociation.html.markdown,r/service=5Fdiscovery=5Fser?= =?UTF-8?q?vice.html.markdown,r/service=5Fdiscovery=5Fpublic=5Fdns=5Fnames?= =?UTF-8?q?pace.html.markdown,r/service=5Fdiscovery=5Fprivate=5Fdns=5Fname?= =?UTF-8?q?space.html.markdown,r/service=5Fdiscovery=5Finstance.html.markd?= =?UTF-8?q?own,r/service=5Fdiscovery=5Fhttp=5Fnamespace.html.markdown,r/se?= =?UTF-8?q?rverlessapplicationrepository=5Fcloudformation=5Fstack.html.mar?= =?UTF-8?q?kdown,r/securitylake=5Fsubscriber=5Fnotification.html.markdown,?= =?UTF-8?q?r/securitylake=5Fsubscriber.html.markdown,r/securitylake=5Fdata?= =?UTF-8?q?=5Flake.html.markdown,r/securitylake=5Fcustom=5Flog=5Fsource.ht?= =?UTF-8?q?ml.markdown,r/securitylake=5Faws=5Flog=5Fsource.html.markdown,r?= =?UTF-8?q?/securityhub=5Fstandards=5Fsubscription.html.markdown,r/securit?= =?UTF-8?q?yhub=5Fstandards=5Fcontrol=5Fassociation.html.markdown,r/securi?= =?UTF-8?q?tyhub=5Fstandards=5Fcontrol.html.markdown,r/securityhub=5Fprodu?= =?UTF-8?q?ct=5Fsubscription.html.markdown,r/securityhub=5Forganization=5F?= =?UTF-8?q?configuration.html.markdown,r/securityhub=5Forganization=5Fadmi?= =?UTF-8?q?n=5Faccount.html.markdown,r/securityhub=5Fmember.html.markdown,?= =?UTF-8?q?r/securityhub=5Finvite=5Faccepter.html.markdown,r/securityhub?= =?UTF-8?q?=5Finsight.html.markdown,r/securityhub=5Ffinding=5Faggregator.h?= =?UTF-8?q?tml.markdown,r/securityhub=5Fconfiguration=5Fpolicy=5Fassociati?= =?UTF-8?q?on.markdown,r/securityhub=5Fconfiguration=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/securityhub=5Fautomation=5Frule.html.markdown,r/securityhub?= =?UTF-8?q?=5Faction=5Ftarget.html.markdown,r/securityhub=5Faccount.html.m?= =?UTF-8?q?arkdown,r/security=5Fgroup=5Frule.html.markdown,r/security=5Fgr?= =?UTF-8?q?oup.html.markdown,r/secretsmanager=5Fsecret=5Fversion.html.mark?= =?UTF-8?q?down,r/secretsmanager=5Fsecret=5Frotation.html.markdown,r/secre?= =?UTF-8?q?tsmanager=5Fsecret=5Fpolicy.html.markdown,r/secretsmanager=5Fse?= =?UTF-8?q?cret.html.markdown,r/schemas=5Fschema.html.markdown,r/schemas?= =?UTF-8?q?=5Fregistry=5Fpolicy.html.markdown,r/schemas=5Fregistry.html.ma?= =?UTF-8?q?rkdown,r/schemas=5Fdiscoverer.html.markdown,r/scheduler=5Fsched?= =?UTF-8?q?ule=5Fgroup.html.markdown,r/scheduler=5Fschedule.html.markdown,?= =?UTF-8?q?r/sagemaker=5Fworkteam.html.markdown,r/sagemaker=5Fworkforce.ht?= =?UTF-8?q?ml.markdown,r/sagemaker=5Fuser=5Fprofile.html.markdown,r/sagema?= =?UTF-8?q?ker=5Fstudio=5Flifecycle=5Fconfig.html.markdown,r/sagemaker=5Fs?= =?UTF-8?q?pace.html.markdown,r/sagemaker=5Fservicecatalog=5Fportfolio=5Fs?= =?UTF-8?q?tatus.html.markdown,r/sagemaker=5Fproject.html.markdown,r/sagem?= =?UTF-8?q?aker=5Fpipeline.html.markdown,r/sagemaker=5Fnotebook=5Finstance?= =?UTF-8?q?=5Flifecycle=5Fconfiguration.html.markdown,r/sagemaker=5Fnotebo?= =?UTF-8?q?ok=5Finstance.html.markdown,r/sagemaker=5Fmonitoring=5Fschedule?= =?UTF-8?q?.html.markdown,r/sagemaker=5Fmodel=5Fpackage=5Fgroup=5Fpolicy.h?= =?UTF-8?q?tml.markdown,r/sagemaker=5Fmodel=5Fpackage=5Fgroup.html.markdow?= =?UTF-8?q?n,r/sagemaker=5Fmodel.html.markdown,r/sagemaker=5Fmlflow=5Ftrac?= =?UTF-8?q?king=5Fserver.html.markdown,r/sagemaker=5Fimage=5Fversion.html.?= =?UTF-8?q?markdown,r/sagemaker=5Fimage.html.markdown,r/sagemaker=5Fhuman?= =?UTF-8?q?=5Ftask=5Fui.html.markdown,r/sagemaker=5Fhub.html.markdown,r/sa?= =?UTF-8?q?gemaker=5Fflow=5Fdefinition.html.markdown,r/sagemaker=5Ffeature?= =?UTF-8?q?=5Fgroup.html.markdown,r/sagemaker=5Fendpoint=5Fconfiguration.h?= =?UTF-8?q?tml.markdown,r/sagemaker=5Fendpoint.html.markdown,r/sagemaker?= =?UTF-8?q?=5Fdomain.html.markdown,r/sagemaker=5Fdevice=5Ffleet.html.markd?= =?UTF-8?q?own,r/sagemaker=5Fdevice.html.markdown,r/sagemaker=5Fdata=5Fqua?= =?UTF-8?q?lity=5Fjob=5Fdefinition.html.markdown,r/sagemaker=5Fcode=5Frepo?= =?UTF-8?q?sitory.html.markdown,r/sagemaker=5Fapp=5Fimage=5Fconfig.html.ma?= =?UTF-8?q?rkdown,r/sagemaker=5Fapp.html.markdown,r/s3tables=5Ftable=5Fpol?= =?UTF-8?q?icy.html.markdown,r/s3tables=5Ftable=5Fbucket=5Fpolicy.html.mar?= =?UTF-8?q?kdown,r/s3tables=5Ftable=5Fbucket.html.markdown,r/s3tables=5Fta?= =?UTF-8?q?ble.html.markdown,r/s3tables=5Fnamespace.html.markdown,r/s3outp?= =?UTF-8?q?osts=5Fendpoint.html.markdown,r/s3control=5Fstorage=5Flens=5Fco?= =?UTF-8?q?nfiguration.html.markdown,r/s3control=5Fobject=5Flambda=5Facces?= =?UTF-8?q?s=5Fpoint=5Fpolicy.html.markdown,r/s3control=5Fobject=5Flambda?= =?UTF-8?q?=5Faccess=5Fpoint.html.markdown,r/s3control=5Fmulti=5Fregion=5F?= =?UTF-8?q?access=5Fpoint=5Fpolicy.html.markdown,r/s3control=5Fmulti=5Freg?= =?UTF-8?q?ion=5Faccess=5Fpoint.html.markdown,r/s3control=5Fdirectory=5Fbu?= =?UTF-8?q?cket=5Faccess=5Fpoint=5Fscope.html.markdown,r/s3control=5Fbucke?= =?UTF-8?q?t=5Fpolicy.html.markdown,r/s3control=5Fbucket=5Flifecycle=5Fcon?= =?UTF-8?q?figuration.html.markdown,r/s3control=5Fbucket.html.markdown,r/s?= =?UTF-8?q?3control=5Faccess=5Fpoint=5Fpolicy.html.markdown,r/s3control=5F?= =?UTF-8?q?access=5Fgrants=5Flocation.html.markdown,r/s3control=5Faccess?= =?UTF-8?q?=5Fgrants=5Finstance=5Fresource=5Fpolicy.html.markdown,r/s3cont?= =?UTF-8?q?rol=5Faccess=5Fgrants=5Finstance.html.markdown,r/s3control=5Fac?= =?UTF-8?q?cess=5Fgrant.html.markdown,r/s3=5Fobject=5Fcopy.html.markdown,r?= =?UTF-8?q?/s3=5Fobject.html.markdown,r/s3=5Fdirectory=5Fbucket.html.markd?= =?UTF-8?q?own,r/s3=5Fbucket=5Fwebsite=5Fconfiguration.html.markdown,r/s3?= =?UTF-8?q?=5Fbucket=5Fversioning.html.markdown,r/s3=5Fbucket=5Fserver=5Fs?= =?UTF-8?q?ide=5Fencryption=5Fconfiguration.html.markdown,r/s3=5Fbucket=5F?= =?UTF-8?q?request=5Fpayment=5Fconfiguration.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Freplication=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Fpu?= =?UTF-8?q?blic=5Faccess=5Fblock.html.markdown,r/s3=5Fbucket=5Fpolicy.html?= =?UTF-8?q?.markdown,r/s3=5Fbucket=5Fownership=5Fcontrols.html.markdown,r/?= =?UTF-8?q?s3=5Fbucket=5Fobject=5Flock=5Fconfiguration.html.markdown,r/s3?= =?UTF-8?q?=5Fbucket=5Fobject.html.markdown,r/s3=5Fbucket=5Fnotification.h?= =?UTF-8?q?tml.markdown,r/s3=5Fbucket=5Fmetric.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Fmetadata=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Floggi?= =?UTF-8?q?ng.html.markdown,r/s3=5Fbucket=5Flifecycle=5Fconfiguration.html?= =?UTF-8?q?.markdown,r/s3=5Fbucket=5Finventory.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Fintelligent=5Ftiering=5Fconfiguration.html.markdown,r/s3=5Fb?= =?UTF-8?q?ucket=5Fcors=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Fanal?= =?UTF-8?q?ytics=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Facl.html.ma?= =?UTF-8?q?rkdown,r/s3=5Fbucket=5Faccelerate=5Fconfiguration.html.markdown?= =?UTF-8?q?,r/s3=5Fbucket.html.markdown,r/s3=5Faccount=5Fpublic=5Faccess?= =?UTF-8?q?=5Fblock.html.markdown,r/s3=5Faccess=5Fpoint.html.markdown,r/ru?= =?UTF-8?q?m=5Fmetrics=5Fdestination.html.markdown,r/rum=5Fapp=5Fmonitor.h?= =?UTF-8?q?tml.markdown,r/route=5Ftable=5Fassociation.html.markdown,r/rout?= =?UTF-8?q?e=5Ftable.html.markdown,r/route53recoveryreadiness=5Fresource?= =?UTF-8?q?=5Fset.html.markdown,r/route53recoveryreadiness=5Frecovery=5Fgr?= =?UTF-8?q?oup.html.markdown,r/route53recoveryreadiness=5Freadiness=5Fchec?= =?UTF-8?q?k.html.markdown,r/route53recoveryreadiness=5Fcell.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fsafety=5Frule.html.markdown,r?= =?UTF-8?q?/route53recoverycontrolconfig=5Frouting=5Fcontrol.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fcontrol=5Fpanel.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fcluster.html.markdown,r/route?= =?UTF-8?q?53profiles=5Fresource=5Fassociation.html.markdown,r/route53prof?= =?UTF-8?q?iles=5Fprofile.html.markdown,r/route53profiles=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/route53domains=5Fregistered=5Fdomain.html.markdow?= =?UTF-8?q?n,r/route53domains=5Fdomain.html.markdown,r/route53domains=5Fde?= =?UTF-8?q?legation=5Fsigner=5Frecord.html.markdown,r/route53=5Fzone=5Fass?= =?UTF-8?q?ociation.html.markdown,r/route53=5Fzone.html.markdown,r/route53?= =?UTF-8?q?=5Fvpc=5Fassociation=5Fauthorization.html.markdown,r/route53=5F?= =?UTF-8?q?traffic=5Fpolicy=5Finstance.html.markdown,r/route53=5Ftraffic?= =?UTF-8?q?=5Fpolicy.html.markdown,r/route53=5Fresolver=5Frule=5Fassociati?= =?UTF-8?q?on.html.markdown,r/route53=5Fresolver=5Frule.html.markdown,r/ro?= =?UTF-8?q?ute53=5Fresolver=5Fquery=5Flog=5Fconfig=5Fassociation.html.mark?= =?UTF-8?q?down,r/route53=5Fresolver=5Fquery=5Flog=5Fconfig.html.markdown,?= =?UTF-8?q?r/route53=5Fresolver=5Ffirewall=5Frule=5Fgroup=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/route53=5Fresolver=5Ffirewall=5Frule=5Fgroup.html?= =?UTF-8?q?.markdown,r/route53=5Fresolver=5Ffirewall=5Frule.html.markdown,?= =?UTF-8?q?r/route53=5Fresolver=5Ffirewall=5Fdomain=5Flist.html.markdown,r?= =?UTF-8?q?/route53=5Fresolver=5Ffirewall=5Fconfig.html.markdown,r/route53?= =?UTF-8?q?=5Fresolver=5Fendpoint.html.markdown,r/route53=5Fresolver=5Fdns?= =?UTF-8?q?sec=5Fconfig.html.markdown,r/route53=5Fresolver=5Fconfig.html.m?= =?UTF-8?q?arkdown,r/route53=5Frecords=5Fexclusive.html.markdown,r/route53?= =?UTF-8?q?=5Frecord.html.markdown,r/route53=5Fquery=5Flog.html.markdown,r?= =?UTF-8?q?/route53=5Fkey=5Fsigning=5Fkey.html.markdown,r/route53=5Fhosted?= =?UTF-8?q?=5Fzone=5Fdnssec.html.markdown,r/route53=5Fhealth=5Fcheck.html.?= =?UTF-8?q?markdown,r/route53=5Fdelegation=5Fset.html.markdown,r/route53?= =?UTF-8?q?=5Fcidr=5Flocation.html.markdown,r/route53=5Fcidr=5Fcollection.?= =?UTF-8?q?html.markdown,r/route.html.markdown,r/rolesanywhere=5Ftrust=5Fa?= =?UTF-8?q?nchor.html.markdown,r/rolesanywhere=5Fprofile.html.markdown,r/r?= =?UTF-8?q?esourcegroups=5Fresource.html.markdown,r/resourcegroups=5Fgroup?= =?UTF-8?q?.html.markdown,r/resourceexplorer2=5Fview.html.markdown,r/resou?= =?UTF-8?q?rceexplorer2=5Findex.html.markdown,r/resiliencehub=5Fresiliency?= =?UTF-8?q?=5Fpolicy.html.markdown,r/rekognition=5Fstream=5Fprocessor.html?= =?UTF-8?q?.markdown,r/rekognition=5Fproject.html.markdown,r/rekognition?= =?UTF-8?q?=5Fcollection.html.markdown,r/redshiftserverless=5Fworkgroup.ht?= =?UTF-8?q?ml.markdown,r/redshiftserverless=5Fusage=5Flimit.html.markdown,?= =?UTF-8?q?r/redshiftserverless=5Fsnapshot.html.markdown,r/redshiftserverl?= =?UTF-8?q?ess=5Fresource=5Fpolicy.html.markdown,r/redshiftserverless=5Fna?= =?UTF-8?q?mespace.html.markdown,r/redshiftserverless=5Fendpoint=5Faccess.?= =?UTF-8?q?html.markdown,r/redshiftserverless=5Fcustom=5Fdomain=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/redshiftdata=5Fstatement.html.markdown,r/re?= =?UTF-8?q?dshift=5Fusage=5Flimit.html.markdown,r/redshift=5Fsubnet=5Fgrou?= =?UTF-8?q?p.html.markdown,r/redshift=5Fsnapshot=5Fschedule=5Fassociation.?= =?UTF-8?q?html.markdown,r/redshift=5Fsnapshot=5Fschedule.html.markdown,r/?= =?UTF-8?q?redshift=5Fsnapshot=5Fcopy=5Fgrant.html.markdown,r/redshift=5Fs?= =?UTF-8?q?napshot=5Fcopy.html.markdown,r/redshift=5Fscheduled=5Faction.ht?= =?UTF-8?q?ml.markdown,r/redshift=5Fresource=5Fpolicy.html.markdown,r/reds?= =?UTF-8?q?hift=5Fpartner.html.markdown,r/redshift=5Fparameter=5Fgroup.htm?= =?UTF-8?q?l.markdown,r/redshift=5Flogging.html.markdown,r/redshift=5Finte?= =?UTF-8?q?gration.html.markdown,r/redshift=5Fhsm=5Fconfiguration.html.mar?= =?UTF-8?q?kdown,r/redshift=5Fhsm=5Fclient=5Fcertificate.html.markdown,r/r?= =?UTF-8?q?edshift=5Fevent=5Fsubscription.html.markdown,r/redshift=5Fendpo?= =?UTF-8?q?int=5Fauthorization.html.markdown,r/redshift=5Fendpoint=5Facces?= =?UTF-8?q?s.html.markdown,r/redshift=5Fdata=5Fshare=5Fconsumer=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/redshift=5Fdata=5Fshare=5Fauthorization.htm?= =?UTF-8?q?l.markdown,r/redshift=5Fcluster=5Fsnapshot.html.markdown,r/reds?= =?UTF-8?q?hift=5Fcluster=5Fiam=5Froles.html.markdown,r/redshift=5Fcluster?= =?UTF-8?q?.html.markdown,r/redshift=5Fauthentication=5Fprofile.html.markd?= =?UTF-8?q?own,r/rds=5Fshard=5Fgroup.html.markdown,r/rds=5Freserved=5Finst?= =?UTF-8?q?ance.html.markdown,r/rds=5Fintegration.html.markdown,r/rds=5Fin?= =?UTF-8?q?stance=5Fstate.html.markdown,r/rds=5Fglobal=5Fcluster.html.mark?= =?UTF-8?q?down,r/rds=5Fexport=5Ftask.html.markdown,r/rds=5Fcustom=5Fdb=5F?= =?UTF-8?q?engine=5Fversion.markdown,r/rds=5Fcluster=5Fsnapshot=5Fcopy.htm?= =?UTF-8?q?l.markdown,r/rds=5Fcluster=5Frole=5Fassociation.html.markdown,r?= =?UTF-8?q?/rds=5Fcluster=5Fparameter=5Fgroup.html.markdown,r/rds=5Fcluste?= =?UTF-8?q?r=5Finstance.html.markdown,r/rds=5Fcluster=5Fendpoint.html.mark?= =?UTF-8?q?down,r/rds=5Fcluster=5Factivity=5Fstream.html.markdown,r/rds=5F?= =?UTF-8?q?cluster.html.markdown,r/rds=5Fcertificate.html.markdown,r/rbin?= =?UTF-8?q?=5Frule.html.markdown,r/ram=5Fsharing=5Fwith=5Forganization.htm?= =?UTF-8?q?l.markdown,r/ram=5Fresource=5Fshare=5Faccepter.html.markdown,r/?= =?UTF-8?q?ram=5Fresource=5Fshare.html.markdown,r/ram=5Fresource=5Fassocia?= =?UTF-8?q?tion.html.markdown,r/ram=5Fprincipal=5Fassociation.html.markdow?= =?UTF-8?q?n,r/quicksight=5Fvpc=5Fconnection.html.markdown,r/quicksight=5F?= =?UTF-8?q?user=5Fcustom=5Fpermission.html.markdown,r/quicksight=5Fuser.ht?= =?UTF-8?q?ml.markdown,r/quicksight=5Ftheme.html.markdown,r/quicksight=5Ft?= =?UTF-8?q?emplate=5Falias.html.markdown,r/quicksight=5Ftemplate.html.mark?= =?UTF-8?q?down,r/quicksight=5Frole=5Fmembership.html.markdown,r/quicksigh?= =?UTF-8?q?t=5Frole=5Fcustom=5Fpermission.html.markdown,r/quicksight=5Fref?= =?UTF-8?q?resh=5Fschedule.html.markdown,r/quicksight=5Fnamespace.html.mar?= =?UTF-8?q?kdown,r/quicksight=5Fkey=5Fregistration.html.markdown,r/quicksi?= =?UTF-8?q?ght=5Fip=5Frestriction.html.markdown,r/quicksight=5Fingestion.h?= =?UTF-8?q?tml.markdown,r/quicksight=5Fiam=5Fpolicy=5Fassignment.html.mark?= =?UTF-8?q?down,r/quicksight=5Fgroup=5Fmembership.html.markdown,r/quicksig?= =?UTF-8?q?ht=5Fgroup.html.markdown,r/quicksight=5Ffolder=5Fmembership.htm?= =?UTF-8?q?l.markdown,r/quicksight=5Ffolder.html.markdown,r/quicksight=5Fd?= =?UTF-8?q?ata=5Fsource.html.markdown,r/quicksight=5Fdata=5Fset.html.markd?= =?UTF-8?q?own,r/quicksight=5Fdashboard.html.markdown,r/quicksight=5Fcusto?= =?UTF-8?q?m=5Fpermissions.html.markdown,r/quicksight=5Fanalysis.html.mark?= =?UTF-8?q?down,r/quicksight=5Faccount=5Fsubscription.html.markdown,r/quic?= =?UTF-8?q?ksight=5Faccount=5Fsettings.html.markdown,r/qldb=5Fstream.html.?= =?UTF-8?q?markdown,r/qldb=5Fledger.html.markdown,r/qbusiness=5Fapplicatio?= =?UTF-8?q?n.html.markdown,r/proxy=5Fprotocol=5Fpolicy.html.markdown,r/pro?= =?UTF-8?q?metheus=5Fworkspace=5Fconfiguration.html.markdown,r/prometheus?= =?UTF-8?q?=5Fworkspace.html.markdown,r/prometheus=5Fscraper.html.markdown?= =?UTF-8?q?,r/prometheus=5Frule=5Fgroup=5Fnamespace.html.markdown,r/promet?= =?UTF-8?q?heus=5Fquery=5Flogging=5Fconfiguration.html.markdown,r/promethe?= =?UTF-8?q?us=5Falert=5Fmanager=5Fdefinition.html.markdown,r/placement=5Fg?= =?UTF-8?q?roup.html.markdown,r/pipes=5Fpipe.html.markdown,r/pinpointsmsvo?= =?UTF-8?q?icev2=5Fphone=5Fnumber.html.markdown,r/pinpointsmsvoicev2=5Fopt?= =?UTF-8?q?=5Fout=5Flist.html.markdown,r/pinpointsmsvoicev2=5Fconfiguratio?= =?UTF-8?q?n=5Fset.html.markdown,r/pinpoint=5Fsms=5Fchannel.html.markdown,?= =?UTF-8?q?r/pinpoint=5Fgcm=5Fchannel.html.markdown,r/pinpoint=5Fevent=5Fs?= =?UTF-8?q?tream.html.markdown,r/pinpoint=5Femail=5Ftemplate.markdown,r/pi?= =?UTF-8?q?npoint=5Femail=5Fchannel.html.markdown,r/pinpoint=5Fbaidu=5Fcha?= =?UTF-8?q?nnel.html.markdown,r/pinpoint=5Fapp.html.markdown,r/pinpoint=5F?= =?UTF-8?q?apns=5Fvoip=5Fsandbox=5Fchannel.html.markdown,r/pinpoint=5Fapns?= =?UTF-8?q?=5Fvoip=5Fchannel.html.markdown,r/pinpoint=5Fapns=5Fsandbox=5Fc?= =?UTF-8?q?hannel.html.markdown,r/pinpoint=5Fapns=5Fchannel.html.markdown,?= =?UTF-8?q?r/pinpoint=5Fadm=5Fchannel.html.markdown,r/paymentcryptography?= =?UTF-8?q?=5Fkey=5Falias.html.markdown,r/paymentcryptography=5Fkey.html.m?= =?UTF-8?q?arkdown,r/osis=5Fpipeline.html.markdown,r/organizations=5Fresou?= =?UTF-8?q?rce=5Fpolicy.html.markdown,r/organizations=5Fpolicy=5Fattachmen?= =?UTF-8?q?t.html.markdown,r/organizations=5Fpolicy.html.markdown,r/organi?= =?UTF-8?q?zations=5Forganizational=5Funit.html.markdown,r/organizations?= =?UTF-8?q?=5Forganization.html.markdown,r/organizations=5Fdelegated=5Fadm?= =?UTF-8?q?inistrator.html.markdown,r/organizations=5Faccount.html.markdow?= =?UTF-8?q?n,r/opensearchserverless=5Fvpc=5Fendpoint.html.markdown,r/opens?= =?UTF-8?q?earchserverless=5Fsecurity=5Fpolicy.html.markdown,r/opensearchs?= =?UTF-8?q?erverless=5Fsecurity=5Fconfig.html.markdown,r/opensearchserverl?= =?UTF-8?q?ess=5Flifecycle=5Fpolicy.html.markdown,r/opensearchserverless?= =?UTF-8?q?=5Fcollection.html.markdown,r/opensearchserverless=5Faccess=5Fp?= =?UTF-8?q?olicy.html.markdown,r/opensearch=5Fvpc=5Fendpoint.html.markdown?= =?UTF-8?q?,r/opensearch=5Fpackage=5Fassociation.html.markdown,r/opensearc?= =?UTF-8?q?h=5Fpackage.html.markdown,r/opensearch=5Foutbound=5Fconnection.?= =?UTF-8?q?html.markdown,r/opensearch=5Finbound=5Fconnection=5Faccepter.ht?= =?UTF-8?q?ml.markdown,r/opensearch=5Fdomain=5Fsaml=5Foptions.html.markdow?= =?UTF-8?q?n,r/opensearch=5Fdomain=5Fpolicy.html.markdown,r/opensearch=5Fd?= =?UTF-8?q?omain.html.markdown,r/opensearch=5Fauthorize=5Fvpc=5Fendpoint?= =?UTF-8?q?=5Faccess.html.markdown,r/oam=5Fsink=5Fpolicy.html.markdown,r/o?= =?UTF-8?q?am=5Fsink.html.markdown,r/oam=5Flink.html.markdown,r/notificati?= =?UTF-8?q?onscontacts=5Femail=5Fcontact.html.markdown,r/notifications=5Fn?= =?UTF-8?q?otification=5Fhub.html.markdown,r/notifications=5Fnotification?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/notifications=5Fevent=5Frule.h?= =?UTF-8?q?tml.markdown,r/notifications=5Fchannel=5Fassociation.html.markd?= =?UTF-8?q?own,r/networkmonitor=5Fprobe.html.markdown,r/networkmonitor=5Fm?= =?UTF-8?q?onitor.html.markdown,r/networkmanager=5Fvpc=5Fattachment.html.m?= =?UTF-8?q?arkdown,r/networkmanager=5Ftransit=5Fgateway=5Froute=5Ftable=5F?= =?UTF-8?q?attachment.html.markdown,r/networkmanager=5Ftransit=5Fgateway?= =?UTF-8?q?=5Fregistration.html.markdown,r/networkmanager=5Ftransit=5Fgate?= =?UTF-8?q?way=5Fpeering.html.markdown,r/networkmanager=5Ftransit=5Fgatewa?= =?UTF-8?q?y=5Fconnect=5Fpeer=5Fassociation.html.markdown,r/networkmanager?= =?UTF-8?q?=5Fsite=5Fto=5Fsite=5Fvpn=5Fattachment.html.markdown,r/networkm?= =?UTF-8?q?anager=5Fsite.html.markdown,r/networkmanager=5Flink=5Fassociati?= =?UTF-8?q?on.html.markdown,r/networkmanager=5Flink.html.markdown,r/networ?= =?UTF-8?q?kmanager=5Fglobal=5Fnetwork.html.markdown,r/networkmanager=5Fdx?= =?UTF-8?q?=5Fgateway=5Fattachment.html.markdown,r/networkmanager=5Fdevice?= =?UTF-8?q?.html.markdown,r/networkmanager=5Fcustomer=5Fgateway=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/networkmanager=5Fcore=5Fnetwork=5Fpolicy=5F?= =?UTF-8?q?attachment.html.markdown,r/networkmanager=5Fcore=5Fnetwork.html?= =?UTF-8?q?.markdown,r/networkmanager=5Fconnection.html.markdown,r/network?= =?UTF-8?q?manager=5Fconnect=5Fpeer.html.markdown,r/networkmanager=5Fconne?= =?UTF-8?q?ct=5Fattachment.html.markdown,r/networkmanager=5Fattachment=5Fa?= =?UTF-8?q?ccepter.html.markdown,r/networkfirewall=5Fvpc=5Fendpoint=5Fasso?= =?UTF-8?q?ciation.html.markdown,r/networkfirewall=5Ftls=5Finspection=5Fco?= =?UTF-8?q?nfiguration.html.markdown,r/networkfirewall=5Frule=5Fgroup.html?= =?UTF-8?q?.markdown,r/networkfirewall=5Fresource=5Fpolicy.html.markdown,r?= =?UTF-8?q?/networkfirewall=5Flogging=5Fconfiguration.html.markdown,r/netw?= =?UTF-8?q?orkfirewall=5Ffirewall=5Ftransit=5Fgateway=5Fattachment=5Faccep?= =?UTF-8?q?ter.html.markdown,r/networkfirewall=5Ffirewall=5Fpolicy.html.ma?= =?UTF-8?q?rkdown,r/networkfirewall=5Ffirewall.html.markdown,r/network=5Fi?= =?UTF-8?q?nterface=5Fsg=5Fattachment.html.markdown,r/network=5Finterface?= =?UTF-8?q?=5Fpermission.html.markdown,r/network=5Finterface=5Fattachment.?= =?UTF-8?q?html.markdown,r/network=5Finterface.html.markdown,r/network=5Fa?= =?UTF-8?q?cl=5Frule.html.markdown,r/network=5Facl=5Fassociation.html.mark?= =?UTF-8?q?down,r/network=5Facl.html.markdown,r/neptunegraph=5Fgraph.html.?= =?UTF-8?q?markdown,r/neptune=5Fsubnet=5Fgroup.html.markdown,r/neptune=5Fp?= =?UTF-8?q?arameter=5Fgroup.html.markdown,r/neptune=5Fglobal=5Fcluster.htm?= =?UTF-8?q?l.markdown,r/neptune=5Fevent=5Fsubscription.html.markdown,r/nep?= =?UTF-8?q?tune=5Fcluster=5Fsnapshot.html.markdown,r/neptune=5Fcluster=5Fp?= =?UTF-8?q?arameter=5Fgroup.html.markdown,r/neptune=5Fcluster=5Finstance.h?= =?UTF-8?q?tml.markdown,r/neptune=5Fcluster=5Fendpoint.html.markdown,r/nep?= =?UTF-8?q?tune=5Fcluster.html.markdown,r/nat=5Fgateway=5Feip=5Fassociatio?= =?UTF-8?q?n.html.markdown,r/nat=5Fgateway.html.markdown,r/mwaa=5Fenvironm?= =?UTF-8?q?ent.html.markdown,r/mskconnect=5Fworker=5Fconfiguration.html.ma?= =?UTF-8?q?rkdown,r/mskconnect=5Fcustom=5Fplugin.html.markdown,r/mskconnec?= =?UTF-8?q?t=5Fconnector.html.markdown,r/msk=5Fvpc=5Fconnection.html.markd?= =?UTF-8?q?own,r/msk=5Fsingle=5Fscram=5Fsecret=5Fassociation.html.markdown?= =?UTF-8?q?,r/msk=5Fserverless=5Fcluster.html.markdown,r/msk=5Fscram=5Fsec?= =?UTF-8?q?ret=5Fassociation.html.markdown,r/msk=5Freplicator.html.markdow?= =?UTF-8?q?n,r/msk=5Fconfiguration.html.markdown,r/msk=5Fcluster=5Fpolicy.?= =?UTF-8?q?html.markdown,r/msk=5Fcluster.html.markdown,r/mq=5Fconfiguratio?= =?UTF-8?q?n.html.markdown,r/mq=5Fbroker.html.markdown,r/memorydb=5Fuser.h?= =?UTF-8?q?tml.markdown,r/memorydb=5Fsubnet=5Fgroup.html.markdown,r/memory?= =?UTF-8?q?db=5Fsnapshot.html.markdown,r/memorydb=5Fparameter=5Fgroup.html?= =?UTF-8?q?.markdown,r/memorydb=5Fmulti=5Fregion=5Fcluster.html.markdown,r?= =?UTF-8?q?/memorydb=5Fcluster.html.markdown,r/memorydb=5Facl.html.markdow?= =?UTF-8?q?n,r/medialive=5Fmultiplex=5Fprogram.html.markdown,r/medialive?= =?UTF-8?q?=5Fmultiplex.html.markdown,r/medialive=5Finput=5Fsecurity=5Fgro?= =?UTF-8?q?up.html.markdown,r/medialive=5Finput.html.markdown,r/medialive?= =?UTF-8?q?=5Fchannel.html.markdown,r/media=5Fstore=5Fcontainer=5Fpolicy.h?= =?UTF-8?q?tml.markdown,r/media=5Fstore=5Fcontainer.html.markdown,r/media?= =?UTF-8?q?=5Fpackagev2=5Fchannel=5Fgroup.html.markdown,r/media=5Fpackage?= =?UTF-8?q?=5Fchannel.html.markdown,r/media=5Fconvert=5Fqueue.html.markdow?= =?UTF-8?q?n,r/main=5Froute=5Ftable=5Fassociation.html.markdown,r/macie2?= =?UTF-8?q?=5Forganization=5Fconfiguration.html.markdown,r/macie2=5Forgani?= =?UTF-8?q?zation=5Fadmin=5Faccount.html.markdown,r/macie2=5Fmember.html.m?= =?UTF-8?q?arkdown,r/macie2=5Finvitation=5Faccepter.html.markdown,r/macie2?= =?UTF-8?q?=5Ffindings=5Ffilter.html.markdown,r/macie2=5Fcustom=5Fdata=5Fi?= =?UTF-8?q?dentifier.html.markdown,r/macie2=5Fclassification=5Fjob.html.ma?= =?UTF-8?q?rkdown,r/macie2=5Fclassification=5Fexport=5Fconfiguration.html.?= =?UTF-8?q?markdown,r/macie2=5Faccount.html.markdown,r/m2=5Fenvironment.ht?= =?UTF-8?q?ml.markdown,r/m2=5Fdeployment.html.markdown,r/m2=5Fapplication.?= =?UTF-8?q?html.markdown,r/location=5Ftracker=5Fassociation.html.markdown,?= =?UTF-8?q?r/location=5Ftracker.html.markdown,r/location=5Froute=5Fcalcula?= =?UTF-8?q?tor.html.markdown,r/location=5Fplace=5Findex.html.markdown,r/lo?= =?UTF-8?q?cation=5Fmap.html.markdown,r/location=5Fgeofence=5Fcollection.h?= =?UTF-8?q?tml.markdown,r/load=5Fbalancer=5Fpolicy.html.markdown,r/load=5F?= =?UTF-8?q?balancer=5Flistener=5Fpolicy.html.markdown,r/load=5Fbalancer=5F?= =?UTF-8?q?backend=5Fserver=5Fpolicy.html.markdown,r/lightsail=5Fstatic=5F?= =?UTF-8?q?ip=5Fattachment.html.markdown,r/lightsail=5Fstatic=5Fip.html.ma?= =?UTF-8?q?rkdown,r/lightsail=5Flb=5Fstickiness=5Fpolicy.html.markdown,r/l?= =?UTF-8?q?ightsail=5Flb=5Fhttps=5Fredirection=5Fpolicy.html.markdown,r/li?= =?UTF-8?q?ghtsail=5Flb=5Fcertificate=5Fattachment.html.markdown,r/lightsa?= =?UTF-8?q?il=5Flb=5Fcertificate.html.markdown,r/lightsail=5Flb=5Fattachme?= =?UTF-8?q?nt.html.markdown,r/lightsail=5Flb.html.markdown,r/lightsail=5Fk?= =?UTF-8?q?ey=5Fpair.html.markdown,r/lightsail=5Finstance=5Fpublic=5Fports?= =?UTF-8?q?.html.markdown,r/lightsail=5Finstance.html.markdown,r/lightsail?= =?UTF-8?q?=5Fdomain=5Fentry.html.markdown,r/lightsail=5Fdomain.html.markd?= =?UTF-8?q?own,r/lightsail=5Fdistribution.html.markdown,r/lightsail=5Fdisk?= =?UTF-8?q?=5Fattachment.html.markdown,r/lightsail=5Fdisk.html.markdown,r/?= =?UTF-8?q?lightsail=5Fdatabase.html.markdown,r/lightsail=5Fcontainer=5Fse?= =?UTF-8?q?rvice=5Fdeployment=5Fversion.html.markdown,r/lightsail=5Fcontai?= =?UTF-8?q?ner=5Fservice.html.markdown,r/lightsail=5Fcertificate.html.mark?= =?UTF-8?q?down,r/lightsail=5Fbucket=5Fresource=5Faccess.html.markdown,r/l?= =?UTF-8?q?ightsail=5Fbucket=5Faccess=5Fkey.html.markdown,r/lightsail=5Fbu?= =?UTF-8?q?cket.html.markdown,r/licensemanager=5Flicense=5Fconfiguration.h?= =?UTF-8?q?tml.markdown,r/licensemanager=5Fgrant=5Faccepter.html.markdown,?= =?UTF-8?q?r/licensemanager=5Fgrant.html.markdown,r/licensemanager=5Fassoc?= =?UTF-8?q?iation.html.markdown,r/lexv2models=5Fslot=5Ftype.html.markdown,?= =?UTF-8?q?r/lexv2models=5Fslot.html.markdown,r/lexv2models=5Fintent.html.?= =?UTF-8?q?markdown,r/lexv2models=5Fbot=5Fversion.html.markdown,r/lexv2mod?= =?UTF-8?q?els=5Fbot=5Flocale.html.markdown,r/lexv2models=5Fbot.html.markd?= =?UTF-8?q?own,r/lex=5Fslot=5Ftype.html.markdown,r/lex=5Fintent.html.markd?= =?UTF-8?q?own,r/lex=5Fbot=5Falias.html.markdown,r/lex=5Fbot.html.markdown?= =?UTF-8?q?,r/lb=5Ftrust=5Fstore=5Frevocation.html.markdown,r/lb=5Ftrust?= =?UTF-8?q?=5Fstore.html.markdown,r/lb=5Ftarget=5Fgroup=5Fattachment.html.?= =?UTF-8?q?markdown,r/lb=5Ftarget=5Fgroup.html.markdown,r/lb=5Fssl=5Fnegot?= =?UTF-8?q?iation=5Fpolicy.html.markdown,r/lb=5Flistener=5Frule.html.markd?= =?UTF-8?q?own,r/lb=5Flistener=5Fcertificate.html.markdown,r/lb=5Flistener?= =?UTF-8?q?.html.markdown,r/lb=5Fcookie=5Fstickiness=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/lb.html.markdown,r/launch=5Ftemplate.html.markdown,r/launch?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/lambda=5Fruntime=5Fmanagement?= =?UTF-8?q?=5Fconfig.html.markdown,r/lambda=5Fprovisioned=5Fconcurrency=5F?= =?UTF-8?q?config.html.markdown,r/lambda=5Fpermission.html.markdown,r/lamb?= =?UTF-8?q?da=5Flayer=5Fversion=5Fpermission.html.markdown,r/lambda=5Flaye?= =?UTF-8?q?r=5Fversion.html.markdown,r/lambda=5Finvocation.html.markdown,r?= =?UTF-8?q?/lambda=5Ffunction=5Furl.html.markdown,r/lambda=5Ffunction=5Fre?= =?UTF-8?q?cursion=5Fconfig.html.markdown,r/lambda=5Ffunction=5Fevent=5Fin?= =?UTF-8?q?voke=5Fconfig.html.markdown,r/lambda=5Ffunction.html.markdown,r?= =?UTF-8?q?/lambda=5Fevent=5Fsource=5Fmapping.html.markdown,r/lambda=5Fcod?= =?UTF-8?q?e=5Fsigning=5Fconfig.html.markdown,r/lambda=5Falias.html.markdo?= =?UTF-8?q?wn,r/lakeformation=5Fresource=5Flf=5Ftags.html.markdown,r/lakef?= =?UTF-8?q?ormation=5Fresource=5Flf=5Ftag.html.markdown,r/lakeformation=5F?= =?UTF-8?q?resource.html.markdown,r/lakeformation=5Fpermissions.html.markd?= =?UTF-8?q?own,r/lakeformation=5Fopt=5Fin.html.markdown,r/lakeformation=5F?= =?UTF-8?q?lf=5Ftag.html.markdown,r/lakeformation=5Fdata=5Flake=5Fsettings?= =?UTF-8?q?.html.markdown,r/lakeformation=5Fdata=5Fcells=5Ffilter.html.mar?= =?UTF-8?q?kdown,r/kms=5Freplica=5Fkey.html.markdown,r/kms=5Freplica=5Fext?= =?UTF-8?q?ernal=5Fkey.html.markdown,r/kms=5Fkey=5Fpolicy.html.markdown,r/?= =?UTF-8?q?kms=5Fkey.html.markdown,r/kms=5Fgrant.html.markdown,r/kms=5Fext?= =?UTF-8?q?ernal=5Fkey.html.markdown,r/kms=5Fcustom=5Fkey=5Fstore.html.mar?= =?UTF-8?q?kdown,r/kms=5Fciphertext.html.markdown,r/kms=5Falias.html.markd?= =?UTF-8?q?own,r/kinesisanalyticsv2=5Fapplication=5Fsnapshot.html.markdown?= =?UTF-8?q?,r/kinesisanalyticsv2=5Fapplication.html.markdown,r/kinesis=5Fv?= =?UTF-8?q?ideo=5Fstream.html.markdown,r/kinesis=5Fstream=5Fconsumer.html.?= =?UTF-8?q?markdown,r/kinesis=5Fstream.html.markdown,r/kinesis=5Fresource?= =?UTF-8?q?=5Fpolicy.html.markdown,r/kinesis=5Ffirehose=5Fdelivery=5Fstrea?= =?UTF-8?q?m.html.markdown,r/kinesis=5Fanalytics=5Fapplication.html.markdo?= =?UTF-8?q?wn,r/keyspaces=5Ftable.html.markdown,r/keyspaces=5Fkeyspace.htm?= =?UTF-8?q?l.markdown,r/key=5Fpair.html.markdown,r/kendra=5Fthesaurus.html?= =?UTF-8?q?.markdown,r/kendra=5Fquery=5Fsuggestions=5Fblock=5Flist.html.ma?= =?UTF-8?q?rkdown,r/kendra=5Findex.html.markdown,r/kendra=5Ffaq.html.markd?= =?UTF-8?q?own,r/kendra=5Fexperience.html.markdown,r/kendra=5Fdata=5Fsourc?= =?UTF-8?q?e.html.markdown,r/ivschat=5Froom.html.markdown,r/ivschat=5Flogg?= =?UTF-8?q?ing=5Fconfiguration.html.markdown,r/ivs=5Frecording=5Fconfigura?= =?UTF-8?q?tion.html.markdown,r/ivs=5Fplayback=5Fkey=5Fpair.html.markdown,?= =?UTF-8?q?r/ivs=5Fchannel.html.markdown,r/iot=5Ftopic=5Frule=5Fdestinatio?= =?UTF-8?q?n.html.markdown,r/iot=5Ftopic=5Frule.html.markdown,r/iot=5Fthin?= =?UTF-8?q?g=5Ftype.html.markdown,r/iot=5Fthing=5Fprincipal=5Fattachment.h?= =?UTF-8?q?tml.markdown,r/iot=5Fthing=5Fgroup=5Fmembership.html.markdown,r?= =?UTF-8?q?/iot=5Fthing=5Fgroup.html.markdown,r/iot=5Fthing.html.markdown,?= =?UTF-8?q?r/iot=5Frole=5Falias.html.markdown,r/iot=5Fprovisioning=5Ftempl?= =?UTF-8?q?ate.html.markdown,r/iot=5Fpolicy=5Fattachment.html.markdown,r/i?= =?UTF-8?q?ot=5Fpolicy.html.markdown,r/iot=5Flogging=5Foptions.html.markdo?= =?UTF-8?q?wn,r/iot=5Findexing=5Fconfiguration.html.markdown,r/iot=5Fevent?= =?UTF-8?q?=5Fconfigurations.html.markdown,r/iot=5Fdomain=5Fconfiguration.?= =?UTF-8?q?html.markdown,r/iot=5Fcertificate.html.markdown,r/iot=5Fca=5Fce?= =?UTF-8?q?rtificate.html.markdown,r/iot=5Fbilling=5Fgroup.html.markdown,r?= =?UTF-8?q?/iot=5Fauthorizer.html.markdown,r/internetmonitor=5Fmonitor.htm?= =?UTF-8?q?l.markdown,r/internet=5Fgateway=5Fattachment.html.markdown,r/in?= =?UTF-8?q?ternet=5Fgateway.html.markdown,r/instance.html.markdown,r/inspe?= =?UTF-8?q?ctor=5Fresource=5Fgroup.html.markdown,r/inspector=5Fassessment?= =?UTF-8?q?=5Ftemplate.html.markdown,r/inspector=5Fassessment=5Ftarget.htm?= =?UTF-8?q?l.markdown,r/inspector2=5Forganization=5Fconfiguration.html.mar?= =?UTF-8?q?kdown,r/inspector2=5Fmember=5Fassociation.html.markdown,r/inspe?= =?UTF-8?q?ctor2=5Ffilter.html.markdown,r/inspector2=5Fenabler.html.markdo?= =?UTF-8?q?wn,r/inspector2=5Fdelegated=5Fadmin=5Faccount.html.markdown,r/i?= =?UTF-8?q?magebuilder=5Fworkflow.html.markdown,r/imagebuilder=5Flifecycle?= =?UTF-8?q?=5Fpolicy.html.markdown,r/imagebuilder=5Finfrastructure=5Fconfi?= =?UTF-8?q?guration.html.markdown,r/imagebuilder=5Fimage=5Frecipe.html.mar?= =?UTF-8?q?kdown,r/imagebuilder=5Fimage=5Fpipeline.html.markdown,r/imagebu?= =?UTF-8?q?ilder=5Fimage.html.markdown,r/imagebuilder=5Fdistribution=5Fcon?= =?UTF-8?q?figuration.html.markdown,r/imagebuilder=5Fcontainer=5Frecipe.ht?= =?UTF-8?q?ml.markdown,r/imagebuilder=5Fcomponent.html.markdown,r/identity?= =?UTF-8?q?store=5Fuser.html.markdown,r/identitystore=5Fgroup=5Fmembership?= =?UTF-8?q?.html.markdown,r/identitystore=5Fgroup.html.markdown,r/iam=5Fvi?= =?UTF-8?q?rtual=5Fmfa=5Fdevice.html.markdown,r/iam=5Fuser=5Fssh=5Fkey.htm?= =?UTF-8?q?l.markdown,r/iam=5Fuser=5Fpolicy=5Fattachments=5Fexclusive.html?= =?UTF-8?q?.markdown,r/iam=5Fuser=5Fpolicy=5Fattachment.html.markdown,r/ia?= =?UTF-8?q?m=5Fuser=5Fpolicy.html.markdown,r/iam=5Fuser=5Fpolicies=5Fexclu?= =?UTF-8?q?sive.html.markdown,r/iam=5Fuser=5Flogin=5Fprofile.html.markdown?= =?UTF-8?q?,r/iam=5Fuser=5Fgroup=5Fmembership.html.markdown,r/iam=5Fuser.h?= =?UTF-8?q?tml.markdown,r/iam=5Fsigning=5Fcertificate.html.markdown,r/iam?= =?UTF-8?q?=5Fservice=5Fspecific=5Fcredential.html.markdown,r/iam=5Fservic?= =?UTF-8?q?e=5Flinked=5Frole.html.markdown,r/iam=5Fserver=5Fcertificate.ht?= =?UTF-8?q?ml.markdown,r/iam=5Fsecurity=5Ftoken=5Fservice=5Fpreferences.ht?= =?UTF-8?q?ml.markdown,r/iam=5Fsaml=5Fprovider.html.markdown,r/iam=5Frole?= =?UTF-8?q?=5Fpolicy=5Fattachments=5Fexclusive.html.markdown,r/iam=5Frole?= =?UTF-8?q?=5Fpolicy=5Fattachment.html.markdown,r/iam=5Frole=5Fpolicy.html?= =?UTF-8?q?.markdown,r/iam=5Frole=5Fpolicies=5Fexclusive.html.markdown,r/i?= =?UTF-8?q?am=5Frole.html.markdown,r/iam=5Fpolicy=5Fattachment.html.markdo?= =?UTF-8?q?wn,r/iam=5Fpolicy.html.markdown,r/iam=5Forganizations=5Ffeature?= =?UTF-8?q?s.html.markdown,r/iam=5Fopenid=5Fconnect=5Fprovider.html.markdo?= =?UTF-8?q?wn,r/iam=5Finstance=5Fprofile.html.markdown,r/iam=5Fgroup=5Fpol?= =?UTF-8?q?icy=5Fattachments=5Fexclusive.html.markdown,r/iam=5Fgroup=5Fpol?= =?UTF-8?q?icy=5Fattachment.html.markdown,r/iam=5Fgroup=5Fpolicy.html.mark?= =?UTF-8?q?down,r/iam=5Fgroup=5Fpolicies=5Fexclusive.html.markdown,r/iam?= =?UTF-8?q?=5Fgroup=5Fmembership.html.markdown,r/iam=5Fgroup.html.markdown?= =?UTF-8?q?,r/iam=5Faccount=5Fpassword=5Fpolicy.html.markdown,r/iam=5Facco?= =?UTF-8?q?unt=5Falias.html.markdown,r/iam=5Faccess=5Fkey.html.markdown,r/?= =?UTF-8?q?guardduty=5Fthreatintelset.html.markdown,r/guardduty=5Fpublishi?= =?UTF-8?q?ng=5Fdestination.html.markdown,r/guardduty=5Forganization=5Fcon?= =?UTF-8?q?figuration=5Ffeature.html.markdown,r/guardduty=5Forganization?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/guardduty=5Forganization=5Fadm?= =?UTF-8?q?in=5Faccount.html.markdown,r/guardduty=5Fmember=5Fdetector=5Ffe?= =?UTF-8?q?ature.html.markdown,r/guardduty=5Fmember.html.markdown,r/guardd?= =?UTF-8?q?uty=5Fmalware=5Fprotection=5Fplan.html.markdown,r/guardduty=5Fi?= =?UTF-8?q?pset.html.markdown,r/guardduty=5Finvite=5Faccepter.html.markdow?= =?UTF-8?q?n,r/guardduty=5Ffilter.html.markdown,r/guardduty=5Fdetector=5Ff?= =?UTF-8?q?eature.html.markdown,r/guardduty=5Fdetector.html.markdown,r/gra?= =?UTF-8?q?fana=5Fworkspace=5Fservice=5Faccount=5Ftoken.html.markdown,r/gr?= =?UTF-8?q?afana=5Fworkspace=5Fservice=5Faccount.html.markdown,r/grafana?= =?UTF-8?q?=5Fworkspace=5Fsaml=5Fconfiguration.html.markdown,r/grafana=5Fw?= =?UTF-8?q?orkspace=5Fapi=5Fkey.html.markdown,r/grafana=5Fworkspace.html.m?= =?UTF-8?q?arkdown,r/grafana=5Frole=5Fassociation.html.markdown,r/grafana?= =?UTF-8?q?=5Flicense=5Fassociation.html.markdown,r/glue=5Fworkflow.html.m?= =?UTF-8?q?arkdown,r/glue=5Fuser=5Fdefined=5Ffunction.html.markdown,r/glue?= =?UTF-8?q?=5Ftrigger.html.markdown,r/glue=5Fsecurity=5Fconfiguration.html?= =?UTF-8?q?.markdown,r/glue=5Fschema.html.markdown,r/glue=5Fresource=5Fpol?= =?UTF-8?q?icy.html.markdown,r/glue=5Fregistry.html.markdown,r/glue=5Fpart?= =?UTF-8?q?ition=5Findex.html.markdown,r/glue=5Fpartition.html.markdown,r/?= =?UTF-8?q?glue=5Fml=5Ftransform.html.markdown,r/glue=5Fjob.html.markdown,?= =?UTF-8?q?r/glue=5Fdev=5Fendpoint.html.markdown,r/glue=5Fdata=5Fquality?= =?UTF-8?q?=5Fruleset.html.markdown,r/glue=5Fdata=5Fcatalog=5Fencryption?= =?UTF-8?q?=5Fsettings.html.markdown,r/glue=5Fcrawler.html.markdown,r/glue?= =?UTF-8?q?=5Fconnection.html.markdown,r/glue=5Fclassifier.html.markdown,r?= =?UTF-8?q?/glue=5Fcatalog=5Ftable=5Foptimizer.html.markdown,r/glue=5Fcata?= =?UTF-8?q?log=5Ftable.html.markdown,r/glue=5Fcatalog=5Fdatabase.html.mark?= =?UTF-8?q?down,r/globalaccelerator=5Flistener.html.markdown,r/globalaccel?= =?UTF-8?q?erator=5Fendpoint=5Fgroup.html.markdown,r/globalaccelerator=5Fc?= =?UTF-8?q?ustom=5Frouting=5Flistener.html.markdown,r/globalaccelerator=5F?= =?UTF-8?q?custom=5Frouting=5Fendpoint=5Fgroup.html.markdown,r/globalaccel?= =?UTF-8?q?erator=5Fcustom=5Frouting=5Faccelerator.html.markdown,r/globala?= =?UTF-8?q?ccelerator=5Fcross=5Faccount=5Fattachment.html.markdown,r/globa?= =?UTF-8?q?laccelerator=5Faccelerator.html.markdown,r/glacier=5Fvault=5Flo?= =?UTF-8?q?ck.html.markdown,r/glacier=5Fvault.html.markdown,r/gamelift=5Fs?= =?UTF-8?q?cript.html.markdown,r/gamelift=5Fgame=5Fsession=5Fqueue.html.ma?= =?UTF-8?q?rkdown,r/gamelift=5Fgame=5Fserver=5Fgroup.html.markdown,r/gamel?= =?UTF-8?q?ift=5Ffleet.html.markdown,r/gamelift=5Fbuild.html.markdown,r/ga?= =?UTF-8?q?melift=5Falias.html.markdown,r/fsx=5Fwindows=5Ffile=5Fsystem.ht?= =?UTF-8?q?ml.markdown,r/fsx=5Fs3=5Faccess=5Fpoint=5Fattachment.html.markd?= =?UTF-8?q?own,r/fsx=5Fopenzfs=5Fvolume.html.markdown,r/fsx=5Fopenzfs=5Fsn?= =?UTF-8?q?apshot.html.markdown,r/fsx=5Fopenzfs=5Ffile=5Fsystem.html.markd?= =?UTF-8?q?own,r/fsx=5Fontap=5Fvolume.html.markdown,r/fsx=5Fontap=5Fstorag?= =?UTF-8?q?e=5Fvirtual=5Fmachine.html.markdown,r/fsx=5Fontap=5Ffile=5Fsyst?= =?UTF-8?q?em.html.markdown,r/fsx=5Flustre=5Ffile=5Fsystem.html.markdown,r?= =?UTF-8?q?/fsx=5Ffile=5Fcache.html.markdown,r/fsx=5Fdata=5Frepository=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/fsx=5Fbackup.html.markdown,r/fms=5Fr?= =?UTF-8?q?esource=5Fset.html.markdown,r/fms=5Fpolicy.html.markdown,r/fms?= =?UTF-8?q?=5Fadmin=5Faccount.html.markdown,r/flow=5Flog.html.markdown,r/f?= =?UTF-8?q?is=5Fexperiment=5Ftemplate.html.markdown,r/finspace=5Fkx=5Fvolu?= =?UTF-8?q?me.html.markdown,r/finspace=5Fkx=5Fuser.html.markdown,r/finspac?= =?UTF-8?q?e=5Fkx=5Fscaling=5Fgroup.html.markdown,r/finspace=5Fkx=5Fenviro?= =?UTF-8?q?nment.html.markdown,r/finspace=5Fkx=5Fdataview.html.markdown,r/?= =?UTF-8?q?finspace=5Fkx=5Fdatabase.html.markdown,r/finspace=5Fkx=5Fcluste?= =?UTF-8?q?r.html.markdown,r/evidently=5Fsegment.html.markdown,r/evidently?= =?UTF-8?q?=5Fproject.html.markdown,r/evidently=5Flaunch.html.markdown,r/e?= =?UTF-8?q?vidently=5Ffeature.html.markdown,r/emrserverless=5Fapplication.?= =?UTF-8?q?html.markdown,r/emrcontainers=5Fvirtual=5Fcluster.html.markdown?= =?UTF-8?q?,r/emrcontainers=5Fjob=5Ftemplate.html.markdown,r/emr=5Fstudio?= =?UTF-8?q?=5Fsession=5Fmapping.html.markdown,r/emr=5Fstudio.html.markdown?= =?UTF-8?q?,r/emr=5Fsecurity=5Fconfiguration.html.markdown,r/emr=5Fmanaged?= =?UTF-8?q?=5Fscaling=5Fpolicy.html.markdown,r/emr=5Finstance=5Fgroup.html?= =?UTF-8?q?.markdown,r/emr=5Finstance=5Ffleet.html.markdown,r/emr=5Fcluste?= =?UTF-8?q?r.html.markdown,r/emr=5Fblock=5Fpublic=5Faccess=5Fconfiguration?= =?UTF-8?q?.html.markdown,r/elb=5Fattachment.html.markdown,r/elb.html.mark?= =?UTF-8?q?down,r/elastictranscoder=5Fpreset.html.markdown,r/elastictransc?= =?UTF-8?q?oder=5Fpipeline.html.markdown,r/elasticsearch=5Fvpc=5Fendpoint.?= =?UTF-8?q?html.markdown,r/elasticsearch=5Fdomain=5Fsaml=5Foptions.html.ma?= =?UTF-8?q?rkdown,r/elasticsearch=5Fdomain=5Fpolicy.html.markdown,r/elasti?= =?UTF-8?q?csearch=5Fdomain.html.markdown,r/elasticache=5Fuser=5Fgroup=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/elasticache=5Fuser=5Fgroup.html.mark?= =?UTF-8?q?down,r/elasticache=5Fuser.html.markdown,r/elasticache=5Fsubnet?= =?UTF-8?q?=5Fgroup.html.markdown,r/elasticache=5Fserverless=5Fcache.html.?= =?UTF-8?q?markdown,r/elasticache=5Freserved=5Fcache=5Fnode.html.markdown,?= =?UTF-8?q?r/elasticache=5Freplication=5Fgroup.html.markdown,r/elasticache?= =?UTF-8?q?=5Fparameter=5Fgroup.html.markdown,r/elasticache=5Fglobal=5Frep?= =?UTF-8?q?lication=5Fgroup.html.markdown,r/elasticache=5Fcluster.html.mar?= =?UTF-8?q?kdown,r/elastic=5Fbeanstalk=5Fenvironment.html.markdown,r/elast?= =?UTF-8?q?ic=5Fbeanstalk=5Fconfiguration=5Ftemplate.html.markdown,r/elast?= =?UTF-8?q?ic=5Fbeanstalk=5Fapplication=5Fversion.html.markdown,r/elastic?= =?UTF-8?q?=5Fbeanstalk=5Fapplication.html.markdown,r/eks=5Fpod=5Fidentity?= =?UTF-8?q?=5Fassociation.html.markdown,r/eks=5Fnode=5Fgroup.html.markdown?= =?UTF-8?q?,r/eks=5Fidentity=5Fprovider=5Fconfig.html.markdown,r/eks=5Ffar?= =?UTF-8?q?gate=5Fprofile.html.markdown,r/eks=5Fcluster.html.markdown,r/ek?= =?UTF-8?q?s=5Faddon.html.markdown,r/eks=5Faccess=5Fpolicy=5Fassociation.h?= =?UTF-8?q?tml.markdown,r/eks=5Faccess=5Fentry.html.markdown,r/eip=5Fdomai?= =?UTF-8?q?n=5Fname.html.markdown,r/eip=5Fassociation.html.markdown,r/eip.?= =?UTF-8?q?html.markdown,r/egress=5Fonly=5Finternet=5Fgateway.html.markdow?= =?UTF-8?q?n,r/efs=5Freplication=5Fconfiguration.html.markdown,r/efs=5Fmou?= =?UTF-8?q?nt=5Ftarget.html.markdown,r/efs=5Ffile=5Fsystem=5Fpolicy.html.m?= =?UTF-8?q?arkdown,r/efs=5Ffile=5Fsystem.html.markdown,r/efs=5Fbackup=5Fpo?= =?UTF-8?q?licy.html.markdown,r/efs=5Faccess=5Fpoint.html.markdown,r/ecs?= =?UTF-8?q?=5Ftask=5Fset.html.markdown,r/ecs=5Ftask=5Fdefinition.html.mark?= =?UTF-8?q?down,r/ecs=5Ftag.html.markdown,r/ecs=5Fservice.html.markdown,r/?= =?UTF-8?q?ecs=5Fcluster=5Fcapacity=5Fproviders.html.markdown,r/ecs=5Fclus?= =?UTF-8?q?ter.html.markdown,r/ecs=5Fcapacity=5Fprovider.html.markdown,r/e?= =?UTF-8?q?cs=5Faccount=5Fsetting=5Fdefault.html.markdown,r/ecrpublic=5Fre?= =?UTF-8?q?pository=5Fpolicy.html.markdown,r/ecrpublic=5Frepository.html.m?= =?UTF-8?q?arkdown,r/ecr=5Frepository=5Fpolicy.html.markdown,r/ecr=5Frepos?= =?UTF-8?q?itory=5Fcreation=5Ftemplate.html.markdown,r/ecr=5Frepository.ht?= =?UTF-8?q?ml.markdown,r/ecr=5Freplication=5Fconfiguration.html.markdown,r?= =?UTF-8?q?/ecr=5Fregistry=5Fscanning=5Fconfiguration.html.markdown,r/ecr?= =?UTF-8?q?=5Fregistry=5Fpolicy.html.markdown,r/ecr=5Fpull=5Fthrough=5Fcac?= =?UTF-8?q?he=5Frule.html.markdown,r/ecr=5Flifecycle=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/ecr=5Faccount=5Fsetting.html.markdown,r/ec2=5Ftransit=5Fgat?= =?UTF-8?q?eway=5Fvpc=5Fattachment=5Faccepter.html.markdown,r/ec2=5Ftransi?= =?UTF-8?q?t=5Fgateway=5Fvpc=5Fattachment.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Froute=5Ftable=5Fpropagation.html.markdown,r/ec2=5Ftra?= =?UTF-8?q?nsit=5Fgateway=5Froute=5Ftable=5Fassociation.html.markdown,r/ec?= =?UTF-8?q?2=5Ftransit=5Fgateway=5Froute=5Ftable.html.markdown,r/ec2=5Ftra?= =?UTF-8?q?nsit=5Fgateway=5Froute.html.markdown,r/ec2=5Ftransit=5Fgateway?= =?UTF-8?q?=5Fprefix=5Flist=5Freference.html.markdown,r/ec2=5Ftransit=5Fga?= =?UTF-8?q?teway=5Fpolicy=5Ftable=5Fassociation.html.markdown,r/ec2=5Ftran?= =?UTF-8?q?sit=5Fgateway=5Fpolicy=5Ftable.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Fpeering=5Fattachment=5Faccepter.html.markdown,r/ec2?= =?UTF-8?q?=5Ftransit=5Fgateway=5Fpeering=5Fattachment.html.markdown,r/ec2?= =?UTF-8?q?=5Ftransit=5Fgateway=5Fmulticast=5Fgroup=5Fsource.html.markdown?= =?UTF-8?q?,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fgroup=5Fmember.html.ma?= =?UTF-8?q?rkdown,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fdomain=5Fassocia?= =?UTF-8?q?tion.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fdoma?= =?UTF-8?q?in.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fdefault=5Froute=5F?= =?UTF-8?q?table=5Fpropagation.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fd?= =?UTF-8?q?efault=5Froute=5Ftable=5Fassociation.html.markdown,r/ec2=5Ftran?= =?UTF-8?q?sit=5Fgateway=5Fconnect=5Fpeer.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Fconnect.html.markdown,r/ec2=5Ftransit=5Fgateway.html.?= =?UTF-8?q?markdown,r/ec2=5Ftraffic=5Fmirror=5Ftarget.html.markdown,r/ec2?= =?UTF-8?q?=5Ftraffic=5Fmirror=5Fsession.html.markdown,r/ec2=5Ftraffic=5Fm?= =?UTF-8?q?irror=5Ffilter=5Frule.html.markdown,r/ec2=5Ftraffic=5Fmirror=5F?= =?UTF-8?q?filter.html.markdown,r/ec2=5Ftag.html.markdown,r/ec2=5Fsubnet?= =?UTF-8?q?=5Fcidr=5Freservation.html.markdown,r/ec2=5Fserial=5Fconsole=5F?= =?UTF-8?q?access.html.markdown,r/ec2=5Fnetwork=5Finsights=5Fpath.html.mar?= =?UTF-8?q?kdown,r/ec2=5Fnetwork=5Finsights=5Fanalysis.html.markdown,r/ec2?= =?UTF-8?q?=5Fmanaged=5Fprefix=5Flist=5Fentry.html.markdown,r/ec2=5Fmanage?= =?UTF-8?q?d=5Fprefix=5Flist.html.markdown,r/ec2=5Flocal=5Fgateway=5Froute?= =?UTF-8?q?=5Ftable=5Fvpc=5Fassociation.html.markdown,r/ec2=5Flocal=5Fgate?= =?UTF-8?q?way=5Froute.html.markdown,r/ec2=5Finstance=5Fstate.html.markdow?= =?UTF-8?q?n,r/ec2=5Finstance=5Fmetadata=5Fdefaults.html.markdown,r/ec2=5F?= =?UTF-8?q?instance=5Fconnect=5Fendpoint.html.markdown,r/ec2=5Fimage=5Fblo?= =?UTF-8?q?ck=5Fpublic=5Faccess.markdown,r/ec2=5Fhost.html.markdown,r/ec2?= =?UTF-8?q?=5Ffleet.html.markdown,r/ec2=5Fdefault=5Fcredit=5Fspecification?= =?UTF-8?q?.html.markdown,r/ec2=5Fclient=5Fvpn=5Froute.html.markdown,r/ec2?= =?UTF-8?q?=5Fclient=5Fvpn=5Fnetwork=5Fassociation.html.markdown,r/ec2=5Fc?= =?UTF-8?q?lient=5Fvpn=5Fendpoint.html.markdown,r/ec2=5Fclient=5Fvpn=5Faut?= =?UTF-8?q?horization=5Frule.html.markdown,r/ec2=5Fcarrier=5Fgateway.html.?= =?UTF-8?q?markdown,r/ec2=5Fcapacity=5Freservation.html.markdown,r/ec2=5Fc?= =?UTF-8?q?apacity=5Fblock=5Freservation.html.markdown,r/ec2=5Favailabilit?= =?UTF-8?q?y=5Fzone=5Fgroup.html.markdown,r/ebs=5Fvolume.html.markdown,r/e?= =?UTF-8?q?bs=5Fsnapshot=5Fimport.html.markdown,r/ebs=5Fsnapshot=5Fcopy.ht?= =?UTF-8?q?ml.markdown,r/ebs=5Fsnapshot=5Fblock=5Fpublic=5Faccess.html.mar?= =?UTF-8?q?kdown,r/ebs=5Fsnapshot.html.markdown,r/ebs=5Ffast=5Fsnapshot=5F?= =?UTF-8?q?restore.html.markdown,r/ebs=5Fencryption=5Fby=5Fdefault.html.ma?= =?UTF-8?q?rkdown,r/ebs=5Fdefault=5Fkms=5Fkey.html.markdown,r/dynamodb=5Ft?= =?UTF-8?q?ag.html.markdown,r/dynamodb=5Ftable=5Freplica.html.markdown,r/d?= =?UTF-8?q?ynamodb=5Ftable=5Fitem.html.markdown,r/dynamodb=5Ftable=5Fexpor?= =?UTF-8?q?t.html.markdown,r/dynamodb=5Ftable.html.markdown,r/dynamodb=5Fr?= =?UTF-8?q?esource=5Fpolicy.html.markdown,r/dynamodb=5Fkinesis=5Fstreaming?= =?UTF-8?q?=5Fdestination.html.markdown,r/dynamodb=5Fglobal=5Ftable.html.m?= =?UTF-8?q?arkdown,r/dynamodb=5Fcontributor=5Finsights.html.markdown,r/dx?= =?UTF-8?q?=5Ftransit=5Fvirtual=5Finterface.html.markdown,r/dx=5Fpublic=5F?= =?UTF-8?q?virtual=5Finterface.html.markdown,r/dx=5Fprivate=5Fvirtual=5Fin?= =?UTF-8?q?terface.html.markdown,r/dx=5Fmacsec=5Fkey=5Fassociation.html.ma?= =?UTF-8?q?rkdown,r/dx=5Flag.html.markdown,r/dx=5Fhosted=5Ftransit=5Fvirtu?= =?UTF-8?q?al=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted=5Ftransit?= =?UTF-8?q?=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5Fpublic=5Fv?= =?UTF-8?q?irtual=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted=5Fpub?= =?UTF-8?q?lic=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5Fprivate?= =?UTF-8?q?=5Fvirtual=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted?= =?UTF-8?q?=5Fprivate=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5F?= =?UTF-8?q?connection.html.markdown,r/dx=5Fgateway=5Fassociation=5Fproposa?= =?UTF-8?q?l.html.markdown,r/dx=5Fgateway=5Fassociation.html.markdown,r/dx?= =?UTF-8?q?=5Fgateway.html.markdown,r/dx=5Fconnection=5Fconfirmation.html.?= =?UTF-8?q?markdown,r/dx=5Fconnection=5Fassociation.html.markdown,r/dx=5Fc?= =?UTF-8?q?onnection.html.markdown,r/dx=5Fbgp=5Fpeer.html.markdown,r/dsql?= =?UTF-8?q?=5Fcluster=5Fpeering.html.markdown,r/dsql=5Fcluster.html.markdo?= =?UTF-8?q?wn,r/drs=5Freplication=5Fconfiguration=5Ftemplate.html.markdown?= =?UTF-8?q?,r/docdbelastic=5Fcluster.html.markdown,r/docdb=5Fsubnet=5Fgrou?= =?UTF-8?q?p.html.markdown,r/docdb=5Fglobal=5Fcluster.html.markdown,r/docd?= =?UTF-8?q?b=5Fevent=5Fsubscription.html.markdown,r/docdb=5Fcluster=5Fsnap?= =?UTF-8?q?shot.html.markdown,r/docdb=5Fcluster=5Fparameter=5Fgroup.html.m?= =?UTF-8?q?arkdown,r/docdb=5Fcluster=5Finstance.html.markdown,r/docdb=5Fcl?= =?UTF-8?q?uster.html.markdown,r/dms=5Fs3=5Fendpoint.html.markdown,r/dms?= =?UTF-8?q?=5Freplication=5Ftask.html.markdown,r/dms=5Freplication=5Fsubne?= =?UTF-8?q?t=5Fgroup.html.markdown,r/dms=5Freplication=5Finstance.html.mar?= =?UTF-8?q?kdown,r/dms=5Freplication=5Fconfig.html.markdown,r/dms=5Fevent?= =?UTF-8?q?=5Fsubscription.html.markdown,r/dms=5Fendpoint.html.markdown,r/?= =?UTF-8?q?dms=5Fcertificate.html.markdown,r/dlm=5Flifecycle=5Fpolicy.html?= =?UTF-8?q?.markdown,r/directory=5Fservice=5Ftrust.html.markdown,r/directo?= =?UTF-8?q?ry=5Fservice=5Fshared=5Fdirectory=5Faccepter.html.markdown,r/di?= =?UTF-8?q?rectory=5Fservice=5Fshared=5Fdirectory.html.markdown,r/director?= =?UTF-8?q?y=5Fservice=5Fregion.html.markdown,r/directory=5Fservice=5Fradi?= =?UTF-8?q?us=5Fsettings.html.markdown,r/directory=5Fservice=5Flog=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/directory=5Fservice=5Fdirectory.html.ma?= =?UTF-8?q?rkdown,r/directory=5Fservice=5Fconditional=5Fforwarder.html.mar?= =?UTF-8?q?kdown,r/devopsguru=5Fservice=5Fintegration.html.markdown,r/devo?= =?UTF-8?q?psguru=5Fresource=5Fcollection.html.markdown,r/devopsguru=5Fnot?= =?UTF-8?q?ification=5Fchannel.html.markdown,r/devopsguru=5Fevent=5Fsource?= =?UTF-8?q?s=5Fconfig.html.markdown,r/devicefarm=5Fupload.html.markdown,r/?= =?UTF-8?q?devicefarm=5Ftest=5Fgrid=5Fproject.html.markdown,r/devicefarm?= =?UTF-8?q?=5Fproject.html.markdown,r/devicefarm=5Fnetwork=5Fprofile.html.?= =?UTF-8?q?markdown,r/devicefarm=5Finstance=5Fprofile.html.markdown,r/devi?= =?UTF-8?q?cefarm=5Fdevice=5Fpool.html.markdown,r/detective=5Forganization?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/detective=5Forganization=5Fadm?= =?UTF-8?q?in=5Faccount.html.markdown,r/detective=5Fmember.html.markdown,r?= =?UTF-8?q?/detective=5Finvitation=5Faccepter.html.markdown,r/detective=5F?= =?UTF-8?q?graph.html.markdown,r/default=5Fvpc=5Fdhcp=5Foptions.html.markd?= =?UTF-8?q?own,r/default=5Fvpc.html.markdown,r/default=5Fsubnet.html.markd?= =?UTF-8?q?own,r/default=5Fsecurity=5Fgroup.html.markdown,r/default=5Frout?= =?UTF-8?q?e=5Ftable.html.markdown,r/default=5Fnetwork=5Facl.html.markdown?= =?UTF-8?q?,r/db=5Fsubnet=5Fgroup.html.markdown,r/db=5Fsnapshot=5Fcopy.htm?= =?UTF-8?q?l.markdown,r/db=5Fsnapshot.html.markdown,r/db=5Fproxy=5Ftarget.?= =?UTF-8?q?html.markdown,r/db=5Fproxy=5Fendpoint.html.markdown,r/db=5Fprox?= =?UTF-8?q?y=5Fdefault=5Ftarget=5Fgroup.html.markdown,r/db=5Fproxy.html.ma?= =?UTF-8?q?rkdown,r/db=5Fparameter=5Fgroup.html.markdown,r/db=5Foption=5Fg?= =?UTF-8?q?roup.html.markdown,r/db=5Finstance=5Frole=5Fassociation.html.ma?= =?UTF-8?q?rkdown,r/db=5Finstance=5Fautomated=5Fbackups=5Freplication.html?= =?UTF-8?q?.markdown,r/db=5Finstance.html.markdown,r/db=5Fevent=5Fsubscrip?= =?UTF-8?q?tion.html.markdown,r/db=5Fcluster=5Fsnapshot.html.markdown,r/da?= =?UTF-8?q?x=5Fsubnet=5Fgroup.html.markdown,r/dax=5Fparameter=5Fgroup.html?= =?UTF-8?q?.markdown,r/dax=5Fcluster.html.markdown,r/datazone=5Fuser=5Fpro?= =?UTF-8?q?file.html.markdown,r/datazone=5Fproject.html.markdown,r/datazon?= =?UTF-8?q?e=5Fglossary=5Fterm.html.markdown,r/datazone=5Fglossary.html.ma?= =?UTF-8?q?rkdown,r/datazone=5Fform=5Ftype.html.markdown,r/datazone=5Fenvi?= =?UTF-8?q?ronment=5Fprofile.html.markdown,r/datazone=5Fenvironment=5Fblue?= =?UTF-8?q?print=5Fconfiguration.html.markdown,r/datazone=5Fenvironment.ht?= =?UTF-8?q?ml.markdown,r/datazone=5Fdomain.html.markdown,r/datazone=5Fasse?= =?UTF-8?q?t=5Ftype.html.markdown,r/datasync=5Ftask.html.markdown,r/datasy?= =?UTF-8?q?nc=5Flocation=5Fsmb.html.markdown,r/datasync=5Flocation=5Fs3.ht?= =?UTF-8?q?ml.markdown,r/datasync=5Flocation=5Fobject=5Fstorage.html.markd?= =?UTF-8?q?own,r/datasync=5Flocation=5Fnfs.html.markdown,r/datasync=5Floca?= =?UTF-8?q?tion=5Fhdfs.html.markdown,r/datasync=5Flocation=5Ffsx=5Fwindows?= =?UTF-8?q?=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5Ffsx=5Fop?= =?UTF-8?q?enzfs=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5Ffsx?= =?UTF-8?q?=5Fontap=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5F?= =?UTF-8?q?fsx=5Flustre=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocatio?= =?UTF-8?q?n=5Fefs.html.markdown,r/datasync=5Flocation=5Fazure=5Fblob.html?= =?UTF-8?q?.markdown,r/datasync=5Fagent.html.markdown,r/datapipeline=5Fpip?= =?UTF-8?q?eline=5Fdefinition.html.markdown,r/datapipeline=5Fpipeline.html?= =?UTF-8?q?.markdown,r/dataexchange=5Frevision=5Fassets.html.markdown,r/da?= =?UTF-8?q?taexchange=5Frevision.html.markdown,r/dataexchange=5Fevent=5Fac?= =?UTF-8?q?tion.html.markdown,r/dataexchange=5Fdata=5Fset.html.markdown,r/?= =?UTF-8?q?customerprofiles=5Fprofile.html.markdown,r/customerprofiles=5Fd?= =?UTF-8?q?omain.html.markdown,r/customer=5Fgateway.html.markdown,r/cur=5F?= =?UTF-8?q?report=5Fdefinition.html.markdown,r/costoptimizationhub=5Fprefe?= =?UTF-8?q?rences.html.markdown,r/costoptimizationhub=5Fenrollment=5Fstatu?= =?UTF-8?q?s.html.markdown,r/controltower=5Flanding=5Fzone.html.markdown,r?= =?UTF-8?q?/controltower=5Fcontrol.html.markdown,r/connect=5Fvocabulary.ht?= =?UTF-8?q?ml.markdown,r/connect=5Fuser=5Fhierarchy=5Fstructure.html.markd?= =?UTF-8?q?own,r/connect=5Fuser=5Fhierarchy=5Fgroup.html.markdown,r/connec?= =?UTF-8?q?t=5Fuser.html.markdown,r/connect=5Fsecurity=5Fprofile.html.mark?= =?UTF-8?q?down,r/connect=5Frouting=5Fprofile.html.markdown,r/connect=5Fqu?= =?UTF-8?q?ick=5Fconnect.html.markdown,r/connect=5Fqueue.html.markdown,r/c?= =?UTF-8?q?onnect=5Fphone=5Fnumber=5Fcontact=5Fflow=5Fassociation.html.mar?= =?UTF-8?q?kdown,r/connect=5Fphone=5Fnumber.html.markdown,r/connect=5Flamb?= =?UTF-8?q?da=5Ffunction=5Fassociation.html.markdown,r/connect=5Finstance?= =?UTF-8?q?=5Fstorage=5Fconfig.html.markdown,r/connect=5Finstance.html.mar?= =?UTF-8?q?kdown,r/connect=5Fhours=5Fof=5Foperation.html.markdown,r/connec?= =?UTF-8?q?t=5Fcontact=5Fflow=5Fmodule.html.markdown,r/connect=5Fcontact?= =?UTF-8?q?=5Fflow.html.markdown,r/connect=5Fbot=5Fassociation.html.markdo?= =?UTF-8?q?wn,r/config=5Fretention=5Fconfiguration.html.markdown,r/config?= =?UTF-8?q?=5Fremediation=5Fconfiguration.html.markdown,r/config=5Forganiz?= =?UTF-8?q?ation=5Fmanaged=5Frule.html.markdown,r/config=5Forganization=5F?= =?UTF-8?q?custom=5Frule.html.markdown,r/config=5Forganization=5Fcustom=5F?= =?UTF-8?q?policy=5Frule.html.markdown,r/config=5Forganization=5Fconforman?= =?UTF-8?q?ce=5Fpack.html.markdown,r/config=5Fdelivery=5Fchannel.html.mark?= =?UTF-8?q?down,r/config=5Fconformance=5Fpack.html.markdown,r/config=5Fcon?= =?UTF-8?q?figuration=5Frecorder=5Fstatus.html.markdown,r/config=5Fconfigu?= =?UTF-8?q?ration=5Frecorder.html.markdown,r/config=5Fconfiguration=5Faggr?= =?UTF-8?q?egator.html.markdown,r/config=5Fconfig=5Frule.html.markdown,r/c?= =?UTF-8?q?onfig=5Faggregate=5Fauthorization.html.markdown,r/computeoptimi?= =?UTF-8?q?zer=5Frecommendation=5Fpreferences.html.markdown,r/computeoptim?= =?UTF-8?q?izer=5Fenrollment=5Fstatus.html.markdown,r/comprehend=5Fentity?= =?UTF-8?q?=5Frecognizer.html.markdown,r/comprehend=5Fdocument=5Fclassifie?= =?UTF-8?q?r.html.markdown,r/cognito=5Fuser=5Fpool=5Fui=5Fcustomization.ht?= =?UTF-8?q?ml.markdown,r/cognito=5Fuser=5Fpool=5Fdomain.html.markdown,r/co?= =?UTF-8?q?gnito=5Fuser=5Fpool=5Fclient.html.markdown,r/cognito=5Fuser=5Fp?= =?UTF-8?q?ool.html.markdown,r/cognito=5Fuser=5Fin=5Fgroup.html.markdown,r?= =?UTF-8?q?/cognito=5Fuser=5Fgroup.html.markdown,r/cognito=5Fuser.html.mar?= =?UTF-8?q?kdown,r/cognito=5Frisk=5Fconfiguration.html.markdown,r/cognito?= =?UTF-8?q?=5Fresource=5Fserver.html.markdown,r/cognito=5Fmanaged=5Fuser?= =?UTF-8?q?=5Fpool=5Fclient.html.markdown,r/cognito=5Fmanaged=5Flogin=5Fbr?= =?UTF-8?q?anding.html.markdown,r/cognito=5Flog=5Fdelivery=5Fconfiguration?= =?UTF-8?q?.html.markdown,r/cognito=5Fidentity=5Fprovider.html.markdown,r/?= =?UTF-8?q?cognito=5Fidentity=5Fpool=5Froles=5Fattachment.html.markdown,r/?= =?UTF-8?q?cognito=5Fidentity=5Fpool=5Fprovider=5Fprincipal=5Ftag.html.mar?= =?UTF-8?q?kdown,r/cognito=5Fidentity=5Fpool.html.markdown,r/codestarnotif?= =?UTF-8?q?ications=5Fnotification=5Frule.html.markdown,r/codestarconnecti?= =?UTF-8?q?ons=5Fhost.html.markdown,r/codestarconnections=5Fconnection.htm?= =?UTF-8?q?l.markdown,r/codepipeline=5Fwebhook.html.markdown,r/codepipelin?= =?UTF-8?q?e=5Fcustom=5Faction=5Ftype.html.markdown,r/codepipeline.html.ma?= =?UTF-8?q?rkdown,r/codegurureviewer=5Frepository=5Fassociation.html.markd?= =?UTF-8?q?own,r/codeguruprofiler=5Fprofiling=5Fgroup.html.markdown,r/code?= =?UTF-8?q?deploy=5Fdeployment=5Fgroup.html.markdown,r/codedeploy=5Fdeploy?= =?UTF-8?q?ment=5Fconfig.html.markdown,r/codedeploy=5Fapp.html.markdown,r/?= =?UTF-8?q?codeconnections=5Fhost.html.markdown,r/codeconnections=5Fconnec?= =?UTF-8?q?tion.html.markdown,r/codecommit=5Ftrigger.html.markdown,r/codec?= =?UTF-8?q?ommit=5Frepository.html.markdown,r/codecommit=5Fapproval=5Frule?= =?UTF-8?q?=5Ftemplate=5Fassociation.html.markdown,r/codecommit=5Fapproval?= =?UTF-8?q?=5Frule=5Ftemplate.html.markdown,r/codecatalyst=5Fsource=5Frepo?= =?UTF-8?q?sitory.html.markdown,r/codecatalyst=5Fproject.html.markdown,r/c?= =?UTF-8?q?odecatalyst=5Fdev=5Fenvironment.html.markdown,r/codebuild=5Fweb?= =?UTF-8?q?hook.html.markdown,r/codebuild=5Fsource=5Fcredential.html.markd?= =?UTF-8?q?own,r/codebuild=5Fresource=5Fpolicy.html.markdown,r/codebuild?= =?UTF-8?q?=5Freport=5Fgroup.html.markdown,r/codebuild=5Fproject.html.mark?= =?UTF-8?q?down,r/codebuild=5Ffleet.html.markdown,r/codeartifact=5Freposit?= =?UTF-8?q?ory=5Fpermissions=5Fpolicy.html.markdown,r/codeartifact=5Frepos?= =?UTF-8?q?itory.html.markdown,r/codeartifact=5Fdomain=5Fpermissions=5Fpol?= =?UTF-8?q?icy.html.markdown,r/codeartifact=5Fdomain.html.markdown,r/cloud?= =?UTF-8?q?watch=5Fquery=5Fdefinition.html.markdown,r/cloudwatch=5Fmetric?= =?UTF-8?q?=5Fstream.html.markdown,r/cloudwatch=5Fmetric=5Falarm.html.mark?= =?UTF-8?q?down,r/cloudwatch=5Flog=5Fsubscription=5Ffilter.html.markdown,r?= =?UTF-8?q?/cloudwatch=5Flog=5Fstream.html.markdown,r/cloudwatch=5Flog=5Fr?= =?UTF-8?q?esource=5Fpolicy.html.markdown,r/cloudwatch=5Flog=5Fmetric=5Ffi?= =?UTF-8?q?lter.html.markdown,r/cloudwatch=5Flog=5Findex=5Fpolicy.html.mar?= =?UTF-8?q?kdown,r/cloudwatch=5Flog=5Fgroup.html.markdown,r/cloudwatch=5Fl?= =?UTF-8?q?og=5Fdestination=5Fpolicy.html.markdown,r/cloudwatch=5Flog=5Fde?= =?UTF-8?q?stination.html.markdown,r/cloudwatch=5Flog=5Fdelivery=5Fsource.?= =?UTF-8?q?html.markdown,r/cloudwatch=5Flog=5Fdelivery=5Fdestination=5Fpol?= =?UTF-8?q?icy.html.markdown,r/cloudwatch=5Flog=5Fdelivery=5Fdestination.h?= =?UTF-8?q?tml.markdown,r/cloudwatch=5Flog=5Fdelivery.html.markdown,r/clou?= =?UTF-8?q?dwatch=5Flog=5Fdata=5Fprotection=5Fpolicy.html.markdown,r/cloud?= =?UTF-8?q?watch=5Flog=5Fanomaly=5Fdetector.html.markdown,r/cloudwatch=5Fl?= =?UTF-8?q?og=5Faccount=5Fpolicy.html.markdown,r/cloudwatch=5Fevent=5Ftarg?= =?UTF-8?q?et.html.markdown,r/cloudwatch=5Fevent=5Frule.html.markdown,r/cl?= =?UTF-8?q?oudwatch=5Fevent=5Fpermission.html.markdown,r/cloudwatch=5Feven?= =?UTF-8?q?t=5Fendpoint.html.markdown,r/cloudwatch=5Fevent=5Fconnection.ht?= =?UTF-8?q?ml.markdown,r/cloudwatch=5Fevent=5Fbus=5Fpolicy.html.markdown,r?= =?UTF-8?q?/cloudwatch=5Fevent=5Fbus.html.markdown,r/cloudwatch=5Fevent=5F?= =?UTF-8?q?archive.html.markdown,r/cloudwatch=5Fevent=5Fapi=5Fdestination.?= =?UTF-8?q?html.markdown,r/cloudwatch=5Fdashboard.html.markdown,r/cloudwat?= =?UTF-8?q?ch=5Fcontributor=5Fmanaged=5Finsight=5Frule.html.markdown,r/clo?= =?UTF-8?q?udwatch=5Fcontributor=5Finsight=5Frule.html.markdown,r/cloudwat?= =?UTF-8?q?ch=5Fcomposite=5Falarm.html.markdown,r/cloudtrail=5Forganizatio?= =?UTF-8?q?n=5Fdelegated=5Fadmin=5Faccount.html.markdown,r/cloudtrail=5Fev?= =?UTF-8?q?ent=5Fdata=5Fstore.html.markdown,r/cloudtrail.html.markdown,r/c?= =?UTF-8?q?loudsearch=5Fdomain=5Fservice=5Faccess=5Fpolicy.html.markdown,r?= =?UTF-8?q?/cloudsearch=5Fdomain.html.markdown,r/cloudhsm=5Fv2=5Fhsm.html.?= =?UTF-8?q?markdown,r/cloudhsm=5Fv2=5Fcluster.html.markdown,r/cloudfrontke?= =?UTF-8?q?yvaluestore=5Fkeys=5Fexclusive.html.markdown,r/cloudfrontkeyval?= =?UTF-8?q?uestore=5Fkey.html.markdown,r/cloudfront=5Fvpc=5Forigin.html.ma?= =?UTF-8?q?rkdown,r/cloudfront=5Fresponse=5Fheaders=5Fpolicy.html.markdown?= =?UTF-8?q?,r/cloudfront=5Frealtime=5Flog=5Fconfig.html.markdown,r/cloudfr?= =?UTF-8?q?ont=5Fpublic=5Fkey.html.markdown,r/cloudfront=5Forigin=5Freques?= =?UTF-8?q?t=5Fpolicy.html.markdown,r/cloudfront=5Forigin=5Faccess=5Fident?= =?UTF-8?q?ity.html.markdown,r/cloudfront=5Forigin=5Faccess=5Fcontrol.html?= =?UTF-8?q?.markdown,r/cloudfront=5Fmonitoring=5Fsubscription.html.markdow?= =?UTF-8?q?n,r/cloudfront=5Fkey=5Fvalue=5Fstore.html.markdown,r/cloudfront?= =?UTF-8?q?=5Fkey=5Fgroup.html.markdown,r/cloudfront=5Ffunction.html.markd?= =?UTF-8?q?own,r/cloudfront=5Ffield=5Flevel=5Fencryption=5Fprofile.html.ma?= =?UTF-8?q?rkdown,r/cloudfront=5Ffield=5Flevel=5Fencryption=5Fconfig.html.?= =?UTF-8?q?markdown,r/cloudfront=5Fdistribution.html.markdown,r/cloudfront?= =?UTF-8?q?=5Fcontinuous=5Fdeployment=5Fpolicy.html.markdown,r/cloudfront?= =?UTF-8?q?=5Fcache=5Fpolicy.html.markdown,r/cloudformation=5Ftype.html.ma?= =?UTF-8?q?rkdown,r/cloudformation=5Fstack=5Fset=5Finstance.html.markdown,?= =?UTF-8?q?r/cloudformation=5Fstack=5Fset.html.markdown,r/cloudformation?= =?UTF-8?q?=5Fstack=5Finstances.html.markdown,r/cloudformation=5Fstack.htm?= =?UTF-8?q?l.markdown,r/cloudcontrolapi=5Fresource.html.markdown,r/cloud9?= =?UTF-8?q?=5Fenvironment=5Fmembership.html.markdown,r/cloud9=5Fenvironmen?= =?UTF-8?q?t=5Fec2.html.markdown,r/cleanrooms=5Fmembership.html.markdown,r?= =?UTF-8?q?/cleanrooms=5Fconfigured=5Ftable.html.markdown,r/cleanrooms=5Fc?= =?UTF-8?q?ollaboration.html.markdown,r/chimesdkvoice=5Fvoice=5Fprofile=5F?= =?UTF-8?q?domain.html.markdown,r/chimesdkvoice=5Fsip=5Frule.html.markdown?= =?UTF-8?q?,r/chimesdkvoice=5Fsip=5Fmedia=5Fapplication.html.markdown,r/ch?= =?UTF-8?q?imesdkvoice=5Fglobal=5Fsettings.html.markdown,r/chimesdkmediapi?= =?UTF-8?q?pelines=5Fmedia=5Finsights=5Fpipeline=5Fconfiguration.html.mark?= =?UTF-8?q?down,r/chime=5Fvoice=5Fconnector=5Ftermination=5Fcredentials.ht?= =?UTF-8?q?ml.markdown,r/chime=5Fvoice=5Fconnector=5Ftermination.html.mark?= =?UTF-8?q?down,r/chime=5Fvoice=5Fconnector=5Fstreaming.html.markdown,r/ch?= =?UTF-8?q?ime=5Fvoice=5Fconnector=5Forigination.html.markdown,r/chime=5Fv?= =?UTF-8?q?oice=5Fconnector=5Flogging.html.markdown,r/chime=5Fvoice=5Fconn?= =?UTF-8?q?ector=5Fgroup.html.markdown,r/chime=5Fvoice=5Fconnector.html.ma?= =?UTF-8?q?rkdown,r/chatbot=5Fteams=5Fchannel=5Fconfiguration.html.markdow?= =?UTF-8?q?n,r/chatbot=5Fslack=5Fchannel=5Fconfiguration.html.markdown,r/c?= =?UTF-8?q?e=5Fcost=5Fcategory.html.markdown,r/ce=5Fcost=5Fallocation=5Fta?= =?UTF-8?q?g.html.markdown,r/ce=5Fanomaly=5Fsubscription.html.markdown,r/c?= =?UTF-8?q?e=5Fanomaly=5Fmonitor.html.markdown,r/budgets=5Fbudget=5Faction?= =?UTF-8?q?.html.markdown,r/budgets=5Fbudget.html.markdown,r/bedrockagent?= =?UTF-8?q?=5Fprompt.html.markdown,r/bedrockagent=5Fknowledge=5Fbase.html.?= =?UTF-8?q?markdown,r/bedrockagent=5Fflow.html.markdown,r/bedrockagent=5Fd?= =?UTF-8?q?ata=5Fsource.html.markdown,r/bedrockagent=5Fagent=5Fknowledge?= =?UTF-8?q?=5Fbase=5Fassociation.html.markdown,r/bedrockagent=5Fagent=5Fco?= =?UTF-8?q?llaborator.html.markdown,r/bedrockagent=5Fagent=5Falias.html.ma?= =?UTF-8?q?rkdown,r/bedrockagent=5Fagent=5Faction=5Fgroup.html.markdown,r/?= =?UTF-8?q?bedrockagent=5Fagent.html.markdown,r/bedrock=5Fprovisioned=5Fmo?= =?UTF-8?q?del=5Fthroughput.html.markdown,r/bedrock=5Fmodel=5Finvocation?= =?UTF-8?q?=5Flogging=5Fconfiguration.html.markdown,r/bedrock=5Finference?= =?UTF-8?q?=5Fprofile.html.markdown,r/bedrock=5Fguardrail=5Fversion.html.m?= =?UTF-8?q?arkdown,r/bedrock=5Fguardrail.html.markdown,r/bedrock=5Fcustom?= =?UTF-8?q?=5Fmodel.html.markdown,r/bcmdataexports=5Fexport.html.markdown,?= =?UTF-8?q?r/batch=5Fscheduling=5Fpolicy.html.markdown,r/batch=5Fjob=5Fque?= =?UTF-8?q?ue.html.markdown,r/batch=5Fjob=5Fdefinition.html.markdown,r/bat?= =?UTF-8?q?ch=5Fcompute=5Fenvironment.html.markdown,r/backup=5Fvault=5Fpol?= =?UTF-8?q?icy.html.markdown,r/backup=5Fvault=5Fnotifications.html.markdow?= =?UTF-8?q?n,r/backup=5Fvault=5Flock=5Fconfiguration.html.markdown,r/backu?= =?UTF-8?q?p=5Fvault.html.markdown,r/backup=5Fselection.html.markdown,r/ba?= =?UTF-8?q?ckup=5Frestore=5Ftesting=5Fselection.html.markdown,r/backup=5Fr?= =?UTF-8?q?estore=5Ftesting=5Fplan.html.markdown,r/backup=5Freport=5Fplan.?= =?UTF-8?q?html.markdown,r/backup=5Fregion=5Fsettings.html.markdown,r/back?= =?UTF-8?q?up=5Fplan.html.markdown,r/backup=5Flogically=5Fair=5Fgapped=5Fv?= =?UTF-8?q?ault.html.markdown,r/backup=5Fglobal=5Fsettings.html.markdown,r?= =?UTF-8?q?/backup=5Fframework.html.markdown,r/autoscalingplans=5Fscaling?= =?UTF-8?q?=5Fplan.html.markdown,r/autoscaling=5Ftraffic=5Fsource=5Fattach?= =?UTF-8?q?ment.html.markdown,r/autoscaling=5Fschedule.html.markdown,r/aut?= =?UTF-8?q?oscaling=5Fpolicy.html.markdown,r/autoscaling=5Fnotification.ht?= =?UTF-8?q?ml.markdown,r/autoscaling=5Flifecycle=5Fhook.html.markdown,r/au?= =?UTF-8?q?toscaling=5Fgroup=5Ftag.html.markdown,r/autoscaling=5Fgroup.htm?= =?UTF-8?q?l.markdown,r/autoscaling=5Fattachment.html.markdown,r/auditmana?= =?UTF-8?q?ger=5Forganization=5Fadmin=5Faccount=5Fregistration.html.markdo?= =?UTF-8?q?wn,r/auditmanager=5Fframework=5Fshare.html.markdown,r/auditmana?= =?UTF-8?q?ger=5Fframework.html.markdown,r/auditmanager=5Fcontrol.html.mar?= =?UTF-8?q?kdown,r/auditmanager=5Fassessment=5Freport.html.markdown,r/audi?= =?UTF-8?q?tmanager=5Fassessment=5Fdelegation.html.markdown,r/auditmanager?= =?UTF-8?q?=5Fassessment.html.markdown,r/auditmanager=5Faccount=5Fregistra?= =?UTF-8?q?tion.html.markdown,r/athena=5Fworkgroup.html.markdown,r/athena?= =?UTF-8?q?=5Fprepared=5Fstatement.html.markdown,r/athena=5Fnamed=5Fquery.?= =?UTF-8?q?html.markdown,r/athena=5Fdatabase.html.markdown,r/athena=5Fdata?= =?UTF-8?q?=5Fcatalog.html.markdown,r/athena=5Fcapacity=5Freservation.html?= =?UTF-8?q?.markdown,r/appsync=5Ftype.html.markdown,r/appsync=5Fsource=5Fa?= =?UTF-8?q?pi=5Fassociation.html.markdown,r/appsync=5Fresolver.html.markdo?= =?UTF-8?q?wn,r/appsync=5Fgraphql=5Fapi.html.markdown,r/appsync=5Ffunction?= =?UTF-8?q?.html.markdown,r/appsync=5Fdomain=5Fname=5Fapi=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/appsync=5Fdomain=5Fname.html.markdown,r/appsync?= =?UTF-8?q?=5Fdatasource.html.markdown,r/appsync=5Fchannel=5Fnamespace.htm?= =?UTF-8?q?l.markdown,r/appsync=5Fapi=5Fkey.html.markdown,r/appsync=5Fapi?= =?UTF-8?q?=5Fcache.html.markdown,r/appsync=5Fapi.html.markdown,r/appstrea?= =?UTF-8?q?m=5Fuser=5Fstack=5Fassociation.html.markdown,r/appstream=5Fuser?= =?UTF-8?q?.html.markdown,r/appstream=5Fstack.html.markdown,r/appstream=5F?= =?UTF-8?q?image=5Fbuilder.html.markdown,r/appstream=5Ffleet=5Fstack=5Fass?= =?UTF-8?q?ociation.html.markdown,r/appstream=5Ffleet.html.markdown,r/apps?= =?UTF-8?q?tream=5Fdirectory=5Fconfig.html.markdown,r/apprunner=5Fvpc=5Fin?= =?UTF-8?q?gress=5Fconnection.html.markdown,r/apprunner=5Fvpc=5Fconnector.?= =?UTF-8?q?html.markdown,r/apprunner=5Fservice.html.markdown,r/apprunner?= =?UTF-8?q?=5Fobservability=5Fconfiguration.html.markdown,r/apprunner=5Fde?= =?UTF-8?q?ployment.html.markdown,r/apprunner=5Fdefault=5Fauto=5Fscaling?= =?UTF-8?q?=5Fconfiguration=5Fversion.html.markdown,r/apprunner=5Fcustom?= =?UTF-8?q?=5Fdomain=5Fassociation.html.markdown,r/apprunner=5Fconnection.?= =?UTF-8?q?html.markdown,r/apprunner=5Fauto=5Fscaling=5Fconfiguration=5Fve?= =?UTF-8?q?rsion.html.markdown,r/appmesh=5Fvirtual=5Fservice.html.markdown?= =?UTF-8?q?,r/appmesh=5Fvirtual=5Frouter.html.markdown,r/appmesh=5Fvirtual?= =?UTF-8?q?=5Fnode.html.markdown,r/appmesh=5Fvirtual=5Fgateway.html.markdo?= =?UTF-8?q?wn,r/appmesh=5Froute.html.markdown,r/appmesh=5Fmesh.html.markdo?= =?UTF-8?q?wn,r/appmesh=5Fgateway=5Froute.html.markdown,r/applicationinsig?= =?UTF-8?q?hts=5Fapplication.html.markdown,r/appintegrations=5Fevent=5Fint?= =?UTF-8?q?egration.html.markdown,r/appintegrations=5Fdata=5Fintegration.h?= =?UTF-8?q?tml.markdown,r/appflow=5Fflow.html.markdown,r/appflow=5Fconnect?= =?UTF-8?q?or=5Fprofile.html.markdown,r/appfabric=5Fingestion=5Fdestinatio?= =?UTF-8?q?n.html.markdown,r/appfabric=5Fingestion.html.markdown,r/appfabr?= =?UTF-8?q?ic=5Fapp=5Fbundle.html.markdown,r/appfabric=5Fapp=5Fauthorizati?= =?UTF-8?q?on=5Fconnection.html.markdown,r/appfabric=5Fapp=5Fauthorization?= =?UTF-8?q?.html.markdown,r/appconfig=5Fhosted=5Fconfiguration=5Fversion.h?= =?UTF-8?q?tml.markdown,r/appconfig=5Fextension=5Fassociation.html.markdow?= =?UTF-8?q?n,r/appconfig=5Fextension.html.markdown,r/appconfig=5Fenvironme?= =?UTF-8?q?nt.html.markdown,r/appconfig=5Fdeployment=5Fstrategy.html.markd?= =?UTF-8?q?own,r/appconfig=5Fdeployment.html.markdown,r/appconfig=5Fconfig?= =?UTF-8?q?uration=5Fprofile.html.markdown,r/appconfig=5Fapplication.html.?= =?UTF-8?q?markdown,r/appautoscaling=5Ftarget.html.markdown,r/appautoscali?= =?UTF-8?q?ng=5Fscheduled=5Faction.html.markdown,r/appautoscaling=5Fpolicy?= =?UTF-8?q?.html.markdown,r/app=5Fcookie=5Fstickiness=5Fpolicy.html.markdo?= =?UTF-8?q?wn,r/apigatewayv2=5Fvpc=5Flink.html.markdown,r/apigatewayv2=5Fs?= =?UTF-8?q?tage.html.markdown,r/apigatewayv2=5Froute=5Fresponse.html.markd?= =?UTF-8?q?own,r/apigatewayv2=5Froute.html.markdown,r/apigatewayv2=5Fmodel?= =?UTF-8?q?.html.markdown,r/apigatewayv2=5Fintegration=5Fresponse.html.mar?= =?UTF-8?q?kdown,r/apigatewayv2=5Fintegration.html.markdown,r/apigatewayv2?= =?UTF-8?q?=5Fdomain=5Fname.html.markdown,r/apigatewayv2=5Fdeployment.html?= =?UTF-8?q?.markdown,r/apigatewayv2=5Fauthorizer.html.markdown,r/apigatewa?= =?UTF-8?q?yv2=5Fapi=5Fmapping.html.markdown,r/apigatewayv2=5Fapi.html.mar?= =?UTF-8?q?kdown,r/api=5Fgateway=5Fvpc=5Flink.html.markdown,r/api=5Fgatewa?= =?UTF-8?q?y=5Fusage=5Fplan=5Fkey.html.markdown,r/api=5Fgateway=5Fusage=5F?= =?UTF-8?q?plan.html.markdown,r/api=5Fgateway=5Fstage.html.markdown,r/api?= =?UTF-8?q?=5Fgateway=5Frest=5Fapi=5Fput.markdown,r/api=5Fgateway=5Frest?= =?UTF-8?q?=5Fapi=5Fpolicy.html.markdown,r/api=5Fgateway=5Frest=5Fapi.html?= =?UTF-8?q?.markdown,r/api=5Fgateway=5Fresource.html.markdown,r/api=5Fgate?= =?UTF-8?q?way=5Frequest=5Fvalidator.html.markdown,r/api=5Fgateway=5Fmodel?= =?UTF-8?q?.html.markdown,r/api=5Fgateway=5Fmethod=5Fsettings.html.markdow?= =?UTF-8?q?n,r/api=5Fgateway=5Fmethod=5Fresponse.html.markdown,r/api=5Fgat?= =?UTF-8?q?eway=5Fmethod.html.markdown,r/api=5Fgateway=5Fintegration=5Fres?= =?UTF-8?q?ponse.html.markdown,r/api=5Fgateway=5Fintegration.html.markdown?= =?UTF-8?q?,r/api=5Fgateway=5Fgateway=5Fresponse.html.markdown,r/api=5Fgat?= =?UTF-8?q?eway=5Fdomain=5Fname=5Faccess=5Fassociation.html.markdown,r/api?= =?UTF-8?q?=5Fgateway=5Fdomain=5Fname.html.markdown,r/api=5Fgateway=5Fdocu?= =?UTF-8?q?mentation=5Fversion.html.markdown,r/api=5Fgateway=5Fdocumentati?= =?UTF-8?q?on=5Fpart.html.markdown,r/api=5Fgateway=5Fdeployment.html.markd?= =?UTF-8?q?own,r/api=5Fgateway=5Fclient=5Fcertificate.html.markdown,r/api?= =?UTF-8?q?=5Fgateway=5Fbase=5Fpath=5Fmapping.html.markdown,r/api=5Fgatewa?= =?UTF-8?q?y=5Fauthorizer.html.markdown,r/api=5Fgateway=5Fapi=5Fkey.html.m?= =?UTF-8?q?arkdown,r/api=5Fgateway=5Faccount.html.markdown,r/amplify=5Fweb?= =?UTF-8?q?hook.html.markdown,r/amplify=5Fdomain=5Fassociation.html.markdo?= =?UTF-8?q?wn,r/amplify=5Fbranch.html.markdown,r/amplify=5Fbackend=5Fenvir?= =?UTF-8?q?onment.html.markdown,r/amplify=5Fapp.html.markdown,r/ami=5Flaun?= =?UTF-8?q?ch=5Fpermission.html.markdown,r/ami=5Ffrom=5Finstance.html.mark?= =?UTF-8?q?down,r/ami=5Fcopy.html.markdown,r/ami.html.markdown,r/acmpca=5F?= =?UTF-8?q?policy.html.markdown,r/acmpca=5Fpermission.html.markdown,r/acmp?= =?UTF-8?q?ca=5Fcertificate=5Fauthority=5Fcertificate.html.markdown,r/acmp?= =?UTF-8?q?ca=5Fcertificate=5Fauthority.html.markdown,r/acmpca=5Fcertifica?= =?UTF-8?q?te.html.markdown,r/acm=5Fcertificate=5Fvalidation.html.markdown?= =?UTF-8?q?,r/acm=5Fcertificate.html.markdown,r/account=5Fregion.markdown,?= =?UTF-8?q?r/account=5Fprimary=5Fcontact.html.markdown,r/account=5Falterna?= =?UTF-8?q?te=5Fcontact.html.markdown,r/accessanalyzer=5Farchive=5Frule.ht?= =?UTF-8?q?ml.markdown,r/accessanalyzer=5Fanalyzer.html.markdown,guides/ve?= =?UTF-8?q?rsion-6-upgrade.html.markdown,guides/version-5-upgrade.html.mar?= =?UTF-8?q?kdown,guides/version-4-upgrade.html.markdown,guides/version-3-u?= =?UTF-8?q?pgrade.html.markdown,guides/version-2-upgrade.html.markdown,gui?= =?UTF-8?q?des/using-aws-with-awscc-provider.html.markdown,guides/resource?= =?UTF-8?q?-tagging.html.markdown,guides/enhanced-region-support.html.mark?= =?UTF-8?q?down,guides/custom-service-endpoints.html.markdown,guides/conti?= =?UTF-8?q?nuous-validation-examples.html.markdown,functions/trim=5Fiam=5F?= =?UTF-8?q?role=5Fpath.html.markdown,functions/arn=5Fparse.html.markdown,f?= =?UTF-8?q?unctions/arn=5Fbuild.html.markdown,ephemeral-resources/ssm=5Fpa?= =?UTF-8?q?rameter.html.markdown,ephemeral-resources/secretsmanager=5Fsecr?= =?UTF-8?q?et=5Fversion.html.markdown,ephemeral-resources/secretsmanager?= =?UTF-8?q?=5Frandom=5Fpassword.html.markdown,ephemeral-resources/lambda?= =?UTF-8?q?=5Finvocation.html.markdown,ephemeral-resources/kms=5Fsecrets.h?= =?UTF-8?q?tml.markdown,ephemeral-resources/eks=5Fcluster=5Fauth.html.mark?= =?UTF-8?q?down,ephemeral-resources/cognito=5Fidentity=5Fopenid=5Ftoken=5F?= =?UTF-8?q?for=5Fdeveloper=5Fidentity.markdown,d/workspaces=5Fworkspace.ht?= =?UTF-8?q?ml.markdown,d/workspaces=5Fimage.html.markdown,d/workspaces=5Fd?= =?UTF-8?q?irectory.html.markdown,d/workspaces=5Fbundle.html.markdown,d/wa?= =?UTF-8?q?fv2=5Fweb=5Facl.html.markdown,d/wafv2=5Frule=5Fgroup.html.markd?= =?UTF-8?q?own,d/wafv2=5Fregex=5Fpattern=5Fset.html.markdown,d/wafv2=5Fip?= =?UTF-8?q?=5Fset.html.markdown,d/wafregional=5Fweb=5Facl.html.markdown,d/?= =?UTF-8?q?wafregional=5Fsubscribed=5Frule=5Fgr=E2=80=A6=20(#44173)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cdktf/python/d/instance.html.markdown | 3 +- .../custom-service-endpoints.html.markdown | 3 +- website/docs/cdktf/python/index.html.markdown | 4 +- ...api_gateway_gateway_response.html.markdown | 6 +- ...hosted_configuration_version.html.markdown | 43 +++++- ...gnito_managed_login_branding.html.markdown | 120 ++++++++++++++++ ...sync_location_object_storage.html.markdown | 4 +- .../cdktf/python/r/ecs_service.html.markdown | 4 +- .../r/fsx_openzfs_file_system.html.markdown | 3 +- .../python/r/fsx_openzfs_volume.html.markdown | 4 +- .../cdktf/python/r/instance.html.markdown | 5 +- .../python/r/launch_template.html.markdown | 5 +- .../python/r/opensearch_package.html.markdown | 5 +- ...rds_cluster_role_association.html.markdown | 4 +- .../r/securitylake_subscriber.html.markdown | 48 ++++++- .../python/r/synthetics_canary.html.markdown | 3 +- .../python/r/wafv2_rule_group.html.markdown | 57 ++++---- .../cdktf/typescript/d/instance.html.markdown | 3 +- .../custom-service-endpoints.html.markdown | 3 +- .../docs/cdktf/typescript/index.html.markdown | 4 +- ...api_gateway_gateway_response.html.markdown | 6 +- ...hosted_configuration_version.html.markdown | 54 ++++++- ...gnito_managed_login_branding.html.markdown | 134 ++++++++++++++++++ ...sync_location_object_storage.html.markdown | 4 +- .../typescript/r/ecs_service.html.markdown | 4 +- .../r/fsx_openzfs_file_system.html.markdown | 3 +- .../r/fsx_openzfs_volume.html.markdown | 4 +- .../cdktf/typescript/r/instance.html.markdown | 5 +- .../r/launch_template.html.markdown | 5 +- .../r/opensearch_package.html.markdown | 5 +- ...rds_cluster_role_association.html.markdown | 4 +- .../r/securitylake_subscriber.html.markdown | 56 +++++++- .../r/synthetics_canary.html.markdown | 3 +- .../r/wafv2_rule_group.html.markdown | 62 ++++---- 34 files changed, 568 insertions(+), 112 deletions(-) create mode 100644 website/docs/cdktf/python/r/cognito_managed_login_branding.html.markdown create mode 100644 website/docs/cdktf/typescript/r/cognito_managed_login_branding.html.markdown diff --git a/website/docs/cdktf/python/d/instance.html.markdown b/website/docs/cdktf/python/d/instance.html.markdown index a2e17918c7ea..1edf7f5160c5 100644 --- a/website/docs/cdktf/python/d/instance.html.markdown +++ b/website/docs/cdktf/python/d/instance.html.markdown @@ -112,6 +112,7 @@ interpolation. * `outpost_arn` - ARN of the Outpost. * `password_data` - Base-64 encoded encrypted password data for the instance. Useful for getting the administrator password for instances running Microsoft Windows. This attribute is only exported if `get_password_data` is true. See [GetPasswordData](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetPasswordData.html) for more information. * `placement_group` - Placement group of the Instance. +* `placement_group_id` - Placement group ID of the Instance. * `placement_partition_number` - Number of the partition the instance is in. * `private_dns` - Private DNS name assigned to the Instance. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC. * `private_dns_name_options` - Options for the instance hostname. @@ -148,4 +149,4 @@ interpolation. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown b/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown index e9cd17638338..5014a5238bdc 100644 --- a/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown +++ b/website/docs/cdktf/python/guides/custom-service-endpoints.html.markdown @@ -358,6 +358,7 @@ class MyConvertedCode(TerraformStack): |WAF Classic Regional|`wafregional`|`AWS_ENDPOINT_URL_WAF_REGIONAL`|`waf_regional`| |WAF|`wafv2`|`AWS_ENDPOINT_URL_WAFV2`|`wafv2`| |Well-Architected Tool|`wellarchitected`|`AWS_ENDPOINT_URL_WELLARCHITECTED`|`wellarchitected`| +|WorkMail|`workmail`|`AWS_ENDPOINT_URL_WORKMAIL`|`workmail`| |WorkSpaces|`workspaces`|`AWS_ENDPOINT_URL_WORKSPACES`|`workspaces`| |WorkSpaces Web|`workspacesweb`|`AWS_ENDPOINT_URL_WORKSPACES_WEB`|`workspaces_web`| |X-Ray|`xray`|`AWS_ENDPOINT_URL_XRAY`|`xray`| @@ -460,4 +461,4 @@ class MyConvertedCode(TerraformStack): ) ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/index.html.markdown b/website/docs/cdktf/python/index.html.markdown index 4b061487e164..e70a0e08dce6 100644 --- a/website/docs/cdktf/python/index.html.markdown +++ b/website/docs/cdktf/python/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -897,4 +897,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/api_gateway_gateway_response.html.markdown b/website/docs/cdktf/python/r/api_gateway_gateway_response.html.markdown index 0bdbf55a07bc..a6d661db9616 100644 --- a/website/docs/cdktf/python/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/cdktf/python/r/api_gateway_gateway_response.html.markdown @@ -47,9 +47,9 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `region` - (Optional) Region where this resource will be managed. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `rest_api_id` - (Required) String identifier of the associated REST API. -* `response_type` - (Required) Response type of the associated GatewayResponse. +* `response_type` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. * `status_code` - (Optional) HTTP status code of the Gateway Response. * `response_templates` - (Optional) Map of templates used to transform the response body. * `response_parameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. @@ -83,4 +83,4 @@ Using `terraform import`, import `aws_api_gateway_gateway_response` using `REST- % terraform import aws_api_gateway_gateway_response.example 12345abcde/UNAUTHORIZED ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appconfig_hosted_configuration_version.html.markdown b/website/docs/cdktf/python/r/appconfig_hosted_configuration_version.html.markdown index af1aef0d4d4f..225ad378923c 100644 --- a/website/docs/cdktf/python/r/appconfig_hosted_configuration_version.html.markdown +++ b/website/docs/cdktf/python/r/appconfig_hosted_configuration_version.html.markdown @@ -103,6 +103,47 @@ class MyConvertedCode(TerraformStack): ) ``` +### Multi-variant Feature Flags + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, Fn, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appconfig_hosted_configuration_version import AppconfigHostedConfigurationVersion +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppconfigHostedConfigurationVersion(self, "example", + application_id=Token.as_string(aws_appconfig_application_example.id), + configuration_profile_id=Token.as_string(aws_appconfig_configuration_profile_example.configuration_profile_id), + content=Token.as_string( + Fn.jsonencode({ + "flags": { + "loggingenabled": { + "name": "loggingEnabled" + } + }, + "values": { + "loggingenabled": { + "_variants": Fn.concat(["${[ for user_id in ${" + appcfg_enable_logging_user_ids.value + "} : { # Flat list of userIds\n enabled = true,\n name = \"usersWithLoggingEnabled_${user_id}\",\n rule = \"(or (eq $userId \\\"${user_id}\\\"))\"\n }]}", [{ + "enabled": False, + "name": "Default" + } + ] + ]) + } + }, + "version": "1" + })), + content_type="application/json", + description="Example Multi-variant Feature Flag Configuration Version" + ) +``` + ## Argument Reference This resource supports the following arguments: @@ -147,4 +188,4 @@ Using `terraform import`, import AppConfig Hosted Configuration Versions using t % terraform import aws_appconfig_hosted_configuration_version.example 71abcde/11xxxxx/2 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/cognito_managed_login_branding.html.markdown b/website/docs/cdktf/python/r/cognito_managed_login_branding.html.markdown new file mode 100644 index 000000000000..a2a73015a41c --- /dev/null +++ b/website/docs/cdktf/python/r/cognito_managed_login_branding.html.markdown @@ -0,0 +1,120 @@ +--- +subcategory: "Cognito IDP (Identity Provider)" +layout: "aws" +page_title: "AWS: aws_cognito_managed_login_branding" +description: |- + Manages branding settings for a user pool style and associates it with an app client. +--- + + + +# Resource: aws_cognito_managed_login_branding + +Manages branding settings for a user pool style and associates it with an app client. + +## Example Usage + +### Default Branding Style + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.cognito_managed_login_branding import CognitoManagedLoginBranding +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + CognitoManagedLoginBranding(self, "client", + client_id=example.id, + use_cognito_provided_values=True, + user_pool_id=Token.as_string(aws_cognito_user_pool_example.id) + ) +``` + +### Custom Branding Style + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Fn, Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.cognito_managed_login_branding import CognitoManagedLoginBranding +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + CognitoManagedLoginBranding(self, "client", + asset=[CognitoManagedLoginBrandingAsset( + bytes=Token.as_string(Fn.filebase64("login_branding_asset.svg")), + category="PAGE_HEADER_BACKGROUND", + color_mode="DARK", + extension="SVG" + ) + ], + client_id=example.id, + settings=Token.as_string(Fn.jsonencode({})), + user_pool_id=Token.as_string(aws_cognito_user_pool_example.id) + ) +``` + +## Argument Reference + +The following arguments are required: + +* `client_id` - (Required) App client that the branding style is for. +* `user_pool_id` - (Required) User pool the client belongs to. + +The following arguments are optional: + +* `asset` - (Optional) Image files to apply to roles like backgrounds, logos, and icons. See [details below](#asset). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `settings` - (Optional) JSON document with the the settings to apply to the style. +* `use_cognito_provided_values` - (Optional) When `true`, applies the default branding style options. + +### asset + +* `bytes` - (Optional) Image file, in Base64-encoded binary. +* `category` - (Required) Category that the image corresponds to. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Category) for valid values. +* `color_mode` - (Required) Display-mode target of the asset. Valid values: `LIGHT`, `DARK`, `DYNAMIC`. +* `extensions` - (Required) File type of the image file. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Extension) for valid values. +* `resource_id` - (Optional) Asset ID. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `managed_login_branding_id` - ID of the managed login branding style. +* `settings_all` - Settings including Amazon Cognito defaults. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Cognito branding settings using `user_pool_id` and `managed_login_branding_id` separated by `,`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.cognito_managed_login_branding import CognitoManagedLoginBranding +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + CognitoManagedLoginBranding.generate_config_for_import(self, "example", "us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd") +``` + +Using `terraform import`, import Cognito branding settings using `user_pool_id` and `managed_login_branding_id` separated by `,`. For example: + +```console +% terraform import aws_cognito_managed_login_branding.example us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown b/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown index 5504f1533528..79c0f4b5a7d8 100644 --- a/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown @@ -40,7 +40,7 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `agent_arns` - (Required) A list of DataSync Agent ARNs with which this location will be associated. +* `agent_arns` - (Optional) A list of DataSync Agent ARNs with which this location will be associated. For agentless cross-cloud transfers, this parameter does not need to be specified. * `access_key` - (Optional) The access key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `access_key` and `secret_key` to provide the user name and password, respectively. * `bucket_name` - (Required) The bucket on the self-managed object storage server that is used to read data from. * `secret_key` - (Optional) The secret key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `access_key` and `secret_key` to provide the user name and password, respectively. @@ -84,4 +84,4 @@ Using `terraform import`, import `aws_datasync_location_object_storage` using th % terraform import aws_datasync_location_object_storage.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecs_service.html.markdown b/website/docs/cdktf/python/r/ecs_service.html.markdown index 3270f7e7e77f..36fc82cffdda 100644 --- a/website/docs/cdktf/python/r/ecs_service.html.markdown +++ b/website/docs/cdktf/python/r/ecs_service.html.markdown @@ -212,7 +212,7 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `alarms` - (Optional) Information about the CloudWatch alarms. [See below](#alarms). -* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. Defaults to `DISABLED`. +* `availability_zone_rebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. When creating a new service, if no value is specified, it defaults to `ENABLED` if the service is compatible with AvailabilityZoneRebalancing. When updating an existing service, if no value is specified it defaults to the existing service's AvailabilityZoneRebalancing value. If the service never had an AvailabilityZoneRebalancing value set, Amazon ECS treats this as `DISABLED`. * `capacity_provider_strategy` - (Optional) Capacity provider strategies to use for the service. Can be one or more. These can be updated without destroying and recreating the service only if `force_new_deployment = true` and not changing from 0 `capacity_provider_strategy` blocks to greater than 0, or vice versa. [See below](#capacity_provider_strategy). Conflicts with `launch_type`. * `cluster` - (Optional) ARN of an ECS cluster. * `deployment_circuit_breaker` - (Optional) Configuration block for deployment circuit breaker. [See below](#deployment_circuit_breaker). @@ -511,4 +511,4 @@ Using `terraform import`, import ECS services using the `name` together with ecs % terraform import aws_ecs_service.imported cluster-name/service-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/fsx_openzfs_file_system.html.markdown b/website/docs/cdktf/python/r/fsx_openzfs_file_system.html.markdown index 9382c0dd41a0..7b684f18a710 100644 --- a/website/docs/cdktf/python/r/fsx_openzfs_file_system.html.markdown +++ b/website/docs/cdktf/python/r/fsx_openzfs_file_system.html.markdown @@ -63,6 +63,7 @@ The following arguments are optional: * `security_group_ids` - (Optional) A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups will apply to all network interfaces. * `skip_final_backup` - (Optional) When enabled, will skip the default final backup taken when the file system is deleted. This configuration must be applied separately before attempting to delete the resource to have the desired behavior. Defaults to `false`. * `storage_type` - (Optional) The filesystem storage type. Only `SSD` is supported. +* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the filesystem. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `weekly_maintenance_start_time` - (Optional) The preferred start time (in `d:HH:MM` format) to perform weekly maintenance, in the UTC time zone. @@ -178,4 +179,4 @@ class MyConvertedCode(TerraformStack): ) ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/fsx_openzfs_volume.html.markdown b/website/docs/cdktf/python/r/fsx_openzfs_volume.html.markdown index c4208c628d83..e5aca16e02dc 100644 --- a/website/docs/cdktf/python/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/cdktf/python/r/fsx_openzfs_volume.html.markdown @@ -49,7 +49,7 @@ This resource supports the following arguments: * `origin_snapshot` - (Optional) Specifies the configuration to use when creating the OpenZFS volume. See [`origin_snapshot` Block](#origin_snapshot-block) below for details. * `storage_capacity_quota_gib` - (Optional) The maximum amount of storage in gibibytes (GiB) that the volume can use from its parent. * `storage_capacity_reservation_gib` - (Optional) The amount of storage in gibibytes (GiB) to reserve from the parent volume. -* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum of 100 items. See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. +* `user_and_group_quotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`user_and_group_quotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `nfs_exports` Block @@ -121,4 +121,4 @@ Using `terraform import`, import FSx Volumes using the `id`. For example: % terraform import aws_fsx_openzfs_volume.example fsvol-543ab12b1ca672f33 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/instance.html.markdown b/website/docs/cdktf/python/r/instance.html.markdown index c90c6c5602ea..b1bf1e60cac3 100644 --- a/website/docs/cdktf/python/r/instance.html.markdown +++ b/website/docs/cdktf/python/r/instance.html.markdown @@ -302,7 +302,8 @@ This resource supports the following arguments: * `metadata_options` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) * `network_interface` - (Optional, **Deprecated** to specify the primary network interface, use `primary_network_interface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. -* `placement_group` - (Optional) Placement Group to start the instance in. +* `placement_group` - (Optional) Placement Group to start the instance in. Conflicts with `placement_group_id`. +* `placement_group_id` - (Optional) Placement Group ID to start the instance in. Conflicts with `placement_group`. * `placement_partition_number` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. * `primary_network_interface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `private_dns_name_options` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. @@ -598,4 +599,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/launch_template.html.markdown b/website/docs/cdktf/python/r/launch_template.html.markdown index 25aaf3ad98ea..73b859f78d7d 100644 --- a/website/docs/cdktf/python/r/launch_template.html.markdown +++ b/website/docs/cdktf/python/r/launch_template.html.markdown @@ -454,7 +454,8 @@ The `placement` block supports the following: * `affinity` - (Optional) The affinity setting for an instance on a Dedicated Host. * `availability_zone` - (Optional) The Availability Zone for the instance. -* `group_name` - (Optional) The name of the placement group for the instance. +* `group_id` - (Optional) The ID of the placement group for the instance. Conflicts with `group_name`. +* `group_name` - (Optional) The name of the placement group for the instance. Conflicts with `group_id`. * `host_id` - (Optional) The ID of the Dedicated Host for the instance. * `host_resource_group_arn` - (Optional) The ARN of the Host Resource Group in which to launch instances. * `spread_domain` - (Optional) Reserved for future use. @@ -512,4 +513,4 @@ Using `terraform import`, import Launch Templates using the `id`. For example: % terraform import aws_launch_template.web lt-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/opensearch_package.html.markdown b/website/docs/cdktf/python/r/opensearch_package.html.markdown index 24c380dc71cc..273434052d9b 100644 --- a/website/docs/cdktf/python/r/opensearch_package.html.markdown +++ b/website/docs/cdktf/python/r/opensearch_package.html.markdown @@ -56,8 +56,9 @@ class MyConvertedCode(TerraformStack): This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `engine_version` - (Optional, Forces new resources) Engine version that the package is compatible with. This argument is required and only valid when `package_type` is `ZIP-PLUGIN`. Format: `OpenSearch_X.Y` or `Elasticsearch_X.Y`, where `X` and `Y` are the major and minor version numbers, respectively. * `package_name` - (Required, Forces new resource) Unique name for the package. -* `package_type` - (Required, Forces new resource) The type of package. +* `package_type` - (Required, Forces new resource) The type of package. Valid values are `TXT-DICTIONARY`, `ZIP-PLUGIN`, `PACKAGE-LICENSE` and `PACKAGE-CONFIG`. * `package_source` - (Required, Forces new resource) Configuration block for the package source options. * `package_description` - (Optional, Forces new resource) Description of the package. @@ -98,4 +99,4 @@ Using `terraform import`, import AWS Opensearch Packages using the Package ID. F % terraform import aws_opensearch_package.example package-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/rds_cluster_role_association.html.markdown b/website/docs/cdktf/python/r/rds_cluster_role_association.html.markdown index d1eaa65764ff..b9c5edd4b37c 100644 --- a/website/docs/cdktf/python/r/rds_cluster_role_association.html.markdown +++ b/website/docs/cdktf/python/r/rds_cluster_role_association.html.markdown @@ -42,7 +42,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `db_cluster_identifier` - (Required) DB Cluster Identifier to associate with the IAM Role. -* `feature_name` - (Required) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). +* `feature_name` - (Optional) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). * `role_arn` - (Required) Amazon Resource Name (ARN) of the IAM Role to associate with the DB Cluster. ## Attribute Reference @@ -83,4 +83,4 @@ Using `terraform import`, import `aws_rds_cluster_role_association` using the DB % terraform import aws_rds_cluster_role_association.example my-db-cluster,arn:aws:iam::123456789012:role/my-role ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/securitylake_subscriber.html.markdown b/website/docs/cdktf/python/r/securitylake_subscriber.html.markdown index b3296e13e50e..ccedbb2ce801 100644 --- a/website/docs/cdktf/python/r/securitylake_subscriber.html.markdown +++ b/website/docs/cdktf/python/r/securitylake_subscriber.html.markdown @@ -16,6 +16,8 @@ Terraform resource for managing an AWS Security Lake Subscriber. ## Example Usage +### Basic Usage + ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct @@ -48,6 +50,46 @@ class MyConvertedCode(TerraformStack): ) ``` +### Multiple Log Sources + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.securitylake_subscriber import SecuritylakeSubscriber +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + SecuritylakeSubscriber(self, "example", + access_type="S3", + depends_on=[aws_securitylake_data_lake_example], + source=[SecuritylakeSubscriberSource( + aws_log_source_resource=[SecuritylakeSubscriberSourceAwsLogSourceResource( + source_name="SH_FINDINGS", + source_version="2.0" + ) + ] + ), SecuritylakeSubscriberSource( + aws_log_source_resource=[SecuritylakeSubscriberSourceAwsLogSourceResource( + source_name="ROUTE53", + source_version="2.0" + ) + ] + ) + ], + subscriber_identity=[SecuritylakeSubscriberSubscriberIdentity( + external_id="example", + principal="1234567890" + ) + ], + subscriber_name="example-name" + ) +``` + ## Argument Reference This resource supports the following arguments: @@ -78,8 +120,8 @@ The `subscriber_identity` block supports the following arguments: The `aws_log_source_resource` block supports the following arguments: -* `source_name` - (Required) Provides data expiration details of Amazon Security Lake object. -* `source_version` - (Optional) Provides data storage transition details of Amazon Security Lake object. +* `source_name` - (Required) The name for a AWS source. This must be a Regionally unique value. Valid values: `ROUTE53`, `VPC_FLOW`, `SH_FINDINGS`, `CLOUD_TRAIL_MGMT`, `LAMBDA_EXECUTION`, `S3_DATA`, `EKS_AUDIT` and `WAF`. +* `source_version` - (Optional) The version for a AWS source. This must be a Regionally unique value. ### `custom_log_source_resource` Block @@ -157,4 +199,4 @@ Using `terraform import`, import Security Lake subscriber using the subscriber I % terraform import aws_securitylake_subscriber.example 9f3bfe79-d543-474d-a93c-f3846805d208 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/synthetics_canary.html.markdown b/website/docs/cdktf/python/r/synthetics_canary.html.markdown index ad6638d66db4..28c84fbb140e 100644 --- a/website/docs/cdktf/python/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/python/r/synthetics_canary.html.markdown @@ -88,6 +88,7 @@ The following arguments are optional: * `memory_in_mb` - (Optional) Maximum amount of memory available to the canary while it is running, in MB. The value you specify must be a multiple of 64. * `active_tracing` - (Optional) Whether this canary is to use active AWS X-Ray tracing when it runs. You can enable active tracing only for canaries that use version syn-nodejs-2.0 or later for their canary runtime. * `environment_variables` - (Optional) Map of environment variables that are accessible from the canary during execution. Please see [AWS Docs](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime) for variables reserved for Lambda. +* `ephemeral_storage` - (Optional) Amount of ephemeral storage (in MB) allocated for the canary run during execution. Defaults to 1024. ### vpc_config @@ -145,4 +146,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown b/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown index 93c04df6453c..38d55da46726 100644 --- a/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown +++ b/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown @@ -284,12 +284,12 @@ class MyConvertedCode(TerraformStack): ) ``` -### Using rule_json +### Using rules_json ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct -from cdktf import Fn, TerraformStack +from cdktf import Fn, Token, TerraformStack # # Provider bindings are generated by running `cdktf get`. # See https://cdk.tf/provider-generation for more details. @@ -301,33 +301,34 @@ class MyConvertedCode(TerraformStack): Wafv2RuleGroup(self, "example", capacity=100, name="example-rule-group", - rule_json=Fn.jsonencode([{ - "Action": { - "Count": {} - }, - "Name": "rule-1", - "Priority": 1, - "Statement": { - "ByteMatchStatement": { - "FieldToMatch": { - "UriPath": {} - }, - "PositionalConstraint": "CONTAINS", - "SearchString": "badbot", - "TextTransformations": [{ - "Priority": 1, - "Type": "NONE" + rules_json=Token.as_string( + Fn.jsonencode([{ + "Action": { + "Count": {} + }, + "Name": "rule-1", + "Priority": 1, + "Statement": { + "ByteMatchStatement": { + "FieldToMatch": { + "UriPath": {} + }, + "PositionalConstraint": "CONTAINS", + "SearchString": "badbot", + "TextTransformations": [{ + "Priority": 1, + "Type": "NONE" + } + ] } - ] + }, + "VisibilityConfig": { + "CloudwatchMetricsEnabled": False, + "MetricName": "friendly-rule-metric-name", + "SampledRequestsEnabled": False } - }, - "VisibilityConfig": { - "CloudwatchMetricsEnabled": False, - "MetricName": "friendly-rule-metric-name", - "SampledRequestsEnabled": False } - } - ]), + ])), scope="REGIONAL", visibility_config=Wafv2RuleGroupVisibilityConfig( cloudwatch_metrics_enabled=False, @@ -348,7 +349,7 @@ This resource supports the following arguments: * `name` - (Required, Forces new resource) A friendly name of the rule group. * `name_prefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `rule` - (Optional) The rule blocks used to identify the web requests that you want to `allow`, `block`, or `count`. See [Rules](#rules) below for details. -* `rule_json` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `rule_json` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. +* `rules_json` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `rules_json` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. * `scope` - (Required, Forces new resource) Specifies whether this is for an AWS CloudFront distribution or for a regional application. Valid values are `CLOUDFRONT` or `REGIONAL`. To work with CloudFront, you must also specify the region `us-east-1` (N. Virginia) on the AWS provider. * `tags` - (Optional) An array of key:value pairs to associate with the resource. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `visibility_config` - (Required) Defines and enables Amazon CloudWatch metrics and web request sample collection. See [Visibility Configuration](#visibility-configuration) below for details. @@ -897,4 +898,4 @@ Using `terraform import`, import WAFv2 Rule Group using `ID/name/scope`. For exa % terraform import aws_wafv2_rule_group.example a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc/example/REGIONAL ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/instance.html.markdown b/website/docs/cdktf/typescript/d/instance.html.markdown index 781e4e17f4af..685a49a1f5f7 100644 --- a/website/docs/cdktf/typescript/d/instance.html.markdown +++ b/website/docs/cdktf/typescript/d/instance.html.markdown @@ -117,6 +117,7 @@ interpolation. * `outpostArn` - ARN of the Outpost. * `passwordData` - Base-64 encoded encrypted password data for the instance. Useful for getting the administrator password for instances running Microsoft Windows. This attribute is only exported if `getPasswordData` is true. See [GetPasswordData](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetPasswordData.html) for more information. * `placementGroup` - Placement group of the Instance. +* `placementGroupId` - Placement group ID of the Instance. * `placementPartitionNumber` - Number of the partition the instance is in. * `privateDns` - Private DNS name assigned to the Instance. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames for your VPC. * `privateDnsNameOptions` - Options for the instance hostname. @@ -153,4 +154,4 @@ interpolation. [1]: http://docs.aws.amazon.com/cli/latest/reference/ec2/describe-instances.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown b/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown index bd24b344b14c..6971f89e5118 100644 --- a/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown +++ b/website/docs/cdktf/typescript/guides/custom-service-endpoints.html.markdown @@ -366,6 +366,7 @@ class MyConvertedCode extends TerraformStack { |WAF Classic Regional|`wafregional`|`AWS_ENDPOINT_URL_WAF_REGIONAL`|`waf_regional`| |WAF|`wafv2`|`AWS_ENDPOINT_URL_WAFV2`|`wafv2`| |Well-Architected Tool|`wellarchitected`|`AWS_ENDPOINT_URL_WELLARCHITECTED`|`wellarchitected`| +|WorkMail|`workmail`|`AWS_ENDPOINT_URL_WORKMAIL`|`workmail`| |WorkSpaces|`workspaces`|`AWS_ENDPOINT_URL_WORKSPACES`|`workspaces`| |WorkSpaces Web|`workspacesweb`|`AWS_ENDPOINT_URL_WORKSPACES_WEB`|`workspaces_web`| |X-Ray|`xray`|`AWS_ENDPOINT_URL_XRAY`|`xray`| @@ -476,4 +477,4 @@ class MyConvertedCode extends TerraformStack { ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/index.html.markdown b/website/docs/cdktf/typescript/index.html.markdown index 5ff551941d19..5181c7592054 100644 --- a/website/docs/cdktf/typescript/index.html.markdown +++ b/website/docs/cdktf/typescript/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,523 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -948,4 +948,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/api_gateway_gateway_response.html.markdown b/website/docs/cdktf/typescript/r/api_gateway_gateway_response.html.markdown index 9e400041802d..8f1e3e377bd3 100644 --- a/website/docs/cdktf/typescript/r/api_gateway_gateway_response.html.markdown +++ b/website/docs/cdktf/typescript/r/api_gateway_gateway_response.html.markdown @@ -50,9 +50,9 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `region` - (Optional) Region where this resource will be managed. See the [AWS Documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints) for supported values. Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `restApiId` - (Required) String identifier of the associated REST API. -* `responseType` - (Required) Response type of the associated GatewayResponse. +* `responseType` - (Required) Response type of the associated GatewayResponse. See the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/supported-gateway-response-types.html) for supported values. * `statusCode` - (Optional) HTTP status code of the Gateway Response. * `responseTemplates` - (Optional) Map of templates used to transform the response body. * `responseParameters` - (Optional) Map of parameters (paths, query strings and headers) of the Gateway Response. @@ -93,4 +93,4 @@ Using `terraform import`, import `aws_api_gateway_gateway_response` using `REST- % terraform import aws_api_gateway_gateway_response.example 12345abcde/UNAUTHORIZED ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appconfig_hosted_configuration_version.html.markdown b/website/docs/cdktf/typescript/r/appconfig_hosted_configuration_version.html.markdown index 5f51d08e0d3f..d2f5ba4d9e50 100644 --- a/website/docs/cdktf/typescript/r/appconfig_hosted_configuration_version.html.markdown +++ b/website/docs/cdktf/typescript/r/appconfig_hosted_configuration_version.html.markdown @@ -115,6 +115,58 @@ class MyConvertedCode extends TerraformStack { ``` +### Multi-variant Feature Flags + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, Fn, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppconfigHostedConfigurationVersion } from "./.gen/providers/aws/appconfig-hosted-configuration-version"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new AppconfigHostedConfigurationVersion(this, "example", { + applicationId: Token.asString(awsAppconfigApplicationExample.id), + configurationProfileId: Token.asString( + awsAppconfigConfigurationProfileExample.configurationProfileId + ), + content: Token.asString( + Fn.jsonencode({ + flags: { + loggingenabled: { + name: "loggingEnabled", + }, + }, + values: { + loggingenabled: { + _variants: Fn.concat([ + "${[ for user_id in ${" + + appcfgEnableLoggingUserIds.value + + '} : { # Flat list of userIds\n enabled = true,\n name = "usersWithLoggingEnabled_${user_id}",\n rule = "(or (eq $userId \\"${user_id}\\"))"\n }]}', + [ + { + enabled: false, + name: "Default", + }, + ], + ]), + }, + }, + version: "1", + }) + ), + contentType: "application/json", + description: "Example Multi-variant Feature Flag Configuration Version", + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: @@ -166,4 +218,4 @@ Using `terraform import`, import AppConfig Hosted Configuration Versions using t % terraform import aws_appconfig_hosted_configuration_version.example 71abcde/11xxxxx/2 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/cognito_managed_login_branding.html.markdown b/website/docs/cdktf/typescript/r/cognito_managed_login_branding.html.markdown new file mode 100644 index 000000000000..e0dfb376a521 --- /dev/null +++ b/website/docs/cdktf/typescript/r/cognito_managed_login_branding.html.markdown @@ -0,0 +1,134 @@ +--- +subcategory: "Cognito IDP (Identity Provider)" +layout: "aws" +page_title: "AWS: aws_cognito_managed_login_branding" +description: |- + Manages branding settings for a user pool style and associates it with an app client. +--- + + + +# Resource: aws_cognito_managed_login_branding + +Manages branding settings for a user pool style and associates it with an app client. + +## Example Usage + +### Default Branding Style + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { CognitoManagedLoginBranding } from "./.gen/providers/aws/cognito-managed-login-branding"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new CognitoManagedLoginBranding(this, "client", { + clientId: example.id, + useCognitoProvidedValues: true, + userPoolId: Token.asString(awsCognitoUserPoolExample.id), + }); + } +} + +``` + +### Custom Branding Style + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Fn, Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { CognitoManagedLoginBranding } from "./.gen/providers/aws/cognito-managed-login-branding"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new CognitoManagedLoginBranding(this, "client", { + asset: [ + { + bytes: Token.asString(Fn.filebase64("login_branding_asset.svg")), + category: "PAGE_HEADER_BACKGROUND", + colorMode: "DARK", + extension: "SVG", + }, + ], + clientId: example.id, + settings: Token.asString(Fn.jsonencode({})), + userPoolId: Token.asString(awsCognitoUserPoolExample.id), + }); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `clientId` - (Required) App client that the branding style is for. +* `userPoolId` - (Required) User pool the client belongs to. + +The following arguments are optional: + +* `asset` - (Optional) Image files to apply to roles like backgrounds, logos, and icons. See [details below](#asset). +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `settings` - (Optional) JSON document with the the settings to apply to the style. +* `useCognitoProvidedValues` - (Optional) When `true`, applies the default branding style options. + +### asset + +* `bytes` - (Optional) Image file, in Base64-encoded binary. +* `category` - (Required) Category that the image corresponds to. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Category) for valid values. +* `colorMode` - (Required) Display-mode target of the asset. Valid values: `LIGHT`, `DARK`, `DYNAMIC`. +* `extensions` - (Required) File type of the image file. See [AWS documentation](https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_AssetType.html#CognitoUserPools-Type-AssetType-Extension) for valid values. +* `resourceId` - (Optional) Asset ID. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `managedLoginBrandingId` - ID of the managed login branding style. +* `settingsAll` - Settings including Amazon Cognito defaults. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Cognito branding settings using `userPoolId` and `managedLoginBrandingId` separated by `,`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { CognitoManagedLoginBranding } from "./.gen/providers/aws/cognito-managed-login-branding"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + CognitoManagedLoginBranding.generateConfigForImport( + this, + "example", + "us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd" + ); + } +} + +``` + +Using `terraform import`, import Cognito branding settings using `userPoolId` and `managedLoginBrandingId` separated by `,`. For example: + +```console +% terraform import aws_cognito_managed_login_branding.example us-west-2_rSss9Zltr,06c6ae7b-1e66-46d2-87a9-1203ea3307bd +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown index 4e0d4dcf39b6..229bbff9d94c 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown @@ -43,7 +43,7 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `agentArns` - (Required) A list of DataSync Agent ARNs with which this location will be associated. +* `agentArns` - (Optional) A list of DataSync Agent ARNs with which this location will be associated. For agentless cross-cloud transfers, this parameter does not need to be specified. * `accessKey` - (Optional) The access key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `accessKey` and `secretKey` to provide the user name and password, respectively. * `bucketName` - (Required) The bucket on the self-managed object storage server that is used to read data from. * `secretKey` - (Optional) The secret key is used if credentials are required to access the self-managed object storage server. If your object storage requires a user name and password to authenticate, use `accessKey` and `secretKey` to provide the user name and password, respectively. @@ -94,4 +94,4 @@ Using `terraform import`, import `aws_datasync_location_object_storage` using th % terraform import aws_datasync_location_object_storage.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecs_service.html.markdown b/website/docs/cdktf/typescript/r/ecs_service.html.markdown index 538880364861..3cff26a48aef 100644 --- a/website/docs/cdktf/typescript/r/ecs_service.html.markdown +++ b/website/docs/cdktf/typescript/r/ecs_service.html.markdown @@ -242,7 +242,7 @@ The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `alarms` - (Optional) Information about the CloudWatch alarms. [See below](#alarms). -* `availabilityZoneRebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. Defaults to `DISABLED`. +* `availabilityZoneRebalancing` - (Optional) ECS automatically redistributes tasks within a service across Availability Zones (AZs) to mitigate the risk of impaired application availability due to underlying infrastructure failures and task lifecycle activities. The valid values are `ENABLED` and `DISABLED`. When creating a new service, if no value is specified, it defaults to `ENABLED` if the service is compatible with AvailabilityZoneRebalancing. When updating an existing service, if no value is specified it defaults to the existing service's AvailabilityZoneRebalancing value. If the service never had an AvailabilityZoneRebalancing value set, Amazon ECS treats this as `DISABLED`. * `capacityProviderStrategy` - (Optional) Capacity provider strategies to use for the service. Can be one or more. These can be updated without destroying and recreating the service only if `force_new_deployment = true` and not changing from 0 `capacityProviderStrategy` blocks to greater than 0, or vice versa. [See below](#capacity_provider_strategy). Conflicts with `launchType`. * `cluster` - (Optional) ARN of an ECS cluster. * `deploymentCircuitBreaker` - (Optional) Configuration block for deployment circuit breaker. [See below](#deployment_circuit_breaker). @@ -548,4 +548,4 @@ Using `terraform import`, import ECS services using the `name` together with ecs % terraform import aws_ecs_service.imported cluster-name/service-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/fsx_openzfs_file_system.html.markdown b/website/docs/cdktf/typescript/r/fsx_openzfs_file_system.html.markdown index 92e5be4ad2e9..fae4cda72ad5 100644 --- a/website/docs/cdktf/typescript/r/fsx_openzfs_file_system.html.markdown +++ b/website/docs/cdktf/typescript/r/fsx_openzfs_file_system.html.markdown @@ -66,6 +66,7 @@ The following arguments are optional: * `securityGroupIds` - (Optional) A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups will apply to all network interfaces. * `skipFinalBackup` - (Optional) When enabled, will skip the default final backup taken when the file system is deleted. This configuration must be applied separately before attempting to delete the resource to have the desired behavior. Defaults to `false`. * `storageType` - (Optional) The filesystem storage type. Only `SSD` is supported. +* `userAndGroupQuotas` - (Optional) - Specify how much storage users or groups can use on the filesystem. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`userAndGroupQuotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `weeklyMaintenanceStartTime` - (Optional) The preferred start time (in `d:HH:MM` format) to perform weekly maintenance, in the UTC time zone. @@ -195,4 +196,4 @@ class MyConvertedCode extends TerraformStack { ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/fsx_openzfs_volume.html.markdown b/website/docs/cdktf/typescript/r/fsx_openzfs_volume.html.markdown index 291ef849a231..eb6f3a0b3869 100644 --- a/website/docs/cdktf/typescript/r/fsx_openzfs_volume.html.markdown +++ b/website/docs/cdktf/typescript/r/fsx_openzfs_volume.html.markdown @@ -52,7 +52,7 @@ This resource supports the following arguments: * `originSnapshot` - (Optional) Specifies the configuration to use when creating the OpenZFS volume. See [`originSnapshot` Block](#origin_snapshot-block) below for details. * `storageCapacityQuotaGib` - (Optional) The maximum amount of storage in gibibytes (GiB) that the volume can use from its parent. * `storageCapacityReservationGib` - (Optional) The amount of storage in gibibytes (GiB) to reserve from the parent volume. -* `userAndGroupQuotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum of 100 items. See [`userAndGroupQuotas` Block](#user_and_group_quotas-block) Below. +* `userAndGroupQuotas` - (Optional) - Specify how much storage users or groups can use on the volume. Maximum number of items defined by [FSx for OpenZFS Resource quota](https://docs.aws.amazon.com/fsx/latest/OpenZFSGuide/limits.html#limits-openzfs-resources-file-system). See [`userAndGroupQuotas` Block](#user_and_group_quotas-block) Below. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. ### `nfsExports` Block @@ -131,4 +131,4 @@ Using `terraform import`, import FSx Volumes using the `id`. For example: % terraform import aws_fsx_openzfs_volume.example fsvol-543ab12b1ca672f33 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/instance.html.markdown b/website/docs/cdktf/typescript/r/instance.html.markdown index 3c8d95416b9f..567f8ba18d56 100644 --- a/website/docs/cdktf/typescript/r/instance.html.markdown +++ b/website/docs/cdktf/typescript/r/instance.html.markdown @@ -326,7 +326,8 @@ This resource supports the following arguments: * `metadataOptions` - (Optional) Customize the metadata options of the instance. See [Metadata Options](#metadata-options) below for more details. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) * `networkInterface` - (Optional, **Deprecated** to specify the primary network interface, use `primaryNetworkInterface`, to attach additional network interfaces, use `aws_network_interface_attachment` resources) Customize network interfaces to be attached at instance boot time. See [Network Interfaces](#network-interfaces) below for more details. -* `placementGroup` - (Optional) Placement Group to start the instance in. +* `placementGroup` - (Optional) Placement Group to start the instance in. Conflicts with `placementGroupId`. +* `placementGroupId` - (Optional) Placement Group ID to start the instance in. Conflicts with `placementGroup`. * `placementPartitionNumber` - (Optional) Number of the partition the instance is in. Valid only if [the `aws_placement_group` resource's](placement_group.html) `strategy` argument is set to `"partition"`. * `primaryNetworkInterface` - (Optional) The primary network interface. See [Primary Network Interface](#primary-network-interface) below. * `privateDnsNameOptions` - (Optional) Options for the instance hostname. The default values are inherited from the subnet. See [Private DNS Name Options](#private-dns-name-options) below for more details. @@ -625,4 +626,4 @@ Using `terraform import`, import instances using the `id`. For example: % terraform import aws_instance.web i-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/launch_template.html.markdown b/website/docs/cdktf/typescript/r/launch_template.html.markdown index 1ed84262009f..010174898736 100644 --- a/website/docs/cdktf/typescript/r/launch_template.html.markdown +++ b/website/docs/cdktf/typescript/r/launch_template.html.markdown @@ -462,7 +462,8 @@ The `placement` block supports the following: * `affinity` - (Optional) The affinity setting for an instance on a Dedicated Host. * `availabilityZone` - (Optional) The Availability Zone for the instance. -* `groupName` - (Optional) The name of the placement group for the instance. +* `groupId` - (Optional) The ID of the placement group for the instance. Conflicts with `groupName`. +* `groupName` - (Optional) The name of the placement group for the instance. Conflicts with `groupId`. * `hostId` - (Optional) The ID of the Dedicated Host for the instance. * `hostResourceGroupArn` - (Optional) The ARN of the Host Resource Group in which to launch instances. * `spreadDomain` - (Optional) Reserved for future use. @@ -523,4 +524,4 @@ Using `terraform import`, import Launch Templates using the `id`. For example: % terraform import aws_launch_template.web lt-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/opensearch_package.html.markdown b/website/docs/cdktf/typescript/r/opensearch_package.html.markdown index 76313420fe53..3d3e8218689e 100644 --- a/website/docs/cdktf/typescript/r/opensearch_package.html.markdown +++ b/website/docs/cdktf/typescript/r/opensearch_package.html.markdown @@ -63,8 +63,9 @@ class MyConvertedCode extends TerraformStack { This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `engineVersion` - (Optional, Forces new resources) Engine version that the package is compatible with. This argument is required and only valid when `packageType` is `ZIP-PLUGIN`. Format: `OpenSearch_X.Y` or `Elasticsearch_X.Y`, where `X` and `Y` are the major and minor version numbers, respectively. * `packageName` - (Required, Forces new resource) Unique name for the package. -* `packageType` - (Required, Forces new resource) The type of package. +* `packageType` - (Required, Forces new resource) The type of package. Valid values are `TXT-DICTIONARY`, `ZIP-PLUGIN`, `PACKAGE-LICENSE` and `PACKAGE-CONFIG`. * `packageSource` - (Required, Forces new resource) Configuration block for the package source options. * `packageDescription` - (Optional, Forces new resource) Description of the package. @@ -108,4 +109,4 @@ Using `terraform import`, import AWS Opensearch Packages using the Package ID. F % terraform import aws_opensearch_package.example package-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/rds_cluster_role_association.html.markdown b/website/docs/cdktf/typescript/r/rds_cluster_role_association.html.markdown index 1291d813cd30..7ef2312c842c 100644 --- a/website/docs/cdktf/typescript/r/rds_cluster_role_association.html.markdown +++ b/website/docs/cdktf/typescript/r/rds_cluster_role_association.html.markdown @@ -45,7 +45,7 @@ This resource supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `dbClusterIdentifier` - (Required) DB Cluster Identifier to associate with the IAM Role. -* `featureName` - (Required) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). +* `featureName` - (Optional) Name of the feature for association. This can be found in the AWS documentation relevant to the integration or a full list is available in the `SupportedFeatureNames` list returned by [AWS CLI rds describe-db-engine-versions](https://docs.aws.amazon.com/cli/latest/reference/rds/describe-db-engine-versions.html). * `roleArn` - (Required) Amazon Resource Name (ARN) of the IAM Role to associate with the DB Cluster. ## Attribute Reference @@ -93,4 +93,4 @@ Using `terraform import`, import `aws_rds_cluster_role_association` using the DB % terraform import aws_rds_cluster_role_association.example my-db-cluster,arn:aws:iam::123456789012:role/my-role ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/securitylake_subscriber.html.markdown b/website/docs/cdktf/typescript/r/securitylake_subscriber.html.markdown index 09031aee2f9d..2500764af5f4 100644 --- a/website/docs/cdktf/typescript/r/securitylake_subscriber.html.markdown +++ b/website/docs/cdktf/typescript/r/securitylake_subscriber.html.markdown @@ -16,6 +16,8 @@ Terraform resource for managing an AWS Security Lake Subscriber. ## Example Usage +### Basic Usage + ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; @@ -54,6 +56,54 @@ class MyConvertedCode extends TerraformStack { ``` +### Multiple Log Sources + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { SecuritylakeSubscriber } from "./.gen/providers/aws/securitylake-subscriber"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new SecuritylakeSubscriber(this, "example", { + accessType: "S3", + dependsOn: [awsSecuritylakeDataLakeExample], + source: [ + { + awsLogSourceResource: [ + { + sourceName: "SH_FINDINGS", + sourceVersion: "2.0", + }, + ], + }, + { + awsLogSourceResource: [ + { + sourceName: "ROUTE53", + sourceVersion: "2.0", + }, + ], + }, + ], + subscriberIdentity: [ + { + externalId: "example", + principal: "1234567890", + }, + ], + subscriberName: "example-name", + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: @@ -84,8 +134,8 @@ The `subscriberIdentity` block supports the following arguments: The `awsLogSourceResource` block supports the following arguments: -* `sourceName` - (Required) Provides data expiration details of Amazon Security Lake object. -* `sourceVersion` - (Optional) Provides data storage transition details of Amazon Security Lake object. +* `sourceName` - (Required) The name for a AWS source. This must be a Regionally unique value. Valid values: `ROUTE53`, `VPC_FLOW`, `SH_FINDINGS`, `CLOUD_TRAIL_MGMT`, `LAMBDA_EXECUTION`, `S3_DATA`, `EKS_AUDIT` and `WAF`. +* `sourceVersion` - (Optional) The version for a AWS source. This must be a Regionally unique value. ### `customLogSourceResource` Block @@ -170,4 +220,4 @@ Using `terraform import`, import Security Lake subscriber using the subscriber I % terraform import aws_securitylake_subscriber.example 9f3bfe79-d543-474d-a93c-f3846805d208 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown index 289fc2396cc7..2386c1c54b8e 100644 --- a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown @@ -91,6 +91,7 @@ The following arguments are optional: * `memoryInMb` - (Optional) Maximum amount of memory available to the canary while it is running, in MB. The value you specify must be a multiple of 64. * `activeTracing` - (Optional) Whether this canary is to use active AWS X-Ray tracing when it runs. You can enable active tracing only for canaries that use version syn-nodejs-2.0 or later for their canary runtime. * `environmentVariables` - (Optional) Map of environment variables that are accessible from the canary during execution. Please see [AWS Docs](https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html#configuration-envvars-runtime) for variables reserved for Lambda. +* `ephemeralStorage` - (Optional) Amount of ephemeral storage (in MB) allocated for the canary run during execution. Defaults to 1024. ### vpc_config @@ -151,4 +152,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/wafv2_rule_group.html.markdown b/website/docs/cdktf/typescript/r/wafv2_rule_group.html.markdown index 9f48860606b0..17223cfa0da4 100644 --- a/website/docs/cdktf/typescript/r/wafv2_rule_group.html.markdown +++ b/website/docs/cdktf/typescript/r/wafv2_rule_group.html.markdown @@ -319,12 +319,12 @@ class MyConvertedCode extends TerraformStack { ``` -### Using rule_json +### Using rules_json ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; -import { Fn, TerraformStack } from "cdktf"; +import { Fn, Token, TerraformStack } from "cdktf"; /* * Provider bindings are generated by running `cdktf get`. * See https://cdk.tf/provider-generation for more details. @@ -336,35 +336,37 @@ class MyConvertedCode extends TerraformStack { new Wafv2RuleGroup(this, "example", { capacity: 100, name: "example-rule-group", - rule_json: Fn.jsonencode([ - { - Action: { - Count: {}, - }, - Name: "rule-1", - Priority: 1, - Statement: { - ByteMatchStatement: { - FieldToMatch: { - UriPath: {}, - }, - PositionalConstraint: "CONTAINS", - SearchString: "badbot", - TextTransformations: [ - { - Priority: 1, - Type: "NONE", + rulesJson: Token.asString( + Fn.jsonencode([ + { + Action: { + Count: {}, + }, + Name: "rule-1", + Priority: 1, + Statement: { + ByteMatchStatement: { + FieldToMatch: { + UriPath: {}, }, - ], + PositionalConstraint: "CONTAINS", + SearchString: "badbot", + TextTransformations: [ + { + Priority: 1, + Type: "NONE", + }, + ], + }, + }, + VisibilityConfig: { + CloudwatchMetricsEnabled: false, + MetricName: "friendly-rule-metric-name", + SampledRequestsEnabled: false, }, }, - VisibilityConfig: { - CloudwatchMetricsEnabled: false, - MetricName: "friendly-rule-metric-name", - SampledRequestsEnabled: false, - }, - }, - ]), + ]) + ), scope: "REGIONAL", visibilityConfig: { cloudwatchMetricsEnabled: false, @@ -388,7 +390,7 @@ This resource supports the following arguments: * `name` - (Required, Forces new resource) A friendly name of the rule group. * `namePrefix` - (Optional) Creates a unique name beginning with the specified prefix. Conflicts with `name`. * `rule` - (Optional) The rule blocks used to identify the web requests that you want to `allow`, `block`, or `count`. See [Rules](#rules) below for details. -* `ruleJson` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `ruleJson` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. +* `rulesJson` - (Optional) Raw JSON string to allow more than three nested statements. Conflicts with `rule` attribute. This is for advanced use cases where more than 3 levels of nested statements are required. **There is no drift detection at this time**. If you use this attribute instead of `rule`, you will be foregoing drift detection. Additionally, importing an existing rule group into a configuration with `rulesJson` set will result in a one time in-place update as the remote rule configuration is initially written to the `rule` attribute. See the AWS [documentation](https://docs.aws.amazon.com/waf/latest/APIReference/API_CreateRuleGroup.html) for the JSON structure. * `scope` - (Required, Forces new resource) Specifies whether this is for an AWS CloudFront distribution or for a regional application. Valid values are `CLOUDFRONT` or `REGIONAL`. To work with CloudFront, you must also specify the region `us-east-1` (N. Virginia) on the AWS provider. * `tags` - (Optional) An array of key:value pairs to associate with the resource. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `visibilityConfig` - (Required) Defines and enables Amazon CloudWatch metrics and web request sample collection. See [Visibility Configuration](#visibility-configuration) below for details. @@ -944,4 +946,4 @@ Using `terraform import`, import WAFv2 Rule Group using `ID/name/scope`. For exa % terraform import aws_wafv2_rule_group.example a1b2c3d4-d5f6-7777-8888-9999aaaabbbbcccc/example/REGIONAL ``` - \ No newline at end of file + \ No newline at end of file From 2561750331e2ffb8080b1db3bb740c198a4a3905 Mon Sep 17 00:00:00 2001 From: Meg Ashby Date: Mon, 8 Sep 2025 09:16:39 -0400 Subject: [PATCH 1499/2115] attribute names and description for managedRuleGroupConfigATPResponseInspectionSchema json object updated (#44174) --- website/docs/cdktf/python/r/wafv2_web_acl.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown index 9ed6dcda4dcb..b6bcc50c764f 100644 --- a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown +++ b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown @@ -915,8 +915,8 @@ The `managed_rule_group_configs` block support the following arguments: ### `json` Block * `identifier` (Required) The identifier for the value to match against in the JSON. -* `success_strings` (Required) Strings in the body of the response that indicate a successful login attempt. -* `failure_strings` (Required) Strings in the body of the response that indicate a failed login attempt. +* `success_values` (Required) Strings in the response JSON that indicate a successful login attempt. +* `failure_values` (Required) Strings in the response JSON that indicate a failed login attempt. ### `status_code` Block From 61d575284c6a0269913dbd7dd8e4b945c7edd886 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 09:19:19 -0400 Subject: [PATCH 1500/2115] Bump mvdan.cc/gofumpt from 0.9.0 to 0.9.1 in /.ci/tools (#44176) Bumps [mvdan.cc/gofumpt](https://github.com/mvdan/gofumpt) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/mvdan/gofumpt/releases) - [Changelog](https://github.com/mvdan/gofumpt/blob/master/CHANGELOG.md) - [Commits](https://github.com/mvdan/gofumpt/compare/v0.9.0...v0.9.1) --- updated-dependencies: - dependency-name: mvdan.cc/gofumpt dependency-version: 0.9.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .ci/tools/go.mod | 2 +- .ci/tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod index dc3c3d14c947..7fa09a7607f5 100644 --- a/.ci/tools/go.mod +++ b/.ci/tools/go.mod @@ -13,7 +13,7 @@ require ( github.com/rhysd/actionlint v1.7.7 github.com/terraform-linters/tflint v0.58.1 golang.org/x/tools v0.36.0 - mvdan.cc/gofumpt v0.9.0 + mvdan.cc/gofumpt v0.9.1 ) require ( diff --git a/.ci/tools/go.sum b/.ci/tools/go.sum index dc69ef68c495..c52fea5f710a 100644 --- a/.ci/tools/go.sum +++ b/.ci/tools/go.sum @@ -2850,8 +2850,8 @@ modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= -mvdan.cc/gofumpt v0.9.0 h1:W0wNHMSvDBDIyZsm3nnGbVfgp5AknzBrGJnfLCy501w= -mvdan.cc/gofumpt v0.9.0/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw= +mvdan.cc/gofumpt v0.9.1 h1:p5YT2NfFWsYyTieYgwcQ8aKV3xRvFH4uuN/zB2gBbMQ= +mvdan.cc/gofumpt v0.9.1/go.mod h1:3xYtNemnKiXaTh6R4VtlqDATFwBbdXI8lJvH/4qk7mw= mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 h1:WjUu4yQoT5BHT1w8Zu56SP8367OuBV5jvo+4Ulppyf8= mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4/go.mod h1:rthT7OuvRbaGcd5ginj6dA2oLE7YNlta9qhBNNdCaLE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From c9a7b8422623d1d412e9d84c6fe7a127f14d2fa6 Mon Sep 17 00:00:00 2001 From: Sagar Barai Date: Mon, 8 Sep 2025 19:18:51 +0530 Subject: [PATCH 1501/2115] chore: update docs - aws_ssm_parameter data block example and argument reference (#44179) --- website/docs/d/ssm_parameter.html.markdown | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/website/docs/d/ssm_parameter.html.markdown b/website/docs/d/ssm_parameter.html.markdown index 70f1f187d07c..eed18304c737 100644 --- a/website/docs/d/ssm_parameter.html.markdown +++ b/website/docs/d/ssm_parameter.html.markdown @@ -12,12 +12,22 @@ Provides an SSM Parameter data source. ## Example Usage +### Default + ```terraform data "aws_ssm_parameter" "foo" { name = "foo" } ``` +### With version + +```terraform +data "aws_ssm_parameter" "foo" { + name = "foo:3" +} +``` + ~> **Note:** The unencrypted value of a SecureString will be stored in the raw state as plain-text. [Read more about sensitive data in state](https://www.terraform.io/docs/state/sensitive-data.html). @@ -28,7 +38,7 @@ data "aws_ssm_parameter" "foo" { This data source supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `name` - (Required) Name of the parameter. +* `name` - (Required) Name of the parameter. To query by parameter version use `name:version` (e.g., `foo:3`). * `with_decryption` - (Optional) Whether to return decrypted `SecureString` value. Defaults to `true`. ## Attribute Reference From 2c8eb04e68c4a9286f692c29b85e6773a2c9d895 Mon Sep 17 00:00:00 2001 From: auvred <61150013+auvred@users.noreply.github.com> Date: Mon, 8 Sep 2025 16:49:45 +0300 Subject: [PATCH 1502/2115] docs: fix `appsync_api` lambda authorizer example to use `arn` instead of `invoke_arn` in `authorizer_uri` (#44170) --- website/docs/r/appsync_api.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/appsync_api.html.markdown b/website/docs/r/appsync_api.html.markdown index bdbd1e030c92..4853ea17251f 100644 --- a/website/docs/r/appsync_api.html.markdown +++ b/website/docs/r/appsync_api.html.markdown @@ -84,7 +84,7 @@ resource "aws_appsync_api" "example" { auth_provider { auth_type = "AWS_LAMBDA" lambda_authorizer_config { - authorizer_uri = aws_lambda_function.example.invoke_arn + authorizer_uri = aws_lambda_function.example.arn authorizer_result_ttl_in_seconds = 300 } } From 615bf1313d373dad6311855d4091f3b2bee6fe48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 10:04:49 -0400 Subject: [PATCH 1503/2115] Bump golang.org/x/text from 0.28.0 to 0.29.0 (#44178) Bumps [golang.org/x/text](https://github.com/golang/text) from 0.28.0 to 0.29.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.29.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 9868d77f7711..2368326168b3 100644 --- a/go.mod +++ b/go.mod @@ -311,7 +311,7 @@ require ( github.com/pquerna/otp v1.5.0 github.com/shopspring/decimal v1.4.0 golang.org/x/crypto v0.41.0 - golang.org/x/text v0.28.0 + golang.org/x/text v0.29.0 golang.org/x/tools v0.36.0 gopkg.in/dnaeon/go-vcr.v4 v4.0.5 ) @@ -377,7 +377,7 @@ require ( golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect - golang.org/x/sync v0.16.0 // indirect + golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.35.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect diff --git a/go.sum b/go.sum index 042b3d2dcb21..4449b224657f 100644 --- a/go.sum +++ b/go.sum @@ -826,8 +826,8 @@ golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -852,8 +852,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From 81a6d6111177ba3322343c5fc600c1c223076f09 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 10:07:04 -0400 Subject: [PATCH 1504/2115] Tweak CHANGELOG entry. --- .changelog/44165.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44165.txt b/.changelog/44165.txt index 7003b455cdd9..fd188ff0a83e 100644 --- a/.changelog/44165.txt +++ b/.changelog/44165.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -resource/aws_ecs_account_setting_default: Add support for `dualStackIPv6` value in `Name` argument +resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ``` \ No newline at end of file From 1c04f28efdd66c5b52a5349164c2cef697d42230 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 8 Sep 2025 14:09:51 +0000 Subject: [PATCH 1505/2115] Update CHANGELOG.md for #44178 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efe65b02c76..1813c6bb452f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) From e2223ebe6e1009e1043c90f9aa4ec658b78252bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 10:10:51 -0400 Subject: [PATCH 1506/2115] Use 'tfslices.AppendUnique'. --- internal/service/ecs/account_setting_default.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/service/ecs/account_setting_default.go b/internal/service/ecs/account_setting_default.go index 6893a7eb5b76..1e852bd4a7cc 100644 --- a/internal/service/ecs/account_setting_default.go +++ b/internal/service/ecs/account_setting_default.go @@ -17,6 +17,7 @@ import ( "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" + tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -38,7 +39,7 @@ func resourceAccountSettingDefault() *schema.Resource { Type: schema.TypeString, ForceNew: true, Required: true, - ValidateFunc: validation.StringInSlice(append(enum.Values[awstypes.SettingName](), "dualStackIPv6"), false), + ValidateFunc: validation.StringInSlice(settingName_Values(), false), }, "principal_arn": { Type: schema.TypeString, @@ -178,3 +179,7 @@ func findEffectiveAccountSettingByName(ctx context.Context, conn *ecs.Client, na return findSetting(ctx, conn, input) } + +func settingName_Values() []string { + return tfslices.AppendUnique(enum.Values[awstypes.SettingName](), "dualStackIPv6") +} From e67e508891a2811b605b387211b9f5a7b7393ec3 Mon Sep 17 00:00:00 2001 From: auvred <61150013+auvred@users.noreply.github.com> Date: Mon, 8 Sep 2025 17:18:01 +0300 Subject: [PATCH 1507/2115] docs: add missing `AWS_IAM` to `auth_provider` in `appsync_api` (#44166) --- website/docs/r/appsync_api.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/appsync_api.html.markdown b/website/docs/r/appsync_api.html.markdown index 4853ea17251f..0aa0ab26dca7 100644 --- a/website/docs/r/appsync_api.html.markdown +++ b/website/docs/r/appsync_api.html.markdown @@ -131,7 +131,7 @@ The `event_config` block supports the following: The `auth_provider` block supports the following: -* `auth_type` - (Required) Type of authentication provider. Valid values: `AMAZON_COGNITO_USER_POOLS`, `AWS_LAMBDA`, `OPENID_CONNECT`, `API_KEY`. +* `auth_type` - (Required) Type of authentication provider. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. * `cognito_config` - (Optional) Configuration for Cognito user pool authentication. Required when `auth_type` is `AMAZON_COGNITO_USER_POOLS`. See [Cognito Config](#cognito-config) below. * `lambda_authorizer_config` - (Optional) Configuration for Lambda authorization. Required when `auth_type` is `AWS_LAMBDA`. See [Lambda Authorizer Config](#lambda-authorizer-config) below. * `openid_connect_config` - (Optional) Configuration for OpenID Connect. Required when `auth_type` is `OPENID_CONNECT`. See [OpenID Connect Config](#openid-connect-config) below. From a7f4339a6ea0b0ee0d99007f9efb2465179fce38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 10:18:40 -0400 Subject: [PATCH 1508/2115] Run 'make clean-tidy'. --- skaff/go.mod | 4 ++-- skaff/go.sum | 8 ++++---- tools/tfsdk2fw/go.mod | 10 +++++----- tools/tfsdk2fw/go.sum | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/skaff/go.mod b/skaff/go.mod index 177af3cf65ef..0beb5dd97e42 100644 --- a/skaff/go.mod +++ b/skaff/go.mod @@ -20,8 +20,8 @@ require ( github.com/spf13/pflag v1.0.9 // indirect github.com/zclconf/go-cty v1.16.3 // indirect golang.org/x/mod v0.27.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/text v0.29.0 // indirect golang.org/x/tools v0.36.0 // indirect ) diff --git a/skaff/go.sum b/skaff/go.sum index 1ded58cb7896..5bee91b63b87 100644 --- a/skaff/go.sum +++ b/skaff/go.sum @@ -32,10 +32,10 @@ github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 857cb8fa4d41..4c19141ccbf2 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 // indirect github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 // indirect @@ -210,7 +210,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 // indirect github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 // indirect github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 // indirect github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 // indirect github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 // indirect @@ -243,7 +243,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 // indirect github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 // indirect github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 // indirect github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 // indirect github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 // indirect @@ -366,9 +366,9 @@ require ( golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect - golang.org/x/sync v0.16.0 // indirect + golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.35.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/text v0.29.0 // indirect golang.org/x/tools v0.36.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 0bddcb89ebc8..c4249157386d 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4 h1:X6XL3qIpS7u/rVfuqt18ra9ySaiZKp3nA4pqgIODScw= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.4/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= @@ -407,8 +407,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1 h1:fqq56R6CEKiBOGKV9AmCG1vEiS3UDvkawNLu8yJRPPg= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.1/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1 h1:8wwJGiYXEG5hSGbtQnwcsdGnspIkS9TNwRf6vf1JVxM= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.213.1/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= @@ -821,8 +821,8 @@ golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -847,8 +847,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From efb682254d3404f26d44a015d4b0b6bcdd9ac7a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 10:45:17 -0400 Subject: [PATCH 1509/2115] r/aws_s3_bucket_lifecycle_configuration: Ignore `MethodNotAllowed` errors when deleting non-existent lifecycle configurations. --- .changelog/#####.txt | 3 +++ internal/service/s3/bucket_lifecycle_configuration.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..ae56dd78da49 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_s3_bucket_lifecycle_configuration: Ignore `MethodNotAllowed` errors when deleting non-existent lifecycle configurations +``` \ No newline at end of file diff --git a/internal/service/s3/bucket_lifecycle_configuration.go b/internal/service/s3/bucket_lifecycle_configuration.go index 3bb4bdc8a09d..74f0fa37857b 100644 --- a/internal/service/s3/bucket_lifecycle_configuration.go +++ b/internal/service/s3/bucket_lifecycle_configuration.go @@ -588,7 +588,7 @@ func (r *bucketLifecycleConfigurationResource) Delete(ctx context.Context, reque } _, err := conn.DeleteBucketLifecycle(ctx, &input) - if tfawserr.ErrCodeEquals(err, errCodeNoSuchBucket, errCodeNoSuchLifecycleConfiguration) { + if tfawserr.ErrCodeEquals(err, errCodeNoSuchBucket, errCodeNoSuchLifecycleConfiguration, errCodeMethodNotAllowed) { return } if err != nil { From f5bb16e67e66be76e2ec5bd2c9c1c1755bd2be03 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 10:47:39 -0400 Subject: [PATCH 1510/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44189.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44189.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44189.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44189.txt From 4ab0997bd106c878ea2f04b8902715ac547c93ec Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 8 Sep 2025 15:13:06 +0000 Subject: [PATCH 1511/2115] Update CHANGELOG.md for #44177 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1813c6bb452f..d97a95fa9343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ENHANCEMENTS: * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) +* resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) From 0f6023be20c16a244e0614ae4c36be64efb1f780 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 11:26:41 -0400 Subject: [PATCH 1512/2115] Add 'TestAccVPCFlowLog_upgradeFromV5' acceptance tests. --- internal/service/ec2/vpc_flow_log_test.go | 116 ++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/internal/service/ec2/vpc_flow_log_test.go b/internal/service/ec2/vpc_flow_log_test.go index a963c8b7fbe0..a00fc3f3be21 100644 --- a/internal/service/ec2/vpc_flow_log_test.go +++ b/internal/service/ec2/vpc_flow_log_test.go @@ -12,8 +12,13 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -564,6 +569,117 @@ func TestAccVPCFlowLog_disappears(t *testing.T) { }) } +func TestAccVPCFlowLog_upgradeFromV5(t *testing.T) { + ctx := acctest.Context(t) + var flowLog awstypes.FlowLog + resourceName := "aws_flow_log.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckFlowLogDestroy(ctx), + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "5.100.0", + }, + }, + Config: testAccVPCFlowLogConfig_destinationTypeCloudWatchLogs(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckFlowLogExists(ctx, resourceName, &flowLog), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrLogGroupName), knownvalue.NotNull()), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccVPCFlowLogConfig_destinationTypeCloudWatchLogs(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckFlowLogExists(ctx, resourceName, &flowLog), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrLogGroupName)), + }, + }, + }, + }) +} + +func TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse(t *testing.T) { + ctx := acctest.Context(t) + var flowLog awstypes.FlowLog + resourceName := "aws_flow_log.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckFlowLogDestroy(ctx), + AdditionalCLIOptions: &resource.AdditionalCLIOptions{ + Plan: resource.PlanOptions{ + NoRefresh: true, + }, + }, + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "5.100.0", + }, + }, + Config: testAccVPCFlowLogConfig_destinationTypeCloudWatchLogs(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckFlowLogExists(ctx, resourceName, &flowLog), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrLogGroupName), knownvalue.NotNull()), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccVPCFlowLogConfig_destinationTypeCloudWatchLogs(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckFlowLogExists(ctx, resourceName, &flowLog), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrLogGroupName)), + }, + }, + }, + }) +} + func testAccCheckFlowLogExists(ctx context.Context, n string, v *awstypes.FlowLog) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] From 28596b801d24dbe69dca53ccddaf6548ef271a63 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 11:26:53 -0400 Subject: [PATCH 1513/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse' PKG=ec2 make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run=TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse -timeout 360m -vet=off 2025/09/08 11:25:20 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/08 11:25:20 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse === PAUSE TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse === CONT TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse vpc_flow_log_test.go:631: Step 2/2 error: Pre-apply plan check(s) failed: 'aws_flow_log.test' - expected NoOp, got action(s): [update] panic.go:636: Error retrieving state, there may be dangling resources: exit status 1 Failed to marshal state to json: unsupported attribute "log_group_name" --- FAIL: TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse (56.71s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/ec2 62.380s FAIL make: *** [testacc] Error 1 From 8d3c964473fdca63b988f27423b5d9638be032d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 11:43:19 -0400 Subject: [PATCH 1514/2115] ec2: Add 'flowLogStateUpgradeV0'. --- internal/service/ec2/exports_test.go | 1 + internal/service/ec2/vpc_flow_log.go | 9 ++ internal/service/ec2/vpc_flow_log_migrate.go | 128 ++++++++++++++++++ .../service/ec2/vpc_flow_log_migrate_test.go | 61 +++++++++ internal/service/ec2/vpc_flow_log_test.go | 4 +- 5 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 internal/service/ec2/vpc_flow_log_migrate.go create mode 100644 internal/service/ec2/vpc_flow_log_migrate_test.go diff --git a/internal/service/ec2/exports_test.go b/internal/service/ec2/exports_test.go index ac954352005d..0dfa615273b7 100644 --- a/internal/service/ec2/exports_test.go +++ b/internal/service/ec2/exports_test.go @@ -264,6 +264,7 @@ var ( FindVolumeAttachmentInstanceByID = findVolumeAttachmentInstanceByID FlattenNetworkInterfacePrivateIPAddresses = flattenNetworkInterfacePrivateIPAddresses FlattenSecurityGroups = flattenSecurityGroups + FlowLogStateUpgradeV0 = flowLogStateUpgradeV0 IPAMServicePrincipal = ipamServicePrincipal InstanceMigrateState = instanceMigrateState InstanceStateUpgradeV1 = instanceStateUpgradeV1 diff --git a/internal/service/ec2/vpc_flow_log.go b/internal/service/ec2/vpc_flow_log.go index 734b2b576afd..384a2a05e378 100644 --- a/internal/service/ec2/vpc_flow_log.go +++ b/internal/service/ec2/vpc_flow_log.go @@ -152,6 +152,15 @@ func resourceFlowLog() *schema.Resource { ExactlyOneOf: []string{"eni_id", names.AttrSubnetID, names.AttrVPCID, names.AttrTransitGatewayID, names.AttrTransitGatewayAttachmentID}, }, }, + + SchemaVersion: 1, + StateUpgraders: []schema.StateUpgrader{ + { + Type: flowLogSchemaV0().CoreConfigSchema().ImpliedType(), + Upgrade: flowLogStateUpgradeV0, + Version: 0, + }, + }, } } diff --git a/internal/service/ec2/vpc_flow_log_migrate.go b/internal/service/ec2/vpc_flow_log_migrate.go new file mode 100644 index 000000000000..73737b2ed6ed --- /dev/null +++ b/internal/service/ec2/vpc_flow_log_migrate.go @@ -0,0 +1,128 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package ec2 + +import ( + "context" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func flowLogSchemaV0() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + "deliver_cross_account_role": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "destination_options": { + Type: schema.TypeList, + Optional: true, + ForceNew: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "file_format": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "hive_compatible_partitions": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + "per_hour_partition": { + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + }, + }, + }, + }, + "eni_id": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + names.AttrIAMRoleARN: { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "log_destination": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "log_destination_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "log_format": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Computed: true, + }, + names.AttrLogGroupName: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "max_aggregation_interval": { + Type: schema.TypeInt, + Optional: true, + ForceNew: true, + }, + names.AttrSubnetID: { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + names.AttrTags: tftags.TagsSchema(), + names.AttrTagsAll: tftags.TagsSchemaComputed(), + "traffic_type": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + names.AttrTransitGatewayAttachmentID: { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + names.AttrTransitGatewayID: { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + names.AttrVPCID: { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + }, + } +} + +func flowLogStateUpgradeV0(_ context.Context, rawState map[string]any, meta any) (map[string]any, error) { + if rawState == nil { + rawState = map[string]any{} + } + + delete(rawState, names.AttrLogGroupName) + + return rawState, nil +} diff --git a/internal/service/ec2/vpc_flow_log_migrate_test.go b/internal/service/ec2/vpc_flow_log_migrate_test.go new file mode 100644 index 000000000000..8574a646ad50 --- /dev/null +++ b/internal/service/ec2/vpc_flow_log_migrate_test.go @@ -0,0 +1,61 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package ec2_test + +import ( + "testing" + + "github.com/google/go-cmp/cmp" + tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestFlowLogStateUpgradeV0(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + rawState map[string]any + expected map[string]any + }{ + { + name: "empty rawState", + rawState: nil, + expected: map[string]any{}, + }, + { + name: "no log_group_name", + rawState: map[string]any{ + names.AttrSubnetID: "sn-12345678", + }, + expected: map[string]any{ + names.AttrSubnetID: "sn-12345678", + }, + }, + { + name: "with log_group_name", + rawState: map[string]any{ + names.AttrLogGroupName: "log-group-name", + names.AttrSubnetID: "sn-12345678", + }, + expected: map[string]any{ + names.AttrSubnetID: "sn-12345678", + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result, err := tfec2.FlowLogStateUpgradeV0(t.Context(), tt.rawState, nil) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if diff := cmp.Diff(tt.expected, result); diff != "" { + t.Errorf("unexpected result (-want +got):\n%s", diff) + } + }) + } +} diff --git a/internal/service/ec2/vpc_flow_log_test.go b/internal/service/ec2/vpc_flow_log_test.go index a00fc3f3be21..0a1ec87b79c4 100644 --- a/internal/service/ec2/vpc_flow_log_test.go +++ b/internal/service/ec2/vpc_flow_log_test.go @@ -656,6 +656,7 @@ func TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrLogGroupName), knownvalue.NotNull()), + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrRegion)), }, }, { @@ -666,7 +667,7 @@ func TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse(t *testing.T) { ), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), }, PostApplyPostRefresh: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), @@ -674,6 +675,7 @@ func TestAccVPCFlowLog_upgradeFromV5PlanRefreshFalse(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrLogGroupName)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), }, }, }, From 335db704925897904ae77f2bc22bb7efc0db6c52 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 11:52:02 -0400 Subject: [PATCH 1515/2115] Add CHANGELOG entry. --- .changelog/#####.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..3485a1bed082 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_flow_log: Fix `Error decoding ... from prior state: unsupported attribute "log_group_name"` errors when upgrading from a pre-v6.0.0 provider version +``` \ No newline at end of file From 250f8a86e7a1476b4c0c1e28caf126162f35f9e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 11:54:58 -0400 Subject: [PATCH 1516/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44191.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44191.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44191.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44191.txt From fcf125874929b50ed2954f1326dae8540880c9a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 13:41:58 -0400 Subject: [PATCH 1517/2115] Add 'TestAccEC2LaunchTemplate_upgradeFromV5' acceptance tests. --- .../service/ec2/ec2_launch_template_test.go | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index ea63f09b706b..d1335f58fcb3 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -13,8 +13,13 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" "github.com/hashicorp/terraform-provider-aws/internal/conns" tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -3363,6 +3368,119 @@ func TestAccEC2LaunchTemplate_updateDefaultVersion(t *testing.T) { }) } +func TestAccEC2LaunchTemplate_upgradeFromV5(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "5.100.0", + }, + }, + Config: testAccLaunchTemplateConfig_name(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_gpu_specifications"), knownvalue.ListSizeExact(0)), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccLaunchTemplateConfig_name(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_gpu_specifications")), + }, + }, + }, + }) +} + +func TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse(t *testing.T) { + ctx := acctest.Context(t) + var template awstypes.LaunchTemplate + resourceName := "aws_launch_template.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckLaunchTemplateDestroy(ctx), + AdditionalCLIOptions: &resource.AdditionalCLIOptions{ + Plan: resource.PlanOptions{ + NoRefresh: true, + }, + }, + Steps: []resource.TestStep{ + { + ExternalProviders: map[string]resource.ExternalProvider{ + "aws": { + Source: "hashicorp/aws", + VersionConstraint: "5.100.0", + }, + }, + Config: testAccLaunchTemplateConfig_name(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_gpu_specifications"), knownvalue.ListSizeExact(0)), + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrRegion)), + }, + }, + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Config: testAccLaunchTemplateConfig_name(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckLaunchTemplateExists(ctx, resourceName, &template), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_gpu_specifications")), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }) +} + func testAccCheckLaunchTemplateExists(ctx context.Context, n string, v *awstypes.LaunchTemplate) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] From 1fc6caee3298cebd6f00399e50234f97b3e31803 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 13:42:07 -0400 Subject: [PATCH 1518/2115] Acceptance test output: % make testacc TESTARGS='-run=TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse' PKG=ec2 make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run=TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse -timeout 360m -vet=off 2025/09/08 13:40:00 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/08 13:40:00 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse === PAUSE TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse === CONT TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse ec2_launch_template_test.go:3430: Step 2/2 error: Pre-apply plan check(s) failed: 'aws_launch_template.test' - expected NoOp, got action(s): [update] panic.go:636: Error retrieving state, there may be dangling resources: exit status 1 Failed to marshal state to json: unsupported attribute "elastic_gpu_specifications" --- FAIL: TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse (44.53s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/ec2 50.423s FAIL make: *** [testacc] Error 1 From c96ac19e64db3b66dc2760ca1d34d4ad62da3cdf Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 13:33:51 -0400 Subject: [PATCH 1519/2115] r/aws_vpc_endpoint: add resource identity === RUN TestAccVPCVPCEndpoint_Identity_Basic --- PASS: TestAccVPCVPCEndpoint_Identity_Basic (40.87s) === RUN TestAccVPCVPCEndpoint_Identity_RegionOverride --- PASS: TestAccVPCVPCEndpoint_Identity_RegionOverride (37.51s) === RUN TestAccVPCVPCEndpoint_Identity_ExistingResource --- PASS: TestAccVPCVPCEndpoint_Identity_ExistingResource (60.65s) === RUN TestAccVPCEndpoint_gatewayBasic --- PASS: TestAccVPCEndpoint_gatewayBasic (38.98s) === RUN TestAccVPCEndpoint_interfaceBasic --- PASS: TestAccVPCEndpoint_interfaceBasic (109.26s) === RUN TestAccVPCEndpoint_interfaceNoPrivateDNS --- PASS: TestAccVPCEndpoint_interfaceNoPrivateDNS (58.48s) === RUN TestAccVPCEndpoint_interfacePrivateDNS --- PASS: TestAccVPCEndpoint_interfacePrivateDNS (513.59s) === RUN TestAccVPCEndpoint_interfacePrivateDNS_updateWithDefaults --- PASS: TestAccVPCEndpoint_interfacePrivateDNS_updateWithDefaults (541.43s) === RUN TestAccVPCEndpoint_interfacePrivateDNSNoGateway --- PASS: TestAccVPCEndpoint_interfacePrivateDNSNoGateway (494.42s) === RUN TestAccVPCEndpoint_disappears --- PASS: TestAccVPCEndpoint_disappears (35.31s) === RUN TestAccVPCEndpoint_tags --- PASS: TestAccVPCEndpoint_tags (55.04s) === RUN TestAccVPCEndpoint_gatewayWithRouteTableAndPolicy --- PASS: TestAccVPCEndpoint_gatewayWithRouteTableAndPolicy (80.02s) === RUN TestAccVPCEndpoint_gatewayPolicy --- PASS: TestAccVPCEndpoint_gatewayPolicy (116.12s) === RUN TestAccVPCEndpoint_ignoreEquivalent --- PASS: TestAccVPCEndpoint_ignoreEquivalent (47.05s) === RUN TestAccVPCEndpoint_ipAddressType --- PASS: TestAccVPCEndpoint_ipAddressType (325.38s) === RUN TestAccVPCEndpoint_interfaceWithSubnetAndSecurityGroup --- PASS: TestAccVPCEndpoint_interfaceWithSubnetAndSecurityGroup (280.11s) === RUN TestAccVPCEndpoint_interfaceNonAWSServiceAcceptOnCreate --- PASS: TestAccVPCEndpoint_interfaceNonAWSServiceAcceptOnCreate (298.92s) === RUN TestAccVPCEndpoint_interfaceNonAWSServiceAcceptOnUpdate --- PASS: TestAccVPCEndpoint_interfaceNonAWSServiceAcceptOnUpdate (300.36s) === RUN TestAccVPCEndpoint_interfaceUserDefinedIPv4 --- PASS: TestAccVPCEndpoint_interfaceUserDefinedIPv4 (253.46s) === RUN TestAccVPCEndpoint_interfaceUserDefinedIPv6 --- PASS: TestAccVPCEndpoint_interfaceUserDefinedIPv6 (266.28s) === RUN TestAccVPCEndpoint_interfaceUserDefinedDualstack --- PASS: TestAccVPCEndpoint_interfaceUserDefinedDualstack (221.20s) === RUN TestAccVPCEndpoint_VPCEndpointType_gatewayLoadBalancer --- PASS: TestAccVPCEndpoint_VPCEndpointType_gatewayLoadBalancer (388.43s) === RUN TestAccVPCEndpoint_crossRegionService --- PASS: TestAccVPCEndpoint_crossRegionService (649.52s) === RUN TestAccVPCEndpoint_invalidCrossRegionService --- PASS: TestAccVPCEndpoint_invalidCrossRegionService (351.49s) === RUN TestAccVPCEndpoint_resourceConfiguration --- PASS: TestAccVPCEndpoint_resourceConfiguration (114.28s) === RUN TestAccVPCEndpoint_serviceNetwork --- PASS: TestAccVPCEndpoint_serviceNetwork (104.51s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 656.301s --- internal/service/ec2/service_package_gen.go | 6 +- .../testdata/VPCEndpoint/basic/main_gen.tf | 24 ++ .../VPCEndpoint/basic_v6.12.0/main_gen.tf | 34 +++ .../VPCEndpoint/region_override/main_gen.tf | 36 +++ .../ec2/testdata/tmpl/vpc_endpoint_tags.gtpl | 19 ++ internal/service/ec2/vpc_endpoint.go | 7 +- .../ec2/vpc_endpoint_identity_gen_test.go | 251 ++++++++++++++++++ 7 files changed, 372 insertions(+), 5 deletions(-) create mode 100644 internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf create mode 100644 internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl create mode 100644 internal/service/ec2/vpc_endpoint_identity_gen_test.go diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index 71fbe4a4b291..2af5fde3e847 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -1584,7 +1584,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*inttypes.ServicePa Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.SDKv2Import{ + WrappedImport: true, + }, }, { Factory: resourceVPCEndpointConnectionAccepter, diff --git a/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf new file mode 100644 index 000000000000..0cfcbe01b616 --- /dev/null +++ b/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf @@ -0,0 +1,24 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = var.rName + } +} + +data "aws_region" "current" { +} + +resource "aws_vpc_endpoint" "test" { + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf new file mode 100644 index 000000000000..fb1f404ddca9 --- /dev/null +++ b/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf @@ -0,0 +1,34 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" + + tags = { + Name = var.rName + } +} + +data "aws_region" "current" { +} + +resource "aws_vpc_endpoint" "test" { + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.12.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf new file mode 100644 index 000000000000..7c4d16786274 --- /dev/null +++ b/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.0.0.0/16" + + tags = { + Name = var.rName + } +} + +data "aws_region" "current" { + region = var.region + +} + +resource "aws_vpc_endpoint" "test" { + region = var.region + + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl b/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl new file mode 100644 index 000000000000..782746d5ad78 --- /dev/null +++ b/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl @@ -0,0 +1,19 @@ +resource "aws_vpc" "test" { +{{- template "region" }} + cidr_block = "10.0.0.0/16" + + tags = { + Name = var.rName + } +} + +data "aws_region" "current" { +{{- template "region" }} +} + +resource "aws_vpc_endpoint" "test" { +{{- template "region" }} + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +{{- template "tags" }} +} diff --git a/internal/service/ec2/vpc_endpoint.go b/internal/service/ec2/vpc_endpoint.go index cf35bf9fe2d9..e960ad203670 100644 --- a/internal/service/ec2/vpc_endpoint.go +++ b/internal/service/ec2/vpc_endpoint.go @@ -40,6 +40,9 @@ const ( // @SDKResource("aws_vpc_endpoint", name="VPC Endpoint") // @Tags(identifierAttribute="id") // @Testing(tagsTest=false) +// @IdentityAttribute("id") +// @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;types.VpcEndpoint") +// @Testing(preIdentityVersion="v6.12.0") func resourceVPCEndpoint() *schema.Resource { return &schema.Resource{ CreateWithoutTimeout: resourceVPCEndpointCreate, @@ -47,10 +50,6 @@ func resourceVPCEndpoint() *schema.Resource { UpdateWithoutTimeout: resourceVPCEndpointUpdate, DeleteWithoutTimeout: resourceVPCEndpointDelete, - Importer: &schema.ResourceImporter{ - StateContext: schema.ImportStatePassthroughContext, - }, - Schema: map[string]*schema.Schema{ names.AttrARN: { Type: schema.TypeString, diff --git a/internal/service/ec2/vpc_endpoint_identity_gen_test.go b/internal/service/ec2/vpc_endpoint_identity_gen_test.go new file mode 100644 index 000000000000..97b778a70df7 --- /dev/null +++ b/internal/service/ec2/vpc_endpoint_identity_gen_test.go @@ -0,0 +1,251 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCVPCEndpoint_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v types.VpcEndpoint + resourceName := "aws_vpc_endpoint.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckVPCEndpointDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckVPCEndpointExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccVPCVPCEndpoint_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_vpc_endpoint.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.12.0 +func TestAccVPCVPCEndpoint_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v types.VpcEndpoint + resourceName := "aws_vpc_endpoint.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckVPCEndpointDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic_v6.12.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckVPCEndpointExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/VPCEndpoint/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} From e6e34a6a22b8e4e2d3e1deea509b249fb2ec2344 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 14:03:46 -0400 Subject: [PATCH 1520/2115] Add changelog entry --- .changelog/44194.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44194.txt diff --git a/.changelog/44194.txt b/.changelog/44194.txt new file mode 100644 index 000000000000..98241109a620 --- /dev/null +++ b/.changelog/44194.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_vpc_endpoint: Add resource identity support +``` From 52a2b6f89ed9796c92d977ce5871c99231031202 Mon Sep 17 00:00:00 2001 From: Sasi Date: Mon, 8 Sep 2025 14:21:42 -0400 Subject: [PATCH 1521/2115] fixed import test case --- internal/service/controltower/baseline_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 944338d14f32..95eaad810d54 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -50,13 +50,16 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { testAccCheckBaselineExists(ctx, resourceName, &baseline), resource.TestCheckResourceAttr(resourceName, "baseline_version", "4.0"), resource.TestCheckResourceAttrSet(resourceName, "baseline_identifier"), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "controltower", regexache.MustCompile(`enabledbaseline:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "controltower", regexache.MustCompile(`enabledbaseline/+.`)), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrID}, }, }, }) @@ -166,6 +169,7 @@ func testAccBaselineConfig_basic(rName string) string { return fmt.Sprintf(` data "aws_partition" "current" {} data "aws_region" "current" {} +data "aws_caller_identity" "current" {} data "aws_organizations_organization" "current" {} @@ -180,7 +184,7 @@ resource "aws_controltower_baseline" "test" { target_identifier = aws_organizations_organizational_unit.test.arn parameters { key = "IdentityCenterEnabledBaselineArn" - value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:664418989480:enabledbaseline/XALULM96QHI525UOC" + value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:{data.aws_caller_identity.current.account_id}:enabledbaseline/XALULM96QHI525UOC" } } `, rName) From be29d7bd1566aa8c793a60c8543f1fd53cd05545 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 14:37:30 -0400 Subject: [PATCH 1522/2115] r/aws_vpc_endpoint: re-generate identity tests --- .../ec2/testdata/VPCEndpoint/basic/main_gen.tf | 10 +++++----- .../testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf | 10 +++++----- .../VPCEndpoint/region_override/main_gen.tf | 14 +++++++------- .../ec2/testdata/tmpl/vpc_endpoint_tags.gtpl | 14 +++++++------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf index 0cfcbe01b616..3aaad7927da6 100644 --- a/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf +++ b/internal/service/ec2/testdata/VPCEndpoint/basic/main_gen.tf @@ -1,6 +1,11 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 +resource "aws_vpc_endpoint" "test" { + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -12,11 +17,6 @@ resource "aws_vpc" "test" { data "aws_region" "current" { } -resource "aws_vpc_endpoint" "test" { - vpc_id = aws_vpc.test.id - service_name = "com.amazonaws.${data.aws_region.current.region}.s3" -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf index fb1f404ddca9..e3f815e16db6 100644 --- a/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf +++ b/internal/service/ec2/testdata/VPCEndpoint/basic_v6.12.0/main_gen.tf @@ -1,6 +1,11 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 +resource "aws_vpc_endpoint" "test" { + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + resource "aws_vpc" "test" { cidr_block = "10.0.0.0/16" @@ -12,11 +17,6 @@ resource "aws_vpc" "test" { data "aws_region" "current" { } -resource "aws_vpc_endpoint" "test" { - vpc_id = aws_vpc.test.id - service_name = "com.amazonaws.${data.aws_region.current.region}.s3" -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf b/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf index 7c4d16786274..4bbb3ee181c2 100644 --- a/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf +++ b/internal/service/ec2/testdata/VPCEndpoint/region_override/main_gen.tf @@ -1,6 +1,13 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 +resource "aws_vpc_endpoint" "test" { + region = var.region + + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +} + resource "aws_vpc" "test" { region = var.region @@ -16,13 +23,6 @@ data "aws_region" "current" { } -resource "aws_vpc_endpoint" "test" { - region = var.region - - vpc_id = aws_vpc.test.id - service_name = "com.amazonaws.${data.aws_region.current.region}.s3" -} - variable "rName" { description = "Name for resource" type = string diff --git a/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl b/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl index 782746d5ad78..27856e2e2500 100644 --- a/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl +++ b/internal/service/ec2/testdata/tmpl/vpc_endpoint_tags.gtpl @@ -1,3 +1,10 @@ +resource "aws_vpc_endpoint" "test" { +{{- template "region" }} + vpc_id = aws_vpc.test.id + service_name = "com.amazonaws.${data.aws_region.current.region}.s3" +{{- template "tags" }} +} + resource "aws_vpc" "test" { {{- template "region" }} cidr_block = "10.0.0.0/16" @@ -10,10 +17,3 @@ resource "aws_vpc" "test" { data "aws_region" "current" { {{- template "region" }} } - -resource "aws_vpc_endpoint" "test" { -{{- template "region" }} - vpc_id = aws_vpc.test.id - service_name = "com.amazonaws.${data.aws_region.current.region}.s3" -{{- template "tags" }} -} From c288a2b3a7f5d9f1170a652856252bfd0a9df317 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 14:42:42 -0400 Subject: [PATCH 1523/2115] r/aws_vpc_endpoint(doc): add import by identity instructions --- website/docs/r/vpc_endpoint.html.markdown | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/vpc_endpoint.html.markdown b/website/docs/r/vpc_endpoint.html.markdown index e1170df389fa..53fe06e63b49 100644 --- a/website/docs/r/vpc_endpoint.html.markdown +++ b/website/docs/r/vpc_endpoint.html.markdown @@ -218,11 +218,37 @@ DNS blocks (for `dns_entry`) support the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_endpoint.example + identity = { + id = "vpce-3ecf2a57" + } +} + +resource "aws_vpc_endpoint" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the VPC endpoint. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import VPC Endpoints using the VPC endpoint `id`. For example: ```terraform import { - to = aws_vpc_endpoint.endpoint1 + to = aws_vpc_endpoint.example id = "vpce-3ecf2a57" } ``` @@ -230,5 +256,5 @@ import { Using `terraform import`, import VPC Endpoints using the VPC endpoint `id`. For example: ```console -% terraform import aws_vpc_endpoint.endpoint1 vpce-3ecf2a57 +% terraform import aws_vpc_endpoint.example vpce-3ecf2a57 ``` From f3b9a0dac99225e90164ad0f5584924c7af06617 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 14:44:10 -0400 Subject: [PATCH 1524/2115] ec2: Add 'launchTemplateStateUpgradeV0'. --- internal/service/ec2/ec2_launch_template.go | 9 + .../ec2/ec2_launch_template_migrate.go | 904 ++++++++++++++++++ .../ec2/ec2_launch_template_migrate_test.go | 85 ++ .../service/ec2/ec2_launch_template_test.go | 4 + internal/service/ec2/exports_test.go | 1 + 5 files changed, 1003 insertions(+) create mode 100644 internal/service/ec2/ec2_launch_template_migrate.go create mode 100644 internal/service/ec2/ec2_launch_template_migrate_test.go diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index 4755bfcc4b8a..78e7861c6bbc 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -998,6 +998,15 @@ func resourceLaunchTemplate() *schema.Resource { }, }, + SchemaVersion: 1, + StateUpgraders: []schema.StateUpgrader{ + { + Type: launchTemplateSchemaV0().CoreConfigSchema().ImpliedType(), + Upgrade: launchTemplateStateUpgradeV0, + Version: 0, + }, + }, + // Enable downstream updates for resources referencing schema attributes // to prevent non-empty plans after "terraform apply" CustomizeDiff: customdiff.Sequence( diff --git a/internal/service/ec2/ec2_launch_template_migrate.go b/internal/service/ec2/ec2_launch_template_migrate.go new file mode 100644 index 000000000000..be52a40511f6 --- /dev/null +++ b/internal/service/ec2/ec2_launch_template_migrate.go @@ -0,0 +1,904 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package ec2 + +import ( + "context" + "maps" + "strings" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types/nullable" + tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func launchTemplateSchemaV0() *schema.Resource { + return &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + "block_device_mappings": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrDeviceName: { + Type: schema.TypeString, + Optional: true, + }, + "ebs": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrDeleteOnTermination: { + Type: nullable.TypeNullableBool, + Optional: true, + }, + names.AttrEncrypted: { + Type: nullable.TypeNullableBool, + Optional: true, + }, + names.AttrIOPS: { + Type: schema.TypeInt, + Computed: true, + Optional: true, + }, + names.AttrKMSKeyID: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrSnapshotID: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrThroughput: { + Type: schema.TypeInt, + Computed: true, + Optional: true, + }, + "volume_initialization_rate": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + names.AttrVolumeSize: { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + names.AttrVolumeType: { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + }, + }, + "no_device": { + Type: schema.TypeString, + Optional: true, + }, + names.AttrVirtualName: { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "capacity_reservation_specification": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "capacity_reservation_preference": { + Type: schema.TypeString, + Optional: true, + }, + "capacity_reservation_target": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "capacity_reservation_id": { + Type: schema.TypeString, + Optional: true, + }, + "capacity_reservation_resource_group_arn": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + }, + }, + }, + "cpu_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "amd_sev_snp": { + Type: schema.TypeString, + Optional: true, + }, + "core_count": { + Type: schema.TypeInt, + Optional: true, + }, + "threads_per_core": { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "credit_specification": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "cpu_credits": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "default_version": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + names.AttrDescription: { + Type: schema.TypeString, + Optional: true, + }, + "disable_api_stop": { + Type: schema.TypeBool, + Optional: true, + }, + "disable_api_termination": { + Type: schema.TypeBool, + Optional: true, + }, + "ebs_optimized": { + Type: nullable.TypeNullableBool, + Optional: true, + }, + "elastic_gpu_specifications": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrType: { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "elastic_inference_accelerator": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrType: { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "enclave_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Optional: true, + }, + }, + }, + }, + "hibernation_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "configured": { + Type: schema.TypeBool, + Required: true, + }, + }, + }, + }, + "iam_instance_profile": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrARN: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrName: { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "image_id": { + Type: schema.TypeString, + Optional: true, + }, + "instance_initiated_shutdown_behavior": { + Type: schema.TypeString, + Optional: true, + }, + "instance_market_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "market_type": { + Type: schema.TypeString, + Optional: true, + }, + "spot_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "block_duration_minutes": { + Type: schema.TypeInt, + Optional: true, + }, + "instance_interruption_behavior": { + Type: schema.TypeString, + Optional: true, + }, + "max_price": { + Type: schema.TypeString, + Optional: true, + }, + "spot_instance_type": { + Type: schema.TypeString, + Optional: true, + }, + "valid_until": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + }, + }, + }, + }, + }, + "instance_requirements": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "accelerator_count": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "accelerator_manufacturers": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "accelerator_names": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "accelerator_total_memory_mib": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "accelerator_types": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "allowed_instance_types": { + Type: schema.TypeSet, + Optional: true, + MaxItems: 400, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "bare_metal": { + Type: schema.TypeString, + Optional: true, + }, + "baseline_ebs_bandwidth_mbps": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "burstable_performance": { + Type: schema.TypeString, + Optional: true, + }, + "cpu_manufacturers": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "excluded_instance_types": { + Type: schema.TypeSet, + Optional: true, + MaxItems: 400, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "instance_generations": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "local_storage": { + Type: schema.TypeString, + Optional: true, + }, + "local_storage_types": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "max_spot_price_as_percentage_of_optimal_on_demand_price": { + Type: schema.TypeInt, + Optional: true, + }, + "memory_gib_per_vcpu": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeFloat, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeFloat, + Optional: true, + }, + }, + }, + }, + "memory_mib": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + "network_bandwidth_gbps": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeFloat, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeFloat, + Optional: true, + }, + }, + }, + }, + "network_interface_count": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + "on_demand_max_price_percentage_over_lowest_price": { + Type: schema.TypeInt, + Optional: true, + }, + "require_hibernate_support": { + Type: schema.TypeBool, + Optional: true, + }, + "spot_max_price_percentage_over_lowest_price": { + Type: schema.TypeInt, + Optional: true, + }, + "total_local_storage_gb": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeFloat, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeFloat, + Optional: true, + }, + }, + }, + }, + "vcpu_count": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrMax: { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrMin: { + Type: schema.TypeInt, + Required: true, + }, + }, + }, + }, + }, + }, + }, + names.AttrInstanceType: { + Type: schema.TypeString, + Optional: true, + }, + "kernel_id": { + Type: schema.TypeString, + Optional: true, + }, + "key_name": { + Type: schema.TypeString, + Optional: true, + }, + "latest_version": { + Type: schema.TypeInt, + Computed: true, + }, + "license_specification": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "license_configuration_arn": { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + "maintenance_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "auto_recovery": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "metadata_options": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "http_endpoint": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "http_protocol_ipv6": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "http_put_response_hop_limit": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, + "http_tokens": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "instance_metadata_tags": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + }, + }, + "monitoring": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrEnabled: { + Type: schema.TypeBool, + Optional: true, + }, + }, + }, + }, + names.AttrName: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + names.AttrNamePrefix: { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "network_interfaces": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "associate_carrier_ip_address": { + Type: nullable.TypeNullableBool, + Optional: true, + }, + "associate_public_ip_address": { + Type: nullable.TypeNullableBool, + Optional: true, + }, + "connection_tracking_specification": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "tcp_established_timeout": { + Type: schema.TypeInt, + Optional: true, + }, + "udp_stream_timeout": { + Type: schema.TypeInt, + Optional: true, + }, + "udp_timeout": { + Type: schema.TypeInt, + Optional: true, + }, + }, + }, + }, + names.AttrDeleteOnTermination: { + Type: nullable.TypeNullableBool, + Optional: true, + }, + names.AttrDescription: { + Type: schema.TypeString, + Optional: true, + }, + "device_index": { + Type: schema.TypeInt, + Optional: true, + }, + "ena_srd_specification": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ena_srd_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + "ena_srd_udp_specification": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ena_srd_udp_enabled": { + Type: schema.TypeBool, + Optional: true, + }, + }, + }, + }, + }, + }, + }, + "interface_type": { + Type: schema.TypeString, + Optional: true, + }, + "ipv4_address_count": { + Type: schema.TypeInt, + Optional: true, + }, + "ipv4_addresses": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "ipv4_prefix_count": { + Type: schema.TypeInt, + Optional: true, + }, + "ipv4_prefixes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "ipv6_address_count": { + Type: schema.TypeInt, + Optional: true, + }, + "ipv6_addresses": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "ipv6_prefix_count": { + Type: schema.TypeInt, + Optional: true, + }, + "ipv6_prefixes": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "network_card_index": { + Type: schema.TypeInt, + Optional: true, + }, + names.AttrNetworkInterfaceID: { + Type: schema.TypeString, + Optional: true, + }, + "primary_ipv6": { + Type: nullable.TypeNullableBool, + Optional: true, + }, + "private_ip_address": { + Type: schema.TypeString, + Optional: true, + }, + names.AttrSecurityGroups: { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + names.AttrSubnetID: { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "placement": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "affinity": { + Type: schema.TypeString, + Optional: true, + }, + names.AttrAvailabilityZone: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrGroupName: { + Type: schema.TypeString, + Optional: true, + }, + "host_id": { + Type: schema.TypeString, + Optional: true, + }, + "host_resource_group_arn": { + Type: schema.TypeString, + Optional: true, + }, + "partition_number": { + Type: schema.TypeInt, + Optional: true, + }, + "spread_domain": { + Type: schema.TypeString, + Optional: true, + }, + "tenancy": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "private_dns_name_options": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "enable_resource_name_dns_aaaa_record": { + Type: schema.TypeBool, + Optional: true, + }, + "enable_resource_name_dns_a_record": { + Type: schema.TypeBool, + Optional: true, + }, + "hostname_type": { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "ram_disk_id": { + Type: schema.TypeString, + Optional: true, + }, + "security_group_names": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "tag_specifications": { + Type: schema.TypeList, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrResourceType: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrTags: tftags.TagsSchema(), + }, + }, + }, + names.AttrTags: tftags.TagsSchema(), + names.AttrTagsAll: tftags.TagsSchemaComputed(), + "update_default_version": { + Type: schema.TypeBool, + Optional: true, + }, + "user_data": { + Type: schema.TypeString, + Optional: true, + }, + names.AttrVPCSecurityGroupIDs: { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + }, + } +} + +func launchTemplateStateUpgradeV0(_ context.Context, rawState map[string]any, meta any) (map[string]any, error) { + if rawState == nil { + rawState = map[string]any{} + } + + maps.DeleteFunc(rawState, func(key string, _ any) bool { + return strings.HasPrefix(key, "elastic_gpu_specifications.") || strings.HasPrefix(key, "elastic_inference_accelerator.") + }) + + return rawState, nil +} diff --git a/internal/service/ec2/ec2_launch_template_migrate_test.go b/internal/service/ec2/ec2_launch_template_migrate_test.go new file mode 100644 index 000000000000..3eee89e17cc1 --- /dev/null +++ b/internal/service/ec2/ec2_launch_template_migrate_test.go @@ -0,0 +1,85 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package ec2_test + +import ( + "testing" + + "github.com/google/go-cmp/cmp" + tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestLaunchTemplateStateUpgradeV0(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + rawState map[string]any + expected map[string]any + }{ + { + name: "empty rawState", + rawState: nil, + expected: map[string]any{}, + }, + { + name: "no elastic_gpu_specifications or elastic_inference_accelerator", + rawState: map[string]any{ + names.AttrName: "test", + }, + expected: map[string]any{ + names.AttrName: "test", + }, + }, + { + name: "with empty elastic_gpu_specifications", + rawState: map[string]any{ + names.AttrName: "test", + "elastic_gpu_specifications.#": "0", + }, + expected: map[string]any{ + names.AttrName: "test", + }, + }, + { + name: "with empty elastic_inference_accelerator", + rawState: map[string]any{ + names.AttrName: "test", + "elastic_inference_accelerator.#": "0", + }, + expected: map[string]any{ + names.AttrName: "test", + }, + }, + { + name: "with elastic_gpu_specifications and elastic_inference_accelerator", + rawState: map[string]any{ + names.AttrName: "test", + "elastic_gpu_specifications.#": "1", + "elastic_gpu_specifications.0.type": "test1", + "elastic_inference_accelerator.#": "2", + "elastic_inference_accelerator.0.type": "test2", + "elastic_inference_accelerator.1.type": "test3", + }, + expected: map[string]any{ + names.AttrName: "test", + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result, err := tfec2.LaunchTemplateStateUpgradeV0(t.Context(), tt.rawState, nil) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if diff := cmp.Diff(tt.expected, result); diff != "" { + t.Errorf("unexpected result (-want +got):\n%s", diff) + } + }) + } +} diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index d1335f58fcb3..d0ded5152012 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -3397,6 +3397,7 @@ func TestAccEC2LaunchTemplate_upgradeFromV5(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_gpu_specifications"), knownvalue.ListSizeExact(0)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_inference_accelerator"), knownvalue.ListSizeExact(0)), }, }, { @@ -3415,6 +3416,7 @@ func TestAccEC2LaunchTemplate_upgradeFromV5(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_gpu_specifications")), + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_inference_accelerator")), }, }, }, @@ -3455,6 +3457,7 @@ func TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_gpu_specifications"), knownvalue.ListSizeExact(0)), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("elastic_inference_accelerator"), knownvalue.ListSizeExact(0)), tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New(names.AttrRegion)), }, }, @@ -3474,6 +3477,7 @@ func TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse(t *testing.T) { }, ConfigStateChecks: []statecheck.StateCheck{ tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_gpu_specifications")), + tfstatecheck.ExpectNoValue(resourceName, tfjsonpath.New("elastic_inference_accelerator")), statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), }, }, diff --git a/internal/service/ec2/exports_test.go b/internal/service/ec2/exports_test.go index ac954352005d..0d9476794511 100644 --- a/internal/service/ec2/exports_test.go +++ b/internal/service/ec2/exports_test.go @@ -269,6 +269,7 @@ var ( InstanceStateUpgradeV1 = instanceStateUpgradeV1 InternetGatewayAttachmentParseResourceID = internetGatewayAttachmentParseResourceID KeyPairMigrateState = keyPairMigrateState + LaunchTemplateStateUpgradeV0 = launchTemplateStateUpgradeV0 ManagedPrefixListEntryCreateResourceID = managedPrefixListEntryCreateResourceID ManagedPrefixListEntryParseResourceID = managedPrefixListEntryParseResourceID MatchRules = matchRules From 1ca69cf60d67f681c9458184e50c584a699d7d77 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 14:45:42 -0400 Subject: [PATCH 1525/2115] Add CHANGELOG entry. --- .changelog/#####.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..3fdb6bdaab72 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,4 @@ + +```release-note:bug +resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version +``` \ No newline at end of file From 2b059482fafd075968623c39e457459025472392 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 14:49:31 -0400 Subject: [PATCH 1526/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44195.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44195.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44195.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44195.txt From 35522b74d3e0939fa94c6a523cb775ae490b1190 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 8 Sep 2025 18:57:00 +0000 Subject: [PATCH 1527/2115] Update CHANGELOG.md for #44131 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d97a95fa9343..8d3318f5fd70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,13 @@ ENHANCEMENTS: +* data-source/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` attributes ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) +* resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) From 8241046a93868cfc40a4beb6610203408ae55648 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 15:01:34 -0400 Subject: [PATCH 1528/2115] Enable 'errorlint.errorf' linter. --- .ci/.golangci2.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.ci/.golangci2.yml b/.ci/.golangci2.yml index f8ed86aa9a31..33bcb26d3c66 100644 --- a/.ci/.golangci2.yml +++ b/.ci/.golangci2.yml @@ -29,8 +29,6 @@ linters: - os.Remove - os.Setenv - os.Unsetenv - errorlint: - errorf: false issues: max-issues-per-linter: 10 max-same-issues: 3 From b69d45b81bb23dc5d52a0b073285c2f1189a00e0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 15:17:20 -0400 Subject: [PATCH 1529/2115] r/aws_acm_certificate(doc): add import by identity instructions --- website/docs/r/acm_certificate.html.markdown | 25 ++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/website/docs/r/acm_certificate.html.markdown b/website/docs/r/acm_certificate.html.markdown index 674c96860493..401ade570540 100644 --- a/website/docs/r/acm_certificate.html.markdown +++ b/website/docs/r/acm_certificate.html.markdown @@ -213,11 +213,32 @@ Renewal summary objects export the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acm_certificate.example + identity = { + "arn" = "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a" + } +} + +resource "aws_acm_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) ARN of the certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import certificates using their ARN. For example: ```terraform import { - to = aws_acm_certificate.cert + to = aws_acm_certificate.example id = "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a" } ``` @@ -225,5 +246,5 @@ import { Using `terraform import`, import certificates using their ARN. For example: ```console -% terraform import aws_acm_certificate.cert arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a +% terraform import aws_acm_certificate.example arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a ``` From ced418d94707a5315b9ace7fc8974de2b82d1f8c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 15:19:54 -0400 Subject: [PATCH 1530/2115] Fix 'TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse. --- internal/service/ec2/ec2_launch_template_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index d0ded5152012..91d41d01f323 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -3469,7 +3469,7 @@ func TestAccEC2LaunchTemplate_upgradeFromV5PlanRefreshFalse(t *testing.T) { ), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), }, PostApplyPostRefresh: []plancheck.PlanCheck{ plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), From f0f6637ad073b7447df54466bef43eec8d7e3c67 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 15:03:29 -0400 Subject: [PATCH 1531/2115] Fix golangci-lint 'errorlint'. --- internal/acctest/plancheck/expect_known_value_change.go | 4 ++-- internal/generate/tests/templates.go | 4 ++-- internal/provider/sdkv2/importer/arn.go | 4 ++-- names/data/lookup.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/acctest/plancheck/expect_known_value_change.go b/internal/acctest/plancheck/expect_known_value_change.go index ffbd11ce07bf..8fabc1f131b2 100644 --- a/internal/acctest/plancheck/expect_known_value_change.go +++ b/internal/acctest/plancheck/expect_known_value_change.go @@ -32,7 +32,7 @@ func (e expectKnownValueChangeCheck) CheckPlan(ctx context.Context, request plan } if err := e.oldValue.CheckValue(old); err != nil { - response.Error = fmt.Errorf("checking old value for attribute at path: %s.%s, err: %s", resource.Address, e.attributePath.String(), err) + response.Error = fmt.Errorf("checking old value for attribute at path: %s.%s, err: %w", resource.Address, e.attributePath.String(), err) return } @@ -45,7 +45,7 @@ func (e expectKnownValueChangeCheck) CheckPlan(ctx context.Context, request plan } if err := e.newValue.CheckValue(new); err != nil { - response.Error = fmt.Errorf("checking new value for attribute at path: %s.%s, err: %s", resource.Address, e.attributePath.String(), err) + response.Error = fmt.Errorf("checking new value for attribute at path: %s.%s, err: %w", resource.Address, e.attributePath.String(), err) return } diff --git a/internal/generate/tests/templates.go b/internal/generate/tests/templates.go index 4e2f868edcc5..e880556ff2ab 100644 --- a/internal/generate/tests/templates.go +++ b/internal/generate/tests/templates.go @@ -18,12 +18,12 @@ var resourceTestGoTmpl string func AddCommonResourceTestTemplates(template *template.Template) (*template.Template, error) { result, err := template.Parse(commonTestGoTmpl) if err != nil { - return nil, fmt.Errorf("parsing common \"common_test.go.gtpl\" test template: %s", err) + return nil, fmt.Errorf("parsing common \"common_test.go.gtpl\" test template: %w", err) } result, err = result.Parse(resourceTestGoTmpl) if err != nil { - return nil, fmt.Errorf("parsing common \"resource_test.go.gtpl\" test template: %s", err) + return nil, fmt.Errorf("parsing common \"resource_test.go.gtpl\" test template: %w", err) } return result, nil diff --git a/internal/provider/sdkv2/importer/arn.go b/internal/provider/sdkv2/importer/arn.go index 6716ef26d50e..a14129dfd2de 100644 --- a/internal/provider/sdkv2/importer/arn.go +++ b/internal/provider/sdkv2/importer/arn.go @@ -19,7 +19,7 @@ func RegionalARN(_ context.Context, rd *schema.ResourceData, identitySpec inttyp if rd.Id() != "" { arnARN, err := arn.Parse(rd.Id()) if err != nil { - return fmt.Errorf("could not parse import ID %q as ARN: %s", rd.Id(), err) + return fmt.Errorf("could not parse import ID %q as ARN: %w", rd.Id(), err) } rd.Set(attr.ResourceAttributeName(), rd.Id()) for _, attr := range identitySpec.IdentityDuplicateAttrs { @@ -54,7 +54,7 @@ func RegionalARN(_ context.Context, rd *schema.ResourceData, identitySpec inttyp arnARN, err := arn.Parse(arnVal) if err != nil { - return fmt.Errorf("identity attribute %q: could not parse %q as ARN: %s", attr.Name(), arnVal, err) + return fmt.Errorf("identity attribute %q: could not parse %q as ARN: %w", attr.Name(), arnVal, err) } rd.Set(names.AttrRegion, arnARN.Region) diff --git a/names/data/lookup.go b/names/data/lookup.go index f646d66b0c8a..9e3432f85d33 100644 --- a/names/data/lookup.go +++ b/names/data/lookup.go @@ -8,7 +8,7 @@ import "fmt" func LookupService(name string) (result ServiceRecord, err error) { serviceData, err := ReadAllServiceData() if err != nil { - return result, fmt.Errorf("error reading service data: %s", err) + return result, fmt.Errorf("error reading service data: %w", err) } for _, s := range serviceData { From 8a76f24cb4e08fb8cdfb8ab9ac2314d3c78ce134 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 15:25:21 -0400 Subject: [PATCH 1532/2115] Exclude '*_migrate.go' from semgrep 'valid-nullable-bool' check. --- .ci/semgrep/types/nullable.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/semgrep/types/nullable.yml b/.ci/semgrep/types/nullable.yml index 8a48ac4899af..9dabd3e7d930 100644 --- a/.ci/semgrep/types/nullable.yml +++ b/.ci/semgrep/types/nullable.yml @@ -2,6 +2,9 @@ rules: - id: valid-nullable-bool languages: [go] message: Uses of `nullable.TypeNullableBool` must be paired with `nullable.ValidateTypeStringNullableBool` unless they are strictly `Computed`. + paths: + exclude: + - "*_migrate.go" patterns: - pattern: | { From 739cbe79cf6bbb88b5e5657646d3693fc85dd24e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 8 Sep 2025 15:17:41 -0400 Subject: [PATCH 1533/2115] docs: add import by identity instructions to resource identity guides --- .../arn-based-resource-identity.md | 32 +++++++++++++++- .../parameterized-resource-identity.md | 37 ++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/docs/ai-agent-guides/arn-based-resource-identity.md b/docs/ai-agent-guides/arn-based-resource-identity.md index ae379316880a..89c22355a6ec 100644 --- a/docs/ai-agent-guides/arn-based-resource-identity.md +++ b/docs/ai-agent-guides/arn-based-resource-identity.md @@ -53,7 +53,37 @@ data "aws_region" "current" { Repeat steps 2 and 3 for each resource in the service. When all resources are complete, proceed to the next section. -## 4. Submit a pull request +## 4. Update import documentation + +- Update the import section of the registry documentation for each resource following the template below. + +````markdown +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = .example + identity = { + "arn" = + } +} + +resource "" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) . +```` + +- The instructions for importing by `identity`, including the identity schema, should appear before instructions for import blocks with an `id` argument or importing via the CLI. +- Refer to `website/docs/r/acm_certificate.html.markdown` for a reference implementation. + +## 5. Submit a pull request **!!!Important!!!**: Ask for confirmation before proceeding with this step. diff --git a/docs/ai-agent-guides/parameterized-resource-identity.md b/docs/ai-agent-guides/parameterized-resource-identity.md index 9fde2beb8779..7a70eb8bdd1c 100644 --- a/docs/ai-agent-guides/parameterized-resource-identity.md +++ b/docs/ai-agent-guides/parameterized-resource-identity.md @@ -66,7 +66,42 @@ data "aws_region" "current" { Repeat steps 2 and 3 for each resource in the service. When all resources are complete, proceed to the next section. -## 4. Submit a pull request +## 4. Update import documentation + +- Update the import section of the registry documentation for each resource following the template below. + +````markdown +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = .example + identity = { + + } +} + +resource "" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + + + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. +```` + +- The instructions for importing by `identity`, including the identity schema, should appear before instructions for import blocks with an `id` argument or importing via the CLI. +- Refer to `website/docs/r/kms_key.html.markdown` for a reference implementation. + +## 5. Submit a pull request **!!!Important!!!**: Ask for confirmation before proceeding with this step. From 07e4762de4fd39b45adf5c67940b8ae6c69fa075 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 8 Sep 2025 14:38:48 -0500 Subject: [PATCH 1534/2115] aws_controltower: update test import attributes --- internal/service/controltower/baseline_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 944338d14f32..4078622a6664 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -50,13 +50,16 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { testAccCheckBaselineExists(ctx, resourceName, &baseline), resource.TestCheckResourceAttr(resourceName, "baseline_version", "4.0"), resource.TestCheckResourceAttrSet(resourceName, "baseline_identifier"), - acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "controltower", regexache.MustCompile(`enabledbaseline:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "controltower", regexache.MustCompile(`enabledbaseline/+.`)), ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{names.AttrID}, }, }, }) From 4e2c99501d99d3b4d8c0a8a5642781ff3df5f6cc Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 8 Sep 2025 14:50:06 -0500 Subject: [PATCH 1535/2115] aws_controltower: use ExpandTo function to expand parameters --- internal/service/controltower/baseline.go | 86 ++++++++++++++--------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index c989c73d29b5..3a4e3e31d1a8 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -6,6 +6,7 @@ package controltower import ( "context" "errors" + "reflect" "time" "github.com/aws/aws-sdk-go-v2/aws" @@ -358,41 +359,60 @@ type parameters struct { Value types.String `tfsdk:"value"` } -func (p parameters) Expand(ctx context.Context) (any, diag.Diagnostics) { - var diags diag.Diagnostics - var r awstypes.EnabledBaselineParameter - if !p.Key.IsNull() { - r.Key = fwflex.StringFromFramework(ctx, p.Key) - } - - if !p.Value.IsNull() { - r.Value = document.NewLazyDocument(fwflex.StringValueFromFramework(ctx, p.Value)) - } - - return &r, diags -} - -func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { +//func (p parameters) Expand(ctx context.Context) (any, diag.Diagnostics) { +// var diags diag.Diagnostics +// var r awstypes.EnabledBaselineParameter +// if !p.Key.IsNull() { +// r.Key = fwflex.StringFromFramework(ctx, p.Key) +// } +// +// if !p.Value.IsNull() { +// r.Value = document.NewLazyDocument(fwflex.StringValueFromFramework(ctx, p.Value)) +// } +// +// return &r, diags +//} +// +//func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { +// var diags diag.Diagnostics +// +// switch v.(type) { +// case awstypes.EnabledBaselineParameter: +// param := v.(awstypes.EnabledBaselineParameter) +// p.Key = fwflex.StringToFramework(ctx, param.Key) +// if param.Value != nil { +// var value any +// err := param.Value.UnmarshalSmithyDocument(&value) +// if err != nil { +// diags.AddError( +// "Error Reading Control Tower Baseline Parameter", +// "Could not read Control Tower Baseline Parameter: "+err.Error(), +// ) +// return diags +// } +// p.Value = fwflex.StringValueToFramework(ctx, value.(string)) +// } else { +// p.Value = types.StringNull() +// } +// } +// return diags +//} + +func (p parameters) ExpandTo(ctx context.Context, targetType reflect.Type) (any, diag.Diagnostics) { var diags diag.Diagnostics + switch targetType { + case reflect.TypeOf(awstypes.EnabledBaselineParameter{}): + var r awstypes.EnabledBaselineParameter + if !p.Key.IsNull() { + r.Key = fwflex.StringFromFramework(ctx, p.Key) + } - switch v.(type) { - case awstypes.EnabledBaselineParameter: - param := v.(awstypes.EnabledBaselineParameter) - p.Key = fwflex.StringToFramework(ctx, param.Key) - if param.Value != nil { - var value any - err := param.Value.UnmarshalSmithyDocument(&value) - if err != nil { - diags.AddError( - "Error Reading Control Tower Baseline Parameter", - "Could not read Control Tower Baseline Parameter: "+err.Error(), - ) - return diags - } - p.Value = fwflex.StringValueToFramework(ctx, value.(string)) - } else { - p.Value = types.StringNull() + if !p.Value.IsNull() { + r.Value = document.NewLazyDocument(fwflex.StringValueFromFramework(ctx, p.Value)) } + + return &r, diags } - return diags + + return nil, diags } From 6df353f69112986b2a9e94aabcafb44b43604ec2 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 8 Sep 2025 14:53:14 -0500 Subject: [PATCH 1536/2115] cleanup --- internal/service/controltower/baseline.go | 39 ----------------------- 1 file changed, 39 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 3a4e3e31d1a8..af1780485bed 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -359,45 +359,6 @@ type parameters struct { Value types.String `tfsdk:"value"` } -//func (p parameters) Expand(ctx context.Context) (any, diag.Diagnostics) { -// var diags diag.Diagnostics -// var r awstypes.EnabledBaselineParameter -// if !p.Key.IsNull() { -// r.Key = fwflex.StringFromFramework(ctx, p.Key) -// } -// -// if !p.Value.IsNull() { -// r.Value = document.NewLazyDocument(fwflex.StringValueFromFramework(ctx, p.Value)) -// } -// -// return &r, diags -//} -// -//func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { -// var diags diag.Diagnostics -// -// switch v.(type) { -// case awstypes.EnabledBaselineParameter: -// param := v.(awstypes.EnabledBaselineParameter) -// p.Key = fwflex.StringToFramework(ctx, param.Key) -// if param.Value != nil { -// var value any -// err := param.Value.UnmarshalSmithyDocument(&value) -// if err != nil { -// diags.AddError( -// "Error Reading Control Tower Baseline Parameter", -// "Could not read Control Tower Baseline Parameter: "+err.Error(), -// ) -// return diags -// } -// p.Value = fwflex.StringValueToFramework(ctx, value.(string)) -// } else { -// p.Value = types.StringNull() -// } -// } -// return diags -//} - func (p parameters) ExpandTo(ctx context.Context, targetType reflect.Type) (any, diag.Diagnostics) { var diags diag.Diagnostics switch targetType { From 660e48ed3b014e50c87a41063c3f11013a925b5c Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 8 Sep 2025 15:08:47 -0500 Subject: [PATCH 1537/2115] aws_controltower: add flatten method --- internal/service/controltower/baseline.go | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index af1780485bed..9296dc635c32 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -359,6 +359,31 @@ type parameters struct { Value types.String `tfsdk:"value"` } +func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { + var diags diag.Diagnostics + + switch v.(type) { + case awstypes.EnabledBaselineParameter: + param := v.(awstypes.EnabledBaselineParameter) + p.Key = fwflex.StringToFramework(ctx, param.Key) + if param.Value != nil { + var value any + err := param.Value.UnmarshalSmithyDocument(&value) + if err != nil { + diags.AddError( + "Error Reading Control Tower Baseline Parameter", + "Could not read Control Tower Baseline Parameter: "+err.Error(), + ) + return diags + } + p.Value = fwflex.StringValueToFramework(ctx, value.(string)) + } else { + p.Value = types.StringNull() + } + } + return diags +} + func (p parameters) ExpandTo(ctx context.Context, targetType reflect.Type) (any, diag.Diagnostics) { var diags diag.Diagnostics switch targetType { From bd3ae86646e9daeba720befe86359ee2bf5fbedf Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 8 Sep 2025 20:42:09 +0000 Subject: [PATCH 1538/2115] Update CHANGELOG.md for #44189 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3318f5fd70..0c737262751f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,10 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_flow_log: Fix `Error decoding ... from prior state: unsupported attribute "log_group_name"` errors when upgrading from a pre-v6.0.0 provider version ([#44191](https://github.com/hashicorp/terraform-provider-aws/issues/44191)) +* resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) * resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) +* resource/aws_s3_bucket_lifecycle_configuration: Ignore `MethodNotAllowed` errors when deleting non-existent lifecycle configurations ([#44189](https://github.com/hashicorp/terraform-provider-aws/issues/44189)) ## 6.12.0 (September 4, 2025) From 150f8e3e0d6d4ca3c1c5319a4a7d6ed264289001 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Mon, 8 Sep 2025 15:30:54 -0400 Subject: [PATCH 1539/2115] Fix golangci-lint 'errorlint' in sweepers. --- internal/service/accessanalyzer/sweep.go | 2 +- internal/service/acm/sweep.go | 2 +- internal/service/acmpca/sweep.go | 2 +- internal/service/amplify/sweep.go | 2 +- internal/service/apigateway/sweep.go | 10 +- internal/service/apigatewayv2/sweep.go | 8 +- internal/service/applicationinsights/sweep.go | 2 +- internal/service/appmesh/sweep.go | 14 +- internal/service/apprunner/sweep.go | 6 +- internal/service/athena/sweep.go | 6 +- internal/service/autoscaling/sweep.go | 4 +- internal/service/backup/sweep.go | 16 +- internal/service/batch/sweep.go | 8 +- internal/service/budgets/sweep.go | 4 +- internal/service/chime/sweep.go | 2 +- internal/service/cleanrooms/sweep.go | 6 +- internal/service/cloud9/sweep.go | 2 +- internal/service/cloudfront/sweep.go | 24 +-- internal/service/cloudhsmv2/sweep.go | 4 +- internal/service/cloudtrail/sweep.go | 4 +- internal/service/cloudwatch/sweep.go | 8 +- internal/service/codeartifact/sweep.go | 4 +- internal/service/codegurureviewer/sweep.go | 2 +- internal/service/codepipeline/sweep.go | 2 +- internal/service/codestarconnections/sweep.go | 4 +- .../service/codestarnotifications/sweep.go | 2 +- internal/service/cognitoidentity/sweep.go | 2 +- internal/service/configservice/sweep.go | 14 +- internal/service/connect/sweep.go | 2 +- internal/service/cur/sweep.go | 2 +- internal/service/datasync/sweep.go | 6 +- internal/service/dax/sweep.go | 2 +- internal/service/deploy/sweep.go | 2 +- internal/service/devicefarm/sweep.go | 4 +- internal/service/directconnect/sweep.go | 12 +- internal/service/dlm/sweep.go | 2 +- internal/service/dms/sweep.go | 10 +- internal/service/docdb/sweep.go | 14 +- internal/service/docdbelastic/sweep.go | 2 +- internal/service/ds/sweep.go | 4 +- internal/service/dynamodb/sweep.go | 4 +- internal/service/ec2/sweep.go | 161 ++++++++---------- internal/service/ecr/sweep.go | 2 +- internal/service/ecrpublic/sweep.go | 2 +- internal/service/ecs/sweep.go | 8 +- internal/service/efs/sweep.go | 6 +- internal/service/eks/sweep.go | 10 +- internal/service/elasticache/sweep.go | 16 +- internal/service/elasticbeanstalk/sweep.go | 4 +- internal/service/elasticsearch/sweep.go | 2 +- internal/service/elb/sweep.go | 2 +- internal/service/elbv2/sweep.go | 4 +- internal/service/emr/sweep.go | 4 +- internal/service/emrcontainers/sweep.go | 4 +- internal/service/emrserverless/sweep.go | 2 +- internal/service/events/sweep.go | 4 +- internal/service/finspace/sweep.go | 2 +- internal/service/firehose/sweep.go | 2 +- internal/service/fms/sweep.go | 2 +- internal/service/gamelift/sweep.go | 12 +- internal/service/glacier/sweep.go | 2 +- internal/service/globalaccelerator/sweep.go | 12 +- internal/service/grafana/sweep.go | 2 +- internal/service/guardduty/sweep.go | 6 +- internal/service/iam/sweep.go | 14 +- internal/service/imagebuilder/sweep.go | 14 +- internal/service/internetmonitor/sweep.go | 2 +- internal/service/iot/sweep.go | 26 +-- internal/service/kafka/sweep.go | 4 +- internal/service/kafkaconnect/sweep.go | 6 +- internal/service/keyspaces/sweep.go | 2 +- internal/service/kinesis/sweep.go | 2 +- internal/service/kinesisanalytics/sweep.go | 2 +- internal/service/kinesisanalyticsv2/sweep.go | 2 +- internal/service/kms/sweep.go | 2 +- internal/service/lambda/sweep.go | 4 +- internal/service/lexmodels/sweep.go | 8 +- internal/service/lexv2models/sweep.go | 2 +- internal/service/licensemanager/sweep.go | 2 +- internal/service/lightsail/sweep.go | 26 +-- internal/service/location/sweep.go | 12 +- internal/service/logs/sweep.go | 6 +- internal/service/medialive/sweep.go | 8 +- internal/service/mediapackage/sweep.go | 2 +- internal/service/memorydb/sweep.go | 10 +- internal/service/mq/sweep.go | 2 +- internal/service/mwaa/sweep.go | 2 +- internal/service/neptune/sweep.go | 12 +- internal/service/networkfirewall/sweep.go | 8 +- internal/service/networkmanager/sweep.go | 26 +-- internal/service/opensearch/sweep.go | 6 +- .../service/opensearchserverless/sweep.go | 10 +- internal/service/pinpoint/sweep.go | 2 +- internal/service/pinpointsmsvoicev2/sweep.go | 2 +- internal/service/qldb/sweep.go | 4 +- internal/service/quicksight/sweep.go | 8 +- internal/service/ram/sweep.go | 2 +- internal/service/redshift/sweep.go | 12 +- internal/service/redshiftserverless/sweep.go | 6 +- internal/service/resourceexplorer2/sweep.go | 2 +- internal/service/route53/sweep.go | 6 +- internal/service/route53profiles/sweep.go | 4 +- .../route53recoverycontrolconfig/sweep.go | 8 +- internal/service/route53resolver/sweep.go | 22 +-- internal/service/rum/sweep.go | 2 +- internal/service/s3control/sweep.go | 14 +- internal/service/secretsmanager/sweep.go | 4 +- internal/service/servicecatalog/sweep.go | 20 +-- internal/service/servicediscovery/sweep.go | 8 +- internal/service/sfn/sweep.go | 4 +- internal/service/shield/sweep.go | 6 +- internal/service/sns/sweep.go | 6 +- internal/service/ssm/sweep.go | 2 +- internal/service/ssmcontacts/sweep.go | 2 +- internal/service/ssoadmin/sweep.go | 6 +- internal/service/storagegateway/sweep.go | 6 +- internal/service/swf/sweep.go | 2 +- internal/service/synthetics/sweep.go | 2 +- internal/service/timestreamwrite/sweep.go | 4 +- internal/service/transcribe/sweep.go | 8 +- internal/service/transfer/sweep.go | 4 +- internal/service/verifiedpermissions/sweep.go | 2 +- internal/service/waf/sweep.go | 24 +-- internal/service/wafregional/sweep.go | 24 +-- internal/service/workspaces/sweep.go | 6 +- 125 files changed, 471 insertions(+), 488 deletions(-) diff --git a/internal/service/accessanalyzer/sweep.go b/internal/service/accessanalyzer/sweep.go index fb28093397f3..8075b5b9e535 100644 --- a/internal/service/accessanalyzer/sweep.go +++ b/internal/service/accessanalyzer/sweep.go @@ -25,7 +25,7 @@ func sweepAnalyzers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AccessAnalyzerClient(ctx) sweepResources := make([]sweep.Sweepable, 0) diff --git a/internal/service/acm/sweep.go b/internal/service/acm/sweep.go index b350671e4fb3..d8e4fe21f51e 100644 --- a/internal/service/acm/sweep.go +++ b/internal/service/acm/sweep.go @@ -43,7 +43,7 @@ func sweepCertificates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ACMClient(ctx) var sweepResources []sweep.Sweepable diff --git a/internal/service/acmpca/sweep.go b/internal/service/acmpca/sweep.go index 996a82538156..f821a8066072 100644 --- a/internal/service/acmpca/sweep.go +++ b/internal/service/acmpca/sweep.go @@ -26,7 +26,7 @@ func sweepCertificateAuthorities(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ACMPCAClient(ctx) var sweepResources []sweep.Sweepable diff --git a/internal/service/amplify/sweep.go b/internal/service/amplify/sweep.go index 285c7a737f62..fe68ba120e73 100644 --- a/internal/service/amplify/sweep.go +++ b/internal/service/amplify/sweep.go @@ -25,7 +25,7 @@ func sweepApps(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AmplifyClient(ctx) var sweepResources []sweep.Sweepable diff --git a/internal/service/apigateway/sweep.go b/internal/service/apigateway/sweep.go index e4ca539f28b0..145b106f66b1 100644 --- a/internal/service/apigateway/sweep.go +++ b/internal/service/apigateway/sweep.go @@ -70,7 +70,7 @@ func sweepRestAPIs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := apigateway.GetRestApisInput{} conn := client.APIGatewayClient(ctx) @@ -159,7 +159,7 @@ func sweepClientCertificates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayClient(ctx) input := apigateway.GetClientCertificatesInput{} @@ -200,7 +200,7 @@ func sweepUsagePlans(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayClient(ctx) input := apigateway.GetUsagePlansInput{} @@ -242,7 +242,7 @@ func sweepAPIKeys(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayClient(ctx) input := apigateway.GetApiKeysInput{} @@ -283,7 +283,7 @@ func sweepDomainNames(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayClient(ctx) input := apigateway.GetDomainNamesInput{} diff --git a/internal/service/apigatewayv2/sweep.go b/internal/service/apigatewayv2/sweep.go index 49f887c58f22..1a80f3659e3a 100644 --- a/internal/service/apigatewayv2/sweep.go +++ b/internal/service/apigatewayv2/sweep.go @@ -48,7 +48,7 @@ func sweepAPIs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayV2Client(ctx) input := &apigatewayv2.GetApisInput{} @@ -92,7 +92,7 @@ func sweepAPIMappings(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayV2Client(ctx) var sweeperErrs *multierror.Error @@ -161,7 +161,7 @@ func sweepDomainNames(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayV2Client(ctx) input := &apigatewayv2.GetDomainNamesInput{} @@ -205,7 +205,7 @@ func sweepVPCLinks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.APIGatewayV2Client(ctx) input := &apigatewayv2.GetVpcLinksInput{} diff --git a/internal/service/applicationinsights/sweep.go b/internal/service/applicationinsights/sweep.go index c5171eb35fea..7b8165e555e8 100644 --- a/internal/service/applicationinsights/sweep.go +++ b/internal/service/applicationinsights/sweep.go @@ -25,7 +25,7 @@ func sweepApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ApplicationInsightsClient(ctx) input := &applicationinsights.ListApplicationsInput{} diff --git a/internal/service/appmesh/sweep.go b/internal/service/appmesh/sweep.go index 28a8c0487957..df8b165bc4e1 100644 --- a/internal/service/appmesh/sweep.go +++ b/internal/service/appmesh/sweep.go @@ -69,7 +69,7 @@ func sweepMeshes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -110,7 +110,7 @@ func sweepVirtualGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -175,7 +175,7 @@ func sweepVirtualNodes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -240,7 +240,7 @@ func sweepVirtualRouters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -305,7 +305,7 @@ func sweepVirtualServices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -370,7 +370,7 @@ func sweepGatewayRoutes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} @@ -457,7 +457,7 @@ func sweepRoutes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AppMeshClient(ctx) input := &appmesh.ListMeshesInput{} diff --git a/internal/service/apprunner/sweep.go b/internal/service/apprunner/sweep.go index 110b16d3fa10..2e88eae8a2d1 100644 --- a/internal/service/apprunner/sweep.go +++ b/internal/service/apprunner/sweep.go @@ -42,7 +42,7 @@ func sweepAutoScalingConfigurationVersions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &apprunner.ListAutoScalingConfigurationsInput{} conn := client.AppRunnerClient(ctx) @@ -92,7 +92,7 @@ func sweepConnections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &apprunner.ListConnectionsInput{} conn := client.AppRunnerClient(ctx) @@ -134,7 +134,7 @@ func sweepServices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &apprunner.ListServicesInput{} conn := client.AppRunnerClient(ctx) diff --git a/internal/service/athena/sweep.go b/internal/service/athena/sweep.go index 9068be60dfd0..87f8b728615b 100644 --- a/internal/service/athena/sweep.go +++ b/internal/service/athena/sweep.go @@ -80,7 +80,7 @@ func sweepDataCatalogs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AthenaClient(ctx) input := &athena.ListDataCatalogsInput{} @@ -128,7 +128,7 @@ func sweepDatabases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AthenaClient(ctx) input := &athena.ListDataCatalogsInput{} @@ -193,7 +193,7 @@ func sweepWorkGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AthenaClient(ctx) input := &athena.ListWorkGroupsInput{} diff --git a/internal/service/autoscaling/sweep.go b/internal/service/autoscaling/sweep.go index 4c8100c99b1a..a9199c089231 100644 --- a/internal/service/autoscaling/sweep.go +++ b/internal/service/autoscaling/sweep.go @@ -32,7 +32,7 @@ func sweepGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AutoScalingClient(ctx) input := &autoscaling.DescribeAutoScalingGroupsInput{} @@ -75,7 +75,7 @@ func sweepLaunchConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.AutoScalingClient(ctx) input := &autoscaling.DescribeLaunchConfigurationsInput{} diff --git a/internal/service/backup/sweep.go b/internal/service/backup/sweep.go index 3b0e6790ff37..19ed24fa8b3f 100644 --- a/internal/service/backup/sweep.go +++ b/internal/service/backup/sweep.go @@ -84,7 +84,7 @@ func sweepFrameworks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListFrameworksInput{} @@ -123,7 +123,7 @@ func sweepPlans(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListBackupPlansInput{} @@ -169,7 +169,7 @@ func sweepSelections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListBackupPlansInput{} @@ -231,7 +231,7 @@ func sweepReportPlans(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListReportPlansInput{} @@ -270,7 +270,7 @@ func sweepRestoreTestingPlans(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListRestoreTestingPlansInput{} @@ -306,7 +306,7 @@ func sweepRestoreTestingSelections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListRestoreTestingPlansInput{} @@ -359,7 +359,7 @@ func sweepVaultLockConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListBackupVaultsInput{} @@ -398,7 +398,7 @@ func sweepVaultNotifications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BackupClient(ctx) input := &backup.ListBackupVaultsInput{} diff --git a/internal/service/batch/sweep.go b/internal/service/batch/sweep.go index fb008f05df9a..226168855c27 100644 --- a/internal/service/batch/sweep.go +++ b/internal/service/batch/sweep.go @@ -60,7 +60,7 @@ func sweepComputeEnvironments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &batch.DescribeComputeEnvironmentsInput{} conn := client.BatchClient(ctx) @@ -172,7 +172,7 @@ func sweepJobDefinitions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &batch.DescribeJobDefinitionsInput{ Status: aws.String("ACTIVE"), @@ -215,7 +215,7 @@ func sweepJobQueues(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &batch.DescribeJobQueuesInput{} conn := client.BatchClient(ctx) @@ -256,7 +256,7 @@ func sweepSchedulingPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &batch.ListSchedulingPoliciesInput{} conn := client.BatchClient(ctx) diff --git a/internal/service/budgets/sweep.go b/internal/service/budgets/sweep.go index fb6296fe8a20..70db17f3ba2d 100644 --- a/internal/service/budgets/sweep.go +++ b/internal/service/budgets/sweep.go @@ -34,7 +34,7 @@ func sweepBudgetActions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BudgetsClient(ctx) accountID := client.AccountID(ctx) @@ -78,7 +78,7 @@ func sweepBudgets(region string) error { // nosemgrep:ci.budgets-in-func-name ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.BudgetsClient(ctx) accountID := client.AccountID(ctx) diff --git a/internal/service/chime/sweep.go b/internal/service/chime/sweep.go index c0d3c359d124..6b36ff12222f 100644 --- a/internal/service/chime/sweep.go +++ b/internal/service/chime/sweep.go @@ -26,7 +26,7 @@ func sweepVoiceConnectors(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ChimeSDKVoiceClient(ctx) diff --git a/internal/service/cleanrooms/sweep.go b/internal/service/cleanrooms/sweep.go index 6463d04cdb34..a670b3a9ab0d 100644 --- a/internal/service/cleanrooms/sweep.go +++ b/internal/service/cleanrooms/sweep.go @@ -37,7 +37,7 @@ func sweepCollaborations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CleanRoomsClient(ctx) input := &cleanrooms.ListCollaborationsInput{} @@ -78,7 +78,7 @@ func sweepConfiguredTables(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CleanRoomsClient(ctx) input := &cleanrooms.ListConfiguredTablesInput{} @@ -119,7 +119,7 @@ func sweepMemberships(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CleanRoomsClient(ctx) input := &cleanrooms.ListMembershipsInput{} diff --git a/internal/service/cloud9/sweep.go b/internal/service/cloud9/sweep.go index 4175e9158615..8f5b3f4d113a 100644 --- a/internal/service/cloud9/sweep.go +++ b/internal/service/cloud9/sweep.go @@ -24,7 +24,7 @@ func sweepEnvironmentEC2s(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Cloud9Client(ctx) input := &cloud9.ListEnvironmentsInput{} diff --git a/internal/service/cloudfront/sweep.go b/internal/service/cloudfront/sweep.go index 17b67c9bccc7..8a64df68b5f2 100644 --- a/internal/service/cloudfront/sweep.go +++ b/internal/service/cloudfront/sweep.go @@ -109,7 +109,7 @@ func sweepCachePolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListCachePoliciesInput{ @@ -188,7 +188,7 @@ func sweepDistributionsByProductionOrStaging(region string, staging bool) error ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListDistributionsInput{} @@ -251,7 +251,7 @@ func sweepContinuousDeploymentPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListContinuousDeploymentPoliciesInput{} @@ -293,7 +293,7 @@ func sweepFunctions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListFunctionsInput{} @@ -405,7 +405,7 @@ func sweepMonitoringSubscriptions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListDistributionsInput{} @@ -446,7 +446,7 @@ func sweepRealtimeLogsConfig(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListRealtimeLogConfigsInput{} @@ -490,7 +490,7 @@ func sweepFieldLevelEncryptionConfigs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListFieldLevelEncryptionConfigsInput{} @@ -546,7 +546,7 @@ func sweepFieldLevelEncryptionProfiles(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListFieldLevelEncryptionProfilesInput{} @@ -602,7 +602,7 @@ func sweepOriginRequestPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListOriginRequestPoliciesInput{ @@ -660,7 +660,7 @@ func sweepResponseHeadersPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListResponseHeadersPoliciesInput{ @@ -718,7 +718,7 @@ func sweepOriginAccessControls(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListOriginAccessControlsInput{} @@ -774,7 +774,7 @@ func sweepVPCOrigins(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudFrontClient(ctx) input := &cloudfront.ListVpcOriginsInput{} diff --git a/internal/service/cloudhsmv2/sweep.go b/internal/service/cloudhsmv2/sweep.go index 698b730d75d1..12f002268847 100644 --- a/internal/service/cloudhsmv2/sweep.go +++ b/internal/service/cloudhsmv2/sweep.go @@ -31,7 +31,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudHSMV2Client(ctx) input := &cloudhsmv2.DescribeClustersInput{} @@ -71,7 +71,7 @@ func sweepHSMs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudHSMV2Client(ctx) input := &cloudhsmv2.DescribeClustersInput{} diff --git a/internal/service/cloudtrail/sweep.go b/internal/service/cloudtrail/sweep.go index ecd679ebe2b4..cc62dfc02830 100644 --- a/internal/service/cloudtrail/sweep.go +++ b/internal/service/cloudtrail/sweep.go @@ -31,7 +31,7 @@ func sweepTrails(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudTrailClient(ctx) input := &cloudtrail.ListTrailsInput{} @@ -94,7 +94,7 @@ func sweepEventDataStores(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudTrailClient(ctx) input := &cloudtrail.ListEventDataStoresInput{} diff --git a/internal/service/cloudwatch/sweep.go b/internal/service/cloudwatch/sweep.go index fe85a4921e70..f0122279fa79 100644 --- a/internal/service/cloudwatch/sweep.go +++ b/internal/service/cloudwatch/sweep.go @@ -41,7 +41,7 @@ func sweepCompositeAlarms(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudWatchClient(ctx) input := &cloudwatch.DescribeAlarmsInput{ @@ -84,7 +84,7 @@ func sweepDashboards(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudWatchClient(ctx) input := &cloudwatch.ListDashboardsInput{} @@ -125,7 +125,7 @@ func sweepMetricAlarms(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudWatchClient(ctx) input := &cloudwatch.DescribeAlarmsInput{ @@ -168,7 +168,7 @@ func sweepMetricStreams(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CloudWatchClient(ctx) input := &cloudwatch.ListMetricStreamsInput{} diff --git a/internal/service/codeartifact/sweep.go b/internal/service/codeartifact/sweep.go index 9bf41592bfb8..30470665b86a 100644 --- a/internal/service/codeartifact/sweep.go +++ b/internal/service/codeartifact/sweep.go @@ -30,7 +30,7 @@ func sweepDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CodeArtifactClient(ctx) input := &codeartifact.ListDomainsInput{} @@ -71,7 +71,7 @@ func sweepRepositories(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CodeArtifactClient(ctx) input := &codeartifact.ListRepositoriesInput{} diff --git a/internal/service/codegurureviewer/sweep.go b/internal/service/codegurureviewer/sweep.go index 600445172dd5..b0b9a2233cba 100644 --- a/internal/service/codegurureviewer/sweep.go +++ b/internal/service/codegurureviewer/sweep.go @@ -25,7 +25,7 @@ func sweepAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &codegurureviewer.ListRepositoryAssociationsInput{} conn := client.CodeGuruReviewerClient(ctx) diff --git a/internal/service/codepipeline/sweep.go b/internal/service/codepipeline/sweep.go index eb7ad5ecbf62..6c1f437322d9 100644 --- a/internal/service/codepipeline/sweep.go +++ b/internal/service/codepipeline/sweep.go @@ -25,7 +25,7 @@ func sweepPipelines(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &codepipeline.ListPipelinesInput{} conn := client.CodePipelineClient(ctx) diff --git a/internal/service/codestarconnections/sweep.go b/internal/service/codestarconnections/sweep.go index 4b37be4e63ca..20e22b5a428c 100644 --- a/internal/service/codestarconnections/sweep.go +++ b/internal/service/codestarconnections/sweep.go @@ -38,7 +38,7 @@ func sweepConnections(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CodeStarConnectionsClient(ctx) input := &codestarconnections.ListConnectionsInput{} @@ -83,7 +83,7 @@ func sweepHosts(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CodeStarConnectionsClient(ctx) input := &codestarconnections.ListHostsInput{} diff --git a/internal/service/codestarnotifications/sweep.go b/internal/service/codestarnotifications/sweep.go index 322faf82e903..f52f83eebaab 100644 --- a/internal/service/codestarnotifications/sweep.go +++ b/internal/service/codestarnotifications/sweep.go @@ -25,7 +25,7 @@ func sweepNotificationRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CodeStarNotificationsClient(ctx) input := &codestarnotifications.ListNotificationRulesInput{} diff --git a/internal/service/cognitoidentity/sweep.go b/internal/service/cognitoidentity/sweep.go index 80758d959874..9dd155adbd1f 100644 --- a/internal/service/cognitoidentity/sweep.go +++ b/internal/service/cognitoidentity/sweep.go @@ -25,7 +25,7 @@ func sweepIdentityPools(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &cognitoidentity.ListIdentityPoolsInput{ MaxResults: aws.Int32(50), diff --git a/internal/service/configservice/sweep.go b/internal/service/configservice/sweep.go index 6295373d6e9f..406867f8da63 100644 --- a/internal/service/configservice/sweep.go +++ b/internal/service/configservice/sweep.go @@ -66,7 +66,7 @@ func sweepAggregateAuthorizations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeAggregationAuthorizationsInput{} @@ -107,7 +107,7 @@ func sweepConfigRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeConfigRulesInput{} @@ -155,7 +155,7 @@ func sweepConfigurationAggregators(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeConfigurationAggregatorsInput{} @@ -217,7 +217,7 @@ func sweepConfigurationRecorder(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeConfigurationRecordersInput{} @@ -251,7 +251,7 @@ func sweepConformancePacks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeConformancePacksInput{} @@ -292,7 +292,7 @@ func sweepDeliveryChannels(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeDeliveryChannelsInput{} @@ -330,7 +330,7 @@ func sweepRemediationConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ConfigServiceClient(ctx) input := &configservice.DescribeConfigRulesInput{} diff --git a/internal/service/connect/sweep.go b/internal/service/connect/sweep.go index b179228defe0..91c872b69a7d 100644 --- a/internal/service/connect/sweep.go +++ b/internal/service/connect/sweep.go @@ -25,7 +25,7 @@ func sweepInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } const maxResults = 10 input := &connect.ListInstancesInput{ diff --git a/internal/service/cur/sweep.go b/internal/service/cur/sweep.go index 40f0b5e688e6..c0db9a762a42 100644 --- a/internal/service/cur/sweep.go +++ b/internal/service/cur/sweep.go @@ -30,7 +30,7 @@ func sweepReportDefinitions(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.CURClient(ctx) input := &cur.DescribeReportDefinitionsInput{} diff --git a/internal/service/datasync/sweep.go b/internal/service/datasync/sweep.go index c25559e19068..a305e8538d43 100644 --- a/internal/service/datasync/sweep.go +++ b/internal/service/datasync/sweep.go @@ -46,7 +46,7 @@ func sweepAgents(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DataSyncClient(ctx) input := &datasync.ListAgentsInput{} @@ -87,7 +87,7 @@ func sweepLocations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DataSyncClient(ctx) input := &datasync.ListLocationsInput{} @@ -152,7 +152,7 @@ func sweepTasks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DataSyncClient(ctx) input := datasync.ListTasksInput{} diff --git a/internal/service/dax/sweep.go b/internal/service/dax/sweep.go index f5a0352c42ae..1624d7182fa4 100644 --- a/internal/service/dax/sweep.go +++ b/internal/service/dax/sweep.go @@ -27,7 +27,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err.Error()) + return fmt.Errorf("getting client: %w", err.Error()) } conn := client.DAXClient(ctx) diff --git a/internal/service/deploy/sweep.go b/internal/service/deploy/sweep.go index 9c9294f5bf3b..a2e23c439d7b 100644 --- a/internal/service/deploy/sweep.go +++ b/internal/service/deploy/sweep.go @@ -25,7 +25,7 @@ func sweepApps(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DeployClient(ctx) input := &codedeploy.ListApplicationsInput{} diff --git a/internal/service/devicefarm/sweep.go b/internal/service/devicefarm/sweep.go index ebe169f868ce..5fde7bb4c441 100644 --- a/internal/service/devicefarm/sweep.go +++ b/internal/service/devicefarm/sweep.go @@ -30,7 +30,7 @@ func sweepProjects(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DeviceFarmClient(ctx) input := &devicefarm.ListProjectsInput{} @@ -71,7 +71,7 @@ func sweepTestGridProjects(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DeviceFarmClient(ctx) input := &devicefarm.ListTestGridProjectsInput{} diff --git a/internal/service/directconnect/sweep.go b/internal/service/directconnect/sweep.go index da3dc1472a3a..f4e6f9350609 100644 --- a/internal/service/directconnect/sweep.go +++ b/internal/service/directconnect/sweep.go @@ -63,7 +63,7 @@ func sweepConnections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeConnectionsInput{} conn := client.DirectConnectClient(ctx) @@ -101,7 +101,7 @@ func sweepGatewayAssociationProposals(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeDirectConnectGatewayAssociationProposalsInput{} conn := client.DirectConnectClient(ctx) @@ -157,7 +157,7 @@ func sweepGatewayAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeDirectConnectGatewaysInput{} conn := client.DirectConnectClient(ctx) @@ -294,7 +294,7 @@ func sweepGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeDirectConnectGatewaysInput{} conn := client.DirectConnectClient(ctx) @@ -378,7 +378,7 @@ func sweepLags(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeLagsInput{} conn := client.DirectConnectClient(ctx) @@ -416,7 +416,7 @@ func sweepMacSecKeys(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &directconnect.DescribeConnectionsInput{} dxConn := client.DirectConnectClient(ctx) diff --git a/internal/service/dlm/sweep.go b/internal/service/dlm/sweep.go index 4856bda76aaa..ceefacecbfd7 100644 --- a/internal/service/dlm/sweep.go +++ b/internal/service/dlm/sweep.go @@ -27,7 +27,7 @@ func sweepLifecyclePolicies(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DLMClient(ctx) diff --git a/internal/service/dms/sweep.go b/internal/service/dms/sweep.go index 06a186c4da2f..d3dfba4942d5 100644 --- a/internal/service/dms/sweep.go +++ b/internal/service/dms/sweep.go @@ -54,7 +54,7 @@ func sweepEndpoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DMSClient(ctx) input := &dms.DescribeEndpointsInput{} @@ -96,7 +96,7 @@ func sweepReplicationConfigs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DMSClient(ctx) input := &dms.DescribeReplicationConfigsInput{} @@ -137,7 +137,7 @@ func sweepReplicationInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DMSClient(ctx) input := &dms.DescribeReplicationInstancesInput{} @@ -179,7 +179,7 @@ func sweepReplicationSubnetGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DMSClient(ctx) input := &dms.DescribeReplicationSubnetGroupsInput{} @@ -220,7 +220,7 @@ func sweepReplicationTasks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DMSClient(ctx) input := &dms.DescribeReplicationTasksInput{ diff --git a/internal/service/docdb/sweep.go b/internal/service/docdb/sweep.go index c0ec260e1607..e4e65dcfca76 100644 --- a/internal/service/docdb/sweep.go +++ b/internal/service/docdb/sweep.go @@ -112,7 +112,7 @@ func sweepClusterSnapshots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeDBClusterSnapshotsInput{} @@ -153,7 +153,7 @@ func sweepClusterParameterGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeDBClusterParameterGroupsInput{} @@ -169,7 +169,7 @@ func sweepClusterParameterGroups(region string) error { } if err != nil { - return fmt.Errorf("error listing DocumentDB Cluster Parameter Groups (%s): %s", region, err) + return err } for _, v := range page.DBClusterParameterGroups { @@ -201,7 +201,7 @@ func sweepClusterInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeDBInstancesInput{} @@ -246,7 +246,7 @@ func sweepGlobalClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeGlobalClustersInput{} @@ -287,7 +287,7 @@ func sweepSubnetGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeDBSubnetGroupsInput{} @@ -328,7 +328,7 @@ func sweepEventSubscriptions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBClient(ctx) input := &docdb.DescribeEventSubscriptionsInput{} diff --git a/internal/service/docdbelastic/sweep.go b/internal/service/docdbelastic/sweep.go index 0e9e53d8c5b0..662735cb9a03 100644 --- a/internal/service/docdbelastic/sweep.go +++ b/internal/service/docdbelastic/sweep.go @@ -32,7 +32,7 @@ func sweepClusters(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DocDBElasticClient(ctx) input := &docdbelastic.ListClustersInput{} diff --git a/internal/service/ds/sweep.go b/internal/service/ds/sweep.go index 183b6567e31e..5331df8c9871 100644 --- a/internal/service/ds/sweep.go +++ b/internal/service/ds/sweep.go @@ -44,7 +44,7 @@ func sweepDirectories(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DSClient(ctx) input := &directoryservice.DescribeDirectoriesInput{} @@ -85,7 +85,7 @@ func sweepRegions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DSClient(ctx) input := &directoryservice.DescribeDirectoriesInput{} diff --git a/internal/service/dynamodb/sweep.go b/internal/service/dynamodb/sweep.go index 40065eb56f3a..c14087733c26 100644 --- a/internal/service/dynamodb/sweep.go +++ b/internal/service/dynamodb/sweep.go @@ -36,7 +36,7 @@ func sweepTables(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DynamoDBClient(ctx) input := &dynamodb.ListTablesInput{} @@ -95,7 +95,7 @@ func sweepBackups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.DynamoDBClient(ctx) input := &dynamodb.ListBackupsInput{ diff --git a/internal/service/ec2/sweep.go b/internal/service/ec2/sweep.go index 1b5b6b609af9..6779a586b136 100644 --- a/internal/service/ec2/sweep.go +++ b/internal/service/ec2/sweep.go @@ -33,10 +33,7 @@ func RegisterSweepers() { }, }) - resource.AddTestSweepers("aws_ec2_capacity_reservation", &resource.Sweeper{ - Name: "aws_ec2_capacity_reservation", - F: sweepCapacityReservations, - }) + awsv2.Register("aws_ec2_capacity_reservation", sweepCapacityReservations) resource.AddTestSweepers("aws_ec2_carrier_gateway", &resource.Sweeper{ Name: "aws_ec2_carrier_gateway", @@ -473,57 +470,43 @@ func RegisterSweepers() { awsv2.Register("aws_vpc_route_server_propagation", sweepRouteServerPropagations) } -func sweepCapacityReservations(region string) error { - ctx := sweep.Context(region) - client, err := sweep.SharedRegionalSweepClient(ctx, region) - if err != nil { - return fmt.Errorf("error getting client: %s", err) - } +func sweepCapacityReservations(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.EC2Client(ctx) + var input ec2.DescribeCapacityReservationsInput + var sweepResources []sweep.Sweepable - input := ec2.DescribeCapacityReservationsInput{} - resp, err := conn.DescribeCapacityReservations(ctx, &input) - - if awsv2.SkipSweepError(err) { - log.Printf("[WARN] Skipping EC2 Capacity Reservation sweep for %s: %s", region, err) - return nil - } - - if err != nil { - return fmt.Errorf("Error retrieving EC2 Capacity Reservations: %s", err) - } - - if len(resp.CapacityReservations) == 0 { - log.Print("[DEBUG] No EC2 Capacity Reservations to sweep") - return nil - } + pages := ec2.NewDescribeCapacityReservationsPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) - for _, r := range resp.CapacityReservations { - if r.State != awstypes.CapacityReservationStateCancelled && r.State != awstypes.CapacityReservationStateExpired { - id := aws.ToString(r.CapacityReservationId) + if err != nil { + return nil, err + } - log.Printf("[INFO] Cancelling EC2 Capacity Reservation EC2 Instance: %s", id) + for _, v := range page.CapacityReservations { + id := aws.ToString(v.CapacityReservationId) - input := ec2.CancelCapacityReservationInput{ - CapacityReservationId: aws.String(id), + if state := v.State; state == awstypes.CapacityReservationStateCancelled || state == awstypes.CapacityReservationStateExpired { + log.Printf("[INFO] Skipping EC2 Capacity Reservation %s: State=%s", id, state) + continue } - _, err := conn.CancelCapacityReservation(ctx, &input) + r := resourceCapacityReservation() + d := r.Data(nil) + d.SetId(id) - if err != nil { - log.Printf("[ERROR] Error cancelling EC2 Capacity Reservation (%s): %s", id, err) - } + sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client)) } } - return nil + return sweepResources, nil } func sweepCarrierGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeCarrierGatewaysInput{} @@ -564,7 +547,7 @@ func sweepClientVPNEndpoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeClientVpnEndpointsInput{} @@ -605,7 +588,7 @@ func sweepClientVPNNetworkAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeClientVpnEndpointsInput{} @@ -667,7 +650,7 @@ func sweepFleets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -713,7 +696,7 @@ func sweepEBSVolumes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeVolumesInput{} @@ -761,7 +744,7 @@ func sweepEBSSnapshots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeSnapshotsInput{ OwnerIds: []string{"self"}, @@ -804,7 +787,7 @@ func sweepEgressOnlyInternetGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeEgressOnlyInternetGatewaysInput{} conn := client.EC2Client(ctx) @@ -845,7 +828,7 @@ func sweepEIPs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } // There is currently no paginator or Marker/NextToken input := ec2.DescribeAddressesInput{} @@ -860,7 +843,7 @@ func sweepEIPs(region string) error { } if err != nil { - return fmt.Errorf("error describing EC2 EIPs: %s", err) + return err } for _, v := range output.Addresses { @@ -895,7 +878,7 @@ func sweepEIPDomainNames(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeAddressesAttributeInput{ @@ -936,7 +919,7 @@ func sweepFlowLogs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeFlowLogsInput{} @@ -977,7 +960,7 @@ func sweepHosts(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeHostsInput{} @@ -1018,7 +1001,7 @@ func sweepInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeInstancesInput{} @@ -1072,7 +1055,7 @@ func sweepInternetGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -1152,7 +1135,7 @@ func sweepKeyPairs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeKeyPairsInput{} @@ -1190,7 +1173,7 @@ func sweepLaunchTemplates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeLaunchTemplatesInput{} @@ -1231,7 +1214,7 @@ func sweepNATGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeNatGatewaysInput{} conn := client.EC2Client(ctx) @@ -1272,7 +1255,7 @@ func sweepNetworkACLs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeNetworkAclsInput{} conn := client.EC2Client(ctx) @@ -1325,7 +1308,7 @@ func sweepNetworkInterfaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeNetworkInterfacesInput{} @@ -1373,7 +1356,7 @@ func sweepManagedPrefixLists(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) var sweepResources []sweep.Sweepable @@ -1418,7 +1401,7 @@ func sweepNetworkInsightsPaths(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) var sweepResources []sweep.Sweepable @@ -1459,7 +1442,7 @@ func sweepPlacementGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribePlacementGroupsInput{} @@ -1498,7 +1481,7 @@ func sweepRouteTables(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -1601,7 +1584,7 @@ func sweepSecurityGroups(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -1701,7 +1684,7 @@ func sweepSpotFleetRequests(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -1750,7 +1733,7 @@ func sweepSpotInstanceRequests(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -1828,7 +1811,7 @@ func sweepTrafficMirrorFilters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTrafficMirrorFiltersInput{} @@ -1869,7 +1852,7 @@ func sweepTrafficMirrorSessions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTrafficMirrorSessionsInput{} @@ -1910,7 +1893,7 @@ func sweepTrafficMirrorTargets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTrafficMirrorTargetsInput{} @@ -1951,7 +1934,7 @@ func sweepTransitGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewaysInput{} @@ -1996,7 +1979,7 @@ func sweepTransitGatewayConnectPeers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewayConnectPeersInput{} @@ -2041,7 +2024,7 @@ func sweepTransitGatewayConnects(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewayConnectsInput{} @@ -2086,7 +2069,7 @@ func sweepTransitGatewayMulticastDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewayMulticastDomainsInput{} @@ -2131,7 +2114,7 @@ func sweepTransitGatewayPeeringAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewayPeeringAttachmentsInput{} @@ -2176,7 +2159,7 @@ func sweepTransitGatewayVPCAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeTransitGatewayVpcAttachmentsInput{} @@ -2222,7 +2205,7 @@ func sweepVPCDHCPOptions(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeDhcpOptionsInput{} @@ -2292,7 +2275,7 @@ func sweepVPCEndpoints(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2347,7 +2330,7 @@ func sweepVPCEndpointConnectionAccepters(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2392,7 +2375,7 @@ func sweepVPCEndpointServices(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2442,7 +2425,7 @@ func sweepVPCPeeringConnections(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeVpcPeeringConnectionsInput{} @@ -2485,7 +2468,7 @@ func sweepVPCs(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2533,7 +2516,7 @@ func sweepVPNConnections(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2576,7 +2559,7 @@ func sweepVPNGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeVpnGatewaysInput{} @@ -2626,7 +2609,7 @@ func sweepCustomerGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeCustomerGatewaysInput{} @@ -2739,7 +2722,7 @@ func sweepAMIs(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ec2.DescribeImagesInput{ @@ -2784,7 +2767,7 @@ func sweepNetworkPerformanceMetricSubscriptions(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2827,7 +2810,7 @@ func sweepInstanceConnectEndpoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) input := ec2.DescribeInstanceConnectEndpointsInput{} @@ -2871,7 +2854,7 @@ func sweepVerifiedAccessEndpoints(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2914,7 +2897,7 @@ func sweepVerifiedAccessGroups(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -2957,7 +2940,7 @@ func sweepVerifiedAccessInstances(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -3000,7 +2983,7 @@ func sweepVerifiedAccessTrustProviders(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) @@ -3043,7 +3026,7 @@ func sweepVerifiedAccessTrustProviderAttachments(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EC2Client(ctx) diff --git a/internal/service/ecr/sweep.go b/internal/service/ecr/sweep.go index 623ceb1d576a..19b3d3c875db 100644 --- a/internal/service/ecr/sweep.go +++ b/internal/service/ecr/sweep.go @@ -26,7 +26,7 @@ func sweepRepositories(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECRClient(ctx) input := &ecr.DescribeRepositoriesInput{} diff --git a/internal/service/ecrpublic/sweep.go b/internal/service/ecrpublic/sweep.go index 3dfd5978bf2e..ca7285580c5c 100644 --- a/internal/service/ecrpublic/sweep.go +++ b/internal/service/ecrpublic/sweep.go @@ -32,7 +32,7 @@ func sweepRepositories(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECRPublicClient(ctx) input := &ecrpublic.DescribeRepositoriesInput{} diff --git a/internal/service/ecs/sweep.go b/internal/service/ecs/sweep.go index 087deea59a17..e8883c7fa044 100644 --- a/internal/service/ecs/sweep.go +++ b/internal/service/ecs/sweep.go @@ -51,7 +51,7 @@ func sweepCapacityProviders(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECSClient(ctx) input := &ecs.DescribeCapacityProvidersInput{} @@ -102,7 +102,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECSClient(ctx) input := &ecs.ListClustersInput{} @@ -143,7 +143,7 @@ func sweepServices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECSClient(ctx) input := &ecs.ListClustersInput{} @@ -201,7 +201,7 @@ func sweepTaskDefinitions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ECSClient(ctx) input := &ecs.ListTaskDefinitionsInput{} diff --git a/internal/service/efs/sweep.go b/internal/service/efs/sweep.go index f49d5989f2c8..1aafffe74887 100644 --- a/internal/service/efs/sweep.go +++ b/internal/service/efs/sweep.go @@ -40,7 +40,7 @@ func sweepAccessPoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EFSClient(ctx) input := &efs.DescribeFileSystemsInput{} @@ -96,7 +96,7 @@ func sweepFileSystems(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EFSClient(ctx) input := &efs.DescribeFileSystemsInput{} @@ -137,7 +137,7 @@ func sweepMountTargets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EFSClient(ctx) input := &efs.DescribeFileSystemsInput{} diff --git a/internal/service/eks/sweep.go b/internal/service/eks/sweep.go index ee8e9f5cf260..a5da5dcc3e6d 100644 --- a/internal/service/eks/sweep.go +++ b/internal/service/eks/sweep.go @@ -56,7 +56,7 @@ func sweepAddons(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EKSClient(ctx) input := &eks.ListClustersInput{} @@ -125,7 +125,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EKSClient(ctx) input := &eks.ListClustersInput{} @@ -181,7 +181,7 @@ func sweepFargateProfiles(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EKSClient(ctx) input := &eks.ListClustersInput{} @@ -250,7 +250,7 @@ func sweepIdentityProvidersConfig(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EKSClient(ctx) input := &eks.ListClustersInput{} @@ -319,7 +319,7 @@ func sweepNodeGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EKSClient(ctx) input := &eks.ListClustersInput{} diff --git a/internal/service/elasticache/sweep.go b/internal/service/elasticache/sweep.go index ef6f111aa6c5..7036c47f56aa 100644 --- a/internal/service/elasticache/sweep.go +++ b/internal/service/elasticache/sweep.go @@ -90,7 +90,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticache.DescribeCacheClustersInput{ ShowCacheClustersNotInReplicationGroups: aws.Bool(true), @@ -139,7 +139,7 @@ func sweepGlobalReplicationGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticache.DescribeGlobalReplicationGroupsInput{ ShowMemberInfo: aws.Bool(true), @@ -188,7 +188,7 @@ func sweepParameterGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticache.DescribeCacheParameterGroupsInput{} conn := client.ElastiCacheClient(ctx) @@ -236,7 +236,7 @@ func sweepReplicationGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticache.DescribeReplicationGroupsInput{} conn := client.ElastiCacheClient(ctx) @@ -280,7 +280,7 @@ func sweepServerlessCaches(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElastiCacheClient(ctx) input := &elasticache.DescribeServerlessCachesInput{} @@ -319,7 +319,7 @@ func sweepSubnetGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElastiCacheClient(ctx) input := &elasticache.DescribeCacheSubnetGroupsInput{} @@ -367,7 +367,7 @@ func sweepUsers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElastiCacheClient(ctx) input := &elasticache.DescribeUsersInput{} @@ -415,7 +415,7 @@ func sweepUserGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElastiCacheClient(ctx) input := &elasticache.DescribeUserGroupsInput{} diff --git a/internal/service/elasticbeanstalk/sweep.go b/internal/service/elasticbeanstalk/sweep.go index ece174aee5b0..b2467aaa78ee 100644 --- a/internal/service/elasticbeanstalk/sweep.go +++ b/internal/service/elasticbeanstalk/sweep.go @@ -31,7 +31,7 @@ func sweepApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElasticBeanstalkClient(ctx) input := &elasticbeanstalk.DescribeApplicationsInput{} @@ -69,7 +69,7 @@ func sweepEnvironments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ElasticBeanstalkClient(ctx) input := &elasticbeanstalk.DescribeEnvironmentsInput{ diff --git a/internal/service/elasticsearch/sweep.go b/internal/service/elasticsearch/sweep.go index 2680f4e1db00..18a3c294fec6 100644 --- a/internal/service/elasticsearch/sweep.go +++ b/internal/service/elasticsearch/sweep.go @@ -27,7 +27,7 @@ func sweepDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticsearchservice.ListDomainNamesInput{ EngineType: awstypes.EngineTypeElasticsearch, diff --git a/internal/service/elb/sweep.go b/internal/service/elb/sweep.go index eb8a3acdb3a5..0e0e6038c8ab 100644 --- a/internal/service/elb/sweep.go +++ b/internal/service/elb/sweep.go @@ -25,7 +25,7 @@ func sweepLoadBalancers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ELBClient(ctx) input := &elasticloadbalancing.DescribeLoadBalancersInput{} diff --git a/internal/service/elbv2/sweep.go b/internal/service/elbv2/sweep.go index 27047ba44d25..967838761020 100644 --- a/internal/service/elbv2/sweep.go +++ b/internal/service/elbv2/sweep.go @@ -48,7 +48,7 @@ func sweepLoadBalancers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticloadbalancingv2.DescribeLoadBalancersInput{} conn := client.ELBV2Client(ctx) @@ -130,7 +130,7 @@ func sweepListeners(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &elasticloadbalancingv2.DescribeLoadBalancersInput{} conn := client.ELBV2Client(ctx) diff --git a/internal/service/emr/sweep.go b/internal/service/emr/sweep.go index 3f18ad064f94..9ac85e134bdb 100644 --- a/internal/service/emr/sweep.go +++ b/internal/service/emr/sweep.go @@ -32,7 +32,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EMRClient(ctx) input := &emr.ListClustersInput{ @@ -88,7 +88,7 @@ func sweepStudios(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EMRClient(ctx) diff --git a/internal/service/emrcontainers/sweep.go b/internal/service/emrcontainers/sweep.go index 24fa1296fbd0..8a8054be6c71 100644 --- a/internal/service/emrcontainers/sweep.go +++ b/internal/service/emrcontainers/sweep.go @@ -31,7 +31,7 @@ func sweepVirtualClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EMRContainersClient(ctx) input := &emrcontainers.ListVirtualClustersInput{} @@ -76,7 +76,7 @@ func sweepJobTemplates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EMRContainersClient(ctx) input := &emrcontainers.ListJobTemplatesInput{} diff --git a/internal/service/emrserverless/sweep.go b/internal/service/emrserverless/sweep.go index fe41ee2221b7..6e7d1ae0534b 100644 --- a/internal/service/emrserverless/sweep.go +++ b/internal/service/emrserverless/sweep.go @@ -26,7 +26,7 @@ func sweepApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EMRServerlessClient(ctx) input := &emrserverless.ListApplicationsInput{} diff --git a/internal/service/events/sweep.go b/internal/service/events/sweep.go index 5681d2739c49..8d104fdc13ea 100644 --- a/internal/service/events/sweep.go +++ b/internal/service/events/sweep.go @@ -252,7 +252,7 @@ func sweepRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EventsClient(ctx) input := &eventbridge.ListEventBusesInput{} @@ -318,7 +318,7 @@ func sweepTargets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.EventsClient(ctx) input := &eventbridge.ListEventBusesInput{} diff --git a/internal/service/finspace/sweep.go b/internal/service/finspace/sweep.go index ae4dd1dc21e9..f0befa794609 100644 --- a/internal/service/finspace/sweep.go +++ b/internal/service/finspace/sweep.go @@ -26,7 +26,7 @@ func sweepKxEnvironments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.FinSpaceClient(ctx) input := &finspace.ListKxEnvironmentsInput{} diff --git a/internal/service/firehose/sweep.go b/internal/service/firehose/sweep.go index fdae1adab0f4..0147cf125105 100644 --- a/internal/service/firehose/sweep.go +++ b/internal/service/firehose/sweep.go @@ -25,7 +25,7 @@ func sweepDeliveryStreams(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.FirehoseClient(ctx) input := &firehose.ListDeliveryStreamsInput{} diff --git a/internal/service/fms/sweep.go b/internal/service/fms/sweep.go index b681f0856952..0413701c8c12 100644 --- a/internal/service/fms/sweep.go +++ b/internal/service/fms/sweep.go @@ -37,7 +37,7 @@ func sweepAdminAccount(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.FMSClient(ctx) diff --git a/internal/service/gamelift/sweep.go b/internal/service/gamelift/sweep.go index b0bc6460b00b..573b40d6bdd2 100644 --- a/internal/service/gamelift/sweep.go +++ b/internal/service/gamelift/sweep.go @@ -56,7 +56,7 @@ func sweepAliases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &gamelift.ListAliasesInput{} conn := client.GameLiftClient(ctx) @@ -97,7 +97,7 @@ func sweepBuilds(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &gamelift.ListBuildsInput{} conn := client.GameLiftClient(ctx) @@ -138,7 +138,7 @@ func sweepScripts(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &gamelift.ListScriptsInput{} conn := client.GameLiftClient(ctx) @@ -179,7 +179,7 @@ func sweepFleets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &gamelift.ListFleetsInput{} conn := client.GameLiftClient(ctx) @@ -220,7 +220,7 @@ func sweepGameServerGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GameLiftClient(ctx) input := &gamelift.ListGameServerGroupsInput{} @@ -261,7 +261,7 @@ func sweepGameSessionQueue(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &gamelift.DescribeGameSessionQueuesInput{} conn := client.GameLiftClient(ctx) diff --git a/internal/service/glacier/sweep.go b/internal/service/glacier/sweep.go index 35789d9d88bb..5f474b16b390 100644 --- a/internal/service/glacier/sweep.go +++ b/internal/service/glacier/sweep.go @@ -25,7 +25,7 @@ func sweepVaults(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &glacier.ListVaultsInput{} conn := client.GlacierClient(ctx) diff --git a/internal/service/globalaccelerator/sweep.go b/internal/service/globalaccelerator/sweep.go index a340596bb430..50c23ca101aa 100644 --- a/internal/service/globalaccelerator/sweep.go +++ b/internal/service/globalaccelerator/sweep.go @@ -62,7 +62,7 @@ func sweepAccelerators(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListAcceleratorsInput{} @@ -103,7 +103,7 @@ func sweepEndpointGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListAcceleratorsInput{} @@ -174,7 +174,7 @@ func sweepListeners(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListAcceleratorsInput{} @@ -230,7 +230,7 @@ func sweepCustomRoutingAccelerators(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListCustomRoutingAcceleratorsInput{} @@ -271,7 +271,7 @@ func sweepCustomRoutingEndpointGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListCustomRoutingAcceleratorsInput{} @@ -342,7 +342,7 @@ func sweepCustomRoutingListeners(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GlobalAcceleratorClient(ctx) input := &globalaccelerator.ListCustomRoutingAcceleratorsInput{} diff --git a/internal/service/grafana/sweep.go b/internal/service/grafana/sweep.go index 65f7e31cd839..699d4b8953fb 100644 --- a/internal/service/grafana/sweep.go +++ b/internal/service/grafana/sweep.go @@ -25,7 +25,7 @@ func sweepWorkSpaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &grafana.ListWorkspacesInput{} conn := client.GrafanaClient(ctx) diff --git a/internal/service/guardduty/sweep.go b/internal/service/guardduty/sweep.go index 7adaaed6a032..96119ac3c62d 100644 --- a/internal/service/guardduty/sweep.go +++ b/internal/service/guardduty/sweep.go @@ -33,7 +33,7 @@ func sweepDetectors(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GuardDutyClient(ctx) @@ -81,7 +81,7 @@ func sweepPublishingDestinations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.GuardDutyClient(ctx) @@ -116,7 +116,7 @@ func sweepPublishingDestinations(region string) error { } if err != nil { - return fmt.Errorf("error retrieving GuardDuty Publishing Destinations: %s", err) + return err } for _, destination_element := range page.Destinations { diff --git a/internal/service/iam/sweep.go b/internal/service/iam/sweep.go index 5c58724368e6..15cf6ef25709 100644 --- a/internal/service/iam/sweep.go +++ b/internal/service/iam/sweep.go @@ -117,7 +117,7 @@ func sweepGroups(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IAMClient(ctx) @@ -350,7 +350,7 @@ func sweepPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IAMClient(ctx) @@ -424,7 +424,7 @@ func sweepRoles(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IAMClient(ctx) @@ -505,7 +505,7 @@ func sweepServerCertificates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IAMClient(ctx) @@ -518,7 +518,7 @@ func sweepServerCertificates(region string) error { } if err != nil { - return fmt.Errorf("Error retrieving IAM Server Certificates: %s", err) + return err } for _, sc := range page.ServerCertificateMetadataList { @@ -584,7 +584,7 @@ func sweepUsers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IAMClient(ctx) prefixes := []string{ @@ -605,7 +605,7 @@ func sweepUsers(region string) error { } if err != nil { - return fmt.Errorf("retrieving IAM Users: %s", err) + return err } for _, user := range page.Users { diff --git a/internal/service/imagebuilder/sweep.go b/internal/service/imagebuilder/sweep.go index dfc0deae5fd9..dc341b44e64e 100644 --- a/internal/service/imagebuilder/sweep.go +++ b/internal/service/imagebuilder/sweep.go @@ -103,7 +103,7 @@ func sweepDistributionConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListDistributionConfigurationsInput{} @@ -144,7 +144,7 @@ func sweepImagePipelines(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListImagePipelinesInput{} @@ -185,7 +185,7 @@ func sweepImageRecipes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListImageRecipesInput{} @@ -226,7 +226,7 @@ func sweepContainerRecipes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListContainerRecipesInput{} @@ -267,7 +267,7 @@ func sweepImages(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListImagesInput{} @@ -308,7 +308,7 @@ func sweepInfrastructureConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListInfrastructureConfigurationsInput{} @@ -349,7 +349,7 @@ func sweepLifecyclePolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ImageBuilderClient(ctx) input := &imagebuilder.ListLifecyclePoliciesInput{} diff --git a/internal/service/internetmonitor/sweep.go b/internal/service/internetmonitor/sweep.go index 19dcc1fa4b6a..14dced4a04ed 100644 --- a/internal/service/internetmonitor/sweep.go +++ b/internal/service/internetmonitor/sweep.go @@ -25,7 +25,7 @@ func sweepMonitors(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &internetmonitor.ListMonitorsInput{} conn := client.InternetMonitorClient(ctx) diff --git a/internal/service/iot/sweep.go b/internal/service/iot/sweep.go index 408d2388e38e..ea90d165df78 100644 --- a/internal/service/iot/sweep.go +++ b/internal/service/iot/sweep.go @@ -112,7 +112,7 @@ func sweepCertificates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListCertificatesInput{} @@ -154,7 +154,7 @@ func sweepPolicyAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListPoliciesInput{} @@ -218,7 +218,7 @@ func sweepPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListPoliciesInput{} @@ -259,7 +259,7 @@ func sweepRoleAliases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListRoleAliasesInput{} @@ -300,7 +300,7 @@ func sweepThingPrincipalAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListThingsInput{} @@ -364,7 +364,7 @@ func sweepThings(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListThingsInput{} @@ -405,7 +405,7 @@ func sweepThingTypes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListThingTypesInput{} @@ -446,7 +446,7 @@ func sweepTopicRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListTopicRulesInput{} @@ -487,7 +487,7 @@ func sweepThingGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListThingGroupsInput{} @@ -528,7 +528,7 @@ func sweepTopicRuleDestinations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListTopicRuleDestinationsInput{} @@ -569,7 +569,7 @@ func sweepAuthorizers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListAuthorizersInput{} @@ -611,7 +611,7 @@ func sweepDomainConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListDomainConfigurationsInput{} @@ -675,7 +675,7 @@ func sweepCACertificates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.IoTClient(ctx) input := &iot.ListCACertificatesInput{} diff --git a/internal/service/kafka/sweep.go b/internal/service/kafka/sweep.go index 6d76ab291fd2..0f0a0c1537b7 100644 --- a/internal/service/kafka/sweep.go +++ b/internal/service/kafka/sweep.go @@ -37,7 +37,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &kafka.ListClustersV2Input{} conn := client.KafkaClient(ctx) @@ -85,7 +85,7 @@ func sweepConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KafkaClient(ctx) input := &kafka.ListConfigurationsInput{} diff --git a/internal/service/kafkaconnect/sweep.go b/internal/service/kafkaconnect/sweep.go index 8c957e6e321b..6167f1ef3ca0 100644 --- a/internal/service/kafkaconnect/sweep.go +++ b/internal/service/kafkaconnect/sweep.go @@ -41,7 +41,7 @@ func sweepConnectors(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KafkaConnectClient(ctx) input := &kafkaconnect.ListConnectorsInput{} @@ -82,7 +82,7 @@ func sweepCustomPlugins(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KafkaConnectClient(ctx) input := &kafkaconnect.ListCustomPluginsInput{} @@ -123,7 +123,7 @@ func sweepWorkerConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KafkaConnectClient(ctx) input := &kafkaconnect.ListWorkerConfigurationsInput{} diff --git a/internal/service/keyspaces/sweep.go b/internal/service/keyspaces/sweep.go index ea122fc22c9d..77b2b7f3157c 100644 --- a/internal/service/keyspaces/sweep.go +++ b/internal/service/keyspaces/sweep.go @@ -26,7 +26,7 @@ func sweepKeyspaces(region string) error { // nosemgrep:ci.keyspaces-in-func-nam ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KeyspacesClient(ctx) input := &keyspaces.ListKeyspacesInput{} diff --git a/internal/service/kinesis/sweep.go b/internal/service/kinesis/sweep.go index b061ced1eccf..ecba7d3a6fb0 100644 --- a/internal/service/kinesis/sweep.go +++ b/internal/service/kinesis/sweep.go @@ -26,7 +26,7 @@ func sweepStreams(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KinesisClient(ctx) input := &kinesis.ListStreamsInput{} diff --git a/internal/service/kinesisanalytics/sweep.go b/internal/service/kinesisanalytics/sweep.go index 026391701876..b69841fd8256 100644 --- a/internal/service/kinesisanalytics/sweep.go +++ b/internal/service/kinesisanalytics/sweep.go @@ -29,7 +29,7 @@ func sweepApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KinesisAnalyticsClient(ctx) input := &kinesisanalytics.ListApplicationsInput{} diff --git a/internal/service/kinesisanalyticsv2/sweep.go b/internal/service/kinesisanalyticsv2/sweep.go index 90cca2f68dd8..f956c319ef8a 100644 --- a/internal/service/kinesisanalyticsv2/sweep.go +++ b/internal/service/kinesisanalyticsv2/sweep.go @@ -27,7 +27,7 @@ func sweepApplication(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KinesisAnalyticsV2Client(ctx) input := &kinesisanalyticsv2.ListApplicationsInput{} diff --git a/internal/service/kms/sweep.go b/internal/service/kms/sweep.go index d427deb284ea..020de559bb3f 100644 --- a/internal/service/kms/sweep.go +++ b/internal/service/kms/sweep.go @@ -30,7 +30,7 @@ func sweepKeys(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.KMSClient(ctx) input := &kms.ListKeysInput{ diff --git a/internal/service/lambda/sweep.go b/internal/service/lambda/sweep.go index 3d08737d35fa..7900eb2e6dca 100644 --- a/internal/service/lambda/sweep.go +++ b/internal/service/lambda/sweep.go @@ -35,7 +35,7 @@ func sweepFunctions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LambdaClient(ctx) input := &lambda.ListFunctionsInput{} @@ -77,7 +77,7 @@ func sweepLayerVersions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LambdaClient(ctx) input := &lambda.ListLayersInput{} diff --git a/internal/service/lexmodels/sweep.go b/internal/service/lexmodels/sweep.go index 0e59d642a048..04e2c71c2d4e 100644 --- a/internal/service/lexmodels/sweep.go +++ b/internal/service/lexmodels/sweep.go @@ -44,7 +44,7 @@ func sweepBotAliases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &lexmodelbuildingservice.GetBotsInput{} conn := client.LexModelsClient(ctx) @@ -109,7 +109,7 @@ func sweepBots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &lexmodelbuildingservice.GetBotsInput{} conn := client.LexModelsClient(ctx) @@ -150,7 +150,7 @@ func sweepIntents(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &lexmodelbuildingservice.GetIntentsInput{} conn := client.LexModelsClient(ctx) @@ -191,7 +191,7 @@ func sweepSlotTypes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &lexmodelbuildingservice.GetSlotTypesInput{} conn := client.LexModelsClient(ctx) diff --git a/internal/service/lexv2models/sweep.go b/internal/service/lexv2models/sweep.go index aa38a6fb18e3..75126996122c 100644 --- a/internal/service/lexv2models/sweep.go +++ b/internal/service/lexv2models/sweep.go @@ -27,7 +27,7 @@ func sweepBots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LexV2ModelsClient(ctx) input := &lexmodelsv2.ListBotsInput{} diff --git a/internal/service/licensemanager/sweep.go b/internal/service/licensemanager/sweep.go index 71c0e1d736c3..a98e5e44de6a 100644 --- a/internal/service/licensemanager/sweep.go +++ b/internal/service/licensemanager/sweep.go @@ -25,7 +25,7 @@ func sweepLicenseConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LicenseManagerClient(ctx) input := &licensemanager.ListLicenseConfigurationsInput{} diff --git a/internal/service/lightsail/sweep.go b/internal/service/lightsail/sweep.go index 4824e0208f5a..44a467f6301f 100644 --- a/internal/service/lightsail/sweep.go +++ b/internal/service/lightsail/sweep.go @@ -61,7 +61,7 @@ func sweepContainerServices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -76,7 +76,7 @@ func sweepContainerServices(region string) error { } if err != nil { - return fmt.Errorf("Error retrieving Lightsail Container Services: %s", err) + return err } for _, service := range output.ContainerServices { @@ -98,7 +98,7 @@ func sweepDatabases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -142,7 +142,7 @@ func sweepDisks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -185,7 +185,7 @@ func sweepDistributions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -228,7 +228,7 @@ func sweepDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -271,7 +271,7 @@ func sweepInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -287,7 +287,7 @@ func sweepInstances(region string) error { } if err != nil { - return fmt.Errorf("Error retrieving Lightsail Instances: %s", err) + return fmt.Errorf("Error retrieving Lightsail Instances: %w", err) } for _, instance := range output.Instances { @@ -300,7 +300,7 @@ func sweepInstances(region string) error { _, err := conn.DeleteInstance(ctx, input) if err != nil { - sweeperErr := fmt.Errorf("error deleting Lightsail Instance (%s): %s", name, err) + sweeperErr := fmt.Errorf("error deleting Lightsail Instance (%s): %w", name, err) log.Printf("[ERROR] %s", sweeperErr) sweeperErrs = multierror.Append(sweeperErrs, sweeperErr) } @@ -320,7 +320,7 @@ func sweepLoadBalancers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -363,7 +363,7 @@ func sweepStaticIPs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("Error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LightsailClient(ctx) @@ -376,7 +376,7 @@ func sweepStaticIPs(region string) error { log.Printf("[WARN] Skipping Lightsail Static IP sweep for %s: %s", region, err) return nil } - return fmt.Errorf("Error retrieving Lightsail Static IPs: %s", err) + return fmt.Errorf("Error retrieving Lightsail Static IPs: %w", err) } if len(output.StaticIps) == 0 { @@ -392,7 +392,7 @@ func sweepStaticIPs(region string) error { StaticIpName: aws.String(name), }) if err != nil { - return fmt.Errorf("Error deleting Lightsail Static IP %s: %s", name, err) + return fmt.Errorf("Error deleting Lightsail Static IP %s: %w", name, err) } } diff --git a/internal/service/location/sweep.go b/internal/service/location/sweep.go index a69e0b181e0d..45be4da769c8 100644 --- a/internal/service/location/sweep.go +++ b/internal/service/location/sweep.go @@ -51,7 +51,7 @@ func sweepGeofenceCollections(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) @@ -94,7 +94,7 @@ func sweepMaps(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) @@ -138,7 +138,7 @@ func sweepPlaceIndexes(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) @@ -182,7 +182,7 @@ func sweepRouteCalculators(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) @@ -226,7 +226,7 @@ func sweepTrackers(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) @@ -270,7 +270,7 @@ func sweepTrackerAssociations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.LocationClient(ctx) diff --git a/internal/service/logs/sweep.go b/internal/service/logs/sweep.go index 13dc8296b095..9f344ce3999b 100644 --- a/internal/service/logs/sweep.go +++ b/internal/service/logs/sweep.go @@ -224,7 +224,7 @@ func sweepGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &cloudwatchlogs.DescribeLogGroupsInput{} conn := client.LogsClient(ctx) @@ -265,7 +265,7 @@ func sweepQueryDefinitions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &cloudwatchlogs.DescribeQueryDefinitionsInput{} conn := client.LogsClient(ctx) @@ -309,7 +309,7 @@ func sweepResourcePolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &cloudwatchlogs.DescribeResourcePoliciesInput{} conn := client.LogsClient(ctx) diff --git a/internal/service/medialive/sweep.go b/internal/service/medialive/sweep.go index e832430346ac..36b782dac174 100644 --- a/internal/service/medialive/sweep.go +++ b/internal/service/medialive/sweep.go @@ -43,7 +43,7 @@ func sweepChannels(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MediaLiveClient(ctx) @@ -87,7 +87,7 @@ func sweepInputs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MediaLiveClient(ctx) @@ -131,7 +131,7 @@ func sweepInputSecurityGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MediaLiveClient(ctx) @@ -175,7 +175,7 @@ func sweepMultiplexes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MediaLiveClient(ctx) diff --git a/internal/service/mediapackage/sweep.go b/internal/service/mediapackage/sweep.go index d07d23b3b014..480dd1d65903 100644 --- a/internal/service/mediapackage/sweep.go +++ b/internal/service/mediapackage/sweep.go @@ -25,7 +25,7 @@ func sweepChannels(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MediaPackageClient(ctx) diff --git a/internal/service/memorydb/sweep.go b/internal/service/memorydb/sweep.go index 0034e24ea43b..2c7f716d9a25 100644 --- a/internal/service/memorydb/sweep.go +++ b/internal/service/memorydb/sweep.go @@ -72,7 +72,7 @@ func sweepACLs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MemoryDBClient(ctx) input := memorydb.DescribeACLsInput{} @@ -170,7 +170,7 @@ func sweepParameterGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MemoryDBClient(ctx) input := memorydb.DescribeParameterGroupsInput{} @@ -218,7 +218,7 @@ func sweepSnapshots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MemoryDBClient(ctx) input := memorydb.DescribeSnapshotsInput{} @@ -259,7 +259,7 @@ func sweepSubnetGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MemoryDBClient(ctx) input := memorydb.DescribeSubnetGroupsInput{} @@ -307,7 +307,7 @@ func sweepUsers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.MemoryDBClient(ctx) input := memorydb.DescribeUsersInput{} diff --git a/internal/service/mq/sweep.go b/internal/service/mq/sweep.go index 630ebc254f4f..c412c39bc3e4 100644 --- a/internal/service/mq/sweep.go +++ b/internal/service/mq/sweep.go @@ -25,7 +25,7 @@ func sweepBrokers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &mq.ListBrokersInput{MaxResults: aws.Int32(100)} conn := client.MQClient(ctx) diff --git a/internal/service/mwaa/sweep.go b/internal/service/mwaa/sweep.go index 0b9ba529af9d..583ca00ff3ea 100644 --- a/internal/service/mwaa/sweep.go +++ b/internal/service/mwaa/sweep.go @@ -25,7 +25,7 @@ func sweepEnvironment(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &mwaa.ListEnvironmentsInput{} conn := client.MWAAClient(ctx) diff --git a/internal/service/neptune/sweep.go b/internal/service/neptune/sweep.go index d20a2a93cf23..7626594e2051 100644 --- a/internal/service/neptune/sweep.go +++ b/internal/service/neptune/sweep.go @@ -122,7 +122,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBClustersInput{} @@ -181,7 +181,7 @@ func sweepClusterSnapshots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBClusterSnapshotsInput{} @@ -222,7 +222,7 @@ func sweepClusterParameterGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBClusterParameterGroupsInput{} @@ -270,7 +270,7 @@ func sweepClusterInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBInstancesInput{} @@ -365,7 +365,7 @@ func sweepParameterGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBParameterGroupsInput{} @@ -413,7 +413,7 @@ func sweepSubnetGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NeptuneClient(ctx) input := &neptune.DescribeDBSubnetGroupsInput{} diff --git a/internal/service/networkfirewall/sweep.go b/internal/service/networkfirewall/sweep.go index 1d4f7859bbdc..c71db02aa249 100644 --- a/internal/service/networkfirewall/sweep.go +++ b/internal/service/networkfirewall/sweep.go @@ -49,7 +49,7 @@ func sweepFirewallPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkFirewallClient(ctx) input := &networkfirewall.ListFirewallPoliciesInput{} @@ -90,7 +90,7 @@ func sweepFirewalls(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkFirewallClient(ctx) input := &networkfirewall.ListFirewallsInput{} @@ -131,7 +131,7 @@ func sweepLoggingConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkFirewallClient(ctx) input := &networkfirewall.ListFirewallsInput{} @@ -172,7 +172,7 @@ func sweepRuleGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkFirewallClient(ctx) input := &networkfirewall.ListRuleGroupsInput{} diff --git a/internal/service/networkmanager/sweep.go b/internal/service/networkmanager/sweep.go index d2ee2e387833..b44bb22262a0 100644 --- a/internal/service/networkmanager/sweep.go +++ b/internal/service/networkmanager/sweep.go @@ -123,7 +123,7 @@ func sweepGlobalNetworks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} @@ -164,7 +164,7 @@ func sweepCoreNetworks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListCoreNetworksInput{} @@ -205,7 +205,7 @@ func sweepConnectAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListAttachmentsInput{ @@ -248,7 +248,7 @@ func sweepDirectConnectGatewayAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListAttachmentsInput{ @@ -294,7 +294,7 @@ func sweepSiteToSiteVPNAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListAttachmentsInput{ @@ -337,7 +337,7 @@ func sweepTransitGatewayPeerings(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListPeeringsInput{ @@ -380,7 +380,7 @@ func sweepTransitGatewayRouteTableAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListAttachmentsInput{ @@ -423,7 +423,7 @@ func sweepVPCAttachments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.ListAttachmentsInput{ @@ -466,7 +466,7 @@ func sweepSites(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} @@ -528,7 +528,7 @@ func sweepDevices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} @@ -590,7 +590,7 @@ func sweepLinks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} @@ -652,7 +652,7 @@ func sweepLinkAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} @@ -713,7 +713,7 @@ func sweepConnections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.NetworkManagerClient(ctx) input := &networkmanager.DescribeGlobalNetworksInput{} diff --git a/internal/service/opensearch/sweep.go b/internal/service/opensearch/sweep.go index 334c848fe12c..95685c338959 100644 --- a/internal/service/opensearch/sweep.go +++ b/internal/service/opensearch/sweep.go @@ -42,7 +42,7 @@ func sweepDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -119,7 +119,7 @@ func sweepInboundConnections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchClient(ctx) input := &opensearch.DescribeInboundConnectionsInput{} @@ -169,7 +169,7 @@ func sweepOutboundConnections(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchClient(ctx) input := &opensearch.DescribeOutboundConnectionsInput{} diff --git a/internal/service/opensearchserverless/sweep.go b/internal/service/opensearchserverless/sweep.go index 960b0a2616ba..069fb6dbefa0 100644 --- a/internal/service/opensearchserverless/sweep.go +++ b/internal/service/opensearchserverless/sweep.go @@ -50,7 +50,7 @@ func sweepAccessPolicies(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchServerlessClient(ctx) input := &opensearchserverless.ListAccessPoliciesInput{ @@ -97,7 +97,7 @@ func sweepCollections(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchServerlessClient(ctx) input := &opensearchserverless.ListCollectionsInput{} @@ -140,7 +140,7 @@ func sweepSecurityConfigs(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchServerlessClient(ctx) input := &opensearchserverless.ListSecurityConfigsInput{ @@ -185,7 +185,7 @@ func sweepSecurityPolicies(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchServerlessClient(ctx) inputEncryption := &opensearchserverless.ListSecurityPoliciesInput{ @@ -259,7 +259,7 @@ func sweepVPCEndpoints(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.OpenSearchServerlessClient(ctx) input := &opensearchserverless.ListVpcEndpointsInput{} diff --git a/internal/service/pinpoint/sweep.go b/internal/service/pinpoint/sweep.go index e0ea841be203..326d2e179c40 100644 --- a/internal/service/pinpoint/sweep.go +++ b/internal/service/pinpoint/sweep.go @@ -25,7 +25,7 @@ func sweepApps(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &pinpoint.GetAppsInput{} conn := client.PinpointClient(ctx) diff --git a/internal/service/pinpointsmsvoicev2/sweep.go b/internal/service/pinpointsmsvoicev2/sweep.go index 53d855c77f94..2ef8b198f2bc 100644 --- a/internal/service/pinpointsmsvoicev2/sweep.go +++ b/internal/service/pinpointsmsvoicev2/sweep.go @@ -27,7 +27,7 @@ func sweepPhoneNumbers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &pinpointsmsvoicev2.DescribePhoneNumbersInput{} conn := client.PinpointSMSVoiceV2Client(ctx) diff --git a/internal/service/qldb/sweep.go b/internal/service/qldb/sweep.go index 614b825a7ed6..17e2bffa7a09 100644 --- a/internal/service/qldb/sweep.go +++ b/internal/service/qldb/sweep.go @@ -34,7 +34,7 @@ func sweepLedgers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QLDBClient(ctx) input := &qldb.ListLedgersInput{} @@ -75,7 +75,7 @@ func sweepStreams(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QLDBClient(ctx) input := &qldb.ListLedgersInput{} diff --git a/internal/service/quicksight/sweep.go b/internal/service/quicksight/sweep.go index c7a2ba27505e..1a6f8b389d1f 100644 --- a/internal/service/quicksight/sweep.go +++ b/internal/service/quicksight/sweep.go @@ -67,7 +67,7 @@ func sweepDashboards(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -111,7 +111,7 @@ func sweepDataSets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -155,7 +155,7 @@ func sweepDataSources(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -295,7 +295,7 @@ func sweepTemplates(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) diff --git a/internal/service/ram/sweep.go b/internal/service/ram/sweep.go index 2aaf62d8ac32..a87872806aae 100644 --- a/internal/service/ram/sweep.go +++ b/internal/service/ram/sweep.go @@ -26,7 +26,7 @@ func sweepResourceShares(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RAMClient(ctx) input := &ram.GetResourceSharesInput{ diff --git a/internal/service/redshift/sweep.go b/internal/service/redshift/sweep.go index ca727a2c5ac1..ae593fde87db 100644 --- a/internal/service/redshift/sweep.go +++ b/internal/service/redshift/sweep.go @@ -119,7 +119,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) input := &redshift.DescribeClustersInput{} @@ -225,7 +225,7 @@ func sweepScheduledActions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) input := &redshift.DescribeScheduledActionsInput{} @@ -266,7 +266,7 @@ func sweepSnapshotSchedules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) input := &redshift.DescribeSnapshotSchedulesInput{} @@ -365,7 +365,7 @@ func sweepHSMClientCertificates(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) @@ -407,7 +407,7 @@ func sweepHSMConfigurations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) input := &redshift.DescribeHsmConfigurationsInput{} @@ -448,7 +448,7 @@ func sweepAuthenticationProfiles(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftClient(ctx) input := &redshift.DescribeAuthenticationProfilesInput{} diff --git a/internal/service/redshiftserverless/sweep.go b/internal/service/redshiftserverless/sweep.go index fe9cfcd2b782..4de99b74c42c 100644 --- a/internal/service/redshiftserverless/sweep.go +++ b/internal/service/redshiftserverless/sweep.go @@ -38,7 +38,7 @@ func sweepNamespaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftServerlessClient(ctx) input := &redshiftserverless.ListNamespacesInput{} @@ -79,7 +79,7 @@ func sweepWorkgroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftServerlessClient(ctx) input := &redshiftserverless.ListWorkgroupsInput{} @@ -120,7 +120,7 @@ func sweepSnapshots(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RedshiftServerlessClient(ctx) input := &redshiftserverless.ListSnapshotsInput{} diff --git a/internal/service/resourceexplorer2/sweep.go b/internal/service/resourceexplorer2/sweep.go index 95dbb72504de..8cc4a82924f4 100644 --- a/internal/service/resourceexplorer2/sweep.go +++ b/internal/service/resourceexplorer2/sweep.go @@ -27,7 +27,7 @@ func sweepIndexes(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ResourceExplorer2Client(ctx) input := &resourceexplorer2.ListIndexesInput{} diff --git a/internal/service/route53/sweep.go b/internal/service/route53/sweep.go index 96ac1e38f20c..11f16edf9d77 100644 --- a/internal/service/route53/sweep.go +++ b/internal/service/route53/sweep.go @@ -65,7 +65,7 @@ func sweepHealthChecks(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53Client(ctx) input := &route53.ListHealthChecksInput{} @@ -113,7 +113,7 @@ func sweepKeySigningKeys(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53Client(ctx) input := &route53.ListHostedZonesInput{} @@ -316,7 +316,7 @@ func sweepZones(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53Client(ctx) input := &route53.ListHostedZonesInput{} diff --git a/internal/service/route53profiles/sweep.go b/internal/service/route53profiles/sweep.go index 6717cc0dcb19..e9292a332dc5 100644 --- a/internal/service/route53profiles/sweep.go +++ b/internal/service/route53profiles/sweep.go @@ -35,7 +35,7 @@ func sweepProfiles(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ProfilesClient(ctx) input := &route53profiles.ListProfilesInput{} @@ -71,7 +71,7 @@ func sweepProfileAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ProfilesClient(ctx) input := &route53profiles.ListProfileAssociationsInput{} diff --git a/internal/service/route53recoverycontrolconfig/sweep.go b/internal/service/route53recoverycontrolconfig/sweep.go index 3acfc46dde7d..b794ab330ac0 100644 --- a/internal/service/route53recoverycontrolconfig/sweep.go +++ b/internal/service/route53recoverycontrolconfig/sweep.go @@ -48,7 +48,7 @@ func sweepClusters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53RecoveryControlConfigClient(ctx) input := &r53rcc.ListClustersInput{} @@ -89,7 +89,7 @@ func sweepControlPanels(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53RecoveryControlConfigClient(ctx) input := &r53rcc.ListClustersInput{} @@ -154,7 +154,7 @@ func sweepRoutingControls(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53RecoveryControlConfigClient(ctx) input := &r53rcc.ListClustersInput{} @@ -234,7 +234,7 @@ func sweepSafetyRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53RecoveryControlConfigClient(ctx) input := &r53rcc.ListClustersInput{} diff --git a/internal/service/route53resolver/sweep.go b/internal/service/route53resolver/sweep.go index fd390b29ae5a..db5f363b91c2 100644 --- a/internal/service/route53resolver/sweep.go +++ b/internal/service/route53resolver/sweep.go @@ -97,7 +97,7 @@ func sweepDNSSECConfig(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverDnssecConfigsInput{} @@ -139,7 +139,7 @@ func sweepEndpoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverEndpointsInput{} @@ -180,7 +180,7 @@ func sweepFirewallConfigs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListFirewallConfigsInput{} @@ -222,7 +222,7 @@ func sweepFirewallDomainLists(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListFirewallDomainListsInput{} @@ -263,7 +263,7 @@ func sweepFirewallRuleGroupAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListFirewallRuleGroupAssociationsInput{} @@ -304,7 +304,7 @@ func sweepFirewallRuleGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListFirewallRuleGroupsInput{} @@ -352,7 +352,7 @@ func sweepFirewallRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListFirewallRuleGroupsInput{} @@ -420,7 +420,7 @@ func sweepQueryLogConfigAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverQueryLogConfigAssociationsInput{} @@ -463,7 +463,7 @@ func sweepQueryLogsConfig(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverQueryLogConfigsInput{} @@ -504,7 +504,7 @@ func sweepRuleAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverRuleAssociationsInput{} @@ -547,7 +547,7 @@ func sweepRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.Route53ResolverClient(ctx) input := &route53resolver.ListResolverRulesInput{} diff --git a/internal/service/rum/sweep.go b/internal/service/rum/sweep.go index 8854334755f6..05a378d34f5d 100644 --- a/internal/service/rum/sweep.go +++ b/internal/service/rum/sweep.go @@ -25,7 +25,7 @@ func sweepAppMonitors(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.RUMClient(ctx) input := &rum.ListAppMonitorsInput{} diff --git a/internal/service/s3control/sweep.go b/internal/service/s3control/sweep.go index edc1838fc70e..91556fd1e10d 100644 --- a/internal/service/s3control/sweep.go +++ b/internal/service/s3control/sweep.go @@ -68,7 +68,7 @@ func sweepAccessGrants(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -110,7 +110,7 @@ func sweepAccessGrantsInstances(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -152,7 +152,7 @@ func sweepAccessGrantsLocations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -194,7 +194,7 @@ func sweepAccessPoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -249,7 +249,7 @@ func sweepMultiRegionAccessPoints(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -293,7 +293,7 @@ func sweepObjectLambdaAccessPoints(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) @@ -341,7 +341,7 @@ func sweepStorageLensConfigurations(region string) error { } client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.S3ControlClient(ctx) accountID := client.AccountID(ctx) diff --git a/internal/service/secretsmanager/sweep.go b/internal/service/secretsmanager/sweep.go index 6024431cb4c9..e2678bb90d82 100644 --- a/internal/service/secretsmanager/sweep.go +++ b/internal/service/secretsmanager/sweep.go @@ -31,7 +31,7 @@ func sweepSecretPolicies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SecretsManagerClient(ctx) input := &secretsmanager.ListSecretsInput{} @@ -79,7 +79,7 @@ func sweepSecrets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SecretsManagerClient(ctx) input := &secretsmanager.ListSecretsInput{} diff --git a/internal/service/servicecatalog/sweep.go b/internal/service/servicecatalog/sweep.go index 2b6a3d189dfc..0e3d0ac0c365 100644 --- a/internal/service/servicecatalog/sweep.go +++ b/internal/service/servicecatalog/sweep.go @@ -88,7 +88,7 @@ func sweepBudgetResourceAssociations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -180,7 +180,7 @@ func sweepConstraints(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -237,7 +237,7 @@ func sweepPrincipalPortfolioAssociations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -294,7 +294,7 @@ func sweepProductPortfolioAssociations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -369,7 +369,7 @@ func sweepProducts(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -416,7 +416,7 @@ func sweepProvisionedProducts(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -465,7 +465,7 @@ func sweepProvisioningArtifacts(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -525,7 +525,7 @@ func sweepServiceActions(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -568,7 +568,7 @@ func sweepTagOptionResourceAssociations(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) @@ -634,7 +634,7 @@ func sweepTagOptions(region string) error { client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceCatalogClient(ctx) diff --git a/internal/service/servicediscovery/sweep.go b/internal/service/servicediscovery/sweep.go index 111ee345f0dc..0e50b806e0d6 100644 --- a/internal/service/servicediscovery/sweep.go +++ b/internal/service/servicediscovery/sweep.go @@ -52,7 +52,7 @@ func sweepHTTPNamespaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceDiscoveryClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -89,7 +89,7 @@ func sweepPrivateDNSNamespaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceDiscoveryClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -126,7 +126,7 @@ func sweepPublicDNSNamespaces(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceDiscoveryClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -163,7 +163,7 @@ func sweepServices(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.ServiceDiscoveryClient(ctx) input := &servicediscovery.ListServicesInput{} diff --git a/internal/service/sfn/sweep.go b/internal/service/sfn/sweep.go index 5428d5510275..e2a2f6bfa3ac 100644 --- a/internal/service/sfn/sweep.go +++ b/internal/service/sfn/sweep.go @@ -30,7 +30,7 @@ func sweepActivities(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SFNClient(ctx) input := &sfn.ListActivitiesInput{} @@ -71,7 +71,7 @@ func sweepStateMachines(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SFNClient(ctx) input := &sfn.ListStateMachinesInput{} diff --git a/internal/service/shield/sweep.go b/internal/service/shield/sweep.go index d944f172e56c..5a7a0ce6a187 100644 --- a/internal/service/shield/sweep.go +++ b/internal/service/shield/sweep.go @@ -43,7 +43,7 @@ func sweepDRTAccessLogBucketAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &shield.DescribeDRTAccessInput{} conn := client.ShieldClient(ctx) @@ -80,7 +80,7 @@ func sweepDRTAccessRoleARNAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &shield.DescribeDRTAccessInput{} conn := client.ShieldClient(ctx) @@ -117,7 +117,7 @@ func sweepProactiveEngagements(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &shield.DescribeSubscriptionInput{} conn := client.ShieldClient(ctx) diff --git a/internal/service/sns/sweep.go b/internal/service/sns/sweep.go index eb32eb81a73a..b4cad0785065 100644 --- a/internal/service/sns/sweep.go +++ b/internal/service/sns/sweep.go @@ -55,7 +55,7 @@ func sweepPlatformApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &sns.ListPlatformApplicationsInput{} conn := client.SNSClient(ctx) @@ -96,7 +96,7 @@ func sweepTopics(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &sns.ListTopicsInput{} conn := client.SNSClient(ctx) @@ -137,7 +137,7 @@ func sweepTopicSubscriptions(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &sns.ListSubscriptionsInput{} conn := client.SNSClient(ctx) diff --git a/internal/service/ssm/sweep.go b/internal/service/ssm/sweep.go index fc03c4702ebf..28450d725e7d 100644 --- a/internal/service/ssm/sweep.go +++ b/internal/service/ssm/sweep.go @@ -117,7 +117,7 @@ func sweepMaintenanceWindows(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SSMClient(ctx) input := &ssm.DescribeMaintenanceWindowsInput{} diff --git a/internal/service/ssmcontacts/sweep.go b/internal/service/ssmcontacts/sweep.go index e9111ba2bb4a..8f7421ce5632 100644 --- a/internal/service/ssmcontacts/sweep.go +++ b/internal/service/ssmcontacts/sweep.go @@ -27,7 +27,7 @@ func sweepRotations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SSMContactsClient(ctx) input := &ssmcontacts.ListRotationsInput{} diff --git a/internal/service/ssoadmin/sweep.go b/internal/service/ssoadmin/sweep.go index 444eb5b963c4..078297fe47e5 100644 --- a/internal/service/ssoadmin/sweep.go +++ b/internal/service/ssoadmin/sweep.go @@ -42,7 +42,7 @@ func sweepAccountAssignments(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SSOAdminClient(ctx) @@ -134,7 +134,7 @@ func sweepApplications(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SSOAdminClient(ctx) var sweepResources []sweep.Sweepable @@ -196,7 +196,7 @@ func sweepPermissionSets(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SSOAdminClient(ctx) var sweepResources []sweep.Sweepable diff --git a/internal/service/storagegateway/sweep.go b/internal/service/storagegateway/sweep.go index f869458078a1..fef47fde910f 100644 --- a/internal/service/storagegateway/sweep.go +++ b/internal/service/storagegateway/sweep.go @@ -38,7 +38,7 @@ func sweepGateways(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.StorageGatewayClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -78,7 +78,7 @@ func sweepTapePools(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.StorageGatewayClient(ctx) sweepResources := make([]sweep.Sweepable, 0) @@ -118,7 +118,7 @@ func sweepFileSystemAssociations(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.StorageGatewayClient(ctx) sweepResources := make([]sweep.Sweepable, 0) diff --git a/internal/service/swf/sweep.go b/internal/service/swf/sweep.go index 470fa832b3cf..c8f42a3f2c65 100644 --- a/internal/service/swf/sweep.go +++ b/internal/service/swf/sweep.go @@ -26,7 +26,7 @@ func sweepDomains(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SWFClient(ctx) input := &swf.ListDomainsInput{ diff --git a/internal/service/synthetics/sweep.go b/internal/service/synthetics/sweep.go index d2d54aeeb26f..f40148acc021 100644 --- a/internal/service/synthetics/sweep.go +++ b/internal/service/synthetics/sweep.go @@ -31,7 +31,7 @@ func sweepCanaries(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.SyntheticsClient(ctx) diff --git a/internal/service/timestreamwrite/sweep.go b/internal/service/timestreamwrite/sweep.go index e74f59bff902..f1e2b8eb6cef 100644 --- a/internal/service/timestreamwrite/sweep.go +++ b/internal/service/timestreamwrite/sweep.go @@ -31,7 +31,7 @@ func sweepDatabases(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ×treamwrite.ListDatabasesInput{} conn := client.TimestreamWriteClient(ctx) @@ -72,7 +72,7 @@ func sweepTables(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := ×treamwrite.ListTablesInput{} conn := client.TimestreamWriteClient(ctx) diff --git a/internal/service/transcribe/sweep.go b/internal/service/transcribe/sweep.go index 6ab1591ae9cd..b63eaada075e 100644 --- a/internal/service/transcribe/sweep.go +++ b/internal/service/transcribe/sweep.go @@ -53,7 +53,7 @@ func sweepLanguageModels(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TranscribeClient(ctx) @@ -97,7 +97,7 @@ func sweepMedicalVocabularies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TranscribeClient(ctx) @@ -142,7 +142,7 @@ func sweepVocabularies(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TranscribeClient(ctx) @@ -187,7 +187,7 @@ func sweepVocabularyFilters(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TranscribeClient(ctx) diff --git a/internal/service/transfer/sweep.go b/internal/service/transfer/sweep.go index b56ba5747fb6..9fa82c77907c 100644 --- a/internal/service/transfer/sweep.go +++ b/internal/service/transfer/sweep.go @@ -34,7 +34,7 @@ func sweepServers(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TransferClient(ctx) input := &transfer.ListServersInput{} @@ -77,7 +77,7 @@ func sweepWorkflows(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.TransferClient(ctx) input := &transfer.ListWorkflowsInput{} diff --git a/internal/service/verifiedpermissions/sweep.go b/internal/service/verifiedpermissions/sweep.go index 152fed964778..55386d21cea6 100644 --- a/internal/service/verifiedpermissions/sweep.go +++ b/internal/service/verifiedpermissions/sweep.go @@ -27,7 +27,7 @@ func sweepPolicyStores(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.VerifiedPermissionsClient(ctx) diff --git a/internal/service/waf/sweep.go b/internal/service/waf/sweep.go index 9cb8c1c7f46c..e1a886ac3214 100644 --- a/internal/service/waf/sweep.go +++ b/internal/service/waf/sweep.go @@ -132,7 +132,7 @@ func sweepByteMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListByteMatchSetsInput{} @@ -185,7 +185,7 @@ func sweepGeoMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListGeoMatchSetsInput{} @@ -238,7 +238,7 @@ func sweepIPSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListIPSetsInput{} @@ -291,7 +291,7 @@ func sweepRateBasedRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListRateBasedRulesInput{} @@ -344,7 +344,7 @@ func sweepRegexMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListRegexMatchSetsInput{} @@ -397,7 +397,7 @@ func sweepRegexPatternSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListRegexPatternSetsInput{} @@ -450,7 +450,7 @@ func sweepRuleGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListRuleGroupsInput{} @@ -503,7 +503,7 @@ func sweepRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListRulesInput{} @@ -556,7 +556,7 @@ func sweepSizeConstraintSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListSizeConstraintSetsInput{} @@ -609,7 +609,7 @@ func sweepSQLInjectionMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListSqlInjectionMatchSetsInput{} @@ -662,7 +662,7 @@ func sweepWebACLs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListWebACLsInput{} @@ -715,7 +715,7 @@ func sweepXSSMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFClient(ctx) input := &waf.ListXssMatchSetsInput{} diff --git a/internal/service/wafregional/sweep.go b/internal/service/wafregional/sweep.go index fd3a811c3bb7..931f404f202c 100644 --- a/internal/service/wafregional/sweep.go +++ b/internal/service/wafregional/sweep.go @@ -132,7 +132,7 @@ func sweepByteMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListByteMatchSetsInput{} @@ -185,7 +185,7 @@ func sweepGeoMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListGeoMatchSetsInput{} @@ -238,7 +238,7 @@ func sweepIPSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListIPSetsInput{} @@ -291,7 +291,7 @@ func sweepRateBasedRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListRateBasedRulesInput{} @@ -344,7 +344,7 @@ func sweepRegexMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListRegexMatchSetsInput{} @@ -397,7 +397,7 @@ func sweepRegexPatternSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListRegexPatternSetsInput{} @@ -450,7 +450,7 @@ func sweepRuleGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListRuleGroupsInput{} @@ -503,7 +503,7 @@ func sweepRules(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListRulesInput{} @@ -556,7 +556,7 @@ func sweepSizeConstraintSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListSizeConstraintSetsInput{} @@ -609,7 +609,7 @@ func sweepSQLInjectionMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListSqlInjectionMatchSetsInput{} @@ -662,7 +662,7 @@ func sweepWebACLs(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListWebACLsInput{} @@ -715,7 +715,7 @@ func sweepXSSMatchSet(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WAFRegionalClient(ctx) input := &wafregional.ListXssMatchSetsInput{} diff --git a/internal/service/workspaces/sweep.go b/internal/service/workspaces/sweep.go index ac07adc543c5..ee41d0341708 100644 --- a/internal/service/workspaces/sweep.go +++ b/internal/service/workspaces/sweep.go @@ -39,7 +39,7 @@ func sweepDirectories(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } input := &workspaces.DescribeWorkspaceDirectoriesInput{} conn := client.WorkSpacesClient(ctx) @@ -80,7 +80,7 @@ func sweepIPGroups(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %s", err) + return fmt.Errorf("getting client: %w", err) } conn := client.WorkSpacesClient(ctx) input := &workspaces.DescribeIpGroupsInput{} @@ -124,7 +124,7 @@ func sweepWorkspace(region string) error { ctx := sweep.Context(region) client, err := sweep.SharedRegionalSweepClient(ctx, region) if err != nil { - return fmt.Errorf("error getting client: %w", err) + return fmt.Errorf("getting client: %w", err) } input := &workspaces.DescribeWorkspacesInput{} conn := client.WorkSpacesClient(ctx) From f7b9adc79773178b872c5334236bb501bb11cd45 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 8 Sep 2025 16:59:28 -0500 Subject: [PATCH 1540/2115] aws_controltower: flatten from correct type --- internal/service/controltower/baseline.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 9296dc635c32..5680c674fb05 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -363,11 +363,11 @@ func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { var diags diag.Diagnostics switch v.(type) { - case awstypes.EnabledBaselineParameter: - param := v.(awstypes.EnabledBaselineParameter) + case awstypes.EnabledBaselineParameterSummary: + param := v.(awstypes.EnabledBaselineParameterSummary) p.Key = fwflex.StringToFramework(ctx, param.Key) if param.Value != nil { - var value any + var value string err := param.Value.UnmarshalSmithyDocument(&value) if err != nil { diags.AddError( @@ -376,7 +376,8 @@ func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { ) return diags } - p.Value = fwflex.StringValueToFramework(ctx, value.(string)) + + p.Value = fwflex.StringValueToFramework(ctx, value) } else { p.Value = types.StringNull() } From 209e118a7d2bfd33ab0c1e86a78e3e3086e97064 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 20:46:16 +0900 Subject: [PATCH 1541/2115] Implement pull_request_build_policy configuration block --- internal/service/codebuild/webhook.go | 85 +++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/internal/service/codebuild/webhook.go b/internal/service/codebuild/webhook.go index 307c3f981771..ef04463f6b93 100644 --- a/internal/service/codebuild/webhook.go +++ b/internal/service/codebuild/webhook.go @@ -88,6 +88,30 @@ func resourceWebhook() *schema.Resource { Required: true, ForceNew: true, }, + "pull_request_build_policy": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "approver_roles": { + Type: schema.TypeSet, + Optional: true, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + ValidateDiagFunc: enum.Validate[types.PullRequestBuildApproverRole](), + }, + }, + "requires_comment_approval": { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[types.PullRequestBuildCommentApproval](), + }, + }, + }, + }, "scope_configuration": { Type: schema.TypeList, Optional: true, @@ -148,6 +172,10 @@ func resourceWebhookCreate(ctx context.Context, d *schema.ResourceData, meta any input.ManualCreation = aws.Bool(v.(bool)) } + if v, ok := d.GetOk("pull_request_build_policy"); ok && len(v.([]any)) > 0 { + input.PullRequestBuildPolicy = expandWebhookPullRequestBuildPolicy(v.([]any)[0].(map[string]any)) + } + if v, ok := d.GetOk("scope_configuration"); ok && len(v.([]any)) > 0 { input.ScopeConfiguration = expandScopeConfiguration(v.([]any)) } @@ -189,6 +217,9 @@ func resourceWebhookRead(ctx context.Context, d *schema.ResourceData, meta any) d.Set("manual_creation", d.Get("manual_creation")) // Create-only. d.Set("payload_url", webhook.PayloadUrl) d.Set("project_name", d.Id()) + if err := d.Set("pull_request_build_policy", flattenWebhookPullRequestBuildPolicy(webhook.PullRequestBuildPolicy)); err != nil { + return sdkdiag.AppendErrorf(diags, "setting pull_request_build_policy: %s", err) + } if err := d.Set("scope_configuration", flattenScopeConfiguration(webhook.ScopeConfiguration)); err != nil { return sdkdiag.AppendErrorf(diags, "setting scope_configuration: %s", err) } @@ -220,6 +251,10 @@ func resourceWebhookUpdate(ctx context.Context, d *schema.ResourceData, meta any input.BranchFilter = aws.String(d.Get("branch_filter").(string)) } + if v, ok := d.GetOk("pull_request_build_policy"); ok && len(v.([]any)) > 0 { + input.PullRequestBuildPolicy = expandWebhookPullRequestBuildPolicy(v.([]any)[0].(map[string]any)) + } + _, err := conn.UpdateWebhook(ctx, &input) if err != nil { @@ -285,6 +320,32 @@ func expandWebhookFilterGroups(tfList []any) [][]types.WebhookFilter { return apiObjects } +func expandWebhookPullRequestBuildPolicy(tfMap map[string]any) *types.PullRequestBuildPolicy { + if tfMap == nil { + return nil + } + + apiObject := &types.PullRequestBuildPolicy{ + RequiresCommentApproval: types.PullRequestBuildCommentApproval(tfMap["requires_comment_approval"].(string)), + } + + if apiObject.RequiresCommentApproval != types.PullRequestBuildCommentApprovalDisabled { + if v, ok := tfMap["approver_roles"]; ok && v.(*schema.Set).Len() > 0 { + var roles []types.PullRequestBuildApproverRole + for _, role := range v.(*schema.Set).List() { + if role != nil { + roles = append(roles, types.PullRequestBuildApproverRole(role.(string))) + } + } + if len(roles) > 0 { + apiObject.ApproverRoles = roles + } + } + } + + return apiObject +} + func expandWebhookFilters(tfList []any) []types.WebhookFilter { if len(tfList) == 0 { return nil @@ -368,6 +429,30 @@ func flattenWebhookFilterGroups(apiObjects [][]types.WebhookFilter) []any { return tfList } +func flattenWebhookPullRequestBuildPolicy(apiObject *types.PullRequestBuildPolicy) []any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{ + "requires_comment_approval": string(apiObject.RequiresCommentApproval), + } + + if v := apiObject.ApproverRoles; len(v) > 0 { + var roles []string + for _, role := range v { + if role != "" { + roles = append(roles, string(role)) + } + } + if len(roles) > 0 { + tfMap["approver_roles"] = roles + } + } + + return []any{tfMap} +} + func flattenWebhookFilters(apiObjects []types.WebhookFilter) []any { if len(apiObjects) == 0 { return nil From 9ca958664c2fdc907137025114a53510d0f2ed7c Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 20:50:16 +0900 Subject: [PATCH 1542/2115] add acctests for pull_request_build_policy --- internal/service/codebuild/webhook_test.go | 134 +++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/internal/service/codebuild/webhook_test.go b/internal/service/codebuild/webhook_test.go index 743b30c86606..ff9110a83ad4 100644 --- a/internal/service/codebuild/webhook_test.go +++ b/internal/service/codebuild/webhook_test.go @@ -6,6 +6,7 @@ package codebuild_test import ( "context" "fmt" + "strings" "testing" "github.com/YakDriver/regexache" @@ -475,6 +476,116 @@ func TestAccCodeBuildWebhook_upgradeV5_94_1(t *testing.T) { }) } +func TestAccCodeBuildWebhook_gitHubWithPullRequestBuildPolicy(t *testing.T) { + ctx := acctest.Context(t) + var webhook types.Webhook + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_codebuild_webhook.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheck(ctx, t) + testAccPreCheckSourceCredentialsForServerType(ctx, t, types.ServerTypeGithub) + }, + ErrorCheck: acctest.ErrorCheck(t, names.CodeBuildServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckWebhookDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicy( + rName, + string(types.PullRequestBuildCommentApprovalAllPullRequests), + []string{ + string(types.PullRequestBuildApproverRoleGithubRead), + string(types.PullRequestBuildApproverRoleGithubWrite), + string(types.PullRequestBuildApproverRoleGithubMaintain), + string(types.PullRequestBuildApproverRoleGithubAdmin), + }), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckWebhookExists(ctx, resourceName, &webhook), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.requires_comment_approval", string(types.PullRequestBuildCommentApprovalAllPullRequests)), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.approver_roles.#", "4"), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubRead)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubWrite)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubMaintain)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubAdmin)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"secret"}, + }, + { + Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicy( + rName, + string(types.PullRequestBuildCommentApprovalForkPullRequests), + []string{ + string(types.PullRequestBuildApproverRoleGithubMaintain), + string(types.PullRequestBuildApproverRoleGithubAdmin), + }), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckWebhookExists(ctx, resourceName, &webhook), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.requires_comment_approval", string(types.PullRequestBuildCommentApprovalForkPullRequests)), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.approver_roles.#", "2"), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubMaintain)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubAdmin)), + ), + }, + { + Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicyNoApproverRoles( + rName, + string(types.PullRequestBuildCommentApprovalDisabled), + ), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckWebhookExists(ctx, resourceName, &webhook), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.requires_comment_approval", string(types.PullRequestBuildCommentApprovalDisabled)), + ), + }, + }, + }) +} + +func TestAccCodeBuildWebhook_gitHubWithPullRequestBuildPolicyNoApproverRoles(t *testing.T) { + ctx := acctest.Context(t) + var webhook types.Webhook + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_codebuild_webhook.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + testAccPreCheck(ctx, t) + testAccPreCheckSourceCredentialsForServerType(ctx, t, types.ServerTypeGithub) + }, + ErrorCheck: acctest.ErrorCheck(t, names.CodeBuildServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckWebhookDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicyNoApproverRoles( + rName, + string(types.PullRequestBuildCommentApprovalAllPullRequests), + ), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckWebhookExists(ctx, resourceName, &webhook), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.requires_comment_approval", string(types.PullRequestBuildCommentApprovalAllPullRequests)), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.approver_roles.#", "3"), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubWrite)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubMaintain)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubAdmin)), + ), + }, + }, + }) +} + func testAccCheckWebhookFilter(webhook *types.Webhook, expectedFilters [][]types.WebhookFilter) resource.TestCheckFunc { return func(s *terraform.State) error { got, want := webhook.FilterGroups, expectedFilters @@ -664,3 +775,26 @@ resource "aws_codebuild_webhook" "test" { } `) } + +func testAccWebhookConfig_gitHubWithPullRequestBuildPolicy(rName, requiresCommentApproval string, approverRoles []string) string { + return acctest.ConfigCompose(testAccProjectConfig_basic(rName), fmt.Sprintf(` +resource "aws_codebuild_webhook" "test" { + project_name = aws_codebuild_project.test.name + pull_request_build_policy { + requires_comment_approval = %[1]q + approver_roles = ["%[2]s"] + } +} +`, requiresCommentApproval, strings.Join(approverRoles, "\", \""))) +} + +func testAccWebhookConfig_gitHubWithPullRequestBuildPolicyNoApproverRoles(rName, requiresCommentApproval string) string { + return acctest.ConfigCompose(testAccProjectConfig_basic(rName), fmt.Sprintf(` +resource "aws_codebuild_webhook" "test" { + project_name = aws_codebuild_project.test.name + pull_request_build_policy { + requires_comment_approval = %[1]q + } +} +`, requiresCommentApproval)) +} From 527777e03bc39d363f59767067d917bf7a184033 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 20:50:48 +0900 Subject: [PATCH 1543/2115] Add checks when pull_requiest_build_policy is not specified --- internal/service/codebuild/webhook_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/codebuild/webhook_test.go b/internal/service/codebuild/webhook_test.go index ff9110a83ad4..d99c755e95ff 100644 --- a/internal/service/codebuild/webhook_test.go +++ b/internal/service/codebuild/webhook_test.go @@ -93,6 +93,12 @@ func TestAccCodeBuildWebhook_gitHub(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scope_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "secret", ""), resource.TestMatchResourceAttr(resourceName, names.AttrURL, regexache.MustCompile(`^https://`)), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.requires_comment_approval", string(types.PullRequestBuildCommentApprovalAllPullRequests)), + resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.0.approver_roles.#", "3"), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubWrite)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubMaintain)), + resource.TestCheckTypeSetElemAttr(resourceName, "pull_request_build_policy.0.approver_roles.*", string(types.PullRequestBuildApproverRoleGithubAdmin)), ), }, { From 31f4e28b1caa9963a18b33812297acd0dba67b65 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 20:51:17 +0900 Subject: [PATCH 1544/2115] acctest: Add permission for GetConnectionToken to CodeBuild role --- internal/service/codebuild/project_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal/service/codebuild/project_test.go b/internal/service/codebuild/project_test.go index 2ea76869a022..c4de42b90e1d 100644 --- a/internal/service/codebuild/project_test.go +++ b/internal/service/codebuild/project_test.go @@ -3140,6 +3140,13 @@ resource "aws_iam_role_policy" "test" { "ec2:DescribeSecurityGroups", "ec2:DescribeVpcs" ] + }, + { + "Effect": "Allow", + "Resource": "*", + "Action": [ + "codeconnections:GetConnectionToken" + ] } ] } From 5cf9a15429697719fcc581cfc9599522afc23a92 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 20:52:16 +0900 Subject: [PATCH 1545/2115] Update the documentation --- website/docs/r/codebuild_webhook.html.markdown | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/website/docs/r/codebuild_webhook.html.markdown b/website/docs/r/codebuild_webhook.html.markdown index f7b06dbebbe2..2d8d9e7eecdd 100644 --- a/website/docs/r/codebuild_webhook.html.markdown +++ b/website/docs/r/codebuild_webhook.html.markdown @@ -91,25 +91,31 @@ This resource supports the following arguments: * `build_type` - (Optional) The type of build this webhook will trigger. Valid values for this parameter are: `BUILD`, `BUILD_BATCH`. * `manual_creation` - (Optional) If true, CodeBuild doesn't create a webhook in GitHub and instead returns `payload_url` and `secret` values for the webhook. The `payload_url` and `secret` values in the output can be used to manually create a webhook within GitHub. * `branch_filter` - (Optional) A regular expression used to determine which branches get built. Default is all branches are built. We recommend using `filter_group` over `branch_filter`. -* `filter_group` - (Optional) Information about the webhook's trigger. Filter group blocks are documented below. -* `scope_configuration` - (Optional) Scope configuration for global or organization webhooks. Scope configuration blocks are documented below. +* `filter_group` - (Optional) Information about the webhook's trigger. See [filter_group](#filter_group) for details. +* `scope_configuration` - (Optional) Scope configuration for global or organization webhooks. See [scope_configuration](#scope_configuration) for details. +* `pull_request_build_policy` - (Optional) Defines comment-based approval requirements for triggering builds on pull requests. See [Pull Request Build Policy](#pull_request_build_policy) for details. -`filter_group` supports the following: +### filter_group -* `filter` - (Required) A webhook filter for the group. Filter blocks are documented below. +* `filter` - (Required) A webhook filter for the group. See [filter](#filter) for details. -`filter` supports the following: +### filter * `type` - (Required) The webhook filter group's type. Valid values for this parameter are: `EVENT`, `BASE_REF`, `HEAD_REF`, `ACTOR_ACCOUNT_ID`, `FILE_PATH`, `COMMIT_MESSAGE`, `WORKFLOW_NAME`, `TAG_NAME`, `RELEASE_NAME`. At least one filter group must specify `EVENT` as its type. * `pattern` - (Required) For a filter that uses `EVENT` type, a comma-separated string that specifies one event: `PUSH`, `PULL_REQUEST_CREATED`, `PULL_REQUEST_UPDATED`, `PULL_REQUEST_REOPENED`. `PULL_REQUEST_MERGED`, `WORKFLOW_JOB_QUEUED` works with GitHub & GitHub Enterprise only. For a filter that uses any of the other filter types, a regular expression. * `exclude_matched_pattern` - (Optional) If set to `true`, the specified filter does *not* trigger a build. Defaults to `false`. -`scope_configuration` supports the following: +### scope_configuration * `name` - (Required) The name of either the enterprise or organization. * `scope` - (Required) The type of scope for a GitHub webhook. Valid values for this parameter are: `GITHUB_ORGANIZATION`, `GITHUB_GLOBAL`. * `domain` - (Optional) The domain of the GitHub Enterprise organization. Required if your project's source type is GITHUB_ENTERPRISE. +### pull_request_build_policy + +* `requires_comment_approval` - (Required) Specifies when comment-based approval is required before triggering a build on pull requests. Valid values for this parameter are: `DISABLED`, `ALL_PULL_REQUESTS`, and `FORK_PULL_REQUESTS`. +* `approver_roles` - (Optional) List of repository roles that have approval privileges for pull request builds when comment approval is required. This field must be specified only when `requires_comment_approval` is not `DISABLED`. See the [AWS documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/pull-request-build-policy.html#pull-request-build-policy.configuration) for its valid values and defaults. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 72be3c908bea0942db570811738ab4e390ff96f5 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 21:11:13 +0900 Subject: [PATCH 1546/2115] terraform fmt --- internal/service/codebuild/webhook_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/codebuild/webhook_test.go b/internal/service/codebuild/webhook_test.go index d99c755e95ff..516bb97ddac7 100644 --- a/internal/service/codebuild/webhook_test.go +++ b/internal/service/codebuild/webhook_test.go @@ -787,8 +787,8 @@ func testAccWebhookConfig_gitHubWithPullRequestBuildPolicy(rName, requiresCommen resource "aws_codebuild_webhook" "test" { project_name = aws_codebuild_project.test.name pull_request_build_policy { - requires_comment_approval = %[1]q - approver_roles = ["%[2]s"] + requires_comment_approval = %[1]q + approver_roles = ["%[2]s"] } } `, requiresCommentApproval, strings.Join(approverRoles, "\", \""))) @@ -799,7 +799,7 @@ func testAccWebhookConfig_gitHubWithPullRequestBuildPolicyNoApproverRoles(rName, resource "aws_codebuild_webhook" "test" { project_name = aws_codebuild_project.test.name pull_request_build_policy { - requires_comment_approval = %[1]q + requires_comment_approval = %[1]q } } `, requiresCommentApproval)) From c94416cdc2323cf163d7812ec50d1c4d7ca60a4a Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 22:17:49 +0900 Subject: [PATCH 1547/2115] Use enum.Slice instead of converting a slice of typed string enums --- internal/service/codebuild/webhook_test.go | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/internal/service/codebuild/webhook_test.go b/internal/service/codebuild/webhook_test.go index 516bb97ddac7..ccd99b872e1b 100644 --- a/internal/service/codebuild/webhook_test.go +++ b/internal/service/codebuild/webhook_test.go @@ -20,6 +20,7 @@ import ( "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/enum" tfcodebuild "github.com/hashicorp/terraform-provider-aws/internal/service/codebuild" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -502,12 +503,13 @@ func TestAccCodeBuildWebhook_gitHubWithPullRequestBuildPolicy(t *testing.T) { Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicy( rName, string(types.PullRequestBuildCommentApprovalAllPullRequests), - []string{ - string(types.PullRequestBuildApproverRoleGithubRead), - string(types.PullRequestBuildApproverRoleGithubWrite), - string(types.PullRequestBuildApproverRoleGithubMaintain), - string(types.PullRequestBuildApproverRoleGithubAdmin), - }), + enum.Slice( + types.PullRequestBuildApproverRoleGithubRead, + types.PullRequestBuildApproverRoleGithubWrite, + types.PullRequestBuildApproverRoleGithubMaintain, + types.PullRequestBuildApproverRoleGithubAdmin, + ), + ), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebhookExists(ctx, resourceName, &webhook), resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), @@ -529,10 +531,11 @@ func TestAccCodeBuildWebhook_gitHubWithPullRequestBuildPolicy(t *testing.T) { Config: testAccWebhookConfig_gitHubWithPullRequestBuildPolicy( rName, string(types.PullRequestBuildCommentApprovalForkPullRequests), - []string{ - string(types.PullRequestBuildApproverRoleGithubMaintain), - string(types.PullRequestBuildApproverRoleGithubAdmin), - }), + enum.Slice( + types.PullRequestBuildApproverRoleGithubMaintain, + types.PullRequestBuildApproverRoleGithubAdmin, + ), + ), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebhookExists(ctx, resourceName, &webhook), resource.TestCheckResourceAttr(resourceName, "pull_request_build_policy.#", "1"), From e531888142cdedc67c5b92874081d99b28817255 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:01 -0400 Subject: [PATCH 1548/2115] 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 2b9f3d6e69c8..af0cf5e499fa 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/YakDriver/go-version v0.1.0 github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 - github.com/aws/aws-sdk-go-v2 v1.38.3 + github.com/aws/aws-sdk-go-v2 v1.39.0 github.com/aws/aws-sdk-go-v2/config v1.31.6 github.com/aws/aws-sdk-go-v2/credentials v1.18.10 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 diff --git a/go.sum b/go.sum index 577593fc7ffd..b38024bfc810 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,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-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk= -github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2 v1.39.0 h1:xm5WV/2L4emMRmMjHFykqiA4M/ra0DJVSWUkDyBjbg4= +github.com/aws/aws-sdk-go-v2 v1.39.0/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= From f443cc574bf4947557f90d843b50edee94e93da1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:02 -0400 Subject: [PATCH 1549/2115] 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 af0cf5e499fa..aaf3686b0dac 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.39.0 - github.com/aws/aws-sdk-go-v2/config v1.31.6 - github.com/aws/aws-sdk-go-v2/credentials v1.18.10 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 + github.com/aws/aws-sdk-go-v2/config v1.31.7 + github.com/aws/aws-sdk-go-v2/credentials v1.18.11 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 github.com/aws/aws-sdk-go-v2/service/account v1.28.2 @@ -249,10 +249,10 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 - github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 + github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 - github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 + github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 @@ -324,16 +324,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.7.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index b38024bfc810..56018fda3f6e 100644 --- a/go.sum +++ b/go.sum @@ -27,18 +27,18 @@ github.com/aws/aws-sdk-go-v2 v1.39.0 h1:xm5WV/2L4emMRmMjHFykqiA4M/ra0DJVSWUkDyBj github.com/aws/aws-sdk-go-v2 v1.39.0/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= -github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= +github.com/aws/aws-sdk-go-v2/config v1.31.7 h1:zS1O6hr6t0nZdBCMFc/c9OyZFyLhXhf/B2IZ9Y0lRQE= +github.com/aws/aws-sdk-go-v2/config v1.31.7/go.mod h1:GpHmi1PQDdL5pP4JaB00pU0ek4EXVcYH7IkjkUadQmM= +github.com/aws/aws-sdk-go-v2/credentials v1.18.11 h1:1Fnb+7Dk96/VYx/uYfzk5sU2V0b0y2RWZROiMZCN/Io= +github.com/aws/aws-sdk-go-v2/credentials v1.18.11/go.mod h1:iuvn9v10dkxU4sDgtTXGWY0MrtkEcmkUmjv4clxhuTc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 h1:Is2tPmieqGS2edBnmOJIbdvOA6Op+rRpaYR60iBAwXM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7/go.mod h1:F1i5V5421EGci570yABvpIXgRIBPb5JM+lSkHF6Dq5w= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 h1:UCxq0X9O3xrlENdKf1r9eRJoKz/b0AfGkpp3a7FPlhg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7/go.mod h1:rHRoJUNUASj5Z/0eqI4w32vKvC7atoWR0jC+IkmVH8k= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 h1:Y6DTZUn7ZUC4th9FMBbo8LVE+1fyq3ofw+tRwkUd3PY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7/go.mod h1:x3XE6vMnU9QvHN/Wrx2s44kwzV2o2g5x/siw4ZUJ9g8= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= @@ -299,8 +299,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgOy26qyh5bvW+nDoAppxgn3J2WV3m9ewq7+8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= @@ -519,16 +519,16 @@ github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= From 73fd052d7523293647f2770af7526c1700f901b2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:05 -0400 Subject: [PATCH 1550/2115] 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 aaf3686b0dac..9b62d2a7a181 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.31.7 github.com/aws/aws-sdk-go-v2/credentials v1.18.11 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 github.com/aws/aws-sdk-go-v2/service/account v1.28.2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 @@ -221,7 +221,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 @@ -327,12 +327,12 @@ require ( github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect diff --git a/go.sum b/go.sum index 56018fda3f6e..1baa98517111 100644 --- a/go.sum +++ b/go.sum @@ -33,16 +33,16 @@ github.com/aws/aws-sdk-go-v2/credentials v1.18.11 h1:1Fnb+7Dk96/VYx/uYfzk5sU2V0b github.com/aws/aws-sdk-go-v2/credentials v1.18.11/go.mod h1:iuvn9v10dkxU4sDgtTXGWY0MrtkEcmkUmjv4clxhuTc= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 h1:Is2tPmieqGS2edBnmOJIbdvOA6Op+rRpaYR60iBAwXM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7/go.mod h1:F1i5V5421EGci570yABvpIXgRIBPb5JM+lSkHF6Dq5w= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 h1:fSuJX/VBJKufwJG/szWgUdRJVyRiEQDDXNh/6NPrTBg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5/go.mod h1:LvN0noQuST+3Su55Wl++BkITpptnfN9g6Ohkv4zs9To= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 h1:UCxq0X9O3xrlENdKf1r9eRJoKz/b0AfGkpp3a7FPlhg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7/go.mod h1:rHRoJUNUASj5Z/0eqI4w32vKvC7atoWR0jC+IkmVH8k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 h1:Y6DTZUn7ZUC4th9FMBbo8LVE+1fyq3ofw+tRwkUd3PY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7/go.mod h1:x3XE6vMnU9QvHN/Wrx2s44kwzV2o2g5x/siw4ZUJ9g8= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cROM8iBd3f6hrpuMQ= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= @@ -295,14 +295,14 @@ github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKH github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7/go.mod h1:vVYfbpd2l+pKqlSIDIOgouxNsGu5il9uDp0ooWb0jys= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgOy26qyh5bvW+nDoAppxgn3J2WV3m9ewq7+8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= @@ -463,8 +463,8 @@ github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= From 20e9ab8c5ceb4e9edb628bc3817e58a5095f327b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:05 -0400 Subject: [PATCH 1551/2115] 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 9b62d2a7a181..823ce775a7ab 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.18.11 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 github.com/aws/aws-sdk-go-v2/service/account v1.28.2 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 diff --git a/go.sum b/go.sum index 1baa98517111..b89989ac0023 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cROM8iBd3f6hrpuMQ= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCKRI8m9Ib2xdAtLT4W1qhqSf548I= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= From d5d6c5a9ea0c00afb4bb838bd61d7d20d036b3a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:06 -0400 Subject: [PATCH 1552/2115] 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 823ce775a7ab..08907591d85f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 - github.com/aws/aws-sdk-go-v2/service/account v1.28.2 + github.com/aws/aws-sdk-go-v2/service/account v1.28.3 github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 diff --git a/go.sum b/go.sum index b89989ac0023..244b820597cd 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,8 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cR github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCKRI8m9Ib2xdAtLT4W1qhqSf548I= github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= -github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= -github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= +github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn+TgaJy4gh/wy8QKF0i0= +github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= From 420a86f7abf1cf1d85909daede96c62e3093f08c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:07 -0400 Subject: [PATCH 1553/2115] 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 08907591d85f..96622ba72e31 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 github.com/aws/aws-sdk-go-v2/service/account v1.28.3 - github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 + github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 diff --git a/go.sum b/go.sum index 244b820597cd..cc6e110a89a2 100644 --- a/go.sum +++ b/go.sum @@ -47,8 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCK github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn+TgaJy4gh/wy8QKF0i0= github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y70pnL22UW4DBocAw= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= From f9e0c7151a771be94af48cecf36f54a3ff0b1a61 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:08 -0400 Subject: [PATCH 1554/2115] 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 96622ba72e31..511bc455064e 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 github.com/aws/aws-sdk-go-v2/service/account v1.28.3 github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 diff --git a/go.sum b/go.sum index cc6e110a89a2..14cb704a647d 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y70pnL22UW4DBocAw= github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SISFxiZdCSbxqPQ4GXrYk= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= From e0f612d19d44b77137fb7c6b0b685253ec90dcca Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:09 -0400 Subject: [PATCH 1555/2115] 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 511bc455064e..7387641a0b6f 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.28.3 github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 - github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 + github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 diff --git a/go.sum b/go.sum index 14cb704a647d..ab59f9000d10 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y7 github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SISFxiZdCSbxqPQ4GXrYk= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhppHopnqYKSxvY6Xg= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= From 9a271e2e0e6ac60107b093e2b9cc530ae9ff7920 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:10 -0400 Subject: [PATCH 1556/2115] 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 7387641a0b6f..69b26cdc3779 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 diff --git a/go.sum b/go.sum index ab59f9000d10..4559762a1b5d 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SIS github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhppHopnqYKSxvY6Xg= github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamtCTGxTqEsEOXOi6mYswk= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= From e85961fc71d52752d5aa4fd42979471879da07bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:11 -0400 Subject: [PATCH 1557/2115] 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 69b26cdc3779..21964196be1f 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 diff --git a/go.sum b/go.sum index 4559762a1b5d..f95a6ebc9d4e 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhp github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamtCTGxTqEsEOXOi6mYswk= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9WvdHd0DCEEekikPII1UJ6Y= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= From 5c372021b91e2d5fe89b6f1ff89da16c08fc9524 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:12 -0400 Subject: [PATCH 1558/2115] 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 21964196be1f..e981fb3c32d7 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 diff --git a/go.sum b/go.sum index f95a6ebc9d4e..9179d0d7ae2b 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamt github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9WvdHd0DCEEekikPII1UJ6Y= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2E3s+tK7Qz145wF7gBj/V+HDk= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= From a2a6c801173617629bdcee315f3cd365f4479bef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:13 -0400 Subject: [PATCH 1559/2115] 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 e981fb3c32d7..cd47f22917b5 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 diff --git a/go.sum b/go.sum index 9179d0d7ae2b..36b7ea65fc65 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2E3s+tK7Qz145wF7gBj/V+HDk= github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSztn51D3bOlTZx7i8UbxIq3s= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= From 03e466ca7b765d9de44f2fce7407dd1aa4e32960 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:14 -0400 Subject: [PATCH 1560/2115] 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 cd47f22917b5..2ae415420a51 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 diff --git a/go.sum b/go.sum index 36b7ea65fc65..69921831988a 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSztn51D3bOlTZx7i8UbxIq3s= github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJg0HSf4/YLZtk8JcHnhtWQ= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= From 61dfc5c2b8bfa0c8d4b51ad2bbdb6cbef91a46d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:15 -0400 Subject: [PATCH 1561/2115] 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 2ae415420a51..223cb1b44a0c 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 diff --git a/go.sum b/go.sum index 69921831988a..2e4e64402374 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSzt github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJg0HSf4/YLZtk8JcHnhtWQ= github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH0OWcSj4mzlFanfHVYao= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= From b33512c5524cb3a12efe13ef28bcb78b6ce64eaa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:16 -0400 Subject: [PATCH 1562/2115] 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 223cb1b44a0c..e8277a4a470c 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 diff --git a/go.sum b/go.sum index 2e4e64402374..3cd51f7edfde 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJ github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH0OWcSj4mzlFanfHVYao= github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu7Ju+Br2LmmviiMWQ0KOtXffGKW4= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= From d18ec724796816a81714a5212a24c17915a745f8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:17 -0400 Subject: [PATCH 1563/2115] 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 e8277a4a470c..88c8979cc517 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 diff --git a/go.sum b/go.sum index 3cd51f7edfde..fde9230c77bf 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,8 @@ github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu7Ju+Br2LmmviiMWQ0KOtXffGKW4= github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGXNYqiTKzGIoi93kxSrJNZ+vNoMMwMUE3B7Q= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= From 9a0b71fc60f4a6f7a8a23a5a1133d5047e814084 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:18 -0400 Subject: [PATCH 1564/2115] 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 88c8979cc517..baf533337274 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 diff --git a/go.sum b/go.sum index fde9230c77bf..1d604c3dd52e 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGXNYqiTKzGIoi93kxSrJNZ+vNoMMwMUE3B7Q= github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sCnUEfX634HFbblmsngzLZw+q5HenUh+o= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= From 09fba2c86196faf9ab0df0ec17a48f02a3c5053f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:19 -0400 Subject: [PATCH 1565/2115] 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 baf533337274..2080fa6a6d93 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 diff --git a/go.sum b/go.sum index 1d604c3dd52e..742bf73e84e8 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGX github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sCnUEfX634HFbblmsngzLZw+q5HenUh+o= github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFqdwzE2bhlI1+uh/t/l4fU3byJXSHNxI= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= From d29f9ee91ba53fe0434df72949662e3500964dbd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:20 -0400 Subject: [PATCH 1566/2115] go get github.com/aws/aws-sdk-go-v2/service/appmesh. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2080fa6a6d93..b4589dd39707 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 diff --git a/go.sum b/go.sum index 742bf73e84e8..b6123b4c1b7f 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sC github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFqdwzE2bhlI1+uh/t/l4fU3byJXSHNxI= github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJGmBF1HYfb12IzSJOIYfI= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= From a11be528ee22e582223413e329befd37c7ea5e76 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:20 -0400 Subject: [PATCH 1567/2115] 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 b4589dd39707..4e57c67b476a 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 diff --git a/go.sum b/go.sum index b6123b4c1b7f..db4e4ea717c6 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFq github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJGmBF1HYfb12IzSJOIYfI= github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxznO/dEo8mlokULdMq3DhMpM= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= From 438eaf1ad6838a86aafd7033e5b4e956855b51da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:21 -0400 Subject: [PATCH 1568/2115] 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 4e57c67b476a..760d814f40e8 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 diff --git a/go.sum b/go.sum index db4e4ea717c6..b21e9e8b0c3d 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJG github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxznO/dEo8mlokULdMq3DhMpM= github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVBje+wEoCOCwSkaM1hfo/9U= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= From 827465760f7099da240a45b09bc42d94c74ac802 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:22 -0400 Subject: [PATCH 1569/2115] 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 760d814f40e8..426413dab9e2 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 diff --git a/go.sum b/go.sum index b21e9e8b0c3d..fe3c220fd726 100644 --- a/go.sum +++ b/go.sum @@ -79,8 +79,8 @@ github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxzn github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVBje+wEoCOCwSkaM1hfo/9U= github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvjFpQrBf8bWqvBkrLKDD0= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= From 5502a8308cdea7c3a178652b6891c359bcbb8db3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:23 -0400 Subject: [PATCH 1570/2115] go get github.com/aws/aws-sdk-go-v2/service/arcregionswitch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 426413dab9e2..49a31186b862 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 diff --git a/go.sum b/go.sum index fe3c220fd726..4290a0084026 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVB github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvjFpQrBf8bWqvBkrLKDD0= github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adnpQQd8TjOW42xnLjhftmBFGxxFY= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= From 1493e3469ac80045a3743395bb380953a3ce83b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:24 -0400 Subject: [PATCH 1571/2115] 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 49a31186b862..30a3980c88f4 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 - github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 + github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 diff --git a/go.sum b/go.sum index 4290a0084026..73b4fc614e68 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvj github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adnpQQd8TjOW42xnLjhftmBFGxxFY= github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVTUSucooSSNMjVjihVRI= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= From 0679da655d4977e722d3393abf5d98ad0c9badde Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:25 -0400 Subject: [PATCH 1572/2115] 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 30a3980c88f4..516bd8107e76 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 diff --git a/go.sum b/go.sum index 73b4fc614e68..aa1aefbe1228 100644 --- a/go.sum +++ b/go.sum @@ -85,8 +85,8 @@ github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adn github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVTUSucooSSNMjVjihVRI= github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= From efd4bb6de09fc028e88434f7d3ef2dbca3b0d7ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:26 -0400 Subject: [PATCH 1573/2115] 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 516bd8107e76..5bb48da3f283 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 diff --git a/go.sum b/go.sum index aa1aefbe1228..2f6aa64947b2 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVT github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 h1:yNHXaZU0c0VV89+V0w04Lfk/+H69//w0YMU1d/LM27s= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= From 93219253ed6f5835e93db851db082782ea74ca14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:27 -0400 Subject: [PATCH 1574/2115] 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 5bb48da3f283..3759cf2d2e75 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 diff --git a/go.sum b/go.sum index 2f6aa64947b2..dfb5deccfd88 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 h1:yNHXaZU0c0VV89+V0w04Lfk/+H69//w0YMU1d/LM27s= github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= From 04f35dbf6ff461ebb87d7f62f9f372dd3a83bc9b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:28 -0400 Subject: [PATCH 1575/2115] 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 3759cf2d2e75..d7d84b824e68 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 - github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 + github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 diff --git a/go.sum b/go.sum index dfb5deccfd88..26c50428b9b5 100644 --- a/go.sum +++ b/go.sum @@ -91,8 +91,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 h1:yNHXaZU0c0VV89+V0w04 github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= From 966f876fbd08b9d892926189ff8cf6295d93fa8d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:29 -0400 Subject: [PATCH 1576/2115] 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 d7d84b824e68..8818edcd4ffb 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 diff --git a/go.sum b/go.sum index 26c50428b9b5..97f427466aa6 100644 --- a/go.sum +++ b/go.sum @@ -93,8 +93,8 @@ github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKO github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iSiyizfy7iAzomncMeo= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= From 7fb8327fe17e4b33dbe79a5b36bcc6d847d5dd02 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:30 -0400 Subject: [PATCH 1577/2115] 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 8818edcd4ffb..ea6343bd3b5f 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 diff --git a/go.sum b/go.sum index 97f427466aa6..94e95531619e 100644 --- a/go.sum +++ b/go.sum @@ -95,8 +95,8 @@ github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZS github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iSiyizfy7iAzomncMeo= github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqVH2avSawMrgd07kKNOx8E1jSR1s= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= From 52406d9eef55598caa50a68bf87b0c268573c99d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:31 -0400 Subject: [PATCH 1578/2115] 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 ea6343bd3b5f..da697e8a3dc9 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 diff --git a/go.sum b/go.sum index 94e95531619e..412bb134d514 100644 --- a/go.sum +++ b/go.sum @@ -97,8 +97,8 @@ github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iS github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqVH2avSawMrgd07kKNOx8E1jSR1s= github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6qFk/aF35pL7D5JjRhYXU= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= From e9f8e01cda07e32ae19fb25b32e095b5577ac7be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:32 -0400 Subject: [PATCH 1579/2115] 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 da697e8a3dc9..9446c971804a 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 diff --git a/go.sum b/go.sum index 412bb134d514..2b911aaed61a 100644 --- a/go.sum +++ b/go.sum @@ -99,8 +99,8 @@ github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqV github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6qFk/aF35pL7D5JjRhYXU= github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+rgc+bPcr/+Oi78TwrzGfMKAw= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= From 84308a789061c3ffafd01ed5f554bf62c9f15c07 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:33 -0400 Subject: [PATCH 1580/2115] go get github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9446c971804a..750ae8471757 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 diff --git a/go.sum b/go.sum index 2b911aaed61a..2177c70775c3 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6q github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+rgc+bPcr/+Oi78TwrzGfMKAw= github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG58QgDZ2oIekzSBMW5eEcSNZPenN076/+F0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= From 0758170e3cddb01cf493c95a2d9d3b1af7a4d8d0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:34 -0400 Subject: [PATCH 1581/2115] go get github.com/aws/aws-sdk-go-v2/service/billing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 750ae8471757..45c994b11b7c 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 - github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 diff --git a/go.sum b/go.sum index 2177c70775c3..d548eca82138 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+ github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG58QgDZ2oIekzSBMW5eEcSNZPenN076/+F0= github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5GjOXuHrAj76Fsv+SBI= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= From f403e64e1e4560a3fc2bec0cf6a9ee1a45ec087f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:35 -0400 Subject: [PATCH 1582/2115] 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 45c994b11b7c..69df45e178d2 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 diff --git a/go.sum b/go.sum index d548eca82138..b440f567aeeb 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5GjOXuHrAj76Fsv+SBI= github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTkjnYSjNBCo8a3RVdYZaM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= From 6bb19ea7065d9ec919690b67988b02b32bdfdc42 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:36 -0400 Subject: [PATCH 1583/2115] 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 69df45e178d2..93f7964cc05b 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 diff --git a/go.sum b/go.sum index b440f567aeeb..fa9d4c478fe4 100644 --- a/go.sum +++ b/go.sum @@ -107,8 +107,8 @@ github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5 github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTkjnYSjNBCo8a3RVdYZaM= github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEygnECFM3aDz/RT79sMqNs= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= From 2bab9052935b111c986e0bc7e1cf9de931a6b25c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:37 -0400 Subject: [PATCH 1584/2115] go get github.com/aws/aws-sdk-go-v2/service/chime. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 93f7964cc05b..7216e6fa74a9 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 - github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 + github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 diff --git a/go.sum b/go.sum index fa9d4c478fe4..77a5b6b75d97 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,8 @@ github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTk github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEygnECFM3aDz/RT79sMqNs= github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ6bCh0EqJpWIOYPfnI= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= From cb930bcdd698f0612b19706b665c385f8805b953 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:38 -0400 Subject: [PATCH 1585/2115] 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 7216e6fa74a9..6abe4644062c 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 diff --git a/go.sum b/go.sum index 77a5b6b75d97..4d2fa3e8cf2a 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEyg github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ6bCh0EqJpWIOYPfnI= github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj46/GZRk2vCBprtN0PADIF8O6xL80cv4lrb4= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= From 5627887eec9554b43dcf82340ea6c5fd0299f3a1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:39 -0400 Subject: [PATCH 1586/2115] 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 6abe4644062c..466235ba9180 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 diff --git a/go.sum b/go.sum index 4d2fa3e8cf2a..82a8879051fe 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj46/GZRk2vCBprtN0PADIF8O6xL80cv4lrb4= github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUcoR6GiaQeelzF8Y0c/lN+qlA/UM= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= From 00102c1d3075b41ebe44ef83320ada2dcbc8624d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:40 -0400 Subject: [PATCH 1587/2115] 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 466235ba9180..74e34966897a 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 diff --git a/go.sum b/go.sum index 82a8879051fe..c6f6b8c70574 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj4 github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUcoR6GiaQeelzF8Y0c/lN+qlA/UM= github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJxCsEgi/Vyy4Q76ufj/zJBg= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= From f37ad472bb1d7a02acd12312f1f90ecb15bd9da5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:40 -0400 Subject: [PATCH 1588/2115] 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 74e34966897a..18daf12dc2d6 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 diff --git a/go.sum b/go.sum index c6f6b8c70574..4bee6aa328f0 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,8 @@ github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUco github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJxCsEgi/Vyy4Q76ufj/zJBg= github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaVS66dAXvZdjlCfJfuIg= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= From b26550648769676212df6383ff76d23c2487b535 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:41 -0400 Subject: [PATCH 1589/2115] 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 18daf12dc2d6..a80e983c88fc 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 diff --git a/go.sum b/go.sum index 4bee6aa328f0..edfa44d2b7a2 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJ github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaVS66dAXvZdjlCfJfuIg= github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQeRGifq/e3EgxevAAeD/rNa+Y= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= From 5dcb7dd82d2367095e124e98cffdf0ef5aa92936 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:42 -0400 Subject: [PATCH 1590/2115] 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 a80e983c88fc..82d003531d7d 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 diff --git a/go.sum b/go.sum index edfa44d2b7a2..8c6b97301eb9 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaV github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQeRGifq/e3EgxevAAeD/rNa+Y= github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07q4Tu2AGPcttKxLRri8LCstfZs8= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= From fbd38c2a6fff17e30df66ef793fc5a4dffcac17d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:43 -0400 Subject: [PATCH 1591/2115] 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 82d003531d7d..3908cc524e49 100644 --- a/go.mod +++ b/go.mod @@ -56,7 +56,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 diff --git a/go.sum b/go.sum index 8c6b97301eb9..3320da49f70a 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQ github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07q4Tu2AGPcttKxLRri8LCstfZs8= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/XNc49hUAOLcVdzeYZqYReU= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= From 5baddd0bd027f346991a1a2d967441968ed7f2f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:44 -0400 Subject: [PATCH 1592/2115] 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 3908cc524e49..ca9588b9b1bc 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 diff --git a/go.sum b/go.sum index 3320da49f70a..c6c4eeb2f246 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/XNc49hUAOLcVdzeYZqYReU= github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUDQ+2mkExTq2WiWTnnRPwLpu/HjUtaPIddgMU= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= From eebb49cea0fc83403174a721072d48e5fc00fe66 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:45 -0400 Subject: [PATCH 1593/2115] 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 ca9588b9b1bc..d4f2fb73da23 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 diff --git a/go.sum b/go.sum index c6c4eeb2f246..e393c81f4196 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/ github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUDQ+2mkExTq2WiWTnnRPwLpu/HjUtaPIddgMU= github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyXbGh3YwxqD0Y+3wWNG1yeDs= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= From 1e1aa10c930ab61594347184e71d17739c06edb7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:45 -0400 Subject: [PATCH 1594/2115] 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 d4f2fb73da23..4d7863a1dfa1 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 diff --git a/go.sum b/go.sum index e393c81f4196..6810d095e6d4 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUD github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyXbGh3YwxqD0Y+3wWNG1yeDs= github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYMUR7/DOPDkrCpuBBKzvoql24= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= From bab54d0e2f4fbcad11c64cac443702951300cc7a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:46 -0400 Subject: [PATCH 1595/2115] 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 4d7863a1dfa1..6153967875df 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 diff --git a/go.sum b/go.sum index 6810d095e6d4..68973736836f 100644 --- a/go.sum +++ b/go.sum @@ -131,8 +131,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyX github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYMUR7/DOPDkrCpuBBKzvoql24= github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= From cb87a2ef7610d8afdb2d628699beacf325cfbd39 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:47 -0400 Subject: [PATCH 1596/2115] 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 6153967875df..cc1b82016066 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 diff --git a/go.sum b/go.sum index 68973736836f..78fff265067b 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYM github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 h1:TC222HSByqrBZpM2hlunXiOp69aDlJflzxVVjwldA3E= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= From ba861a64b2d46afdd76f860b4e714ed6ce4b02c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:48 -0400 Subject: [PATCH 1597/2115] 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 cc1b82016066..fa9927067198 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 diff --git a/go.sum b/go.sum index 78fff265067b..1c98548ae309 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrp github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 h1:TC222HSByqrBZpM2hlunXiOp69aDlJflzxVVjwldA3E= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= From d4ae2d051010a97bb90ea3ad2a3b4ee0964ea079 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:48 -0400 Subject: [PATCH 1598/2115] 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 fa9927067198..814dcf1ae6fb 100644 --- a/go.mod +++ b/go.mod @@ -63,7 +63,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 diff --git a/go.sum b/go.sum index 1c98548ae309..94e0ec2a4662 100644 --- a/go.sum +++ b/go.sum @@ -137,8 +137,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 h1:TC222HSByqrBZpM2hlunX github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= From 6fb9110b88f73c9a4bbb996ddafbdfb6774ec7b6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:49 -0400 Subject: [PATCH 1599/2115] 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 814dcf1ae6fb..351992417713 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 diff --git a/go.sum b/go.sum index 94e0ec2a4662..466f9dd01545 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUE github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZBQ/JNM8j6JZEux+MjUrg0E= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= From eaef99239ca5c6795491c7555862e9b48aec67fd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:50 -0400 Subject: [PATCH 1600/2115] 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 351992417713..5a11ebdd6523 100644 --- a/go.mod +++ b/go.mod @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 diff --git a/go.sum b/go.sum index 466f9dd01545..ac9a1569ffa7 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZBQ/JNM8j6JZEux+MjUrg0E= github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+NBuXT6PeJmr/VN6Zo9Dy9jxVk= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= From b37310c2ba62946d98377209906136f71d54b7c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:51 -0400 Subject: [PATCH 1601/2115] 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 5a11ebdd6523..4ebf740c0814 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 diff --git a/go.sum b/go.sum index ac9a1569ffa7..e49f925ae1fe 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZB github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+NBuXT6PeJmr/VN6Zo9Dy9jxVk= github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBipmU3ZTitH91temRUTZMEPo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= From 59ac88396b2dccacbfc6e6d39b2da2c95272e1e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:52 -0400 Subject: [PATCH 1602/2115] go get github.com/aws/aws-sdk-go-v2/service/codeconnections. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4ebf740c0814..1432e862cda7 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 diff --git a/go.sum b/go.sum index e49f925ae1fe..2997824e3e72 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+N github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBipmU3ZTitH91temRUTZMEPo= github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tPlqJ01kxMWK2/PfGlM5YiFutMw4Q= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= From 5492ac548a9be20e4942bdedaa621879ecde2bc6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:53 -0400 Subject: [PATCH 1603/2115] 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 1432e862cda7..763e9c588d66 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 diff --git a/go.sum b/go.sum index 2997824e3e72..3e597242df73 100644 --- a/go.sum +++ b/go.sum @@ -147,8 +147,8 @@ github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBi github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tPlqJ01kxMWK2/PfGlM5YiFutMw4Q= github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94el09NUC8Z++6ncPnGEvpQs= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= From 911dd694922c1cbca3e96f40fbd2588842463701 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:53 -0400 Subject: [PATCH 1604/2115] 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 763e9c588d66..49d534f6f83d 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 diff --git a/go.sum b/go.sum index 3e597242df73..2de445a6f331 100644 --- a/go.sum +++ b/go.sum @@ -149,8 +149,8 @@ github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tP github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94el09NUC8Z++6ncPnGEvpQs= github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6okF5hNmuZZmAHkqxdcId8ilxkMIs= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= From bd95e1298dbb44eaef98991c24b1a23f4e7cad47 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:54 -0400 Subject: [PATCH 1605/2115] 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 49d534f6f83d..9a48508823b6 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 diff --git a/go.sum b/go.sum index 2de445a6f331..00f56b9e5f6b 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,8 @@ github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94 github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6okF5hNmuZZmAHkqxdcId8ilxkMIs= github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv6VeLYNcX6geP40LFUxrkkHIvQaXE= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= From ea4b79bf1bfe6fe9d6578f358d88aee3751347be Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:55 -0400 Subject: [PATCH 1606/2115] 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 9a48508823b6..77be831afbac 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 diff --git a/go.sum b/go.sum index 00f56b9e5f6b..307c811094da 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6 github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv6VeLYNcX6geP40LFUxrkkHIvQaXE= github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27KVNxn24VWtGQA+V6JredhXx7A= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= From 684268fba6322768060f5017cbf4a0321b457b97 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:56 -0400 Subject: [PATCH 1607/2115] 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 77be831afbac..009dd90434b8 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 diff --git a/go.sum b/go.sum index 307c811094da..49e96d2689ad 100644 --- a/go.sum +++ b/go.sum @@ -155,8 +155,8 @@ github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27KVNxn24VWtGQA+V6JredhXx7A= github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN5xx0jzebrkdkmeP6ZkAd+3Ij9ajy+EA= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= From ff6a8356bb262c4b4192bad46262def7b8023914 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:57 -0400 Subject: [PATCH 1608/2115] 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 009dd90434b8..dfbf87a159ff 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 diff --git a/go.sum b/go.sum index 49e96d2689ad..05e83fefce8b 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27K github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN5xx0jzebrkdkmeP6ZkAd+3Ij9ajy+EA= github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8BZUsggJHY7SJktmEDdJ57UEI4mDEeIFvqY= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= From e3a14508196975459555f876262b25633042f043 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:57 -0400 Subject: [PATCH 1609/2115] 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 dfbf87a159ff..d66ca81d5256 100644 --- a/go.mod +++ b/go.mod @@ -74,7 +74,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 diff --git a/go.sum b/go.sum index 05e83fefce8b..4862e177bd47 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8BZUsggJHY7SJktmEDdJ57UEI4mDEeIFvqY= github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/1kKMhj4Q75SWK05KQHHRHaoZSlU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= From 2b028a7df927eea6839da095fc058f67b2c05415 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:58 -0400 Subject: [PATCH 1610/2115] go get github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d66ca81d5256..3dea44dd6e73 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 diff --git a/go.sum b/go.sum index 4862e177bd47..120caccdb367 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,8 @@ github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8B github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/1kKMhj4Q75SWK05KQHHRHaoZSlU= github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6tafmdmmiFCUALzMZtrYQ6N3xbRKjRbH5TtFI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= From 518b28c8748d3de03e362d563a28b0ff36814cc4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:29:59 -0400 Subject: [PATCH 1611/2115] 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 3dea44dd6e73..17dadbc8750a 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 diff --git a/go.sum b/go.sum index 120caccdb367..e39b394a2b76 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/ github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6tafmdmmiFCUALzMZtrYQ6N3xbRKjRbH5TtFI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpke8z9rxb6Dh0y2OvFtlUhM0= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= From 30a2d8a83f7fa0325a487bdefc24399d82ce880e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:00 -0400 Subject: [PATCH 1612/2115] 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 17dadbc8750a..ca8c9035c2ca 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 diff --git a/go.sum b/go.sum index e39b394a2b76..6d15cc4a4ac6 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6t github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpke8z9rxb6Dh0y2OvFtlUhM0= github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8MPax3sHFejHHCqFl+fdRqa7S8ztB0= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= From 8e79b7720828b069a6604ca948997188c8e4fc91 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:01 -0400 Subject: [PATCH 1613/2115] 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 ca8c9035c2ca..711f3b29dac2 100644 --- a/go.mod +++ b/go.mod @@ -78,7 +78,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 diff --git a/go.sum b/go.sum index 6d15cc4a4ac6..ea32bf807d8e 100644 --- a/go.sum +++ b/go.sum @@ -167,8 +167,8 @@ github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpk github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8MPax3sHFejHHCqFl+fdRqa7S8ztB0= github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= From ac085250040fea020bb03847348b22fff60c2887 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:02 -0400 Subject: [PATCH 1614/2115] go get github.com/aws/aws-sdk-go-v2/service/connect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 711f3b29dac2..9494ef895843 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 - github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 + github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 diff --git a/go.sum b/go.sum index ea32bf807d8e..31d828da2b49 100644 --- a/go.sum +++ b/go.sum @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8M github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 h1:DvE8Ky2vGLHgcc2+lRphPCiHBXvI6HVLLG8BrtCl5Uk= +github.com/aws/aws-sdk-go-v2/service/connect v1.138.2/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= From 878ba77c63118d0e93eaf442671e4ba934e5ef00 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:03 -0400 Subject: [PATCH 1615/2115] 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 9494ef895843..d6746590f493 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 diff --git a/go.sum b/go.sum index 31d828da2b49..70c2428be233 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuV github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 h1:DvE8Ky2vGLHgcc2+lRphPCiHBXvI6HVLLG8BrtCl5Uk= github.com/aws/aws-sdk-go-v2/service/connect v1.138.2/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= From ed670763f162ac6e7797eab0291e3b37dd3c8ea5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:04 -0400 Subject: [PATCH 1616/2115] 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 d6746590f493..21b6dd58d92b 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 diff --git a/go.sum b/go.sum index 70c2428be233..72bd327b403a 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 h1:DvE8Ky2vGLHgcc2+lRphPCi github.com/aws/aws-sdk-go-v2/service/connect v1.138.2/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= From aabd83381b477a6a59a18a60154dbc813c2b9b12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:05 -0400 Subject: [PATCH 1617/2115] 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 21b6dd58d92b..70058041fafd 100644 --- a/go.mod +++ b/go.mod @@ -82,7 +82,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 diff --git a/go.sum b/go.sum index 72bd327b403a..f21f494613e2 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,8 @@ github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDb github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xOjSPlZfvc4UvUIKwZpMMJfuQgQwQR6ufdQZ5Is= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= From 72c7285520cd70058d444ce6133ad91f67461648 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:06 -0400 Subject: [PATCH 1618/2115] 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 70058041fafd..d0d80286063f 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 diff --git a/go.sum b/go.sum index f21f494613e2..cb9693eef2dd 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAs github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xOjSPlZfvc4UvUIKwZpMMJfuQgQwQR6ufdQZ5Is= github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4vuvEtqHjxU+cPklfCR+2uQwPA= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= From 6e137919f73c955c98035e61b4d4fda3c74af970 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:07 -0400 Subject: [PATCH 1619/2115] 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 d0d80286063f..351979b561a8 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 diff --git a/go.sum b/go.sum index cb9693eef2dd..0e27cfb3a18a 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xO github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4vuvEtqHjxU+cPklfCR+2uQwPA= github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWokSMewfFPNIDaYOJg02HxZQYb83bkIu8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= From d4d5996a7a7eef48ea0cca9a1afb21a7c161dd67 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:08 -0400 Subject: [PATCH 1620/2115] 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 351979b561a8..948ecc5c9607 100644 --- a/go.mod +++ b/go.mod @@ -85,7 +85,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 diff --git a/go.sum b/go.sum index 0e27cfb3a18a..0e306c0383e7 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4v github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWokSMewfFPNIDaYOJg02HxZQYb83bkIu8= github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPpNpM0HuV1pfYz3B1ppUSU2y0Cu6OY= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= From eda270db8f042928172861a01644773936b2556b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:09 -0400 Subject: [PATCH 1621/2115] go get github.com/aws/aws-sdk-go-v2/service/databasemigrationservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 948ecc5c9607..7b6aff25af15 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 diff --git a/go.sum b/go.sum index 0e306c0383e7..5a103ccf20f0 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWo github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPpNpM0HuV1pfYz3B1ppUSU2y0Cu6OY= github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQiY1kknfxJ/nwmvHVfQ3eMgiOLEUDpEOLkzpQ= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= From 6b418659582fe473d3e08cd9bfd962af725a8e9a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:10 -0400 Subject: [PATCH 1622/2115] go get github.com/aws/aws-sdk-go-v2/service/databrew. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7b6aff25af15..b2f191cabb13 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 diff --git a/go.sum b/go.sum index 5a103ccf20f0..c2dab672ebcc 100644 --- a/go.sum +++ b/go.sum @@ -185,8 +185,8 @@ github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPp github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQiY1kknfxJ/nwmvHVfQ3eMgiOLEUDpEOLkzpQ= github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsHjURn201IENzNUENNj8SI= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= From 02305c64de06186aa654393312a35cb2293e6473 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:11 -0400 Subject: [PATCH 1623/2115] go get github.com/aws/aws-sdk-go-v2/service/dataexchange. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b2f191cabb13..663fed58278e 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 diff --git a/go.sum b/go.sum index c2dab672ebcc..a98bb8bbb44d 100644 --- a/go.sum +++ b/go.sum @@ -187,8 +187,8 @@ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQ github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsHjURn201IENzNUENNj8SI= github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9CoGpnckvCzfBePSZC/N2sSfSM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= From df32f4c329215427f5fcefaf97feb9f11e877cb8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:12 -0400 Subject: [PATCH 1624/2115] go get github.com/aws/aws-sdk-go-v2/service/datapipeline. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 663fed58278e..01ad415172ee 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 diff --git a/go.sum b/go.sum index a98bb8bbb44d..7ed03c7b4236 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,8 @@ github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsH github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9CoGpnckvCzfBePSZC/N2sSfSM= github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe1jZauBE+WBMw/GrrmFRka5iM= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= From 07ed5db4651264ba4d45d0fe19b567c339d0beb4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:12 -0400 Subject: [PATCH 1625/2115] 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 01ad415172ee..48db19a036e6 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 diff --git a/go.sum b/go.sum index 7ed03c7b4236..86db958efaee 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9C github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe1jZauBE+WBMw/GrrmFRka5iM= github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= From d4f85cca2224f73343d1fc9ef0af1349edad6f38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:13 -0400 Subject: [PATCH 1626/2115] 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 48db19a036e6..bdbc7c2a562d 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 + github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 diff --git a/go.sum b/go.sum index 86db958efaee..60746dbbfe15 100644 --- a/go.sum +++ b/go.sum @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 h1:W/7L3e4rh5+ijYuLM0yiW+aio/WI1IMfeKRBwFvAz7k= +github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= From 74030338433283350eb657feacabae690b0e8960 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:14 -0400 Subject: [PATCH 1627/2115] 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 bdbc7c2a562d..f96dcd818e64 100644 --- a/go.mod +++ b/go.mod @@ -92,7 +92,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 - github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 + github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 diff --git a/go.sum b/go.sum index 60746dbbfe15..10aac93b0fe6 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 h1:W/7L3e4rh5+ijYuLM0yiW+aio/WI1IMfeKRBwFvAz7k= github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= From aebc0221d3eaa013f0648e0d98cf91c658ff2ea6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:15 -0400 Subject: [PATCH 1628/2115] go get github.com/aws/aws-sdk-go-v2/service/detective. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f96dcd818e64..5547ce322a60 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 - github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 diff --git a/go.sum b/go.sum index 10aac93b0fe6..5f2a89434bc8 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 h1:W/7L3e4rh5+ijYuLM0yiW+a github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= From e5aede49cb8d5b5d89825cb89662934412053284 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:16 -0400 Subject: [PATCH 1629/2115] 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 5547ce322a60..656d9f926aa1 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 diff --git a/go.sum b/go.sum index 5f2a89434bc8..1a14f3415881 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,8 @@ github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBM github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2QKKPEjT4ClxdvF4ntWQTSs= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= From ad417b596ad548f47a5a5e2b7d35d845dba1d6e2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:16 -0400 Subject: [PATCH 1630/2115] 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 656d9f926aa1..30e8fb2af34b 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 diff --git a/go.sum b/go.sum index 1a14f3415881..be326becad4b 100644 --- a/go.sum +++ b/go.sum @@ -201,8 +201,8 @@ github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCT github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2QKKPEjT4ClxdvF4ntWQTSs= github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0TuFHmiKc9PSMkDeEdy8if/I= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= From 0e25b451a93755c0c73e86a9f4e8596553310f31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:17 -0400 Subject: [PATCH 1631/2115] go get github.com/aws/aws-sdk-go-v2/service/directconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 30e8fb2af34b..81d4bb423aca 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 diff --git a/go.sum b/go.sum index be326becad4b..e4590d2f9e29 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0TuFHmiKc9PSMkDeEdy8if/I= github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnBGzjPu79AQDmI/sqh5gWfDAjYw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= From ef204b1e001fa4b96d91783ef6b112124de5316d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:18 -0400 Subject: [PATCH 1632/2115] 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 81d4bb423aca..7fb1afe76fad 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 diff --git a/go.sum b/go.sum index e4590d2f9e29..d3fd9506d2b7 100644 --- a/go.sum +++ b/go.sum @@ -205,8 +205,8 @@ github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0T github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnBGzjPu79AQDmI/sqh5gWfDAjYw= github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJFjOPrPyVGTT6eoCfEzRQn7hwPhnw= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= From 01893d735e6f5f7d976b4c0f39275d1a782b8774 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:19 -0400 Subject: [PATCH 1633/2115] 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 7fb1afe76fad..299480dee3bf 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 diff --git a/go.sum b/go.sum index d3fd9506d2b7..3883fccd5fb4 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,8 @@ github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnB github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJFjOPrPyVGTT6eoCfEzRQn7hwPhnw= github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36WlzAsN21voQLdcA3Cs= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= From ccacdd218c50437d3bb17f94f7aedc7aaf41c9a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:20 -0400 Subject: [PATCH 1634/2115] 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 299480dee3bf..975f699a50bf 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 diff --git a/go.sum b/go.sum index 3883fccd5fb4..9c2efd00111d 100644 --- a/go.sum +++ b/go.sum @@ -209,8 +209,8 @@ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJ github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36WlzAsN21voQLdcA3Cs= github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1HBTHUhzxbrE67SwmqA= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= From 2e36c961b391c49d27e9173df23e2bffd2036543 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:21 -0400 Subject: [PATCH 1635/2115] 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 975f699a50bf..930e04a21490 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 diff --git a/go.sum b/go.sum index 9c2efd00111d..ad5d0153889b 100644 --- a/go.sum +++ b/go.sum @@ -211,8 +211,8 @@ github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36Wlz github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1HBTHUhzxbrE67SwmqA= github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4PWkwoXDlMNnD0CmGxG8qaBRA= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= From 46cb94ced5dbd6e26d83ba95ce28e3929ff25c95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:22 -0400 Subject: [PATCH 1636/2115] 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 930e04a21490..ed36b6606a66 100644 --- a/go.mod +++ b/go.mod @@ -101,7 +101,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 - github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 + github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 diff --git a/go.sum b/go.sum index ad5d0153889b..22c6f049d14e 100644 --- a/go.sum +++ b/go.sum @@ -213,8 +213,8 @@ github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1H github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4PWkwoXDlMNnD0CmGxG8qaBRA= github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunKOfeT8HJBE9GpHrQ= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= From 819a747d2e0a18a180ed0c88429b8bfa6064a16a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:23 -0400 Subject: [PATCH 1637/2115] go get github.com/aws/aws-sdk-go-v2/service/dsql. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed36b6606a66..bd26b166d512 100644 --- a/go.mod +++ b/go.mod @@ -102,7 +102,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 diff --git a/go.sum b/go.sum index 22c6f049d14e..eb665e09c381 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,8 @@ github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4 github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunKOfeT8HJBE9GpHrQ= github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxTkqxd/oAYKY5RaaM= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= From 68a242bf69993428062d33084ab03afb88598658 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:23 -0400 Subject: [PATCH 1638/2115] 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 bd26b166d512..976a4fda4669 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 @@ -330,7 +330,7 @@ require ( github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect diff --git a/go.sum b/go.sum index eb665e09c381..3bf4c5fba2dd 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunK github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxTkqxd/oAYKY5RaaM= github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcplH3O3LDSbRYSEU77RafeI= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= @@ -297,8 +297,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebP github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7/go.mod h1:vVYfbpd2l+pKqlSIDIOgouxNsGu5il9uDp0ooWb0jys= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 h1:VN9u746Erhm6xnVSmaUd1Saxs1MVZVum6v2yPOqj8xQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7/go.mod h1:j0BhJWTdVsYsllEfO0E8EXtLToU8U7QeA7Gztxrl/8g= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgOy26qyh5bvW+nDoAppxgn3J2WV3m9ewq7+8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= From 0b25ce0d20190de2588b99186d8f3e90afa1687c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:25 -0400 Subject: [PATCH 1639/2115] 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 976a4fda4669..1310f1bf27cd 100644 --- a/go.mod +++ b/go.mod @@ -104,7 +104,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 diff --git a/go.sum b/go.sum index 3bf4c5fba2dd..8a7424b1c2d5 100644 --- a/go.sum +++ b/go.sum @@ -219,8 +219,8 @@ github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxT github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcplH3O3LDSbRYSEU77RafeI= github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIACV9+bZD1Pq/s1dzc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= From b2de24cd6859df35397311a193a521701a7f196e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:26 -0400 Subject: [PATCH 1640/2115] 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 1310f1bf27cd..35e1b3f3b231 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 diff --git a/go.sum b/go.sum index 8a7424b1c2d5..0cf003f560b0 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcpl github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIACV9+bZD1Pq/s1dzc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue2KwFWm1A/lILQfY= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= From 6ba71cf31e1a57e8fb7057ef3464400ad6fd4d1e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:26 -0400 Subject: [PATCH 1641/2115] 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 35e1b3f3b231..e5123fefe46f 100644 --- a/go.mod +++ b/go.mod @@ -106,7 +106,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 diff --git a/go.sum b/go.sum index 0cf003f560b0..65860f03399c 100644 --- a/go.sum +++ b/go.sum @@ -223,8 +223,8 @@ github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIA github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue2KwFWm1A/lILQfY= github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/UqDGxjl69/4eMbVBiW/00= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= From ec8da931370931bb5d01f7f4896101f9315d3150 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:27 -0400 Subject: [PATCH 1642/2115] 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 e5123fefe46f..8bcfa9371303 100644 --- a/go.mod +++ b/go.mod @@ -107,7 +107,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 diff --git a/go.sum b/go.sum index 65860f03399c..8e3d7709531b 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/UqDGxjl69/4eMbVBiW/00= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eGF+Z3xAR/VBlf84Q= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= From da78a5fe4f13eb0e9c3747676240e0125ae61bd2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:28 -0400 Subject: [PATCH 1643/2115] go get github.com/aws/aws-sdk-go-v2/service/efs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8bcfa9371303..05738009c1a4 100644 --- a/go.mod +++ b/go.mod @@ -108,7 +108,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 - github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 diff --git a/go.sum b/go.sum index 8e3d7709531b..e891c51553b7 100644 --- a/go.sum +++ b/go.sum @@ -227,8 +227,8 @@ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eGF+Z3xAR/VBlf84Q= github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7VhJSmgoUCVEakyM4= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= From 343a36e947942a8add7c8e679857c453849717e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:29 -0400 Subject: [PATCH 1644/2115] 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 05738009c1a4..888920048435 100644 --- a/go.mod +++ b/go.mod @@ -109,7 +109,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 - github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 + github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 diff --git a/go.sum b/go.sum index e891c51553b7..a145acb2d056 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,8 @@ github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eG github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7VhJSmgoUCVEakyM4= github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5LXgQrrNkMa4AcNY= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= From d0ee91986ec581000debecac510f42bdb056192a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:30 -0400 Subject: [PATCH 1645/2115] 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 888920048435..15ab8e0b2130 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 diff --git a/go.sum b/go.sum index a145acb2d056..9bc6f1761d7c 100644 --- a/go.sum +++ b/go.sum @@ -231,8 +231,8 @@ github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7V github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5LXgQrrNkMa4AcNY= github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUTJ4KJ+fzyS6xoTnB0TxVA1w8= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= From 74b4513fb5afe599bb0e3047aa3b934d03f8b57c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:30 -0400 Subject: [PATCH 1646/2115] 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 15ab8e0b2130..e2daf951bf29 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 diff --git a/go.sum b/go.sum index 9bc6f1761d7c..2b5c9142a2a5 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,8 @@ github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5 github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUTJ4KJ+fzyS6xoTnB0TxVA1w8= github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2ciJit4cOOPSdB9UTv47b/AD/tSMY= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= From dc3b3ecf4da1c967dcc379b38072cc85a2daef20 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:31 -0400 Subject: [PATCH 1647/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e2daf951bf29..2f3c2c94938d 100644 --- a/go.mod +++ b/go.mod @@ -112,7 +112,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 diff --git a/go.sum b/go.sum index 2b5c9142a2a5..1270fba4da67 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUT github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2ciJit4cOOPSdB9UTv47b/AD/tSMY= github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1blhU1mpj3lyxgZaBaO7EcZrAZ4Ryj+pk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= From 7646d687eb533dc3a5df453e81bf0569a9e63617 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:32 -0400 Subject: [PATCH 1648/2115] 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 2f3c2c94938d..3c7413ddfd4a 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 diff --git a/go.sum b/go.sum index 1270fba4da67..009a9b154012 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2 github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1blhU1mpj3lyxgZaBaO7EcZrAZ4Ryj+pk= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+O1wOnvKLUoo+jGM9vzghqEouBb29W2hcOs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= From 7c3afa8c7c655d3b4886d348fab8f36909a28eb3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:33 -0400 Subject: [PATCH 1649/2115] go get github.com/aws/aws-sdk-go-v2/service/elasticsearchservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3c7413ddfd4a..1bd31452ec34 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 diff --git a/go.sum b/go.sum index 009a9b154012..d1abdaa65cf2 100644 --- a/go.sum +++ b/go.sum @@ -239,8 +239,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+O1wOnvKLUoo+jGM9vzghqEouBb29W2hcOs= github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNgG2sqhx+CHOXSqrIXnVDnZeHAhPZppIsM= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= From 8c36ee8df88408da48fb9c9df97b6bc2963f7a7f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:34 -0400 Subject: [PATCH 1650/2115] go get github.com/aws/aws-sdk-go-v2/service/elastictranscoder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1bd31452ec34..0ad70c3446aa 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 diff --git a/go.sum b/go.sum index d1abdaa65cf2..1b27304b52d3 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNgG2sqhx+CHOXSqrIXnVDnZeHAhPZppIsM= github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UVGxsteGA2RzeubDtXPFdefEHQJDUMk= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= From 60e671eb412a9524ccd016fbcb93c50b8ada0613 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:35 -0400 Subject: [PATCH 1651/2115] 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 0ad70c3446aa..870b75406443 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 - github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 + github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 diff --git a/go.sum b/go.sum index 1b27304b52d3..413e769d2824 100644 --- a/go.sum +++ b/go.sum @@ -243,8 +243,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNg github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UVGxsteGA2RzeubDtXPFdefEHQJDUMk= github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDamfVylxdI5Ap8uGps= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= From f0488e49c38b602b4f98a772357cbfaff5602910 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:36 -0400 Subject: [PATCH 1652/2115] go get github.com/aws/aws-sdk-go-v2/service/emrcontainers. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 870b75406443..f572df0b312f 100644 --- a/go.mod +++ b/go.mod @@ -117,7 +117,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 diff --git a/go.sum b/go.sum index 413e769d2824..592a25c76514 100644 --- a/go.sum +++ b/go.sum @@ -245,8 +245,8 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UV github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDamfVylxdI5Ap8uGps= github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2vc9yMEj0eHVT4mHRTp7nX/gvg= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= From 8dc53d9eb1a576a121b019be99be74a3b01bc43b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:37 -0400 Subject: [PATCH 1653/2115] 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 f572df0b312f..10e5445447a8 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 diff --git a/go.sum b/go.sum index 592a25c76514..0da06244df33 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDam github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2vc9yMEj0eHVT4mHRTp7nX/gvg= github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/c1fNQ6bZvh+cOh5WSnEYDviss= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= From 13ba7e47e32f18a81d25721b4771ba596589c850 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:38 -0400 Subject: [PATCH 1654/2115] 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 10e5445447a8..0fec6828eb1e 100644 --- a/go.mod +++ b/go.mod @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 diff --git a/go.sum b/go.sum index 0da06244df33..23f112418be9 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2 github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/c1fNQ6bZvh+cOh5WSnEYDviss= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZl2QtFQyrZQFoUVuqnA8fRA4= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= From 6b6beb01a69c41be3029fa597ea9700dbb9e4b50 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:38 -0400 Subject: [PATCH 1655/2115] 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 0fec6828eb1e..817803bebcd0 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 diff --git a/go.sum b/go.sum index 23f112418be9..b2db97b90940 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,8 @@ github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/ github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZl2QtFQyrZQFoUVuqnA8fRA4= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf2twd5yOawH7AbEBnjjfs0= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= From 346c5c3f8e8047ae31dcd8d7c4ce10fbe075bdd5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:39 -0400 Subject: [PATCH 1656/2115] go get github.com/aws/aws-sdk-go-v2/service/evs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 817803bebcd0..4fa5a00a231c 100644 --- a/go.mod +++ b/go.mod @@ -121,7 +121,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 - github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 + github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 diff --git a/go.sum b/go.sum index b2db97b90940..c52639c65d49 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZ github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf2twd5yOawH7AbEBnjjfs0= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVTCHipzZwiAkS+HE= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= From d2ee37f939bab90e2def66ede930d036b89d25eb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:40 -0400 Subject: [PATCH 1657/2115] 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 4fa5a00a231c..ccaf71024652 100644 --- a/go.mod +++ b/go.mod @@ -122,7 +122,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 diff --git a/go.sum b/go.sum index c52639c65d49..511e96d09581 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVTCHipzZwiAkS+HE= github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw80cgPIyDjKDmQg8yhyss= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= From 6f63817b4cd12afafff7033854de2e45a0584331 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:41 -0400 Subject: [PATCH 1658/2115] 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 ccaf71024652..8bc0d07d770f 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 diff --git a/go.sum b/go.sum index 511e96d09581..cf241eeff085 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVT github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw80cgPIyDjKDmQg8yhyss= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU8PtytX+mbDQ3pDrfDRq4= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= From efdf24d69e45198890af56adbfef8e155e889dbf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:42 -0400 Subject: [PATCH 1659/2115] 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 8bc0d07d770f..9a95970eeeae 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 - github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 + github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 diff --git a/go.sum b/go.sum index cf241eeff085..0c85c84f96a6 100644 --- a/go.sum +++ b/go.sum @@ -259,8 +259,8 @@ github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU8PtytX+mbDQ3pDrfDRq4= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgdfSSpqh2iJenR07k= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= From effe724d8f48779f9d824ff830389c714491455a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:42 -0400 Subject: [PATCH 1660/2115] 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 9a95970eeeae..b5aae4c1ee85 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 - github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 + github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 diff --git a/go.sum b/go.sum index 0c85c84f96a6..e752233457f4 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgdfSSpqh2iJenR07k= github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/jgNVOmV80ZvqAUQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= From 186d6fe366cf51bfd64e9aa1d617cb47f94c3d47 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:43 -0400 Subject: [PATCH 1661/2115] go get github.com/aws/aws-sdk-go-v2/service/fsx. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b5aae4c1ee85..b2c019d00dec 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 diff --git a/go.sum b/go.sum index e752233457f4..e00d3477e541 100644 --- a/go.sum +++ b/go.sum @@ -263,8 +263,8 @@ github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgd github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/jgNVOmV80ZvqAUQ= github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z8fBNVAt8JImC6Rk= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= From f988843cea060a691928574563906d671503ebc5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:44 -0400 Subject: [PATCH 1662/2115] go get github.com/aws/aws-sdk-go-v2/service/gamelift. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b2c019d00dec..5c399edf8edc 100644 --- a/go.mod +++ b/go.mod @@ -127,7 +127,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 diff --git a/go.sum b/go.sum index e00d3477e541..7060803917cd 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/ github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z8fBNVAt8JImC6Rk= github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/4cvxvDywFbRSahtzb70k= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= From c919d733e2dad2c294de9f2e84a34b4357af49c6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:45 -0400 Subject: [PATCH 1663/2115] 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 5c399edf8edc..b57e73299102 100644 --- a/go.mod +++ b/go.mod @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 diff --git a/go.sum b/go.sum index 7060803917cd..2f8258123563 100644 --- a/go.sum +++ b/go.sum @@ -267,8 +267,8 @@ github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/4cvxvDywFbRSahtzb70k= github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMeSb/2uvmz+5SKMElnwLg= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= From e77bcb46948fa54a3d715a2aef1b6dfd11951430 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:46 -0400 Subject: [PATCH 1664/2115] 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 b57e73299102..157643da302f 100644 --- a/go.mod +++ b/go.mod @@ -129,7 +129,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 diff --git a/go.sum b/go.sum index 2f8258123563..e2bc0040f47a 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/ github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMeSb/2uvmz+5SKMElnwLg= github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1rse3iZPdH+nfOIgAfbT1Cpyob5hKE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= From 9e9e35ef09b54d8651082ed57b2182dccba1487d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:47 -0400 Subject: [PATCH 1665/2115] go get github.com/aws/aws-sdk-go-v2/service/glue. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 157643da302f..244e9385be3a 100644 --- a/go.mod +++ b/go.mod @@ -130,7 +130,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 - github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 + github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 diff --git a/go.sum b/go.sum index e2bc0040f47a..15d6380cdc94 100644 --- a/go.sum +++ b/go.sum @@ -271,8 +271,8 @@ github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMe github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1rse3iZPdH+nfOIgAfbT1Cpyob5hKE= github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkrlPFE3St8Hb0HasyWY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= From 0321c188ae81620c0f87bf6b3f2140591ab67e9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:48 -0400 Subject: [PATCH 1666/2115] go get github.com/aws/aws-sdk-go-v2/service/grafana. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 244e9385be3a..043b850bfc42 100644 --- a/go.mod +++ b/go.mod @@ -131,7 +131,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 diff --git a/go.sum b/go.sum index 15d6380cdc94..417b1df8b893 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1 github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkrlPFE3St8Hb0HasyWY= github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAOdnHtFtcCV83HjPvlXD4= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= From a1bc9f75ade11e684d3be4c715163c0cc02ed44d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:49 -0400 Subject: [PATCH 1667/2115] go get github.com/aws/aws-sdk-go-v2/service/greengrass. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 043b850bfc42..482415268fe8 100644 --- a/go.mod +++ b/go.mod @@ -132,7 +132,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 diff --git a/go.sum b/go.sum index 417b1df8b893..925ca26a941f 100644 --- a/go.sum +++ b/go.sum @@ -275,8 +275,8 @@ github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkr github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAOdnHtFtcCV83HjPvlXD4= github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwGbfEULKHdTWFtfM0PtS4tRw= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= From 775af97dc755f190efc85cddd584f07619d12dc0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:50 -0400 Subject: [PATCH 1668/2115] 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 482415268fe8..ab1c3602b717 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 diff --git a/go.sum b/go.sum index 925ca26a941f..9718d4284e30 100644 --- a/go.sum +++ b/go.sum @@ -277,8 +277,8 @@ github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAO github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwGbfEULKHdTWFtfM0PtS4tRw= github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP2V+GbkDZSD2ssy09CG/UbV6/U= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2/go.mod h1:HssjGKML+1CKdk/rpboJ1GDnqPdIRbKcaHn+rWb8WnI= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= From 94ba9b28a52ba96886d46e35ddefaafaf069c972 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:51 -0400 Subject: [PATCH 1669/2115] 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 ab1c3602b717..f47bb45a00d8 100644 --- a/go.mod +++ b/go.mod @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 diff --git a/go.sum b/go.sum index 9718d4284e30..e0d9e51c27b2 100644 --- a/go.sum +++ b/go.sum @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwG github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP2V+GbkDZSD2ssy09CG/UbV6/U= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2/go.mod h1:HssjGKML+1CKdk/rpboJ1GDnqPdIRbKcaHn+rWb8WnI= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2CpfUjEuYQw9JuCyRq+JHk= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= From 03c4280516f7f77b47bd1ad5d818f16cb929ed97 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:52 -0400 Subject: [PATCH 1670/2115] 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 f47bb45a00d8..004c333cfc12 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 diff --git a/go.sum b/go.sum index e0d9e51c27b2..1d5391576974 100644 --- a/go.sum +++ b/go.sum @@ -281,8 +281,8 @@ github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2CpfUjEuYQw9JuCyRq+JHk= github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+BeDgJXZAeUaBMOJUBLPAelw= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= From 00a1e0c6762986e541f4d40ecee7374eb86b75c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:52 -0400 Subject: [PATCH 1671/2115] 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 004c333cfc12..05374cad7f45 100644 --- a/go.mod +++ b/go.mod @@ -136,7 +136,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 - github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 diff --git a/go.sum b/go.sum index 1d5391576974..540053e8a4de 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,8 @@ github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2 github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+BeDgJXZAeUaBMOJUBLPAelw= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8vp8a0KqWThrXnhpI= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= From 6717ceb2f78f68bec116f745409e8f25e8a19c9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:53 -0400 Subject: [PATCH 1672/2115] 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 05374cad7f45..f96b3fc5d497 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 diff --git a/go.sum b/go.sum index 540053e8a4de..1033fbf35401 100644 --- a/go.sum +++ b/go.sum @@ -285,8 +285,8 @@ github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+B github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8vp8a0KqWThrXnhpI= github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2DqiehXiA6JDOyYPoG9FOuihV9Mg= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= From 2fc95c667f17e1a366a7049f638d6344369ccdad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:54 -0400 Subject: [PATCH 1673/2115] go get github.com/aws/aws-sdk-go-v2/service/imagebuilder. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f96b3fc5d497..746ad2ea6614 100644 --- a/go.mod +++ b/go.mod @@ -138,7 +138,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 diff --git a/go.sum b/go.sum index 1033fbf35401..4e27b70bd09d 100644 --- a/go.sum +++ b/go.sum @@ -287,8 +287,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8v github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2DqiehXiA6JDOyYPoG9FOuihV9Mg= github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90TQn2DyKXC5t7ojFo9f+DMgtM= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= From fcb6bc4d466fbe385bb138837465890562919b85 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:55 -0400 Subject: [PATCH 1674/2115] go get github.com/aws/aws-sdk-go-v2/service/inspector. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 746ad2ea6614..d0eff85faf9d 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 diff --git a/go.sum b/go.sum index 4e27b70bd09d..d5fb2b57836e 100644 --- a/go.sum +++ b/go.sum @@ -289,8 +289,8 @@ github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2Dq github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90TQn2DyKXC5t7ojFo9f+DMgtM= github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 h1:5vo4H66qsNDlcYkIWHoUdgiI1nlKyUbCbyrjA4gFLE4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= From 845d94788d3bbf9a171cbb1f3344d822a31cfd6e Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 08:30:55 -0500 Subject: [PATCH 1675/2115] aws_controltower_baseline: fix staticheck linter error --- internal/service/controltower/baseline.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 5680c674fb05..ea06d29ab852 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -362,9 +362,8 @@ type parameters struct { func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { var diags diag.Diagnostics - switch v.(type) { + switch param := v.(type) { case awstypes.EnabledBaselineParameterSummary: - param := v.(awstypes.EnabledBaselineParameterSummary) p.Key = fwflex.StringToFramework(ctx, param.Key) if param.Value != nil { var value string From e9f3119daf6afc1c8cd11fced1ee79cc73e583c5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:56 -0400 Subject: [PATCH 1676/2115] 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 d0eff85faf9d..271e9a2cb580 100644 --- a/go.mod +++ b/go.mod @@ -140,7 +140,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 diff --git a/go.sum b/go.sum index d5fb2b57836e..8a9d815eec71 100644 --- a/go.sum +++ b/go.sum @@ -291,8 +291,8 @@ github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90 github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 h1:5vo4H66qsNDlcYkIWHoUdgiI1nlKyUbCbyrjA4gFLE4= github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 h1:N0c2Xhm+jL85dxldlPy8vB/iqLXIevRz9xgt1suQ1Aw= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= From bff24b39dbcf917ab87e30be83d32fbc03a5c684 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:57 -0400 Subject: [PATCH 1677/2115] 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 271e9a2cb580..1551f671e8c4 100644 --- a/go.mod +++ b/go.mod @@ -141,7 +141,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 diff --git a/go.sum b/go.sum index 8a9d815eec71..224146c6b383 100644 --- a/go.sum +++ b/go.sum @@ -303,8 +303,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgO github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp2iC2aQqPMOSXyx7QpATrRzSWB04= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= From 0526afe971f7b284051b37289f70c19d21bea5a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:58 -0400 Subject: [PATCH 1678/2115] go get github.com/aws/aws-sdk-go-v2/service/invoicing. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1551f671e8c4..6cd78c75072a 100644 --- a/go.mod +++ b/go.mod @@ -142,7 +142,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 diff --git a/go.sum b/go.sum index 224146c6b383..82342cb65bcc 100644 --- a/go.sum +++ b/go.sum @@ -305,8 +305,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp2iC2aQqPMOSXyx7QpATrRzSWB04= github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF8Mn6s2G22HOI2cyiHiP8= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= From 93b8accb0b43e30960e46e99b52258e27c68bd5c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:59 -0400 Subject: [PATCH 1679/2115] go get github.com/aws/aws-sdk-go-v2/service/iot. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6cd78c75072a..fe72ef7121c4 100644 --- a/go.mod +++ b/go.mod @@ -143,7 +143,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 - github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 + github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 diff --git a/go.sum b/go.sum index 82342cb65bcc..7daaea9c362f 100644 --- a/go.sum +++ b/go.sum @@ -307,8 +307,8 @@ github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF8Mn6s2G22HOI2cyiHiP8= github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJxk7DDcYZ73jJ/s4= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= From f39428ecc10c197d7801b4d9a28527cdb573f418 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:30:59 -0400 Subject: [PATCH 1680/2115] go get github.com/aws/aws-sdk-go-v2/service/ivs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe72ef7121c4..60cc9ac46319 100644 --- a/go.mod +++ b/go.mod @@ -144,7 +144,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 diff --git a/go.sum b/go.sum index 7daaea9c362f..478b3ae37bcf 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJxk7DDcYZ73jJ/s4= github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgDv3j/jeSmyD52xEY= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= From a7c85ecb74c6fed9bb6ccbd0731180ddda5f3ab6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:00 -0400 Subject: [PATCH 1681/2115] 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 60cc9ac46319..43e9145e2823 100644 --- a/go.mod +++ b/go.mod @@ -145,7 +145,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 diff --git a/go.sum b/go.sum index 478b3ae37bcf..7636bda4e8ae 100644 --- a/go.sum +++ b/go.sum @@ -311,8 +311,8 @@ github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJ github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgDv3j/jeSmyD52xEY= github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrze1jmq7nx60P7hIFmSLA= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= From b44d834aeee98ece51f221d879b7b0ff6359edb5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:01 -0400 Subject: [PATCH 1682/2115] 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 43e9145e2823..67acb21ddd12 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 diff --git a/go.sum b/go.sum index 7636bda4e8ae..2a941e0888eb 100644 --- a/go.sum +++ b/go.sum @@ -313,8 +313,8 @@ github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgD github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrze1jmq7nx60P7hIFmSLA= github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+sJIm2sJMLltK2unRSk= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= From c5edf0903fd2d22665b08ed1cb45b8264ce9bacd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:02 -0400 Subject: [PATCH 1683/2115] go get github.com/aws/aws-sdk-go-v2/service/kafkaconnect. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 67acb21ddd12..9c4060cb4bb5 100644 --- a/go.mod +++ b/go.mod @@ -147,7 +147,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 diff --git a/go.sum b/go.sum index 2a941e0888eb..3f650f262b57 100644 --- a/go.sum +++ b/go.sum @@ -315,8 +315,8 @@ github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrz github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+sJIm2sJMLltK2unRSk= github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQrI2bkJ2sQpN84mRcEcBNV9LZU= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= From 4511c9a77fe9e6e478e0cc2c944569e68e2def37 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:03 -0400 Subject: [PATCH 1684/2115] 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 9c4060cb4bb5..d7d1011eae45 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 diff --git a/go.sum b/go.sum index 3f650f262b57..adb2810eee21 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,8 @@ github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+s github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQrI2bkJ2sQpN84mRcEcBNV9LZU= github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxju7ahxkdmmXCQBIUU1k= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= From 8aa3bd47c6c79783fdfcc93e70119035c50e67e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:04 -0400 Subject: [PATCH 1685/2115] 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 d7d1011eae45..6888b039918f 100644 --- a/go.mod +++ b/go.mod @@ -149,7 +149,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 diff --git a/go.sum b/go.sum index adb2810eee21..ba7f2affb6b9 100644 --- a/go.sum +++ b/go.sum @@ -319,8 +319,8 @@ github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQr github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxju7ahxkdmmXCQBIUU1k= github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDRux7yw7tIKDEZbjmQ+8thE= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= From 4d7e762b4c6211dc318a0f3345ac2e8344d1ea3e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:05 -0400 Subject: [PATCH 1686/2115] 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 6888b039918f..2ec99bd15f2c 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 diff --git a/go.sum b/go.sum index ba7f2affb6b9..5073db73768b 100644 --- a/go.sum +++ b/go.sum @@ -321,8 +321,8 @@ github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxj github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDRux7yw7tIKDEZbjmQ+8thE= github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68IgDVXLnz9B8brLDLuJjiA= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= From ef5f2d3502a0997e39ed73e165766df2cceabcd7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:06 -0400 Subject: [PATCH 1687/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalytics. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2ec99bd15f2c..fb84708c8eac 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 diff --git a/go.sum b/go.sum index 5073db73768b..a72f364bcfde 100644 --- a/go.sum +++ b/go.sum @@ -323,8 +323,8 @@ github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDR github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68IgDVXLnz9B8brLDLuJjiA= github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMgptRcCWeRly7bh2qnaWLu9MSkTVU8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= From b9e6ec88221ed6fec7cb3fa0681b24beb45be884 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:07 -0400 Subject: [PATCH 1688/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fb84708c8eac..dc5e65ff48cc 100644 --- a/go.mod +++ b/go.mod @@ -152,7 +152,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 diff --git a/go.sum b/go.sum index a72f364bcfde..dffc13c2d418 100644 --- a/go.sum +++ b/go.sum @@ -325,8 +325,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68Ig github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMgptRcCWeRly7bh2qnaWLu9MSkTVU8= github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaFL6A62A/7/58SK+cGoZUycB+pqI/Ll4= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= From 8df5f5a7c50a2ccc943245cdf95e878f8bc5538f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:07 -0400 Subject: [PATCH 1689/2115] go get github.com/aws/aws-sdk-go-v2/service/kinesisvideo. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dc5e65ff48cc..404e6e3dac53 100644 --- a/go.mod +++ b/go.mod @@ -153,7 +153,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 diff --git a/go.sum b/go.sum index dffc13c2d418..22c8ba61e7b8 100644 --- a/go.sum +++ b/go.sum @@ -327,8 +327,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMg github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaFL6A62A/7/58SK+cGoZUycB+pqI/Ll4= github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx40rnzsCwu4Ak+cZ1yD2rQ+44M= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= From 355671aced01b96648bb80360ce490aff4283846 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:08 -0400 Subject: [PATCH 1690/2115] 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 404e6e3dac53..6d74700aec07 100644 --- a/go.mod +++ b/go.mod @@ -154,7 +154,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 - github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 + github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 diff --git a/go.sum b/go.sum index 22c8ba61e7b8..920bd9a7a613 100644 --- a/go.sum +++ b/go.sum @@ -329,8 +329,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaF github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx40rnzsCwu4Ak+cZ1yD2rQ+44M= github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FDoUckCOfCY3hj1n4= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= From 9cd91577578cb0b72e5aecc7796a002378e72dcb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:09 -0400 Subject: [PATCH 1691/2115] 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 6d74700aec07..15483788a894 100644 --- a/go.mod +++ b/go.mod @@ -155,7 +155,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 diff --git a/go.sum b/go.sum index 920bd9a7a613..6e2a9a8ec0b1 100644 --- a/go.sum +++ b/go.sum @@ -331,8 +331,8 @@ github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx4 github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FDoUckCOfCY3hj1n4= github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4CcKg5S13cY+tN9o+4D9VKPSBwI= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= From ba392538d6d061176daf0572d0f335e1d650b383 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:10 -0400 Subject: [PATCH 1692/2115] 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 15483788a894..eb7a8d2d97cb 100644 --- a/go.mod +++ b/go.mod @@ -156,7 +156,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 diff --git a/go.sum b/go.sum index 6e2a9a8ec0b1..b12fbfd0dd1f 100644 --- a/go.sum +++ b/go.sum @@ -333,8 +333,8 @@ github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FD github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4CcKg5S13cY+tN9o+4D9VKPSBwI= github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27ACbUfULROVoe+2eAdng0= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= From 2f73c3ff9629c916d45a4cbafbff16e24b84a9c0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:11 -0400 Subject: [PATCH 1693/2115] 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 eb7a8d2d97cb..5f8c5fbe8c39 100644 --- a/go.mod +++ b/go.mod @@ -157,7 +157,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 diff --git a/go.sum b/go.sum index b12fbfd0dd1f..1ef90e345116 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4C github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27ACbUfULROVoe+2eAdng0= github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQM5Urs36ARzbEP8L3nYypc2Q4= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= From 85616eddadfbbfd621ca26c32aa349935ec5b5ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:12 -0400 Subject: [PATCH 1694/2115] go get github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5f8c5fbe8c39..24c4db7f8491 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 diff --git a/go.sum b/go.sum index 1ef90e345116..39fa0332c471 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,8 @@ github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27AC github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQM5Urs36ARzbEP8L3nYypc2Q4= github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB6/wGEBdKTSv+jjfLTb7g4a6RwsqiVHE1TEE= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= From 39da10971f2f5b9a3eeab98cf329bb4986021d3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:13 -0400 Subject: [PATCH 1695/2115] 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 24c4db7f8491..17f6f17bb1cb 100644 --- a/go.mod +++ b/go.mod @@ -159,7 +159,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 github.com/aws/aws-sdk-go-v2/service/location v1.49.2 diff --git a/go.sum b/go.sum index 39fa0332c471..e4305954cf2c 100644 --- a/go.sum +++ b/go.sum @@ -339,8 +339,8 @@ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQ github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB6/wGEBdKTSv+jjfLTb7g4a6RwsqiVHE1TEE= github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7WhJO5xpYiA7f1LH2YQZVh4Fio= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= From e141c9075ace4cd97c8364568370e15271d7757e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:14 -0400 Subject: [PATCH 1696/2115] go get github.com/aws/aws-sdk-go-v2/service/licensemanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 17f6f17bb1cb..e5e20c44f034 100644 --- a/go.mod +++ b/go.mod @@ -160,7 +160,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 github.com/aws/aws-sdk-go-v2/service/location v1.49.2 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 diff --git a/go.sum b/go.sum index e4305954cf2c..781df9bec616 100644 --- a/go.sum +++ b/go.sum @@ -341,8 +341,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7WhJO5xpYiA7f1LH2YQZVh4Fio= github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7VtNyZLsM9Uz1Zl8VMe/NVQgEWtpY= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= From ca4a82f042f72e5202c75e3ac30770b2e8c34fc2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:15 -0400 Subject: [PATCH 1697/2115] 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 e5e20c44f034..ac56d16a95e5 100644 --- a/go.mod +++ b/go.mod @@ -161,7 +161,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 github.com/aws/aws-sdk-go-v2/service/location v1.49.2 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 diff --git a/go.sum b/go.sum index 781df9bec616..05d00f71e868 100644 --- a/go.sum +++ b/go.sum @@ -343,8 +343,8 @@ github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7Wh github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7VtNyZLsM9Uz1Zl8VMe/NVQgEWtpY= github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJqozcrpumFh9+P7RQuXFJw= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= From 4d2ef47ddf9d03160eea831175e69501f53802d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:16 -0400 Subject: [PATCH 1698/2115] go get github.com/aws/aws-sdk-go-v2/service/location. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ac56d16a95e5..5ffc46b592d5 100644 --- a/go.mod +++ b/go.mod @@ -162,7 +162,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 - github.com/aws/aws-sdk-go-v2/service/location v1.49.2 + github.com/aws/aws-sdk-go-v2/service/location v1.49.3 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 diff --git a/go.sum b/go.sum index 05d00f71e868..af4e637bb64a 100644 --- a/go.sum +++ b/go.sum @@ -345,8 +345,8 @@ github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7Vt github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJqozcrpumFh9+P7RQuXFJw= github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= -github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= -github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= +github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK2rY+2xBEUAVxxz7iSJvQ= +github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= From 1ed2be9d420e2956dd91b03cd24d2572f03a5a46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:17 -0400 Subject: [PATCH 1699/2115] 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 5ffc46b592d5..fa34b6fed8d3 100644 --- a/go.mod +++ b/go.mod @@ -163,7 +163,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 github.com/aws/aws-sdk-go-v2/service/location v1.49.3 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 diff --git a/go.sum b/go.sum index af4e637bb64a..5edf32b62040 100644 --- a/go.sum +++ b/go.sum @@ -347,8 +347,8 @@ github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJ github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK2rY+2xBEUAVxxz7iSJvQ= github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hrSUtqfXVJP15KShbRle+mq/6VV4= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= From 9fdd70b91e8d146672019754e7d5012d2a9af3d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:17 -0400 Subject: [PATCH 1700/2115] 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 fa34b6fed8d3..10914d80c33f 100644 --- a/go.mod +++ b/go.mod @@ -164,7 +164,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 github.com/aws/aws-sdk-go-v2/service/location v1.49.3 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 diff --git a/go.sum b/go.sum index 5edf32b62040..2776a172e6dd 100644 --- a/go.sum +++ b/go.sum @@ -349,8 +349,8 @@ github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hrSUtqfXVJP15KShbRle+mq/6VV4= github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh4kV5MFdWnYHKeM= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= From dedc09806922aa425eb407c616df81247260d112 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:18 -0400 Subject: [PATCH 1701/2115] go get github.com/aws/aws-sdk-go-v2/service/macie2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 10914d80c33f..f5d5de1621f5 100644 --- a/go.mod +++ b/go.mod @@ -165,7 +165,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/location v1.49.3 github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 diff --git a/go.sum b/go.sum index 2776a172e6dd..5d82dc3657d1 100644 --- a/go.sum +++ b/go.sum @@ -351,8 +351,8 @@ github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hr github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh4kV5MFdWnYHKeM= github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0OjHi1dTFkG5LpaOf3FI= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= From c530151e6d288292fe7f401b0cfebc2dbd7bf214 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:19 -0400 Subject: [PATCH 1702/2115] 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 f5d5de1621f5..b9dd12c009db 100644 --- a/go.mod +++ b/go.mod @@ -166,7 +166,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 diff --git a/go.sum b/go.sum index 5d82dc3657d1..83b368db57f9 100644 --- a/go.sum +++ b/go.sum @@ -353,8 +353,8 @@ github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0OjHi1dTFkG5LpaOf3FI= github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9pawjWdGGF1r/CAdDFZVot7GeQ= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= From 8ad634ab2b0c4abf901ade90fe1cc03ec20e78ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:20 -0400 Subject: [PATCH 1703/2115] 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 b9dd12c009db..6e4bd9bbb2c9 100644 --- a/go.mod +++ b/go.mod @@ -167,7 +167,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 diff --git a/go.sum b/go.sum index 83b368db57f9..6c47efdaaf8e 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0O github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9pawjWdGGF1r/CAdDFZVot7GeQ= github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcLmFLUXI84JEqnIYW9lkiLV1ws= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= From 8fd28dcdec3db257f5ff87ab6d6e448ce56f8b06 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:21 -0400 Subject: [PATCH 1704/2115] 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 6e4bd9bbb2c9..1b0e3d6c6961 100644 --- a/go.mod +++ b/go.mod @@ -168,7 +168,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 diff --git a/go.sum b/go.sum index 6c47efdaaf8e..cbbfa93d2ac3 100644 --- a/go.sum +++ b/go.sum @@ -357,8 +357,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9p github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcLmFLUXI84JEqnIYW9lkiLV1ws= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG/wHpY2SaH3eODO3jVwAIM= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= From 3afa08ef71e0efeb03f24a121a02ca74693ca167 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:22 -0400 Subject: [PATCH 1705/2115] 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 1b0e3d6c6961..0f77cdc715af 100644 --- a/go.mod +++ b/go.mod @@ -169,7 +169,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 diff --git a/go.sum b/go.sum index cbbfa93d2ac3..90d902194b8d 100644 --- a/go.sum +++ b/go.sum @@ -359,8 +359,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcL github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG/wHpY2SaH3eODO3jVwAIM= github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= From d5d81364967cfe02fb7b28f2f80e333771ea276a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:23 -0400 Subject: [PATCH 1706/2115] 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 0f77cdc715af..032f04729965 100644 --- a/go.mod +++ b/go.mod @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 diff --git a/go.sum b/go.sum index 90d902194b8d..ac65722fd9d6 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 h1:78Llq5ye9Yo1uy8e/0UNeMNy8DWdTT+6FbMVaTP5XUs= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= From 3e9c7def9621c4d32f77f340d7cc5f48bb5f5463 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:24 -0400 Subject: [PATCH 1707/2115] go get github.com/aws/aws-sdk-go-v2/service/mediapackagevod. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 032f04729965..8dc518970838 100644 --- a/go.mod +++ b/go.mod @@ -171,7 +171,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 diff --git a/go.sum b/go.sum index ac65722fd9d6..0f23569a7c1d 100644 --- a/go.sum +++ b/go.sum @@ -363,8 +363,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CC github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 h1:78Llq5ye9Yo1uy8e/0UNeMNy8DWdTT+6FbMVaTP5XUs= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= From 42d375a66bb599536937984043fb40077ff7e6ab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:25 -0400 Subject: [PATCH 1708/2115] 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 8dc518970838..5243cb6d3f60 100644 --- a/go.mod +++ b/go.mod @@ -172,7 +172,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 diff --git a/go.sum b/go.sum index 0f23569a7c1d..b4196ba5c909 100644 --- a/go.sum +++ b/go.sum @@ -365,8 +365,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 h1:78Llq5ye9Yo1uy8e/ github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= From 0d16e6fa6344fdb89006bdfacaede1991daebc46 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:25 -0400 Subject: [PATCH 1709/2115] go get github.com/aws/aws-sdk-go-v2/service/memorydb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5243cb6d3f60..b7efef3756ed 100644 --- a/go.mod +++ b/go.mod @@ -173,7 +173,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 diff --git a/go.sum b/go.sum index b4196ba5c909..2ac6788300de 100644 --- a/go.sum +++ b/go.sum @@ -367,8 +367,8 @@ github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLj github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/HhUeTHxiWqsvQQgocL48= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= From 5e84496adc452bf99169855a881fe469bed89a31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:26 -0400 Subject: [PATCH 1710/2115] go get github.com/aws/aws-sdk-go-v2/service/mgn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b7efef3756ed..d028bf13f1c2 100644 --- a/go.mod +++ b/go.mod @@ -174,7 +174,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 diff --git a/go.sum b/go.sum index 2ac6788300de..685a5d64a5f2 100644 --- a/go.sum +++ b/go.sum @@ -369,8 +369,8 @@ github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/HhUeTHxiWqsvQQgocL48= github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4KZRdjN06PAFlt9o= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= github.com/aws/aws-sdk-go-v2/service/mq v1.34.0/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= From f3f9538d71c96d7f6bdb6523981ecba2f9b0711f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:27 -0400 Subject: [PATCH 1711/2115] 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 d028bf13f1c2..0c89033a9372 100644 --- a/go.mod +++ b/go.mod @@ -175,7 +175,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 - github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 + github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 diff --git a/go.sum b/go.sum index 685a5d64a5f2..f57c98861f38 100644 --- a/go.sum +++ b/go.sum @@ -371,8 +371,8 @@ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/ github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4KZRdjN06PAFlt9o= github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.0/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+RvB5sblqeVmiNAI= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= From 51212c3330221fc129999958746ee0a755324184 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:28 -0400 Subject: [PATCH 1712/2115] 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 0c89033a9372..570f4dfd49f1 100644 --- a/go.mod +++ b/go.mod @@ -176,7 +176,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 diff --git a/go.sum b/go.sum index f57c98861f38..85637f1bf0ca 100644 --- a/go.sum +++ b/go.sum @@ -373,8 +373,8 @@ github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4 github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+RvB5sblqeVmiNAI= github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOUarwehGgE2V8v3Dqo= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= From 4fae14be259cebc9c09f5bae8d92b437268a94b1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:29 -0400 Subject: [PATCH 1713/2115] go get github.com/aws/aws-sdk-go-v2/service/neptune. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 570f4dfd49f1..858964414830 100644 --- a/go.mod +++ b/go.mod @@ -177,7 +177,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 - github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 diff --git a/go.sum b/go.sum index 85637f1bf0ca..052e4bd8416d 100644 --- a/go.sum +++ b/go.sum @@ -375,8 +375,8 @@ github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+R github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOUarwehGgE2V8v3Dqo= github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9nbq+UxcpQAuXQxVjvsY= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= From 626eb31cc08aac99bc529a66ed633d1a5d170ef2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:29 -0400 Subject: [PATCH 1714/2115] 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 858964414830..d651a7d3f814 100644 --- a/go.mod +++ b/go.mod @@ -178,7 +178,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 diff --git a/go.sum b/go.sum index 052e4bd8416d..9f43016c0f64 100644 --- a/go.sum +++ b/go.sum @@ -377,8 +377,8 @@ github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOU github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9nbq+UxcpQAuXQxVjvsY= github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHMlwaw26mFUUcVQEVqY/I4oA7A= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= From 1c09c4a6ceb8495623e6c01ce1ea0f6b37b01fe3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:30 -0400 Subject: [PATCH 1715/2115] go get github.com/aws/aws-sdk-go-v2/service/networkfirewall. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d651a7d3f814..b75a36d63c02 100644 --- a/go.mod +++ b/go.mod @@ -179,7 +179,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 diff --git a/go.sum b/go.sum index 9f43016c0f64..8826cf976439 100644 --- a/go.sum +++ b/go.sum @@ -379,8 +379,8 @@ github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9 github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHMlwaw26mFUUcVQEVqY/I4oA7A= github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YVNLJI1/i9OEzflSg1B7EJ2CTnq2I= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= From 1849439bb3fa81ae55670a75752e2bdf4180e320 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:31 -0400 Subject: [PATCH 1716/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmanager. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b75a36d63c02..109ca289a245 100644 --- a/go.mod +++ b/go.mod @@ -180,7 +180,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 diff --git a/go.sum b/go.sum index 8826cf976439..81e43a931f2a 100644 --- a/go.sum +++ b/go.sum @@ -381,8 +381,8 @@ github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHM github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YVNLJI1/i9OEzflSg1B7EJ2CTnq2I= github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPItMeYp9pw2S+VG5CITFdXy1zQyg= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= From e4c4073fb23b6cdb3991c682bd62e4e2a64c0a3c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:32 -0400 Subject: [PATCH 1717/2115] go get github.com/aws/aws-sdk-go-v2/service/networkmonitor. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 109ca289a245..be84727e781c 100644 --- a/go.mod +++ b/go.mod @@ -181,7 +181,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 diff --git a/go.sum b/go.sum index 81e43a931f2a..8341ac0cb78d 100644 --- a/go.sum +++ b/go.sum @@ -383,8 +383,8 @@ github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YV github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPItMeYp9pw2S+VG5CITFdXy1zQyg= github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM9t7ag2468xgqWQs9H48iEBCs5Q= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= From 6b7ce9de2b1f59af67c09bfa807298eb1f6a92aa Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:33 -0400 Subject: [PATCH 1718/2115] go get github.com/aws/aws-sdk-go-v2/service/notifications. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be84727e781c..a329b96eba06 100644 --- a/go.mod +++ b/go.mod @@ -182,7 +182,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 - github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 diff --git a/go.sum b/go.sum index 8341ac0cb78d..e2659bb355f5 100644 --- a/go.sum +++ b/go.sum @@ -385,8 +385,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPI github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM9t7ag2468xgqWQs9H48iEBCs5Q= github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJjOFM4FMrbZbawG8NscGKHsxw= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= From ed6f2adc8a80cd76e309110498f28a2ba052d5e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:34 -0400 Subject: [PATCH 1719/2115] go get github.com/aws/aws-sdk-go-v2/service/notificationscontacts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a329b96eba06..a4cc1ce2fe41 100644 --- a/go.mod +++ b/go.mod @@ -183,7 +183,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 diff --git a/go.sum b/go.sum index e2659bb355f5..474a49bc989c 100644 --- a/go.sum +++ b/go.sum @@ -387,8 +387,8 @@ github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJjOFM4FMrbZbawG8NscGKHsxw= github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2YD8IhcKDETZNLxmticIRESuyafaqSi/PA= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= github.com/aws/aws-sdk-go-v2/service/oam v1.22.1/go.mod h1:7FL0wpgqB1DXHmD5sh0Shnq70Ib6Yb3ayh0OHeJO9a4= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= From 41ec3866e37857e4f2b76837a536f96bd8bee5c4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:35 -0400 Subject: [PATCH 1720/2115] 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 a4cc1ce2fe41..dfcbccc6f498 100644 --- a/go.mod +++ b/go.mod @@ -184,7 +184,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 - github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 + github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 diff --git a/go.sum b/go.sum index 474a49bc989c..e029a232a938 100644 --- a/go.sum +++ b/go.sum @@ -389,8 +389,8 @@ github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJ github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2YD8IhcKDETZNLxmticIRESuyafaqSi/PA= github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.1/go.mod h1:7FL0wpgqB1DXHmD5sh0Shnq70Ib6Yb3ayh0OHeJO9a4= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy4rf0V0p1yZF5rIQ= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= From c0c9121d50ed09d799317150632c552c1664813b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:36 -0400 Subject: [PATCH 1721/2115] go get github.com/aws/aws-sdk-go-v2/service/odb. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dfcbccc6f498..d8806c55b8bf 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 - github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 + github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 diff --git a/go.sum b/go.sum index e029a232a938..477f5f7fd476 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,8 @@ github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2Y github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy4rf0V0p1yZF5rIQ= github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7kArD8EuXN8jTrPs= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= From ac0ebd1a06ab54e9b08de40bdcca8520d4229dde Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:37 -0400 Subject: [PATCH 1722/2115] go get github.com/aws/aws-sdk-go-v2/service/opensearch. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d8806c55b8bf..006d15ec222a 100644 --- a/go.mod +++ b/go.mod @@ -186,7 +186,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 diff --git a/go.sum b/go.sum index 477f5f7fd476..ef137ac3c7bf 100644 --- a/go.sum +++ b/go.sum @@ -393,8 +393,8 @@ github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7kArD8EuXN8jTrPs= github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJFjaozIVkQ1o+JPlggNzhCs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= From 6655de629a69cd944f632de3ac6407eb3452a0f1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:38 -0400 Subject: [PATCH 1723/2115] 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 006d15ec222a..a7d89e8a04ca 100644 --- a/go.mod +++ b/go.mod @@ -187,7 +187,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 diff --git a/go.sum b/go.sum index ef137ac3c7bf..e4bb2d7591eb 100644 --- a/go.sum +++ b/go.sum @@ -395,8 +395,8 @@ github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7k github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJFjaozIVkQ1o+JPlggNzhCs= github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= From 4bdb630e2a8d65331179b3b691d46ec200f90ae6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:39 -0400 Subject: [PATCH 1724/2115] 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 a7d89e8a04ca..f8139bdf2c43 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 + github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 diff --git a/go.sum b/go.sum index e4bb2d7591eb..f3c71ccd7a85 100644 --- a/go.sum +++ b/go.sum @@ -397,8 +397,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJ github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 h1:1fvWoh45dKiK7dfU1I6JZN8ok+UIvTeonyLqvjgWl0k= +github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= From 4d50ca628f4bf0c86dddae228941e6bd97f77d0d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:39 -0400 Subject: [PATCH 1725/2115] 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 f8139bdf2c43..bab9abdc2c44 100644 --- a/go.mod +++ b/go.mod @@ -189,7 +189,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 - github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 + github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 diff --git a/go.sum b/go.sum index f3c71ccd7a85..937a7105b7ba 100644 --- a/go.sum +++ b/go.sum @@ -399,8 +399,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQ github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 h1:1fvWoh45dKiK7dfU1I6JZN8ok+UIvTeonyLqvjgWl0k= github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= From ab0dff1e47c6a5c3d44306b1af28fbfcfbb24ef9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:40 -0400 Subject: [PATCH 1726/2115] go get github.com/aws/aws-sdk-go-v2/service/outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bab9abdc2c44..0f1c9f8d3a17 100644 --- a/go.mod +++ b/go.mod @@ -190,7 +190,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 diff --git a/go.sum b/go.sum index 937a7105b7ba..4d1f38fbbcee 100644 --- a/go.sum +++ b/go.sum @@ -401,8 +401,8 @@ github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 h1:1fvWoh45dKiK7dfU1I github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= From 4fa048d176b68956147daa005319c627e06467d1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:41 -0400 Subject: [PATCH 1727/2115] 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 0f1c9f8d3a17..dc1d9e6069e5 100644 --- a/go.mod +++ b/go.mod @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 diff --git a/go.sum b/go.sum index 4d1f38fbbcee..55c416e72cb1 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoE github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcTju7vc4t7aj2d2gvXvkH4ktuwFf3Op8s= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= From d6d18e6c6d21360a1cbffe9ff2597b76242be23e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:42 -0400 Subject: [PATCH 1728/2115] 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 dc1d9e6069e5..7e0dd6b469e8 100644 --- a/go.mod +++ b/go.mod @@ -192,7 +192,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 diff --git a/go.sum b/go.sum index 55c416e72cb1..cc589ec84d72 100644 --- a/go.sum +++ b/go.sum @@ -405,8 +405,8 @@ github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDg github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcTju7vc4t7aj2d2gvXvkH4ktuwFf3Op8s= github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1h0im145UBakpEmOCCkXTGnOkoM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= From 432b3089cb44a2ce1afa17c1d924122ba424b946 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:43 -0400 Subject: [PATCH 1729/2115] go get github.com/aws/aws-sdk-go-v2/service/pcs. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7e0dd6b469e8..fad35e604c21 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 diff --git a/go.sum b/go.sum index cc589ec84d72..e0716cef8f83 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,8 @@ github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcT github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1h0im145UBakpEmOCCkXTGnOkoM= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02eeV6w924Pbbw2Vdfs= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= From 881c9b133ba4355400deac1a8cadc92275b1ff65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:44 -0400 Subject: [PATCH 1730/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpoint. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fad35e604c21..bdfd984229bb 100644 --- a/go.mod +++ b/go.mod @@ -194,7 +194,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 diff --git a/go.sum b/go.sum index e0716cef8f83..680608165cc4 100644 --- a/go.sum +++ b/go.sum @@ -409,8 +409,8 @@ github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02eeV6w924Pbbw2Vdfs= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQaoVoDFtZz92A9OWddBuFA= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= From d692e49b55103332fb793d32866151ab502a1bed Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:45 -0400 Subject: [PATCH 1731/2115] go get github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bdfd984229bb..3f6166414ff5 100644 --- a/go.mod +++ b/go.mod @@ -195,7 +195,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 diff --git a/go.sum b/go.sum index 680608165cc4..7a802a7a043d 100644 --- a/go.sum +++ b/go.sum @@ -411,8 +411,8 @@ github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02ee github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQaoVoDFtZz92A9OWddBuFA= github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqzbYCXC8Ke2S/O6K9/QXl5MZRXmA8iMU= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= From 5512848403e806209c9d37262feea7739675ea21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:46 -0400 Subject: [PATCH 1732/2115] 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 3f6166414ff5..3e676096f0f0 100644 --- a/go.mod +++ b/go.mod @@ -196,7 +196,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 diff --git a/go.sum b/go.sum index 7a802a7a043d..078c2c3b6e93 100644 --- a/go.sum +++ b/go.sum @@ -413,8 +413,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQa github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqzbYCXC8Ke2S/O6K9/QXl5MZRXmA8iMU= github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7GKi9eemWNYFNrmyx0= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= From e02e0a5e6756c28806216a1466c03ba8ab2b4e99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:46 -0400 Subject: [PATCH 1733/2115] 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 3e676096f0f0..6b5b97508f7c 100644 --- a/go.mod +++ b/go.mod @@ -197,7 +197,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 - github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 + github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 diff --git a/go.sum b/go.sum index 078c2c3b6e93..d8aeac3951a6 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqz github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7GKi9eemWNYFNrmyx0= github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bgHCpyj9cTg5dOZ8tLw= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= From 2213c1741d6a2572fa8d751e5398be64e973d27a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:47 -0400 Subject: [PATCH 1734/2115] 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 6b5b97508f7c..53d418191de8 100644 --- a/go.mod +++ b/go.mod @@ -198,7 +198,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 diff --git a/go.sum b/go.sum index d8aeac3951a6..b8827748b52b 100644 --- a/go.sum +++ b/go.sum @@ -417,8 +417,8 @@ github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7 github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bgHCpyj9cTg5dOZ8tLw= github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBDK8HthRDBr5deAQ5Pb3s= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= From 649d5b0b4cde83cb0c1ea771dc0fb5ad90f82e8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:48 -0400 Subject: [PATCH 1735/2115] 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 53d418191de8..d389e83f6484 100644 --- a/go.mod +++ b/go.mod @@ -199,7 +199,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 diff --git a/go.sum b/go.sum index b8827748b52b..41745c64490f 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bg github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBDK8HthRDBr5deAQ5Pb3s= github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUEJYFj6C+UzlCy+Lb0Xu+8k= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= From c563637d78337b99e303cf9d9d81f89aa631f482 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:49 -0400 Subject: [PATCH 1736/2115] 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 d389e83f6484..3cb655e789dc 100644 --- a/go.mod +++ b/go.mod @@ -200,7 +200,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 diff --git a/go.sum b/go.sum index 41745c64490f..b435e19d294c 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBD github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUEJYFj6C+UzlCy+Lb0Xu+8k= github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgAJklcYcApJuRMoYOU= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= From 530eceed66955fb5ad3e311a012ca9abc772475d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:50 -0400 Subject: [PATCH 1737/2115] go get github.com/aws/aws-sdk-go-v2/service/quicksight. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3cb655e789dc..a4dde6bbe46f 100644 --- a/go.mod +++ b/go.mod @@ -201,7 +201,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 diff --git a/go.sum b/go.sum index b435e19d294c..007b2fda82eb 100644 --- a/go.sum +++ b/go.sum @@ -423,8 +423,8 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUE github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgAJklcYcApJuRMoYOU= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/RjNZo72wiWbIxR7pT+XEmQ= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= From 7e48edd60a7c9d533a6963dc4e19b4eee3f8ae26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:51 -0400 Subject: [PATCH 1738/2115] 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 a4dde6bbe46f..a175b29f15c5 100644 --- a/go.mod +++ b/go.mod @@ -202,7 +202,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 - github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 + github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 diff --git a/go.sum b/go.sum index 007b2fda82eb..a6cd6d06d777 100644 --- a/go.sum +++ b/go.sum @@ -425,8 +425,8 @@ github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgA github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/RjNZo72wiWbIxR7pT+XEmQ= github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k05kzFIQhpgyLEMI= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= From b044700bbd4b0fe4b4f4347da9fb103232ac459e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:52 -0400 Subject: [PATCH 1739/2115] 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 a175b29f15c5..c0829e1a221a 100644 --- a/go.mod +++ b/go.mod @@ -203,7 +203,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 diff --git a/go.sum b/go.sum index a6cd6d06d777..1f18aae30fe5 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,8 @@ github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/ github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k05kzFIQhpgyLEMI= github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLImbS+DZnxB08lpYps= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= github.com/aws/aws-sdk-go-v2/service/rds v1.106.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= From 827a61de311145d03e7a3c5687739cff34a97f48 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:53 -0400 Subject: [PATCH 1740/2115] 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 c0829e1a221a..94af528530d1 100644 --- a/go.mod +++ b/go.mod @@ -204,7 +204,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 - github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 + github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 diff --git a/go.sum b/go.sum index 1f18aae30fe5..c62a29648cbc 100644 --- a/go.sum +++ b/go.sum @@ -429,8 +429,8 @@ github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLImbS+DZnxB08lpYps= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4m6dQYOZNgqyYDj2o= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= From 2a92ecc63e52da99c0034b1de7f7ee514b623063 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:53 -0400 Subject: [PATCH 1741/2115] 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 94af528530d1..5ffd84bedf57 100644 --- a/go.mod +++ b/go.mod @@ -205,7 +205,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 diff --git a/go.sum b/go.sum index c62a29648cbc..c0e34088a012 100644 --- a/go.sum +++ b/go.sum @@ -431,8 +431,8 @@ github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLI github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4m6dQYOZNgqyYDj2o= github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4Yl4+pf6Se2xSeCjqXa6w= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= From 14b8d6e15a09585b24591b0766e6ae58b83f1044 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:54 -0400 Subject: [PATCH 1742/2115] 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 5ffd84bedf57..2502f07463d4 100644 --- a/go.mod +++ b/go.mod @@ -206,7 +206,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 diff --git a/go.sum b/go.sum index c0e34088a012..411e43b722f4 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4 github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4Yl4+pf6Se2xSeCjqXa6w= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS1SdD95fPhVji6FGceW2/5gMg= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= From 55480972c8c0d38a3c7f0f647f0164e12206df73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:55 -0400 Subject: [PATCH 1743/2115] 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 2502f07463d4..7ea2032be333 100644 --- a/go.mod +++ b/go.mod @@ -207,7 +207,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 diff --git a/go.sum b/go.sum index 411e43b722f4..a22148eca357 100644 --- a/go.sum +++ b/go.sum @@ -435,8 +435,8 @@ github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS1SdD95fPhVji6FGceW2/5gMg= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyNGf7Ls2OFIOrDzWZX97f5Uljgw/iJGM= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= From b457a9da20efe6c553e059160fa1d8d23e7e3860 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:56 -0400 Subject: [PATCH 1744/2115] 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 7ea2032be333..1c0f7f8ba6f6 100644 --- a/go.mod +++ b/go.mod @@ -208,7 +208,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 diff --git a/go.sum b/go.sum index a22148eca357..26619d13ef2b 100644 --- a/go.sum +++ b/go.sum @@ -437,8 +437,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyNGf7Ls2OFIOrDzWZX97f5Uljgw/iJGM= github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8UNkdFX85Ttk+bOMEICuIljgQ= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= From 44b410616acbf3b5f67925f7d37417e5d0d1e108 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:57 -0400 Subject: [PATCH 1745/2115] go get github.com/aws/aws-sdk-go-v2/service/resiliencehub. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1c0f7f8ba6f6..c310e9df5823 100644 --- a/go.mod +++ b/go.mod @@ -209,7 +209,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 diff --git a/go.sum b/go.sum index 26619d13ef2b..eeeb9f33cdd5 100644 --- a/go.sum +++ b/go.sum @@ -439,8 +439,8 @@ github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyN github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8UNkdFX85Ttk+bOMEICuIljgQ= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDheFISpJ/AF6WM6Yt2sSQUG9qqFg= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= From d80a0ae2841d041d44a3e27de9543fca5f695e9a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:58 -0400 Subject: [PATCH 1746/2115] 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 c310e9df5823..d3026d0c72ed 100644 --- a/go.mod +++ b/go.mod @@ -210,7 +210,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 diff --git a/go.sum b/go.sum index eeeb9f33cdd5..547914b2a0a4 100644 --- a/go.sum +++ b/go.sum @@ -441,8 +441,8 @@ github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8U github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDheFISpJ/AF6WM6Yt2sSQUG9qqFg= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRPVQhlqxGjco8HePVXCBsdazota6EUw= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= From e0c9e910f0eceee2181945d586ff629d7d49a0ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:59 -0400 Subject: [PATCH 1747/2115] 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 d3026d0c72ed..c4e8f2558891 100644 --- a/go.mod +++ b/go.mod @@ -211,7 +211,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 diff --git a/go.sum b/go.sum index 547914b2a0a4..4cc05f385034 100644 --- a/go.sum +++ b/go.sum @@ -443,8 +443,8 @@ github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDhe github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRPVQhlqxGjco8HePVXCBsdazota6EUw= github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8OLb/SBOJdwjHB/MvEwg38JbaMBI= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= From e22a3ff3b3fa5c8983f3c4747df922a5ab89f755 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:31:59 -0400 Subject: [PATCH 1748/2115] 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 c4e8f2558891..4d690049c172 100644 --- a/go.mod +++ b/go.mod @@ -212,7 +212,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 diff --git a/go.sum b/go.sum index 4cc05f385034..4951f8da6dcc 100644 --- a/go.sum +++ b/go.sum @@ -445,8 +445,8 @@ github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRP github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8OLb/SBOJdwjHB/MvEwg38JbaMBI= github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzFXI35uo7KknYTViOtZux/kSh0Fu3vOcTQ5REE= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= From ce4921293b268eed0236cdf8caf1f92fef39e1b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:00 -0400 Subject: [PATCH 1749/2115] 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 4d690049c172..9c55db824aea 100644 --- a/go.mod +++ b/go.mod @@ -213,7 +213,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 diff --git a/go.sum b/go.sum index 4951f8da6dcc..7db5286f434c 100644 --- a/go.sum +++ b/go.sum @@ -447,8 +447,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8O github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzFXI35uo7KknYTViOtZux/kSh0Fu3vOcTQ5REE= github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6PgFQiuGd1ZLfoD1kHjlHFSiK0= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= From 4baf62151c6e2531d54d46253a6cddbcd4e4b160 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:01 -0400 Subject: [PATCH 1750/2115] 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 9c55db824aea..21b330f8fd0c 100644 --- a/go.mod +++ b/go.mod @@ -214,7 +214,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 - github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 diff --git a/go.sum b/go.sum index 7db5286f434c..daa138c2f8b0 100644 --- a/go.sum +++ b/go.sum @@ -449,8 +449,8 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzF github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6PgFQiuGd1ZLfoD1kHjlHFSiK0= github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiqBGMEZa6eNfr5oL8grOA= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= From fb23e5b1253a333a6fb51681f3f89e9048592227 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:02 -0400 Subject: [PATCH 1751/2115] 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 21b330f8fd0c..be29a873f82c 100644 --- a/go.mod +++ b/go.mod @@ -215,7 +215,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 diff --git a/go.sum b/go.sum index daa138c2f8b0..8f3ea40e6a94 100644 --- a/go.sum +++ b/go.sum @@ -451,8 +451,8 @@ github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6 github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiqBGMEZa6eNfr5oL8grOA= github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsXefhtvI2AJIDv712MZTKeImxOAY= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= From f04647c6223ad5b078ddbfcdbd07593fc5535a27 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:03 -0400 Subject: [PATCH 1752/2115] 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 be29a873f82c..9cad699a947c 100644 --- a/go.mod +++ b/go.mod @@ -216,7 +216,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 diff --git a/go.sum b/go.sum index 8f3ea40e6a94..39b242f164fa 100644 --- a/go.sum +++ b/go.sum @@ -453,8 +453,8 @@ github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiq github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsXefhtvI2AJIDv712MZTKeImxOAY= github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADhx/A01nfm8j55iOo9aTDNoY59lA= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= From 4b0a4f998caedcf1c344cba932c4156c4cbc9d2d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:04 -0400 Subject: [PATCH 1753/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9cad699a947c..1add7eb70ec7 100644 --- a/go.mod +++ b/go.mod @@ -217,7 +217,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 diff --git a/go.sum b/go.sum index 39b242f164fa..0f81c0738b08 100644 --- a/go.sum +++ b/go.sum @@ -455,8 +455,8 @@ github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsX github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADhx/A01nfm8j55iOo9aTDNoY59lA= github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4RJNmyvJ9w1xzaIZyckMWxIhJ3mgqHUbP/0zB4A0+E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= From 46bf7e641562f52c9f0b2a0e410b5fe64f965814 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:04 -0400 Subject: [PATCH 1754/2115] go get github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1add7eb70ec7..ce4048aab3cf 100644 --- a/go.mod +++ b/go.mod @@ -218,7 +218,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 diff --git a/go.sum b/go.sum index 0f81c0738b08..0e50b0f83bb6 100644 --- a/go.sum +++ b/go.sum @@ -457,8 +457,8 @@ github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADh github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4RJNmyvJ9w1xzaIZyckMWxIhJ3mgqHUbP/0zB4A0+E= github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5ORL+P6y+YkGPKsFlqaWbgX9tXZyFTBhJyEYMb4= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= From d9d72103f37a7a0d3955d9a197e4b57d5c41e470 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:05 -0400 Subject: [PATCH 1755/2115] go get github.com/aws/aws-sdk-go-v2/service/route53resolver. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ce4048aab3cf..d8c162b09252 100644 --- a/go.mod +++ b/go.mod @@ -219,7 +219,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 diff --git a/go.sum b/go.sum index 0e50b0f83bb6..08d366a2acc8 100644 --- a/go.sum +++ b/go.sum @@ -459,8 +459,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4R github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5ORL+P6y+YkGPKsFlqaWbgX9tXZyFTBhJyEYMb4= github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 h1:pniIup6rzD25rCcheV/g15zkvc+Hvkl+dHlP4TyY/4g= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= From 7f052b20be5b8a27cbaeb853b1bca0c533018584 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:06 -0400 Subject: [PATCH 1756/2115] 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 d8c162b09252..0fef50265514 100644 --- a/go.mod +++ b/go.mod @@ -220,7 +220,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 - github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 diff --git a/go.sum b/go.sum index 08d366a2acc8..e5882aa1f102 100644 --- a/go.sum +++ b/go.sum @@ -461,8 +461,8 @@ github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5OR github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 h1:pniIup6rzD25rCcheV/g15zkvc+Hvkl+dHlP4TyY/4g= github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 h1:XBhTNPtS3JdGkqE+sMUCToFGUMm5x6dVcR6IfwbacVo= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.4/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= From bf064dcb4422b8d12db956bcc7c936e7c3fbbc98 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:08 -0400 Subject: [PATCH 1757/2115] 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 0fef50265514..02e3297b7acb 100644 --- a/go.mod +++ b/go.mod @@ -222,7 +222,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 diff --git a/go.sum b/go.sum index e5882aa1f102..1e2c5988825d 100644 --- a/go.sum +++ b/go.sum @@ -465,8 +465,8 @@ github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 h1:XBhTNPtS3JdGkqE+sMUCToFGUMm5 github.com/aws/aws-sdk-go-v2/service/rum v1.28.4/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe/t/WE+RxSOoHWaK6P9Hg0= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= From 35dd5a384bde8d49dce30d54f61f0a9a6a019b07 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:08 -0400 Subject: [PATCH 1758/2115] go get github.com/aws/aws-sdk-go-v2/service/s3outposts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 02e3297b7acb..c22dda828b95 100644 --- a/go.mod +++ b/go.mod @@ -223,7 +223,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 diff --git a/go.sum b/go.sum index 1e2c5988825d..1f1abc516261 100644 --- a/go.sum +++ b/go.sum @@ -467,8 +467,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPL github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe/t/WE+RxSOoHWaK6P9Hg0= github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr8Snf8RvyGJfVveILKOR9uY= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= From dc1bf3b82f2f5b04d3072f5028ddb3f08166249c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:09 -0400 Subject: [PATCH 1759/2115] go get github.com/aws/aws-sdk-go-v2/service/s3tables. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c22dda828b95..6889f6e3eaf4 100644 --- a/go.mod +++ b/go.mod @@ -224,7 +224,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 diff --git a/go.sum b/go.sum index 1f1abc516261..411995c9380b 100644 --- a/go.sum +++ b/go.sum @@ -469,8 +469,8 @@ github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr8Snf8RvyGJfVveILKOR9uY= github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoKlDpGiTXnBhKN98xcZkAc= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= From acf2c5aaf37e545639f54de948aa8d4fd9c39958 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:10 -0400 Subject: [PATCH 1760/2115] go get github.com/aws/aws-sdk-go-v2/service/s3vectors. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6889f6e3eaf4..9d322dbad5e3 100644 --- a/go.mod +++ b/go.mod @@ -225,7 +225,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 diff --git a/go.sum b/go.sum index 411995c9380b..0efe3654aaa6 100644 --- a/go.sum +++ b/go.sum @@ -471,8 +471,8 @@ github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoKlDpGiTXnBhKN98xcZkAc= github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= From 7bd644599770249a496c400dc7cc9ae8bfda780b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:11 -0400 Subject: [PATCH 1761/2115] go get github.com/aws/aws-sdk-go-v2/service/sagemaker. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9d322dbad5e3..bdfc823355f1 100644 --- a/go.mod +++ b/go.mod @@ -226,7 +226,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 diff --git a/go.sum b/go.sum index 0efe3654aaa6..9f00e5e4af3e 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoK github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 h1:P3ppuK80Tolbgi1G1omVAXIvpqgxX1sWyjMR6NpRTBw= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= From 0b43983216ea4c455395dd56e4e9699c2d19ca5a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:12 -0400 Subject: [PATCH 1762/2115] 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 bdfc823355f1..a525b881ebca 100644 --- a/go.mod +++ b/go.mod @@ -227,7 +227,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 diff --git a/go.sum b/go.sum index 9f00e5e4af3e..c72c6e001a92 100644 --- a/go.sum +++ b/go.sum @@ -475,8 +475,8 @@ github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5Y github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 h1:P3ppuK80Tolbgi1G1omVAXIvpqgxX1sWyjMR6NpRTBw= github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= From 1cd4a3c37ba3156f6bfca168f276674daf1b9ace Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:12 -0400 Subject: [PATCH 1763/2115] 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 a525b881ebca..9e0b2cf59882 100644 --- a/go.mod +++ b/go.mod @@ -228,7 +228,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 diff --git a/go.sum b/go.sum index c72c6e001a92..f3b936e4231f 100644 --- a/go.sum +++ b/go.sum @@ -477,8 +477,8 @@ github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 h1:P3ppuK80Tolbgi1G1omVA github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= From 9f6ca00f593ab93965219a5653ed477c483b145d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:13 -0400 Subject: [PATCH 1764/2115] 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 9e0b2cf59882..cc83895c168d 100644 --- a/go.mod +++ b/go.mod @@ -229,7 +229,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 diff --git a/go.sum b/go.sum index f3b936e4231f..3e6c74aa2018 100644 --- a/go.sum +++ b/go.sum @@ -479,8 +479,8 @@ github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o3 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mbwXV5xFXQyNJuR8X0gfcbTXFjHk= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2/go.mod h1:iGwIZwjxYYEwbnE7NUCDBGAvrkmWu2DMpxSXoYATaCc= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= From e10ad1bc62c6c7581008f804f7375e75dd9cf386 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:14 -0400 Subject: [PATCH 1765/2115] 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 cc83895c168d..db4487311190 100644 --- a/go.mod +++ b/go.mod @@ -230,7 +230,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 diff --git a/go.sum b/go.sum index 3e6c74aa2018..75cea96d9fe2 100644 --- a/go.sum +++ b/go.sum @@ -481,8 +481,8 @@ github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0E github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mbwXV5xFXQyNJuR8X0gfcbTXFjHk= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2/go.mod h1:iGwIZwjxYYEwbnE7NUCDBGAvrkmWu2DMpxSXoYATaCc= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5MO8lnR2vabp2q5i7zPUoyJM= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= From af139f96953b23b1dff217f5ca5c3a1c0f6c665d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:15 -0400 Subject: [PATCH 1766/2115] 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 db4487311190..07efce48a5c2 100644 --- a/go.mod +++ b/go.mod @@ -231,7 +231,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 diff --git a/go.sum b/go.sum index 75cea96d9fe2..45329ec9a1ca 100644 --- a/go.sum +++ b/go.sum @@ -483,8 +483,8 @@ github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mb github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5MO8lnR2vabp2q5i7zPUoyJM= github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemPQ8R8BNang/sAbuut12LOOfg0= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= From aa3f7aecf99c9a87ffc195bddc1b4adbe8fa2003 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:16 -0400 Subject: [PATCH 1767/2115] go get github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 07efce48a5c2..099cb4043038 100644 --- a/go.mod +++ b/go.mod @@ -232,7 +232,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 diff --git a/go.sum b/go.sum index 45329ec9a1ca..e74a8ed4c319 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5 github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemPQ8R8BNang/sAbuut12LOOfg0= github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1:ch8Iz6TsqfK3USQn9/NEVFgC6QbG1uW3K7fcZSiDKKY= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= From 7caddae7bf920636bed4cc32e372d5500576401d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:17 -0400 Subject: [PATCH 1768/2115] go get github.com/aws/aws-sdk-go-v2/service/servicecatalog. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 099cb4043038..98c21ad155ef 100644 --- a/go.mod +++ b/go.mod @@ -233,7 +233,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 diff --git a/go.sum b/go.sum index e74a8ed4c319..7fff64ec4f2a 100644 --- a/go.sum +++ b/go.sum @@ -487,8 +487,8 @@ github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemP github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1:ch8Iz6TsqfK3USQn9/NEVFgC6QbG1uW3K7fcZSiDKKY= github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhKgesbP4VSEBivrVx+u8XcpCtRno= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= From 7a3fe6d55534fb685c5b86444187b29ef822c6a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:17 -0400 Subject: [PATCH 1769/2115] 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 98c21ad155ef..8f0294b830cc 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 diff --git a/go.sum b/go.sum index 7fff64ec4f2a..bacf96d4e5b4 100644 --- a/go.sum +++ b/go.sum @@ -489,8 +489,8 @@ github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhKgesbP4VSEBivrVx+u8XcpCtRno= github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaFzarpVWRQdLSHU+KKeKoPOmA7SPXmb4zlnFfmQ= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= From f8ef9e36c89e5ca00cfdac25c2137fe53f683ff8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:18 -0400 Subject: [PATCH 1770/2115] 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 8f0294b830cc..15ef3718f45c 100644 --- a/go.mod +++ b/go.mod @@ -235,7 +235,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 diff --git a/go.sum b/go.sum index bacf96d4e5b4..78c1047f1eca 100644 --- a/go.sum +++ b/go.sum @@ -491,8 +491,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhK github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaFzarpVWRQdLSHU+KKeKoPOmA7SPXmb4zlnFfmQ= github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3/ha0nyZbpQGtC8iFYS0zGKj9LnTo= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= From 1be9d346f27dc7d50eb39278a1559c1923d336ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:19 -0400 Subject: [PATCH 1771/2115] 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 15ef3718f45c..bdcefa874f0a 100644 --- a/go.mod +++ b/go.mod @@ -236,7 +236,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 diff --git a/go.sum b/go.sum index 78c1047f1eca..4c825cb1bb59 100644 --- a/go.sum +++ b/go.sum @@ -493,8 +493,8 @@ github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaF github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3/ha0nyZbpQGtC8iFYS0zGKj9LnTo= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Guqm1hHymfwOvn8nI7aCJcePv8g= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= From b0c5933a5c0d8d2ed9c7e250ede4abe9bc90b59d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:20 -0400 Subject: [PATCH 1772/2115] go get github.com/aws/aws-sdk-go-v2/service/ses. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index bdcefa874f0a..72965b5f1c7d 100644 --- a/go.mod +++ b/go.mod @@ -237,7 +237,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 - github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 + github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 diff --git a/go.sum b/go.sum index 4c825cb1bb59..1098e870cf25 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,8 @@ github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Guqm1hHymfwOvn8nI7aCJcePv8g= github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2TuVXFYCLnxEBvyA= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= From eb26345a9f14312d176a6185c7c6ba89d7de3167 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:21 -0400 Subject: [PATCH 1773/2115] 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 72965b5f1c7d..917629038211 100644 --- a/go.mod +++ b/go.mod @@ -238,7 +238,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 diff --git a/go.sum b/go.sum index 1098e870cf25..95ff429a1be6 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Gu github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2TuVXFYCLnxEBvyA= github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs+pmesFvq2J5F80kyo= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= From 19d728c9fd702c8a7b6d3596fc3be13624e29013 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:22 -0400 Subject: [PATCH 1774/2115] go get github.com/aws/aws-sdk-go-v2/service/sfn. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 917629038211..f2cced4e2030 100644 --- a/go.mod +++ b/go.mod @@ -239,7 +239,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 diff --git a/go.sum b/go.sum index 95ff429a1be6..44b5ac7f7bbb 100644 --- a/go.sum +++ b/go.sum @@ -499,8 +499,8 @@ github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2 github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs+pmesFvq2J5F80kyo= github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/pJTUTs4ww/WqOxTA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= From 96b2ebca59dd5778bca915cd4ff4f285ced077e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:22 -0400 Subject: [PATCH 1775/2115] 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 f2cced4e2030..3283668fc4e5 100644 --- a/go.mod +++ b/go.mod @@ -240,7 +240,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 - github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 + github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 diff --git a/go.sum b/go.sum index 44b5ac7f7bbb..3b7174c6b93b 100644 --- a/go.sum +++ b/go.sum @@ -501,8 +501,8 @@ github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/pJTUTs4ww/WqOxTA= github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJmiH4alWEdnISAWkDaX0= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= From 99f98a4676af8f08c275b290b11a4787d3b5f1f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:23 -0400 Subject: [PATCH 1776/2115] 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 3283668fc4e5..e1f67b8e67cd 100644 --- a/go.mod +++ b/go.mod @@ -241,7 +241,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 - github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 + github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 diff --git a/go.sum b/go.sum index 3b7174c6b93b..bc7c44bcd867 100644 --- a/go.sum +++ b/go.sum @@ -503,8 +503,8 @@ github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/p github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJmiH4alWEdnISAWkDaX0= github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t0To86r5oewWmuplU08= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= From 01a78de6d051ede87004db2e6e9264b02c03ac7b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:24 -0400 Subject: [PATCH 1777/2115] 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 e1f67b8e67cd..6bd73729073e 100644 --- a/go.mod +++ b/go.mod @@ -242,7 +242,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 - github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 + github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 diff --git a/go.sum b/go.sum index bc7c44bcd867..5290697b19dc 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJm github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t0To86r5oewWmuplU08= github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2AqiN1AXrtq/rBdY= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= From f11a645962c911b90a5fbb5a87338515f802d5ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:25 -0400 Subject: [PATCH 1778/2115] 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 6bd73729073e..2647ccad7ddd 100644 --- a/go.mod +++ b/go.mod @@ -243,7 +243,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 diff --git a/go.sum b/go.sum index 5290697b19dc..dc98b204fff2 100644 --- a/go.sum +++ b/go.sum @@ -507,8 +507,8 @@ github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2AqiN1AXrtq/rBdY= github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+nBt6mnK5iPjjSzk= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= From 816525e89bfefa5dbb70aed08ae555faa0739bf2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:26 -0400 Subject: [PATCH 1779/2115] 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 2647ccad7ddd..f962afcc1e22 100644 --- a/go.mod +++ b/go.mod @@ -244,7 +244,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 diff --git a/go.sum b/go.sum index dc98b204fff2..7d974cc5937b 100644 --- a/go.sum +++ b/go.sum @@ -509,8 +509,8 @@ github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2 github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+nBt6mnK5iPjjSzk= github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3qlSxWllTzuAImA0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= From fc9e3ea89ece0b12d1829691b7b776faad1e01f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:27 -0400 Subject: [PATCH 1780/2115] 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 f962afcc1e22..1f751eac348b 100644 --- a/go.mod +++ b/go.mod @@ -245,7 +245,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 diff --git a/go.sum b/go.sum index 7d974cc5937b..028d43112a2d 100644 --- a/go.sum +++ b/go.sum @@ -511,8 +511,8 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+ github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3qlSxWllTzuAImA0= github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T7x9sWfubbppvulyj9crp5mk= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= From 3b0ff1cd3ba8c87e3493244b5fa9feb3a58c4479 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:28 -0400 Subject: [PATCH 1781/2115] 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 1f751eac348b..45d78607a2ad 100644 --- a/go.mod +++ b/go.mod @@ -246,7 +246,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 diff --git a/go.sum b/go.sum index 028d43112a2d..bd6b477d786a 100644 --- a/go.sum +++ b/go.sum @@ -513,8 +513,8 @@ github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3 github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T7x9sWfubbppvulyj9crp5mk= github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTITHiVpo/VCn2q0IZdGqBGhF10= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= From a36776e8fa34d8d4b05ea71c792141a4c591e0b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:29 -0400 Subject: [PATCH 1782/2115] go get github.com/aws/aws-sdk-go-v2/service/ssmquicksetup. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 45d78607a2ad..6661904908cd 100644 --- a/go.mod +++ b/go.mod @@ -247,7 +247,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 diff --git a/go.sum b/go.sum index bd6b477d786a..2fa9882a4a35 100644 --- a/go.sum +++ b/go.sum @@ -515,8 +515,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTITHiVpo/VCn2q0IZdGqBGhF10= github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 h1:MXTDAHwEZ5NzaLnsq34xjPXEVh0VaeGD5rATFCgFqvg= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= From a898e9f300b6b3561b9cc9a25dc73a0419179aeb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:29 -0400 Subject: [PATCH 1783/2115] 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 6661904908cd..451a4ba706dc 100644 --- a/go.mod +++ b/go.mod @@ -248,7 +248,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 diff --git a/go.sum b/go.sum index 2fa9882a4a35..080e685b23cc 100644 --- a/go.sum +++ b/go.sum @@ -517,8 +517,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTI github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 h1:MXTDAHwEZ5NzaLnsq34xjPXEVh0VaeGD5rATFCgFqvg= github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 h1:SfEgky1fDjAGRFYxLnrnDVlo0ZOqH39t6KsspYJPebM= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= From 364f92321cb018b9c1f39649f4c462ba164a0a5a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:31 -0400 Subject: [PATCH 1784/2115] 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 451a4ba706dc..0bbf9a22be52 100644 --- a/go.mod +++ b/go.mod @@ -250,7 +250,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 diff --git a/go.sum b/go.sum index 080e685b23cc..9ea054029d4e 100644 --- a/go.sum +++ b/go.sum @@ -521,8 +521,8 @@ github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 h1:SfEgky1fDjAGRFYxLnrnDVlo0 github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 h1:yzeq9QvTmQfUMY4FHs11SxWJhBqeaaTEPpfzdHa1BZo= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= From c5abe79cf62f11815446e9b309588cdac0288e32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:32 -0400 Subject: [PATCH 1785/2115] go get github.com/aws/aws-sdk-go-v2/service/storagegateway. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0bbf9a22be52..732c80770123 100644 --- a/go.mod +++ b/go.mod @@ -251,7 +251,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 diff --git a/go.sum b/go.sum index 9ea054029d4e..535488ae0b03 100644 --- a/go.sum +++ b/go.sum @@ -525,8 +525,8 @@ github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 h1:yzeq9QvTmQfUMY4FHs11SxW github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 h1:091+jMFSSt/41p2PqQzhKHi6SDZhGikc85jF/rHKzxM= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= From 456127908397c1afb1bb780ae1b1aae17529bf73 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:33 -0400 Subject: [PATCH 1786/2115] 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 732c80770123..b5a9862ea558 100644 --- a/go.mod +++ b/go.mod @@ -253,7 +253,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 - github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 + github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 diff --git a/go.sum b/go.sum index 535488ae0b03..080d0b51cb47 100644 --- a/go.sum +++ b/go.sum @@ -529,8 +529,8 @@ github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 h1:091+jMFSSt/41p2Pq github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zcJsTF4awNHHaMYIY= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= From ae317374febbe7d0afcc9f67c1b00c5af44b206c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:34 -0400 Subject: [PATCH 1787/2115] 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 b5a9862ea558..04fa88d5e7bc 100644 --- a/go.mod +++ b/go.mod @@ -254,7 +254,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 diff --git a/go.sum b/go.sum index 080d0b51cb47..1fecbfb168a2 100644 --- a/go.sum +++ b/go.sum @@ -531,8 +531,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtm github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zcJsTF4awNHHaMYIY= github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojtyt1UuaeJdXbLhrvVZlc1cw= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= From 4a4b58191e472c52978181cc47e614cd44d1c5da Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:35 -0400 Subject: [PATCH 1788/2115] go get github.com/aws/aws-sdk-go-v2/service/taxsettings. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 04fa88d5e7bc..fe9a8a13d181 100644 --- a/go.mod +++ b/go.mod @@ -255,7 +255,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 diff --git a/go.sum b/go.sum index 1fecbfb168a2..702e5d00c3e4 100644 --- a/go.sum +++ b/go.sum @@ -533,8 +533,8 @@ github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zc github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojtyt1UuaeJdXbLhrvVZlc1cw= github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhXJppa4xzWCh00mIE5hJyET6A= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= From 4f2784e492255a9b1a90a9a7a921545ab18c6a9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:36 -0400 Subject: [PATCH 1789/2115] 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 fe9a8a13d181..8ba2c60a96f9 100644 --- a/go.mod +++ b/go.mod @@ -256,7 +256,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 diff --git a/go.sum b/go.sum index 702e5d00c3e4..0a803ffef1d0 100644 --- a/go.sum +++ b/go.sum @@ -535,8 +535,8 @@ github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojt github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhXJppa4xzWCh00mIE5hJyET6A= github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a8LjhJwsMCkpdVJUMRuIy61LghA0XHY= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= From 064fe97773f28e0cef789ee68759cc332ce38524 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:37 -0400 Subject: [PATCH 1790/2115] go get github.com/aws/aws-sdk-go-v2/service/timestreamquery. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8ba2c60a96f9..398ac58d7737 100644 --- a/go.mod +++ b/go.mod @@ -257,7 +257,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 diff --git a/go.sum b/go.sum index 0a803ffef1d0..9e77d4fcde77 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhX github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a8LjhJwsMCkpdVJUMRuIy61LghA0XHY= github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdVguofsIheoDIv1ntzNJBJ8Y12l3Q= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= From 4b3d3e0334f46864dfe20f262acdd69f53303c62 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:38 -0400 Subject: [PATCH 1791/2115] 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 398ac58d7737..377788ac0918 100644 --- a/go.mod +++ b/go.mod @@ -258,7 +258,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 diff --git a/go.sum b/go.sum index 9e77d4fcde77..f186ca844b58 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdVguofsIheoDIv1ntzNJBJ8Y12l3Q= github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTwo5fOTHBoBEJBg7s1h4J0ohi/DY4= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= From bde8e3d9c7756ce02d5a846b6141af637e01f0a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:38 -0400 Subject: [PATCH 1792/2115] 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 377788ac0918..1a0b84a7e8e6 100644 --- a/go.mod +++ b/go.mod @@ -259,7 +259,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 diff --git a/go.sum b/go.sum index f186ca844b58..271bccb8a922 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdV github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTwo5fOTHBoBEJBg7s1h4J0ohi/DY4= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wGcBfOqphwX7gXy9oSMO78Vs= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= From 43248f7f0dc3656d59b98187e3c08e92e6f23250 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:39 -0400 Subject: [PATCH 1793/2115] 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 1a0b84a7e8e6..da9562229bbb 100644 --- a/go.mod +++ b/go.mod @@ -260,7 +260,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 diff --git a/go.sum b/go.sum index 271bccb8a922..11b7660d50c5 100644 --- a/go.sum +++ b/go.sum @@ -543,8 +543,8 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTw github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wGcBfOqphwX7gXy9oSMO78Vs= github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/E4lZGOhg+F1qzAPSIJwE= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= From aa10e410161d14946d0810477e9d9bfe93ffde0b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:40 -0400 Subject: [PATCH 1794/2115] 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 da9562229bbb..8a080eaa847c 100644 --- a/go.mod +++ b/go.mod @@ -261,7 +261,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 diff --git a/go.sum b/go.sum index 11b7660d50c5..40d4c1a1a95e 100644 --- a/go.sum +++ b/go.sum @@ -545,8 +545,8 @@ github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wG github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/E4lZGOhg+F1qzAPSIJwE= github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+eflgSmIju0rD0QjwKZq1OFZt5pBB6Og4= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= From 79e68d44796057e8d5f3bf85dc3ef467e0727ddb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:41 -0400 Subject: [PATCH 1795/2115] 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 8a080eaa847c..582dddbcab69 100644 --- a/go.mod +++ b/go.mod @@ -262,7 +262,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 diff --git a/go.sum b/go.sum index 40d4c1a1a95e..7638cdc1c5e6 100644 --- a/go.sum +++ b/go.sum @@ -547,8 +547,8 @@ github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/ github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+eflgSmIju0rD0QjwKZq1OFZt5pBB6Og4= github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpAbcEJY0Ujo6hyQXv+m20SCk= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= From 32256f8da67be29eaf3b38b9216a890123382616 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:42 -0400 Subject: [PATCH 1796/2115] 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 582dddbcab69..15c49cd50dd4 100644 --- a/go.mod +++ b/go.mod @@ -263,7 +263,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 - github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 + github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 diff --git a/go.sum b/go.sum index 7638cdc1c5e6..e0c1338ec491 100644 --- a/go.sum +++ b/go.sum @@ -549,8 +549,8 @@ github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+e github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpAbcEJY0Ujo6hyQXv+m20SCk= github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53Hv3YxFLl5mZatRM= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= From 8a6eef8fd4c78823e26b84cee52ce12e7be3034d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:43 -0400 Subject: [PATCH 1797/2115] 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 15c49cd50dd4..833e74acfb19 100644 --- a/go.mod +++ b/go.mod @@ -264,7 +264,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 diff --git a/go.sum b/go.sum index e0c1338ec491..a47e88b8459b 100644 --- a/go.sum +++ b/go.sum @@ -551,8 +551,8 @@ github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpA github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53Hv3YxFLl5mZatRM= github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= From dd3d36d71f60102d04c02a83eb5ab57682f930d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:44 -0400 Subject: [PATCH 1798/2115] 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 833e74acfb19..8821abd47ef4 100644 --- a/go.mod +++ b/go.mod @@ -265,7 +265,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 diff --git a/go.sum b/go.sum index a47e88b8459b..e47bb0a5b325 100644 --- a/go.sum +++ b/go.sum @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53 github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 h1:NdxsAUHycaPLcB8aPtmFqZFAhfjQyB0+rMKR4J+++w8= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= From daae2bd20810c6d841e2fadcf47bc7b3c5f43df4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:45 -0400 Subject: [PATCH 1799/2115] 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 8821abd47ef4..2b7384640ccf 100644 --- a/go.mod +++ b/go.mod @@ -266,7 +266,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 diff --git a/go.sum b/go.sum index e47bb0a5b325..e0d7e23a08fe 100644 --- a/go.sum +++ b/go.sum @@ -555,8 +555,8 @@ github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93y github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 h1:NdxsAUHycaPLcB8aPtmFqZFAhfjQyB0+rMKR4J+++w8= github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= From fd9a072e15a137289b215c9613d64b03941e149b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:46 -0400 Subject: [PATCH 1800/2115] go get github.com/aws/aws-sdk-go-v2/service/workmail. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2b7384640ccf..f3cb2a57f26f 100644 --- a/go.mod +++ b/go.mod @@ -267,7 +267,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 - github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 diff --git a/go.sum b/go.sum index e0d7e23a08fe..53d19240171d 100644 --- a/go.sum +++ b/go.sum @@ -557,8 +557,8 @@ github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 h1:NdxsAUHycaPLcB8aPtmFqZFAhf github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= From 98c08799ea3f366e51c2728cb6862663c318b615 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:46 -0400 Subject: [PATCH 1801/2115] 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 f3cb2a57f26f..9b1a50feebe2 100644 --- a/go.mod +++ b/go.mod @@ -268,7 +268,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 github.com/aws/smithy-go v1.23.0 diff --git a/go.sum b/go.sum index 53d19240171d..0e832bca2bc4 100644 --- a/go.sum +++ b/go.sum @@ -559,8 +559,8 @@ github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/OV9nUFILLuflBXxNjZvrDo= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2/go.mod h1:L53nfLqk4M1G+rZek3o4rOzimvntauPKkGrWWjQ1F/Y= github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= From c65754752d5dd9b8dc6dab6395692da5fe0b1eee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:47 -0400 Subject: [PATCH 1802/2115] 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 9b1a50feebe2..06302cfcaaa1 100644 --- a/go.mod +++ b/go.mod @@ -269,7 +269,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 diff --git a/go.sum b/go.sum index 0e832bca2bc4..4f69de3e5bdd 100644 --- a/go.sum +++ b/go.sum @@ -561,8 +561,8 @@ github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/OV9nUFILLuflBXxNjZvrDo= github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2/go.mod h1:L53nfLqk4M1G+rZek3o4rOzimvntauPKkGrWWjQ1F/Y= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 h1:7XygyvejhD059PzkTVCo5ZWnKNE249ju6aBTfV9rYho= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= From 5b0de5f35b08bc6cde786822fa68aaeeecd7f529 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 09:32:48 -0400 Subject: [PATCH 1803/2115] 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 06302cfcaaa1..a27b91e5b611 100644 --- a/go.mod +++ b/go.mod @@ -270,7 +270,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 - github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 + github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 diff --git a/go.sum b/go.sum index 4f69de3e5bdd..255f5e1844a6 100644 --- a/go.sum +++ b/go.sum @@ -563,8 +563,8 @@ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/ github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 h1:7XygyvejhD059PzkTVCo5ZWnKNE249ju6aBTfV9rYho= github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 h1:hm+vuMO3n7s7E/fv32zOhdWGxb4eO4P5SEMSJpdY+KM= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.1/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= From 9bf3fe4c53e9a3d250a28e0ca81d7d8d6f1901c9 Mon Sep 17 00:00:00 2001 From: Sasi Date: Tue, 9 Sep 2025 09:36:24 -0400 Subject: [PATCH 1804/2115] import state verify ignore updated --- internal/service/controltower/baseline_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 95eaad810d54..a64b41179e9a 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -59,7 +59,7 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), ImportStateVerify: true, ImportStateVerifyIdentifierAttribute: names.AttrARN, - ImportStateVerifyIgnore: []string{names.AttrID}, + ImportStateVerifyIgnore: []string{"operation_identifier"}, }, }, }) @@ -184,7 +184,7 @@ resource "aws_controltower_baseline" "test" { target_identifier = aws_organizations_organizational_unit.test.arn parameters { key = "IdentityCenterEnabledBaselineArn" - value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:{data.aws_caller_identity.current.account_id}:enabledbaseline/XALULM96QHI525UOC" + value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:enabledbaseline/XALULM96QHI525UOC" } } `, rName) From e2f058def4e761a615eb602e54d0bd0139b6e76b Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 23:06:19 +0900 Subject: [PATCH 1805/2115] add changelog --- .changelog/44201.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44201.txt diff --git a/.changelog/44201.txt b/.changelog/44201.txt new file mode 100644 index 000000000000..75a0942b6b37 --- /dev/null +++ b/.changelog/44201.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block +``` From fa34a4e0d2adfb3f1b20ba26a55407e0e4106eae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 10:32:56 -0400 Subject: [PATCH 1806/2115] Add 'TestAccCognitoIDPManagedLoginBranding_multiple'. --- .../cognitoidp/managed_login_branding_test.go | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/internal/service/cognitoidp/managed_login_branding_test.go b/internal/service/cognitoidp/managed_login_branding_test.go index e96b63f8cda3..0c1a76bd1b8d 100644 --- a/internal/service/cognitoidp/managed_login_branding_test.go +++ b/internal/service/cognitoidp/managed_login_branding_test.go @@ -301,6 +301,54 @@ func TestAccCognitoIDPManagedLoginBranding_updateSettings(t *testing.T) { }) } +// https://github.com/hashicorp/terraform-provider-aws/issues/44188. +func TestAccCognitoIDPManagedLoginBranding_multiple(t *testing.T) { + ctx := acctest.Context(t) + var v1, v2 awstypes.ManagedLoginBrandingType + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resource1Name := "aws_cognito_managed_login_branding.test1" + resource2Name := "aws_cognito_managed_login_branding.test2" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckIdentityProvider(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedLoginBrandingDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedLoginBrandingConfig_multiple(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedLoginBrandingExists(ctx, resource1Name, &v1), + testAccCheckManagedLoginBrandingExists(ctx, resource2Name, &v2), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resource1Name, plancheck.ResourceActionCreate), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectKnownValue(resource1Name, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)), + statecheck.ExpectKnownValue(resource2Name, tfjsonpath.New("use_cognito_provided_values"), knownvalue.Bool(true)), + }, + }, + { + ResourceName: resource1Name, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resource1Name, ",", names.AttrUserPoolID, "managed_login_branding_id"), + }, + { + ResourceName: resource2Name, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "managed_login_branding_id", + ImportStateIdFunc: acctest.AttrsImportStateIdFunc(resource2Name, ",", names.AttrUserPoolID, "managed_login_branding_id"), + }, + }, + }) +} + func testAccCheckManagedLoginBrandingDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).CognitoIDPClient(ctx) @@ -1314,3 +1362,44 @@ resource "aws_cognito_managed_login_branding" "test" { } `) } + +func testAccManagedLoginBrandingConfig_multiple(rName string) string { + return fmt.Sprintf(` +resource "aws_cognito_user_pool" "test" { + name = %[1]q +} + +resource "aws_cognito_user_pool_client" "test0" { + name = "%[1]s-0" + user_pool_id = aws_cognito_user_pool.test.id + explicit_auth_flows = ["ADMIN_NO_SRP_AUTH"] +} + +resource "aws_cognito_user_pool_client" "test1" { + name = "%[1]s-1" + user_pool_id = aws_cognito_user_pool_client.test0.user_pool_id + explicit_auth_flows = ["ADMIN_NO_SRP_AUTH"] +} + +resource "aws_cognito_user_pool_client" "test2" { + name = "%[1]s-2" + user_pool_id = aws_cognito_user_pool_client.test1.user_pool_id + explicit_auth_flows = ["ADMIN_NO_SRP_AUTH"] +} + +resource "aws_cognito_managed_login_branding" "test1" { + # Cross over user pool client IDs to test read logic. + client_id = aws_cognito_user_pool_client.test2.id + user_pool_id = aws_cognito_user_pool.test.id + + use_cognito_provided_values = true +} + +resource "aws_cognito_managed_login_branding" "test2" { + client_id = aws_cognito_user_pool_client.test1.id + user_pool_id = aws_cognito_managed_login_branding.test1.user_pool_id + + use_cognito_provided_values = true +} +`, rName) +} From 43f98e18c1b8ea6ea0a8ff073314c0fbe4c3992f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 10:33:52 -0400 Subject: [PATCH 1807/2115] Acceptance test output: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit % make testacc TESTARGS='-run=TestAccCognitoIDPManagedLoginBranding_multiple' PKG=cognitoidp make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 b-aws_cognito_managed_login_branding-multiple 🌿... TF_ACC=1 go1.24.6 test ./internal/service/cognitoidp/... -v -count 1 -parallel 20 -run=TestAccCognitoIDPManagedLoginBranding_multiple -timeout 360m -vet=off 2025/09/09 10:32:10 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/09 10:32:10 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccCognitoIDPManagedLoginBranding_multiple === PAUSE TestAccCognitoIDPManagedLoginBranding_multiple === CONT TestAccCognitoIDPManagedLoginBranding_multiple managed_login_branding_test.go:311: Step 1/3 error: Error running post-apply refresh plan: exit status 1 Error: reading Cognito Managed Login Branding by client (4f7qlv900s7jlotspu7t4o65nc) with aws_cognito_managed_login_branding.test1, on terraform_plugin_test.tf line 34, in resource "aws_cognito_managed_login_branding" "test1": 34: resource "aws_cognito_managed_login_branding" "test1" { couldn't find resource --- FAIL: TestAccCognitoIDPManagedLoginBranding_multiple (19.90s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp 25.433s FAIL make: *** [testacc] Error 1 From fa031b194fb3d13edbe066ee6f88a56517663412 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 10:41:53 -0400 Subject: [PATCH 1808/2115] r/aws_cognito_managed_login_branding: Fix `reading Cognito Managed Login Branding by client ... couldn't find resource` errors when a user pool contains multiple client apps. --- .changelog/#####.txt | 3 +++ internal/service/cognitoidp/managed_login_branding.go | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 .changelog/#####.txt diff --git a/.changelog/#####.txt b/.changelog/#####.txt new file mode 100644 index 000000000000..e49f14a7c698 --- /dev/null +++ b/.changelog/#####.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_cognito_managed_login_branding: Fix `reading Cognito Managed Login Branding by client ... couldn't find resource` errors when a user pool contains multiple client apps +``` \ No newline at end of file diff --git a/internal/service/cognitoidp/managed_login_branding.go b/internal/service/cognitoidp/managed_login_branding.go index 3092313d070a..62a57dba2f06 100644 --- a/internal/service/cognitoidp/managed_login_branding.go +++ b/internal/service/cognitoidp/managed_login_branding.go @@ -276,6 +276,10 @@ func (r *managedLoginBrandingResource) Read(ctx context.Context, request resourc } mlb, err := findManagedLoginBrandingByClient(ctx, conn, &input) + if tfresource.NotFound(err) { + continue + } + if err != nil { response.Diagnostics.AddError(fmt.Sprintf("reading Cognito Managed Login Branding by client (%s)", clientID), err.Error()) From bc19cab12e92c3eaef235a89bb4ddcbba1994362 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 10:44:21 -0400 Subject: [PATCH 1809/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44204.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44204.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44204.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44204.txt From 936c80cdddbe6cc143fcdda83254bd777f53ce2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 10:51:36 -0400 Subject: [PATCH 1810/2115] r/aws_networkmanager_vpc_attachment: Change `options` to Optional and Computed. --- .changelog/43742.txt | 4 ++++ internal/service/networkmanager/vpc_attachment.go | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.changelog/43742.txt b/.changelog/43742.txt index eb2b0bf0b2b0..b0e495dd7288 100644 --- a/.changelog/43742.txt +++ b/.changelog/43742.txt @@ -1,3 +1,7 @@ +```release-note:enhancement +resource/aws_networkmanager_vpc_attachment: Change `options` to Optional and Computed +``` + ```release-note:enhancement resource/aws_networkmanager_vpc_attachment: Add `options.dns_support` and `options.security_group_referencing_support` arguments ``` \ No newline at end of file diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 0a816a952c27..266ef0c95e99 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -136,24 +136,29 @@ func resourceVPCAttachment() *schema.Resource { "options": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "appliance_mode_support": { Type: schema.TypeBool, Optional: true, + Computed: true, }, "dns_support": { Type: schema.TypeBool, Optional: true, + Computed: true, }, "ipv6_support": { Type: schema.TypeBool, Optional: true, + Computed: true, }, "security_group_referencing_support": { Type: schema.TypeBool, Optional: true, + Computed: true, }, }, }, From 9343075c63d0aba611c030c5f62a7323519883ca Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 09:55:24 -0500 Subject: [PATCH 1811/2115] aws_controltower_baseline: add waiter for delete --- internal/service/controltower/baseline.go | 57 ++++++++++++++----- .../r/controltower_baseline.html.markdown | 1 + 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index ea06d29ab852..567765434f7f 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -43,6 +43,7 @@ func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, err r := &resourceBaseline{} r.SetDefaultCreateTimeout(30 * time.Minute) r.SetDefaultUpdateTimeout(30 * time.Minute) + r.SetDefaultDeleteTimeout(30 * time.Minute) return r, nil } @@ -87,7 +88,7 @@ func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, }, Blocks: map[string]schema.Block{ names.AttrParameters: schema.ListNestedBlock{ - CustomType: fwtypes.NewListNestedObjectTypeOf[parameters](ctx), + CustomType: fwtypes.NewListNestedObjectTypeOf[parameter](ctx), Validators: []validator.List{ listvalidator.SizeAtMost(1), }, @@ -105,6 +106,7 @@ func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, names.AttrTimeouts: timeouts.Block(ctx, timeouts.Opts{ Create: true, Update: true, + Delete: true, }), }, } @@ -242,7 +244,6 @@ func (r *resourceBaseline) Update(ctx context.Context, request resource.UpdateRe updateTimeout := r.UpdateTimeout(ctx, plan.Timeouts) _, err = waitBaselineReady(ctx, conn, plan.ARN.ValueString(), updateTimeout) if err != nil { - response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root(names.AttrARN), plan.ARN.ValueString())...) response.Diagnostics.AddError( create.ProblemStandardMessage(names.ControlTower, create.ErrActionWaitingForUpdate, ResNameBaseline, plan.ARN.String(), err), err.Error(), @@ -283,6 +284,16 @@ func (r *resourceBaseline) Delete(ctx context.Context, request resource.DeleteRe ) return } + + deleteTimeout := r.UpdateTimeout(ctx, state.Timeouts) + _, err = waitBaselineDeleted(ctx, conn, state.ARN.ValueString(), deleteTimeout) + if err != nil { + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.ControlTower, create.ErrActionWaitingForDeletion, ResNameBaseline, state.ARN.String(), err), + err.Error(), + ) + return + } } func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { //nolint:unparam @@ -303,6 +314,24 @@ func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string return nil, err } +func waitBaselineDeleted(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { //nolint:unparam + stateConf := &retry.StateChangeConf{ + Pending: enum.Slice(awstypes.EnablementStatusUnderChange), + Target: []string{}, + Refresh: statusBaseline(conn, id), + Timeout: timeout, + NotFoundChecks: 20, + ContinuousTargetOccurence: 2, + } + + outputRaw, err := stateConf.WaitForStateContext(ctx) + if out, ok := outputRaw.(*awstypes.EnabledBaselineDetails); ok { + return out, err + } + + return nil, err +} + func statusBaseline(conn *controltower.Client, id string) retry.StateRefreshFunc { return func(ctx context.Context) (any, string, error) { out, err := findBaselineByID(ctx, conn, id) @@ -343,23 +372,23 @@ func findBaselineByID(ctx context.Context, conn *controltower.Client, id string) type resourceBaselineData struct { framework.WithRegionModel - ARN types.String `tfsdk:"arn"` - BaselineIdentifier types.String `tfsdk:"baseline_identifier"` - BaselineVersion types.String `tfsdk:"baseline_version"` - OperationIdentifier types.String `tfsdk:"operation_identifier"` - Parameters fwtypes.ListNestedObjectValueOf[parameters] `tfsdk:"parameters"` - Tags tftags.Map `tfsdk:"tags"` - TagsAll tftags.Map `tfsdk:"tags_all"` - TargetIdentifier types.String `tfsdk:"target_identifier"` - Timeouts timeouts.Value `tfsdk:"timeouts"` + ARN types.String `tfsdk:"arn"` + BaselineIdentifier types.String `tfsdk:"baseline_identifier"` + BaselineVersion types.String `tfsdk:"baseline_version"` + OperationIdentifier types.String `tfsdk:"operation_identifier"` + Parameters fwtypes.ListNestedObjectValueOf[parameter] `tfsdk:"parameters"` + Tags tftags.Map `tfsdk:"tags"` + TagsAll tftags.Map `tfsdk:"tags_all"` + TargetIdentifier types.String `tfsdk:"target_identifier"` + Timeouts timeouts.Value `tfsdk:"timeouts"` } -type parameters struct { +type parameter struct { Key types.String `tfsdk:"key"` Value types.String `tfsdk:"value"` } -func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { +func (p *parameter) Flatten(ctx context.Context, v any) diag.Diagnostics { var diags diag.Diagnostics switch param := v.(type) { @@ -384,7 +413,7 @@ func (p *parameters) Flatten(ctx context.Context, v any) diag.Diagnostics { return diags } -func (p parameters) ExpandTo(ctx context.Context, targetType reflect.Type) (any, diag.Diagnostics) { +func (p parameter) ExpandTo(ctx context.Context, targetType reflect.Type) (any, diag.Diagnostics) { var diags diag.Diagnostics switch targetType { case reflect.TypeOf(awstypes.EnabledBaselineParameter{}): diff --git a/website/docs/r/controltower_baseline.html.markdown b/website/docs/r/controltower_baseline.html.markdown index 2200ca337c25..0e9938857a69 100644 --- a/website/docs/r/controltower_baseline.html.markdown +++ b/website/docs/r/controltower_baseline.html.markdown @@ -59,6 +59,7 @@ This resource exports the following attributes in addition to the arguments abov * `create` - (Default `30m`) * `update` - (Default `30m`) +* `delete` - (Default `30m`) ## Import From fdb07e70f6fc450b4c0e0767513fa9badd0ee14f Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 10:00:19 -0500 Subject: [PATCH 1812/2115] aws_controltower_baseline: simplify test with predefined find function --- .../service/controltower/baseline_test.go | 28 ++++++++----------- internal/service/controltower/exports_test.go | 1 + 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index a64b41179e9a..dd7a776bf1fc 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/YakDriver/regexache" - "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/controltower" "github.com/aws/aws-sdk-go-v2/service/controltower/types" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" @@ -19,7 +18,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" - "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tfcontroltower "github.com/hashicorp/terraform-provider-aws/internal/service/controltower" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -106,15 +105,15 @@ func testAccCheckBaselineDestroy(ctx context.Context) resource.TestCheckFunc { continue } - input := &controltower.GetEnabledBaselineInput{ - EnabledBaselineIdentifier: aws.String(rs.Primary.Attributes[names.AttrARN]), - } - _, err := conn.GetEnabledBaseline(ctx, input) - if errs.IsA[*types.ResourceNotFoundException](err) { - return nil + arn := rs.Primary.Attributes[names.AttrARN] + _, err := tfcontroltower.FindBaselineByID(ctx, conn, rs.Primary.Attributes[arn]) + + if retry.NotFound(err) { + continue } + if err != nil { - return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, rs.Primary.ID, err) + return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, arn, err) } return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, rs.Primary.ID, errors.New("not destroyed")) @@ -135,17 +134,14 @@ func testAccCheckBaselineExists(ctx context.Context, name string, baseline *type return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, name, errors.New("not set")) } - conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) - input := controltower.GetEnabledBaselineInput{ - EnabledBaselineIdentifier: aws.String(rs.Primary.Attributes[names.AttrARN]), - } - resp, err := conn.GetEnabledBaseline(ctx, &input) + arn := rs.Primary.Attributes[names.AttrARN] + resp, err := tfcontroltower.FindBaselineByID(ctx, acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx), arn) if err != nil { - return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, rs.Primary.ID, err) + return create.Error(names.ControlTower, create.ErrActionCheckingExistence, tfcontroltower.ResNameBaseline, arn, err) } - *baseline = *resp.EnabledBaselineDetails + *baseline = *resp return nil } diff --git a/internal/service/controltower/exports_test.go b/internal/service/controltower/exports_test.go index c30c23a7bc31..63aeb9785018 100644 --- a/internal/service/controltower/exports_test.go +++ b/internal/service/controltower/exports_test.go @@ -9,6 +9,7 @@ var ( ResourceLandingZone = resourceLandingZone ResourceBaseline = newResourceBaseline + FindBaselineByID = findBaselineByID FindEnabledControlByTwoPartKey = findEnabledControlByTwoPartKey FindLandingZoneByID = findLandingZoneByID ) From a372e4ef5171b6e9f01c2fe95d5ab808c51922a7 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 11:19:18 -0400 Subject: [PATCH 1813/2115] r/aws_vpc_security_group_(in|e)gress_rule: add resource identity support (#44198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds resource identity support to the `aws_vpc_security_group_ingress_rule` and `aws_vpc_security_group_egress_rule` resources. Both resources are parameterized identities with a single attribute, `id`, corresponding to the `security_group_rule_id`. ```console % make testacc PKG=vpc TESTS="TestAccVPCSecurityGroup(In|E)gressRule_" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 tmp2 🌿... TF_ACC=1 go1.24.6 test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccVPCSecurityGroup(In|E)gressRule_' -timeout 360m -vet=off 2025/09/08 15:38:23 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/08 15:38:24 Initializing Terraform AWS Provider (SDKv2-style)... === CONT TestAccVPCSecurityGroupIngressRule_ReferencedSecurityGroupID_peerVPC vpc_security_group_ingress_rule_test.go:524: skipping test because at least one environment variable of [AWS_ALTERNATE_PROFILE AWS_ALTERNATE_ACCESS_KEY_ID] must be set. Usage: credentials for running acceptance testing in alternate AWS account. --- SKIP: TestAccVPCSecurityGroupIngressRule_ReferencedSecurityGroupID_peerVPC (0.38s) === CONT TestAccVPCSecurityGroupIngressRule_referencedSecurityGroupID --- PASS: TestAccVPCSecurityGroupEgressRule_disappears (48.71s) === CONT TestAccVPCSecurityGroupIngressRule_prefixListID --- PASS: TestAccVPCSecurityGroupEgressRule_basic (54.02s) === CONT TestAccVPCSecurityGroupIngressRule_description --- PASS: TestAccVPCSecurityGroupIngressRule_tags_EmptyMap (56.04s) === CONT TestAccVPCSecurityGroupIngressRule_cidrIPv6 --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_nullOverlappingResourceTag (59.32s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_tags_null (59.54s) === CONT TestAccVPCSecurityGroupEgressRule_tags_ComputedTag_OnCreate --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_emptyProviderOnlyTag (59.64s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_emptyResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_Identity_RegionOverride (69.36s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_emptyProviderOnlyTag --- PASS: TestAccVPCSecurityGroupIngressRule_Identity_Basic (78.10s) === CONT TestAccVPCSecurityGroupIngressRule_tags_ComputedTag_OnCreate --- PASS: TestAccVPCSecurityGroupEgressRule_Identity_Basic (79.21s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_cidrIPv4 (79.24s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccVPCSecurityGroupIngressRule_updateSourceType (80.76s) === CONT TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccVPCSecurityGroupIngressRule_referencedSecurityGroupID (82.53s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_emptyResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_Identity_ExistingResource (84.80s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_updateToResourceOnly --- PASS: TestAccVPCSecurityGroupIngressRule_tags_ComputedTag_OnUpdate_Add (89.24s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_providerOnly --- PASS: TestAccVPCSecurityGroupEgressRule_tags_ComputedTag_OnUpdate_Add (90.30s) === CONT TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_updateToProviderOnly (90.57s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_updateToProviderOnly --- PASS: TestAccVPCSecurityGroupEgressRule_tags_ComputedTag_OnUpdate_Replace (92.55s) === CONT TestAccVPCSecurityGroupIngressRule_basic --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nullNonOverlappingResourceTag (51.15s) === CONT TestAccVPCSecurityGroupIngressRule_tags_ignoreTags --- PASS: TestAccVPCSecurityGroupEgressRule_tags_ComputedTag_OnCreate (51.59s) === CONT TestAccVPCSecurityGroupIngressRule_tags_defaultAndIgnoreTags --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_emptyResourceTag (51.90s) === CONT TestAccVPCSecurityGroupIngressRule_disappears --- PASS: TestAccVPCSecurityGroupEgressRule_tags_IgnoreTags_Overlap_DefaultTag (114.76s) === CONT TestAccVPCSecurityGroupIngressRule_tags_IgnoreTags_Overlap_DefaultTag --- PASS: TestAccVPCSecurityGroupEgressRule_tags_IgnoreTags_Overlap_ResourceTag (118.75s) === CONT TestAccVPCSecurityGroupIngressRule_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_emptyProviderOnlyTag (53.26s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nullOverlappingResourceTag --- PASS: TestAccVPCSecurityGroupIngressRule_cidrIPv6 (71.67s) === CONT TestAccVPCSecurityGroupIngressRule_tags_ComputedTag_OnUpdate_Replace --- PASS: TestAccVPCSecurityGroupIngressRule_description (73.71s) === CONT TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccVPCSecurityGroupIngressRule_prefixListID (83.54s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_overlapping --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_nullNonOverlappingResourceTag (53.41s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_nonOverlapping --- PASS: TestAccVPCSecurityGroupIngressRule_tags_ComputedTag_OnCreate (55.37s) === CONT TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_providerOnly --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_emptyResourceTag (51.57s) === CONT TestAccVPCSecurityGroupEgressRule_tags_null --- PASS: TestAccVPCSecurityGroupIngressRule_basic (44.77s) === CONT TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnCreate --- PASS: TestAccVPCSecurityGroupIngressRule_disappears (41.03s) === CONT TestAccVPCSecurityGroupEgressRule_tags_AddOnUpdate --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_updateToResourceOnly (85.16s) === CONT TestAccVPCSecurityGroupEgressRule_tags_EmptyMap --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_updateToResourceOnly (87.12s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_overlapping --- PASS: TestAccVPCSecurityGroupIngressRule_tags (175.75s) === CONT TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnCreate --- PASS: TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnUpdate_Replace (86.02s) === CONT TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnUpdate_Add --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nullOverlappingResourceTag (54.03s) === CONT TestAccVPCSecurityGroupEgressRule_Identity_ExistingResource --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_updateToProviderOnly (88.41s) === CONT TestAccVPCSecurityGroupEgressRule_tags --- PASS: TestAccVPCSecurityGroupEgressRule_tags_null (54.38s) === CONT TestAccVPCSecurityGroupEgressRule_Identity_RegionOverride --- PASS: TestAccVPCSecurityGroupIngressRule_tags_ignoreTags (95.41s) === CONT TestAccVPCSecurityGroupIngressRule_tags_AddOnUpdate --- PASS: TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnUpdate_Add (127.03s) === CONT TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nonOverlapping --- PASS: TestAccVPCSecurityGroupIngressRule_tags_defaultAndIgnoreTags (97.34s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnUpdate_Replace (83.51s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_EmptyMap (51.73s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_ComputedTag_OnUpdate_Replace (89.31s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_IgnoreTags_Overlap_DefaultTag (107.62s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_EmptyTag_OnCreate (90.99s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_IgnoreTags_Overlap_ResourceTag (112.94s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_AddOnUpdate (82.03s) --- PASS: TestAccVPCSecurityGroupEgressRule_Identity_RegionOverride (54.01s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnCreate (75.88s) --- PASS: TestAccVPCSecurityGroupEgressRule_Identity_ExistingResource (75.26s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_providerOnly (163.65s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_overlapping (122.12s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_nonOverlapping (122.64s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_AddOnUpdate (54.51s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_EmptyTag_OnUpdate_Add (89.50s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_overlapping (100.06s) --- PASS: TestAccVPCSecurityGroupIngressRule_tags_DefaultTags_providerOnly (140.69s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags (106.47s) --- PASS: TestAccVPCSecurityGroupEgressRule_tags_DefaultTags_nonOverlapping (78.60s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/ec2 293.172s ``` --- .changelog/44198.txt | 6 + internal/framework/with_import_by_identity.go | 3 + internal/service/ec2/service_package_gen.go | 12 +- .../SecurityGroupEgressRule/basic/main_gen.tf | 26 ++ .../basic_v6.12.0/main_gen.tf | 36 +++ .../region_override/main_gen.tf | 38 +++ .../basic/main_gen.tf | 26 ++ .../basic_v6.12.0/main_gen.tf | 36 +++ .../region_override/main_gen.tf | 38 +++ .../vpc_security_group_egress_rule_tags.gtpl | 3 + .../vpc_security_group_ingress_rule_tags.gtpl | 3 + .../ec2/vpc_security_group_egress_rule.go | 3 + ...ity_group_egress_rule_identity_gen_test.go | 256 ++++++++++++++++++ .../ec2/vpc_security_group_ingress_rule.go | 5 +- ...ty_group_ingress_rule_identity_gen_test.go | 256 ++++++++++++++++++ ...c_security_group_egress_rule.html.markdown | 26 ++ ..._security_group_ingress_rule.html.markdown | 26 ++ 17 files changed, 796 insertions(+), 3 deletions(-) create mode 100644 .changelog/44198.txt create mode 100644 internal/service/ec2/testdata/SecurityGroupEgressRule/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/SecurityGroupEgressRule/basic_v6.12.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/SecurityGroupEgressRule/region_override/main_gen.tf create mode 100644 internal/service/ec2/testdata/SecurityGroupIngressRule/basic/main_gen.tf create mode 100644 internal/service/ec2/testdata/SecurityGroupIngressRule/basic_v6.12.0/main_gen.tf create mode 100644 internal/service/ec2/testdata/SecurityGroupIngressRule/region_override/main_gen.tf create mode 100644 internal/service/ec2/vpc_security_group_egress_rule_identity_gen_test.go create mode 100644 internal/service/ec2/vpc_security_group_ingress_rule_identity_gen_test.go diff --git a/.changelog/44198.txt b/.changelog/44198.txt new file mode 100644 index 000000000000..230320e7b47c --- /dev/null +++ b/.changelog/44198.txt @@ -0,0 +1,6 @@ +```release-note:enhancement +resource/aws_vpc_security_group_ingress_rule: Add resource identity support +``` +```release-note:enhancement +resource/aws_vpc_security_group_egress_rule: Add resource identity support +``` diff --git a/internal/framework/with_import_by_identity.go b/internal/framework/with_import_by_identity.go index 59eebd257faa..3f34178ff8b0 100644 --- a/internal/framework/with_import_by_identity.go +++ b/internal/framework/with_import_by_identity.go @@ -18,6 +18,9 @@ type ImportByIdentityer interface { var _ ImportByIdentityer = &WithImportByIdentity{} +// WithImportByIdentity is intended to be embedded in resources which support resource identity. +// +// See: https://developer.hashicorp.com/terraform/plugin/framework/resources/identity#importing-by-identity type WithImportByIdentity struct { identity inttypes.Identity importSpec inttypes.FrameworkImport diff --git a/internal/service/ec2/service_package_gen.go b/internal/service/ec2/service_package_gen.go index 2af5fde3e847..525aaad6f819 100644 --- a/internal/service/ec2/service_package_gen.go +++ b/internal/service/ec2/service_package_gen.go @@ -206,7 +206,11 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.FrameworkImport{ + WrappedImport: true, + }, }, { Factory: newSecurityGroupIngressRuleResource, @@ -215,7 +219,11 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrID, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), + Region: unique.Make(inttypes.ResourceRegionDefault()), + Identity: inttypes.RegionalSingleParameterIdentity(names.AttrID), + Import: inttypes.FrameworkImport{ + WrappedImport: true, + }, }, { Factory: newSecurityGroupVPCAssociationResource, diff --git a/internal/service/ec2/testdata/SecurityGroupEgressRule/basic/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupEgressRule/basic/main_gen.tf new file mode 100644 index 000000000000..f748f945acba --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupEgressRule/basic/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_egress_rule" "test" { + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/SecurityGroupEgressRule/basic_v6.12.0/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupEgressRule/basic_v6.12.0/main_gen.tf new file mode 100644 index 000000000000..564690b46994 --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupEgressRule/basic_v6.12.0/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_egress_rule" "test" { + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.12.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/SecurityGroupEgressRule/region_override/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupEgressRule/region_override/main_gen.tf new file mode 100644 index 000000000000..8a56cdac0a16 --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupEgressRule/region_override/main_gen.tf @@ -0,0 +1,38 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_egress_rule" "test" { + region = var.region + + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + region = var.region + + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/SecurityGroupIngressRule/basic/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupIngressRule/basic/main_gen.tf new file mode 100644 index 000000000000..d457825a0a1b --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupIngressRule/basic/main_gen.tf @@ -0,0 +1,26 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_ingress_rule" "test" { + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/SecurityGroupIngressRule/basic_v6.12.0/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupIngressRule/basic_v6.12.0/main_gen.tf new file mode 100644 index 000000000000..84c9fb6741f6 --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupIngressRule/basic_v6.12.0/main_gen.tf @@ -0,0 +1,36 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_ingress_rule" "test" { + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "6.12.0" + } + } +} + +provider "aws" {} diff --git a/internal/service/ec2/testdata/SecurityGroupIngressRule/region_override/main_gen.tf b/internal/service/ec2/testdata/SecurityGroupIngressRule/region_override/main_gen.tf new file mode 100644 index 000000000000..4c387aabfe42 --- /dev/null +++ b/internal/service/ec2/testdata/SecurityGroupIngressRule/region_override/main_gen.tf @@ -0,0 +1,38 @@ +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 + +resource "aws_vpc_security_group_ingress_rule" "test" { + region = var.region + + security_group_id = aws_security_group.test.id + + cidr_ipv4 = "10.0.0.0/8" + from_port = 80 + ip_protocol = "tcp" + to_port = 8080 +} + +resource "aws_vpc" "test" { + region = var.region + + cidr_block = "10.0.0.0/16" +} + +resource "aws_security_group" "test" { + region = var.region + + vpc_id = aws_vpc.test.id + name = var.rName +} + +variable "rName" { + description = "Name for resource" + type = string + nullable = false +} + +variable "region" { + description = "Region to deploy resource in" + type = string + nullable = false +} diff --git a/internal/service/ec2/testdata/tmpl/vpc_security_group_egress_rule_tags.gtpl b/internal/service/ec2/testdata/tmpl/vpc_security_group_egress_rule_tags.gtpl index c76ecc6d331a..495b77c4643c 100644 --- a/internal/service/ec2/testdata/tmpl/vpc_security_group_egress_rule_tags.gtpl +++ b/internal/service/ec2/testdata/tmpl/vpc_security_group_egress_rule_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_vpc_security_group_egress_rule" "test" { +{{- template "region" }} security_group_id = aws_security_group.test.id cidr_ipv4 = "10.0.0.0/8" @@ -10,10 +11,12 @@ resource "aws_vpc_security_group_egress_rule" "test" { } resource "aws_vpc" "test" { +{{- template "region" }} cidr_block = "10.0.0.0/16" } resource "aws_security_group" "test" { +{{- template "region" }} vpc_id = aws_vpc.test.id name = var.rName } diff --git a/internal/service/ec2/testdata/tmpl/vpc_security_group_ingress_rule_tags.gtpl b/internal/service/ec2/testdata/tmpl/vpc_security_group_ingress_rule_tags.gtpl index 0eaeff4769f2..4e5bb5192883 100644 --- a/internal/service/ec2/testdata/tmpl/vpc_security_group_ingress_rule_tags.gtpl +++ b/internal/service/ec2/testdata/tmpl/vpc_security_group_ingress_rule_tags.gtpl @@ -1,4 +1,5 @@ resource "aws_vpc_security_group_ingress_rule" "test" { +{{- template "region" }} security_group_id = aws_security_group.test.id cidr_ipv4 = "10.0.0.0/8" @@ -10,10 +11,12 @@ resource "aws_vpc_security_group_ingress_rule" "test" { } resource "aws_vpc" "test" { +{{- template "region" }} cidr_block = "10.0.0.0/16" } resource "aws_security_group" "test" { +{{- template "region" }} vpc_id = aws_vpc.test.id name = var.rName } diff --git a/internal/service/ec2/vpc_security_group_egress_rule.go b/internal/service/ec2/vpc_security_group_egress_rule.go index c9336773d31f..be44e0d5c027 100644 --- a/internal/service/ec2/vpc_security_group_egress_rule.go +++ b/internal/service/ec2/vpc_security_group_egress_rule.go @@ -15,7 +15,10 @@ import ( // @FrameworkResource("aws_vpc_security_group_egress_rule", name="Security Group Egress Rule") // @Tags(identifierAttribute="id") +// @IdentityAttribute("id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;awstypes;awstypes.SecurityGroupRule") +// @Testing(idAttrDuplicates="security_group_rule_id") +// @Testing(preIdentityVersion="v6.12.0") func newSecurityGroupEgressRuleResource(context.Context) (resource.ResourceWithConfigure, error) { r := &securityGroupEgressRuleResource{} r.securityGroupRule = r diff --git a/internal/service/ec2/vpc_security_group_egress_rule_identity_gen_test.go b/internal/service/ec2/vpc_security_group_egress_rule_identity_gen_test.go new file mode 100644 index 000000000000..9476fd679732 --- /dev/null +++ b/internal/service/ec2/vpc_security_group_egress_rule_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCSecurityGroupEgressRule_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.SecurityGroupRule + resourceName := "aws_vpc_security_group_egress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckSecurityGroupEgressRuleDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecurityGroupEgressRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("security_group_rule_id"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("security_group_rule_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("security_group_rule_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccVPCSecurityGroupEgressRule_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_vpc_security_group_egress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("security_group_rule_id"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.12.0 +func TestAccVPCSecurityGroupEgressRule_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.SecurityGroupRule + resourceName := "aws_vpc_security_group_egress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckSecurityGroupEgressRuleDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic_v6.12.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecurityGroupEgressRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupEgressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go index 4d3e2e6fc1c5..9832f31ab1f1 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go @@ -43,7 +43,10 @@ import ( // @FrameworkResource("aws_vpc_security_group_ingress_rule", name="Security Group Ingress Rule") // @Tags(identifierAttribute="id") +// @IdentityAttribute("id") // @Testing(existsType="github.com/aws/aws-sdk-go-v2/service/ec2/types;awstypes;awstypes.SecurityGroupRule") +// @Testing(idAttrDuplicates="security_group_rule_id") +// @Testing(preIdentityVersion="v6.12.0") func newSecurityGroupIngressRuleResource(context.Context) (resource.ResourceWithConfigure, error) { r := &securityGroupIngressRuleResource{} r.securityGroupRule = r @@ -168,7 +171,7 @@ type securityGroupRule interface { type securityGroupRuleResource struct { securityGroupRule framework.ResourceWithModel[securityGroupRuleResourceModel] - framework.WithImportByID + framework.WithImportByIdentity } func (r *securityGroupRuleResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { diff --git a/internal/service/ec2/vpc_security_group_ingress_rule_identity_gen_test.go b/internal/service/ec2/vpc_security_group_ingress_rule_identity_gen_test.go new file mode 100644 index 000000000000..715767f4c043 --- /dev/null +++ b/internal/service/ec2/vpc_security_group_ingress_rule_identity_gen_test.go @@ -0,0 +1,256 @@ +// Code generated by internal/generate/identitytests/main.go; DO NOT EDIT. + +package ec2_test + +import ( + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/terraform-plugin-testing/compare" + "github.com/hashicorp/terraform-plugin-testing/config" + sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/knownvalue" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/statecheck" + "github.com/hashicorp/terraform-plugin-testing/tfjsonpath" + "github.com/hashicorp/terraform-plugin-testing/tfversion" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + tfknownvalue "github.com/hashicorp/terraform-provider-aws/internal/acctest/knownvalue" + tfstatecheck "github.com/hashicorp/terraform-provider-aws/internal/acctest/statecheck" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCSecurityGroupIngressRule_Identity_Basic(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.SecurityGroupRule + resourceName := "aws_vpc_security_group_ingress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckSecurityGroupIngressRuleDestroy(ctx), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("security_group_rule_id"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ImportStateKind: resource.ImportCommandWithID, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("security_group_rule_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New("security_group_rule_id"), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.Region())), + }, + }, + }, + }, + }) +} + +func TestAccVPCSecurityGroupIngressRule_Identity_RegionOverride(t *testing.T) { + ctx := acctest.Context(t) + + resourceName := "aws_vpc_security_group_ingress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: acctest.CheckDestroyNoop, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + Steps: []resource.TestStep{ + // Step 1: Setup + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.CompareValuePairs(resourceName, tfjsonpath.New(names.AttrID), resourceName, tfjsonpath.New("security_group_rule_id"), compare.ValuesSame()), + statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.AlternateRegion()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + + // Step 2: Import command + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ImportStateKind: resource.ImportCommandWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + + // Step 3: Import block with Import ID + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithID, + ImportStateIdFunc: acctest.CrossRegionImportStateIdFunc(resourceName), + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + + // Step 4: Import block with Resource Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/region_override/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + "region": config.StringVariable(acctest.AlternateRegion()), + }, + ResourceName: resourceName, + ImportState: true, + ImportStateKind: resource.ImportBlockWithResourceIdentity, + ImportPlanChecks: resource.ImportPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrID), knownvalue.NotNull()), + plancheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrRegion), knownvalue.StringExact(acctest.AlternateRegion())), + }, + }, + }, + }, + }) +} + +// Resource Identity was added after v6.12.0 +func TestAccVPCSecurityGroupIngressRule_Identity_ExistingResource(t *testing.T) { + ctx := acctest.Context(t) + + var v awstypes.SecurityGroupRule + resourceName := "aws_vpc_security_group_ingress_rule.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + acctest.ParallelTest(ctx, t, resource.TestCase{ + TerraformVersionChecks: []tfversion.TerraformVersionCheck{ + tfversion.SkipBelow(tfversion.Version1_12_0), + }, + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), + CheckDestroy: testAccCheckSecurityGroupIngressRuleDestroy(ctx), + Steps: []resource.TestStep{ + // Step 1: Create pre-Identity + { + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic_v6.12.0/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckSecurityGroupIngressRuleExists(ctx, resourceName, &v), + ), + ConfigStateChecks: []statecheck.StateCheck{ + tfstatecheck.ExpectNoIdentity(resourceName), + }, + }, + + // Step 2: Current version + { + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + ConfigDirectory: config.StaticDirectory("testdata/SecurityGroupIngressRule/basic/"), + ConfigVariables: config.Variables{ + acctest.CtRName: config.StringVariable(rName), + }, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionNoop), + }, + }, + ConfigStateChecks: []statecheck.StateCheck{ + statecheck.ExpectIdentity(resourceName, map[string]knownvalue.Check{ + names.AttrAccountID: tfknownvalue.AccountID(), + names.AttrRegion: knownvalue.StringExact(acctest.Region()), + names.AttrID: knownvalue.NotNull(), + }), + statecheck.ExpectIdentityValueMatchesState(resourceName, tfjsonpath.New(names.AttrID)), + }, + }, + }, + }) +} diff --git a/website/docs/r/vpc_security_group_egress_rule.html.markdown b/website/docs/r/vpc_security_group_egress_rule.html.markdown index 5f78f5476d74..c1cffb60f848 100644 --- a/website/docs/r/vpc_security_group_egress_rule.html.markdown +++ b/website/docs/r/vpc_security_group_egress_rule.html.markdown @@ -57,6 +57,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_egress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_egress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group egress rules using the `security_group_rule_id`. For example: ```terraform diff --git a/website/docs/r/vpc_security_group_ingress_rule.html.markdown b/website/docs/r/vpc_security_group_ingress_rule.html.markdown index 6b38a6aad661..3f62ee6f3b5b 100644 --- a/website/docs/r/vpc_security_group_ingress_rule.html.markdown +++ b/website/docs/r/vpc_security_group_ingress_rule.html.markdown @@ -66,6 +66,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_ingress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_ingress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group ingress rules using the `security_group_rule_id`. For example: ```terraform From dacd14c4d3729b1f8dc63a9b20b49a391db395ad Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 9 Sep 2025 15:24:24 +0000 Subject: [PATCH 1814/2115] Update CHANGELOG.md for #44198 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c737262751f..0b393a5366ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ ENHANCEMENTS: * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) +* resource/aws_vpc_endpoint: Add resource identity support ([#44194](https://github.com/hashicorp/terraform-provider-aws/issues/44194)) +* resource/aws_vpc_security_group_egress_rule: Add resource identity support ([#44198](https://github.com/hashicorp/terraform-provider-aws/issues/44198)) +* resource/aws_vpc_security_group_ingress_rule: Add resource identity support ([#44198](https://github.com/hashicorp/terraform-provider-aws/issues/44198)) BUG FIXES: From 6bb98ebac565a275f99faccd3f2b7dd4c67d8598 Mon Sep 17 00:00:00 2001 From: tabito Date: Tue, 9 Sep 2025 23:10:41 +0900 Subject: [PATCH 1815/2115] Update the documentation to improve --- website/docs/r/codebuild_webhook.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/codebuild_webhook.html.markdown b/website/docs/r/codebuild_webhook.html.markdown index 2d8d9e7eecdd..f375bb31495f 100644 --- a/website/docs/r/codebuild_webhook.html.markdown +++ b/website/docs/r/codebuild_webhook.html.markdown @@ -93,7 +93,7 @@ This resource supports the following arguments: * `branch_filter` - (Optional) A regular expression used to determine which branches get built. Default is all branches are built. We recommend using `filter_group` over `branch_filter`. * `filter_group` - (Optional) Information about the webhook's trigger. See [filter_group](#filter_group) for details. * `scope_configuration` - (Optional) Scope configuration for global or organization webhooks. See [scope_configuration](#scope_configuration) for details. -* `pull_request_build_policy` - (Optional) Defines comment-based approval requirements for triggering builds on pull requests. See [Pull Request Build Policy](#pull_request_build_policy) for details. +* `pull_request_build_policy` - (Optional) Defines comment-based approval requirements for triggering builds on pull requests. See [pull_request_build_policy](#pull_request_build_policy) for details. ### filter_group @@ -113,8 +113,8 @@ This resource supports the following arguments: ### pull_request_build_policy -* `requires_comment_approval` - (Required) Specifies when comment-based approval is required before triggering a build on pull requests. Valid values for this parameter are: `DISABLED`, `ALL_PULL_REQUESTS`, and `FORK_PULL_REQUESTS`. -* `approver_roles` - (Optional) List of repository roles that have approval privileges for pull request builds when comment approval is required. This field must be specified only when `requires_comment_approval` is not `DISABLED`. See the [AWS documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/pull-request-build-policy.html#pull-request-build-policy.configuration) for its valid values and defaults. +* `requires_comment_approval` - (Required) Specifies when comment-based approval is required before triggering a build on pull requests. Valid values are: `DISABLED`, `ALL_PULL_REQUESTS`, and `FORK_PULL_REQUESTS`. +* `approver_roles` - (Optional) List of repository roles that have approval privileges for pull request builds when comment approval is required. This argument must be specified only when `requires_comment_approval` is not `DISABLED`. See the [AWS documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/pull-request-build-policy.html#pull-request-build-policy.configuration) for valid values and defaults. ## Attribute Reference From 33a08afd1eed9e8c8a3d8982e11a9bd8d0ff89e1 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 10:48:51 -0500 Subject: [PATCH 1816/2115] aws_controltower_baseline: remove identity --- internal/service/controltower/baseline.go | 6 ++++-- internal/service/controltower/service_package_gen.go | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 567765434f7f..e90916d2d4fb 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -38,7 +38,6 @@ import ( // @FrameworkResource("aws_controltower_baseline", name="Baseline") // @Tags(identifierAttribute="arn") -// @ArnIdentity func newResourceBaseline(_ context.Context) (resource.ResourceWithConfigure, error) { r := &resourceBaseline{} r.SetDefaultCreateTimeout(30 * time.Minute) @@ -55,7 +54,6 @@ const ( type resourceBaseline struct { framework.ResourceWithModel[resourceBaselineData] framework.WithTimeouts - framework.WithImportByIdentity } func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) { @@ -296,6 +294,10 @@ func (r *resourceBaseline) Delete(ctx context.Context, request resource.DeleteRe } } +func (r *resourceBaseline) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + resource.ImportStatePassthroughID(ctx, path.Root(names.AttrARN), request, response) +} + func waitBaselineReady(ctx context.Context, conn *controltower.Client, id string, timeout time.Duration) (*awstypes.EnabledBaselineDetails, error) { //nolint:unparam stateConf := &retry.StateChangeConf{ Pending: enum.Slice(awstypes.EnablementStatusUnderChange), diff --git a/internal/service/controltower/service_package_gen.go b/internal/service/controltower/service_package_gen.go index 3ef37c89b5a9..47d3593928e0 100644 --- a/internal/service/controltower/service_package_gen.go +++ b/internal/service/controltower/service_package_gen.go @@ -30,11 +30,7 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Tags: unique.Make(inttypes.ServicePackageResourceTags{ IdentifierAttribute: names.AttrARN, }), - Region: unique.Make(inttypes.ResourceRegionDefault()), - Identity: inttypes.RegionalARNIdentity(), - Import: inttypes.FrameworkImport{ - WrappedImport: true, - }, + Region: unique.Make(inttypes.ResourceRegionDefault()), }, } } From e3ae386645dd5c7acc308b49516527e4761c2e2d Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 00:54:16 +0900 Subject: [PATCH 1817/2115] Implement run_rate_in_hours in iceberg_configuration blocks --- .../service/glue/catalog_table_optimizer.go | 72 +++++++++++++++++-- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/internal/service/glue/catalog_table_optimizer.go b/internal/service/glue/catalog_table_optimizer.go index ede1021e7be6..f50a3dfb2f0e 100644 --- a/internal/service/glue/catalog_table_optimizer.go +++ b/internal/service/glue/catalog_table_optimizer.go @@ -13,6 +13,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/path" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/schema/validator" @@ -108,13 +109,20 @@ func (r *catalogTableOptimizerResource) Schema(ctx context.Context, _ resource.S }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ - "snapshot_retention_period_in_days": schema.Int32Attribute{ + "clean_expired_files": schema.BoolAttribute{ Optional: true, }, "number_of_snapshots_to_retain": schema.Int32Attribute{ Optional: true, }, - "clean_expired_files": schema.BoolAttribute{ + "run_rate_in_hours": schema.Int32Attribute{ + Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Int32{ + int32planmodifier.UseStateForUnknown(), + }, + }, + "snapshot_retention_period_in_days": schema.Int32Attribute{ Optional: true, }, }, @@ -137,11 +145,18 @@ func (r *catalogTableOptimizerResource) Schema(ctx context.Context, _ resource.S }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ + names.AttrLocation: schema.StringAttribute{ + Optional: true, + }, "orphan_file_retention_period_in_days": schema.Int32Attribute{ Optional: true, }, - names.AttrLocation: schema.StringAttribute{ + "run_rate_in_hours": schema.Int32Attribute{ Optional: true, + Computed: true, + PlanModifiers: []planmodifier.Int32{ + int32planmodifier.UseStateForUnknown(), + }, }, }, }, @@ -209,6 +224,28 @@ func (r *catalogTableOptimizerResource) Create(ctx context.Context, request reso return } + output, err := findCatalogTableOptimizer(ctx, conn, plan.CatalogID.ValueString(), plan.DatabaseName.ValueString(), plan.TableName.ValueString(), plan.Type.ValueString()) + if err != nil { + id, _ := flex.FlattenResourceId([]string{ + plan.CatalogID.ValueString(), + plan.DatabaseName.ValueString(), + plan.TableName.ValueString(), + plan.Type.ValueString(), + }, idParts, false) + + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.Glue, create.ErrActionReading, ResNameCatalogTableOptimizer, id, err), + err.Error(), + ) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output.TableOptimizer, &plan)...) + + if response.Diagnostics.HasError() { + return + } + response.Diagnostics.Append(response.State.Set(ctx, &plan)...) } @@ -289,6 +326,27 @@ func (r *catalogTableOptimizerResource) Update(ctx context.Context, request reso ) return } + output, err := findCatalogTableOptimizer(ctx, conn, plan.CatalogID.ValueString(), plan.DatabaseName.ValueString(), plan.TableName.ValueString(), plan.Type.ValueString()) + if err != nil { + id, _ := flex.FlattenResourceId([]string{ + plan.CatalogID.ValueString(), + plan.DatabaseName.ValueString(), + plan.TableName.ValueString(), + plan.Type.ValueString(), + }, idParts, false) + + response.Diagnostics.AddError( + create.ProblemStandardMessage(names.Glue, create.ErrActionReading, ResNameCatalogTableOptimizer, id, err), + err.Error(), + ) + return + } + + response.Diagnostics.Append(fwflex.Flatten(ctx, output.TableOptimizer, &plan)...) + + if response.Diagnostics.HasError() { + return + } } response.Diagnostics.Append(response.State.Set(ctx, &plan)...) @@ -376,9 +434,10 @@ type retentionConfigurationData struct { } type icebergRetentionConfigurationData struct { - SnapshotRetentionPeriodInDays types.Int32 `tfsdk:"snapshot_retention_period_in_days"` - NumberOfSnapshotsToRetain types.Int32 `tfsdk:"number_of_snapshots_to_retain"` CleanExpiredFiles types.Bool `tfsdk:"clean_expired_files"` + NumberOfSnapshotsToRetain types.Int32 `tfsdk:"number_of_snapshots_to_retain"` + RunRateInHours types.Int32 `tfsdk:"run_rate_in_hours"` + SnapshotRetentionPeriodInDays types.Int32 `tfsdk:"snapshot_retention_period_in_days"` } type orphanFileDeletionConfigurationData struct { @@ -386,8 +445,9 @@ type orphanFileDeletionConfigurationData struct { } type icebergOrphanFileDeletionConfigurationData struct { - OrphanFileRetentionPeriodInDays types.Int32 `tfsdk:"orphan_file_retention_period_in_days"` Location types.String `tfsdk:"location"` + OrphanFileRetentionPeriodInDays types.Int32 `tfsdk:"orphan_file_retention_period_in_days"` + RunRateInHours types.Int32 `tfsdk:"run_rate_in_hours"` } func findCatalogTableOptimizer(ctx context.Context, conn *glue.Client, catalogID, dbName, tableName, optimizerType string) (*glue.GetTableOptimizerOutput, error) { From a86b0d23f340b7e2453c33698a7c85eaf0e527ec Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 00:57:38 +0900 Subject: [PATCH 1818/2115] Add acceptance tests --- .../glue/catalog_table_optimizer_test.go | 169 ++++++++++++++++++ internal/service/glue/glue_test.go | 12 +- 2 files changed, 176 insertions(+), 5 deletions(-) diff --git a/internal/service/glue/catalog_table_optimizer_test.go b/internal/service/glue/catalog_table_optimizer_test.go index c17558cb49a4..a455a07c1c88 100644 --- a/internal/service/glue/catalog_table_optimizer_test.go +++ b/internal/service/glue/catalog_table_optimizer_test.go @@ -149,6 +149,7 @@ func testAccCatalogTableOptimizer_RetentionConfiguration(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.snapshot_retention_period_in_days", "7"), resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.number_of_snapshots_to_retain", "3"), resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.clean_expired_files", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.run_rate_in_hours", "24"), ), }, { @@ -170,6 +171,62 @@ func testAccCatalogTableOptimizer_RetentionConfiguration(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.snapshot_retention_period_in_days", "6"), resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.number_of_snapshots_to_retain", "3"), resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.clean_expired_files", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.run_rate_in_hours", "24"), + ), + }, + }, + }) +} + +func testAccCatalogTableOptimizer_RetentionConfigurationWithRunRateInHours(t *testing.T) { + ctx := acctest.Context(t) + var catalogTableOptimizer glue.GetTableOptimizerOutput + + resourceName := "aws_glue_catalog_table_optimizer.test" + + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.GlueServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCatalogTableOptimizerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccCatalogTableOptimizerConfig_retentionConfigurationWithRunRateInHours(rName, 7, 6), + Check: resource.ComposeTestCheckFunc( + testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), + resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrType, "retention"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.snapshot_retention_period_in_days", "7"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.number_of_snapshots_to_retain", "3"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.clean_expired_files", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.run_rate_in_hours", "6"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccCatalogTableOptimizerStateIDFunc(resourceName), + ImportStateVerifyIdentifierAttribute: names.AttrTableName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccCatalogTableOptimizerConfig_retentionConfigurationWithRunRateInHours(rName, 6, 4), + Check: resource.ComposeTestCheckFunc( + testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), + resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrType, "retention"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.snapshot_retention_period_in_days", "6"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.number_of_snapshots_to_retain", "3"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.clean_expired_files", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.retention_configuration.0.iceberg_configuration.0.run_rate_in_hours", "4"), ), }, }, @@ -201,6 +258,7 @@ func testAccCatalogTableOptimizer_DeleteOrphanFileConfiguration(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.orphan_file_retention_period_in_days", "7"), resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.location", fmt.Sprintf("s3://%s/files/", rName)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.run_rate_in_hours", "24"), ), }, { @@ -221,6 +279,60 @@ func testAccCatalogTableOptimizer_DeleteOrphanFileConfiguration(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.orphan_file_retention_period_in_days", "6"), resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.location", fmt.Sprintf("s3://%s/files/", rName)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.run_rate_in_hours", "24"), + ), + }, + }, + }) +} + +func testAccCatalogTableOptimizer_DeleteOrphanFileConfigurationWithRunRateInHours(t *testing.T) { + ctx := acctest.Context(t) + var catalogTableOptimizer glue.GetTableOptimizerOutput + + resourceName := "aws_glue_catalog_table_optimizer.test" + + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.GlueServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCatalogTableOptimizerDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccCatalogTableOptimizerConfig_orphanFileDeletionConfigurationWithRunRateInHours(rName, 7, 6), + Check: resource.ComposeTestCheckFunc( + testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), + resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrType, "orphan_file_deletion"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.orphan_file_retention_period_in_days", "7"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.location", fmt.Sprintf("s3://%s/files/", rName)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.run_rate_in_hours", "6"), + ), + }, + { + ResourceName: resourceName, + ImportStateIdFunc: testAccCatalogTableOptimizerStateIDFunc(resourceName), + ImportStateVerifyIdentifierAttribute: names.AttrTableName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccCatalogTableOptimizerConfig_orphanFileDeletionConfigurationWithRunRateInHours(rName, 6, 4), + Check: resource.ComposeTestCheckFunc( + testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), + resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrType, "orphan_file_deletion"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.orphan_file_retention_period_in_days", "6"), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.location", fmt.Sprintf("s3://%s/files/", rName)), + resource.TestCheckResourceAttr(resourceName, "configuration.0.orphan_file_deletion_configuration.0.iceberg_configuration.0.run_rate_in_hours", "4"), ), }, }, @@ -472,10 +584,39 @@ resource "aws_glue_catalog_table_optimizer" "test" { } } } + depends_on = [aws_iam_role_policy.test] } `, retentionPeriod)) } +func testAccCatalogTableOptimizerConfig_retentionConfigurationWithRunRateInHours(rName string, retentionPeriod, runRateInHours int) string { + return acctest.ConfigCompose( + testAccCatalogTableOptimizerConfig_baseConfig(rName), + fmt.Sprintf(` +resource "aws_glue_catalog_table_optimizer" "test" { + catalog_id = data.aws_caller_identity.current.account_id + database_name = aws_glue_catalog_database.test.name + table_name = aws_glue_catalog_table.test.name + type = "retention" + + configuration { + role_arn = aws_iam_role.test.arn + enabled = true + + retention_configuration { + iceberg_configuration { + snapshot_retention_period_in_days = %[1]d + number_of_snapshots_to_retain = 3 + clean_expired_files = true + run_rate_in_hours = %[2]d + } + } + } + depends_on = [aws_iam_role_policy.test] +} +`, retentionPeriod, runRateInHours)) +} + func testAccCatalogTableOptimizerConfig_orphanFileDeletionConfiguration(rName string, retentionPeriod int) string { return acctest.ConfigCompose( testAccCatalogTableOptimizerConfig_baseConfig(rName), @@ -497,6 +638,34 @@ resource "aws_glue_catalog_table_optimizer" "test" { } } } + depends_on = [aws_iam_role_policy.test] } `, retentionPeriod)) } + +func testAccCatalogTableOptimizerConfig_orphanFileDeletionConfigurationWithRunRateInHours(rName string, retentionPeriod, runRateInHours int) string { + return acctest.ConfigCompose( + testAccCatalogTableOptimizerConfig_baseConfig(rName), + fmt.Sprintf(` +resource "aws_glue_catalog_table_optimizer" "test" { + catalog_id = data.aws_caller_identity.current.account_id + database_name = aws_glue_catalog_database.test.name + table_name = aws_glue_catalog_table.test.name + type = "orphan_file_deletion" + + configuration { + role_arn = aws_iam_role.test.arn + enabled = true + + orphan_file_deletion_configuration { + iceberg_configuration { + orphan_file_retention_period_in_days = %[1]d + location = "s3://${aws_s3_bucket.bucket.bucket}/files/" + run_rate_in_hours = %[2]d + } + } + } + depends_on = [aws_iam_role_policy.test] +} +`, retentionPeriod, runRateInHours)) +} diff --git a/internal/service/glue/glue_test.go b/internal/service/glue/glue_test.go index 2f86cd9057c0..000eea341e59 100644 --- a/internal/service/glue/glue_test.go +++ b/internal/service/glue/glue_test.go @@ -14,11 +14,13 @@ func TestAccGlue_serial(t *testing.T) { testCases := map[string]map[string]func(t *testing.T){ "CatalogTableOptimizer": { - acctest.CtBasic: testAccCatalogTableOptimizer_basic, - "deleteOrphanFileConfiguration": testAccCatalogTableOptimizer_DeleteOrphanFileConfiguration, - acctest.CtDisappears: testAccCatalogTableOptimizer_disappears, - "retentionConfiguration": testAccCatalogTableOptimizer_RetentionConfiguration, - "update": testAccCatalogTableOptimizer_update, + acctest.CtBasic: testAccCatalogTableOptimizer_basic, + "deleteOrphanFileConfiguration": testAccCatalogTableOptimizer_DeleteOrphanFileConfiguration, + "deleteOrphanFileConfigurationWithRunRateInHours": testAccCatalogTableOptimizer_DeleteOrphanFileConfigurationWithRunRateInHours, + acctest.CtDisappears: testAccCatalogTableOptimizer_disappears, + "retentionConfiguration": testAccCatalogTableOptimizer_RetentionConfiguration, + "retentionConfigurationWithRunRateInHours": testAccCatalogTableOptimizer_RetentionConfigurationWithRunRateInHours, + "update": testAccCatalogTableOptimizer_update, }, "DataCatalogEncryptionSettings": { acctest.CtBasic: testAccDataCatalogEncryptionSettings_basic, From 2a71a1f7c3d2d74f1822e4567d84be499bc5eadd Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 00:57:55 +0900 Subject: [PATCH 1819/2115] Update the documentations --- .../docs/r/glue_catalog_table_optimizer.html.markdown | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/website/docs/r/glue_catalog_table_optimizer.html.markdown b/website/docs/r/glue_catalog_table_optimizer.html.markdown index cba03a6b94e0..f92a367bbe3c 100644 --- a/website/docs/r/glue_catalog_table_optimizer.html.markdown +++ b/website/docs/r/glue_catalog_table_optimizer.html.markdown @@ -101,15 +101,17 @@ This resource supports the following arguments: ### Orphan File Deletion Configuration * `iceberg_configuration` (Optional) - The configuration for an Iceberg orphan file deletion optimizer. - * `orphan_file_retention_period_in_days` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. * `location` (Optional) - Specifies a directory in which to look for files. You may choose a sub-directory rather than the top-level table location. Defaults to the table's location. - + * `orphan_file_retention_period_in_days` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. + * `run_rate_in_hours` (Optional) - interval in hours between orphan file deletion job runs. Defaults to `24`. + ### Retention Configuration * `iceberg_configuration` (Optional) - The configuration for an Iceberg snapshot retention optimizer. - * `snapshot_retention_period_in_days` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. - * `number_of_snapshots_to_retain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. * `clean_expired_files` (Optional) - If set to `false`, snapshots are only deleted from table metadata, and the underlying data and metadata files are not deleted. Defaults to `false`. + * `number_of_snapshots_to_retain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. + * `run_rate_in_hours` (Optional) - Interval in hours between retention job runs. Defaults to `24`. + * `snapshot_retention_period_in_days` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. ## Attribute Reference From 9ad87fbded4fe0fd20504fbc535096dd23cefe54 Mon Sep 17 00:00:00 2001 From: Sasi Date: Tue, 9 Sep 2025 12:03:55 -0400 Subject: [PATCH 1820/2115] depends on condition added --- internal/service/controltower/baseline_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index dd7a776bf1fc..9b286893f244 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -116,7 +116,7 @@ func testAccCheckBaselineDestroy(ctx context.Context) resource.TestCheckFunc { return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, arn, err) } - return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, rs.Primary.ID, errors.New("not destroyed")) + return create.Error(names.ControlTower, create.ErrActionCheckingDestroyed, tfcontroltower.ResNameBaseline, arn, errors.New("not destroyed")) } return nil @@ -182,6 +182,9 @@ resource "aws_controltower_baseline" "test" { key = "IdentityCenterEnabledBaselineArn" value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:enabledbaseline/XALULM96QHI525UOC" } + depends_on = [ + aws_organizations_organizational_unit.test + ] } `, rName) } From a204b12c6ebb05f59262714d393afc9ddeb68412 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:20 -0400 Subject: [PATCH 1821/2115] Fix golangci-lint 'errorlint' - athena. --- internal/service/athena/workgroup_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/athena/workgroup_test.go b/internal/service/athena/workgroup_test.go index 79ef1c7d229d..153fe5677fff 100644 --- a/internal/service/athena/workgroup_test.go +++ b/internal/service/athena/workgroup_test.go @@ -699,7 +699,7 @@ func testAccCheckCreateNamedQuery(ctx context.Context, workGroup *types.WorkGrou } if _, err := conn.CreateNamedQuery(ctx, input); err != nil { - return fmt.Errorf("error creating Named Query (%s) on Workgroup (%s): %s", queryName, aws.ToString(workGroup.Name), err) + return fmt.Errorf("error creating Named Query (%s) on Workgroup (%s): %w", queryName, aws.ToString(workGroup.Name), err) } return nil From 754465b8531a15258db3ea65c030e15250b10d14 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:21 -0400 Subject: [PATCH 1822/2115] Fix golangci-lint 'errorlint' - batch. --- internal/service/batch/job_definition.go | 6 +++--- internal/service/batch/job_queue_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/batch/job_definition.go b/internal/service/batch/job_definition.go index 83b0255af1d9..1c2fb0c07d44 100644 --- a/internal/service/batch/job_definition.go +++ b/internal/service/batch/job_definition.go @@ -1110,7 +1110,7 @@ func validJobContainerProperties(v any, k string) (ws []string, errors []error) value := v.(string) _, err := expandContainerProperties(value) if err != nil { - errors = append(errors, fmt.Errorf("AWS Batch Job container_properties is invalid: %s", err)) + errors = append(errors, fmt.Errorf("AWS Batch Job container_properties is invalid: %w", err)) } return } @@ -1119,7 +1119,7 @@ func validJobECSProperties(v any, k string) (ws []string, errors []error) { value := v.(string) _, err := expandECSProperties(value) if err != nil { - errors = append(errors, fmt.Errorf("AWS Batch Job ecs_properties is invalid: %s", err)) + errors = append(errors, fmt.Errorf("AWS Batch Job ecs_properties is invalid: %w", err)) } return } @@ -1128,7 +1128,7 @@ func validJobNodeProperties(v any, k string) (ws []string, errors []error) { value := v.(string) _, err := expandJobNodeProperties(value) if err != nil { - errors = append(errors, fmt.Errorf("AWS Batch Job node_properties is invalid: %s", err)) + errors = append(errors, fmt.Errorf("AWS Batch Job node_properties is invalid: %w", err)) } return } diff --git a/internal/service/batch/job_queue_test.go b/internal/service/batch/job_queue_test.go index 94e80c9a0e0c..b3d0ebaf2e4f 100644 --- a/internal/service/batch/job_queue_test.go +++ b/internal/service/batch/job_queue_test.go @@ -451,7 +451,7 @@ func testAccCheckJobQueueComputeEnvironmentOrderUpdate(ctx context.Context, jobQ _, err := conn.UpdateJobQueue(ctx, input) if err != nil { - return fmt.Errorf("error updating Batch Job Queue (%s): %s", name, err) + return fmt.Errorf("error updating Batch Job Queue (%s): %w", name, err) } return nil From b14d7e00e5b5e9ce76df0e5c7c7116ec8d32ed7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:22 -0400 Subject: [PATCH 1823/2115] Fix golangci-lint 'errorlint' - budgets. --- internal/service/budgets/budget.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/budgets/budget.go b/internal/service/budgets/budget.go index 0d005aacd6f2..6e669eb80b9b 100644 --- a/internal/service/budgets/budget.go +++ b/internal/service/budgets/budget.go @@ -707,14 +707,14 @@ func updateBudgetNotifications(ctx context.Context, conn *budgets.Client, d *sch _, err := conn.DeleteNotification(ctx, input) if err != nil { - return fmt.Errorf("deleting Budget (%s) notification: %s", d.Id(), err) + return fmt.Errorf("deleting Budget (%s) notification: %w", d.Id(), err) } } err = createBudgetNotifications(ctx, conn, addNotifications, addSubscribers, budgetName, accountID) if err != nil { - return fmt.Errorf("creating Budget (%s) notifications: %s", d.Id(), err) + return fmt.Errorf("creating Budget (%s) notifications: %w", d.Id(), err) } } From b9b3830d62966f8b13235aeb246ab4d444e82b21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:24 -0400 Subject: [PATCH 1824/2115] Fix golangci-lint 'errorlint' - cloudtrail. --- internal/service/cloudtrail/trail.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloudtrail/trail.go b/internal/service/cloudtrail/trail.go index 1c6218e801c4..63cf3c0992f6 100644 --- a/internal/service/cloudtrail/trail.go +++ b/internal/service/cloudtrail/trail.go @@ -672,7 +672,7 @@ func setEventSelectors(ctx context.Context, conn *cloudtrail.Client, d *schema.R input.EventSelectors = eventSelectors if _, err := conn.PutEventSelectors(ctx, input); err != nil { - return fmt.Errorf("setting CloudTrail Trail (%s) event selectors: %s", d.Id(), err) + return fmt.Errorf("setting CloudTrail Trail (%s) event selectors: %w", d.Id(), err) } return nil From 8fae64fcb80a7c954ec339f97a1cbdc58c4bf74b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:24 -0400 Subject: [PATCH 1825/2115] Fix golangci-lint 'errorlint' - codecommit. --- internal/service/codecommit/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/codecommit/repository.go b/internal/service/codecommit/repository.go index b7e60713a171..dc9ee83a2477 100644 --- a/internal/service/codecommit/repository.go +++ b/internal/service/codecommit/repository.go @@ -229,7 +229,7 @@ func updateRepositoryDefaultBranch(ctx context.Context, conn *codecommit.Client, output, err := conn.ListBranches(ctx, inputL) if err != nil { - return fmt.Errorf("listing CodeCommit Repository (%s) branches: %s", name, err) + return fmt.Errorf("listing CodeCommit Repository (%s) branches: %w", name, err) } if len(output.Branches) == 0 { From 17fadcb2e481938b6b5539bbdf6aa37c38146a8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:25 -0400 Subject: [PATCH 1826/2115] Fix golangci-lint 'errorlint' - cognitoidp. --- internal/service/cognitoidp/user_pool_data_source_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/user_pool_data_source_test.go b/internal/service/cognitoidp/user_pool_data_source_test.go index c881fa66d209..f0e2aba80205 100644 --- a/internal/service/cognitoidp/user_pool_data_source_test.go +++ b/internal/service/cognitoidp/user_pool_data_source_test.go @@ -153,7 +153,7 @@ func testSchemaAttributes(n string) resource.TestCheckFunc { } numAttributes, err := strconv.Atoi(numAttributesStr) if err != nil { - return fmt.Errorf("error parsing schema_attributes.#: %s", err) + return fmt.Errorf("error parsing schema_attributes.#: %w", err) } // Loop through the schema_attributes and check the mutable key in each attribute From 26c1257521d8f83dece621cf182f70369bfc38e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:25 -0400 Subject: [PATCH 1827/2115] Fix golangci-lint 'errorlint' - comprehend. --- internal/service/comprehend/document_classifier.go | 2 +- internal/service/comprehend/entity_recognizer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/comprehend/document_classifier.go b/internal/service/comprehend/document_classifier.go index 4b8fdaa00404..ad37f633a09a 100644 --- a/internal/service/comprehend/document_classifier.go +++ b/internal/service/comprehend/document_classifier.go @@ -417,7 +417,7 @@ func resourceDocumentClassifierDelete(ctx context.Context, d *schema.ResourceDat } if _, err := waitDocumentClassifierDeleted(ctx, conn, aws.ToString(v.DocumentClassifierArn), d.Timeout(schema.TimeoutDelete)); err != nil { - return fmt.Errorf("waiting for version (%s) to be deleted: %s", aws.ToString(v.VersionName), err) + return fmt.Errorf("waiting for version (%s) to be deleted: %w", aws.ToString(v.VersionName), err) } ec2Conn := meta.(*conns.AWSClient).EC2Client(ctx) diff --git a/internal/service/comprehend/entity_recognizer.go b/internal/service/comprehend/entity_recognizer.go index e6216c8148b3..b9d4fdced08d 100644 --- a/internal/service/comprehend/entity_recognizer.go +++ b/internal/service/comprehend/entity_recognizer.go @@ -446,7 +446,7 @@ func resourceEntityRecognizerDelete(ctx context.Context, d *schema.ResourceData, } if _, err := waitEntityRecognizerDeleted(ctx, conn, aws.ToString(v.EntityRecognizerArn), d.Timeout(schema.TimeoutDelete)); err != nil { - return fmt.Errorf("waiting for version (%s) to be deleted: %s", aws.ToString(v.VersionName), err) + return fmt.Errorf("waiting for version (%s) to be deleted: %w", aws.ToString(v.VersionName), err) } ec2Conn := meta.(*conns.AWSClient).EC2Client(ctx) From 9161ef8505c1350595aefcd09692c58a36229c7c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:26 -0400 Subject: [PATCH 1828/2115] Fix golangci-lint 'errorlint' - connect. --- internal/service/connect/routing_profile.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/connect/routing_profile.go b/internal/service/connect/routing_profile.go index 682a7d8165e6..b888578dbff2 100644 --- a/internal/service/connect/routing_profile.go +++ b/internal/service/connect/routing_profile.go @@ -377,7 +377,7 @@ func updateRoutingProfileQueueAssociations(ctx context.Context, conn *connect.Cl _, err := conn.DisassociateRoutingProfileQueues(ctx, input) if err != nil { - return fmt.Errorf("disassociating Connect Routing Profile (%s) queues: %s", routingProfileID, err) + return fmt.Errorf("disassociating Connect Routing Profile (%s) queues: %w", routingProfileID, err) } } } @@ -392,7 +392,7 @@ func updateRoutingProfileQueueAssociations(ctx context.Context, conn *connect.Cl _, err := conn.AssociateRoutingProfileQueues(ctx, input) if err != nil { - return fmt.Errorf("associating Connect Routing Profile (%s) queues: %s", routingProfileID, err) + return fmt.Errorf("associating Connect Routing Profile (%s) queues: %w", routingProfileID, err) } } From acd5bd8a201acd049ab48aded0d151d60d3a8676 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:27 -0400 Subject: [PATCH 1829/2115] Fix golangci-lint 'errorlint' - dax. --- internal/service/dax/cluster_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/dax/cluster_test.go b/internal/service/dax/cluster_test.go index 5fc425d33049..a2981f1b85d9 100644 --- a/internal/service/dax/cluster_test.go +++ b/internal/service/dax/cluster_test.go @@ -377,7 +377,7 @@ func testAccCheckClusterExists(ctx context.Context, n string, v *awstypes.Cluste } resp, err := conn.DescribeClusters(ctx, &input) if err != nil { - return fmt.Errorf("DAX error: %v", err) + return fmt.Errorf("DAX error: %w", err) } for _, c := range resp.Clusters { From 1f0a118dc2511a2aad5a7d81c73da1bb8fb0a156 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:27 -0400 Subject: [PATCH 1830/2115] Fix golangci-lint 'errorlint' - deploy. --- internal/service/deploy/deployment_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/deploy/deployment_group.go b/internal/service/deploy/deployment_group.go index 97fe8f328fd1..58024bb9d13d 100644 --- a/internal/service/deploy/deployment_group.go +++ b/internal/service/deploy/deployment_group.go @@ -54,7 +54,7 @@ func resourceDeploymentGroup() *schema.Resource { group, err := findDeploymentGroupByTwoPartKey(ctx, conn, applicationName, deploymentGroupName) if err != nil { - return []*schema.ResourceData{}, fmt.Errorf("reading CodeDeploy Deployment Group (%s): %s", d.Id(), err) + return []*schema.ResourceData{}, fmt.Errorf("reading CodeDeploy Deployment Group (%s): %w", d.Id(), err) } d.SetId(aws.ToString(group.DeploymentGroupId)) From afa545b9c39aec9ecda62920f6d42295e7a634e8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:28 -0400 Subject: [PATCH 1831/2115] Fix golangci-lint 'errorlint' - dms. --- internal/service/dms/endpoint_data_source.go | 2 +- internal/service/dms/replication_config.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dms/endpoint_data_source.go b/internal/service/dms/endpoint_data_source.go index eea413087107..b1d363ab9f82 100644 --- a/internal/service/dms/endpoint_data_source.go +++ b/internal/service/dms/endpoint_data_source.go @@ -765,7 +765,7 @@ func resourceEndpointDataSourceSetState(d *schema.ResourceData, endpoint *awstyp } case engineNameS3: if err := d.Set("s3_settings", flattenS3Settings(endpoint.S3Settings)); err != nil { - return fmt.Errorf("setting s3_settings for DMS: %s", err) + return fmt.Errorf("setting s3_settings for DMS: %w", err) } default: d.Set(names.AttrDatabaseName, endpoint.DatabaseName) diff --git a/internal/service/dms/replication_config.go b/internal/service/dms/replication_config.go index 935dc4c3c0b3..a2ccff9b33ca 100644 --- a/internal/service/dms/replication_config.go +++ b/internal/service/dms/replication_config.go @@ -544,7 +544,7 @@ func startReplication(ctx context.Context, conn *dms.Client, arn string, timeout replication, err := findReplicationByReplicationConfigARN(ctx, conn, arn) if err != nil { - return fmt.Errorf("reading DMS Replication Config (%s) replication: %s", arn, err) + return fmt.Errorf("reading DMS Replication Config (%s) replication: %w", arn, err) } replicationStatus := aws.ToString(replication.Status) @@ -582,7 +582,7 @@ func stopReplication(ctx context.Context, conn *dms.Client, arn string, timeout } if err != nil { - return fmt.Errorf("reading DMS Replication Config (%s) replication: %s", arn, err) + return fmt.Errorf("reading DMS Replication Config (%s) replication: %w", arn, err) } if replicationStatus := aws.ToString(replication.Status); replicationStatus == replicationStatusStopped || replicationStatus == replicationStatusCreated || replicationStatus == replicationStatusFailed { From 2507dcbdfabcff36a1e60605e6877a34bfcb2ba7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:29 -0400 Subject: [PATCH 1832/2115] Fix golangci-lint 'errorlint' - dynamodb. --- internal/service/dynamodb/table.go | 16 ++++++++-------- internal/service/dynamodb/table_item.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index f450a7365aee..73d836174963 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -92,7 +92,7 @@ func resourceTable() *schema.Resource { func(_ context.Context, diff *schema.ResourceDiff, meta any) error { if diff.Id() != "" && (diff.HasChange("stream_enabled") || (diff.Get("stream_view_type") != "" && diff.HasChange("stream_view_type"))) { if err := diff.SetNewComputed(names.AttrStreamARN); err != nil { - return fmt.Errorf("setting stream_arn to computed: %s", err) + return fmt.Errorf("setting stream_arn to computed: %w", err) } } return nil @@ -1446,11 +1446,11 @@ func cycleStreamEnabled(ctx context.Context, conn *dynamodb.Client, id string, s _, err := conn.UpdateTable(ctx, input) if err != nil { - return fmt.Errorf("cycling stream enabled: %s", err) + return fmt.Errorf("cycling stream enabled: %w", err) } if _, err := waitTableActive(ctx, conn, id, timeout); err != nil { - return fmt.Errorf("waiting for stream cycle: %s", err) + return fmt.Errorf("waiting for stream cycle: %w", err) } input.StreamSpecification = &awstypes.StreamSpecification{ @@ -1461,11 +1461,11 @@ func cycleStreamEnabled(ctx context.Context, conn *dynamodb.Client, id string, s _, err = conn.UpdateTable(ctx, input) if err != nil { - return fmt.Errorf("cycling stream enabled: %s", err) + return fmt.Errorf("cycling stream enabled: %w", err) } if _, err := waitTableActive(ctx, conn, id, timeout); err != nil { - return fmt.Errorf("waiting for stream cycle: %s", err) + return fmt.Errorf("waiting for stream cycle: %w", err) } return nil @@ -1936,11 +1936,11 @@ func updateWarmThroughput(ctx context.Context, conn *dynamodb.Client, warmList [ } if _, err := waitTableActive(ctx, conn, tableName, timeout); err != nil { - return fmt.Errorf("waiting for warm throughput: %s", err) + return fmt.Errorf("waiting for warm throughput: %w", err) } if err := waitTableWarmThroughputActive(ctx, conn, tableName, timeout); err != nil { - return fmt.Errorf("waiting for warm throughput: %s", err) + return fmt.Errorf("waiting for warm throughput: %w", err) } return nil @@ -2388,7 +2388,7 @@ func enrichReplicas(ctx context.Context, conn *dynamodb.Client, arn, tableName s newARN, err := arnForNewRegion(arn, tfMap["region_name"].(string)) if err != nil { - return nil, fmt.Errorf("creating new-region ARN: %s", err) + return nil, fmt.Errorf("creating new-region ARN: %w", err) } tfMap[names.AttrARN] = newARN diff --git a/internal/service/dynamodb/table_item.go b/internal/service/dynamodb/table_item.go index dc6fbe90c2ff..e7d883cdcc30 100644 --- a/internal/service/dynamodb/table_item.go +++ b/internal/service/dynamodb/table_item.go @@ -63,7 +63,7 @@ func resourceTableItem() *schema.Resource { func validateTableItem(v any, k string) (ws []string, errors []error) { _, err := expandTableItemAttributes(v.(string)) if err != nil { - errors = append(errors, fmt.Errorf("Invalid format of %q: %s", k, err)) + errors = append(errors, fmt.Errorf("Invalid format of %q: %w", k, err)) } return } From cefa19a22ba8110e82f87a99a92caa01e8589b30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:29 -0400 Subject: [PATCH 1833/2115] Fix golangci-lint 'errorlint' - ec2. --- .../ebs_encryption_by_default_data_source_test.go | 7 ++++--- .../service/ec2/ebs_encryption_by_default_test.go | 4 ++-- internal/service/ec2/ebs_test.go | 15 +++++++++++++++ internal/service/ec2/ec2_ami.go | 6 ++++-- internal/service/ec2/ec2_instance.go | 12 ++++++------ .../ec2_serial_console_access_data_source_test.go | 7 ++++--- .../service/ec2/ec2_serial_console_access_test.go | 13 +++++++++---- internal/service/ec2/vpc_.go | 4 ++-- internal/service/ec2/vpc_managed_prefix_list.go | 4 ++-- internal/service/ec2/vpc_nat_gateway.go | 8 ++++---- internal/service/ec2/vpc_security_group.go | 4 ++-- internal/service/ec2/vpc_security_group_test.go | 2 +- 12 files changed, 55 insertions(+), 31 deletions(-) diff --git a/internal/service/ec2/ebs_encryption_by_default_data_source_test.go b/internal/service/ec2/ebs_encryption_by_default_data_source_test.go index 00c2c8937e85..d56a4861a1f1 100644 --- a/internal/service/ec2/ebs_encryption_by_default_data_source_test.go +++ b/internal/service/ec2/ebs_encryption_by_default_data_source_test.go @@ -18,9 +18,10 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestAccEC2EBSEncryptionByDefaultDataSource_basic(t *testing.T) { +func testAccEBSEncryptionByDefaultDataSource_basic(t *testing.T) { ctx := acctest.Context(t) - resource.ParallelTest(t, resource.TestCase{ + + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -51,7 +52,7 @@ func testAccCheckEBSEncryptionByDefaultDataSource(ctx context.Context, n string) input := ec2.GetEbsEncryptionByDefaultInput{} actual, err := conn.GetEbsEncryptionByDefault(ctx, &input) if err != nil { - return fmt.Errorf("Error reading default EBS encryption toggle: %q", err) + return err } attr, _ := strconv.ParseBool(rs.Primary.Attributes[names.AttrEnabled]) diff --git a/internal/service/ec2/ebs_encryption_by_default_test.go b/internal/service/ec2/ebs_encryption_by_default_test.go index 1bbebbb5d5b4..fd7ad27dab06 100644 --- a/internal/service/ec2/ebs_encryption_by_default_test.go +++ b/internal/service/ec2/ebs_encryption_by_default_test.go @@ -17,11 +17,11 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestAccEC2EBSEncryptionByDefault_basic(t *testing.T) { +func testAccEBSEncryptionByDefault_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_ebs_encryption_by_default.test" - resource.ParallelTest(t, resource.TestCase{ + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/ec2/ebs_test.go b/internal/service/ec2/ebs_test.go index 20a9edfabc33..084190d89803 100644 --- a/internal/service/ec2/ebs_test.go +++ b/internal/service/ec2/ebs_test.go @@ -23,3 +23,18 @@ func TestAccEC2EBSDefaultKMSKey_serial(t *testing.T) { acctest.RunSerialTests2Levels(t, testCases, 0) } + +func TestAccEC2EBSEncryptionByDefault_serial(t *testing.T) { + t.Parallel() + + testCases := map[string]map[string]func(t *testing.T){ + "Resource": { + acctest.CtBasic: testAccEBSEncryptionByDefault_basic, + }, + "DataSource": { + acctest.CtBasic: testAccEBSEncryptionByDefaultDataSource_basic, + }, + } + + acctest.RunSerialTests2Levels(t, testCases, 0) +} diff --git a/internal/service/ec2/ec2_ami.go b/internal/service/ec2/ec2_ami.go index 071c282ba618..c77b32b0a352 100644 --- a/internal/service/ec2/ec2_ami.go +++ b/internal/service/ec2/ec2_ami.go @@ -564,13 +564,15 @@ func updateDescription(ctx context.Context, conn *ec2.Client, id string, descrip } _, err := conn.ModifyImageAttribute(ctx, &input) + if err != nil { - return fmt.Errorf("updating description: %s", err) + return fmt.Errorf("updating description: %w", err) } err = waitImageDescriptionUpdated(ctx, conn, id, description) + if err != nil { - return fmt.Errorf("updating description: waiting for completion: %s", err) + return fmt.Errorf("updating description: waiting for completion: %w", err) } return nil diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index e55dc7bb9a80..120200b94c9c 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -2325,7 +2325,7 @@ func disableInstanceAPIStop(ctx context.Context, conn *ec2.Client, id string, di } if err != nil { - return fmt.Errorf("modifying EC2 Instance (%s) DisableApiStop attribute: %s", id, err) + return fmt.Errorf("modifying EC2 Instance (%s) DisableApiStop attribute: %w", id, err) } return nil @@ -2347,7 +2347,7 @@ func disableInstanceAPITermination(ctx context.Context, conn *ec2.Client, id str } if err != nil { - return fmt.Errorf("modifying EC2 Instance (%s) DisableApiTermination attribute: %s", id, err) + return fmt.Errorf("modifying EC2 Instance (%s) DisableApiTermination attribute: %w", id, err) } return nil @@ -2570,7 +2570,7 @@ func associateInstanceProfile(ctx context.Context, d *schema.ResourceData, conn }) if err != nil { - return fmt.Errorf("associating instance profile: %s", err) + return fmt.Errorf("associating instance profile: %w", err) } return nil @@ -2888,7 +2888,7 @@ func readBlockDeviceMappingsFromConfig(ctx context.Context, d *schema.ResourceDa func readVolumeTags(ctx context.Context, conn *ec2.Client, instanceId string) ([]awstypes.Tag, error) { volIDs, err := getInstanceVolIDs(ctx, conn, instanceId) if err != nil { - return nil, fmt.Errorf("getting tags for volumes (%s): %s", volIDs, err) + return nil, fmt.Errorf("getting tags for volumes (%s): %w", volIDs, err) } input := ec2.DescribeTagsInput{ @@ -2898,7 +2898,7 @@ func readVolumeTags(ctx context.Context, conn *ec2.Client, instanceId string) ([ } resp, err := conn.DescribeTags(ctx, &input) if err != nil { - return nil, fmt.Errorf("getting tags for volumes (%s): %s", volIDs, err) + return nil, fmt.Errorf("getting tags for volumes (%s): %w", volIDs, err) } return tagsFromTagDescriptions(resp.Tags), nil @@ -3512,7 +3512,7 @@ func getInstanceVolIDs(ctx context.Context, conn *ec2.Client, instanceId string) } resp, err := conn.DescribeVolumes(ctx, &input) if err != nil { - return nil, fmt.Errorf("getting volumes: %s", err) + return nil, fmt.Errorf("getting volumes: %w", err) } for _, v := range resp.Volumes { diff --git a/internal/service/ec2/ec2_serial_console_access_data_source_test.go b/internal/service/ec2/ec2_serial_console_access_data_source_test.go index 55e6887434ed..59ca7cd25cdc 100644 --- a/internal/service/ec2/ec2_serial_console_access_data_source_test.go +++ b/internal/service/ec2/ec2_serial_console_access_data_source_test.go @@ -18,9 +18,10 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestAccEC2SerialConsoleAccessDataSource_basic(t *testing.T) { +func testAccEC2SerialConsoleAccessDataSource_basic(t *testing.T) { ctx := acctest.Context(t) - resource.ParallelTest(t, resource.TestCase{ + + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -51,7 +52,7 @@ func testAccCheckSerialConsoleAccessDataSource(ctx context.Context, n string) re input := ec2.GetSerialConsoleAccessStatusInput{} actual, err := conn.GetSerialConsoleAccessStatus(ctx, &input) if err != nil { - return fmt.Errorf("Error reading serial console access toggle: %q", err) + return err } attr, _ := strconv.ParseBool(rs.Primary.Attributes[names.AttrEnabled]) diff --git a/internal/service/ec2/ec2_serial_console_access_test.go b/internal/service/ec2/ec2_serial_console_access_test.go index c25d147df9a2..4e50814d5950 100644 --- a/internal/service/ec2/ec2_serial_console_access_test.go +++ b/internal/service/ec2/ec2_serial_console_access_test.go @@ -20,12 +20,17 @@ import ( func TestAccEC2SerialConsoleAccess_serial(t *testing.T) { t.Parallel() - testCases := map[string]func(t *testing.T){ - acctest.CtBasic: testAccEC2SerialConsoleAccess_basic, - "Identity": testAccEC2SerialConsoleAccess_IdentitySerial, + testCases := map[string]map[string]func(t *testing.T){ + "Resource": { + acctest.CtBasic: testAccEC2SerialConsoleAccess_basic, + "Identity": testAccEC2SerialConsoleAccess_IdentitySerial, + }, + "DataSource": { + acctest.CtBasic: testAccEC2SerialConsoleAccessDataSource_basic, + }, } - acctest.RunSerialTests1Level(t, testCases, 0) + acctest.RunSerialTests2Levels(t, testCases, 0) } func testAccEC2SerialConsoleAccess_basic(t *testing.T) { diff --git a/internal/service/ec2/vpc_.go b/internal/service/ec2/vpc_.go index ce177ab42d1e..71427eb3f8fa 100644 --- a/internal/service/ec2/vpc_.go +++ b/internal/service/ec2/vpc_.go @@ -503,10 +503,10 @@ func resourceVPCImport(ctx context.Context, d *schema.ResourceData, meta any) ([ func resourceVPCCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v any) error { if diff.HasChange("assign_generated_ipv6_cidr_block") { if err := diff.SetNewComputed("ipv6_association_id"); err != nil { - return fmt.Errorf("setting ipv6_association_id to computed: %s", err) + return fmt.Errorf("setting ipv6_association_id to computed: %w", err) } if err := diff.SetNewComputed("ipv6_cidr_block"); err != nil { - return fmt.Errorf("setting ipv6_cidr_block to computed: %s", err) + return fmt.Errorf("setting ipv6_cidr_block to computed: %w", err) } } diff --git a/internal/service/ec2/vpc_managed_prefix_list.go b/internal/service/ec2/vpc_managed_prefix_list.go index aea314e1906c..0fbec311b375 100644 --- a/internal/service/ec2/vpc_managed_prefix_list.go +++ b/internal/service/ec2/vpc_managed_prefix_list.go @@ -335,13 +335,13 @@ func updateMaxEntry(ctx context.Context, conn *ec2.Client, id string, maxEntries _, err := conn.ModifyManagedPrefixList(ctx, &input) if err != nil { - return fmt.Errorf("updating MaxEntries for EC2 Managed Prefix List (%s): %s", id, err) + return fmt.Errorf("updating MaxEntries for EC2 Managed Prefix List (%s): %w", id, err) } _, err = waitManagedPrefixListModified(ctx, conn, id) if err != nil { - return fmt.Errorf("waiting for EC2 Managed Prefix List (%s) MaxEntries update: %s", id, err) + return fmt.Errorf("waiting for EC2 Managed Prefix List (%s) MaxEntries update: %w", id, err) } return nil diff --git a/internal/service/ec2/vpc_nat_gateway.go b/internal/service/ec2/vpc_nat_gateway.go index ac6d6328ae3a..dc697d72cbef 100644 --- a/internal/service/ec2/vpc_nat_gateway.go +++ b/internal/service/ec2/vpc_nat_gateway.go @@ -369,14 +369,14 @@ func resourceNATGatewayCustomizeDiff(ctx context.Context, diff *schema.ResourceD if diff.Id() != "" && diff.HasChange("secondary_private_ip_address_count") { if v := diff.GetRawConfig().GetAttr("secondary_private_ip_address_count"); v.IsKnown() && !v.IsNull() { if err := diff.ForceNew("secondary_private_ip_address_count"); err != nil { - return fmt.Errorf("setting secondary_private_ip_address_count to ForceNew: %s", err) + return fmt.Errorf("setting secondary_private_ip_address_count to ForceNew: %w", err) } } } if diff.Id() != "" && diff.HasChange("secondary_private_ip_addresses") { if err := diff.SetNewComputed("secondary_private_ip_address_count"); err != nil { - return fmt.Errorf("setting secondary_private_ip_address_count to computed: %s", err) + return fmt.Errorf("setting secondary_private_ip_address_count to Computed: %w", err) } } case awstypes.ConnectivityTypePublic: @@ -387,12 +387,12 @@ func resourceNATGatewayCustomizeDiff(ctx context.Context, diff *schema.ResourceD if diff.Id() != "" { if v := diff.GetRawConfig().GetAttr("secondary_allocation_ids"); diff.HasChange("secondary_allocation_ids") || !v.IsWhollyKnown() { if err := diff.SetNewComputed("secondary_private_ip_address_count"); err != nil { - return fmt.Errorf("setting secondary_private_ip_address_count to computed: %s", err) + return fmt.Errorf("setting secondary_private_ip_address_count to Computed: %w", err) } if v := diff.GetRawConfig().GetAttr("secondary_private_ip_addresses"); !v.IsKnown() || v.IsNull() { if err := diff.SetNewComputed("secondary_private_ip_addresses"); err != nil { - return fmt.Errorf("setting secondary_private_ip_addresses to computed: %s", err) + return fmt.Errorf("setting secondary_private_ip_addresses to Computed: %w", err) } } } diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go index 5397965c94e3..b335b96d4476 100644 --- a/internal/service/ec2/vpc_security_group.go +++ b/internal/service/ec2/vpc_security_group.go @@ -431,7 +431,7 @@ func forceRevokeSecurityGroupRules(ctx context.Context, conn *ec2.Client, id str rules, err := rulesInSGsTouchingThis(ctx, conn, id, searchAll) if err != nil { - return fmt.Errorf("describing security group rules: %s", err) + return fmt.Errorf("describing security group rules: %w", err) } for _, rule := range rules { @@ -495,7 +495,7 @@ func rulesInSGsTouchingThis(ctx context.Context, conn *ec2.Client, id string, se } else { sgs, err := relatedSGs(ctx, conn, id) if err != nil { - return nil, fmt.Errorf("describing security group rules: %s", err) + return nil, fmt.Errorf("describing security group rules: %w", err) } input = &ec2.DescribeSecurityGroupRulesInput{ diff --git a/internal/service/ec2/vpc_security_group_test.go b/internal/service/ec2/vpc_security_group_test.go index e3019869de7d..cf36fb337cc6 100644 --- a/internal/service/ec2/vpc_security_group_test.go +++ b/internal/service/ec2/vpc_security_group_test.go @@ -2862,7 +2862,7 @@ func testAccCheckSecurityGroupRuleLimit(n string, v *int) resource.TestCheckFunc limit, err := strconv.Atoi(rs.Primary.Attributes[names.AttrValue]) if err != nil { - return fmt.Errorf("converting value to int: %s", err) + return fmt.Errorf("converting value to int: %w", err) } *v = limit From 9f880ec294160c1938a4e309761f68812a187ca7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:29 -0400 Subject: [PATCH 1834/2115] Fix golangci-lint 'errorlint' - ecrpublic. --- internal/service/ecrpublic/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecrpublic/repository.go b/internal/service/ecrpublic/repository.go index f46c87e075ff..b76a38103662 100644 --- a/internal/service/ecrpublic/repository.go +++ b/internal/service/ecrpublic/repository.go @@ -382,7 +382,7 @@ func resourceRepositoryUpdateCatalogData(ctx context.Context, conn *ecrpublic.Cl _, err := conn.PutRepositoryCatalogData(ctx, &input) if err != nil { - return fmt.Errorf("updating catalog data for repository(%s): %s", d.Id(), err) + return fmt.Errorf("updating catalog data for repository (%s): %w", d.Id(), err) } } } From 90b9a996a206fc1237e37048e52f910d7ca0dcae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1835/2115] Fix golangci-lint 'errorlint' - ecs. --- internal/service/ecs/task_definition.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecs/task_definition.go b/internal/service/ecs/task_definition.go index 10e62b6f803b..03914eaa5fca 100644 --- a/internal/service/ecs/task_definition.go +++ b/internal/service/ecs/task_definition.go @@ -796,7 +796,7 @@ func findTaskDefinitionByFamilyOrARN(ctx context.Context, conn *ecs.Client, fami func validTaskDefinitionContainerDefinitions(v any, k string) (ws []string, errors []error) { _, err := expandContainerDefinitions(v.(string)) if err != nil { - errors = append(errors, fmt.Errorf("ECS Task Definition container_definitions is invalid: %s", err)) + errors = append(errors, fmt.Errorf("ECS Task Definition container_definitions is invalid: %w", err)) } return } From 7f1c32611fde2301d75a339627cd731dee36c67a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1836/2115] Fix golangci-lint 'errorlint' - eks. --- internal/service/eks/cluster_auth_data_source_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/eks/cluster_auth_data_source_test.go b/internal/service/eks/cluster_auth_data_source_test.go index 4a60fa0bef34..b6ebc35f534f 100644 --- a/internal/service/eks/cluster_auth_data_source_test.go +++ b/internal/service/eks/cluster_auth_data_source_test.go @@ -51,7 +51,7 @@ func testAccCheckClusterAuthToken(n string) resource.TestCheckFunc { verifier := tfeks.NewVerifier(name) identity, err := verifier.Verify(tok) if err != nil { - return fmt.Errorf("Error verifying token for cluster %q: %v", name, err) + return fmt.Errorf("Error verifying token for cluster %q: %w", name, err) } if identity.ARN == "" { return fmt.Errorf("Unexpected blank ARN for token identity") From f7501a40b960a63d36dd3bf91ead0843941034bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1837/2115] Fix golangci-lint 'errorlint' - elasticache. --- internal/service/elasticache/parameter_group.go | 2 +- internal/service/elasticache/replication_group.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/elasticache/parameter_group.go b/internal/service/elasticache/parameter_group.go index 36049f5fe438..4e6a87148dca 100644 --- a/internal/service/elasticache/parameter_group.go +++ b/internal/service/elasticache/parameter_group.go @@ -303,7 +303,7 @@ func deleteParameterGroup(ctx context.Context, conn *elasticache.Client, name st } if err != nil { - return fmt.Errorf("deleting ElastiCache Parameter Group (%s): %s", name, err) + return fmt.Errorf("deleting ElastiCache Parameter Group (%s): %w", name, err) } return err diff --git a/internal/service/elasticache/replication_group.go b/internal/service/elasticache/replication_group.go index c305af347cd1..cf3df01e5a42 100644 --- a/internal/service/elasticache/replication_group.go +++ b/internal/service/elasticache/replication_group.go @@ -1006,7 +1006,7 @@ func resourceReplicationGroupUpdate(ctx context.Context, d *schema.ResourceData, } if err != nil { - return fmt.Errorf("modifying ElastiCache Replication Group (%s): %s", d.Id(), err) + return fmt.Errorf("modifying ElastiCache Replication Group (%s): %w", d.Id(), err) } return nil }) @@ -1028,7 +1028,7 @@ func resourceReplicationGroupUpdate(ctx context.Context, d *schema.ResourceData, } if err != nil { - return fmt.Errorf("modifying ElastiCache Replication Group (%s) authentication: %s", d.Id(), err) + return fmt.Errorf("modifying ElastiCache Replication Group (%s) authentication: %w", d.Id(), err) } return nil }) From fd27e28a5ef895b46d7401391c3c721379d31a30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1838/2115] Fix golangci-lint 'errorlint' - elasticbeanstalk. --- internal/service/elasticbeanstalk/environment_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticbeanstalk/environment_test.go b/internal/service/elasticbeanstalk/environment_test.go index 6e6a08d77c2f..d822e050f92b 100644 --- a/internal/service/elasticbeanstalk/environment_test.go +++ b/internal/service/elasticbeanstalk/environment_test.go @@ -561,7 +561,7 @@ func testAccVerifyConfig(ctx context.Context, env *awstypes.EnvironmentDescripti }) if err != nil { - return fmt.Errorf("Error describing config settings in testAccVerifyConfig: %s", err) + return fmt.Errorf("Error describing config settings in testAccVerifyConfig: %w", err) } // should only be 1 environment From 65b0ed1053aba033303f8efb0123b2cc18fd7751 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1839/2115] Fix golangci-lint 'errorlint' - elasticsearch. --- internal/service/elasticsearch/acc_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticsearch/acc_test.go b/internal/service/elasticsearch/acc_test.go index 2424584bdaf1..0825803c6af3 100644 --- a/internal/service/elasticsearch/acc_test.go +++ b/internal/service/elasticsearch/acc_test.go @@ -29,7 +29,7 @@ func testAccCheckPolicyMatch(resource, attr, expectedPolicy string) resource.Tes areEquivalent, err := awspolicy.PoliciesAreEquivalent(given, expectedPolicy) if err != nil { - return fmt.Errorf("Comparing AWS Policies failed: %s", err) + return fmt.Errorf("Comparing AWS Policies failed: %w", err) } if !areEquivalent { From b43d9099670c10d161aa2f685d71535d25bfc7de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:30 -0400 Subject: [PATCH 1840/2115] Fix golangci-lint 'errorlint' - elastictranscoder. --- internal/service/elastictranscoder/preset_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elastictranscoder/preset_test.go b/internal/service/elastictranscoder/preset_test.go index 627aa94b6a95..d2de67ee731a 100644 --- a/internal/service/elastictranscoder/preset_test.go +++ b/internal/service/elastictranscoder/preset_test.go @@ -312,7 +312,7 @@ func testAccCheckPresetDestroy(ctx context.Context) resource.TestCheckFunc { } if !errs.IsA[*awstypes.ResourceNotFoundException](err) { - return fmt.Errorf("unexpected error: %s", err) + return fmt.Errorf("unexpected error: %w", err) } } return nil From 214932753510a51ab7828d893ba9e14d3c3b6672 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:32 -0400 Subject: [PATCH 1841/2115] Fix golangci-lint 'errorlint' - glue. --- internal/service/glue/crawler.go | 4 ++-- internal/service/glue/crawler_test.go | 4 ++-- internal/service/glue/resource_policy_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index aa1208c50885..f17502ef3deb 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -696,7 +696,7 @@ func createCrawlerInput(ctx context.Context, d *schema.ResourceData, crawlerName if v, ok := d.GetOk(names.AttrConfiguration); ok { configuration, err := structure.NormalizeJsonString(v) if err != nil { - return nil, fmt.Errorf("configuration contains an invalid JSON: %v", err) + return nil, fmt.Errorf("configuration contains an invalid JSON: %w", err) } crawlerInput.Configuration = aws.String(configuration) } @@ -748,7 +748,7 @@ func updateCrawlerInput(d *schema.ResourceData, crawlerName string) (*glue.Updat if v, ok := d.GetOk(names.AttrConfiguration); ok { configuration, err := structure.NormalizeJsonString(v) if err != nil { - return nil, fmt.Errorf("Configuration contains an invalid JSON: %v", err) + return nil, fmt.Errorf("Configuration contains an invalid JSON: %w", err) } crawlerInput.Configuration = aws.String(configuration) } else { diff --git a/internal/service/glue/crawler_test.go b/internal/service/glue/crawler_test.go index b319da2ddfe1..67b370d889ae 100644 --- a/internal/service/glue/crawler_test.go +++ b/internal/service/glue/crawler_test.go @@ -1779,12 +1779,12 @@ func testAccCheckCrawlerConfiguration(crawler *awstypes.Crawler, acctestJSON str apiJSON := aws.ToString(crawler.Configuration) apiJSONBuffer := bytes.NewBufferString("") if err := json.Compact(apiJSONBuffer, []byte(apiJSON)); err != nil { - return fmt.Errorf("unable to compact API configuration JSON: %s", err) + return fmt.Errorf("unable to compact API configuration JSON: %w", err) } acctestJSONBuffer := bytes.NewBufferString("") if err := json.Compact(acctestJSONBuffer, []byte(acctestJSON)); err != nil { - return fmt.Errorf("unable to compact acceptance test configuration JSON: %s", err) + return fmt.Errorf("unable to compact acceptance test configuration JSON: %w", err) } if !verify.JSONBytesEqual(apiJSONBuffer.Bytes(), acctestJSONBuffer.Bytes()) { diff --git a/internal/service/glue/resource_policy_test.go b/internal/service/glue/resource_policy_test.go index b20e44f8afb6..dddbce03041b 100644 --- a/internal/service/glue/resource_policy_test.go +++ b/internal/service/glue/resource_policy_test.go @@ -187,7 +187,7 @@ func testAccResourcePolicy(ctx context.Context, n string, action string) resourc actualPolicyText, expectedPolicy := aws.ToString(output.PolicyInJson), testAccNewResourcePolicy(ctx, action) equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicy) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", From 9044269671bb6902dd083d2f5e684d4abb61e8b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:33 -0400 Subject: [PATCH 1842/2115] Fix golangci-lint 'errorlint' - guardduty. --- internal/service/guardduty/member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/guardduty/member.go b/internal/service/guardduty/member.go index c045a671a875..5e26db3560e1 100644 --- a/internal/service/guardduty/member.go +++ b/internal/service/guardduty/member.go @@ -258,7 +258,7 @@ func inviteMemberWaiter(ctx context.Context, accountID, detectorID string, timeo out, err = conn.GetMembers(ctx, &input) if err != nil { - return tfresource.NonRetryableError(fmt.Errorf("reading GuardDuty Member %q: %s", accountID, err)) + return tfresource.NonRetryableError(fmt.Errorf("reading GuardDuty Member %q: %w", accountID, err)) } retryable, err := memberInvited(out, accountID) From a9e367e15614ad3e80531ea844327b74e5be3b2b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:33 -0400 Subject: [PATCH 1843/2115] Fix golangci-lint 'errorlint' - iam. --- internal/service/iam/access_key_test.go | 4 ++-- internal/service/iam/user.go | 8 +++---- .../service/iam/user_group_membership_test.go | 2 +- .../service/iam/user_login_profile_test.go | 6 ++--- internal/service/iam/user_test.go | 24 +++++++++---------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/internal/service/iam/access_key_test.go b/internal/service/iam/access_key_test.go index c44c5bda98eb..c62fae40d8cf 100644 --- a/internal/service/iam/access_key_test.go +++ b/internal/service/iam/access_key_test.go @@ -242,11 +242,11 @@ func testDecryptSecretKeyAndTest(nAccessKey, key string) resource.TestCheckFunc // have it. We can verify that decrypting it does not error _, err := pgpkeys.DecryptBytes(secret, key) if err != nil { - return fmt.Errorf("Error decrypting secret: %s", err) + return fmt.Errorf("Error decrypting secret: %w", err) } _, err = pgpkeys.DecryptBytes(password, key) if err != nil { - return fmt.Errorf("Error decrypting password: %s", err) + return fmt.Errorf("Error decrypting password: %w", err) } return nil diff --git a/internal/service/iam/user.go b/internal/service/iam/user.go index 12b1b7da2cb6..d8c42a5c55f7 100644 --- a/internal/service/iam/user.go +++ b/internal/service/iam/user.go @@ -543,7 +543,7 @@ func deleteUserPolicies(ctx context.Context, conn *iam.Client, username string) } if err != nil { - return fmt.Errorf("listing/deleting IAM User (%s) inline policies: %s", username, err) + return fmt.Errorf("listing/deleting IAM User (%s) inline policies: %w", username, err) } for _, name := range output.PolicyNames { @@ -558,7 +558,7 @@ func deleteUserPolicies(ctx context.Context, conn *iam.Client, username string) if errs.IsA[*awstypes.NoSuchEntityException](err) { continue } - return fmt.Errorf("deleting IAM User (%s) inline policies: %s", username, err) + return fmt.Errorf("deleting IAM User (%s) inline policies: %w", username, err) } } @@ -577,7 +577,7 @@ func detachUserPolicies(ctx context.Context, conn *iam.Client, username string) } if err != nil { - return fmt.Errorf("listing/detaching IAM User (%s) attached policy: %s", username, err) + return fmt.Errorf("listing/detaching IAM User (%s) attached policy: %w", username, err) } for _, policy := range output.AttachedPolicies { @@ -586,7 +586,7 @@ func detachUserPolicies(ctx context.Context, conn *iam.Client, username string) log.Printf("[DEBUG] Detaching IAM User (%s) attached policy: %s", username, policyARN) if err := detachPolicyFromUser(ctx, conn, username, policyARN); err != nil { - return fmt.Errorf("detaching IAM User (%s) attached policy: %s", username, err) + return fmt.Errorf("detaching IAM User (%s) attached policy: %w", username, err) } } diff --git a/internal/service/iam/user_group_membership_test.go b/internal/service/iam/user_group_membership_test.go index c1902b760405..044e626bc31d 100644 --- a/internal/service/iam/user_group_membership_test.go +++ b/internal/service/iam/user_group_membership_test.go @@ -159,7 +159,7 @@ func testAccUserGroupMembershipCheckGroupListForUser(ctx context.Context, userNa UserName: &userName, }) if err != nil { - return fmt.Errorf("Error validing user group list for %s: %s", userName, err) + return fmt.Errorf("Error validing user group list for %s: %w", userName, err) } // check required groups diff --git a/internal/service/iam/user_login_profile_test.go b/internal/service/iam/user_login_profile_test.go index df93026585b1..5ccae2d0c08d 100644 --- a/internal/service/iam/user_login_profile_test.go +++ b/internal/service/iam/user_login_profile_test.go @@ -382,7 +382,7 @@ func testDecryptPasswordAndTest(ctx context.Context, nProfile, nAccessKey, key s decryptedPassword, err := pgpkeys.DecryptBytes(password, key) if err != nil { - return fmt.Errorf("decrypting password: %s", err) + return fmt.Errorf("decrypting password: %w", err) } iamAsCreatedUserSession, err := config.LoadDefaultConfig(ctx, @@ -390,7 +390,7 @@ func testDecryptPasswordAndTest(ctx context.Context, nProfile, nAccessKey, key s config.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(accessKeyId, secretAccessKey, "")), ) if err != nil { - return fmt.Errorf("creating session: %s", err) + return fmt.Errorf("creating session: %w", err) } return tfresource.Retry(ctx, 2*time.Minute, func(ctx context.Context) *tfresource.RetryError { @@ -415,7 +415,7 @@ func testDecryptPasswordAndTest(ctx context.Context, nProfile, nAccessKey, key s return tfresource.RetryableError(err) } - return tfresource.NonRetryableError(fmt.Errorf("changing decrypted password: %s", err)) + return tfresource.NonRetryableError(fmt.Errorf("changing decrypted password: %w", err)) } return nil diff --git a/internal/service/iam/user_test.go b/internal/service/iam/user_test.go index ff3b106c8062..8bcd410949b3 100644 --- a/internal/service/iam/user_test.go +++ b/internal/service/iam/user_test.go @@ -612,7 +612,7 @@ func testAccCheckUserCreatesAccessKey(ctx context.Context, user *awstypes.User) } if _, err := conn.CreateAccessKey(ctx, input); err != nil { - return fmt.Errorf("error creating IAM User (%s) Access Key: %s", aws.ToString(user.UserName), err) + return fmt.Errorf("error creating IAM User (%s) Access Key: %w", aws.ToString(user.UserName), err) } return nil @@ -632,7 +632,7 @@ func testAccCheckUserCreatesLoginProfile(ctx context.Context, user *awstypes.Use } if _, err := conn.CreateLoginProfile(ctx, input); err != nil { - return fmt.Errorf("error creating IAM User (%s) Login Profile: %s", aws.ToString(user.UserName), err) + return fmt.Errorf("error creating IAM User (%s) Login Profile: %w", aws.ToString(user.UserName), err) } return nil @@ -650,17 +650,17 @@ func testAccCheckUserCreatesMFADevice(ctx context.Context, user *awstypes.User) createVirtualMFADeviceOutput, err := conn.CreateVirtualMFADevice(ctx, createVirtualMFADeviceInput) if err != nil { - return fmt.Errorf("error creating IAM User (%s) Virtual MFA Device: %s", aws.ToString(user.UserName), err) + return fmt.Errorf("error creating IAM User (%s) Virtual MFA Device: %w", aws.ToString(user.UserName), err) } secret := string(createVirtualMFADeviceOutput.VirtualMFADevice.Base32StringSeed) authenticationCode1, err := totp.GenerateCode(secret, time.Now().Add(-30*time.Second)) if err != nil { - return fmt.Errorf("error generating Virtual MFA Device authentication code 1: %s", err) + return fmt.Errorf("error generating Virtual MFA Device authentication code 1: %w", err) } authenticationCode2, err := totp.GenerateCode(secret, time.Now()) if err != nil { - return fmt.Errorf("error generating Virtual MFA Device authentication code 2: %s", err) + return fmt.Errorf("error generating Virtual MFA Device authentication code 2: %w", err) } enableVirtualMFADeviceInput := &iam.EnableMFADeviceInput{ @@ -671,7 +671,7 @@ func testAccCheckUserCreatesMFADevice(ctx context.Context, user *awstypes.User) } if _, err := conn.EnableMFADevice(ctx, enableVirtualMFADeviceInput); err != nil { - return fmt.Errorf("error enabling IAM User (%s) Virtual MFA Device: %s", aws.ToString(user.UserName), err) + return fmt.Errorf("error enabling IAM User (%s) Virtual MFA Device: %w", aws.ToString(user.UserName), err) } return nil @@ -734,7 +734,7 @@ func testAccCheckUserUploadSigningCertificate(ctx context.Context, t *testing.T, } if _, err := conn.UploadSigningCertificate(ctx, input); err != nil { - return fmt.Errorf("error uploading IAM User (%s) Signing Certificate : %s", aws.ToString(user.UserName), err) + return fmt.Errorf("error uploading IAM User (%s) Signing Certificate : %w", aws.ToString(user.UserName), err) } return nil @@ -754,18 +754,18 @@ func testAccCheckUserAttachPolicy(ctx context.Context, user *awstypes.User) reso output, err := conn.CreatePolicy(ctx, input) if err != nil { - return fmt.Errorf("externally creating IAM Policy (%s): %s", aws.ToString(user.UserName), err) + return fmt.Errorf("externally creating IAM Policy (%s): %w", aws.ToString(user.UserName), err) } _, err = tfresource.RetryWhenNewResourceNotFound(ctx, 2*time.Minute, func(ctx context.Context) (any, error) { return tfiam.FindPolicyByARN(ctx, conn, aws.ToString(output.Policy.Arn)) }, true) if err != nil { - return fmt.Errorf("waiting for external creation of IAM Policy (%s): %s", aws.ToString(user.UserName), err) + return fmt.Errorf("waiting for external creation of IAM Policy (%s): %w", aws.ToString(user.UserName), err) } if err := tfiam.AttachPolicyToUser(ctx, conn, aws.ToString(user.UserName), aws.ToString(output.Policy.Arn)); err != nil { - return fmt.Errorf("externally attaching IAM User (%s) to policy (%s): %s", aws.ToString(user.UserName), aws.ToString(output.Policy.Arn), err) + return fmt.Errorf("externally attaching IAM User (%s) to policy (%s): %w", aws.ToString(user.UserName), aws.ToString(output.Policy.Arn), err) } return nil @@ -786,14 +786,14 @@ func testAccCheckUserInlinePolicy(ctx context.Context, user *awstypes.User) reso _, err := conn.PutUserPolicy(ctx, input) if err != nil { - return fmt.Errorf("externally putting IAM User (%s) policy: %s", aws.ToString(user.UserName), err) + return fmt.Errorf("externally putting IAM User (%s) policy: %w", aws.ToString(user.UserName), err) } _, err = tfresource.RetryWhenNotFound(ctx, 2*time.Minute, func(ctx context.Context) (any, error) { return tfiam.FindUserPolicyByTwoPartKey(ctx, conn, aws.ToString(user.UserName), aws.ToString(user.UserName)) }) if err != nil { - return fmt.Errorf("waiting for external creation of inline IAM User Policy (%s): %s", aws.ToString(user.UserName), err) + return fmt.Errorf("waiting for external creation of inline IAM User Policy (%s): %w", aws.ToString(user.UserName), err) } return nil From 63f126ebdd18a7ff2c78c4e1f30923afdd73a188 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:34 -0400 Subject: [PATCH 1844/2115] Fix golangci-lint 'errorlint' - iot. --- internal/service/iot/thing_principal_attachment_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/iot/thing_principal_attachment_test.go b/internal/service/iot/thing_principal_attachment_test.go index f93f73d51ac6..45632a98df3f 100644 --- a/internal/service/iot/thing_principal_attachment_test.go +++ b/internal/service/iot/thing_principal_attachment_test.go @@ -208,7 +208,7 @@ func testAccCheckThingPrincipalAttachmentStatus(ctx context.Context, thingName s return nil } } else if err != nil { - return fmt.Errorf("Error: cannot describe thing %s: %s", thingName, err) + return fmt.Errorf("Error: cannot describe thing %s: %w", thingName, err) } else if !exists { return fmt.Errorf("Error: Thing (%s) does not exist, but expected to be", thingName) } @@ -218,7 +218,7 @@ func testAccCheckThingPrincipalAttachmentStatus(ctx context.Context, thingName s }) if err != nil { - return fmt.Errorf("Error: Cannot list thing (%s) principals: %s", thingName, err) + return fmt.Errorf("Error: Cannot list thing (%s) principals: %w", thingName, err) } if len(res.Principals) != len(principalARNs) { From 5ead37401ab6165d3f333d7dcdaa866b92e7dc95 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:35 -0400 Subject: [PATCH 1845/2115] Fix golangci-lint 'errorlint' - kendra. --- internal/service/kendra/data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index f6d743c55b77..c72b37f79f17 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -976,7 +976,7 @@ func expandTemplateConfiguration(tfList []any) (*types.TemplateConfiguration, er var body any err := json.Unmarshal([]byte(tfMap["template"].(string)), &body) if err != nil { - return nil, fmt.Errorf("decoding JSON: %s", err) + return nil, fmt.Errorf("decoding JSON: %w", err) } return &types.TemplateConfiguration{ From 5d25283b1d3d0c239d1291bdb228bde7ac9c11d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:36 -0400 Subject: [PATCH 1846/2115] Fix golangci-lint 'errorlint' - kms. --- internal/service/kms/external_key_test.go | 2 +- internal/service/kms/key.go | 2 +- internal/service/kms/key_test.go | 2 +- internal/service/kms/validate.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index cd09a6c9af8f..d9746162dcb0 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -558,7 +558,7 @@ func testAccCheckExternalKeyHasPolicy(ctx context.Context, name string, expected equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", diff --git a/internal/service/kms/key.go b/internal/service/kms/key.go index a67d0d5f2edb..bfb29f69b1c1 100644 --- a/internal/service/kms/key.go +++ b/internal/service/kms/key.go @@ -444,7 +444,7 @@ func findDefaultKeyARNForService(ctx context.Context, conn *kms.Client, service, }) if err != nil { - return "", fmt.Errorf("reading KMS Key (%s): %s", keyID, err) + return "", fmt.Errorf("reading KMS Key (%s): %w", keyID, err) } return aws.ToString(key.Arn), nil diff --git a/internal/service/kms/key_test.go b/internal/service/kms/key_test.go index ea95ff8a4cc6..65755f40cd49 100644 --- a/internal/service/kms/key_test.go +++ b/internal/service/kms/key_test.go @@ -720,7 +720,7 @@ func testAccCheckKeyHasPolicy(ctx context.Context, name string, expectedPolicyTe equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", diff --git a/internal/service/kms/validate.go b/internal/service/kms/validate.go index 059a584b3711..d909185dd515 100644 --- a/internal/service/kms/validate.go +++ b/internal/service/kms/validate.go @@ -87,7 +87,7 @@ func validateKeyARN(v any, k string) (ws []string, errors []error) { } if _, err := arn.Parse(value); err != nil { - errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %s", k, value, err)) + errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %w", k, value, err)) return } @@ -113,7 +113,7 @@ func validateKeyAliasARN(v any, k string) (ws []string, errors []error) { } if _, err := arn.Parse(value); err != nil { - errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %s", k, value, err)) + errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %w", k, value, err)) return } From 348998ac0b9d06a12dc8f55d1eea56e104330636 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:36 -0400 Subject: [PATCH 1847/2115] Fix golangci-lint 'errorlint' - lambda. --- internal/service/lambda/event_source_mapping_test.go | 2 +- internal/service/lambda/function.go | 6 +++--- internal/service/lambda/function_event_invoke_config.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/lambda/event_source_mapping_test.go b/internal/service/lambda/event_source_mapping_test.go index d0a6ff64cfa1..b4db01ec6765 100644 --- a/internal/service/lambda/event_source_mapping_test.go +++ b/internal/service/lambda/event_source_mapping_test.go @@ -1576,7 +1576,7 @@ func testAccCheckEventSourceMappingIsBeingDisabled(ctx context.Context, v *lambd if err != nil { return tfresource.NonRetryableError( - fmt.Errorf("Error getting Lambda Event Source Mapping: %s", err)) + fmt.Errorf("Error getting Lambda Event Source Mapping: %w", err)) } if state := aws.ToString(output.State); state != "Disabled" { diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 24d1e9c74734..ca08d47bafc7 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1272,7 +1272,7 @@ func replaceSecurityGroupsOnDestroy(ctx context.Context, d *schema.ResourceData, } else { defaultSG, err := tfec2.FindSecurityGroupByNameAndVPCID(ctx, ec2Conn, "default", vpcID) if err != nil || defaultSG == nil { - return fmt.Errorf("finding VPC (%s) default security group: %s", vpcID, err) + return fmt.Errorf("finding VPC (%s) default security group: %w", vpcID, err) } replacementSGIDs = []string{aws.ToString(defaultSG.GroupId)} } @@ -1287,11 +1287,11 @@ func replaceSecurityGroupsOnDestroy(ctx context.Context, d *schema.ResourceData, if _, err := retryFunctionOp(ctx, func() (*lambda.UpdateFunctionConfigurationOutput, error) { return conn.UpdateFunctionConfiguration(ctx, input) }); err != nil { - return fmt.Errorf("updating Lambda Function (%s) configuration: %s", d.Id(), err) + return fmt.Errorf("updating Lambda Function (%s) configuration: %w", d.Id(), err) } if _, err := waitFunctionUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { - return fmt.Errorf("waiting for Lambda Function (%s) configuration update: %s", d.Id(), err) + return fmt.Errorf("waiting for Lambda Function (%s) configuration update: %w", d.Id(), err) } return nil diff --git a/internal/service/lambda/function_event_invoke_config.go b/internal/service/lambda/function_event_invoke_config.go index 3f27c391a99b..cb94bc6acc22 100644 --- a/internal/service/lambda/function_event_invoke_config.go +++ b/internal/service/lambda/function_event_invoke_config.go @@ -273,7 +273,7 @@ func functionEventInvokeConfigParseResourceID(id string) (string, string, error) parsedARN, err := arn.Parse(id) if err != nil { - return "", "", fmt.Errorf("parsing ARN (%s): %s", id, err) + return "", "", fmt.Errorf("parsing ARN (%s): %w", id, err) } function := strings.TrimPrefix(parsedARN.Resource, "function:") From d32e9a86ebcae4fcb28c329c1703dda2921659df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:36 -0400 Subject: [PATCH 1848/2115] Fix golangci-lint 'errorlint' - lexmodels. --- internal/service/lexmodels/bot_alias_test.go | 2 +- internal/service/lexmodels/intent_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/lexmodels/bot_alias_test.go b/internal/service/lexmodels/bot_alias_test.go index 1d186bad8a1b..866ef6409533 100644 --- a/internal/service/lexmodels/bot_alias_test.go +++ b/internal/service/lexmodels/bot_alias_test.go @@ -410,7 +410,7 @@ func testAccCheckBotAliasDestroy(ctx context.Context, botName, botAliasName stri return nil } - return fmt.Errorf("error getting bot alias '%s': %s", botAliasName, err) + return fmt.Errorf("error getting bot alias '%s': %w", botAliasName, err) } return fmt.Errorf("error bot alias still exists after delete, %s", botAliasName) diff --git a/internal/service/lexmodels/intent_test.go b/internal/service/lexmodels/intent_test.go index a068070964e8..549767c1c27e 100644 --- a/internal/service/lexmodels/intent_test.go +++ b/internal/service/lexmodels/intent_test.go @@ -774,7 +774,7 @@ func testAccCheckIntentNotExists(ctx context.Context, intentName, intentVersion return nil } if err != nil { - return fmt.Errorf("error getting intent %s version %s: %s", intentName, intentVersion, err) + return fmt.Errorf("error getting intent %s version %s: %w", intentName, intentVersion, err) } return fmt.Errorf("error intent %s version %s exists", intentName, intentVersion) From 49c133944c02d517a4dfdd3ec9a303ed16d380d8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:37 -0400 Subject: [PATCH 1849/2115] Fix golangci-lint 'errorlint' - macie2. --- internal/service/macie2/member.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/macie2/member.go b/internal/service/macie2/member.go index 44d6f1dd5c58..ddb2c4a185fb 100644 --- a/internal/service/macie2/member.go +++ b/internal/service/macie2/member.go @@ -265,7 +265,7 @@ func inviteMember(ctx context.Context, conn *macie2.Client, d *schema.ResourceDa } if _, err := waitMemberInvited(ctx, conn, d.Id()); err != nil { - return fmt.Errorf("waiting for Macie Member (%s) invite: %s", d.Id(), err) + return fmt.Errorf("waiting for Macie Member (%s) invite: %w", d.Id(), err) } return nil From 2ccb8c64a4b571b7a6e7921955e42d6d010692cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:38 -0400 Subject: [PATCH 1850/2115] Fix golangci-lint 'errorlint' - medialive. --- internal/service/medialive/channel.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/medialive/channel.go b/internal/service/medialive/channel.go index d403e8159821..f27c3596ff39 100644 --- a/internal/service/medialive/channel.go +++ b/internal/service/medialive/channel.go @@ -998,13 +998,13 @@ func startChannel(ctx context.Context, conn *medialive.Client, timeout time.Dura }) if err != nil { - return fmt.Errorf("starting Medialive Channel (%s): %s", id, err) + return fmt.Errorf("starting Medialive Channel (%s): %w", id, err) } _, err = waitChannelStarted(ctx, conn, id, timeout) if err != nil { - return fmt.Errorf("waiting for Medialive Channel (%s) start: %s", id, err) + return fmt.Errorf("waiting for Medialive Channel (%s) start: %w", id, err) } return nil @@ -1016,13 +1016,13 @@ func stopChannel(ctx context.Context, conn *medialive.Client, timeout time.Durat }) if err != nil { - return fmt.Errorf("stopping Medialive Channel (%s): %s", id, err) + return fmt.Errorf("stopping Medialive Channel (%s): %w", id, err) } _, err = waitChannelStopped(ctx, conn, id, timeout) if err != nil { - return fmt.Errorf("waiting for Medialive Channel (%s) stop: %s", id, err) + return fmt.Errorf("waiting for Medialive Channel (%s) stop: %w", id, err) } return nil From cb8b4d7e9c87ff497e4b523ebdd02643a23e0f35 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:38 -0400 Subject: [PATCH 1851/2115] Fix golangci-lint 'errorlint' - meta. --- internal/service/meta/ip_ranges_data_source_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/meta/ip_ranges_data_source_test.go b/internal/service/meta/ip_ranges_data_source_test.go index 461f8d113a5f..128b1bc0e29c 100644 --- a/internal/service/meta/ip_ranges_data_source_test.go +++ b/internal/service/meta/ip_ranges_data_source_test.go @@ -186,7 +186,7 @@ func testAccIPRangesCheckCIDRBlocksAttribute(name, attribute string) resource.Te _, _, err := net.ParseCIDR(cidrBlock) if err != nil { - return fmt.Errorf("malformed CIDR block %s in %s: %s", cidrBlock, attribute, err) + return fmt.Errorf("malformed CIDR block %s in %s: %w", cidrBlock, attribute, err) } cidrBlocks[i] = cidrBlock From 9138ba5eb7e774628efb8911d9c0a29278faaeae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:39 -0400 Subject: [PATCH 1852/2115] Fix golangci-lint 'errorlint' - neptune. --- .../service/neptune/engine_version_data_source_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/neptune/engine_version_data_source_test.go b/internal/service/neptune/engine_version_data_source_test.go index c2676e1523dd..918a7bddd065 100644 --- a/internal/service/neptune/engine_version_data_source_test.go +++ b/internal/service/neptune/engine_version_data_source_test.go @@ -255,7 +255,7 @@ func TestAccNeptuneEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_major_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -272,7 +272,7 @@ func TestAccNeptuneEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_minor_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -289,7 +289,7 @@ func TestAccNeptuneEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_major_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -301,7 +301,7 @@ func TestAccNeptuneEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_minor_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { From 0920bb1fec5824cf74896453e3b1086ed58a758d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:39 -0400 Subject: [PATCH 1853/2115] Fix golangci-lint 'errorlint' - networkmanager. --- internal/service/networkmanager/core_network.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/networkmanager/core_network.go b/internal/service/networkmanager/core_network.go index 1270ef17655c..8c9cf6cb8c05 100644 --- a/internal/service/networkmanager/core_network.go +++ b/internal/service/networkmanager/core_network.go @@ -520,7 +520,7 @@ func putAndExecuteCoreNetworkPolicy(ctx context.Context, conn *networkmanager.Cl document, err := structure.NormalizeJsonString(policyDocument) if err != nil { - return fmt.Errorf("decoding Network Manager Core Network (%s) policy document: %s", coreNetworkId, err) + return fmt.Errorf("decoding Network Manager Core Network (%s) policy document: %w", coreNetworkId, err) } output, err := conn.PutCoreNetworkPolicy(ctx, &networkmanager.PutCoreNetworkPolicyInput{ @@ -530,13 +530,13 @@ func putAndExecuteCoreNetworkPolicy(ctx context.Context, conn *networkmanager.Cl }) if err != nil { - return fmt.Errorf("putting Network Manager Core Network (%s) policy: %s", coreNetworkId, err) + return fmt.Errorf("putting Network Manager Core Network (%s) policy: %w", coreNetworkId, err) } policyVersionID := output.CoreNetworkPolicy.PolicyVersionId if _, err := waitCoreNetworkPolicyCreated(ctx, conn, coreNetworkId, policyVersionID, waitCoreNetworkPolicyCreatedTimeInMinutes*time.Minute); err != nil { - return fmt.Errorf("waiting for Network Manager Core Network Policy from Core Network (%s) create: %s", coreNetworkId, err) + return fmt.Errorf("waiting for Network Manager Core Network Policy from Core Network (%s) create: %w", coreNetworkId, err) } _, err = conn.ExecuteCoreNetworkChangeSet(ctx, &networkmanager.ExecuteCoreNetworkChangeSetInput{ @@ -544,7 +544,7 @@ func putAndExecuteCoreNetworkPolicy(ctx context.Context, conn *networkmanager.Cl PolicyVersionId: policyVersionID, }) if err != nil { - return fmt.Errorf("executing Network Manager Core Network (%s) change set (%d): %s", coreNetworkId, policyVersionID, err) + return fmt.Errorf("executing Network Manager Core Network (%s) change set (%d): %w", coreNetworkId, policyVersionID, err) } return nil @@ -621,7 +621,7 @@ func buildCoreNetworkBasePolicyDocument(regions []any) (string, error) { b, err := json.MarshalIndent(basePolicy, "", " ") if err != nil { // should never happen if the above code is correct - return "", fmt.Errorf("building base policy document: %s", err) + return "", fmt.Errorf("building base policy document: %w", err) } return string(b), nil From 57e71fc3c45f6dad9991ed0b535b9b90ada266e1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:40 -0400 Subject: [PATCH 1854/2115] Fix golangci-lint 'errorlint' - opensearch. --- internal/service/opensearch/domain_policy_test.go | 2 +- internal/service/opensearch/wait.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/opensearch/domain_policy_test.go b/internal/service/opensearch/domain_policy_test.go index aedf2920c163..d2694cfa5d89 100644 --- a/internal/service/opensearch/domain_policy_test.go +++ b/internal/service/opensearch/domain_policy_test.go @@ -101,7 +101,7 @@ func testAccCheckPolicyMatch(resource, attr, expectedPolicy string) resource.Tes areEquivalent, err := awspolicy.PoliciesAreEquivalent(given, expectedPolicy) if err != nil { - return fmt.Errorf("Comparing AWS Policies failed: %s", err) + return fmt.Errorf("Comparing AWS Policies failed: %w", err) } if !areEquivalent { diff --git a/internal/service/opensearch/wait.go b/internal/service/opensearch/wait.go index 7026599181fd..1c1a7a560851 100644 --- a/internal/service/opensearch/wait.go +++ b/internal/service/opensearch/wait.go @@ -112,7 +112,7 @@ func waitForDomainDelete(ctx context.Context, conn *opensearch.Client, domainNam }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) if err != nil { - return fmt.Errorf("waiting for OpenSearch Domain to be deleted: %s", err) + return fmt.Errorf("waiting for OpenSearch Domain to be deleted: %w", err) } // opensearch maintains information about the domain in multiple (at least 2) places that need From 1f71340f673a07186f2f7a6836dcf60bff0daf0b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:43 -0400 Subject: [PATCH 1855/2115] Fix golangci-lint 'errorlint' - rds. --- internal/service/rds/blue_green.go | 12 ++++++------ internal/service/rds/cluster.go | 4 ++-- .../service/rds/engine_version_data_source_test.go | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/rds/blue_green.go b/internal/service/rds/blue_green.go index 049ffd5e5ff3..9d53d5660f10 100644 --- a/internal/service/rds/blue_green.go +++ b/internal/service/rds/blue_green.go @@ -49,7 +49,7 @@ func (o *blueGreenOrchestrator) CleanUp(ctx context.Context) { func (o *blueGreenOrchestrator) CreateDeployment(ctx context.Context, input *rds.CreateBlueGreenDeploymentInput) (*types.BlueGreenDeployment, error) { createOut, err := o.conn.CreateBlueGreenDeployment(ctx, input) if err != nil { - return nil, fmt.Errorf("creating Blue/Green Deployment: %s", err) + return nil, fmt.Errorf("creating Blue/Green Deployment: %w", err) } dep := createOut.BlueGreenDeployment return dep, nil @@ -58,7 +58,7 @@ func (o *blueGreenOrchestrator) CreateDeployment(ctx context.Context, input *rds func (o *blueGreenOrchestrator) waitForDeploymentAvailable(ctx context.Context, identifier string, timeout time.Duration) (*types.BlueGreenDeployment, error) { dep, err := waitBlueGreenDeploymentAvailable(ctx, o.conn, identifier, timeout) if err != nil { - return nil, fmt.Errorf("creating Blue/Green Deployment: %s", err) + return nil, fmt.Errorf("creating Blue/Green Deployment: %w", err) } return dep, nil } @@ -76,12 +76,12 @@ func (o *blueGreenOrchestrator) Switchover(ctx context.Context, identifier strin }, ) if err != nil { - return nil, fmt.Errorf("switching over Blue/Green Deployment: %s", err) + return nil, fmt.Errorf("switching over Blue/Green Deployment: %w", err) } dep, err := waitBlueGreenDeploymentSwitchoverCompleted(ctx, o.conn, identifier, timeout) if err != nil { - return nil, fmt.Errorf("switching over Blue/Green Deployment: waiting for completion: %s", err) + return nil, fmt.Errorf("switching over Blue/Green Deployment: waiting for completion: %w", err) } return dep, nil } @@ -122,7 +122,7 @@ func (h *instanceHandler) precondition(ctx context.Context, d *schema.ResourceDa if needsPreConditions { err := dbInstanceModify(ctx, h.conn, d.Id(), input, d.Timeout(schema.TimeoutUpdate)) if err != nil { - return fmt.Errorf("setting pre-conditions: %s", err) + return fmt.Errorf("setting pre-conditions: %w", err) } } return nil @@ -160,7 +160,7 @@ func (h *instanceHandler) modifyTarget(ctx context.Context, identifier string, d err := dbInstanceModify(ctx, h.conn, d.Id(), modifyInput, timeout) if err != nil { - return fmt.Errorf("updating Green environment: %s", err) + return fmt.Errorf("updating Green environment: %w", err) } } diff --git a/internal/service/rds/cluster.go b/internal/service/rds/cluster.go index b340e72143b0..e95539d9a093 100644 --- a/internal/service/rds/cluster.go +++ b/internal/service/rds/cluster.go @@ -1933,11 +1933,11 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta any ) if err != nil { - return false, fmt.Errorf("modifying RDS Cluster (%s) DeletionProtection=false: %s", d.Id(), err) + return false, fmt.Errorf("modifying RDS Cluster (%s) DeletionProtection=false: %w", d.Id(), err) } if _, err := waitDBClusterUpdated(ctx, conn, d.Id(), false, d.Timeout(schema.TimeoutDelete)); err != nil { - return false, fmt.Errorf("waiting for RDS Cluster (%s) update: %s", d.Id(), err) + return false, fmt.Errorf("waiting for RDS Cluster (%s) update: %w", d.Id(), err) } } diff --git a/internal/service/rds/engine_version_data_source_test.go b/internal/service/rds/engine_version_data_source_test.go index f68c3df5ee53..aab4d7df585b 100644 --- a/internal/service/rds/engine_version_data_source_test.go +++ b/internal/service/rds/engine_version_data_source_test.go @@ -330,7 +330,7 @@ func TestAccRDSEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_major_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -347,7 +347,7 @@ func TestAccRDSEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_minor_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -364,7 +364,7 @@ func TestAccRDSEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_major_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { @@ -376,7 +376,7 @@ func TestAccRDSEngineVersionDataSource_hasMinorMajor(t *testing.T) { resource.TestCheckResourceAttrWith(dataSourceName, "valid_minor_targets.#", func(value string) error { intValue, err := strconv.Atoi(value) if err != nil { - return fmt.Errorf("could not convert string to int: %v", err) + return fmt.Errorf("could not convert string to int: %w", err) } if intValue <= 0 { From 4992e288d05c73e334d381447c9ed1481c0190ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:45 -0400 Subject: [PATCH 1856/2115] Fix golangci-lint 'errorlint' - s3. --- internal/service/s3/bucket_policy_data_source_test.go | 2 +- internal/service/s3/bucket_policy_test.go | 2 +- internal/service/s3/bucket_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/s3/bucket_policy_data_source_test.go b/internal/service/s3/bucket_policy_data_source_test.go index 1af409f6f8e8..096c53c5bc8a 100644 --- a/internal/service/s3/bucket_policy_data_source_test.go +++ b/internal/service/s3/bucket_policy_data_source_test.go @@ -60,7 +60,7 @@ func testAccCheckBucketPolicyMatch(nameFirst, keyFirst, nameSecond, keySecond st areEquivalent, err := awspolicy.PoliciesAreEquivalent(policy1, policy2) if err != nil { - return fmt.Errorf("comparing IAM Policies failed: %s", err) + return fmt.Errorf("comparing IAM Policies failed: %w", err) } if !areEquivalent { diff --git a/internal/service/s3/bucket_policy_test.go b/internal/service/s3/bucket_policy_test.go index edd2b0ddd251..768525f66c9a 100644 --- a/internal/service/s3/bucket_policy_test.go +++ b/internal/service/s3/bucket_policy_test.go @@ -519,7 +519,7 @@ func testAccCheckBucketHasPolicy(ctx context.Context, n string, expectedPolicyTe expectedPolicyText := fmt.Sprintf(expectedPolicyTemplate, acctest.AccountID(ctx), acctest.Partition(), bucketName) equivalent, err := awspolicy.PoliciesAreEquivalent(policy, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 77c38b81319a..5e4956c1e94d 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -629,7 +629,7 @@ func TestAccS3Bucket_tags_withSystemTags(t *testing.T) { } if _, err := tfcloudformation.WaitStackDeleted(ctx, conn, stackID, requestToken, 10*time.Minute); err != nil { - return fmt.Errorf("Error waiting for CloudFormation stack deletion: %s", err) + return fmt.Errorf("Error waiting for CloudFormation stack deletion: %w", err) } return nil From 2bbe02b682041e740180cd0c502ace3e6e1564d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:45 -0400 Subject: [PATCH 1857/2115] Fix golangci-lint 'errorlint' - s3control. --- internal/service/s3control/access_point_test.go | 2 +- internal/service/s3control/s3_tags.go | 4 ++-- internal/service/s3control/storage_lens_configuration.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/s3control/access_point_test.go b/internal/service/s3control/access_point_test.go index ff4764422fe0..515fc1183da6 100644 --- a/internal/service/s3control/access_point_test.go +++ b/internal/service/s3control/access_point_test.go @@ -494,7 +494,7 @@ func testAccCheckAccessPointHasPolicy(ctx context.Context, n string, fn func() s equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", diff --git a/internal/service/s3control/s3_tags.go b/internal/service/s3control/s3_tags.go index 367d59d88eff..4cf97ab6f449 100644 --- a/internal/service/s3control/s3_tags.go +++ b/internal/service/s3control/s3_tags.go @@ -85,7 +85,7 @@ func bucketUpdateTags(ctx context.Context, conn *s3control.Client, identifier st _, err := conn.PutBucketTagging(ctx, &input, optFns...) if err != nil { - return fmt.Errorf("setting resource tags (%s): %s", identifier, err) + return fmt.Errorf("setting resource tags (%s): %w", identifier, err) } } else if len(oldTags) > 0 && len(ignoredTags) == 0 { input := s3control.DeleteBucketTaggingInput{ @@ -96,7 +96,7 @@ func bucketUpdateTags(ctx context.Context, conn *s3control.Client, identifier st _, err := conn.DeleteBucketTagging(ctx, &input, optFns...) if err != nil { - return fmt.Errorf("deleting resource tags (%s): %s", identifier, err) + return fmt.Errorf("deleting resource tags (%s): %w", identifier, err) } } diff --git a/internal/service/s3control/storage_lens_configuration.go b/internal/service/s3control/storage_lens_configuration.go index 236c93f9b7cd..d19af7076f76 100644 --- a/internal/service/s3control/storage_lens_configuration.go +++ b/internal/service/s3control/storage_lens_configuration.go @@ -620,7 +620,7 @@ func storageLensConfigurationUpdateTags(ctx context.Context, conn *s3control.Cli allTags, err := storageLensConfigurationListTags(ctx, conn, accountID, configID) if err != nil { - return fmt.Errorf("listing tags: %s", err) + return fmt.Errorf("listing tags: %w", err) } ignoredTags := allTags.Ignore(oldTags).Ignore(newTags) @@ -635,7 +635,7 @@ func storageLensConfigurationUpdateTags(ctx context.Context, conn *s3control.Cli _, err := conn.PutStorageLensConfigurationTagging(ctx, input) if err != nil { - return fmt.Errorf("setting tags: %s", err) + return fmt.Errorf("setting tags: %w", err) } } else if len(oldTags) > 0 && len(ignoredTags) == 0 { input := &s3control.DeleteStorageLensConfigurationTaggingInput{ @@ -646,7 +646,7 @@ func storageLensConfigurationUpdateTags(ctx context.Context, conn *s3control.Cli _, err := conn.DeleteStorageLensConfigurationTagging(ctx, input) if err != nil { - return fmt.Errorf("deleting tags: %s", err) + return fmt.Errorf("deleting tags: %w", err) } } From 53f381ef21f22eb872453ae6330ba5f7eb74c526 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:46 -0400 Subject: [PATCH 1858/2115] Fix golangci-lint 'errorlint' - sagemaker. --- internal/service/sagemaker/notebook_instance.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sagemaker/notebook_instance.go b/internal/service/sagemaker/notebook_instance.go index 2457e989cdb0..0bb3527eb2c9 100644 --- a/internal/service/sagemaker/notebook_instance.go +++ b/internal/service/sagemaker/notebook_instance.go @@ -420,23 +420,23 @@ func startNotebookInstance(ctx context.Context, conn *sagemaker.Client, id strin err := tfresource.Retry(ctx, 5*time.Minute, func(ctx context.Context) *tfresource.RetryError { _, err := conn.StartNotebookInstance(ctx, startOpts) if err != nil { - return tfresource.NonRetryableError(fmt.Errorf("starting: %s", err)) + return tfresource.NonRetryableError(fmt.Errorf("starting: %w", err)) } err = waitNotebookInstanceStarted(ctx, conn, id) if err != nil { - return tfresource.RetryableError(fmt.Errorf("starting: waiting for completion: %s", err)) + return tfresource.RetryableError(fmt.Errorf("starting: waiting for completion: %w", err)) } return nil }) if err != nil { - return fmt.Errorf("starting: %s", err) + return fmt.Errorf("starting: %w", err) } if err := waitNotebookInstanceInService(ctx, conn, id); err != nil { - return fmt.Errorf("starting: waiting to be in service: %s", err) + return fmt.Errorf("starting: waiting to be in service: %w", err) } return nil } @@ -460,11 +460,11 @@ func stopNotebookInstance(ctx context.Context, conn *sagemaker.Client, id string } if _, err := conn.StopNotebookInstance(ctx, stopOpts); err != nil { - return fmt.Errorf("stopping: %s", err) + return fmt.Errorf("stopping: %w", err) } if err := waitNotebookInstanceStopped(ctx, conn, id); err != nil { - return fmt.Errorf("stopping: waiting for completion: %s", err) + return fmt.Errorf("stopping: waiting for completion: %w", err) } return nil From ac6274a70c74bb569d6089fb74d20b63909b4901 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:46 -0400 Subject: [PATCH 1859/2115] Fix golangci-lint 'errorlint' - schemas. --- internal/service/schemas/registry_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/schemas/registry_policy_test.go b/internal/service/schemas/registry_policy_test.go index d3a59177aff1..277ed9e63d92 100644 --- a/internal/service/schemas/registry_policy_test.go +++ b/internal/service/schemas/registry_policy_test.go @@ -213,7 +213,7 @@ func testAccCheckRegistryPolicy(ctx context.Context, name string, expectedSid st equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", From fedb008f871eb7bbe0ab2fc986578cef6c478da9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:48 -0400 Subject: [PATCH 1860/2115] Fix golangci-lint 'errorlint' - sns. --- internal/service/sns/topic_subscription.go | 6 +++--- internal/service/sns/topic_subscription_test.go | 4 ++-- internal/service/sns/topic_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/sns/topic_subscription.go b/internal/service/sns/topic_subscription.go index 62f5f485388b..0414158410a6 100644 --- a/internal/service/sns/topic_subscription.go +++ b/internal/service/sns/topic_subscription.go @@ -591,18 +591,18 @@ func normalizeTopicSubscriptionDeliveryPolicy(policy string) ([]byte, error) { var deliveryPolicy TopicSubscriptionDeliveryPolicy if err := json.Unmarshal([]byte(policy), &deliveryPolicy); err != nil { - return nil, fmt.Errorf("[WARN] Unable to unmarshal SNS Topic Subscription delivery policy JSON: %s", err) + return nil, fmt.Errorf("[WARN] Unable to unmarshal SNS Topic Subscription delivery policy JSON: %w", err) } normalizedDeliveryPolicy, err := json.Marshal(deliveryPolicy) if err != nil { - return nil, fmt.Errorf("[WARN] Unable to marshal SNS Topic Subscription delivery policy back to JSON: %s", err) + return nil, fmt.Errorf("[WARN] Unable to marshal SNS Topic Subscription delivery policy back to JSON: %w", err) } b := bytes.NewBufferString("") if err := json.Compact(b, normalizedDeliveryPolicy); err != nil { - return nil, fmt.Errorf("[WARN] Unable to marshal SNS Topic Subscription delivery policy back to JSON: %s", err) + return nil, fmt.Errorf("[WARN] Unable to marshal SNS Topic Subscription delivery policy back to JSON: %w", err) } return b.Bytes(), nil diff --git a/internal/service/sns/topic_subscription_test.go b/internal/service/sns/topic_subscription_test.go index 1b97b90dbcd9..b52128b61da5 100644 --- a/internal/service/sns/topic_subscription_test.go +++ b/internal/service/sns/topic_subscription_test.go @@ -866,7 +866,7 @@ func testAccCheckTopicSubscriptionDeliveryPolicyAttribute(attributes *map[string var apiDeliveryPolicy tfsns.TopicSubscriptionDeliveryPolicy if err := json.Unmarshal([]byte(apiDeliveryPolicyJSONString), &apiDeliveryPolicy); err != nil { - return fmt.Errorf("unable to unmarshal SNS Topic Subscription delivery policy JSON (%s): %s", apiDeliveryPolicyJSONString, err) + return fmt.Errorf("unable to unmarshal SNS Topic Subscription delivery policy JSON (%s): %w", apiDeliveryPolicyJSONString, err) } if reflect.DeepEqual(apiDeliveryPolicy, *expectedDeliveryPolicy) { @@ -887,7 +887,7 @@ func testAccCheckTopicSubscriptionRedrivePolicyAttribute(ctx context.Context, at var apiRedrivePolicy tfsns.TopicSubscriptionRedrivePolicy if err := json.Unmarshal([]byte(apiRedrivePolicyJSONString), &apiRedrivePolicy); err != nil { - return fmt.Errorf("unable to unmarshal SNS Topic Subscription redrive policy JSON (%s): %s", apiRedrivePolicyJSONString, err) + return fmt.Errorf("unable to unmarshal SNS Topic Subscription redrive policy JSON (%s): %w", apiRedrivePolicyJSONString, err) } expectedRedrivePolicy := tfsns.TopicSubscriptionRedrivePolicy{ diff --git a/internal/service/sns/topic_test.go b/internal/service/sns/topic_test.go index 8635fec43a43..3855eb34d64f 100644 --- a/internal/service/sns/topic_test.go +++ b/internal/service/sns/topic_test.go @@ -648,7 +648,7 @@ func testAccCheckTopicHasPolicy(ctx context.Context, n string, expectedPolicyTex equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicyText) if err != nil { - return fmt.Errorf("testing policy equivalence: %s", err) + return fmt.Errorf("testing policy equivalence: %w", err) } if !equivalent { From acd2f63cfa946f43731054a011b6b1118e5755c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:48 -0400 Subject: [PATCH 1861/2115] Fix golangci-lint 'errorlint' - sqs. --- internal/service/sqs/queue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/sqs/queue_test.go b/internal/service/sqs/queue_test.go index 9e9c1ff44251..8b68b06d3838 100644 --- a/internal/service/sqs/queue_test.go +++ b/internal/service/sqs/queue_test.go @@ -921,7 +921,7 @@ func testAccCheckQueuePolicyAttribute(ctx context.Context, queueAttributes *map[ equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicy) if err != nil { - return fmt.Errorf("Error testing policy equivalence: %s", err) + return fmt.Errorf("Error testing policy equivalence: %w", err) } if !equivalent { return fmt.Errorf("Non-equivalent policy error:\n\nexpected: %s\n\n got: %s\n", expectedPolicy, actualPolicyText) From bbd06b082de99125efcfc5d3657d0af5ed702a90 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:11:48 -0400 Subject: [PATCH 1862/2115] Fix golangci-lint 'errorlint' - ssm. --- internal/service/ssm/default_patch_baseline.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ssm/default_patch_baseline.go b/internal/service/ssm/default_patch_baseline.go index 339b9e607710..da745cdfdbb8 100644 --- a/internal/service/ssm/default_patch_baseline.go +++ b/internal/service/ssm/default_patch_baseline.go @@ -200,7 +200,7 @@ func findDefaultDefaultPatchBaselineIDByOperatingSystem(ctx context.Context, con page, err := paginator.NextPage(ctx) if err != nil { - return nil, fmt.Errorf("reading SSM Patch Baselines: %s", err) + return nil, fmt.Errorf("reading SSM Patch Baselines: %w", err) } for _, v := range page.BaselineIdentities { @@ -272,7 +272,7 @@ func validatePatchBaselineARN(v any, k string) (ws []string, errors []error) { } if _, err := arn.Parse(value); err != nil { - errors = append(errors, fmt.Errorf("%q (%s) is not a valid ARN: %s", k, value, err)) + errors = append(errors, fmt.Errorf("%q (%s) is not a valid ARN: %w", k, value, err)) return } From 5e8f700b8911e20907a41a827f3d4185059f8163 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:12:29 -0400 Subject: [PATCH 1863/2115] Fix golangci-lint 'errorlint' - acctest. --- internal/acctest/acctest.go | 4 ++-- internal/acctest/statecheck/expect_global_arn_format.go | 2 +- .../acctest/statecheck/expect_identity_regional_arn_format.go | 2 +- internal/acctest/statecheck/expect_regional_arn_format.go | 2 +- internal/acctest/statecheck/full_tags.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 9d59bb43c11d..629a17e8211b 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -526,7 +526,7 @@ func MatchResourceAttrRegionalARNNoAccount(resourceName, attributeName, arnServi attributeMatch, err := regexp.Compile(arnRegexp) if err != nil { - return fmt.Errorf("unable to compile ARN regexp (%s): %s", arnRegexp, err) + return fmt.Errorf("unable to compile ARN regexp (%s): %w", arnRegexp, err) } return resource.TestMatchResourceAttr(resourceName, attributeName, attributeMatch)(s) @@ -678,7 +678,7 @@ func MatchResourceAttrGlobalARNNoAccount(resourceName, attributeName, arnService attributeMatch, err := regexp.Compile(arnRegexp) if err != nil { - return fmt.Errorf("unable to compile ARN regexp (%s): %s", arnRegexp, err) + return fmt.Errorf("unable to compile ARN regexp (%s): %w", arnRegexp, err) } return resource.TestMatchResourceAttr(resourceName, attributeName, attributeMatch)(s) diff --git a/internal/acctest/statecheck/expect_global_arn_format.go b/internal/acctest/statecheck/expect_global_arn_format.go index a0fdfac1b6e2..935c57e76365 100644 --- a/internal/acctest/statecheck/expect_global_arn_format.go +++ b/internal/acctest/statecheck/expect_global_arn_format.go @@ -41,7 +41,7 @@ func (e expectGlobalARNFormatCheck) CheckState(ctx context.Context, request stat knownCheck := acctest.GlobalARN(e.arnService, arnString) if err = knownCheck.CheckValue(value); err != nil { //nolint:contextcheck // knownCheck implements an interface - response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %s", e.base.ResourceAddress(), e.attributePath, err) + response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %w", e.base.ResourceAddress(), e.attributePath, err) return } } diff --git a/internal/acctest/statecheck/expect_identity_regional_arn_format.go b/internal/acctest/statecheck/expect_identity_regional_arn_format.go index e46cb32467fe..e6faa93e3c1a 100644 --- a/internal/acctest/statecheck/expect_identity_regional_arn_format.go +++ b/internal/acctest/statecheck/expect_identity_regional_arn_format.go @@ -57,7 +57,7 @@ func (e expectIdentityRegionalARNFormatCheck) CheckState(ctx context.Context, re knownCheck := e.checkFactory(e.arnService, arnString) if err = knownCheck.CheckValue(value); err != nil { - response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %s", e.base.ResourceAddress(), attrPath, err) + response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %w", e.base.ResourceAddress(), attrPath, err) return } } diff --git a/internal/acctest/statecheck/expect_regional_arn_format.go b/internal/acctest/statecheck/expect_regional_arn_format.go index 15c90af6655a..eef786fd6621 100644 --- a/internal/acctest/statecheck/expect_regional_arn_format.go +++ b/internal/acctest/statecheck/expect_regional_arn_format.go @@ -43,7 +43,7 @@ func (e expectRegionalARNFormatCheck) CheckState(ctx context.Context, request st knownCheck := e.checkFactory(e.arnService, arnString) if err = knownCheck.CheckValue(value); err != nil { - response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %s", e.base.ResourceAddress(), e.attributePath, err) + response.Error = fmt.Errorf("checking value for attribute at path: %s.%s, err: %w", e.base.ResourceAddress(), e.attributePath, err) return } } diff --git a/internal/acctest/statecheck/full_tags.go b/internal/acctest/statecheck/full_tags.go index ea1d779b7858..c55ddcb058b1 100644 --- a/internal/acctest/statecheck/full_tags.go +++ b/internal/acctest/statecheck/full_tags.go @@ -77,7 +77,7 @@ func (e expectFullTagsCheck) CheckState(ctx context.Context, req statecheck.Chec err = fmt.Errorf("no ListTags method found for service %s", sp.ServicePackageName()) } if err != nil { - resp.Error = fmt.Errorf("listing tags for %s: %s", e.base.ResourceAddress(), err) + resp.Error = fmt.Errorf("listing tags for %s: %w", e.base.ResourceAddress(), err) return } @@ -102,7 +102,7 @@ func (e expectFullTagsCheck) CheckState(ctx context.Context, req statecheck.Chec }) if err := e.knownValue.CheckValue(tagsMap); err != nil { - resp.Error = fmt.Errorf("error checking remote tags for %s: %s", e.base.ResourceAddress(), err) // nosemgrep:ci.semgrep.errors.no-fmt.Errorf-leading-error + resp.Error = fmt.Errorf("error checking remote tags for %s: %w", e.base.ResourceAddress(), err) // nosemgrep:ci.semgrep.errors.no-fmt.Errorf-leading-error return } } From 2c196bdf39bd959c107268b9ed0d5b3e7f9fe3bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:12:42 -0400 Subject: [PATCH 1864/2115] Fix golangci-lint 'errorlint'. --- internal/generate/tests/templates.go | 6 +++--- internal/provider/sdkv2/importer/arn.go | 6 +++--- internal/types/timestamp/timestamp.go | 2 +- internal/verify/validate.go | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/generate/tests/templates.go b/internal/generate/tests/templates.go index e880556ff2ab..126fd9c5c4dd 100644 --- a/internal/generate/tests/templates.go +++ b/internal/generate/tests/templates.go @@ -35,12 +35,12 @@ var dataSourceTestGoTmpl string func AddCommonDataSourceTestTemplates(template *template.Template) (*template.Template, error) { result, err := template.Parse(commonTestGoTmpl) if err != nil { - return nil, fmt.Errorf("parsing common \"common_test.go.gtpl\" test template: %s", err) + return nil, fmt.Errorf("parsing common \"common_test.go.gtpl\" test template: %w", err) } result, err = result.Parse(dataSourceTestGoTmpl) if err != nil { - return nil, fmt.Errorf("parsing common \"datasource_test.go.gtpl\" test template: %s", err) + return nil, fmt.Errorf("parsing common \"datasource_test.go.gtpl\" test template: %w", err) } return result, nil @@ -52,7 +52,7 @@ var acctestTfTmpl string func AddCommonTfTemplates(template *template.Template) (*template.Template, error) { result, err := template.Parse(acctestTfTmpl) if err != nil { - return nil, fmt.Errorf("parsing common \"acctest.tf.gtpl\" config template: %s", err) + return nil, fmt.Errorf("parsing common \"acctest.tf.gtpl\" config template: %w", err) } return result, nil } diff --git a/internal/provider/sdkv2/importer/arn.go b/internal/provider/sdkv2/importer/arn.go index a14129dfd2de..2e33fbce0b20 100644 --- a/internal/provider/sdkv2/importer/arn.go +++ b/internal/provider/sdkv2/importer/arn.go @@ -70,7 +70,7 @@ func RegionalARN(_ context.Context, rd *schema.ResourceData, identitySpec inttyp func RegionalARNValue(_ context.Context, rd *schema.ResourceData, attrName string, arnValue string) error { arnARN, err := arn.Parse(arnValue) if err != nil { - return fmt.Errorf("could not parse %q as ARN: %s", arnValue, err) + return fmt.Errorf("could not parse %q as ARN: %w", arnValue, err) } rd.Set(attrName, arnValue) @@ -93,7 +93,7 @@ func GlobalARN(_ context.Context, rd *schema.ResourceData, identitySpec inttypes if rd.Id() != "" { _, err := arn.Parse(rd.Id()) if err != nil { - return fmt.Errorf("could not parse import ID %q as ARN: %s", rd.Id(), err) + return fmt.Errorf("could not parse import ID %q as ARN: %w", rd.Id(), err) } rd.Set(attr.ResourceAttributeName(), rd.Id()) for _, attr := range identitySpec.IdentityDuplicateAttrs { @@ -120,7 +120,7 @@ func GlobalARN(_ context.Context, rd *schema.ResourceData, identitySpec inttypes _, err = arn.Parse(arnVal) if err != nil { - return fmt.Errorf("identity attribute %q: could not parse %q as ARN: %s", attr.Name(), arnVal, err) + return fmt.Errorf("identity attribute %q: could not parse %q as ARN: %w", attr.Name(), arnVal, err) } rd.Set(attr.ResourceAttributeName(), arnVal) diff --git a/internal/types/timestamp/timestamp.go b/internal/types/timestamp/timestamp.go index e33b72f2d57b..1578abc5667d 100644 --- a/internal/types/timestamp/timestamp.go +++ b/internal/types/timestamp/timestamp.go @@ -53,7 +53,7 @@ func (t Timestamp) ValidateOnceAWeekWindowFormat() error { func (t Timestamp) ValidateUTCFormat() error { _, err := time.Parse(time.RFC3339, t.String()) if err != nil { - return fmt.Errorf("must be in RFC3339 time format %q. Example: %s", time.RFC3339, err) + return fmt.Errorf("must be in RFC3339 time format %q: %w", time.RFC3339, err) } return nil diff --git a/internal/verify/validate.go b/internal/verify/validate.go index 5406bccd2fc3..a42c82a88c92 100644 --- a/internal/verify/validate.go +++ b/internal/verify/validate.go @@ -109,7 +109,7 @@ func ValidARNCheck(f ...ARNCheckFunc) schema.SchemaValidateFunc { parsedARN, err := arn.Parse(value) if err != nil { - errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %s", k, value, err)) + errors = append(errors, fmt.Errorf("%q (%s) is an invalid ARN: %w", k, value, err)) return ws, errors } @@ -224,7 +224,7 @@ func ValidIAMPolicyJSON(v any, k string) (ws []string, errors []error) { } if err := basevalidation.JSONNoDuplicateKeys(value); err != nil { - errors = append(errors, fmt.Errorf("%q contains duplicate JSON keys: %s", k, err)) + errors = append(errors, fmt.Errorf("%q contains duplicate JSON keys: %w", k, err)) return //nolint:nakedret // Naked return due to legacy, non-idiomatic Go function, error handling } @@ -411,11 +411,11 @@ func ValidRegionName(v any, k string) (ws []string, errors []error) { func ValidStringIsJSONOrYAML(v any, k string) (ws []string, errors []error) { if looksLikeJSONString(v) { if _, err := structure.NormalizeJsonString(v); err != nil { - errors = append(errors, fmt.Errorf("%q contains an invalid JSON: %s", k, err)) + errors = append(errors, fmt.Errorf("%q contains an invalid JSON: %w", k, err)) } } else { if _, err := checkYAMLString(v); err != nil { - errors = append(errors, fmt.Errorf("%q contains an invalid YAML: %s", k, err)) + errors = append(errors, fmt.Errorf("%q contains an invalid YAML: %w", k, err)) } } return @@ -435,7 +435,7 @@ func ValidTypeStringNullableFloat(v any, k string) (ws []string, es []error) { } if _, err := strconv.ParseFloat(value, 64); err != nil { - es = append(es, fmt.Errorf("%s: cannot parse '%s' as float: %s", k, value, err)) + es = append(es, fmt.Errorf("%s: cannot parse '%s' as float: %w", k, value, err)) } return @@ -465,7 +465,7 @@ func ValidDuration(v any, k string) (ws []string, errors []error) { value := v.(string) duration, err := time.ParseDuration(value) if err != nil { - errors = append(errors, fmt.Errorf("%q cannot be parsed as a duration: %s", k, err)) + errors = append(errors, fmt.Errorf("%q cannot be parsed as a duration: %w", k, err)) } if duration < 0 { errors = append(errors, fmt.Errorf("%q must be greater than zero", k)) From 7360ef9dbe7765ad894e762067bbabd48c20d2bc Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 01:19:51 +0900 Subject: [PATCH 1865/2115] add changelog --- .changelog/44207.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44207.txt diff --git a/.changelog/44207.txt b/.changelog/44207.txt new file mode 100644 index 000000000000..53180c8a1993 --- /dev/null +++ b/.changelog/44207.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_glue_catalog_table_optimizer: Add `iceberg_configuration.run_rate_in_hours` argument to `retention_configuration` and `orphan_file_deletion_configuration` blocks +``` From c4800cd6b7dbed7d1ab74a8a58bd0644d5712060 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 11:20:41 -0500 Subject: [PATCH 1866/2115] aws_controltower_baseline: update when there are changes --- internal/service/controltower/baseline.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index e90916d2d4fb..65d467c0a633 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -212,7 +212,7 @@ func (r *resourceBaseline) Update(ctx context.Context, request resource.UpdateRe return } - if !diff.HasChanges() { + if diff.HasChanges() { in := controltower.UpdateEnabledBaselineInput{ EnabledBaselineIdentifier: plan.ARN.ValueStringPointer(), } From 9e58f0d1c929d782f9fcc0cb57733ebf5eceb942 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:25:48 -0400 Subject: [PATCH 1867/2115] r/aws_networkmanager_vpc_attachment: Fixup tagging acceptance tests generated configurations. --- .../networkmanager/testdata/VPCAttachment/tags/main_gen.tf | 2 +- .../testdata/VPCAttachment/tagsComputed1/main_gen.tf | 2 +- .../testdata/VPCAttachment/tagsComputed2/main_gen.tf | 2 +- .../testdata/VPCAttachment/tags_defaults/main_gen.tf | 2 +- .../testdata/VPCAttachment/tags_ignore/main_gen.tf | 2 +- .../networkmanager/testdata/tmpl/vpc_attachment_tags.gtpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/networkmanager/testdata/VPCAttachment/tags/main_gen.tf b/internal/service/networkmanager/testdata/VPCAttachment/tags/main_gen.tf index 0c5d94e9a47e..576e43929f64 100644 --- a/internal/service/networkmanager/testdata/VPCAttachment/tags/main_gen.tf +++ b/internal/service/networkmanager/testdata/VPCAttachment/tags/main_gen.tf @@ -37,7 +37,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { diff --git a/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed1/main_gen.tf b/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed1/main_gen.tf index 48a9c4dd79c6..9503b9511cc5 100644 --- a/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed1/main_gen.tf +++ b/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed1/main_gen.tf @@ -41,7 +41,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { diff --git a/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed2/main_gen.tf b/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed2/main_gen.tf index 1c9c3d62cf37..34271cff82b7 100644 --- a/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed2/main_gen.tf +++ b/internal/service/networkmanager/testdata/VPCAttachment/tagsComputed2/main_gen.tf @@ -42,7 +42,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { diff --git a/internal/service/networkmanager/testdata/VPCAttachment/tags_defaults/main_gen.tf b/internal/service/networkmanager/testdata/VPCAttachment/tags_defaults/main_gen.tf index 888a209806a6..b16001213ac7 100644 --- a/internal/service/networkmanager/testdata/VPCAttachment/tags_defaults/main_gen.tf +++ b/internal/service/networkmanager/testdata/VPCAttachment/tags_defaults/main_gen.tf @@ -43,7 +43,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { diff --git a/internal/service/networkmanager/testdata/VPCAttachment/tags_ignore/main_gen.tf b/internal/service/networkmanager/testdata/VPCAttachment/tags_ignore/main_gen.tf index 01b2738c90da..0f326d45c681 100644 --- a/internal/service/networkmanager/testdata/VPCAttachment/tags_ignore/main_gen.tf +++ b/internal/service/networkmanager/testdata/VPCAttachment/tags_ignore/main_gen.tf @@ -46,7 +46,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { diff --git a/internal/service/networkmanager/testdata/tmpl/vpc_attachment_tags.gtpl b/internal/service/networkmanager/testdata/tmpl/vpc_attachment_tags.gtpl index cec8471c2f3b..5da89196fb9f 100644 --- a/internal/service/networkmanager/testdata/tmpl/vpc_attachment_tags.gtpl +++ b/internal/service/networkmanager/testdata/tmpl/vpc_attachment_tags.gtpl @@ -33,7 +33,7 @@ data "aws_networkmanager_core_network_policy_document" "test" { segments { name = "shared" description = "SegmentForSharedServices" - require_attachment_acceptance = true + require_attachment_acceptance = false } segment_actions { From a39de70b9f238bbfc37898d774cb82f9f068d95b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 12:31:16 -0400 Subject: [PATCH 1868/2115] Fix golangci-lint 'govet'. --- internal/service/dax/sweep.go | 36 ++++++++++------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/internal/service/dax/sweep.go b/internal/service/dax/sweep.go index 1624d7182fa4..e09bead9e413 100644 --- a/internal/service/dax/sweep.go +++ b/internal/service/dax/sweep.go @@ -4,36 +4,27 @@ package dax import ( - "fmt" - "log" + "context" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/dax" awstypes "github.com/aws/aws-sdk-go-v2/service/dax/types" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" ) func RegisterSweepers() { - resource.AddTestSweepers("aws_dax_cluster", &resource.Sweeper{ - Name: "aws_dax_cluster", - F: sweepClusters, - }) + awsv2.Register("aws_dax_cluster", sweepClusters) } -func sweepClusters(region string) error { - ctx := sweep.Context(region) - client, err := sweep.SharedRegionalSweepClient(ctx, region) - if err != nil { - return fmt.Errorf("getting client: %w", err.Error()) - } +func sweepClusters(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) { conn := client.DAXClient(ctx) - + var input dax.DescribeClustersInput sweepResources := make([]sweep.Sweepable, 0) - err = describeClustersPages(ctx, conn, &dax.DescribeClustersInput{}, func(page *dax.DescribeClustersOutput, lastPage bool) bool { + err := describeClustersPages(ctx, conn, &input, func(page *dax.DescribeClustersOutput, lastPage bool) bool { if page == nil { return !lastPage } @@ -51,20 +42,13 @@ func sweepClusters(region string) error { // GovCloud (with no DAX support) has an endpoint that responds with: // InvalidParameterValueException: Access Denied to API Version: DAX_V3 - if awsv2.SkipSweepError(err) || errs.IsAErrorMessageContains[*awstypes.InvalidParameterValueException](err, "Access Denied to API Version: DAX_V3") { - log.Printf("[WARN] Skipping DAX Cluster sweep for %s: %s", region, err) - return nil + if errs.IsAErrorMessageContains[*awstypes.InvalidParameterValueException](err, "Access Denied to API Version: DAX_V3") { + return nil, nil } if err != nil { - return fmt.Errorf("listing DAX Clusters (%s): %w", region, err) - } - - err = sweep.SweepOrchestrator(ctx, sweepResources) - - if err != nil { - return fmt.Errorf("sweeping DAX Clusters (%s): %w", region, err) + return nil, err } - return nil + return sweepResources, nil } From 41bf2a5425db3831c4f4374ab4cd125ba8da2912 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Tue, 9 Sep 2025 11:56:00 -0500 Subject: [PATCH 1869/2115] aws_controltower_baseline: only use arn to check destroy --- internal/service/controltower/baseline_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 9b286893f244..5a2940c02414 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -106,7 +106,7 @@ func testAccCheckBaselineDestroy(ctx context.Context) resource.TestCheckFunc { } arn := rs.Primary.Attributes[names.AttrARN] - _, err := tfcontroltower.FindBaselineByID(ctx, conn, rs.Primary.Attributes[arn]) + _, err := tfcontroltower.FindBaselineByID(ctx, conn, arn) if retry.NotFound(err) { continue From 7dd17b5ec460fde631ff6dad463d49848f37f1e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 13:15:31 -0400 Subject: [PATCH 1870/2115] Fix providerlint 'AT012: file contains multiple acceptance test name prefixes: [TestAccEC2EBSDefaultKMSKey TestAccEC2EBSEncryptionByDefault]'. --- .../service/ec2/ebs_default_kms_key_test.go | 15 +++++++ .../ec2/ebs_encryption_by_default_test.go | 15 +++++++ internal/service/ec2/ebs_test.go | 40 ------------------- 3 files changed, 30 insertions(+), 40 deletions(-) delete mode 100644 internal/service/ec2/ebs_test.go diff --git a/internal/service/ec2/ebs_default_kms_key_test.go b/internal/service/ec2/ebs_default_kms_key_test.go index 4b6a5e3496e5..c4468836b540 100644 --- a/internal/service/ec2/ebs_default_kms_key_test.go +++ b/internal/service/ec2/ebs_default_kms_key_test.go @@ -19,6 +19,21 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) +func TestAccEC2EBSDefaultKMSKey_serial(t *testing.T) { + t.Parallel() + + testCases := map[string]map[string]func(t *testing.T){ + "Resource": { + acctest.CtBasic: testAccEBSDefaultKMSKey_basic, + }, + "DataSource": { + acctest.CtBasic: testAccEBSDefaultKMSKeyDataSource_basic, + }, + } + + acctest.RunSerialTests2Levels(t, testCases, 0) +} + func testAccEBSDefaultKMSKey_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_ebs_default_kms_key.test" diff --git a/internal/service/ec2/ebs_encryption_by_default_test.go b/internal/service/ec2/ebs_encryption_by_default_test.go index fd7ad27dab06..9b0ab876fee7 100644 --- a/internal/service/ec2/ebs_encryption_by_default_test.go +++ b/internal/service/ec2/ebs_encryption_by_default_test.go @@ -17,6 +17,21 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) +func TestAccEC2EBSEncryptionByDefault_serial(t *testing.T) { + t.Parallel() + + testCases := map[string]map[string]func(t *testing.T){ + "Resource": { + acctest.CtBasic: testAccEBSEncryptionByDefault_basic, + }, + "DataSource": { + acctest.CtBasic: testAccEBSEncryptionByDefaultDataSource_basic, + }, + } + + acctest.RunSerialTests2Levels(t, testCases, 0) +} + func testAccEBSEncryptionByDefault_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_ebs_encryption_by_default.test" diff --git a/internal/service/ec2/ebs_test.go b/internal/service/ec2/ebs_test.go deleted file mode 100644 index 084190d89803..000000000000 --- a/internal/service/ec2/ebs_test.go +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package ec2_test - -import ( - "testing" - - "github.com/hashicorp/terraform-provider-aws/internal/acctest" -) - -func TestAccEC2EBSDefaultKMSKey_serial(t *testing.T) { - t.Parallel() - - testCases := map[string]map[string]func(t *testing.T){ - "Resource": { - acctest.CtBasic: testAccEBSDefaultKMSKey_basic, - }, - "DataSource": { - acctest.CtBasic: testAccEBSDefaultKMSKeyDataSource_basic, - }, - } - - acctest.RunSerialTests2Levels(t, testCases, 0) -} - -func TestAccEC2EBSEncryptionByDefault_serial(t *testing.T) { - t.Parallel() - - testCases := map[string]map[string]func(t *testing.T){ - "Resource": { - acctest.CtBasic: testAccEBSEncryptionByDefault_basic, - }, - "DataSource": { - acctest.CtBasic: testAccEBSEncryptionByDefaultDataSource_basic, - }, - } - - acctest.RunSerialTests2Levels(t, testCases, 0) -} From 7cf94a3a638a9ba34abac5898a95deefc06273e5 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:48:43 -0400 Subject: [PATCH 1871/2115] r/aws_acmpca_certificate_authority(doc): document import by identity --- ...acmpca_certificate_authority.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/acmpca_certificate_authority.html.markdown b/website/docs/r/acmpca_certificate_authority.html.markdown index c3bb44f2ef5f..1ef07bd89d3f 100644 --- a/website/docs/r/acmpca_certificate_authority.html.markdown +++ b/website/docs/r/acmpca_certificate_authority.html.markdown @@ -184,6 +184,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate_authority.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_certificate_authority" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_certificate_authority` using the certificate authority ARN. For example: ```terraform From 0bc259a139c23b7f79d0a7390f893193cf240be4 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:48:46 -0400 Subject: [PATCH 1872/2115] r/aws_acmpca_certificate(doc): document import by identity --- .../docs/r/acmpca_certificate.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/acmpca_certificate.html.markdown b/website/docs/r/acmpca_certificate.html.markdown index d6ebab9dd285..8648a8e5a079 100644 --- a/website/docs/r/acmpca_certificate.html.markdown +++ b/website/docs/r/acmpca_certificate.html.markdown @@ -84,6 +84,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012/certificate/286535153982981100925020015808220737245" + } +} + +resource "aws_acmpca_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ACM PCA Certificates using their ARN. For example: ```terraform From 3cb40f52aab4b052349599cd07bffc4a3c2b5d44 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:48:50 -0400 Subject: [PATCH 1873/2115] r/aws_acmpca_policy(doc): document import by identity --- website/docs/r/acmpca_policy.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/acmpca_policy.html.markdown b/website/docs/r/acmpca_policy.html.markdown index 577dd23b630d..dffdf43909a3 100644 --- a/website/docs/r/acmpca_policy.html.markdown +++ b/website/docs/r/acmpca_policy.html.markdown @@ -76,6 +76,28 @@ This resource exports no additional attributes. ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_policy.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_policy` using the `resource_arn` value. For example: ```terraform From ee11858c99654110aa1403555c28447a364118cb Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:48:54 -0400 Subject: [PATCH 1874/2115] r/aws_api_gateway_domain_name_access_association(doc): document import by identity --- ...main_name_access_association.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/api_gateway_domain_name_access_association.html.markdown b/website/docs/r/api_gateway_domain_name_access_association.html.markdown index 143f448e98aa..59e15a92ddf2 100644 --- a/website/docs/r/api_gateway_domain_name_access_association.html.markdown +++ b/website/docs/r/api_gateway_domain_name_access_association.html.markdown @@ -40,6 +40,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_api_gateway_domain_name_access_association.example + identity = { + "arn" = "arn:aws:apigateway:us-east-1::/domainnames/example.com/accessassociation" + } +} + +resource "aws_api_gateway_domain_name_access_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the API Gateway domain name access association. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import API Gateway domain name acces associations using their `arn`. For example: ```terraform From dac16994a982c59e3a9fe5e9e9737fbebdf34482 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:48:59 -0400 Subject: [PATCH 1875/2115] r/aws_appfabric_app_bundle(doc): document import by identity --- .../docs/r/appfabric_app_bundle.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/appfabric_app_bundle.html.markdown b/website/docs/r/appfabric_app_bundle.html.markdown index 5b385c141926..34567b0f8f30 100644 --- a/website/docs/r/appfabric_app_bundle.html.markdown +++ b/website/docs/r/appfabric_app_bundle.html.markdown @@ -40,6 +40,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_appfabric_app_bundle.example + identity = { + "arn" = "arn:aws:appfabric:us-east-1:123456789012:appbundle/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_appfabric_app_bundle" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the AppFabric app bundle. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppFabric AppBundle using the `arn`. For example: ```terraform From 6c87eb1347aca4d4269014f18d25b2fb549e9938 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:04 -0400 Subject: [PATCH 1876/2115] r/aws_apprunner_auto_scaling_configuration_version(doc): document import by identity --- ...caling_configuration_version.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown b/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown index 4bb453ee7c67..3b6d000cb95e 100644 --- a/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown +++ b/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown @@ -49,6 +49,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_auto_scaling_configuration_version.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:autoscalingconfiguration/example-auto-scaling-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_auto_scaling_configuration_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner auto scaling configuration version. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner AutoScaling Configuration Versions using the `arn`. For example: ```terraform From 54dce4b14505eabdbde12312b751fef41b9d8b90 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:08 -0400 Subject: [PATCH 1877/2115] r/aws_apprunner_observability_configuration(doc): document import by identity --- ..._observability_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/apprunner_observability_configuration.html.markdown b/website/docs/r/apprunner_observability_configuration.html.markdown index cdecc27f9025..ee4698e2fbfd 100644 --- a/website/docs/r/apprunner_observability_configuration.html.markdown +++ b/website/docs/r/apprunner_observability_configuration.html.markdown @@ -53,6 +53,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_observability_configuration.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:observabilityconfiguration/example-observability-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_observability_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner observability configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Observability Configuration using the `arn`. For example: ```terraform From 224e47d6000ee9060b96061987f19d4f34c93790 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:12 -0400 Subject: [PATCH 1878/2115] r/aws_apprunner_service(doc): document import by identity --- .../docs/r/apprunner_service.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/apprunner_service.html.markdown b/website/docs/r/apprunner_service.html.markdown index 86f29278b0c1..37b5357527a5 100644 --- a/website/docs/r/apprunner_service.html.markdown +++ b/website/docs/r/apprunner_service.html.markdown @@ -273,6 +273,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_service.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:service/example-app-service/8fe1e10304f84fd2b0df550fe98a71fa" + } +} + +resource "aws_apprunner_service" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner service. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Services using the `arn`. For example: ```terraform From 8c60485d99fb1796e729e1963ca108fc2a5233e6 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:15 -0400 Subject: [PATCH 1879/2115] r/aws_apprunner_vpc_connector(doc): document import by identity --- .../r/apprunner_vpc_connector.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/apprunner_vpc_connector.html.markdown b/website/docs/r/apprunner_vpc_connector.html.markdown index 4e8c24e86abe..0e10c84379fa 100644 --- a/website/docs/r/apprunner_vpc_connector.html.markdown +++ b/website/docs/r/apprunner_vpc_connector.html.markdown @@ -41,6 +41,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_connector.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcconnector/example-vpc-connector/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_connector" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC connector. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner vpc connector using the `arn`. For example: ```terraform From 6b5933b158d40c8f5db1ed7ffde790fe5b26a0f8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:19 -0400 Subject: [PATCH 1880/2115] r/aws_apprunner_vpc_ingress_connection(doc): document import by identity --- ...unner_vpc_ingress_connection.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/apprunner_vpc_ingress_connection.html.markdown b/website/docs/r/apprunner_vpc_ingress_connection.html.markdown index e9cc347f66e5..ef6849a27614 100644 --- a/website/docs/r/apprunner_vpc_ingress_connection.html.markdown +++ b/website/docs/r/apprunner_vpc_ingress_connection.html.markdown @@ -57,6 +57,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_ingress_connection.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcingressconnection/example-vpc-ingress-connection/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_ingress_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC ingress connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner VPC Ingress Connection using the `arn`. For example: ```terraform From 147f123fd0558179bfdbf781b77d35d03d59b2a9 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:22 -0400 Subject: [PATCH 1881/2115] r/aws_batch_compute_environment(doc): document import by identity --- .../r/batch_compute_environment.html.markdown | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/docs/r/batch_compute_environment.html.markdown b/website/docs/r/batch_compute_environment.html.markdown index 8f2f49b9f334..4ea9fed89ffd 100644 --- a/website/docs/r/batch_compute_environment.html.markdown +++ b/website/docs/r/batch_compute_environment.html.markdown @@ -262,6 +262,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_compute_environment.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:compute-environment/sample" + } +} + +resource "aws_batch_compute_environment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the compute environment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Batch compute using the `name`. For example: ```terraform From a09d1960be0a07876f4ca2522230f2c8efbd3b1f Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:26 -0400 Subject: [PATCH 1882/2115] r/aws_batch_job_definition(doc): document import by identity --- .../docs/r/batch_job_definition.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/batch_job_definition.html.markdown b/website/docs/r/batch_job_definition.html.markdown index 5585e30e0559..97b575f75875 100644 --- a/website/docs/r/batch_job_definition.html.markdown +++ b/website/docs/r/batch_job_definition.html.markdown @@ -378,6 +378,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_definition.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-definition/sample:1" + } +} + +resource "aws_batch_job_definition" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job definition. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Definition using the `arn`. For example: ```terraform From 96a6182b7e57756f4c693abb34c1e58e6398f6c7 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:30 -0400 Subject: [PATCH 1883/2115] r/aws_batch_job_queue(doc): document import by identity --- website/docs/r/batch_job_queue.html.markdown | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/batch_job_queue.html.markdown b/website/docs/r/batch_job_queue.html.markdown index 20e6a536c297..d577b5eeeaf0 100644 --- a/website/docs/r/batch_job_queue.html.markdown +++ b/website/docs/r/batch_job_queue.html.markdown @@ -111,6 +111,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_queue.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-queue/sample" + } +} + +resource "aws_batch_job_queue" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job queue. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Queue using the `arn`. For example: ```terraform From a72a7ad4530d50fce8bc59e5316208ac97b33381 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:33 -0400 Subject: [PATCH 1884/2115] r/aws_bcmdataexports_export(doc): document import by identity --- .../r/bcmdataexports_export.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/bcmdataexports_export.html.markdown b/website/docs/r/bcmdataexports_export.html.markdown index 4b0578ace7ca..927b4585f310 100644 --- a/website/docs/r/bcmdataexports_export.html.markdown +++ b/website/docs/r/bcmdataexports_export.html.markdown @@ -111,6 +111,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bcmdataexports_export.example + identity = { + "arn" = "arn:aws:bcm-data-exports:us-east-1:123456789012:export/example-export" + } +} + +resource "aws_bcmdataexports_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the BCM Data Exports export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import BCM Data Exports Export using the export ARN. For example: ```terraform From 11ec4e7d9903c691a9958d37d4076b116f848d25 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:38 -0400 Subject: [PATCH 1885/2115] r/aws_bedrock_custom_model(doc): document import by identity --- .../docs/r/bedrock_custom_model.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/bedrock_custom_model.html.markdown b/website/docs/r/bedrock_custom_model.html.markdown index 589c52c55d24..37e9bb91a485 100644 --- a/website/docs/r/bedrock_custom_model.html.markdown +++ b/website/docs/r/bedrock_custom_model.html.markdown @@ -98,6 +98,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_custom_model.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:custom-model/amazon.titan-text-lite-v1:0:4k/example-model" + } +} + +resource "aws_bedrock_custom_model" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock custom model. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Bedrock Custom Model using the `job_arn`. For example: ```terraform From 9dce51bb616ee40fc60a29f308fd6329c2464a99 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:41 -0400 Subject: [PATCH 1886/2115] r/aws_bedrock_provisioned_model_throughput(doc): document import by identity --- ...provisioned_model_throughput.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/bedrock_provisioned_model_throughput.html.markdown b/website/docs/r/bedrock_provisioned_model_throughput.html.markdown index 6f6ff75c996e..e754efbd9279 100644 --- a/website/docs/r/bedrock_provisioned_model_throughput.html.markdown +++ b/website/docs/r/bedrock_provisioned_model_throughput.html.markdown @@ -47,6 +47,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_provisioned_model_throughput.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:provisioned-model/a1b2c3d4567890ab" + } +} + +resource "aws_bedrock_provisioned_model_throughput" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock provisioned model throughput. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Provisioned Throughput using the `provisioned_model_arn`. For example: ```terraform From 464da725f587edb728349c12cc6cf603507f6d36 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:45 -0400 Subject: [PATCH 1887/2115] r/aws_ce_anomaly_monitor(doc): document import by identity --- .../docs/r/ce_anomaly_monitor.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ce_anomaly_monitor.html.markdown b/website/docs/r/ce_anomaly_monitor.html.markdown index fb196ce241f8..26fee1feb6b4 100644 --- a/website/docs/r/ce_anomaly_monitor.html.markdown +++ b/website/docs/r/ce_anomaly_monitor.html.markdown @@ -69,6 +69,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_monitor.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalymonitor/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_monitor" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly monitor. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_monitor` using the `id`. For example: ```terraform From 21f238985cb20397ecea0b454e294b4e5e46f5c2 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:50 -0400 Subject: [PATCH 1888/2115] r/aws_ce_anomaly_subscription(doc): document import by identity --- .../r/ce_anomaly_subscription.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ce_anomaly_subscription.html.markdown b/website/docs/r/ce_anomaly_subscription.html.markdown index 572869322c89..6a67a997881d 100644 --- a/website/docs/r/ce_anomaly_subscription.html.markdown +++ b/website/docs/r/ce_anomaly_subscription.html.markdown @@ -255,6 +255,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_subscription.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalysubscription/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_subscription` using the `id`. For example: ```terraform From 0bd9574a8f04d25643e70b9d9766594aa2416bfa Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:49:56 -0400 Subject: [PATCH 1889/2115] r/aws_ce_cost_category(doc): document import by identity --- website/docs/r/ce_cost_category.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ce_cost_category.html.markdown b/website/docs/r/ce_cost_category.html.markdown index 229ebf6bfccc..0cba9ad3e0d3 100644 --- a/website/docs/r/ce_cost_category.html.markdown +++ b/website/docs/r/ce_cost_category.html.markdown @@ -126,6 +126,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_cost_category.example + identity = { + "arn" = "arn:aws:ce::123456789012:costcategory/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_cost_category" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer cost category. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_cost_category` using the id. For example: ```terraform From 75f9fc72428aac34360608849476185bb4ac680e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:03 -0400 Subject: [PATCH 1890/2115] r/aws_chimesdkmediapipelines_media_insights_pipeline_configuration(doc): document import by identity --- ...ights_pipeline_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown b/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown index 5ef9664328dd..7c6b9c04be35 100644 --- a/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown +++ b/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown @@ -358,6 +358,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_chimesdkmediapipelines_media_insights_pipeline_configuration.example + identity = { + "arn" = "arn:aws:chime:us-east-1:123456789012:media-insights-pipeline-configuration/example-config" + } +} + +resource "aws_chimesdkmediapipelines_media_insights_pipeline_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Chime SDK media insights pipeline configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Chime SDK Media Pipelines Media Insights Pipeline Configuration using the `id`. For example: ```terraform From 8d7fca175ce21d5e22ea6cd47ede6094dd22e539 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:03 -0400 Subject: [PATCH 1891/2115] r/aws_cloudfront_realtime_log_config(doc): document import by identity --- ...oudfront_realtime_log_config.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/cloudfront_realtime_log_config.html.markdown b/website/docs/r/cloudfront_realtime_log_config.html.markdown index c7036249a8f4..9324d8ade06a 100644 --- a/website/docs/r/cloudfront_realtime_log_config.html.markdown +++ b/website/docs/r/cloudfront_realtime_log_config.html.markdown @@ -99,6 +99,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudfront_realtime_log_config.example + identity = { + "arn" = "arn:aws:cloudfront::123456789012:realtime-log-config/ExampleNameForRealtimeLogConfig" + } +} + +resource "aws_cloudfront_realtime_log_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudFront real-time log configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudFront real-time log configurations using the ARN. For example: ```terraform From 729eea6d57b89e5de5b35b531c2656642e022cd8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:04 -0400 Subject: [PATCH 1892/2115] r/aws_cloudtrail_event_data_store(doc): document import by identity --- .../cloudtrail_event_data_store.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/cloudtrail_event_data_store.html.markdown b/website/docs/r/cloudtrail_event_data_store.html.markdown index 3c2191f98128..fb5154296ab2 100644 --- a/website/docs/r/cloudtrail_event_data_store.html.markdown +++ b/website/docs/r/cloudtrail_event_data_store.html.markdown @@ -119,6 +119,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudtrail_event_data_store.example + identity = { + "arn" = "arn:aws:cloudtrail:us-east-1:123456789012:eventdatastore/example-event-data-store-id" + } +} + +resource "aws_cloudtrail_event_data_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudTrail event data store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import event data stores using their `arn`. For example: ```terraform From 8f13cd20c55b4ed843599496bc6c922093bcee0a Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:04 -0400 Subject: [PATCH 1893/2115] r/aws_codeartifact_domain_permissions_policy(doc): document import by identity --- ...ct_domain_permissions_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeartifact_domain_permissions_policy.html.markdown b/website/docs/r/codeartifact_domain_permissions_policy.html.markdown index d8ce2df19fba..f1839767ab88 100644 --- a/website/docs/r/codeartifact_domain_permissions_policy.html.markdown +++ b/website/docs/r/codeartifact_domain_permissions_policy.html.markdown @@ -60,6 +60,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain Permissions Policies using the CodeArtifact Domain ARN. For example: ```terraform From 6819b3e976bf215cfade63e1d64683f6f152244d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:04 -0400 Subject: [PATCH 1894/2115] r/aws_codeartifact_domain(doc): document import by identity --- .../docs/r/codeartifact_domain.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeartifact_domain.html.markdown b/website/docs/r/codeartifact_domain.html.markdown index 048dc5fb4dd6..546343f3e482 100644 --- a/website/docs/r/codeartifact_domain.html.markdown +++ b/website/docs/r/codeartifact_domain.html.markdown @@ -42,6 +42,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain using the CodeArtifact Domain arn. For example: ```terraform From 31aef16fdbb593e1ad1d280cabbdbfc8d86e9dae Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:11 -0400 Subject: [PATCH 1895/2115] r/aws_codeartifact_repository_permissions_policy(doc): document import by identity --- ...epository_permissions_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeartifact_repository_permissions_policy.html.markdown b/website/docs/r/codeartifact_repository_permissions_policy.html.markdown index 82f1fa5d4900..f29a91a460f0 100644 --- a/website/docs/r/codeartifact_repository_permissions_policy.html.markdown +++ b/website/docs/r/codeartifact_repository_permissions_policy.html.markdown @@ -67,6 +67,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository Permissions Policies using the CodeArtifact Repository ARN. For example: ```terraform From 7090203774e70fd22cd13327a71e471e67a22553 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:11 -0400 Subject: [PATCH 1896/2115] r/aws_codeartifact_repository(doc): document import by identity --- .../r/codeartifact_repository.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeartifact_repository.html.markdown b/website/docs/r/codeartifact_repository.html.markdown index 15ca5ea8eefa..963a3c0b07da 100644 --- a/website/docs/r/codeartifact_repository.html.markdown +++ b/website/docs/r/codeartifact_repository.html.markdown @@ -96,6 +96,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository using the CodeArtifact Repository ARN. For example: ```terraform From 7a4aa29bf73bcb3c1516014c1ae33910f788fea8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:11 -0400 Subject: [PATCH 1897/2115] r/aws_codebuild_fleet(doc): document import by identity --- website/docs/r/codebuild_fleet.html.markdown | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codebuild_fleet.html.markdown b/website/docs/r/codebuild_fleet.html.markdown index 8ec6f76bc40b..b17e14d0dcf3 100644 --- a/website/docs/r/codebuild_fleet.html.markdown +++ b/website/docs/r/codebuild_fleet.html.markdown @@ -100,6 +100,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_fleet.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:fleet/example-fleet" + } +} + +resource "aws_codebuild_fleet" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild fleet. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Fleet using the `name` or the `arn`. For example: ```terraform From 4483615f02d978d78877c090aae82aef79623003 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:11 -0400 Subject: [PATCH 1898/2115] r/aws_codebuild_project(doc): document import by identity --- .../docs/r/codebuild_project.html.markdown | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/docs/r/codebuild_project.html.markdown b/website/docs/r/codebuild_project.html.markdown index 027e983256a7..84de3ddeb2a4 100755 --- a/website/docs/r/codebuild_project.html.markdown +++ b/website/docs/r/codebuild_project.html.markdown @@ -591,6 +591,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_project.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:project/project-name" + } +} + +resource "aws_codebuild_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Project using the `name`. For example: From b39d65d88b08abd20eb90dd980b914531d58b1d0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:11 -0400 Subject: [PATCH 1899/2115] r/aws_codebuild_report_group(doc): document import by identity --- .../r/codebuild_report_group.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codebuild_report_group.html.markdown b/website/docs/r/codebuild_report_group.html.markdown index a5ee39ff729b..4b5de3832fe3 100644 --- a/website/docs/r/codebuild_report_group.html.markdown +++ b/website/docs/r/codebuild_report_group.html.markdown @@ -93,6 +93,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_report_group.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_report_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild report group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Report Group using the CodeBuild Report Group arn. For example: ```terraform From 3f7a7cba988678bdb3c91ba227ed66f7c6b79a2f Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:16 -0400 Subject: [PATCH 1900/2115] r/aws_codebuild_resource_policy(doc): document import by identity --- .../r/codebuild_resource_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codebuild_resource_policy.html.markdown b/website/docs/r/codebuild_resource_policy.html.markdown index ced81c1a62fe..4aad7d82ed68 100644 --- a/website/docs/r/codebuild_resource_policy.html.markdown +++ b/website/docs/r/codebuild_resource_policy.html.markdown @@ -65,6 +65,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_resource_policy.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild resource. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Resource Policy using the CodeBuild Resource Policy arn. For example: ```terraform From 019a4dea46df4b75e1f37f3b217dd50e12f2bbf2 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:16 -0400 Subject: [PATCH 1901/2115] r/aws_codebuild_source_credential(doc): document import by identity --- .../codebuild_source_credential.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codebuild_source_credential.html.markdown b/website/docs/r/codebuild_source_credential.html.markdown index 92156231d775..250912575ad2 100644 --- a/website/docs/r/codebuild_source_credential.html.markdown +++ b/website/docs/r/codebuild_source_credential.html.markdown @@ -70,6 +70,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_source_credential.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:token/github" + } +} + +resource "aws_codebuild_source_credential" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild source credential. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Source Credential using the CodeBuild Source Credential arn. For example: From 1544f70a1ee36876c5155f1dacdcddc78911329d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:16 -0400 Subject: [PATCH 1902/2115] r/aws_codeconnections_connection(doc): document import by identity --- .../codeconnections_connection.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeconnections_connection.html.markdown b/website/docs/r/codeconnections_connection.html.markdown index 87f1c1d3a96d..f584eefaf2b9 100644 --- a/website/docs/r/codeconnections_connection.html.markdown +++ b/website/docs/r/codeconnections_connection.html.markdown @@ -44,6 +44,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_connection.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codeconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections connection using the ARN. For example: ```terraform From 3d6deebe646ec2f6ffedb33dded7661e94fd5b26 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:16 -0400 Subject: [PATCH 1903/2115] r/aws_codeconnections_host(doc): document import by identity --- .../docs/r/codeconnections_host.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codeconnections_host.html.markdown b/website/docs/r/codeconnections_host.html.markdown index 824f1f17761d..194c92e44469 100644 --- a/website/docs/r/codeconnections_host.html.markdown +++ b/website/docs/r/codeconnections_host.html.markdown @@ -51,6 +51,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_host.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codeconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections Host using the ARN. For example: ```terraform From e46cb562ed560e3ccf0e0a835d5a37dc85ad3028 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:17 -0400 Subject: [PATCH 1904/2115] r/aws_codepipeline_webhook(doc): document import by identity --- .../docs/r/codepipeline_webhook.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codepipeline_webhook.html.markdown b/website/docs/r/codepipeline_webhook.html.markdown index c335469d9d70..b868d8bb5025 100644 --- a/website/docs/r/codepipeline_webhook.html.markdown +++ b/website/docs/r/codepipeline_webhook.html.markdown @@ -139,6 +139,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codepipeline_webhook.example + identity = { + "arn" = "arn:aws:codepipeline:us-west-2:123456789012:webhook:example-webhook" + } +} + +resource "aws_codepipeline_webhook" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodePipeline webhook. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodePipeline Webhooks using their ARN. For example: ```terraform From e90c2f6a74d1ecafcaa03069cac11644077b2426 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:23 -0400 Subject: [PATCH 1905/2115] r/aws_codestarconnections_connection(doc): document import by identity --- ...destarconnections_connection.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codestarconnections_connection.html.markdown b/website/docs/r/codestarconnections_connection.html.markdown index a3fa9504a5a6..a2ed8e1692de 100644 --- a/website/docs/r/codestarconnections_connection.html.markdown +++ b/website/docs/r/codestarconnections_connection.html.markdown @@ -82,6 +82,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_connection.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codestarconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar connections using the ARN. For example: ```terraform From 44379d6209a26e5f1be4cc8760e0570775d0ed5c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:23 -0400 Subject: [PATCH 1906/2115] r/aws_codestarconnections_host(doc): document import by identity --- .../r/codestarconnections_host.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codestarconnections_host.html.markdown b/website/docs/r/codestarconnections_host.html.markdown index f550f02b69bd..8cf13cee8e21 100644 --- a/website/docs/r/codestarconnections_host.html.markdown +++ b/website/docs/r/codestarconnections_host.html.markdown @@ -49,6 +49,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_host.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codestarconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar Host using the ARN. For example: ```terraform From 1d75422ad7f9ef5c55945a16210288ac2b7ece00 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:23 -0400 Subject: [PATCH 1907/2115] r/aws_codestarnotifications_notification_rule(doc): document import by identity --- ...ifications_notification_rule.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/codestarnotifications_notification_rule.html.markdown b/website/docs/r/codestarnotifications_notification_rule.html.markdown index 4e5336af9de7..ba62366f3b21 100644 --- a/website/docs/r/codestarnotifications_notification_rule.html.markdown +++ b/website/docs/r/codestarnotifications_notification_rule.html.markdown @@ -81,6 +81,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarnotifications_notification_rule.example + identity = { + "arn" = "arn:aws:codestar-notifications:us-west-2:123456789012:notificationrule/dc82df7a-9435-44d4-a696-78f67EXAMPLE" + } +} + +resource "aws_codestarnotifications_notification_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar notification rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar notification rule using the ARN. For example: ```terraform From 71d188a8138ce9247d2506b4606b22bb0c07b4c3 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:23 -0400 Subject: [PATCH 1908/2115] r/aws_comprehend_document_classifier(doc): document import by identity --- ...mprehend_document_classifier.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/comprehend_document_classifier.html.markdown b/website/docs/r/comprehend_document_classifier.html.markdown index be82905106c9..cf45aa1749d4 100644 --- a/website/docs/r/comprehend_document_classifier.html.markdown +++ b/website/docs/r/comprehend_document_classifier.html.markdown @@ -134,6 +134,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_document_classifier.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:document-classifier/example" + } +} + +resource "aws_comprehend_document_classifier" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend document classifier. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Document Classifier using the ARN. For example: ```terraform From 88acf66faf5ab31ec49f213ff349265c6cb2347b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:23 -0400 Subject: [PATCH 1909/2115] r/aws_comprehend_entity_recognizer(doc): document import by identity --- ...comprehend_entity_recognizer.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/comprehend_entity_recognizer.html.markdown b/website/docs/r/comprehend_entity_recognizer.html.markdown index e7818437a07b..b170cee0075a 100644 --- a/website/docs/r/comprehend_entity_recognizer.html.markdown +++ b/website/docs/r/comprehend_entity_recognizer.html.markdown @@ -159,6 +159,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_entity_recognizer.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:entity-recognizer/example" + } +} + +resource "aws_comprehend_entity_recognizer" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend entity recognizer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Entity Recognizer using the ARN. For example: ```terraform From 37efff51b682639073dd143fcc1e0203e66da47b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:29 -0400 Subject: [PATCH 1910/2115] r/aws_datasync_agent(doc): document import by identity --- website/docs/r/datasync_agent.html.markdown | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_agent.html.markdown b/website/docs/r/datasync_agent.html.markdown index 5d1d81782d7e..f442f2e503b1 100644 --- a/website/docs/r/datasync_agent.html.markdown +++ b/website/docs/r/datasync_agent.html.markdown @@ -78,6 +78,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_agent.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:agent/agent-12345678901234567" + } +} + +resource "aws_datasync_agent" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync agent. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_agent` using the DataSync Agent Amazon Resource Name (ARN). For example: ```terraform From 5f762224c07d7e40c543c796eefc716086faf365 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:29 -0400 Subject: [PATCH 1911/2115] r/aws_datasync_location_azure_blob(doc): document import by identity --- ...datasync_location_azure_blob.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_azure_blob.html.markdown b/website/docs/r/datasync_location_azure_blob.html.markdown index 099012adaf01..819f59561ea0 100644 --- a/website/docs/r/datasync_location_azure_blob.html.markdown +++ b/website/docs/r/datasync_location_azure_blob.html.markdown @@ -53,6 +53,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_azure_blob.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_azure_blob" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync Azure Blob location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_azure_blob` using the Amazon Resource Name (ARN). For example: ```terraform From 7a3af771fb61a0e72d8d3007b8a71f5648aa7432 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:29 -0400 Subject: [PATCH 1912/2115] r/aws_datasync_location_efs(doc): document import by identity --- .../r/datasync_location_efs.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_efs.html.markdown b/website/docs/r/datasync_location_efs.html.markdown index e13733ba24fa..9d40c5b4c76e 100644 --- a/website/docs/r/datasync_location_efs.html.markdown +++ b/website/docs/r/datasync_location_efs.html.markdown @@ -57,6 +57,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_efs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_efs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync EFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_efs` using the DataSync Task Amazon Resource Name (ARN). For example: ```terraform From 82d8993a7b721963a689f302b39f9796dff50c64 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:29 -0400 Subject: [PATCH 1913/2115] r/aws_datasync_location_hdfs(doc): document import by identity --- .../r/datasync_location_hdfs.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_hdfs.html.markdown b/website/docs/r/datasync_location_hdfs.html.markdown index 04f82c4396c9..98de24a4afe3 100644 --- a/website/docs/r/datasync_location_hdfs.html.markdown +++ b/website/docs/r/datasync_location_hdfs.html.markdown @@ -85,6 +85,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_hdfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_hdfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync HDFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_hdfs` using the Amazon Resource Name (ARN). For example: ```terraform From 32ba54c6ae485eaefc8b28244579a5e2ad044e2a Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:29 -0400 Subject: [PATCH 1914/2115] r/aws_datasync_location_nfs(doc): document import by identity --- .../r/datasync_location_nfs.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_nfs.html.markdown b/website/docs/r/datasync_location_nfs.html.markdown index 0c507101d82d..308f6fbbedf0 100644 --- a/website/docs/r/datasync_location_nfs.html.markdown +++ b/website/docs/r/datasync_location_nfs.html.markdown @@ -58,6 +58,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_nfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_nfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync NFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_nfs` using the DataSync Task Amazon Resource Name (ARN). For example: ```terraform From 16e9922f9d314c244894416c276595c8d1c5f4ca Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:58 -0400 Subject: [PATCH 1915/2115] r/aws_datasync_location_object_storage(doc): document import by identity --- ...sync_location_object_storage.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_object_storage.html.markdown b/website/docs/r/datasync_location_object_storage.html.markdown index 7b5614258910..1bc887279d9f 100644 --- a/website/docs/r/datasync_location_object_storage.html.markdown +++ b/website/docs/r/datasync_location_object_storage.html.markdown @@ -48,6 +48,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_object_storage.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_object_storage" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync object storage location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_object_storage` using the Amazon Resource Name (ARN). For example: ```terraform From 442a9a67b3da6a412155acc47e92a067ac14a689 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:58 -0400 Subject: [PATCH 1916/2115] r/aws_datasync_location_s3(doc): document import by identity --- .../docs/r/datasync_location_s3.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_s3.html.markdown b/website/docs/r/datasync_location_s3.html.markdown index 546f6b3b2d3e..49b22a9ae352 100644 --- a/website/docs/r/datasync_location_s3.html.markdown +++ b/website/docs/r/datasync_location_s3.html.markdown @@ -68,6 +68,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_s3.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_s3" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync S3 location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_s3` using the DataSync Task Amazon Resource Name (ARN). For example: ```terraform From f6f2e0da8b0be05e86f2adad920fb20b3449abfd Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:58 -0400 Subject: [PATCH 1917/2115] r/aws_datasync_location_smb(doc): document import by identity --- .../r/datasync_location_smb.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_location_smb.html.markdown b/website/docs/r/datasync_location_smb.html.markdown index 69578194ebf0..f143d52ac7a2 100644 --- a/website/docs/r/datasync_location_smb.html.markdown +++ b/website/docs/r/datasync_location_smb.html.markdown @@ -55,6 +55,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_smb.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_smb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync SMB location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_smb` using the Amazon Resource Name (ARN). For example: ```terraform From 9519bf55c3ab1fc2cedc1a9c29a252c67fc3a723 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:58 -0400 Subject: [PATCH 1918/2115] r/aws_datasync_task(doc): document import by identity --- website/docs/r/datasync_task.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/datasync_task.html.markdown b/website/docs/r/datasync_task.html.markdown index b4978881b732..d5df99d44aae 100644 --- a/website/docs/r/datasync_task.html.markdown +++ b/website/docs/r/datasync_task.html.markdown @@ -176,6 +176,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_task.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:task/task-12345678901234567" + } +} + +resource "aws_datasync_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync task. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_task` using the DataSync Task Amazon Resource Name (ARN). For example: ```terraform From a5f8a849cfc2bc5656c4f6699306b7bd5316dc26 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:50:58 -0400 Subject: [PATCH 1919/2115] r/aws_devicefarm_device_pool(doc): document import by identity --- .../r/devicefarm_device_pool.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_device_pool.html.markdown b/website/docs/r/devicefarm_device_pool.html.markdown index 291ccc86f4d4..cd122441d706 100644 --- a/website/docs/r/devicefarm_device_pool.html.markdown +++ b/website/docs/r/devicefarm_device_pool.html.markdown @@ -51,6 +51,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_device_pool.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:devicepool:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_device_pool" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm device pool. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Device Pools using their ARN. For example: ```terraform From a3aba973f3834517e2452acecc48bc42a0f22f15 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:04 -0400 Subject: [PATCH 1920/2115] r/aws_devicefarm_instance_profile(doc): document import by identity --- .../devicefarm_instance_profile.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_instance_profile.html.markdown b/website/docs/r/devicefarm_instance_profile.html.markdown index d0555bddd65a..e11430d6e7b9 100644 --- a/website/docs/r/devicefarm_instance_profile.html.markdown +++ b/website/docs/r/devicefarm_instance_profile.html.markdown @@ -41,6 +41,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_instance_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:instanceprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_instance_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm instance profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Instance Profiles using their ARN. For example: ```terraform From 11ad0f1c5e156a1731caf710141b23dd5272c311 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:04 -0400 Subject: [PATCH 1921/2115] r/aws_devicefarm_network_profile(doc): document import by identity --- .../devicefarm_network_profile.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_network_profile.html.markdown b/website/docs/r/devicefarm_network_profile.html.markdown index 2808980e2dd8..a3c4bbbaeab7 100644 --- a/website/docs/r/devicefarm_network_profile.html.markdown +++ b/website/docs/r/devicefarm_network_profile.html.markdown @@ -53,6 +53,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_network_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:networkprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_network_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm network profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Network Profiles using their ARN. For example: ```terraform From ab7f396bea9838d83fabfb84d15130f763ac68fd Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:04 -0400 Subject: [PATCH 1922/2115] r/aws_devicefarm_project(doc): document import by identity --- .../docs/r/devicefarm_project.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_project.html.markdown b/website/docs/r/devicefarm_project.html.markdown index cedf35871eda..722f0a274b30 100644 --- a/website/docs/r/devicefarm_project.html.markdown +++ b/website/docs/r/devicefarm_project.html.markdown @@ -43,6 +43,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Projects using their ARN. For example: ```terraform From bab8038e18d288c85bee4c21a688f51683de40fe Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:04 -0400 Subject: [PATCH 1923/2115] r/aws_devicefarm_test_grid_project(doc): document import by identity --- ...devicefarm_test_grid_project.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_test_grid_project.html.markdown b/website/docs/r/devicefarm_test_grid_project.html.markdown index 9123148bd26c..06d09678f555 100644 --- a/website/docs/r/devicefarm_test_grid_project.html.markdown +++ b/website/docs/r/devicefarm_test_grid_project.html.markdown @@ -51,6 +51,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_test_grid_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:testgrid-project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_test_grid_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm test grid project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Test Grid Projects using their ARN. For example: ```terraform From c4e52f31074b83d885349d2da94ecbc641723668 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:04 -0400 Subject: [PATCH 1924/2115] r/aws_devicefarm_upload(doc): document import by identity --- .../docs/r/devicefarm_upload.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/devicefarm_upload.html.markdown b/website/docs/r/devicefarm_upload.html.markdown index 4bd1baa9b5cd..47b90d37ccbf 100644 --- a/website/docs/r/devicefarm_upload.html.markdown +++ b/website/docs/r/devicefarm_upload.html.markdown @@ -47,6 +47,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_upload.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:upload:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_upload" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm upload. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Uploads using their ARN. For example: ```terraform From 4f2d6f2ee393a75da35f54d9bc8953778c15f011 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:09 -0400 Subject: [PATCH 1925/2115] r/aws_dms_replication_config(doc): document import by identity --- .../r/dms_replication_config.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/dms_replication_config.html.markdown b/website/docs/r/dms_replication_config.html.markdown index 47aa32948535..eb9bb50b41a2 100644 --- a/website/docs/r/dms_replication_config.html.markdown +++ b/website/docs/r/dms_replication_config.html.markdown @@ -90,6 +90,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dms_replication_config.example + identity = { + "arn" = "arn:aws:dms:us-east-1:123456789012:replication-config:example-config" + } +} + +resource "aws_dms_replication_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DMS replication configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import replication configs using the `arn`. For example: ```terraform From c9f0c431e62223fb340c1d014e4f9d0d152bd81c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:09 -0400 Subject: [PATCH 1926/2115] r/aws_docdbelastic_cluster(doc): document import by identity --- .../docs/r/docdbelastic_cluster.html.markdown | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/website/docs/r/docdbelastic_cluster.html.markdown b/website/docs/r/docdbelastic_cluster.html.markdown index 91c02b1afac4..4660b48c7724 100644 --- a/website/docs/r/docdbelastic_cluster.html.markdown +++ b/website/docs/r/docdbelastic_cluster.html.markdown @@ -67,7 +67,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import OpenSearchServerless Access Policy using the `name` and `type` arguments separated by a slash (`/`). For example: +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_docdbelastic_cluster.example + identity = { + "arn" = "arn:aws:docdb-elastic:us-east-1:000011112222:cluster/12345678-7abc-def0-1234-56789abcdef" + } +} + +resource "aws_docdbelastic_cluster" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DocDB Elastic cluster. + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DocDB Elastic Cluster using the `arn`. For example: ```terraform import { From 456c839804aa8a28bb82f27325d440296c07a2eb Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:10 -0400 Subject: [PATCH 1927/2115] r/aws_dynamodb_resource_policy(doc): document import by identity --- .../r/dynamodb_resource_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/dynamodb_resource_policy.html.markdown b/website/docs/r/dynamodb_resource_policy.html.markdown index 7ef0961f209a..a6e97cb57d9b 100644 --- a/website/docs/r/dynamodb_resource_policy.html.markdown +++ b/website/docs/r/dynamodb_resource_policy.html.markdown @@ -42,6 +42,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_resource_policy.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table" + } +} + +resource "aws_dynamodb_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB Resource Policy using the `resource_arn`. For example: ```terraform From 45deada16c1325d3de164fb1454c8c40d48588f4 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:10 -0400 Subject: [PATCH 1928/2115] r/aws_dynamodb_table_export(doc): document import by identity --- .../r/dynamodb_table_export.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/dynamodb_table_export.html.markdown b/website/docs/r/dynamodb_table_export.html.markdown index 18af1e4c34ec..9178a5bf1315 100644 --- a/website/docs/r/dynamodb_table_export.html.markdown +++ b/website/docs/r/dynamodb_table_export.html.markdown @@ -120,6 +120,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_table_export.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table/export/01234567890123-a1b2c3d4" + } +} + +resource "aws_dynamodb_table_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB table exports using the `arn`. For example: ```terraform From 6e7abba59af5ea59f940524189a8420b4a889158 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:10 -0400 Subject: [PATCH 1929/2115] r/aws_ecs_capacity_provider(doc): document import by identity --- .../r/ecs_capacity_provider.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ecs_capacity_provider.html.markdown b/website/docs/r/ecs_capacity_provider.html.markdown index f16ef3ecf3c5..ae8a50b60942 100644 --- a/website/docs/r/ecs_capacity_provider.html.markdown +++ b/website/docs/r/ecs_capacity_provider.html.markdown @@ -77,6 +77,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecs_capacity_provider.example + identity = { + "arn" = "arn:aws:ecs:us-west-2:123456789012:capacity-provider/example" + } +} + +resource "aws_ecs_capacity_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ECS capacity provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECS Capacity Providers using the `arn`. For example: ```terraform From d9df264a199c6c5db989c3527349aec5870e68c0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:16 -0400 Subject: [PATCH 1930/2115] r/aws_globalaccelerator_accelerator(doc): document import by identity --- ...lobalaccelerator_accelerator.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_accelerator.html.markdown b/website/docs/r/globalaccelerator_accelerator.html.markdown index 2c07d01ed283..ab8a802fa30c 100644 --- a/website/docs/r/globalaccelerator_accelerator.html.markdown +++ b/website/docs/r/globalaccelerator_accelerator.html.markdown @@ -74,6 +74,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator accelerators using the `arn`. For example: ```terraform From 7ed2703f9f216b13a59f4d6d8fc6563ca5db6ab5 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:16 -0400 Subject: [PATCH 1931/2115] r/aws_globalaccelerator_cross_account_attachment(doc): document import by identity --- ...tor_cross_account_attachment.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown b/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown index 363fb3d86dde..c0478f047411 100644 --- a/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown +++ b/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown @@ -69,6 +69,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_cross_account_attachment.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:attachment/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_cross_account_attachment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator cross-account attachment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator Cross Account Attachment using the `arn`. For example: ```terraform From c3dfb72610edcca31f88c2f937bcbb05f8ca6198 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:16 -0400 Subject: [PATCH 1932/2115] r/aws_globalaccelerator_custom_routing_accelerator(doc): document import by identity --- ...r_custom_routing_accelerator.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown b/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown index 5ab917567c63..8991ae04fe7c 100644 --- a/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown @@ -73,6 +73,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_custom_routing_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing accelerators using the `arn`. For example: ```terraform From 9425644c272ec0721182aae6f72cbe0479f8e1fb Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:16 -0400 Subject: [PATCH 1933/2115] r/aws_globalaccelerator_custom_routing_endpoint_group(doc): document import by identity --- ...ustom_routing_endpoint_group.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown b/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown index 6d7f90c62493..556a47a9a9b1 100644 --- a/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown @@ -64,6 +64,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_custom_routing_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing endpoint groups using the `id`. For example: ```terraform From af15cf549277cc6d73b6bcc1ecdd098d63752a3a Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:17 -0400 Subject: [PATCH 1934/2115] r/aws_globalaccelerator_custom_routing_listener(doc): document import by identity --- ...ator_custom_routing_listener.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown b/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown index 25d23f5ed8d7..f2c3c0a28e82 100644 --- a/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown @@ -63,6 +63,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_custom_routing_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing listeners using the `id`. For example: ```terraform From ddc76b68b2c2f1bf81b1be58beb660ba07e99ada Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:22 -0400 Subject: [PATCH 1935/2115] r/aws_globalaccelerator_endpoint_group(doc): document import by identity --- ...alaccelerator_endpoint_group.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_endpoint_group.html.markdown b/website/docs/r/globalaccelerator_endpoint_group.html.markdown index ff1a7a0a5a31..3ca6f85a832e 100644 --- a/website/docs/r/globalaccelerator_endpoint_group.html.markdown +++ b/website/docs/r/globalaccelerator_endpoint_group.html.markdown @@ -69,6 +69,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator endpoint groups using the `id`. For example: ```terraform From b49d79c7c3f071c62ca5f95239bd20e1bd389ca9 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:22 -0400 Subject: [PATCH 1936/2115] r/aws_globalaccelerator_listener(doc): document import by identity --- .../globalaccelerator_listener.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/globalaccelerator_listener.html.markdown b/website/docs/r/globalaccelerator_listener.html.markdown index 3ff57eb34d0a..266b514c1567 100644 --- a/website/docs/r/globalaccelerator_listener.html.markdown +++ b/website/docs/r/globalaccelerator_listener.html.markdown @@ -68,6 +68,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator listeners using the `id`. For example: ```terraform From 29b3399282b6f79424f2f390a72f498b0fcfb793 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:22 -0400 Subject: [PATCH 1937/2115] r/aws_glue_registry(doc): document import by identity --- website/docs/r/glue_registry.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/glue_registry.html.markdown b/website/docs/r/glue_registry.html.markdown index 2da74013a799..4fe8113f1c35 100644 --- a/website/docs/r/glue_registry.html.markdown +++ b/website/docs/r/glue_registry.html.markdown @@ -37,6 +37,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_registry.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:registry/example" + } +} + +resource "aws_glue_registry" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue registry. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```terraform From e7ff10368e1c1ecf7f98e0c20288564d063ae5c0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:22 -0400 Subject: [PATCH 1938/2115] r/aws_glue_schema(doc): document import by identity --- website/docs/r/glue_schema.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/glue_schema.html.markdown b/website/docs/r/glue_schema.html.markdown index f9313b8d0bc9..69cb151a3770 100644 --- a/website/docs/r/glue_schema.html.markdown +++ b/website/docs/r/glue_schema.html.markdown @@ -49,6 +49,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_schema.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:schema/example-registry/example-schema" + } +} + +resource "aws_glue_schema" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue schema. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```terraform From 9739262eebc9c84049f3aa48411426df73ec0e17 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:23 -0400 Subject: [PATCH 1939/2115] r/aws_iam_openid_connect_provider(doc): document import by identity --- .../iam_openid_connect_provider.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/iam_openid_connect_provider.html.markdown b/website/docs/r/iam_openid_connect_provider.html.markdown index a5ac615be67c..b993645663b3 100644 --- a/website/docs/r/iam_openid_connect_provider.html.markdown +++ b/website/docs/r/iam_openid_connect_provider.html.markdown @@ -56,6 +56,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_openid_connect_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:oidc-provider/example.com" + } +} + +resource "aws_iam_openid_connect_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM OpenID Connect provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM OpenID Connect Providers using the `arn`. For example: ```terraform From 78f87d58dc07245c5a6664472f4246be347c1fc9 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:29 -0400 Subject: [PATCH 1940/2115] r/aws_iam_policy(doc): document import by identity --- website/docs/r/iam_policy.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/iam_policy.html.markdown b/website/docs/r/iam_policy.html.markdown index 5b8cdf13f03c..9ae174558566 100644 --- a/website/docs/r/iam_policy.html.markdown +++ b/website/docs/r/iam_policy.html.markdown @@ -60,6 +60,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_policy.example + identity = { + "arn" = "arn:aws:iam::123456789012:policy/UsersManageOwnCredentials" + } +} + +resource "aws_iam_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM Policies using the `arn`. For example: ```terraform From 0b32a160dfd6f10ce5d85f2bc6924a436d67ffa4 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:29 -0400 Subject: [PATCH 1941/2115] r/aws_iam_saml_provider(doc): document import by identity --- .../docs/r/iam_saml_provider.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/iam_saml_provider.html.markdown b/website/docs/r/iam_saml_provider.html.markdown index 05b06017ebdd..dd95a56107b4 100644 --- a/website/docs/r/iam_saml_provider.html.markdown +++ b/website/docs/r/iam_saml_provider.html.markdown @@ -37,6 +37,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_saml_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:saml-provider/ExampleProvider" + } +} + +resource "aws_iam_saml_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM SAML provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM SAML Providers using the `arn`. For example: ```terraform From fa8b597accdbb194a016427ccb7e3fa52ec50689 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:29 -0400 Subject: [PATCH 1942/2115] r/aws_iam_service_linked_role(doc): document import by identity --- .../r/iam_service_linked_role.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/iam_service_linked_role.html.markdown b/website/docs/r/iam_service_linked_role.html.markdown index d470fa01f3eb..183d1524d82a 100644 --- a/website/docs/r/iam_service_linked_role.html.markdown +++ b/website/docs/r/iam_service_linked_role.html.markdown @@ -41,6 +41,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_service_linked_role.example + identity = { + "arn" = "arn:aws:iam::123456789012:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk" + } +} + +resource "aws_iam_service_linked_role" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM service-linked role. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM service-linked roles using role ARN. For example: ```terraform From 2af2581b119446de78a6586272ceab1197ec881e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:30 -0400 Subject: [PATCH 1943/2115] r/aws_imagebuilder_container_recipe(doc): document import by identity --- ...magebuilder_container_recipe.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_container_recipe.html.markdown b/website/docs/r/imagebuilder_container_recipe.html.markdown index 991679410a55..ded8f0df6b2c 100644 --- a/website/docs/r/imagebuilder_container_recipe.html.markdown +++ b/website/docs/r/imagebuilder_container_recipe.html.markdown @@ -136,6 +136,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_container_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:container-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_container_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder container recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_container_recipe` resources using the Amazon Resource Name (ARN). For example: ```terraform From 717fb524db55c7010ba44bf2aa12024abf1938ce Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:30 -0400 Subject: [PATCH 1944/2115] r/aws_imagebuilder_distribution_configuration(doc): document import by identity --- ...r_distribution_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_distribution_configuration.html.markdown b/website/docs/r/imagebuilder_distribution_configuration.html.markdown index 35b1d0246ab2..999cf7b76bff 100644 --- a/website/docs/r/imagebuilder_distribution_configuration.html.markdown +++ b/website/docs/r/imagebuilder_distribution_configuration.html.markdown @@ -149,6 +149,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_distribution_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:distribution-configuration/example" + } +} + +resource "aws_imagebuilder_distribution_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder distribution configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_distribution_configurations` resources using the Amazon Resource Name (ARN). For example: ```terraform From 40be49b5986beaef95cfb53df0f41caccb9df590 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:35 -0400 Subject: [PATCH 1945/2115] r/aws_imagebuilder_image_pipeline(doc): document import by identity --- .../imagebuilder_image_pipeline.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_image_pipeline.html.markdown b/website/docs/r/imagebuilder_image_pipeline.html.markdown index 6c958f9e080f..839c42b7a390 100644 --- a/website/docs/r/imagebuilder_image_pipeline.html.markdown +++ b/website/docs/r/imagebuilder_image_pipeline.html.markdown @@ -156,6 +156,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_pipeline.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-pipeline/example" + } +} + +resource "aws_imagebuilder_image_pipeline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image pipeline. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_pipeline` resources using the Amazon Resource Name (ARN). For example: ```terraform From b00db1d7aa62a847806a659ded49ae512260abd2 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:35 -0400 Subject: [PATCH 1946/2115] r/aws_imagebuilder_image_recipe(doc): document import by identity --- .../r/imagebuilder_image_recipe.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_image_recipe.html.markdown b/website/docs/r/imagebuilder_image_recipe.html.markdown index 9f88df44d705..8a3f4a24307b 100644 --- a/website/docs/r/imagebuilder_image_recipe.html.markdown +++ b/website/docs/r/imagebuilder_image_recipe.html.markdown @@ -107,6 +107,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_image_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_recipe` resources using the Amazon Resource Name (ARN). For example: ```terraform From 4246f81ab2f8af6071eb13977b63a032bf9db8ca Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:35 -0400 Subject: [PATCH 1947/2115] r/aws_imagebuilder_image(doc): document import by identity --- .../docs/r/imagebuilder_image.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_image.html.markdown b/website/docs/r/imagebuilder_image.html.markdown index ed6f12105cd1..35c250c57d1b 100644 --- a/website/docs/r/imagebuilder_image.html.markdown +++ b/website/docs/r/imagebuilder_image.html.markdown @@ -112,6 +112,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image/example/1.0.0/1" + } +} + +resource "aws_imagebuilder_image" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image` resources using the Amazon Resource Name (ARN). For example: ```terraform From e92735456ef9d7e8b19ac5119a89fce79cc5a03e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:35 -0400 Subject: [PATCH 1948/2115] r/aws_imagebuilder_infrastructure_configuration(doc): document import by identity --- ...infrastructure_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown index e18ef1dfed74..483fc016b1eb 100644 --- a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown +++ b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown @@ -107,6 +107,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_infrastructure_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:infrastructure-configuration/example" + } +} + +resource "aws_imagebuilder_infrastructure_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder infrastructure configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_infrastructure_configuration` using the Amazon Resource Name (ARN). For example: ```terraform From 5cebf4b97a59ea402b9a08ba7c0c055814ad2ec0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:35 -0400 Subject: [PATCH 1949/2115] r/aws_imagebuilder_lifecycle_policy(doc): document import by identity --- ...magebuilder_lifecycle_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_lifecycle_policy.html.markdown b/website/docs/r/imagebuilder_lifecycle_policy.html.markdown index 066b619b1c72..db1d3bb4203a 100644 --- a/website/docs/r/imagebuilder_lifecycle_policy.html.markdown +++ b/website/docs/r/imagebuilder_lifecycle_policy.html.markdown @@ -176,6 +176,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_lifecycle_policy.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:lifecycle-policy/example" + } +} + +resource "aws_imagebuilder_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder lifecycle policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_lifecycle_policy` using the Amazon Resource Name (ARN). For example: ```terraform From e564aba6788f6d4a00adf6960011a9144743bad0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:41 -0400 Subject: [PATCH 1950/2115] r/aws_imagebuilder_workflow(doc): document import by identity --- .../r/imagebuilder_workflow.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/imagebuilder_workflow.html.markdown b/website/docs/r/imagebuilder_workflow.html.markdown index 41b9a8eaa13e..f66c5da68aa1 100644 --- a/website/docs/r/imagebuilder_workflow.html.markdown +++ b/website/docs/r/imagebuilder_workflow.html.markdown @@ -80,6 +80,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_workflow.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:workflow/build/example/1.0.0" + } +} + +resource "aws_imagebuilder_workflow" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder workflow. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import EC2 Image Builder Workflow using the `arn`. For example: ```terraform From 7883bc8f9c9f30411dcdb007223e12561b3723e3 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:41 -0400 Subject: [PATCH 1951/2115] r/aws_inspector_assessment_target(doc): document import by identity --- .../inspector_assessment_target.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/inspector_assessment_target.html.markdown b/website/docs/r/inspector_assessment_target.html.markdown index 9f9551fb2053..8b96dc2ea10b 100644 --- a/website/docs/r/inspector_assessment_target.html.markdown +++ b/website/docs/r/inspector_assessment_target.html.markdown @@ -42,6 +42,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_target.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678" + } +} + +resource "aws_inspector_assessment_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment target. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Inspector Classic Assessment Targets using their Amazon Resource Name (ARN). For example: ```terraform From ec78e203e7a241a4fe0b83db35641a5bc345bfb5 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:41 -0400 Subject: [PATCH 1952/2115] r/aws_inspector_assessment_template(doc): document import by identity --- ...nspector_assessment_template.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/inspector_assessment_template.html.markdown b/website/docs/r/inspector_assessment_template.html.markdown index 58618112129f..c80bb7408ccd 100644 --- a/website/docs/r/inspector_assessment_template.html.markdown +++ b/website/docs/r/inspector_assessment_template.html.markdown @@ -60,6 +60,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_template.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678/template/0-87654321" + } +} + +resource "aws_inspector_assessment_template" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment template. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_inspector_assessment_template` using the template assessment ARN. For example: ```terraform From e4c0a48390d908408fecebf73c519255f97d8ef8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:41 -0400 Subject: [PATCH 1953/2115] r/aws_ivs_channel(doc): document import by identity --- website/docs/r/ivs_channel.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ivs_channel.html.markdown b/website/docs/r/ivs_channel.html.markdown index 2e94eef39649..ca08fe414fc9 100644 --- a/website/docs/r/ivs_channel.html.markdown +++ b/website/docs/r/ivs_channel.html.markdown @@ -51,6 +51,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_channel.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh" + } +} + +resource "aws_ivs_channel" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS channel. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Channel using the ARN. For example: ```terraform From 8bb8c92599eeaf6cb1dd3a77e875fa3bab4d62db Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:41 -0400 Subject: [PATCH 1954/2115] r/aws_ivs_playback_key_pair(doc): document import by identity --- .../r/ivs_playback_key_pair.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ivs_playback_key_pair.html.markdown b/website/docs/r/ivs_playback_key_pair.html.markdown index 414db3aa6732..62214b61c5af 100644 --- a/website/docs/r/ivs_playback_key_pair.html.markdown +++ b/website/docs/r/ivs_playback_key_pair.html.markdown @@ -50,6 +50,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_playback_key_pair.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:playback-key/abcdABCDefgh" + } +} + +resource "aws_ivs_playback_key_pair" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS playback key pair. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Playback Key Pair using the ARN. For example: ```terraform From 527fdf840b2b0e3bc182ca5fa6e70f8663f4b3d7 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:47 -0400 Subject: [PATCH 1955/2115] r/aws_ivs_recording_configuration(doc): document import by identity --- .../ivs_recording_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ivs_recording_configuration.html.markdown b/website/docs/r/ivs_recording_configuration.html.markdown index 913cd26490fe..291b80087f77 100644 --- a/website/docs/r/ivs_recording_configuration.html.markdown +++ b/website/docs/r/ivs_recording_configuration.html.markdown @@ -60,6 +60,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_recording_configuration.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:recording-configuration/abcdABCDefgh" + } +} + +resource "aws_ivs_recording_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS recording configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Recording Configuration using the ARN. For example: ```terraform From aa977ff6a2976fb6fabf0c1361fe7c4cb03683d9 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:47 -0400 Subject: [PATCH 1956/2115] r/aws_ivschat_logging_configuration(doc): document import by identity --- ...vschat_logging_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ivschat_logging_configuration.html.markdown b/website/docs/r/ivschat_logging_configuration.html.markdown index 17e6b4dcdd20..5c28659d5bb8 100644 --- a/website/docs/r/ivschat_logging_configuration.html.markdown +++ b/website/docs/r/ivschat_logging_configuration.html.markdown @@ -132,6 +132,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_logging_configuration.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:logging-configuration/abcdABCDefgh" + } +} + +resource "aws_ivschat_logging_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat logging configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Logging Configuration using the ARN. For example: ```terraform From 7b4f5da687658cc97bcd18c02428c04ff5a63732 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:47 -0400 Subject: [PATCH 1957/2115] r/aws_ivschat_room(doc): document import by identity --- website/docs/r/ivschat_room.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ivschat_room.html.markdown b/website/docs/r/ivschat_room.html.markdown index d63c2f9f1271..76088d26d19f 100644 --- a/website/docs/r/ivschat_room.html.markdown +++ b/website/docs/r/ivschat_room.html.markdown @@ -87,6 +87,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_room.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:room/g1H2I3j4k5L6" + } +} + +resource "aws_ivschat_room" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat room. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Room using the ARN. For example: ```terraform From 9d6c6ad9ac6d6a56b5aeab64ee76a0bc6455103b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:47 -0400 Subject: [PATCH 1958/2115] r/aws_kinesis_resource_policy(doc): document import by identity --- .../r/kinesis_resource_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/kinesis_resource_policy.html.markdown b/website/docs/r/kinesis_resource_policy.html.markdown index 873e3c2d58d1..df59352f8509 100644 --- a/website/docs/r/kinesis_resource_policy.html.markdown +++ b/website/docs/r/kinesis_resource_policy.html.markdown @@ -54,6 +54,28 @@ This resource exports no additional attributes. ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kinesis_resource_policy.example + identity = { + "arn" = "arn:aws:kinesis:us-east-1:123456789012:stream/example-stream" + } +} + +resource "aws_kinesis_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Kinesis stream. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Kinesis resource policies using the `resource_arn`. For example: ```terraform From e4c34929e6e2a58a51e6836b863cb584d88f138d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:47 -0400 Subject: [PATCH 1959/2115] r/aws_lb_listener_rule(doc): document import by identity --- website/docs/r/lb_listener_rule.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/lb_listener_rule.html.markdown b/website/docs/r/lb_listener_rule.html.markdown index ac9da4c71dc4..638bb924284c 100644 --- a/website/docs/r/lb_listener_rule.html.markdown +++ b/website/docs/r/lb_listener_rule.html.markdown @@ -341,6 +341,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener_rule.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:listener-rule/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2/9683b2d02a6cabee" + } +} + +resource "aws_lb_listener_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import rules using their ARN. For example: ```terraform From 9e34a8a08bc625cd8af0e6627c55dc43f0b05e90 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:54 -0400 Subject: [PATCH 1960/2115] r/aws_lb_listener(doc): document import by identity --- website/docs/r/lb_listener.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/lb_listener.html.markdown b/website/docs/r/lb_listener.html.markdown index dce235c56b31..25363c464264 100644 --- a/website/docs/r/lb_listener.html.markdown +++ b/website/docs/r/lb_listener.html.markdown @@ -468,6 +468,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:187416307283:listener/app/front-end-alb/8e4497da625e2d8a/9ab28ade35828f96" + } +} + +resource "aws_lb_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import listeners using their ARN. For example: ```terraform From 93175e096bca9880416197697e99fd4cd76585b6 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:54 -0400 Subject: [PATCH 1961/2115] r/aws_lb_target_group(doc): document import by identity --- website/docs/r/lb_target_group.html.markdown | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/lb_target_group.html.markdown b/website/docs/r/lb_target_group.html.markdown index 2140b8023e38..fec8875b073e 100644 --- a/website/docs/r/lb_target_group.html.markdown +++ b/website/docs/r/lb_target_group.html.markdown @@ -233,6 +233,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_target_group.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067" + } +} + +resource "aws_lb_target_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the target group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Target Groups using their ARN. For example: ```terraform From 4bfe900b5903a78ecb9bf04a1ac903c0e11decfa Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:54 -0400 Subject: [PATCH 1962/2115] r/aws_lb_trust_store(doc): document import by identity --- website/docs/r/lb_trust_store.html.markdown | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/lb_trust_store.html.markdown b/website/docs/r/lb_trust_store.html.markdown index 3db20580248f..1057f396a4f9 100644 --- a/website/docs/r/lb_trust_store.html.markdown +++ b/website/docs/r/lb_trust_store.html.markdown @@ -62,6 +62,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_trust_store.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:truststore/my-trust-store/73e2d6bc24d8a067" + } +} + +resource "aws_lb_trust_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the trust store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Trust Stores using their ARN. For example: ```terraform From 324ce65df00322cb57b74f37883c6e670658f74d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:55 -0400 Subject: [PATCH 1963/2115] r/aws_lb(doc): document import by identity --- website/docs/r/lb.html.markdown | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/docs/r/lb.html.markdown b/website/docs/r/lb.html.markdown index 4c08f55c5eaa..973308e17517 100644 --- a/website/docs/r/lb.html.markdown +++ b/website/docs/r/lb.html.markdown @@ -181,6 +181,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188" + } +} + +resource "aws_lb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import LBs using their ARN. For example: ```terraform From 4ca484b081c3b07095bf3711f43a643a456ccae8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:51:55 -0400 Subject: [PATCH 1964/2115] r/aws_networkfirewall_tls_inspection_configuration(doc): document import by identity --- ...tls_inspection_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown b/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown index 9ada5afe5a14..e54fb3259c00 100644 --- a/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown +++ b/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown @@ -339,6 +339,28 @@ The `certificates` block exports the following attributes: ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_networkfirewall_tls_inspection_configuration.example + identity = { + "arn" = "arn:aws:network-firewall:us-west-2:123456789012:tls-configuration/example" + } +} + +resource "aws_networkfirewall_tls_inspection_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Network Firewall TLS inspection configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Network Firewall TLS Inspection Configuration using the `arn`. For example: ```terraform From 2be7646feb9a8a52390c4e23c0d0f18df373176c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:00 -0400 Subject: [PATCH 1965/2115] r/aws_paymentcryptography_key(doc): document import by identity --- .../r/paymentcryptography_key.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/paymentcryptography_key.html.markdown b/website/docs/r/paymentcryptography_key.html.markdown index e2eb6cc00373..20565e8acf3d 100644 --- a/website/docs/r/paymentcryptography_key.html.markdown +++ b/website/docs/r/paymentcryptography_key.html.markdown @@ -88,6 +88,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_paymentcryptography_key.example + identity = { + "arn" = "arn:aws:payment-cryptography:us-east-1:123456789012:key/1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_paymentcryptography_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Payment Cryptography key. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Payment Cryptography Control Plane Key using the `arn:aws:payment-cryptography:us-east-1:123456789012:key/qtbojf64yshyvyzf`. For example: ```terraform From 0e00c27c30b846fc1b35e5aeb9fc5b50879d3770 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:00 -0400 Subject: [PATCH 1966/2115] r/aws_rds_integration(doc): document import by identity --- website/docs/r/rds_integration.html.markdown | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/rds_integration.html.markdown b/website/docs/r/rds_integration.html.markdown index ed53dcfb87d7..8050544cf45d 100644 --- a/website/docs/r/rds_integration.html.markdown +++ b/website/docs/r/rds_integration.html.markdown @@ -132,6 +132,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_rds_integration.example + identity = { + "arn" = "arn:aws:rds:us-east-1:123456789012:integration:12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_rds_integration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the RDS integration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import RDS (Relational Database) Integration using the `arn`. For example: ```terraform From 6105b0f2a705b0a2676bb258f49d6f74feb28b74 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:00 -0400 Subject: [PATCH 1967/2115] r/aws_resourceexplorer2_index(doc): document import by identity --- .../r/resourceexplorer2_index.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/resourceexplorer2_index.html.markdown b/website/docs/r/resourceexplorer2_index.html.markdown index 6b9f1d1f5df7..c89cb2289f83 100644 --- a/website/docs/r/resourceexplorer2_index.html.markdown +++ b/website/docs/r/resourceexplorer2_index.html.markdown @@ -43,6 +43,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_index.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:index/example-index-id" + } +} + +resource "aws_resourceexplorer2_index" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer index. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer indexes using the `arn`. For example: ```terraform From a6332ca894a1acb50962b622c202d3b8ef250496 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:00 -0400 Subject: [PATCH 1968/2115] r/aws_resourceexplorer2_view(doc): document import by identity --- .../r/resourceexplorer2_view.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/resourceexplorer2_view.html.markdown b/website/docs/r/resourceexplorer2_view.html.markdown index 33b2ea1d9210..8225f8c2de39 100644 --- a/website/docs/r/resourceexplorer2_view.html.markdown +++ b/website/docs/r/resourceexplorer2_view.html.markdown @@ -65,6 +65,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_view.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:view/example-view/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_resourceexplorer2_view" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer view. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer views using the `arn`. For example: ```terraform From 0fb8b623ce64f991095d46e1ff9c66745750f545 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:00 -0400 Subject: [PATCH 1969/2115] r/aws_secretsmanager_secret_policy(doc): document import by identity --- ...secretsmanager_secret_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/secretsmanager_secret_policy.html.markdown b/website/docs/r/secretsmanager_secret_policy.html.markdown index fb81412e68c9..49a52281463f 100644 --- a/website/docs/r/secretsmanager_secret_policy.html.markdown +++ b/website/docs/r/secretsmanager_secret_policy.html.markdown @@ -60,6 +60,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_policy.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_policy` using the secret Amazon Resource Name (ARN). For example: ```terraform From dfba70caddf5ea935c170d45c6723766c14d0af8 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:17 -0400 Subject: [PATCH 1970/2115] r/aws_secretsmanager_secret_rotation(doc): document import by identity --- ...cretsmanager_secret_rotation.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/secretsmanager_secret_rotation.html.markdown b/website/docs/r/secretsmanager_secret_rotation.html.markdown index 4d99d9d1ee54..28e459d326da 100644 --- a/website/docs/r/secretsmanager_secret_rotation.html.markdown +++ b/website/docs/r/secretsmanager_secret_rotation.html.markdown @@ -59,6 +59,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_rotation.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_rotation` using the secret Amazon Resource Name (ARN). For example: ```terraform From d6bd59770e424b3a06a1d6e926fa460b1da543ec Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:17 -0400 Subject: [PATCH 1971/2115] r/aws_secretsmanager_secret(doc): document import by identity --- .../r/secretsmanager_secret.html.markdown | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/docs/r/secretsmanager_secret.html.markdown b/website/docs/r/secretsmanager_secret.html.markdown index 96f731c57c23..46aaea445f8d 100644 --- a/website/docs/r/secretsmanager_secret.html.markdown +++ b/website/docs/r/secretsmanager_secret.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret` using the secret Amazon Resource Name (ARN). For example: ```terraform From 457e382949e3358655b45e2b7b0b29bed02c5bf1 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:17 -0400 Subject: [PATCH 1972/2115] r/aws_securityhub_automation_rule(doc): document import by identity --- .../securityhub_automation_rule.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/securityhub_automation_rule.html.markdown b/website/docs/r/securityhub_automation_rule.html.markdown index 4638e55b1ead..b759c205271a 100644 --- a/website/docs/r/securityhub_automation_rule.html.markdown +++ b/website/docs/r/securityhub_automation_rule.html.markdown @@ -202,6 +202,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securityhub_automation_rule.example + identity = { + "arn" = "arn:aws:securityhub:us-east-1:123456789012:automation-rule/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_securityhub_automation_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Hub automation rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub Automation Rule using their ARN. For example: ```terraform From 2733e51787e3d25c8a57d9afdb58a84b716ce085 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:17 -0400 Subject: [PATCH 1973/2115] r/aws_securitylake_data_lake(doc): document import by identity --- .../r/securitylake_data_lake.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/securitylake_data_lake.html.markdown b/website/docs/r/securitylake_data_lake.html.markdown index 495fb0ad3e58..7b5472dabf47 100644 --- a/website/docs/r/securitylake_data_lake.html.markdown +++ b/website/docs/r/securitylake_data_lake.html.markdown @@ -115,6 +115,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securitylake_data_lake.example + identity = { + "arn" = "arn:aws:securitylake:us-east-1:123456789012:data-lake/default" + } +} + +resource "aws_securitylake_data_lake" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Lake data lake. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub standards subscriptions using the standards subscription ARN. For example: ```terraform From f83de80ffb7282c6625e03bf929982a41ccb1487 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:17 -0400 Subject: [PATCH 1974/2115] r/aws_sns_topic_data_protection_policy(doc): document import by identity --- ...topic_data_protection_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/sns_topic_data_protection_policy.html.markdown b/website/docs/r/sns_topic_data_protection_policy.html.markdown index 95eab80c0740..2470dd6cd1c9 100644 --- a/website/docs/r/sns_topic_data_protection_policy.html.markdown +++ b/website/docs/r/sns_topic_data_protection_policy.html.markdown @@ -58,6 +58,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_data_protection_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:example" + } +} + +resource "aws_sns_topic_data_protection_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Data Protection Topic Policy using the topic ARN. For example: ```terraform From 72ad3ed8a796cf6e40575d1e68cdc055e1c94860 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:23 -0400 Subject: [PATCH 1975/2115] r/aws_sns_topic_policy(doc): document import by identity --- website/docs/r/sns_topic_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/sns_topic_policy.html.markdown b/website/docs/r/sns_topic_policy.html.markdown index b555d9fed777..fffa922fb3b9 100644 --- a/website/docs/r/sns_topic_policy.html.markdown +++ b/website/docs/r/sns_topic_policy.html.markdown @@ -82,6 +82,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Policy using the topic ARN. For example: ```terraform From 801b328aca92e077cb56d132a5ddbfc596905231 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:23 -0400 Subject: [PATCH 1976/2115] r/aws_sns_topic_subscription(doc): document import by identity --- .../r/sns_topic_subscription.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/sns_topic_subscription.html.markdown b/website/docs/r/sns_topic_subscription.html.markdown index 9ab7a169a74e..31435c3051d0 100644 --- a/website/docs/r/sns_topic_subscription.html.markdown +++ b/website/docs/r/sns_topic_subscription.html.markdown @@ -335,6 +335,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_subscription.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic:8a21d249-4329-4871-acc6-7be709c6ea7f" + } +} + +resource "aws_sns_topic_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Subscriptions using the subscription `arn`. For example: ```terraform From b182e8a682588f469a4c90db3ab8fce5f86405fa Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:24 -0400 Subject: [PATCH 1977/2115] r/aws_sns_topic(doc): document import by identity --- website/docs/r/sns_topic.html.markdown | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/website/docs/r/sns_topic.html.markdown b/website/docs/r/sns_topic.html.markdown index e82721f28ba0..996c2cf6a037 100644 --- a/website/docs/r/sns_topic.html.markdown +++ b/website/docs/r/sns_topic.html.markdown @@ -114,6 +114,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topics using the topic `arn`. For example: ```terraform From e3d4744b2aa569e926202e8cdab4aa7a2bafb54c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:24 -0400 Subject: [PATCH 1978/2115] r/aws_ssmcontacts_rotation(doc): document import by identity --- .../docs/r/ssmcontacts_rotation.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ssmcontacts_rotation.html.markdown b/website/docs/r/ssmcontacts_rotation.html.markdown index 54fc453059d8..6b0b2e507e23 100644 --- a/website/docs/r/ssmcontacts_rotation.html.markdown +++ b/website/docs/r/ssmcontacts_rotation.html.markdown @@ -194,6 +194,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssmcontacts_rotation.example + identity = { + "arn" = "arn:aws:ssm-contacts:us-east-1:123456789012:rotation/example-rotation" + } +} + +resource "aws_ssmcontacts_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSM Contacts rotation. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSMContacts Rotation using the `arn`. For example: ```terraform From d925bba68d3439e38ba2acb73db87987226bfd77 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:24 -0400 Subject: [PATCH 1979/2115] r/aws_ssoadmin_application_assignment_configuration(doc): document import by identity --- ...ion_assignment_configuration.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown b/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown index 290916c00243..c6867099e066 100644 --- a/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown +++ b/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown @@ -41,6 +41,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application_assignment_configuration.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application_assignment_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application Assignment Configuration using the `id`. For example: ```terraform From 5490663acaf160a7361bd891343255694e0bf78c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:28 -0400 Subject: [PATCH 1980/2115] r/aws_ssoadmin_application(doc): document import by identity --- .../docs/r/ssoadmin_application.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/ssoadmin_application.html.markdown b/website/docs/r/ssoadmin_application.html.markdown index fb769400a3a4..ff1d00a90ee3 100644 --- a/website/docs/r/ssoadmin_application.html.markdown +++ b/website/docs/r/ssoadmin_application.html.markdown @@ -89,6 +89,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application using the `id`. For example: ```terraform From 52b48821f352182084bd4d0e073ffe1c4d8f622f Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 13:52:28 -0400 Subject: [PATCH 1981/2115] r/aws_xray_group(doc): document import by identity --- website/docs/r/xray_group.html.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/xray_group.html.markdown b/website/docs/r/xray_group.html.markdown index 3e72c86533bd..f1951fe36013 100644 --- a/website/docs/r/xray_group.html.markdown +++ b/website/docs/r/xray_group.html.markdown @@ -51,6 +51,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import + +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_xray_group.example + identity = { + "arn" = "arn:aws:xray:us-west-2:123456789012:group/example-group/AFAEAFE" + } +} + +resource "aws_xray_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the X-Ray group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import XRay Groups using the ARN. For example: ```terraform From 06f22157a4b986975b8b5c35817169279cee9c7d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Tue, 9 Sep 2025 14:13:39 -0400 Subject: [PATCH 1982/2115] chore: website linter fixes --- website/docs/r/acmpca_certificate.html.markdown | 1 - website/docs/r/acmpca_certificate_authority.html.markdown | 1 - website/docs/r/acmpca_policy.html.markdown | 1 - .../r/api_gateway_domain_name_access_association.html.markdown | 1 - website/docs/r/appfabric_app_bundle.html.markdown | 1 - .../r/apprunner_auto_scaling_configuration_version.html.markdown | 1 - .../docs/r/apprunner_observability_configuration.html.markdown | 1 - website/docs/r/apprunner_service.html.markdown | 1 - website/docs/r/apprunner_vpc_connector.html.markdown | 1 - website/docs/r/apprunner_vpc_ingress_connection.html.markdown | 1 - website/docs/r/batch_job_definition.html.markdown | 1 - website/docs/r/batch_job_queue.html.markdown | 1 - website/docs/r/bcmdataexports_export.html.markdown | 1 - website/docs/r/bedrock_custom_model.html.markdown | 1 - .../docs/r/bedrock_provisioned_model_throughput.html.markdown | 1 - website/docs/r/ce_anomaly_monitor.html.markdown | 1 - website/docs/r/ce_anomaly_subscription.html.markdown | 1 - website/docs/r/ce_cost_category.html.markdown | 1 - ...pipelines_media_insights_pipeline_configuration.html.markdown | 1 - website/docs/r/cloudfront_realtime_log_config.html.markdown | 1 - website/docs/r/cloudtrail_event_data_store.html.markdown | 1 - website/docs/r/codeartifact_domain.html.markdown | 1 - .../docs/r/codeartifact_domain_permissions_policy.html.markdown | 1 - website/docs/r/codeartifact_repository.html.markdown | 1 - .../r/codeartifact_repository_permissions_policy.html.markdown | 1 - website/docs/r/codebuild_fleet.html.markdown | 1 - website/docs/r/codebuild_report_group.html.markdown | 1 - website/docs/r/codebuild_resource_policy.html.markdown | 1 - website/docs/r/codebuild_source_credential.html.markdown | 1 - website/docs/r/codeconnections_connection.html.markdown | 1 - website/docs/r/codeconnections_host.html.markdown | 1 - website/docs/r/codepipeline_webhook.html.markdown | 1 - website/docs/r/codestarconnections_connection.html.markdown | 1 - website/docs/r/codestarconnections_host.html.markdown | 1 - .../docs/r/codestarnotifications_notification_rule.html.markdown | 1 - website/docs/r/comprehend_document_classifier.html.markdown | 1 - website/docs/r/comprehend_entity_recognizer.html.markdown | 1 - website/docs/r/datasync_agent.html.markdown | 1 - website/docs/r/datasync_location_azure_blob.html.markdown | 1 - website/docs/r/datasync_location_efs.html.markdown | 1 - website/docs/r/datasync_location_hdfs.html.markdown | 1 - website/docs/r/datasync_location_nfs.html.markdown | 1 - website/docs/r/datasync_location_object_storage.html.markdown | 1 - website/docs/r/datasync_location_s3.html.markdown | 1 - website/docs/r/datasync_location_smb.html.markdown | 1 - website/docs/r/datasync_task.html.markdown | 1 - website/docs/r/devicefarm_device_pool.html.markdown | 1 - website/docs/r/devicefarm_instance_profile.html.markdown | 1 - website/docs/r/devicefarm_network_profile.html.markdown | 1 - website/docs/r/devicefarm_project.html.markdown | 1 - website/docs/r/devicefarm_test_grid_project.html.markdown | 1 - website/docs/r/devicefarm_upload.html.markdown | 1 - website/docs/r/dms_replication_config.html.markdown | 1 - website/docs/r/dynamodb_resource_policy.html.markdown | 1 - website/docs/r/dynamodb_table_export.html.markdown | 1 - website/docs/r/ecs_capacity_provider.html.markdown | 1 - website/docs/r/globalaccelerator_accelerator.html.markdown | 1 - .../r/globalaccelerator_cross_account_attachment.html.markdown | 1 - .../r/globalaccelerator_custom_routing_accelerator.html.markdown | 1 - ...globalaccelerator_custom_routing_endpoint_group.html.markdown | 1 - .../r/globalaccelerator_custom_routing_listener.html.markdown | 1 - website/docs/r/globalaccelerator_endpoint_group.html.markdown | 1 - website/docs/r/globalaccelerator_listener.html.markdown | 1 - website/docs/r/glue_registry.html.markdown | 1 - website/docs/r/glue_schema.html.markdown | 1 - website/docs/r/iam_openid_connect_provider.html.markdown | 1 - website/docs/r/iam_policy.html.markdown | 1 - website/docs/r/iam_saml_provider.html.markdown | 1 - website/docs/r/iam_service_linked_role.html.markdown | 1 - website/docs/r/imagebuilder_container_recipe.html.markdown | 1 - .../docs/r/imagebuilder_distribution_configuration.html.markdown | 1 - website/docs/r/imagebuilder_image.html.markdown | 1 - website/docs/r/imagebuilder_image_pipeline.html.markdown | 1 - website/docs/r/imagebuilder_image_recipe.html.markdown | 1 - .../r/imagebuilder_infrastructure_configuration.html.markdown | 1 - website/docs/r/imagebuilder_lifecycle_policy.html.markdown | 1 - website/docs/r/imagebuilder_workflow.html.markdown | 1 - website/docs/r/inspector_assessment_target.html.markdown | 1 - website/docs/r/inspector_assessment_template.html.markdown | 1 - website/docs/r/ivs_channel.html.markdown | 1 - website/docs/r/ivs_playback_key_pair.html.markdown | 1 - website/docs/r/ivs_recording_configuration.html.markdown | 1 - website/docs/r/ivschat_logging_configuration.html.markdown | 1 - website/docs/r/ivschat_room.html.markdown | 1 - website/docs/r/kinesis_resource_policy.html.markdown | 1 - website/docs/r/lb_listener.html.markdown | 1 - website/docs/r/lb_listener_rule.html.markdown | 1 - website/docs/r/lb_target_group.html.markdown | 1 - website/docs/r/lb_trust_store.html.markdown | 1 - .../r/networkfirewall_tls_inspection_configuration.html.markdown | 1 - website/docs/r/paymentcryptography_key.html.markdown | 1 - website/docs/r/rds_integration.html.markdown | 1 - website/docs/r/resourceexplorer2_index.html.markdown | 1 - website/docs/r/resourceexplorer2_view.html.markdown | 1 - website/docs/r/secretsmanager_secret_policy.html.markdown | 1 - website/docs/r/secretsmanager_secret_rotation.html.markdown | 1 - website/docs/r/securityhub_automation_rule.html.markdown | 1 - website/docs/r/securitylake_data_lake.html.markdown | 1 - website/docs/r/sns_topic_data_protection_policy.html.markdown | 1 - website/docs/r/sns_topic_policy.html.markdown | 1 - website/docs/r/sns_topic_subscription.html.markdown | 1 - website/docs/r/ssmcontacts_rotation.html.markdown | 1 - website/docs/r/ssoadmin_application.html.markdown | 1 - .../ssoadmin_application_assignment_configuration.html.markdown | 1 - website/docs/r/xray_group.html.markdown | 1 - 105 files changed, 105 deletions(-) diff --git a/website/docs/r/acmpca_certificate.html.markdown b/website/docs/r/acmpca_certificate.html.markdown index 8648a8e5a079..7f1ef51e57ed 100644 --- a/website/docs/r/acmpca_certificate.html.markdown +++ b/website/docs/r/acmpca_certificate.html.markdown @@ -84,7 +84,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/acmpca_certificate_authority.html.markdown b/website/docs/r/acmpca_certificate_authority.html.markdown index 1ef07bd89d3f..0d161ce725ac 100644 --- a/website/docs/r/acmpca_certificate_authority.html.markdown +++ b/website/docs/r/acmpca_certificate_authority.html.markdown @@ -184,7 +184,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/acmpca_policy.html.markdown b/website/docs/r/acmpca_policy.html.markdown index dffdf43909a3..385421bc67f0 100644 --- a/website/docs/r/acmpca_policy.html.markdown +++ b/website/docs/r/acmpca_policy.html.markdown @@ -76,7 +76,6 @@ This resource exports no additional attributes. ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/api_gateway_domain_name_access_association.html.markdown b/website/docs/r/api_gateway_domain_name_access_association.html.markdown index 59e15a92ddf2..ce6f20691ce6 100644 --- a/website/docs/r/api_gateway_domain_name_access_association.html.markdown +++ b/website/docs/r/api_gateway_domain_name_access_association.html.markdown @@ -40,7 +40,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/appfabric_app_bundle.html.markdown b/website/docs/r/appfabric_app_bundle.html.markdown index 34567b0f8f30..3a4b24c417f4 100644 --- a/website/docs/r/appfabric_app_bundle.html.markdown +++ b/website/docs/r/appfabric_app_bundle.html.markdown @@ -40,7 +40,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown b/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown index 3b6d000cb95e..d03d26eba389 100644 --- a/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown +++ b/website/docs/r/apprunner_auto_scaling_configuration_version.html.markdown @@ -49,7 +49,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/apprunner_observability_configuration.html.markdown b/website/docs/r/apprunner_observability_configuration.html.markdown index ee4698e2fbfd..b93af4fb9665 100644 --- a/website/docs/r/apprunner_observability_configuration.html.markdown +++ b/website/docs/r/apprunner_observability_configuration.html.markdown @@ -53,7 +53,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/apprunner_service.html.markdown b/website/docs/r/apprunner_service.html.markdown index 37b5357527a5..a13448cf4d83 100644 --- a/website/docs/r/apprunner_service.html.markdown +++ b/website/docs/r/apprunner_service.html.markdown @@ -273,7 +273,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/apprunner_vpc_connector.html.markdown b/website/docs/r/apprunner_vpc_connector.html.markdown index 0e10c84379fa..d81523735e0f 100644 --- a/website/docs/r/apprunner_vpc_connector.html.markdown +++ b/website/docs/r/apprunner_vpc_connector.html.markdown @@ -41,7 +41,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/apprunner_vpc_ingress_connection.html.markdown b/website/docs/r/apprunner_vpc_ingress_connection.html.markdown index ef6849a27614..8c42c530f33c 100644 --- a/website/docs/r/apprunner_vpc_ingress_connection.html.markdown +++ b/website/docs/r/apprunner_vpc_ingress_connection.html.markdown @@ -57,7 +57,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/batch_job_definition.html.markdown b/website/docs/r/batch_job_definition.html.markdown index 97b575f75875..3abfbfb22b36 100644 --- a/website/docs/r/batch_job_definition.html.markdown +++ b/website/docs/r/batch_job_definition.html.markdown @@ -378,7 +378,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/batch_job_queue.html.markdown b/website/docs/r/batch_job_queue.html.markdown index d577b5eeeaf0..5a05a0ad248b 100644 --- a/website/docs/r/batch_job_queue.html.markdown +++ b/website/docs/r/batch_job_queue.html.markdown @@ -111,7 +111,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/bcmdataexports_export.html.markdown b/website/docs/r/bcmdataexports_export.html.markdown index 927b4585f310..768262af4647 100644 --- a/website/docs/r/bcmdataexports_export.html.markdown +++ b/website/docs/r/bcmdataexports_export.html.markdown @@ -111,7 +111,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/bedrock_custom_model.html.markdown b/website/docs/r/bedrock_custom_model.html.markdown index 37e9bb91a485..8177d81b84b6 100644 --- a/website/docs/r/bedrock_custom_model.html.markdown +++ b/website/docs/r/bedrock_custom_model.html.markdown @@ -98,7 +98,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/bedrock_provisioned_model_throughput.html.markdown b/website/docs/r/bedrock_provisioned_model_throughput.html.markdown index e754efbd9279..59668b1e2383 100644 --- a/website/docs/r/bedrock_provisioned_model_throughput.html.markdown +++ b/website/docs/r/bedrock_provisioned_model_throughput.html.markdown @@ -47,7 +47,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ce_anomaly_monitor.html.markdown b/website/docs/r/ce_anomaly_monitor.html.markdown index 26fee1feb6b4..63e00e32a732 100644 --- a/website/docs/r/ce_anomaly_monitor.html.markdown +++ b/website/docs/r/ce_anomaly_monitor.html.markdown @@ -69,7 +69,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ce_anomaly_subscription.html.markdown b/website/docs/r/ce_anomaly_subscription.html.markdown index 6a67a997881d..16da0ed5137b 100644 --- a/website/docs/r/ce_anomaly_subscription.html.markdown +++ b/website/docs/r/ce_anomaly_subscription.html.markdown @@ -255,7 +255,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ce_cost_category.html.markdown b/website/docs/r/ce_cost_category.html.markdown index 0cba9ad3e0d3..e0536e714a48 100644 --- a/website/docs/r/ce_cost_category.html.markdown +++ b/website/docs/r/ce_cost_category.html.markdown @@ -126,7 +126,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown b/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown index 7c6b9c04be35..c377e26567d3 100644 --- a/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown +++ b/website/docs/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown @@ -358,7 +358,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/cloudfront_realtime_log_config.html.markdown b/website/docs/r/cloudfront_realtime_log_config.html.markdown index 9324d8ade06a..2e44a3e1b305 100644 --- a/website/docs/r/cloudfront_realtime_log_config.html.markdown +++ b/website/docs/r/cloudfront_realtime_log_config.html.markdown @@ -99,7 +99,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/cloudtrail_event_data_store.html.markdown b/website/docs/r/cloudtrail_event_data_store.html.markdown index fb5154296ab2..69fd64cdb6b9 100644 --- a/website/docs/r/cloudtrail_event_data_store.html.markdown +++ b/website/docs/r/cloudtrail_event_data_store.html.markdown @@ -119,7 +119,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeartifact_domain.html.markdown b/website/docs/r/codeartifact_domain.html.markdown index 546343f3e482..7b7d7d1f2cd6 100644 --- a/website/docs/r/codeartifact_domain.html.markdown +++ b/website/docs/r/codeartifact_domain.html.markdown @@ -42,7 +42,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeartifact_domain_permissions_policy.html.markdown b/website/docs/r/codeartifact_domain_permissions_policy.html.markdown index f1839767ab88..6d7c15ed0bf7 100644 --- a/website/docs/r/codeartifact_domain_permissions_policy.html.markdown +++ b/website/docs/r/codeartifact_domain_permissions_policy.html.markdown @@ -60,7 +60,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeartifact_repository.html.markdown b/website/docs/r/codeartifact_repository.html.markdown index 963a3c0b07da..c153c6c4bb55 100644 --- a/website/docs/r/codeartifact_repository.html.markdown +++ b/website/docs/r/codeartifact_repository.html.markdown @@ -96,7 +96,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeartifact_repository_permissions_policy.html.markdown b/website/docs/r/codeartifact_repository_permissions_policy.html.markdown index f29a91a460f0..e0007ae829bc 100644 --- a/website/docs/r/codeartifact_repository_permissions_policy.html.markdown +++ b/website/docs/r/codeartifact_repository_permissions_policy.html.markdown @@ -67,7 +67,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codebuild_fleet.html.markdown b/website/docs/r/codebuild_fleet.html.markdown index b17e14d0dcf3..4d093173aa5f 100644 --- a/website/docs/r/codebuild_fleet.html.markdown +++ b/website/docs/r/codebuild_fleet.html.markdown @@ -100,7 +100,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codebuild_report_group.html.markdown b/website/docs/r/codebuild_report_group.html.markdown index 4b5de3832fe3..28bba164d66c 100644 --- a/website/docs/r/codebuild_report_group.html.markdown +++ b/website/docs/r/codebuild_report_group.html.markdown @@ -93,7 +93,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codebuild_resource_policy.html.markdown b/website/docs/r/codebuild_resource_policy.html.markdown index 4aad7d82ed68..52cbeec6d107 100644 --- a/website/docs/r/codebuild_resource_policy.html.markdown +++ b/website/docs/r/codebuild_resource_policy.html.markdown @@ -65,7 +65,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codebuild_source_credential.html.markdown b/website/docs/r/codebuild_source_credential.html.markdown index 250912575ad2..2887083cc54d 100644 --- a/website/docs/r/codebuild_source_credential.html.markdown +++ b/website/docs/r/codebuild_source_credential.html.markdown @@ -70,7 +70,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeconnections_connection.html.markdown b/website/docs/r/codeconnections_connection.html.markdown index f584eefaf2b9..d6e72d818f10 100644 --- a/website/docs/r/codeconnections_connection.html.markdown +++ b/website/docs/r/codeconnections_connection.html.markdown @@ -44,7 +44,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codeconnections_host.html.markdown b/website/docs/r/codeconnections_host.html.markdown index 194c92e44469..46274a2e1b43 100644 --- a/website/docs/r/codeconnections_host.html.markdown +++ b/website/docs/r/codeconnections_host.html.markdown @@ -51,7 +51,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codepipeline_webhook.html.markdown b/website/docs/r/codepipeline_webhook.html.markdown index b868d8bb5025..9492d0da929c 100644 --- a/website/docs/r/codepipeline_webhook.html.markdown +++ b/website/docs/r/codepipeline_webhook.html.markdown @@ -139,7 +139,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codestarconnections_connection.html.markdown b/website/docs/r/codestarconnections_connection.html.markdown index a2ed8e1692de..d904fcb32a04 100644 --- a/website/docs/r/codestarconnections_connection.html.markdown +++ b/website/docs/r/codestarconnections_connection.html.markdown @@ -82,7 +82,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codestarconnections_host.html.markdown b/website/docs/r/codestarconnections_host.html.markdown index 8cf13cee8e21..8fe10e6bf6f3 100644 --- a/website/docs/r/codestarconnections_host.html.markdown +++ b/website/docs/r/codestarconnections_host.html.markdown @@ -49,7 +49,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/codestarnotifications_notification_rule.html.markdown b/website/docs/r/codestarnotifications_notification_rule.html.markdown index ba62366f3b21..60e47fa855ea 100644 --- a/website/docs/r/codestarnotifications_notification_rule.html.markdown +++ b/website/docs/r/codestarnotifications_notification_rule.html.markdown @@ -81,7 +81,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/comprehend_document_classifier.html.markdown b/website/docs/r/comprehend_document_classifier.html.markdown index cf45aa1749d4..b0b7bab6be54 100644 --- a/website/docs/r/comprehend_document_classifier.html.markdown +++ b/website/docs/r/comprehend_document_classifier.html.markdown @@ -134,7 +134,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/comprehend_entity_recognizer.html.markdown b/website/docs/r/comprehend_entity_recognizer.html.markdown index b170cee0075a..3a0723a25b65 100644 --- a/website/docs/r/comprehend_entity_recognizer.html.markdown +++ b/website/docs/r/comprehend_entity_recognizer.html.markdown @@ -159,7 +159,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_agent.html.markdown b/website/docs/r/datasync_agent.html.markdown index f442f2e503b1..a66ee44cc342 100644 --- a/website/docs/r/datasync_agent.html.markdown +++ b/website/docs/r/datasync_agent.html.markdown @@ -78,7 +78,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_azure_blob.html.markdown b/website/docs/r/datasync_location_azure_blob.html.markdown index 819f59561ea0..563e15c4ab8c 100644 --- a/website/docs/r/datasync_location_azure_blob.html.markdown +++ b/website/docs/r/datasync_location_azure_blob.html.markdown @@ -53,7 +53,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_efs.html.markdown b/website/docs/r/datasync_location_efs.html.markdown index 9d40c5b4c76e..e82902f8f21b 100644 --- a/website/docs/r/datasync_location_efs.html.markdown +++ b/website/docs/r/datasync_location_efs.html.markdown @@ -57,7 +57,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_hdfs.html.markdown b/website/docs/r/datasync_location_hdfs.html.markdown index 98de24a4afe3..db8e47579199 100644 --- a/website/docs/r/datasync_location_hdfs.html.markdown +++ b/website/docs/r/datasync_location_hdfs.html.markdown @@ -85,7 +85,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_nfs.html.markdown b/website/docs/r/datasync_location_nfs.html.markdown index 308f6fbbedf0..2015fe3cf6a7 100644 --- a/website/docs/r/datasync_location_nfs.html.markdown +++ b/website/docs/r/datasync_location_nfs.html.markdown @@ -58,7 +58,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_object_storage.html.markdown b/website/docs/r/datasync_location_object_storage.html.markdown index 1bc887279d9f..72051d0f8391 100644 --- a/website/docs/r/datasync_location_object_storage.html.markdown +++ b/website/docs/r/datasync_location_object_storage.html.markdown @@ -48,7 +48,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_s3.html.markdown b/website/docs/r/datasync_location_s3.html.markdown index 49b22a9ae352..9fa7e652737f 100644 --- a/website/docs/r/datasync_location_s3.html.markdown +++ b/website/docs/r/datasync_location_s3.html.markdown @@ -68,7 +68,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_location_smb.html.markdown b/website/docs/r/datasync_location_smb.html.markdown index f143d52ac7a2..3d169079b423 100644 --- a/website/docs/r/datasync_location_smb.html.markdown +++ b/website/docs/r/datasync_location_smb.html.markdown @@ -55,7 +55,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/datasync_task.html.markdown b/website/docs/r/datasync_task.html.markdown index d5df99d44aae..327a9cf3b791 100644 --- a/website/docs/r/datasync_task.html.markdown +++ b/website/docs/r/datasync_task.html.markdown @@ -176,7 +176,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_device_pool.html.markdown b/website/docs/r/devicefarm_device_pool.html.markdown index cd122441d706..202076cd3e9e 100644 --- a/website/docs/r/devicefarm_device_pool.html.markdown +++ b/website/docs/r/devicefarm_device_pool.html.markdown @@ -51,7 +51,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_instance_profile.html.markdown b/website/docs/r/devicefarm_instance_profile.html.markdown index e11430d6e7b9..7669bb64f178 100644 --- a/website/docs/r/devicefarm_instance_profile.html.markdown +++ b/website/docs/r/devicefarm_instance_profile.html.markdown @@ -41,7 +41,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_network_profile.html.markdown b/website/docs/r/devicefarm_network_profile.html.markdown index a3c4bbbaeab7..373feefad700 100644 --- a/website/docs/r/devicefarm_network_profile.html.markdown +++ b/website/docs/r/devicefarm_network_profile.html.markdown @@ -53,7 +53,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_project.html.markdown b/website/docs/r/devicefarm_project.html.markdown index 722f0a274b30..d08f30db9637 100644 --- a/website/docs/r/devicefarm_project.html.markdown +++ b/website/docs/r/devicefarm_project.html.markdown @@ -43,7 +43,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_test_grid_project.html.markdown b/website/docs/r/devicefarm_test_grid_project.html.markdown index 06d09678f555..40c16f1230f6 100644 --- a/website/docs/r/devicefarm_test_grid_project.html.markdown +++ b/website/docs/r/devicefarm_test_grid_project.html.markdown @@ -51,7 +51,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/devicefarm_upload.html.markdown b/website/docs/r/devicefarm_upload.html.markdown index 47b90d37ccbf..95c52156a8ab 100644 --- a/website/docs/r/devicefarm_upload.html.markdown +++ b/website/docs/r/devicefarm_upload.html.markdown @@ -47,7 +47,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/dms_replication_config.html.markdown b/website/docs/r/dms_replication_config.html.markdown index eb9bb50b41a2..948d1be63166 100644 --- a/website/docs/r/dms_replication_config.html.markdown +++ b/website/docs/r/dms_replication_config.html.markdown @@ -90,7 +90,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/dynamodb_resource_policy.html.markdown b/website/docs/r/dynamodb_resource_policy.html.markdown index a6e97cb57d9b..9648292634df 100644 --- a/website/docs/r/dynamodb_resource_policy.html.markdown +++ b/website/docs/r/dynamodb_resource_policy.html.markdown @@ -42,7 +42,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/dynamodb_table_export.html.markdown b/website/docs/r/dynamodb_table_export.html.markdown index 9178a5bf1315..46ed37a84838 100644 --- a/website/docs/r/dynamodb_table_export.html.markdown +++ b/website/docs/r/dynamodb_table_export.html.markdown @@ -120,7 +120,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ecs_capacity_provider.html.markdown b/website/docs/r/ecs_capacity_provider.html.markdown index ae8a50b60942..9dd2f4a13b2b 100644 --- a/website/docs/r/ecs_capacity_provider.html.markdown +++ b/website/docs/r/ecs_capacity_provider.html.markdown @@ -77,7 +77,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_accelerator.html.markdown b/website/docs/r/globalaccelerator_accelerator.html.markdown index ab8a802fa30c..307aa167ce62 100644 --- a/website/docs/r/globalaccelerator_accelerator.html.markdown +++ b/website/docs/r/globalaccelerator_accelerator.html.markdown @@ -74,7 +74,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown b/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown index c0478f047411..3f7da5fbba59 100644 --- a/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown +++ b/website/docs/r/globalaccelerator_cross_account_attachment.html.markdown @@ -69,7 +69,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown b/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown index 8991ae04fe7c..70e63deb186e 100644 --- a/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_accelerator.html.markdown @@ -73,7 +73,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown b/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown index 556a47a9a9b1..4c0d234fc650 100644 --- a/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_endpoint_group.html.markdown @@ -64,7 +64,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown b/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown index f2c3c0a28e82..04502a12ff07 100644 --- a/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown +++ b/website/docs/r/globalaccelerator_custom_routing_listener.html.markdown @@ -63,7 +63,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_endpoint_group.html.markdown b/website/docs/r/globalaccelerator_endpoint_group.html.markdown index 3ca6f85a832e..40dc43708563 100644 --- a/website/docs/r/globalaccelerator_endpoint_group.html.markdown +++ b/website/docs/r/globalaccelerator_endpoint_group.html.markdown @@ -69,7 +69,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/globalaccelerator_listener.html.markdown b/website/docs/r/globalaccelerator_listener.html.markdown index 266b514c1567..38e8248bc5d3 100644 --- a/website/docs/r/globalaccelerator_listener.html.markdown +++ b/website/docs/r/globalaccelerator_listener.html.markdown @@ -68,7 +68,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/glue_registry.html.markdown b/website/docs/r/glue_registry.html.markdown index 4fe8113f1c35..2c88b97f28e2 100644 --- a/website/docs/r/glue_registry.html.markdown +++ b/website/docs/r/glue_registry.html.markdown @@ -37,7 +37,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/glue_schema.html.markdown b/website/docs/r/glue_schema.html.markdown index 69cb151a3770..12d4dbe0f35c 100644 --- a/website/docs/r/glue_schema.html.markdown +++ b/website/docs/r/glue_schema.html.markdown @@ -49,7 +49,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/iam_openid_connect_provider.html.markdown b/website/docs/r/iam_openid_connect_provider.html.markdown index b993645663b3..5c3d93e335ae 100644 --- a/website/docs/r/iam_openid_connect_provider.html.markdown +++ b/website/docs/r/iam_openid_connect_provider.html.markdown @@ -56,7 +56,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/iam_policy.html.markdown b/website/docs/r/iam_policy.html.markdown index 9ae174558566..9a7289d47d5f 100644 --- a/website/docs/r/iam_policy.html.markdown +++ b/website/docs/r/iam_policy.html.markdown @@ -60,7 +60,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/iam_saml_provider.html.markdown b/website/docs/r/iam_saml_provider.html.markdown index dd95a56107b4..6f83ac5a2294 100644 --- a/website/docs/r/iam_saml_provider.html.markdown +++ b/website/docs/r/iam_saml_provider.html.markdown @@ -37,7 +37,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/iam_service_linked_role.html.markdown b/website/docs/r/iam_service_linked_role.html.markdown index 183d1524d82a..bf5682308c14 100644 --- a/website/docs/r/iam_service_linked_role.html.markdown +++ b/website/docs/r/iam_service_linked_role.html.markdown @@ -41,7 +41,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_container_recipe.html.markdown b/website/docs/r/imagebuilder_container_recipe.html.markdown index ded8f0df6b2c..f02e0a1b3053 100644 --- a/website/docs/r/imagebuilder_container_recipe.html.markdown +++ b/website/docs/r/imagebuilder_container_recipe.html.markdown @@ -136,7 +136,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_distribution_configuration.html.markdown b/website/docs/r/imagebuilder_distribution_configuration.html.markdown index 999cf7b76bff..4bf98ef498c0 100644 --- a/website/docs/r/imagebuilder_distribution_configuration.html.markdown +++ b/website/docs/r/imagebuilder_distribution_configuration.html.markdown @@ -149,7 +149,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_image.html.markdown b/website/docs/r/imagebuilder_image.html.markdown index 35c250c57d1b..439047b96430 100644 --- a/website/docs/r/imagebuilder_image.html.markdown +++ b/website/docs/r/imagebuilder_image.html.markdown @@ -112,7 +112,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_image_pipeline.html.markdown b/website/docs/r/imagebuilder_image_pipeline.html.markdown index 839c42b7a390..86a6ae15c417 100644 --- a/website/docs/r/imagebuilder_image_pipeline.html.markdown +++ b/website/docs/r/imagebuilder_image_pipeline.html.markdown @@ -156,7 +156,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_image_recipe.html.markdown b/website/docs/r/imagebuilder_image_recipe.html.markdown index 8a3f4a24307b..5263703c9347 100644 --- a/website/docs/r/imagebuilder_image_recipe.html.markdown +++ b/website/docs/r/imagebuilder_image_recipe.html.markdown @@ -107,7 +107,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown index 483fc016b1eb..f9eb2128b732 100644 --- a/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown +++ b/website/docs/r/imagebuilder_infrastructure_configuration.html.markdown @@ -107,7 +107,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_lifecycle_policy.html.markdown b/website/docs/r/imagebuilder_lifecycle_policy.html.markdown index db1d3bb4203a..f6910c31a706 100644 --- a/website/docs/r/imagebuilder_lifecycle_policy.html.markdown +++ b/website/docs/r/imagebuilder_lifecycle_policy.html.markdown @@ -176,7 +176,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/imagebuilder_workflow.html.markdown b/website/docs/r/imagebuilder_workflow.html.markdown index f66c5da68aa1..2957b13dff40 100644 --- a/website/docs/r/imagebuilder_workflow.html.markdown +++ b/website/docs/r/imagebuilder_workflow.html.markdown @@ -80,7 +80,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/inspector_assessment_target.html.markdown b/website/docs/r/inspector_assessment_target.html.markdown index 8b96dc2ea10b..d126914bcc8d 100644 --- a/website/docs/r/inspector_assessment_target.html.markdown +++ b/website/docs/r/inspector_assessment_target.html.markdown @@ -42,7 +42,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/inspector_assessment_template.html.markdown b/website/docs/r/inspector_assessment_template.html.markdown index c80bb7408ccd..670dd89c032b 100644 --- a/website/docs/r/inspector_assessment_template.html.markdown +++ b/website/docs/r/inspector_assessment_template.html.markdown @@ -60,7 +60,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ivs_channel.html.markdown b/website/docs/r/ivs_channel.html.markdown index ca08fe414fc9..0e3a16ab3540 100644 --- a/website/docs/r/ivs_channel.html.markdown +++ b/website/docs/r/ivs_channel.html.markdown @@ -51,7 +51,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ivs_playback_key_pair.html.markdown b/website/docs/r/ivs_playback_key_pair.html.markdown index 62214b61c5af..4824d0efdda8 100644 --- a/website/docs/r/ivs_playback_key_pair.html.markdown +++ b/website/docs/r/ivs_playback_key_pair.html.markdown @@ -50,7 +50,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ivs_recording_configuration.html.markdown b/website/docs/r/ivs_recording_configuration.html.markdown index 291b80087f77..e9dc6280d371 100644 --- a/website/docs/r/ivs_recording_configuration.html.markdown +++ b/website/docs/r/ivs_recording_configuration.html.markdown @@ -60,7 +60,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ivschat_logging_configuration.html.markdown b/website/docs/r/ivschat_logging_configuration.html.markdown index 5c28659d5bb8..52f389c48785 100644 --- a/website/docs/r/ivschat_logging_configuration.html.markdown +++ b/website/docs/r/ivschat_logging_configuration.html.markdown @@ -132,7 +132,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ivschat_room.html.markdown b/website/docs/r/ivschat_room.html.markdown index 76088d26d19f..d2715f7f05ff 100644 --- a/website/docs/r/ivschat_room.html.markdown +++ b/website/docs/r/ivschat_room.html.markdown @@ -87,7 +87,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/kinesis_resource_policy.html.markdown b/website/docs/r/kinesis_resource_policy.html.markdown index df59352f8509..57cdc66cd6a8 100644 --- a/website/docs/r/kinesis_resource_policy.html.markdown +++ b/website/docs/r/kinesis_resource_policy.html.markdown @@ -54,7 +54,6 @@ This resource exports no additional attributes. ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/lb_listener.html.markdown b/website/docs/r/lb_listener.html.markdown index 25363c464264..f17a72c4bc30 100644 --- a/website/docs/r/lb_listener.html.markdown +++ b/website/docs/r/lb_listener.html.markdown @@ -468,7 +468,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/lb_listener_rule.html.markdown b/website/docs/r/lb_listener_rule.html.markdown index 638bb924284c..34d996f0eae0 100644 --- a/website/docs/r/lb_listener_rule.html.markdown +++ b/website/docs/r/lb_listener_rule.html.markdown @@ -341,7 +341,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/lb_target_group.html.markdown b/website/docs/r/lb_target_group.html.markdown index fec8875b073e..c5eeaf71a207 100644 --- a/website/docs/r/lb_target_group.html.markdown +++ b/website/docs/r/lb_target_group.html.markdown @@ -233,7 +233,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/lb_trust_store.html.markdown b/website/docs/r/lb_trust_store.html.markdown index 1057f396a4f9..642ab27a31d0 100644 --- a/website/docs/r/lb_trust_store.html.markdown +++ b/website/docs/r/lb_trust_store.html.markdown @@ -62,7 +62,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown b/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown index e54fb3259c00..a0122d39ab44 100644 --- a/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown +++ b/website/docs/r/networkfirewall_tls_inspection_configuration.html.markdown @@ -339,7 +339,6 @@ The `certificates` block exports the following attributes: ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/paymentcryptography_key.html.markdown b/website/docs/r/paymentcryptography_key.html.markdown index 20565e8acf3d..9ef312a40434 100644 --- a/website/docs/r/paymentcryptography_key.html.markdown +++ b/website/docs/r/paymentcryptography_key.html.markdown @@ -88,7 +88,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/rds_integration.html.markdown b/website/docs/r/rds_integration.html.markdown index 8050544cf45d..d9c47107aa30 100644 --- a/website/docs/r/rds_integration.html.markdown +++ b/website/docs/r/rds_integration.html.markdown @@ -132,7 +132,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/resourceexplorer2_index.html.markdown b/website/docs/r/resourceexplorer2_index.html.markdown index c89cb2289f83..9bc7b191f4dd 100644 --- a/website/docs/r/resourceexplorer2_index.html.markdown +++ b/website/docs/r/resourceexplorer2_index.html.markdown @@ -43,7 +43,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/resourceexplorer2_view.html.markdown b/website/docs/r/resourceexplorer2_view.html.markdown index 8225f8c2de39..8aafe508b249 100644 --- a/website/docs/r/resourceexplorer2_view.html.markdown +++ b/website/docs/r/resourceexplorer2_view.html.markdown @@ -65,7 +65,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/secretsmanager_secret_policy.html.markdown b/website/docs/r/secretsmanager_secret_policy.html.markdown index 49a52281463f..1e99f20ed5fc 100644 --- a/website/docs/r/secretsmanager_secret_policy.html.markdown +++ b/website/docs/r/secretsmanager_secret_policy.html.markdown @@ -60,7 +60,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/secretsmanager_secret_rotation.html.markdown b/website/docs/r/secretsmanager_secret_rotation.html.markdown index 28e459d326da..44c78f36d33f 100644 --- a/website/docs/r/secretsmanager_secret_rotation.html.markdown +++ b/website/docs/r/secretsmanager_secret_rotation.html.markdown @@ -59,7 +59,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/securityhub_automation_rule.html.markdown b/website/docs/r/securityhub_automation_rule.html.markdown index b759c205271a..eb7cbb28efe8 100644 --- a/website/docs/r/securityhub_automation_rule.html.markdown +++ b/website/docs/r/securityhub_automation_rule.html.markdown @@ -202,7 +202,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/securitylake_data_lake.html.markdown b/website/docs/r/securitylake_data_lake.html.markdown index 7b5472dabf47..4f53f9054956 100644 --- a/website/docs/r/securitylake_data_lake.html.markdown +++ b/website/docs/r/securitylake_data_lake.html.markdown @@ -115,7 +115,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/sns_topic_data_protection_policy.html.markdown b/website/docs/r/sns_topic_data_protection_policy.html.markdown index 2470dd6cd1c9..3339d02be0b3 100644 --- a/website/docs/r/sns_topic_data_protection_policy.html.markdown +++ b/website/docs/r/sns_topic_data_protection_policy.html.markdown @@ -58,7 +58,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/sns_topic_policy.html.markdown b/website/docs/r/sns_topic_policy.html.markdown index fffa922fb3b9..b48eb47dab7c 100644 --- a/website/docs/r/sns_topic_policy.html.markdown +++ b/website/docs/r/sns_topic_policy.html.markdown @@ -82,7 +82,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/sns_topic_subscription.html.markdown b/website/docs/r/sns_topic_subscription.html.markdown index 31435c3051d0..bf6c6a0dc7e4 100644 --- a/website/docs/r/sns_topic_subscription.html.markdown +++ b/website/docs/r/sns_topic_subscription.html.markdown @@ -335,7 +335,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ssmcontacts_rotation.html.markdown b/website/docs/r/ssmcontacts_rotation.html.markdown index 6b0b2e507e23..cbc38f7adb5e 100644 --- a/website/docs/r/ssmcontacts_rotation.html.markdown +++ b/website/docs/r/ssmcontacts_rotation.html.markdown @@ -194,7 +194,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ssoadmin_application.html.markdown b/website/docs/r/ssoadmin_application.html.markdown index ff1d00a90ee3..58e2f8f538ee 100644 --- a/website/docs/r/ssoadmin_application.html.markdown +++ b/website/docs/r/ssoadmin_application.html.markdown @@ -89,7 +89,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown b/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown index c6867099e066..cccb5ac509c8 100644 --- a/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown +++ b/website/docs/r/ssoadmin_application_assignment_configuration.html.markdown @@ -41,7 +41,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform diff --git a/website/docs/r/xray_group.html.markdown b/website/docs/r/xray_group.html.markdown index f1951fe36013..84c94ad846d8 100644 --- a/website/docs/r/xray_group.html.markdown +++ b/website/docs/r/xray_group.html.markdown @@ -51,7 +51,6 @@ This resource exports the following attributes in addition to the arguments abov ## Import - In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: ```terraform From 7680a7d8afe9e8a67f5a88850a7559a277879d94 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 14:40:22 -0400 Subject: [PATCH 1983/2115] Correct CHANGELOG entry file name. --- .changelog/{#####.txt => 44211.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{#####.txt => 44211.txt} (100%) diff --git a/.changelog/#####.txt b/.changelog/44211.txt similarity index 100% rename from .changelog/#####.txt rename to .changelog/44211.txt From 6d990b4e6a002d8b23687d605290277c37c0b1ca Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 9 Sep 2025 18:55:19 +0000 Subject: [PATCH 1984/2115] Update CHANGELOG.md for #44204 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b393a5366ec..e412efd0d1bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ENHANCEMENTS: * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) +* resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block ([#44201](https://github.com/hashicorp/terraform-provider-aws/issues/44201)) * resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) @@ -18,6 +19,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_cognito_managed_login_branding: Fix `reading Cognito Managed Login Branding by client ... couldn't find resource` errors when a user pool contains multiple client apps ([#44204](https://github.com/hashicorp/terraform-provider-aws/issues/44204)) * resource/aws_flow_log: Fix `Error decoding ... from prior state: unsupported attribute "log_group_name"` errors when upgrading from a pre-v6.0.0 provider version ([#44191](https://github.com/hashicorp/terraform-provider-aws/issues/44191)) * resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) * resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) From 4a1d8fd1d046cfa6cc5c8b07f635ed9c297a7b42 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Tue, 9 Sep 2025 19:02:45 +0000 Subject: [PATCH 1985/2115] Update CHANGELOG.md for #44196 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e412efd0d1bb..1655b8b8d6e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ENHANCEMENTS: * resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block ([#44201](https://github.com/hashicorp/terraform-provider-aws/issues/44201)) * resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) +* resource/aws_glue_catalog_table_optimizer: Add `iceberg_configuration.run_rate_in_hours` argument to `retention_configuration` and `orphan_file_deletion_configuration` blocks ([#44207](https://github.com/hashicorp/terraform-provider-aws/issues/44207)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_vpc_endpoint: Add resource identity support ([#44194](https://github.com/hashicorp/terraform-provider-aws/issues/44194)) From 7d27ba84234b234685644056ba14e0de266d0c55 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 15:14:39 -0400 Subject: [PATCH 1986/2115] Add 'sdkv2.SuppressEquivalentTime'. --- internal/sdkv2/suppress.go | 16 ++++++++++++++ internal/sdkv2/suppress_test.go | 38 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/internal/sdkv2/suppress.go b/internal/sdkv2/suppress.go index 430d55d634e1..a3b9e7352c95 100644 --- a/internal/sdkv2/suppress.go +++ b/internal/sdkv2/suppress.go @@ -44,6 +44,22 @@ func SuppressEquivalentRoundedTime(layout string, d time.Duration) schema.Schema } } +// SuppressEquivalentTime returns a difference suppression function that suppresses differences +// for time values that represent the same instant in different timezones. +func SuppressEquivalentTime(k, old, new string, d *schema.ResourceData) bool { + oldTime, err := time.Parse(time.RFC3339, old) + if err != nil { + return false + } + + newTime, err := time.Parse(time.RFC3339, new) + if err != nil { + return false + } + + return oldTime.Equal(newTime) +} + // SuppressEquivalentIAMPolicyDocuments provides custom difference suppression // for IAM policy documents in the given strings that are equivalent. func SuppressEquivalentIAMPolicyDocuments(k, old, new string, _ *schema.ResourceData) bool { diff --git a/internal/sdkv2/suppress_test.go b/internal/sdkv2/suppress_test.go index dc870e10aeac..64616fee77e8 100644 --- a/internal/sdkv2/suppress_test.go +++ b/internal/sdkv2/suppress_test.go @@ -106,3 +106,41 @@ func TestSuppressEquivalentRoundedTime(t *testing.T) { } } } + +func TestSuppressEquivalentTime(t *testing.T) { + t.Parallel() + + testCases := []struct { + old string + new string + equivalent bool + }{ + { + old: "2024-04-19T23:01:23.000Z", + new: "2024-04-19T23:01:23.000Z", + equivalent: true, + }, + { + old: "2024-04-19T23:01:23.000Z", + new: "2024-04-19T23:02:23.000Z", + equivalent: false, + }, + { + old: "2023-09-24T15:30:00+09:00", + new: "2023-09-24T06:30:00Z", + equivalent: true, + }, + } + + for i, tc := range testCases { + value := SuppressEquivalentTime("test_property", tc.old, tc.new, nil) + + if tc.equivalent && !value { + t.Fatalf("expected test case %d to be equivalent", i) + } + + if !tc.equivalent && value { + t.Fatalf("expected test case %d to not be equivalent", i) + } + } +} From 29dd225a0b41d813826cd5cec8c2a5719382d7f2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 15:20:27 -0400 Subject: [PATCH 1987/2115] r/aws_appautoscaling_scheduled_action: Use 'sdkv2.SuppressEquivalentTime'. --- internal/service/appautoscaling/diff.go | 26 ----------- .../appautoscaling/scheduled_action.go | 43 ++++++++++--------- internal/service/appautoscaling/target.go | 1 - 3 files changed, 22 insertions(+), 48 deletions(-) delete mode 100644 internal/service/appautoscaling/diff.go diff --git a/internal/service/appautoscaling/diff.go b/internal/service/appautoscaling/diff.go deleted file mode 100644 index b0060d5bf522..000000000000 --- a/internal/service/appautoscaling/diff.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package appautoscaling - -import ( - "time" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -) - -// suppressEquivalentTime suppresses differences for time values that represent the same -// instant in different timezones. -func suppressEquivalentTime(k, old, new string, d *schema.ResourceData) bool { - oldTime, err := time.Parse(time.RFC3339, old) - if err != nil { - return false - } - - newTime, err := time.Parse(time.RFC3339, new) - if err != nil { - return false - } - - return oldTime.Equal(newTime) -} diff --git a/internal/service/appautoscaling/scheduled_action.go b/internal/service/appautoscaling/scheduled_action.go index a67fe916745d..d1dcd3a15b44 100644 --- a/internal/service/appautoscaling/scheduled_action.go +++ b/internal/service/appautoscaling/scheduled_action.go @@ -6,7 +6,6 @@ package appautoscaling import ( "context" "log" - "strconv" "strings" "time" @@ -19,6 +18,8 @@ import ( "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/flex" + "github.com/hashicorp/terraform-provider-aws/internal/sdkv2" "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types/nullable" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -42,7 +43,7 @@ func resourceScheduledAction() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.IsRFC3339Time, - DiffSuppressFunc: suppressEquivalentTime, + DiffSuppressFunc: sdkv2.SuppressEquivalentTime, }, names.AttrName: { Type: schema.TypeString, @@ -101,7 +102,7 @@ func resourceScheduledAction() *schema.Resource { Type: schema.TypeString, Optional: true, ValidateFunc: validation.IsRFC3339Time, - DiffSuppressFunc: suppressEquivalentTime, + DiffSuppressFunc: sdkv2.SuppressEquivalentTime, }, "timezone": { Type: schema.TypeString, @@ -276,41 +277,41 @@ func findScheduledActions(ctx context.Context, conn *applicationautoscaling.Clie return output, nil } -func expandScalableTargetAction(l []any) *awstypes.ScalableTargetAction { - if len(l) == 0 || l[0] == nil { +func expandScalableTargetAction(tfList []any) *awstypes.ScalableTargetAction { + if len(tfList) == 0 || tfList[0] == nil { return nil } - m := l[0].(map[string]any) + tfMap := tfList[0].(map[string]any) + apiObject := &awstypes.ScalableTargetAction{} - result := &awstypes.ScalableTargetAction{} - - if v, ok := m[names.AttrMaxCapacity]; ok { + if v, ok := tfMap[names.AttrMaxCapacity]; ok { if v, null, _ := nullable.Int(v.(string)).ValueInt32(); !null { - result.MaxCapacity = aws.Int32(v) + apiObject.MaxCapacity = aws.Int32(v) } } - if v, ok := m["min_capacity"]; ok { + if v, ok := tfMap["min_capacity"]; ok { if v, null, _ := nullable.Int(v.(string)).ValueInt32(); !null { - result.MinCapacity = aws.Int32(v) + apiObject.MinCapacity = aws.Int32(v) } } - return result + return apiObject } -func flattenScalableTargetAction(cfg *awstypes.ScalableTargetAction) []any { - if cfg == nil { +func flattenScalableTargetAction(apiObject *awstypes.ScalableTargetAction) []any { + if apiObject == nil { return []any{} } - m := make(map[string]any) - if cfg.MaxCapacity != nil { - m[names.AttrMaxCapacity] = strconv.FormatInt(int64(aws.ToInt32(cfg.MaxCapacity)), 10) + tfMap := make(map[string]any) + + if apiObject.MaxCapacity != nil { + tfMap[names.AttrMaxCapacity] = flex.Int32ToStringValue(apiObject.MaxCapacity) } - if cfg.MinCapacity != nil { - m["min_capacity"] = strconv.FormatInt(int64(aws.ToInt32(cfg.MinCapacity)), 10) + if apiObject.MinCapacity != nil { + tfMap["min_capacity"] = flex.Int32ToStringValue(apiObject.MinCapacity) } - return []any{m} + return []any{tfMap} } diff --git a/internal/service/appautoscaling/target.go b/internal/service/appautoscaling/target.go index 9397a39eb71f..033ebe07dc0b 100644 --- a/internal/service/appautoscaling/target.go +++ b/internal/service/appautoscaling/target.go @@ -244,7 +244,6 @@ func findTargetByThreePartKey(ctx context.Context, conn *applicationautoscaling. var output []awstypes.ScalableTarget pages := applicationautoscaling.NewDescribeScalableTargetsPaginator(conn, &input) - for pages.HasMorePages() { page, err := pages.NextPage(ctx) From f48321f67f70c40c1f51ce59843f4cd56c4f1416 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 15:32:06 -0400 Subject: [PATCH 1988/2115] r/aws_appautoscaling_policy: Add plan-time validation of `policy_type`. --- .changelog/44211.txt | 4 ++++ internal/service/appautoscaling/policy.go | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.changelog/44211.txt b/.changelog/44211.txt index 8780fbccc11e..e70d5b7ac56a 100644 --- a/.changelog/44211.txt +++ b/.changelog/44211.txt @@ -1,3 +1,7 @@ ```release-note:bug resource/aws_appautoscaling_policy: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `step_scaling_policy_configuration` is empty +``` + +```release-note:enhancement +resource/aws_appautoscaling_policy: Add plan-time validation of `policy_type` ``` \ No newline at end of file diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 994b3078d23f..28a2a0fe374a 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -58,9 +58,10 @@ func resourcePolicy() *schema.Resource { ValidateFunc: validation.StringLenBetween(0, 255), }, "policy_type": { - Type: schema.TypeString, - Optional: true, - Default: "StepScaling", + Type: schema.TypeString, + Optional: true, + Default: awstypes.PolicyTypeStepScaling, + ValidateDiagFunc: enum.Validate[awstypes.PolicyType](), }, names.AttrResourceID: { Type: schema.TypeString, From 15fdafa7dce7143610fd07ae1cc99ce3debcd7a0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 9 Sep 2025 15:35:19 -0400 Subject: [PATCH 1989/2115] r/aws_appautoscaling_policy: Add plan-time validation of `step_scaling_policy_configuration.adjustment_type` and `step_scaling_policy_configuration.metric_aggregation_type`. --- .changelog/44211.txt | 4 ++++ internal/service/appautoscaling/policy.go | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.changelog/44211.txt b/.changelog/44211.txt index e70d5b7ac56a..d5ec5b4d54b9 100644 --- a/.changelog/44211.txt +++ b/.changelog/44211.txt @@ -4,4 +4,8 @@ resource/aws_appautoscaling_policy: Fix `interface conversion: interface {} is n ```release-note:enhancement resource/aws_appautoscaling_policy: Add plan-time validation of `policy_type` +``` + +```release-note:enhancement +resource/aws_appautoscaling_policy: Add plan-time validation of `step_scaling_policy_configuration.adjustment_type` and `step_scaling_policy_configuration.metric_aggregation_type` ``` \ No newline at end of file diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 28a2a0fe374a..2c4af60e59c3 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -85,16 +85,18 @@ func resourcePolicy() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "adjustment_type": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.AdjustmentType](), }, "cooldown": { Type: schema.TypeInt, Optional: true, }, "metric_aggregation_type": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.MetricAggregationType](), }, "min_adjustment_magnitude": { Type: schema.TypeInt, From c20eab669e1d34ccc7d4b498ab39f6e4624d2641 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 08:47:24 +0900 Subject: [PATCH 1990/2115] Allow IPv6 CIDR block in the validations --- internal/service/networkfirewall/rule_group.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/internal/service/networkfirewall/rule_group.go b/internal/service/networkfirewall/rule_group.go index 261237b91a27..b15748975d4d 100644 --- a/internal/service/networkfirewall/rule_group.go +++ b/internal/service/networkfirewall/rule_group.go @@ -250,9 +250,12 @@ func resourceRuleGroup() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "address_definition": { - Type: schema.TypeString, - Required: true, - ValidateFunc: verify.ValidIPv4CIDRNetworkAddress, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.Any( + verify.ValidIPv4CIDRNetworkAddress, + verify.ValidIPv6CIDRNetworkAddress, + ), }, }, }, @@ -284,9 +287,12 @@ func resourceRuleGroup() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "address_definition": { - Type: schema.TypeString, - Required: true, - ValidateFunc: verify.ValidIPv4CIDRNetworkAddress, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.Any( + verify.ValidIPv4CIDRNetworkAddress, + verify.ValidIPv6CIDRNetworkAddress, + ), }, }, }, From 115b34cc234be93f638f9990d0f7f933fc0a7b8f Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 08:47:59 +0900 Subject: [PATCH 1991/2115] Add an acceptance test for IPv6 CIDR block --- .../networkfirewall/rule_group_test.go | 94 +++++++++++++++++-- 1 file changed, 88 insertions(+), 6 deletions(-) diff --git a/internal/service/networkfirewall/rule_group_test.go b/internal/service/networkfirewall/rule_group_test.go index ff3f0cb4a8d8..438f0a11e834 100644 --- a/internal/service/networkfirewall/rule_group_test.go +++ b/internal/service/networkfirewall/rule_group_test.go @@ -228,12 +228,60 @@ func TestAccNetworkFirewallRuleGroup_Basic_statelessRule(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "rule_group.0.rules_source.#", "1"), resource.TestCheckResourceAttr(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.0.stateless_rule.*", map[string]string{ - names.AttrPriority: "1", - "rule_definition.#": "1", - "rule_definition.0.actions.#": "1", - "rule_definition.0.match_attributes.#": "1", - "rule_definition.0.match_attributes.0.destination.#": "1", - "rule_definition.0.match_attributes.0.source.#": "1", + names.AttrPriority: "1", + "rule_definition.#": "1", + "rule_definition.0.actions.#": "1", + "rule_definition.0.match_attributes.#": "1", + "rule_definition.0.match_attributes.0.destination.#": "1", + "rule_definition.0.match_attributes.0.destination.0.address_definition": "1.2.3.4/32", + "rule_definition.0.match_attributes.0.source.#": "1", + "rule_definition.0.match_attributes.0.source.0.address_definition": "124.1.1.5/32", + }), + resource.TestCheckTypeSetElemAttr(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.0.stateless_rule.*.rule_definition.0.actions.*", "aws:drop"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccNetworkFirewallRuleGroup_Basic_statelessRuleIPv6(t *testing.T) { + ctx := acctest.Context(t) + var ruleGroup networkfirewall.DescribeRuleGroupOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_networkfirewall_rule_group.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.NetworkFirewallServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckRuleGroupDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccRuleGroupConfig_basicStatelessIPv6(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateless-rulegroup/%s", rName)), + resource.TestCheckResourceAttr(resourceName, "capacity", "100"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateless)), + resource.TestCheckResourceAttr(resourceName, "rule_group.#", "1"), + resource.TestCheckResourceAttr(resourceName, "rule_group.0.rules_source.#", "1"), + resource.TestCheckResourceAttr(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.0.stateless_rule.*", map[string]string{ + names.AttrPriority: "1", + "rule_definition.#": "1", + "rule_definition.0.actions.#": "1", + "rule_definition.0.match_attributes.#": "1", + "rule_definition.0.match_attributes.0.destination.#": "1", + "rule_definition.0.match_attributes.0.destination.0.address_definition": "1111:0000:0000:0000:0000:0000:0000:0111/128", + "rule_definition.0.match_attributes.0.source.#": "1", + "rule_definition.0.match_attributes.0.source.0.address_definition": "1111:0000:0000:0000:0000:0000:0000:0000/64", }), resource.TestCheckTypeSetElemAttr(resourceName, "rule_group.0.rules_source.0.stateless_rules_and_custom_actions.0.stateless_rule.*.rule_definition.0.actions.*", "aws:drop"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -1588,6 +1636,40 @@ resource "aws_networkfirewall_rule_group" "test" { `, rName) } +func testAccRuleGroupConfig_basicStatelessIPv6(rName string) string { + return fmt.Sprintf(` +resource "aws_networkfirewall_rule_group" "test" { + capacity = 100 + name = %[1]q + type = "STATELESS" + + rule_group { + rules_source { + stateless_rules_and_custom_actions { + stateless_rule { + priority = 1 + + rule_definition { + actions = ["aws:drop"] + + match_attributes { + destination { + address_definition = "1111:0000:0000:0000:0000:0000:0000:0111/128" + } + + source { + address_definition = "1111:0000:0000:0000:0000:0000:0000:0000/64" + } + } + } + } + } + } + } +} +`, rName) +} + func testAccRuleGroupConfig_basic(rName, rules string) string { return fmt.Sprintf(` resource "aws_networkfirewall_rule_group" "test" { From 5c7941ee915ad615822c5fcff04a04456e1bb0e5 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 08:50:28 +0900 Subject: [PATCH 1992/2115] Update the documentation --- website/docs/r/networkfirewall_rule_group.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/networkfirewall_rule_group.html.markdown b/website/docs/r/networkfirewall_rule_group.html.markdown index 53e4b90ea974..449789fc6b47 100644 --- a/website/docs/r/networkfirewall_rule_group.html.markdown +++ b/website/docs/r/networkfirewall_rule_group.html.markdown @@ -519,7 +519,7 @@ The `dimension` block supports the following argument: The `destination` block supports the following argument: -* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Destination Port @@ -533,7 +533,7 @@ The `destination_port` block supports the following arguments: The `source` block supports the following argument: -* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Source Port From 7aef703b8fe6ff05a627c1aea4e20eab3bc8c0f4 Mon Sep 17 00:00:00 2001 From: Meg Ashby Date: Tue, 9 Sep 2025 21:28:41 -0400 Subject: [PATCH 1993/2115] clean up wafv2 docs around ja fingerprints --- website/docs/cdktf/python/r/wafv2_rule_group.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown b/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown index 38d55da46726..3f264b0ccf8a 100644 --- a/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown +++ b/website/docs/cdktf/python/r/wafv2_rule_group.html.markdown @@ -781,8 +781,8 @@ The `custom_key` block supports the following arguments: * `http_method` - (Optional) Use the request's HTTP method as an aggregate key. See [RateLimit `http_method`](#ratelimit-http_method-block) below for details. * `header` - (Optional) Use the value of a header in the request as an aggregate key. See [RateLimit `header`](#ratelimit-header-block) below for details. * `ip` - (Optional) Use the request's originating IP address as an aggregate key. See [`RateLimit ip`](#ratelimit-ip-block) below for details. -* `ja3_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [`RateLimit ip`](#ratelimit-ja3_fingerprint-block) below for details. -* `ja4_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [`RateLimit ip`](#ratelimit-ja4_fingerprint-block) below for details. +* `ja3_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [`RateLimit ja3_fingerprint`](#ratelimit-ja3_fingerprint-block) below for details. +* `ja4_fingerprint` - (Optional) Use the JA4 fingerprint in the request as an aggregate key. See [`RateLimit ja4_fingerprint`](#ratelimit-ja4_fingerprint-block) below for details. * `label_namespace` - (Optional) Use the specified label namespace as an aggregate key. See [RateLimit `label_namespace`](#ratelimit-label_namespace-block) below for details. * `query_argument` - (Optional) Use the specified query argument as an aggregate key. See [RateLimit `query_argument`](#ratelimit-query_argument-block) below for details. * `query_string` - (Optional) Use the request's query string as an aggregate key. See [RateLimit `query_string`](#ratelimit-query_string-block) below for details. From e1aa4d6b28b5bb680f593e699311cbf4746471e6 Mon Sep 17 00:00:00 2001 From: Meg Ashby Date: Tue, 9 Sep 2025 21:30:31 -0400 Subject: [PATCH 1994/2115] clean up wafv2 docs around ja fingerprints --- website/docs/cdktf/python/r/wafv2_web_acl.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown index b6bcc50c764f..73e9c8f25e90 100644 --- a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown +++ b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown @@ -1131,9 +1131,9 @@ The `custom_key` block supports the following arguments: * `forwarded_ip` - (Optional) Use the first IP address in an HTTP header as an aggregate key. See [`forwarded_ip`](#ratelimit-forwarded_ip-block) below for details. * `http_method` - (Optional) Use the request's HTTP method as an aggregate key. See [RateLimit `http_method`](#ratelimit-http_method-block) below for details. * `header` - (Optional) Use the value of a header in the request as an aggregate key. See [RateLimit `header`](#ratelimit-header-block) below for details. -* `ip` - (Optional) Use the request's originating IP address as an aggregate key. See [`RateLimit ip`](#ratelimit-ip-block) below for details. -* `ja3_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [`RateLimit ip`](#ratelimit-ja3_fingerprint-block) below for details. -* `ja4_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [`RateLimit ip`](#ratelimit-ja4_fingerprint-block) below for details. +* `ip` - (Optional) Use the request's originating IP address as an aggregate key. See [RateLimit `ip`](#ratelimit-ip-block) below for details. +* `ja3_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [RateLimit ja3_fingerprint`](#ratelimit-ja3_fingerprint-block) below for details. +* `ja4_fingerprint` - (Optional) Use the JA3 fingerprint in the request as an aggregate key. See [RateLimit `ja4_fingerprint`](#ratelimit-ja4_fingerprint-block) below for details. * `label_namespace` - (Optional) Use the specified label namespace as an aggregate key. See [RateLimit `label_namespace`](#ratelimit-label_namespace-block) below for details. * `query_argument` - (Optional) Use the specified query argument as an aggregate key. See [RateLimit `query_argument`](#ratelimit-query_argument-block) below for details. * `query_string` - (Optional) Use the request's query string as an aggregate key. See [RateLimit `query_string`](#ratelimit-query_string-block) below for details. From 99e3588d2d921732e7060af034030cbe5e4d106a Mon Sep 17 00:00:00 2001 From: Meg Ashby Date: Tue, 9 Sep 2025 21:38:48 -0400 Subject: [PATCH 1995/2115] add ja4_fingerprint to list of allowed items --- website/docs/cdktf/python/r/wafv2_web_acl.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown index 73e9c8f25e90..9742497a831e 100644 --- a/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown +++ b/website/docs/cdktf/python/r/wafv2_web_acl.html.markdown @@ -929,7 +929,7 @@ The part of a web request that you want AWS WAF to inspect. Include the single ` The `field_to_match` block supports the following arguments: -~> **Note** Only one of `all_query_arguments`, `body`, `cookies`, `header_order`, `headers`, `ja3_fingerprint`, `json_body`, `method`, `query_string`, `single_header`, `single_query_argument`, `uri_fragment` or `uri_path` can be specified. An empty configuration block `{}` should be used when specifying `all_query_arguments`, `method`, or `query_string` attributes. +~> **Note** Only one of `all_query_arguments`, `body`, `cookies`, `header_order`, `headers`, `ja3_fingerprint`,`ja4_fingerprint`, `json_body`, `method`, `query_string`, `single_header`, `single_query_argument`, `uri_fragment` or `uri_path` can be specified. An empty configuration block `{}` should be used when specifying `all_query_arguments`, `method`, or `query_string` attributes. * `all_query_arguments` - (Optional) Inspect all query arguments. * `body` - (Optional) Inspect the request body, which immediately follows the request headers. See [`body`](#body-block) below for details. From 96ee5d1028e24f3a62653fc9d9f5ad590b4104db Mon Sep 17 00:00:00 2001 From: Sasi Date: Tue, 9 Sep 2025 21:58:41 -0400 Subject: [PATCH 1996/2115] added serial testing --- internal/service/controltower/baseline_test.go | 6 ++++-- internal/service/controltower/controltower_test.go | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 5a2940c02414..017396c7055b 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -33,7 +33,7 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_controltower_baseline.test" - resource.ParallelTest(t, resource.TestCase{ + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) acctest.PreCheckPartitionHasService(t, names.ControlTowerEndpointID) @@ -74,7 +74,7 @@ func TestAccControlTowerBaseline_disappears(t *testing.T) { rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_controltower_baseline.test" - resource.ParallelTest(t, resource.TestCase{ + resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) acctest.PreCheckPartitionHasService(t, names.ControlTowerEndpointID) @@ -161,6 +161,8 @@ func testAccEnabledBaselinesPreCheck(ctx context.Context, t *testing.T) { } } +// IdentityCenterEnabledBaselineArn needs to be updated based on user account to test +// we can change it to data block when datasource is implemented. func testAccBaselineConfig_basic(rName string) string { return fmt.Sprintf(` data "aws_partition" "current" {} diff --git a/internal/service/controltower/controltower_test.go b/internal/service/controltower/controltower_test.go index 4cc14ff91675..0b3670ebe3fe 100644 --- a/internal/service/controltower/controltower_test.go +++ b/internal/service/controltower/controltower_test.go @@ -23,6 +23,10 @@ func TestAccControlTower_serial(t *testing.T) { acctest.CtDisappears: testAccControl_disappears, "parameters": testAccControl_parameters, }, + "Baseline": { + acctest.CtBasic: TestAccControlTowerBaseline_basic, + acctest.CtDisappears: TestAccControlTowerBaseline_disappears, + }, } acctest.RunSerialTests2Levels(t, testCases, 0) From b0d9f6f94daf20b5f15b4cca2febf196d8e1e963 Mon Sep 17 00:00:00 2001 From: breathingdust <282361+breathingdust@users.noreply.github.com> Date: Wed, 10 Sep 2025 09:05:12 +0000 Subject: [PATCH 1997/2115] docs: update resource counts --- website/docs/index.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 71cc4b407f39..bc71474d5f38 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -9,7 +9,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,537 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). From 277a7edb99fd45a31258973fb1bce762ced7af67 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 19:44:53 +0900 Subject: [PATCH 1998/2115] Add changelog --- .changelog/44215.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44215.txt diff --git a/.changelog/44215.txt b/.changelog/44215.txt new file mode 100644 index 000000000000..abbe682b91df --- /dev/null +++ b/.changelog/44215.txt @@ -0,0 +1,3 @@ +```release-note:Enhancement +resource/aws_networkfirewall_rule_group: Add IPv6 CIDR block support to `address_definition` arguments in `source` and `destination` blocks within `rule_group.rules_source.stateless_rules_and_custom_actions.stateless_rule.rule_definition.match_attributes` +``` From 3a5050b6e46e5d305963662d7e283df38fcdb9ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 08:59:00 -0400 Subject: [PATCH 1999/2115] Fixup 'TestAccNetworkManagerVPCAttachment_basic' and 'TestAccNetworkManagerVPCAttachment_Attached_basic'. --- internal/service/networkmanager/vpc_attachment_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/networkmanager/vpc_attachment_test.go b/internal/service/networkmanager/vpc_attachment_test.go index 87f2a514214b..f8fa2437ab51 100644 --- a/internal/service/networkmanager/vpc_attachment_test.go +++ b/internal/service/networkmanager/vpc_attachment_test.go @@ -70,9 +70,9 @@ func TestAccNetworkManagerVPCAttachment_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtTrue), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), @@ -138,9 +138,9 @@ func TestAccNetworkManagerVPCAttachment_Attached_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.dns_support", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), - resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtFalse), + resource.TestCheckResourceAttr(resourceName, "options.0.security_group_referencing_support", acctest.CtTrue), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), From 82ccd99c52ee7c98f62c80c0608b54e09657d5ab Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 22:26:43 +0900 Subject: [PATCH 2000/2115] Implement arguments related to actions in word_policy_config --- internal/service/bedrock/guardrail.go | 44 +++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/internal/service/bedrock/guardrail.go b/internal/service/bedrock/guardrail.go index 636e30718c10..da5ccd7eed1d 100644 --- a/internal/service/bedrock/guardrail.go +++ b/internal/service/bedrock/guardrail.go @@ -395,6 +395,20 @@ func (r *guardrailResource) Schema(ctx context.Context, req resource.SchemaReque CustomType: fwtypes.NewListNestedObjectTypeOf[managedWordListsConfig](ctx), NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ + "input_action": schema.StringAttribute{ + Optional: true, + CustomType: fwtypes.StringEnumType[awstypes.GuardrailWordAction](), + }, + "input_enabled": schema.BoolAttribute{ + Optional: true, + }, + "output_action": schema.StringAttribute{ + Optional: true, + CustomType: fwtypes.StringEnumType[awstypes.GuardrailWordAction](), + }, + "output_enabled": schema.BoolAttribute{ + Optional: true, + }, names.AttrType: schema.StringAttribute{ Required: true, CustomType: fwtypes.StringEnumType[awstypes.GuardrailManagedWordsType](), @@ -404,8 +418,26 @@ func (r *guardrailResource) Schema(ctx context.Context, req resource.SchemaReque }, "words_config": schema.ListNestedBlock{ CustomType: fwtypes.NewListNestedObjectTypeOf[wordsConfig](ctx), + Validators: []validator.List{ + listvalidator.SizeAtLeast(1), + listvalidator.SizeAtMost(10000), + }, NestedObject: schema.NestedBlockObject{ Attributes: map[string]schema.Attribute{ + "input_action": schema.StringAttribute{ + Optional: true, + CustomType: fwtypes.StringEnumType[awstypes.GuardrailWordAction](), + }, + "input_enabled": schema.BoolAttribute{ + Optional: true, + }, + "output_action": schema.StringAttribute{ + Optional: true, + CustomType: fwtypes.StringEnumType[awstypes.GuardrailWordAction](), + }, + "output_enabled": schema.BoolAttribute{ + Optional: true, + }, "text": schema.StringAttribute{ Required: true, Validators: []validator.String{ @@ -836,9 +868,17 @@ type wordPolicyConfig struct { } type managedWordListsConfig struct { - Type fwtypes.StringEnum[awstypes.GuardrailManagedWordsType] `tfsdk:"type"` + InputAction fwtypes.StringEnum[awstypes.GuardrailWordAction] `tfsdk:"input_action"` + InputEnabled types.Bool `tfsdk:"input_enabled"` + OutputAction fwtypes.StringEnum[awstypes.GuardrailWordAction] `tfsdk:"output_action"` + OutputEnabled types.Bool `tfsdk:"output_enabled"` + Type fwtypes.StringEnum[awstypes.GuardrailManagedWordsType] `tfsdk:"type"` } type wordsConfig struct { - Text types.String `tfsdk:"text"` + InputAction fwtypes.StringEnum[awstypes.GuardrailWordAction] `tfsdk:"input_action"` + InputEnabled types.Bool `tfsdk:"input_enabled"` + OutputAction fwtypes.StringEnum[awstypes.GuardrailWordAction] `tfsdk:"output_action"` + OutputEnabled types.Bool `tfsdk:"output_enabled"` + Text types.String `tfsdk:"text"` } From e0ef79189a47319ddae8628515172bd90d0c39cf Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 22:32:50 +0900 Subject: [PATCH 2001/2115] Add an acceptance test --- internal/service/bedrock/guardrail_test.go | 116 +++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/internal/service/bedrock/guardrail_test.go b/internal/service/bedrock/guardrail_test.go index bb338c9a4ac9..7094b58f71ab 100644 --- a/internal/service/bedrock/guardrail_test.go +++ b/internal/service/bedrock/guardrail_test.go @@ -207,6 +207,92 @@ func TestAccBedrockGuardrail_update(t *testing.T) { }) } +func TestAccBedrockGuardrail_wordConfigAction(t *testing.T) { + ctx := acctest.Context(t) + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_bedrock_guardrail.test" + var guardrail bedrock.GetGuardrailOutput + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.BedrockEndpointID) + }, + ErrorCheck: acctest.ErrorCheck(t, names.BedrockServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGuardrailDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccGuardrailConfig_wordConfigAction(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckGuardrailExists(ctx, resourceName, &guardrail), + resource.TestCheckResourceAttrSet(resourceName, "guardrail_arn"), + resource.TestCheckResourceAttr(resourceName, "blocked_input_messaging", "test"), + resource.TestCheckResourceAttr(resourceName, "blocked_outputs_messaging", "test"), + resource.TestCheckResourceAttr(resourceName, "content_policy_config.#", "0"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), + resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "sensitive_information_policy_config.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "READY"), + resource.TestCheckResourceAttr(resourceName, "topic_policy_config.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "DRAFT"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.input_action", string(types.GuardrailWordActionBlock)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.input_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.output_action", string(types.GuardrailWordActionBlock)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.output_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.type", string(types.GuardrailManagedWordsTypeProfanity)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.input_action", string(types.GuardrailWordActionBlock)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.input_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.output_action", string(types.GuardrailWordActionBlock)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.output_enabled", acctest.CtTrue), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.text", "HATE"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccGuardrailImportStateIDFunc(resourceName), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "guardrail_id", + }, + { + Config: testAccGuardrailConfig_wordConfig_only(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckGuardrailExists(ctx, resourceName, &guardrail), + resource.TestCheckResourceAttrSet(resourceName, "guardrail_arn"), + resource.TestCheckResourceAttr(resourceName, "blocked_input_messaging", "test"), + resource.TestCheckResourceAttr(resourceName, "blocked_outputs_messaging", "test"), + resource.TestCheckResourceAttr(resourceName, "content_policy_config.#", "0"), + resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), + resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "sensitive_information_policy_config.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "READY"), + resource.TestCheckResourceAttr(resourceName, "topic_policy_config.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "DRAFT"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.#", "1"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.input_action"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.input_enabled"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.output_action"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.output_enabled"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.managed_word_lists_config.0.type", string(types.GuardrailManagedWordsTypeProfanity)), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.#", "1"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.words_config.0.input_action"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.words_config.0.input_enabled"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.words_config.0.output_action"), + resource.TestCheckNoResourceAttr(resourceName, "word_policy_config.0.words_config.0.output_enabled"), + resource.TestCheckResourceAttr(resourceName, "word_policy_config.0.words_config.0.text", "HATE"), + ), + }, + }, + }) +} + func TestAccBedrockGuardrail_crossRegion(t *testing.T) { ctx := acctest.Context(t) @@ -496,6 +582,36 @@ resource "aws_bedrock_guardrail" "test" { `, rName)) } +func testAccGuardrailConfig_wordConfigAction(rName string) string { + return acctest.ConfigCompose( + testAccCustomModelConfig_base(rName), + fmt.Sprintf(` +resource "aws_bedrock_guardrail" "test" { + name = %[1]q + blocked_input_messaging = "test" + blocked_outputs_messaging = "test" + description = "test" + + word_policy_config { + managed_word_lists_config { + input_action = "BLOCK" + input_enabled = true + output_action = "BLOCK" + output_enabled = true + type = "PROFANITY" + } + words_config { + input_action = "BLOCK" + input_enabled = true + output_action = "BLOCK" + output_enabled = true + text = "HATE" + } + } +} +`, rName)) +} + func testAccGuardrailConfig_crossRegion(rName string) string { return fmt.Sprintf(` data "aws_caller_identity" "current" {} From a8e534e698103f860d7085e26d4afd8eff782786 Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 22:39:41 +0900 Subject: [PATCH 2002/2115] Update the documentation --- website/docs/r/bedrock_guardrail.html.markdown | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/website/docs/r/bedrock_guardrail.html.markdown b/website/docs/r/bedrock_guardrail.html.markdown index 8d01928ef910..3956c7bdb47a 100644 --- a/website/docs/r/bedrock_guardrail.html.markdown +++ b/website/docs/r/bedrock_guardrail.html.markdown @@ -189,10 +189,18 @@ The `tier_config` configuration block supports the following arguments: #### Managed Word Lists Config * `type` (Required) Options for managed words. +* `input_action` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `input_enabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `output_action` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `output_enabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. #### Words Config * `text` (Required) The custom word text. +* `input_action` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `input_enabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `output_action` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `output_enabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. ## Attribute Reference From 05963e230d2e3642f97fea359ae7b43448e28d74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 09:50:37 -0400 Subject: [PATCH 2003/2115] Merge pull request #44218 from hashicorp/dependabot/go_modules/aws-sdk-go-v2-de1d6c9156 build(deps): bump the aws-sdk-go-v2 group across 1 directory with 8 updates --- go.mod | 16 +- go.sum | 32 +- tools/tfsdk2fw/go.mod | 536 ++++++++++----------- tools/tfsdk2fw/go.sum | 1072 ++++++++++++++++++++--------------------- 4 files changed, 828 insertions(+), 828 deletions(-) diff --git a/go.mod b/go.mod index a27b91e5b611..8a61dbd790e4 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 @@ -61,7 +61,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 @@ -79,7 +79,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 - github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 + github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 + github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 @@ -170,7 +170,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 @@ -188,7 +188,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 + github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 @@ -226,7 +226,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 @@ -265,7 +265,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 diff --git a/go.sum b/go.sum index 255f5e1844a6..8137fd9618eb 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVT github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3 h1:yNHXaZU0c0VV89+V0w04Lfk/+H69//w0YMU1d/LM27s= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.3/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 h1:3gdYbEifG0hBOi3j43F/5B5Wln0uzdk6sAZzULZFAUA= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= @@ -133,8 +133,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYM github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3 h1:TC222HSByqrBZpM2hlunXiOp69aDlJflzxVVjwldA3E= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.3/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 h1:6ly6/OBsK9fGwyEc2BNFs8bvCL25/vp5LF7Vt+NJW6s= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= @@ -169,8 +169,8 @@ github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8M github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.2 h1:DvE8Ky2vGLHgcc2+lRphPCiHBXvI6HVLLG8BrtCl5Uk= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.2/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 h1:dIa+kK5GZCIRDjBcOxBDRCFhfRcL29X1F72Is14VBeE= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.0/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3 h1:W/7L3e4rh5+ijYuLM0yiW+aio/WI1IMfeKRBwFvAz7k= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.3/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 h1:tYG+bkHqTjuylERnj4fkeKX//pI635rPecfd92c/Csw= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= @@ -361,8 +361,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3 h1:78Llq5ye9Yo1uy8e/0UNeMNy8DWdTT+6FbMVaTP5XUs= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.3/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 h1:VFsXwfXdn+R7mJpW6RojrBbPR7PKzNqdLRdijyVRN48= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= @@ -397,8 +397,8 @@ github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJ github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3 h1:1fvWoh45dKiK7dfU1I6JZN8ok+UIvTeonyLqvjgWl0k= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.3/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 h1:pokghrmP5zmoAOwXuQT29pCCQ+obzpqxD1M+QOxNJu8= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= @@ -473,8 +473,8 @@ github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoK github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1 h1:P3ppuK80Tolbgi1G1omVAXIvpqgxX1sWyjMR6NpRTBw= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 h1:ql9qBtq3g5uYsOyDUsXRBo7JcW8D67PxUkolgw1kjS4= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= @@ -553,8 +553,8 @@ github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53 github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3 h1:NdxsAUHycaPLcB8aPtmFqZFAhfjQyB0+rMKR4J+++w8= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.3/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 h1:Ea4CMk5sZOknJttA28mqYSQcH5IQyCBEhwoXcu7sxyc= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 4c19141ccbf2..ea7068613c0b 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -18,277 +18,277 @@ 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-v2 v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2 v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.6 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.10 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.7 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.11 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 // indirect - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 // indirect + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.49.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 // indirect github.com/aws/smithy-go v1.23.0 // indirect github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index c4249157386d..6a8f2a0a4928 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -23,548 +23,548 @@ 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-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk= -github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2 v1.39.0 h1:xm5WV/2L4emMRmMjHFykqiA4M/ra0DJVSWUkDyBjbg4= +github.com/aws/aws-sdk-go-v2 v1.39.0/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= -github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= +github.com/aws/aws-sdk-go-v2/config v1.31.7 h1:zS1O6hr6t0nZdBCMFc/c9OyZFyLhXhf/B2IZ9Y0lRQE= +github.com/aws/aws-sdk-go-v2/config v1.31.7/go.mod h1:GpHmi1PQDdL5pP4JaB00pU0ek4EXVcYH7IkjkUadQmM= +github.com/aws/aws-sdk-go-v2/credentials v1.18.11 h1:1Fnb+7Dk96/VYx/uYfzk5sU2V0b0y2RWZROiMZCN/Io= +github.com/aws/aws-sdk-go-v2/credentials v1.18.11/go.mod h1:iuvn9v10dkxU4sDgtTXGWY0MrtkEcmkUmjv4clxhuTc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 h1:Is2tPmieqGS2edBnmOJIbdvOA6Op+rRpaYR60iBAwXM= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7/go.mod h1:F1i5V5421EGci570yABvpIXgRIBPb5JM+lSkHF6Dq5w= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 h1:fSuJX/VBJKufwJG/szWgUdRJVyRiEQDDXNh/6NPrTBg= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5/go.mod h1:LvN0noQuST+3Su55Wl++BkITpptnfN9g6Ohkv4zs9To= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 h1:UCxq0X9O3xrlENdKf1r9eRJoKz/b0AfGkpp3a7FPlhg= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7/go.mod h1:rHRoJUNUASj5Z/0eqI4w32vKvC7atoWR0jC+IkmVH8k= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 h1:Y6DTZUn7ZUC4th9FMBbo8LVE+1fyq3ofw+tRwkUd3PY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7/go.mod h1:x3XE6vMnU9QvHN/Wrx2s44kwzV2o2g5x/siw4ZUJ9g8= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6/go.mod h1:y/7sDdu+aJvPtGXr4xYosdpq9a6T9Z0jkXfugmti0rI= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2 h1:CV594KI3G5YUW6gMyY3FZSJn43wg0RdnpbU1sec/6ww= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.2/go.mod h1:WAcHFG0G2iM8i56FwE5IciRhCgvEByRsm4PBOWKE39k= -github.com/aws/aws-sdk-go-v2/service/account v1.28.2 h1:2M9jLruQ9NEmJ8OJfJPT3m595C/g8Bwi3+UqMHwNQak= -github.com/aws/aws-sdk-go-v2/service/account v1.28.2/go.mod h1:+wm3rOFQq9upDxz3DLkA+qo8qF6fEXNDdJc+FCmFKGg= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.2 h1:xHL377Sv01f+x0+vOTgxCAldxjY24Li5qmYPJ1ky6Xk= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.2/go.mod h1:O0RIJKU/HcON/0R940lIHsfGNTix0AVrefYOPcKKZrM= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1 h1:57Zj23al3/5z0+EL/bTXg60JCesEuCQFOFsaYT4Q/Ug= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.1/go.mod h1:8hG5y8K/+UAo2EuqP+zNKjTsMRpIAueEoZ+lOXfu5dM= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.2 h1:IDias597FmaTXyZjz0PpcQqZu4M3PvUoU9pEy3ZKy0w= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.2/go.mod h1:Y7h/Fwzhh3K06Pq7E0KQeG3Ig1gu3Co7n6vRu0HQ3Lw= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1 h1:7XHZ8P8to6LYUiwgopfJQZ5gKVttC7fbhqKLDZrLG0Q= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.1/go.mod h1:w78lilq00niyoQpilDNnEd/twrrBIJsd7yWMHqy0Q+M= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2 h1:v9Y2bqzpf+ZlzVhzzbT2lXYUyUQJY4oYOISeiTzsXBE= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.2/go.mod h1:GrF7L3G4zf6kSlEPe0g5U0+NM6aD3sbYTXxtZ2WpbhY= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2 h1:iFj4I9K3+rSYzscyL325U3M1gK+trwKivF5mS9qOV0o= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.2/go.mod h1:0EtzxxLlK3I1QAKBhXQvUgqu//VUtOgVSS0Fxgc2Cv8= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2 h1:oF8852TUzZ7SlOTFYwhdVwRa0QCNcO12C10ITVPmzDw= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.2/go.mod h1:FMfpZdFkhXRanuAck3GM43SV2g2yE8ZN3hEudANx6I8= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2 h1:05ZgmHa5476oKwB5eUNvTjRpUxEAdsVC2wd8W8E0rUk= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.2/go.mod h1:931/c29HkZHHXxYob7A/cKbhAkDfc7aGd8ItlZtJRmM= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2 h1:MQ3CevjMr46z5Y7E0jwdx1thdZcZBaft8jiME2aiv1I= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.2/go.mod h1:i6xYGmbdCd1f0O1yO/GEWYjaFZSTpCG9pLuwEVMt3dw= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2 h1:OnzDoF1r5KAIk/zetG694RGns8Ij5o4+Grh6JFgqwUQ= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.2/go.mod h1:uFYfmSyXgRqjRTRZ9BAXBxWc+HycCNVPD4OFzP0Pj/U= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1 h1:7taUYNlFqizsaiMdHHRThw4zeTJiwlwf6LuYSncdJqQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.1/go.mod h1:GCi363sGAGpwZJMN9yt0HaC1INLyXlzmitpKhDasbrg= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1 h1:lt87uXXt4dCn8EunxEHTdlYfa5AGXm0ETNxgvopugNI= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.1/go.mod h1:TVdPBUM3rvV3atXHnVlYTZ0+vOnzfqNfyE975szB6rg= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4 h1:WzyX5AmWzePDlfPQ9s3sQTgR7fwTQF9w4gBud2k7zD4= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.4/go.mod h1:yFXpleMg5Ey8HCT2hm3hy/J7DZdlJp1Oh3TU6RSmwMA= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2 h1:HCKeoGJiSrorgMr2fmMSpmb9WPxVSwCEmlmE4uObfLs= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.2/go.mod h1:PtSWKYmJuvDvtg6fye2Oz3p6ZMYhQWVbyVwUsE1RGHE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3 h1:h6HKdn8kmz/bpDAM8eIX/Nu0oSoewQH4l1hiRukqYoE= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.3/go.mod h1:17A21aZwtJWcU346UqC5h5iynSNesczxeYQn5TX39lU= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2 h1:E7Ls4IRBhbxRzJXaoAqvMAz55EYO2Clag59H8jEzx34= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.2/go.mod h1:lTjohIjckNGEHnsUrALyTBmrDsonnvaWrUHo+ZtbrHQ= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2 h1:CpbqcESjyHtywmjH0Hp31oJSh2tU2uy7mHmyozdL+wQ= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.2/go.mod h1:7+42mxrcInVf1P8f1R23exdfb34LkH/wVIOJ3ClXWms= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4 h1:Vprtu6GlnfiCP4p7T+DTurEgAGzugvxCSDNOca0gQLY= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.4/go.mod h1:FxTxmxbtxbY6xAH1tlD6i/WuqDLVVPPhFsT5YnCoA3c= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.2 h1:JTbSWkhg9TtWN4rWidba9KZVtDsdNvzlrlEhtkJ2n8U= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.2/go.mod h1:SqfRGad1YJst/x6I1nbPS3t9dtmATSwaVU/sxPfo8ts= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2 h1:maCuWKUKkugR2KylwT900bvkgofYkdcrbziqPPlmwQ0= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.2/go.mod h1:nsfi1OxIVy+jpXQXDfbiXgut3dts8ikR5OsPYwRNhPo= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2 h1:z6A7RKbrhDiVp5wlV/MgZ03uOv//yLM228nY9Clw2Ds= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.58.2/go.mod h1:ailCQb+KhHZcMFd/VstivWtcNizcI5lpHxzbk6FI2dM= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1 h1:aR1HH39NRyDjQUBkwiA+TiIxTzvLHG8/N4yQwBp4OYk= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.1/go.mod h1:UL218OezrxqSUmkdB4PbsZfXEeOEa0kxgWeChXQDu2I= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.2 h1:Y7QdrFoRbyermqhYVv8SNpLLpd8h8ZS60+Ag9fQTJ2g= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.2/go.mod h1:np/dL9XAcYePqgiJTfl7TqLBEdpNIdngm86uz9vaV/g= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.5 h1:iVVSvFSxyiY+4X3ZzJMeyLBSX6hOhZ+u0dXajlr6fpw= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.5/go.mod h1:/kuiqEICHKG1fj+arz94+JfIfUy+DuHPsZNaKV015oM= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4 h1:rCsX5uQG+TR71GJISV8vvAaWFk3S2MVW5zeYRiLAU7I= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.4/go.mod h1:NL8MY5NFgNvl0mgFNb5IdM6noZK+TX4LfmF2CfIdPW4= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2 h1:VTb93pnTP2UadIETvk4zv0BXOw0/qxPEDB1t6rLGDDE= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.45.2/go.mod h1:Z6UKMB49N1t02yf2NDYytv7XD3+p71nj00brl5wxBOE= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2 h1:FjYY1QPhbQcortMB7yp0t1eLFk0m0muZZR6DohjcZtw= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.2/go.mod h1:ZsEdFufjlCVl1G5Wd6NRYr9ARgEhXtdvlcJzxgcFDLw= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2 h1:IUMR1nAxcQC3jZoUdLtuPjQArrBilvgaC1dIGx/+nnA= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.2/go.mod h1:n8frkmYZSCGdKGcK7hH9yyBPinwWKVrEMQbZoMENFo8= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.3 h1:7AeVkpSsE1wOaopMkjHRC3AGjT4bxPbwgclqpSkoQ0Y= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.3/go.mod h1:y0rAFOF713pJRGh6zOwi343ahkdL04Ibuna64FZ0/xg= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3 h1:EMOY7Ex+ZHL0NQ0h/O19AH5HeWjVis6WH2NUSf9a60g= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.3/go.mod h1:/vsWgFIdCFpdyFLRLMsjEJkxzWra/C5oQ/hQSi46iqw= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2 h1:Wi/pLk1uhY65DpSst7EAvxorPZLxD7bZcrPRNl7DdZA= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.2/go.mod h1:rx6dqsDi9Ty8NlUnx2Jvs07na6XUVyu1sTszM4DcqNI= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.1 h1:yAd8AQKAspLHfsOYHDipEgx34ocbH085BO4s039gPBg= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.1/go.mod h1:0BKNnUBOVTsOH3svKuVHbc5Or1eMOW7PM5IvStfJ1wg= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2 h1:kx06nIs4bnHaGVTRvkiw5pCNfPkRCctjM4P1YXdVh/I= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.2/go.mod h1:jqJrPA64O8ZI7pqR0sWSNj73NdRhf0AxCvVUfrv4BAo= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1 h1:O9bLIMtriAFtiU4qnppOXhqNNWuMHXYbX2pLcV8uzkY= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.1/go.mod h1:QcftJ3U92WQXE1ZJ7ODgTCJhcuVblb9czGv4no9GTC4= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0 h1:ziY2XZYGC257XJ0ttZ8EeJ8MwMHy44ZYkxWW93nAq7Q= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.0/go.mod h1:rG+in10QL0Dn0HZNc8PxujO69CxAEW0F9kT0DbX7iAM= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1 h1:q1IAmb2fLTce5Cg2oBsJgLaH2AEwdIXF03RdHAwUue4= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.1/go.mod h1:899wT6Y0uc6QS5wN4M/ZRKZguJm1cIQwKRgfoY1cIyA= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2 h1:GNReIUhfyDIMLS33j+Ibfv9OMxzSfbLDBV70qdjVlsQ= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.2/go.mod h1:EM5v3k1+zWN6gWwlOVMDqAK59ZkpeifaUX4COuRTMwY= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0 h1:zDKnCvsZ21fO1oCx1Dj+QofcU2MABkM9gdb1278an+Y= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.0/go.mod h1:wkKFqGoZf9Asi1eKuWbz7SEx0RtCq4+drWwHKzizP9o= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0 h1:R/9JRiILKmBLrnpnwE+JPYxmE6/HE9lVfUmoC0INNEE= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.0/go.mod h1:OaiKA9p7K0oTLbULuaXxRdCYv3WBZxRX1t5BWJRluAM= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4 h1:FvHZbV/K0iN+5PRdkNdezw4hMNfucmOqHWtCVWaMCSQ= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.4/go.mod h1:W8PEQOFJDTfEczBnyVJjMyhjgug9eTm8wP9MPLZW4qw= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1 h1:mHPzi3CzNp6m0j0f24KWjKnVqc7EKkYDYD0m0eXq1+8= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.1/go.mod h1:QjQFCvDfno6ijpmZXllvODuBF04Z8W9ImaNR1QYX/tM= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2 h1:SYs99QpWcvrw8zC3x/PFdx3okZYlUuj1HwOH2HrZXws= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.2/go.mod h1:FJ7xQXe2+iO/4IJ8JxVWzish+5G8CAbXu8mqc/ckwaI= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2 h1:dlGpx2aVrU8Kjksdo0H9JqC0DrDOctTsLsbOivy722s= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.2/go.mod h1:jl4HqKy8wA2nlM/K0X4evl9CIPtXBlBIk5CJFKQqGms= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2 h1:hhZnSp7al9i6Jfnb51j6AvbEITN+nlrYCZX7eEwcf7Y= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.49.2/go.mod h1:+AW8Vf+OhePdK+WiRFDyzh6Le8QS4D6/Y6wKEC6NVlk= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2 h1:TSNLZXt7ipIV+Q+GZAQ8dUxYUDsMX2/Atrn/YuPF3zI= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.2/go.mod h1:mSt0uBAxUj2dnagbjc7p+Jh68SSwgDTNzMKUjchDiOY= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2 h1:jTeAsAK227buQb1s0renmkSTvvOt9cgBAvjQmNhzTu8= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.2/go.mod h1:ruPxVenlBiKrw3hONr5JxZENV7OwBwF84RBCvKb1Bxo= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1 h1:kutNNMJBe6o87IHwFi+YypZYaH0Gbb+8eTh8Bo9lhH0= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.1/go.mod h1:y4SeLNsf29MIhrKr7oTFFf1OpqKR4zKGbFKPNDsYMNg= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4 h1:C9AXP3x1utSMcOiSx7VbFBCpxqQzPDV00PMT5X+fGXQ= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.4/go.mod h1:vr65FBqfx+0udgx4Dip0DQALYV6ndcso34XfhFvJ2lA= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2 h1:qIySgaSYDLcInLpY0e7HPCi+AVeD/LTsl9EL1b692oA= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.2/go.mod h1:SobWM1535Mn1WuThoIVLiLa/C1rRbxbbq5PZW2QFCIM= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1 h1:fFozrfL+uhK/JEGAE75l1x4ansAeyJmGzxC80xnGLmo= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.1/go.mod h1:7Ao3ErgFt2gq2cWvJO/Ux/1u+mgOpb7MaftYrQCEhuk= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1 h1:bozxV8Rv6dfjSt/SuNKYsE0d5iHeO8m0u7M2eY8sZF0= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.1/go.mod h1:YtP8V4xhxkufrrcteKY90M4eO0YZWHxhw68/Gw5PEj8= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1 h1:0+EYI0dBogeiEsM1vZWrgq7QUYAl1js4dQbU7FYy+Zk= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.1/go.mod h1:JgObDvt+EyaCm37wh1lv9SoD+NQPOt/sDidb3YZ6pVg= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1 h1:1jCd6GsgICkA6kjvOYf7C6U5pv9SU7x6m1WalSd1zIQ= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.1/go.mod h1:2Dl95oWOgqJa0XkVre+vXYAK5m3N7QIeisNcihygrOk= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2 h1:lH74n0qEyTZUFG9xBW/H17iv2tZVQ0W1cG0+YUz6P9M= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.2/go.mod h1:v6mzAapGAEbeC9Y8e3LjWIdzkEUiYDzm7YTwV2zJH0I= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2 h1:taAVT41mG1omZFnvPeWZshpon8j2YXZeFCbW7htFlbY= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.2/go.mod h1:WUXurX89fWSPjdvGheDDGA/Gqcg0Y0RS8AvLJFZNNd0= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2 h1:aUE6o0KtiLFRircxk15GQ9JZQ1rKG+/D5t585I9FR2Y= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.2/go.mod h1:DYaze+lOmq/2/TEyp0nORtSkksROWg3IpGpEdvkGFd8= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2 h1:MPtnvXrLc2dp2+VOdLXHYY35+oIeG8o6XzEU3jRJazI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.2/go.mod h1:OfHi9BqiUZJCyM59Jm9nEyhfXOpbZzRLbxzQDdOI6GI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3 h1:GE/RDCrvBzhdIzvkpB6why7pYsgsjD3f1TLRZmBC5nQ= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.3/go.mod h1:7SB0BLKGT8jicCgQ5E5tsJqT6FXrFAl6JviiyvOuEdU= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2 h1:CWPyAmLgdIvIU7dIZTZmlZQuFwTYBV6yK8uu6XzNwTY= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.2/go.mod h1:VY0HshV36OPINFcJCJaZUFoDN+CqZNzDfqdAGpE2INk= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1 h1:1PTeBL08xILU8pvssFWwxdpSUzJQO9LKN/GgNYlGCC4= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.1/go.mod h1:8c5GqYpVU2ADZR+aEOJn9nmjWwgTKCFohk1oi+WgmNQ= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2 h1:jCtBGfam7lP2flT4WCj8X3RniE0pm9s0uZMdZvLMN/k= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.2/go.mod h1:/v3Qj03P/7nEDopkALYKzCMnE5+lJezs6VHAKPKxjvU= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.1 h1:MXbzuguyuvs56c27ujkl3ugliN2scXue5aB8AY+PoWE= -github.com/aws/aws-sdk-go-v2/service/connect v1.138.1/go.mod h1:4/tShL3DwnJoVT+4G/VAdWSMGO/Mv764IjetEQWvlYE= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2 h1:+exlRXOAMPfZZW8vdoCq0Pc3UV6jwoiYXanw8Hdeb/w= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.2/go.mod h1:LhPYKJKYcxqNoEb+qSaf59JsuN1hohUVKy1MN752Dv0= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2 h1:olXHUzlyyzaXoL6t9caN+FzGSzUtiXkkFcF1uVz7reA= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.2/go.mod h1:ojCzzbtA/EzWHw3DMo6JFrGyWVNtppBHhNicFVWCVzE= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2 h1:2d0q0nu8LC5aeas0ZmsgjZHCiAfZZXTB9Y1iF9dpm0w= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.2/go.mod h1:mvpFNLX9pwMKCZtwEipfMUbAdZs9RmHcpkUp+J58eXU= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3 h1:wIxOLILQ3fjaY/A6PWfmQYaJGcmimUt6C1VJObyVL7U= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.3/go.mod h1:BbguYlNx01GCK33JAkLy/Z+fwmaA8rXW2JRxqE2L7XQ= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2 h1:TrVHD8csYxtmPTUPwvRVQ/cfhKhahLeW+7AjTv1IdIc= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.2/go.mod h1:rdHbpIynh5Ngf1hCmUaLPoi+O+ed/RKQ6Yozd8aPj+E= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2 h1:cCBFpiH77NXmdb0DzRiQV22UhpsiKOMC4uwowKvotrI= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.2/go.mod h1:YgrwD4/4TQ1Gy2flGX6luIU8H66p4MXWoUXecuVSzmg= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2 h1:jF2Rb+OqznTzCyv5RR9JC89Q5ZhnHA2Z2ZfTqp/2/GM= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.2/go.mod h1:axHRiqofRmrdwwsnQh2+R3NK1AS+qQm4L1xCiKyvIMo= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1 h1:4tp86h4YU1Dd5yR0k4IQTe66AgRF8UVUYRppR7NyDkU= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.1/go.mod h1:6HOQsxLM/j43bmDvLTHH1vyQ905dEfscli+ABJ29AZE= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2 h1:4eY0vLqcYE6Ua1ewZ8tiNLctuirVzN0RE1RX7+URTbk= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.2/go.mod h1:Cdjpp4CX0cD1wAoUHf+1yPw0Ve1lsUDtSOnhyiUZ5Po= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1 h1:Gg/y/1+rHrf2kxrBWZY5KE3zrSgT+if4oqR4b3LYTE4= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.1/go.mod h1:dwLDJ+47AzvPn5I9ASJEjhg8PZT/bGad5/jMUOAdkFs= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2 h1:lbUeqY5fSPLhyVCYuWR6wqYGBrVvSE6pOr6Bm0+HeUA= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.2/go.mod h1:uSbSm54E6/rjYAPtTVy/wJFyIqTIadEW3y0xq8/0uIA= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2 h1:qO8LCWDgtAIhKG9CiROlgY51gxtTGFzjUtyOYSi49Yg= -github.com/aws/aws-sdk-go-v2/service/datazone v1.39.2/go.mod h1:8KGSh6YVyd17gbXThGwBgu7CcsxkBK1o9wi925hbWiE= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.2 h1:Un4IIQHVY2csGJT68qw71WnviCnT/cMMZjtkjJ0xwQI= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.2/go.mod h1:CkMUKAX5Qn4E1WAdYAPL0eWLhAMfCRljL+bbW6gT9YI= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.3 h1:AP8E9/Byu5p60nFHqm/Q9tcHTmXffbvFKrTFQI2jC4I= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.3/go.mod h1:meju7FTUGY5mWz/xpVFL83Nz5yhsYrJpHMJ0wJzBE9o= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2 h1:koFhxvKiLr01UL5lrxqIHRb8CBCpz3WC1Bvc/oi9B4o= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.2/go.mod h1:WbbD8452uRsRQkKwTi2sY9KkbEAJ3QvI97hRIAyT/sI= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2 h1:FsuCfy5PiQ4gKLrFoMRHPnnF9xCv+H8ECjlMDODPGR8= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.2/go.mod h1:Bcp61bIcLwGbpYm+EkqQUo38CCVtjjtyV/PDuzjbi8w= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2 h1:MjLoBgzV+I7IpdGHRYKmHZ+CZ+rn0l2xSjvIOjiw6Lg= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.2/go.mod h1:rE+Tqmv9tBMJDPE7ZNIOlsKAFINOvVvBlVdUZJY4avU= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1 h1:QKdx/YMHM5m7eY4a+opHqh5U84n63kjeFMmNyIEvdtc= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.1/go.mod h1:oQFvh/8djxr5mA0/5fljC3oWpPhNxlrsOaQIG6tqoHI= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2 h1:NMbMvXmeB5y4w3yN5N+6wYMj1/dIbagOqaiwvCwQ2MU= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.2/go.mod h1:L/IJNaSxg0Z+VlSe2rQGQa4UBFhINjRzAFezwd59y2Y= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2 h1:gIn/FS7vqlEV0KsOpipfOhVXif+nMyr+mYD5gnsLHTM= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.2/go.mod h1:fAXculuOmpN8xecbrSSODxOX/cEa5PYj7LJY46USG7U= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2 h1:/Nzns4U6fqGUJYICI/plyXklmvAzj5usZFzwMTYMk4I= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.2/go.mod h1:u1p4pWbdxs4SvRp/QdmqPWjU1dFNIiacpDSUqTBZ9BI= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.2 h1:4xcfn1eO+8H21xB5L51T+m8PxKbLV10SFlGaImgUWrQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.2/go.mod h1:W6hq6uHkmhLRhKSttnhck2vedhar8x/gdJhCGdhc0HY= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4 h1:uCgCv9sLsyXj0+JRC9u9b/u4LZGibdHnft1PJqdsSTY= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.4/go.mod h1:EEkX+o+T3MSk2NpuuijcvT/1To5rRtH5wjztMvaPD8o= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1 h1:MXUnj1TKjwQvotPPHFMfynlUljcpl5UccMrkiauKdWI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.1/go.mod h1:fe3UQAYwylCQRlGnihsqU/tTQkrc2nrW/IhWYwlW9vg= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0 h1:hGHSNZDTFnhLGUpRkQORM8uBY9R/FOkxCkuUUJBEOQ4= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.0/go.mod h1:SmMqzfS4HVsOD58lwLZ79oxF58f8zVe5YdK3o+/o1Ck= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1 h1:lcwFjRx3C/hBxJzoWkD6DIG2jeB+mzLmFVBFVOadxxE= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.1/go.mod h1:qt9OL5kXqWoSub4QAkOF74mS3M2zOTNxMODqgwEUjt8= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2 h1:EfatDVSMFxaS5TiR0C0zssQU1Nm+rGx3VbUGIH1y274= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.2/go.mod h1:oRy1IEgzXtOkEk4B/J7HZbXUC258drDLtkmc++lN7IA= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5 h1:AGhQaUug+K/NvkLssgyN0hGs0e56TR4HWDl24RmLZHM= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.5/go.mod h1:Cr5XpL/mBhaOKU1/kyVlQ/Zxs6d9RPcMRyI1DRXmFms= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.3 h1:xzZVMU2lDWKq9yENGNGXujl/x3GBdd40VtTorzAhp60= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.3/go.mod h1:hvE2jEAz+1qmX4MbQ6MvsE0rC3hV5lILFdtooRxA2fQ= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.1 h1:Txq5jxY/ao+2Vx/kX9+65WTqkzCnxSlXnwIj+Cr/fng= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.1/go.mod h1:+hYFg3laewH0YCfJRv+o5R3bradDKmFIm/uaiaD1U7U= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1 h1:K3Z12SXq/J12p2BkjHyQZaTJ9E6KxiSSE2Qj4p9kORU= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.1/go.mod h1:gLYkZU7UpseQKBHxNk7O75xlxgyGV92/LCWf/BPdblc= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3 h1:GVkv1bzSKANCnsuPUxe+8nl/vdXSWQ31epMEJNBZHKQ= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3/go.mod h1:PEzNIYaubtnKFF35zeEmJttqTlxU2yha7GgMpzaopV0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2 h1:L71eE74x591WhKIfNvjc+qE6WcON6bb1KiDwymf0dVk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.2/go.mod h1:RpnUpPKuFd5ViTyiAlru/sygnOJ4tw7elKm7lyQerfk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2 h1:5NXAi1QdV3DT6nyASf94+E3i1jZ6zuFPb0lM0yDSMvw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2/go.mod h1:Gk3uvYKSpiM998WXOreKOsk6PHkkIMp1xGgYFDlZLAA= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2 h1:44GYa+nsnE2S5WukRh7w6ldTixoQbaJyi891QVNL/vs= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.2/go.mod h1:EFLVu5kj1U7pC6K6Lth3UOWgqcqHg86DUeX/38s7FXk= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2 h1:1EvYH0LUt00Uop6MzSZfarFDLnGWGPgdFk+68aMeJLs= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.2/go.mod h1:1+FoECQK1k2EfVz0uWFnfQ8d90ZmOcu1BJV9wY4qR1U= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.1 h1:tgJcX1AysVmunCvPjXYP1Ddcio2kATXoOqkX5v7LWHA= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.1/go.mod h1:YPjTMPJ6p8plhbUw+HbJ/JbOcoXCPZaTywSksbhSYCo= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2 h1:26yws1a1IPK65hVSP0/y4f3HNZMZ60VsmoFBhXTBXts= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.2/go.mod h1:CAepPdiAWHUg8PaCPQbQ1I5NbsbRjF7S8rX0N+dBt3Y= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2 h1:EPozHVLMR+Z0+vu3kBj6La5tAmYlN3X6MTinwMvabKs= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.2/go.mod h1:W2mEuCVgphPWH+TVQ6FkvyMqPbseclEXl0Ttdzw6Epc= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1 h1:Qe+A73TDCVscF7zc8StTI8rukwBHjXNks+49Xv2xqE4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.1/go.mod h1:sA4f8EFW5uDGL1yvDu8UE11pQFOUmlxtcDD/k1so+OQ= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1 h1:it/HO4u5vJhqpq1IZ5vvgGn8PuQQTxru3IQZJwqtrM0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.1/go.mod h1:WrsfRXLObQz3ve2KBsZ3C0Ia6uI6q4fr+GXo5nkBtJY= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.2 h1:DlmNO9d+4ZMsHWEcE4mCHytUH0Fig7nivHZmavucu4E= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.2/go.mod h1:/1ytJKXbiDq3p7Zp3Tl2nbu/ijvAQSEOY00O5v8lf/M= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2 h1:qnmpywrmsu9o7XmYLDuHp+tnswTD9s4H8GuNT2eTlS8= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.2/go.mod h1:A7eFWF1KozvlmYu+Dw805VjVkFBmCw8dm8dEGcOwleo= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2 h1:QLPNIWblJw5wiTYaGi89yMcd5jP8Q0Nu33RIzhQJUNY= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.2/go.mod h1:DXMRebcjxi94pF9v4X0wV3hJ696+hLqlNeKJoDv0tQo= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.1 h1:OXyZxLC0vVu8OAUTfuUvm859whB5PDQTg3410UkX9pg= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.1/go.mod h1:x+CiN7zrqZA5y43Dma1ahWUNli54qPs2Q6ixNXaPHoM= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.1 h1:HiFdvkhoMBP8VAoM15SBH+k2K9RdcyLrjVMGLuKxsNw= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.1/go.mod h1:6mmQzuHkCJIqSMbkqTzUL9wcvXn34kYlkgpvDqFNYnM= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2 h1:ujnyoDVn5S/f/H7bRtrc8Um9hMg5K7sQL8ma20qLah4= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.2/go.mod h1:S9CXyIjFuiaDY8q61cEITsws9mCUnDbzPzFfQkLibZE= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2 h1:YyoyDpgVa8MC9tev/IKD6WtM+6E7liVh1NalZW2OfDk= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.2/go.mod h1:qt7in+OKWRwgxnhnO5nsF+sf2PnnVP5zNaxNN6pBNj8= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2 h1:VokGAUPuUxPCAZBX6G8Hdg4XOPoN37juPPm4FxlWJ/w= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.2/go.mod h1:udU+JbWDpFtpSuxT7rhVvi8SRX+ENKfgdUocZPsLjqk= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2 h1:6C++uHi8NtBt48AemvtwVyLx+3rKEFG1dr10uaosNpM= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.2/go.mod h1:4Bxo37nCAKiivZGbiyYUJDlgjyJy4puvdd3uCZ2iD6g= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.1 h1:BrhnjxI07q7PFQNWPpmp7GawYCIRClHbSU920YmPJkc= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.1/go.mod h1:a+xiPF/o+H8kQrsYI7hgBuZRPCiDenH2OKT/TJYwpHo= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2 h1:rZODhEVhB2iqwtqtxABx1r9QfGj1PgPpTTm+3Rftnlk= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.2/go.mod h1:s8VuZ0xEokt5DxeqcQObWOhCmmZ0/9jCCpCF8MzoQ/I= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2 h1:VEeScKJn6CH3rH9IP8yMc2JmauyJsLYQkQBULpbC2vE= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.2/go.mod h1:iXva/vNMQB6FX7ooA7rahCAn7TlyQPVW+DTkix4E0kE= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2 h1:x4EqAoItA797CzLaIwBjFxBdiqVppAJoJYh0+jiOlu8= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.2/go.mod h1:+XX2J867OOegjDEhNJgAEcxcjfYHN3Lgt/UoCL/AF9Y= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2 h1:I8pteGdTARKWNd5K8n5MjR4RnKdmV2lxfp3GWF1/Y+4= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.2/go.mod h1:HssjGKML+1CKdk/rpboJ1GDnqPdIRbKcaHn+rWb8WnI= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1 h1:Q947iRDzikQFezOGSDtrwUc3MC6NhTs9hHBNamUoIOA= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.1/go.mod h1:DmDO9bdGxMg218F+zRYKyjjtqogS22LKF/E83fXDAmw= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.3 h1:BDkM6KWoryEstnb0fTg5Ip+WsxAph/aCNqwws/sS5yE= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.3/go.mod h1:5q4IwllQ9vIoq7bk8dPvPbT3LQCky+4NgV7vKwAbaEs= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2 h1:TumDpDVz1B05Z4zq4cU9pxSdiYyBM9tMPmm1bkwluYk= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.2/go.mod h1:gvxXKQnGA9qkvntBjBC0BaUJ8uLIZcgI+6fJ3006FlY= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2 h1:PmnYKJ6qiRPgakjMenA+sIUTm6xuDNRT4ZF+7s77Hgs= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.2/go.mod h1:ju9p+EywpL7/cMYeEHUiTeIDoHbmG3N8yRbMPdstUxU= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1 h1:d68gzCkt0Uji+drJwToTJ9IFENXCpvJtTtXsqSOBS7k= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.1/go.mod h1:jFh/bgVYvfNYzEr1RKbBFCDXKGOOP2jrxNPbpuaqUlY= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2 h1:wy488TfMl9y6ZBWQQCNKHlq8rGaJJRIgV56ndmcjnO0= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.2/go.mod h1:yo1LMGikHlvanNXHarw81zC9IBRLO95W9z4oV/82SJ8= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cROM8iBd3f6hrpuMQ= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCKRI8m9Ib2xdAtLT4W1qhqSf548I= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= +github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn+TgaJy4gh/wy8QKF0i0= +github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y70pnL22UW4DBocAw= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SISFxiZdCSbxqPQ4GXrYk= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhppHopnqYKSxvY6Xg= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamtCTGxTqEsEOXOi6mYswk= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9WvdHd0DCEEekikPII1UJ6Y= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2E3s+tK7Qz145wF7gBj/V+HDk= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSztn51D3bOlTZx7i8UbxIq3s= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJg0HSf4/YLZtk8JcHnhtWQ= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH0OWcSj4mzlFanfHVYao= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu7Ju+Br2LmmviiMWQ0KOtXffGKW4= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGXNYqiTKzGIoi93kxSrJNZ+vNoMMwMUE3B7Q= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sCnUEfX634HFbblmsngzLZw+q5HenUh+o= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFqdwzE2bhlI1+uh/t/l4fU3byJXSHNxI= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJGmBF1HYfb12IzSJOIYfI= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxznO/dEo8mlokULdMq3DhMpM= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVBje+wEoCOCwSkaM1hfo/9U= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvjFpQrBf8bWqvBkrLKDD0= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adnpQQd8TjOW42xnLjhftmBFGxxFY= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVTUSucooSSNMjVjihVRI= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 h1:3gdYbEifG0hBOi3j43F/5B5Wln0uzdk6sAZzULZFAUA= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iSiyizfy7iAzomncMeo= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqVH2avSawMrgd07kKNOx8E1jSR1s= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6qFk/aF35pL7D5JjRhYXU= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+rgc+bPcr/+Oi78TwrzGfMKAw= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG58QgDZ2oIekzSBMW5eEcSNZPenN076/+F0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5GjOXuHrAj76Fsv+SBI= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTkjnYSjNBCo8a3RVdYZaM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEygnECFM3aDz/RT79sMqNs= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ6bCh0EqJpWIOYPfnI= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj46/GZRk2vCBprtN0PADIF8O6xL80cv4lrb4= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUcoR6GiaQeelzF8Y0c/lN+qlA/UM= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJxCsEgi/Vyy4Q76ufj/zJBg= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaVS66dAXvZdjlCfJfuIg= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQeRGifq/e3EgxevAAeD/rNa+Y= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07q4Tu2AGPcttKxLRri8LCstfZs8= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/XNc49hUAOLcVdzeYZqYReU= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUDQ+2mkExTq2WiWTnnRPwLpu/HjUtaPIddgMU= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyXbGh3YwxqD0Y+3wWNG1yeDs= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYMUR7/DOPDkrCpuBBKzvoql24= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 h1:6ly6/OBsK9fGwyEc2BNFs8bvCL25/vp5LF7Vt+NJW6s= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZBQ/JNM8j6JZEux+MjUrg0E= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+NBuXT6PeJmr/VN6Zo9Dy9jxVk= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBipmU3ZTitH91temRUTZMEPo= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tPlqJ01kxMWK2/PfGlM5YiFutMw4Q= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94el09NUC8Z++6ncPnGEvpQs= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6okF5hNmuZZmAHkqxdcId8ilxkMIs= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv6VeLYNcX6geP40LFUxrkkHIvQaXE= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27KVNxn24VWtGQA+V6JredhXx7A= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN5xx0jzebrkdkmeP6ZkAd+3Ij9ajy+EA= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8BZUsggJHY7SJktmEDdJ57UEI4mDEeIFvqY= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/1kKMhj4Q75SWK05KQHHRHaoZSlU= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6tafmdmmiFCUALzMZtrYQ6N3xbRKjRbH5TtFI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpke8z9rxb6Dh0y2OvFtlUhM0= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8MPax3sHFejHHCqFl+fdRqa7S8ztB0= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 h1:dIa+kK5GZCIRDjBcOxBDRCFhfRcL29X1F72Is14VBeE= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.0/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xOjSPlZfvc4UvUIKwZpMMJfuQgQwQR6ufdQZ5Is= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4vuvEtqHjxU+cPklfCR+2uQwPA= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWokSMewfFPNIDaYOJg02HxZQYb83bkIu8= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPpNpM0HuV1pfYz3B1ppUSU2y0Cu6OY= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQiY1kknfxJ/nwmvHVfQ3eMgiOLEUDpEOLkzpQ= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsHjURn201IENzNUENNj8SI= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9CoGpnckvCzfBePSZC/N2sSfSM= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe1jZauBE+WBMw/GrrmFRka5iM= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 h1:tYG+bkHqTjuylERnj4fkeKX//pI635rPecfd92c/Csw= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2QKKPEjT4ClxdvF4ntWQTSs= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0TuFHmiKc9PSMkDeEdy8if/I= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnBGzjPu79AQDmI/sqh5gWfDAjYw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJFjOPrPyVGTT6eoCfEzRQn7hwPhnw= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36WlzAsN21voQLdcA3Cs= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1HBTHUhzxbrE67SwmqA= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4PWkwoXDlMNnD0CmGxG8qaBRA= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunKOfeT8HJBE9GpHrQ= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxTkqxd/oAYKY5RaaM= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcplH3O3LDSbRYSEU77RafeI= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIACV9+bZD1Pq/s1dzc= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue2KwFWm1A/lILQfY= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/UqDGxjl69/4eMbVBiW/00= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eGF+Z3xAR/VBlf84Q= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7VhJSmgoUCVEakyM4= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5LXgQrrNkMa4AcNY= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUTJ4KJ+fzyS6xoTnB0TxVA1w8= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2ciJit4cOOPSdB9UTv47b/AD/tSMY= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1blhU1mpj3lyxgZaBaO7EcZrAZ4Ryj+pk= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+O1wOnvKLUoo+jGM9vzghqEouBb29W2hcOs= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNgG2sqhx+CHOXSqrIXnVDnZeHAhPZppIsM= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UVGxsteGA2RzeubDtXPFdefEHQJDUMk= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDamfVylxdI5Ap8uGps= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2vc9yMEj0eHVT4mHRTp7nX/gvg= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/c1fNQ6bZvh+cOh5WSnEYDviss= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZl2QtFQyrZQFoUVuqnA8fRA4= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf2twd5yOawH7AbEBnjjfs0= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVTCHipzZwiAkS+HE= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw80cgPIyDjKDmQg8yhyss= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU8PtytX+mbDQ3pDrfDRq4= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgdfSSpqh2iJenR07k= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/jgNVOmV80ZvqAUQ= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z8fBNVAt8JImC6Rk= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/4cvxvDywFbRSahtzb70k= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMeSb/2uvmz+5SKMElnwLg= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1rse3iZPdH+nfOIgAfbT1Cpyob5hKE= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkrlPFE3St8Hb0HasyWY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAOdnHtFtcCV83HjPvlXD4= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwGbfEULKHdTWFtfM0PtS4tRw= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP2V+GbkDZSD2ssy09CG/UbV6/U= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2CpfUjEuYQw9JuCyRq+JHk= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+BeDgJXZAeUaBMOJUBLPAelw= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8vp8a0KqWThrXnhpI= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2DqiehXiA6JDOyYPoG9FOuihV9Mg= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90TQn2DyKXC5t7ojFo9f+DMgtM= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 h1:5vo4H66qsNDlcYkIWHoUdgiI1nlKyUbCbyrjA4gFLE4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 h1:N0c2Xhm+jL85dxldlPy8vB/iqLXIevRz9xgt1suQ1Aw= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6 h1:34ojKW9OV123FZ6Q8Nua3Uwy6yVTcshZ+gLE4gpMDEs= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.6/go.mod h1:sXXWh1G9LKKkNbuR0f0ZPd/IvDXlMGiag40opt4XEgY= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1 h1:ZeXNdfj9Gb/u/kEwEdT5mTYPjVdOQu94ged888vVoc0= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.1/go.mod h1:656tpQ686itYBqEl1EbgA0OZog+8JhP5wghNgi9JvXw= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4 h1:UMTSLrtSCr3nahIbpnQk2aLngcunD0s0aL4L6c5LRUI= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.4/go.mod h1:e0NxgLPA2BWdm89QVOx7i+nwsDbSuUyaIEQqxkmLjDQ= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.1 h1:5I9hhdiPnIZOlyAA6PIysCHmmfFKgCLvpJah6xWf6VQ= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.1/go.mod h1:MNfd0gEcP5VIG2NRWG1GbcbqAq8hjVUfGGfpohXxVoE= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2 h1:rQjtFoJmPESHtgPiF6igtieWdLvM2oq5Gh4qlmbXyjc= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.2/go.mod h1:482D8kaN4J+zrBmYpBwucmIbQjAntr4ze0Qi2vh4f4Q= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1 h1:/VgocLhOilNd62aeqqcI+S7F673U4o0rFVrVJlJmwiw= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.1/go.mod h1:smGbv/1Ll9KBL5AJKnOEJQi9VT18PLvOOXKfbrno56I= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2 h1:pAud0XuQySFoniVUZ5FOFs7eBes3KyPKfiXWADa25iE= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.2/go.mod h1:Rd/liQoGexiuBzTo73W4GIHPKWgt2qC/hhViblXym7E= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1 h1:PUM+0xm5gZG7BEtWKzh7jK2W7raCsD54cMuAE+79fr8= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.1/go.mod h1:tpU5kDjKiOH0qdFWZ+UT8xp0Cg0gfTCDEOty0SCiG/k= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2 h1:ObuofAivu0GlwoTxyXu7KNVGUx2JtQ9y2bRcqBCsP7o= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.2/go.mod h1:76irOFfBcTfyT/uS7O3qV8cRpDq1Qe+qVQmZGQjusrc= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2 h1:1M335ZGLSdN80gNSSwEdUZm/Pt3/gB8c22jvK6OJyS8= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.2/go.mod h1:pQdmmQt22CjVhGe8HHtU/tTCKwx98smrYmMM2C8iosQ= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1 h1:9QC0AF6gakV1TZuGp3NEUNl/6gXt3rfIifnxd+dWwbw= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.1/go.mod h1:UpSQbmXxFiDGDrvqsTgEm3YijDf9cg/Ti+s2W0SeFEU= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2 h1:8ZbNqijMVzZZofOW/6Xh7wc7CXun5FE5MXjtgNAG0Lg= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.2/go.mod h1:pmAbP9pq5R2jqEh//Me43nsNQYsYok8GjpqYz7QcolA= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3 h1:QZeo3/lt9h1Ds/svP26ZRrbNcqMKDct1d2rAh0dqAjo= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.3/go.mod h1:EnvBk5Fi0pAy4F1utrmERPPLcuGyTp9X2ydePEGm6as= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1 h1:0CfC8/6m9HhcAKSkN79iiLjj766k5bnGPls7Gpshekg= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.1/go.mod h1:TN5seLoay67ikVXd4gI6EU2vdn2Ke8EdzlDWi5N59ZQ= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.1 h1:NhkI4kfcZYmcIM34a+q9drh3aMG1BthkyziOr7sRTv4= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.1/go.mod h1:elyXIFqx79eHvd0cRAzYDYHajeoJEygkBjJto4HJddc= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1 h1:BRYyXi9Li2KlXWfkNvPYm00nnYPFgXfcPLEdA+SLXdk= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.1/go.mod h1:p06/vzxmF/yX9uei/CtO4tDFQ3lSyvEBw/F0s7S8QJE= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2 h1:fJVIBLHXWxaCUsESJgY3y/R5DNy7JAJ+DgeT91dDiyU= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.2/go.mod h1:Sbu0Y/aqwGRAskM+Hw44L1nop2I6FK5IADcMCfa5wE0= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2 h1:1IBwOlg/WTe8hIKpWUvnf/hf4F5dQxsL2kXkCkklbiQ= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.2/go.mod h1:Z2kxQSCAmdY0pPrpfVrEJptPEvWNI3QUmtJ0GsRlrUY= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1 h1:rn2FTVBpfdNDRn7PAjuRLSJ4uCyI+e2Z4KJJtBtEz8s= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.1/go.mod h1:YqfkR+PBSQJLzQvHABm7aOYQr7eAjfE3sovr2sZ8ye4= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2 h1:g6UGKTATXpxBTTHKr3M08DLRBzq84FQZyOGgj3wxrNw= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.2/go.mod h1:AfplfLn7h73O2+N/Avmmxl0iTXK4taXo8UrIQ1MNYlI= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2 h1:q/4QZ+EjbF2CJPZbsD1XFES7YOPAt/YHvk0zPWtMmWQ= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.2/go.mod h1:gQ1fiatpNaGerkhbbXs2h3N+antINpIuC3+n0qbPxlc= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2 h1:bbcKDYr5ivT4ghbcNmKPmLpH/42dn0CqZgE6c7SziQU= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.2/go.mod h1:yYrzhBVvgD0aekhyjDij7gw1JVFHetfPUfxyyr0X3e8= -github.com/aws/aws-sdk-go-v2/service/location v1.49.2 h1:WpsAwA0aNp+x4dZSrKziIf8lx6/pD86URzA+DLOgpzs= -github.com/aws/aws-sdk-go-v2/service/location v1.49.2/go.mod h1:hV93DXgH2VEoY1err3EtxFY08ekWVsT31ZPGPVViN8c= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2 h1:wTj8xWtSCzyDfLg4LlClw23eMELksHZ32MhyWDpSkOM= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.2/go.mod h1:XCoN+Erp+a2o/doaItiAgkTmXlT7K7dnTjf/mwNtOGw= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2 h1:D/3runLJe4DYuCboq+OukD+Vf/zdXreQCE7/rANMYto= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.2/go.mod h1:ug8PGGYq9+/ExH8veHXUaHsN9Jj8SVd1LEe8rI4ofjA= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2 h1:SSTVebeUdhbix4G+EIdpDs0BPaquk1/k0dlMCpM5RG0= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.2/go.mod h1:eJs7j5kobel1UXlczSHjSvZvWTFDlDy8xsCrd4zU6ms= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2 h1:ga+0OEEZC1ykB32a/+R0QabZHB15R21AKhjjtwpmoy8= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.2/go.mod h1:NHwOWoVYH68SFtRglQST43ddIsHNogUxyENfpxodKWM= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2 h1:y7sJwmKba7eR+NC+QYEBXer4WsXFMnWAdc+tGF5WSXY= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.2/go.mod h1:98+WyOT4VtVfTD/Gr2aDHR9dzZxNHcdYCLLbYi+ghFQ= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2 h1:nDDUfwtvJhIm+iua3Slds0XFTmmahIulH1hITQAuGsM= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.2/go.mod h1:GsHZRIBtRirgUfeHdH0qUlFm16uFXU2iaEqQ6p3CUfw= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2 h1:ul7XXORFXSPYEVCDwB0urPAheVO09CsyioVswBMoixo= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.2/go.mod h1:2nGnFjoxAMuAwZami5DUGySCoJbM02FDti68RN14fa4= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2 h1:adPpqiu26kt1mN9zjwLfRhHmNMYachXR1GPwQH0PjDc= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.30.2/go.mod h1:BvI+coqicHOWc/jODnTLjOxGZkc3ZzzbgAZxvZyd+hs= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2 h1:qTV1eMZUu1KgyPbiilVxV4mW5D+BNWux187jhnB7o+Q= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.2/go.mod h1:IZtKkqbU0jBvGkSqW7YpinF6iNtE9cVB42hjuJZlPPg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2 h1:QinCfaJL3wHwNSlL4yaAIEBb9e4waAmck0gVuVlZVfg= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.2/go.mod h1:lXXe0GYwXcEoB1XVqHSq6a+n3CQ2uO7FOx7UVt1gtVE= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2 h1:AbXfA2+h39tChp7mnfFx+nW3kZoXuz11mFkFvV0Bc4U= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.2/go.mod h1:dvpVmhK6Tq5Z+yWFDNFJl3C3JU35JgYhw6RX+Evj5xI= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1 h1:tgAwtExWmZwFS3uXnq13gYJZPWOhSnD8DiPG9DyCCEk= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.1/go.mod h1:x6cENwxLQupiiL1RSa3V5KWA5/U/k5LYb7W5VAU2aVU= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.0 h1:JzLtIS1mKKGizvjiKNRNZZVryiUbMoj9e8A9/Y8dbc4= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.0/go.mod h1:/cY5DP3yOf7chKkiHdKrwv1sN0sYu1YoTff2pmLbnbs= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2 h1:hCfXnZGSHBPuw7PnBEGgUJJFh83M4fZDKMjNd3NOyDM= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.2/go.mod h1:buzZot1R2yAsQ9eVoQagpZ595yizch+xdSP6BStUxSQ= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0 h1:YAM5JqLr2+ZwbHoQWeASolqSy+36eIj/H5LLLr979T0= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.0/go.mod h1:4Gq2StBipHbnBpL75SlNXYSsmgoALkjWT1i5Omx/NyE= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1 h1:7EFqHTCnPVj/FICjur3tR194fwQ+rLVVbTTi31/iA9Q= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.1/go.mod h1:+S+f7gxu7d5AtL/wOOr+QcFv5Eov7qXudPfLqPKG+S0= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1 h1:0v9wUjQibqrzx6rLzFkozCHwzGclwGwKQFlZk1YWX+g= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.1/go.mod h1:rV+KqkVMi93lnXpXSJiSvVt2dOs6HFKcJck1NNIK490= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3 h1:gY4PvsoPWzIOtm6CFTe2ObPjpYUpt0jyJ/oumeuE/6k= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.3/go.mod h1:TVPzh8RtsPMdRA421VtCuJEP1v5vaZSArkobw7MXlww= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2 h1:dQ9dCkC619cNuiXJI2RklFea/eIc30RD/XhE5RCLznE= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.2/go.mod h1:cs/wqWocUbgUnGwU/Ea9YJ19CZkPn7kk4qnbi0uTWsM= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0 h1:EBk+1ZduoUbA0GtnTAV8j0VUvQu0rVGXViUrK1G07Q0= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.0/go.mod h1:5kDrVxrEbhjDZqlXYTbEe30HNTKR7cF7Yc4S/IK8KcI= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4 h1:PzrU9JiVo+exAVnUpGiMR85U9SvWk6ZgFaRNUGnpINM= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.4/go.mod h1:/xFLJqrrgsCQz3CFhuPXD5o6OP+sjXFaIp3fvycjWOU= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.1 h1:cGcxO6BjTAKdb8a6wezZEUwHh9FQyTMkDEH7NW9XnwI= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.1/go.mod h1:7FL0wpgqB1DXHmD5sh0Shnq70Ib6Yb3ayh0OHeJO9a4= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.2 h1:Y2MMKh4c3YH+8CIxf/BPHy8iTspNT5396ClX2/nfRnU= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.2/go.mod h1:/GY3y8SPSgLGazlItn1aGikoiRNXFORs3FXUk/1Y16g= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1 h1:9OnoPv+06kee2cfSwcbJqJtm2w8MDIoaYGGQKgkW7Pc= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.1/go.mod h1:VdD2OqHk82qsJmNHOBWoqBoPKMk5wsQGRwW9B4Ln3qE= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0 h1:tZJrVA57lsnn1uRLHxdZ0MgqXH9S/gpwWzhyYq7Hnpk= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.0/go.mod h1:l0f3Rb75Vy0zJf6hXNKDR+oYFojuWTUJXKhmYfQLd8c= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2 h1:yPEB/4Wixi9oLQ4OOGR8CRFzvdi4S/fv5FRJcHG31mM= -github.com/aws/aws-sdk-go-v2/service/organizations v1.44.2/go.mod h1:xRPBK7o9nutMfPwVm7zg7+YCDrO06cs9J4P7btwa/iA= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.1 h1:aoo3ElrrS5UxII33Bsk7v37AM7Xt2qDUewoQNmOhrLg= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.1/go.mod h1:+fJKGQAI1FZEWgr9Ak2L4NalE/+muYwZTm5ODdwz44U= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2 h1:VwNFKyLlOtvXBPLja/Q8hs1o5vtLn+y9L5VjCwGh8rQ= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.2/go.mod h1:m6oPE9UnVlxKJl3Z05N23MHUCy25Cu5zzU62QQqZRvE= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2 h1:FS7YSZwM+gtZjC4csLH260o5ou1/HGs1s2ODEojhOiY= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.2/go.mod h1:8j3CgvUAWVP5ugpdLtdj7gtilRNgQV5cd2pzToN06qg= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2 h1:xGUYI7u/Z3XkFhwx5AXq6PcxzYagcEEZJIbhAIhPBxw= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.2/go.mod h1:dt6dIEsrU9x4xAhlqL+aKa5aHL1ld3Cx+PyIvB6iM8w= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2 h1:uIbbgGebIlEo/eLyKsaQA7O4I0AYZcFmclHdqkxaflo= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.2/go.mod h1:XPQAXDqJoSDJS919hZDgE8M64Dr3nvzwSWIHqopdAm8= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2 h1:52j59BkbBW0Zp1IvEmv4IcQQ3TX/5G+OLUk8ix8p7EE= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.2/go.mod h1:lxI1V2S0N3rKdpp/1AkgrEfr/W6r0LtfdTw/I0/iT7c= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1 h1:5OVK43kiMcc6tgBgPKGNDFbiV5nsBt1BrDBrdXjNpAc= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.1/go.mod h1:8Do0eDYyHDDmYHf/1v9s1sd9bg9547DMFchoGbSf8Ac= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1 h1:g25jup/yyGqWNQXaimGX9diCyU8KZGrQ/vWuTF5K4SM= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.1/go.mod h1:4+J6Maz7tbtuYgxjTvY66Jm1wOx+i5vkf1Fpk1hteoU= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.2 h1:vcDKXb9+Auy9uibi3HsRY5/7Z1acUVbuXPxsTB+FTJk= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.2/go.mod h1:06OhbqDrb/XS2Rp8wgoEFHeQsEvlqzSFuVLPsUMuwO4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2 h1:l/q4Z68sGq+AQGrDee1F04m1tkpP/oVRwCvfvN7BaQ4= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.2/go.mod h1:DYAtIMM3N9hDsLKFMuKIccnZPi55L2apMc66gz+sQ20= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2 h1:cXKN86BdjoUR9XrBya5HW8jq63cdxexBRJ64oSk8IFs= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.2/go.mod h1:LFBZAkaRRGLIM6YomKelbPRNCmUS5+wXTc2GjUTbRbA= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2 h1:qKleFvZS3Y8Y/bsUSJWHdqDSB4wZJUEG6q6NraQVadI= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.2/go.mod h1:GiVcvrCpT8x1LxX13KTzX3Nif5tws2W5un64kTEaAqU= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2 h1:q7LFCxCZ1XIgx+UYy8XbZITtR5uMg53zpXT3uICkYm4= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.2/go.mod h1:Zrl3fkheKPAb+9H6EI1Hfc26xi5zmK2lDp8Bsf4I2DA= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.2 h1:F21WHJ9CjB++7Rh8JpO+o8LlaayPXJI1pc2AAUqcZ1w= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.2/go.mod h1:llK4kgNHccy++lfEj5HEq9scvxs50MPr1dMgqfsGE2E= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2 h1:/d7f3wxyDfFvUxA6UBZLx/9af3lLoRjvpmmDOMuysyI= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.2/go.mod h1:f7j6IlDieTG503IXtH55Aj0iK1rTwSqKGUXyMQ83xyc= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.0 h1:L50DoPhDIG5QVb3PYijYwQcqLZzubnHzklsFz4dVd54= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.0/go.mod h1:BepvfU+5/iWo7uyVZg/2TdDJEPMUQtWTZ3HPy/WaZb4= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1 h1:fvtiUHref8X8JucCCwman1gLSF2C4YqE0xGQOML7iSQ= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.1/go.mod h1:yiTu0iOctBFs+D6jjfA1Hnb0ct91hJNq7cQ7FhMZws8= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2 h1:jkkeGlMA3SrApz4dCY1rmpF2RTVGNr5ohw52A2681zA= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.2/go.mod h1:7/cQR6Hqe/mAj+lsOAPuUBlZ5V5v3F6rPNW2IrWaLu4= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2 h1:Ig4dTUqFpsvLr3FCdRaBM/yVtHyg7Ugtehs8N3PTWVk= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.2/go.mod h1:ogXm22LnayzeC/nvpho3YX/mrr7KY22lumhgqucSPXM= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1 h1:hZ2BntETXyoPXIMme1FGT4QjcRr0NB32z6Ji9fgDLzY= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.1/go.mod h1:dQrBnn+QeI3ADcOP4zTYZ3hd42jQRtbyuemw7sRZwAo= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2 h1:yza40nSD/2vIUMWwmU+AKAVHP6X9oJ6csAccBL2FUfw= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.2/go.mod h1:MHC40pfiv6PEuuQqTwSF5+6Y4hXIv+3+6BhrOX/zkxQ= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2 h1:zP3ba3QkN/JEosnOgLy/Koyw/bqsaHP/JgcOZnkQ/UU= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.2/go.mod h1:u9pEQ10QG3INXYmR129OszMPJadPmgAAoBsqv1uxZ2s= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3 h1:lv1mu3NdIa5sqkSWGq2Pe/OnRFyLlwfWNxa37Az64nY= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.3/go.mod h1:LUYthJpStiOnz5Qz5mmxZlu2V1h0F5Q7qQXMjUK8ojs= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2 h1:mjf0THDU1HniXbvfDrDaEpVezBsIwVi+Z3lQIHVaOv4= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.2/go.mod h1:/Zc94W6KxN90khSJzZo61yvFoucxU5WTiDAGEGuc4Ao= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2 h1:51kPAIcfOld54qX1GuttcFRIeCrfkB5AwGkb1hyQseI= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.2/go.mod h1:kL7oUvOOOifWJy/uPUR2tQbobhYlHi3/FKA7L0C2SiE= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0 h1:P7dm9TlRs6EEiXhwMn8DYQ92M/443GAzDk2q6GaPDNQ= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.0/go.mod h1:j4q6vBiAJvH9oxFyFtZoV739zxVMsSn26XNFvFlorfU= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0 h1:ghvTp7Y951DH6nCJyslU7JkXeGJ2pwWfuQuwZFyPhjM= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.0/go.mod h1:JwpIh8KZpaZJWFjB0KmkElCK7398QzFGUDvjqxU0OmQ= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2 h1:iJzNq8Mkkewq1wx0GWEiy8+g0XWrmz4VDcr8dV09Qmc= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.2/go.mod h1:N7gREZYdoi6fWnvRNtDk3xHpGPv5Tjys1OJ1kEHLaoc= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3 h1:HTVhZvnV0pzNuvwgboEwHYl8Yu86gL6tyUtPuBYfgDs= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.3/go.mod h1:/nTiifZpzvw2LGcsnuwvy7711doQnZ5CbcXRE4roslE= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2 h1:kHk1vf01L6EZWJfb/tl9FCiUtivpZbuch8zjpfOFZh8= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.2/go.mod h1:HssqCIVrwkn6lr7FhucjcbqEjm3Yn+cLYNw1NTlacdI= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2 h1:Smb99KzDEt6X9c97P0TbG+PyjSaQJqzmddHPC9rFUdc= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.2/go.mod h1:OFYibvEVgaCMWorP+oKyPkfRDlILKV7fgTBT/CEl3QA= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.3 h1:34ZOJ68Vne67uqRvgLSr06t+FXAAVH0U9SsTBfJdYl8= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.3/go.mod h1:WoU5gqlz7e1qkiJN46U/NBvacoW1x7n8yvq45arml6o= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= -github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4 h1:yLhv1ES05hpdIlE09NjNHl/EjQ1ctW9NUjacLJ5nODw= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.4/go.mod h1:1maUsrcjcvs5cFYpufGazZ32ttRROeIEBCCsAhyLD6o= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2 h1:QyuMVRu+fUSd0CEjr3DIo9UoYLaWYfuzu90trof4SE4= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.2/go.mod h1:h+GeDG0DcW8qMLHjKIOtaXBOexdNEUGWQ089z0S6EXk= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1 h1:S/XTt495b8Gq/LG8Qk6n+nX2EyDJM/XtIbxb/tqG01g= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.1/go.mod h1:KdvVQdbQpmJPR7Sc5Dhl6BDoeDdIzbNNjVW1ngESq+A= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4 h1:+voCWwzv0hjPAYlPgFK5O/1Jbih2Kmis2GdGRm/ez4U= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.4/go.mod h1:BSxggpM5AIOTMl1ViayZKQW/3i08ticdyCClQohrdNk= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0 h1:0oO2/J3a8KFjId1p3zInJUlBg8NUabxSMAUA2LSMCaI= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.214.0/go.mod h1:Ae028fYUbRG3E4ufQ2Kbia4VtG9C9enwh6pYCsHxonI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1 h1:ogjtKXvsyTDbARaUOJyzrAGzffSpPUo4wq04pift9g0= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.1/go.mod h1:ByEOJKwZ6GhUoex+J2CAsw3axuWo/Xe0F7qOLAeNwH8= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1 h1:kHBF/4k2+qSE7NducknUvqy4fNkuomJwc1Uu1frUIhs= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.1/go.mod h1:N1eQPcS1CxWvbkbCJtfWTQE3dFFhaTlB6PC7+Jy302E= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2 h1:QMayWWWmfWyQwP4nZf3qdIVS39Pm65Yi5waYj1euCzo= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.2/go.mod h1:4eAXC8WdO1rRt01ZKKq57z8oTzzLkkIo5IReQ+b8hEU= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2 h1:xyW+W8UGFmBegLgY3jcejDpMJpCjzCHDHZq6X1AgO0k= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.63.2/go.mod h1:iGwIZwjxYYEwbnE7NUCDBGAvrkmWu2DMpxSXoYATaCc= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2 h1:baOZEoq1yQ/vl6bViVbEPZm0h/fFSDlL4gEw/eZMQko= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.2/go.mod h1:0a8Af6RGkrvYCKq/Dum5S0JiRFTUgkDUpcctCsSII14= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2 h1:oa5geySYdx/JbI4tOIHbrP4z9QeS5yapYtE4fmNih9M= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.2/go.mod h1:c2JTS2Gy7fUCSfZK0GXO/tewBmHrmIE77XYAP6+PpYs= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2 h1:wH/MVo9VvzJXMnHtawrU85309lqMAS4FNCOM23krd38= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.2/go.mod h1:CdNdrQ5Eibe5gmd/CQ8aK2rJkEtcUtKjzZCDbR2YQxc= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2 h1:suwi0IZD2FAPqC2eaKE35sNJAFHXOJisRCZqiv9QMaI= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.2/go.mod h1:j2WeUxVTdQIny/YxZ+ATXI+1O4VH1ue5ZDtOhfkj+bI= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5 h1:soJTg6MJHziT5Xj7b3OMuJ92HQLOIqvPzXZAWyXnnFY= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.5/go.mod h1:z8hJkk3PNhYVmL6/CNb8QTeq63hHNJvlipF7BUQ2wl0= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1 h1:FZyx6GVtwgU/VgQciAlDfAWTWd4SdrYti2yerujac1g= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.1/go.mod h1:tscyLnH7Ds1Ja+07MAxBIbtb+EN3SWL1EsdJPgHieCY= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.1 h1:/sqmiyIhJl3sUelbSnIJiPeMLwRVL8RrWeU10hosiLk= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.1/go.mod h1:L0ntuXDlMduVQ0dbor+A42SYwR15ddAqC7J81L3EyiU= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1 h1:4UnpjeaUfSEQ7D0YldaG8C8LtEYA28Y/TTbET9BfP2c= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.1/go.mod h1:aob2hoCCLs9/E/Iwl6ClQvLXSQA7LhLD/e8/m3Gn4WA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2 h1:DFD1m7vwn3fYSYY20fgn5YUOMew2PteGaOoWr22PAZg= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.2/go.mod h1:Ji1ckIimHIgoJJ4xqw+KYHgeiyx/ZIjVjiXOFDCCwvw= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.2 h1:daAMTHVfwUaAOdyBlGNtl09xqkjB9k3X3/BgEVpmJD4= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.2/go.mod h1:TWtjIQVEyCP4M8JXZ/ePx3Zw2XHe1fC2arN6p44C2PI= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.2 h1:m21C+93vtoz3ukgvKrZw/6sGyYKcLRkZCM1j4S3WLNQ= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.2/go.mod h1:OzsMS5vSfvCCOfkGg5T4tADnGr+rtvT+E0prVrWdW4M= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.1 h1:6AqFh9gI+BEOlKRXaYryGMCwygwaTlISVUs6qEMosaU= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.1/go.mod h1:wZGK3CJNllAOeJ/xrnyTHotaXEvtC27KOLMMKGBeT+4= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3 h1:0dWg1Tkz3FnEo48DgAh7CT22hYyMShly8WMd3sGx0xI= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.3/go.mod h1:hpOo4IGPfGPlHRcf2nizYAzKfz8GzbQ8tTDIUR4H4GQ= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2 h1:6P4W42RUTZixRG6TgfRB8KlsqNzHtvBhs6sTbkVPZvk= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.2/go.mod h1:wtxdacy3oO5sHO03uOtk8HMGfgo1gBHKwuJdYM220i0= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4 h1:uZu3+0UGmyvyAszwqxd1w14BJ6B7dC2R7KmpgpcIAt8= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.4/go.mod h1:AcrjFcoh1wLWYQqE+EUcTvHwjJLaSchTU/FcYKfW7BQ= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1 h1:DsH7AjU8npCm/XCi7qovfX1YXp1QoUe5CNS0F9lmJhI= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.1/go.mod h1:DGicTMbnUELJ2LucW+maP/9NeVVU+JapfAkHZiT4jgE= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2 h1:IG0mSK5U5tQW3bg3JV4oSL6yYz7phBkyrO7lyQRT3c4= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.2/go.mod h1:lpRVgTQzyPBScHFoWF3Kwjoz2vgmwa2soYnIfRsF5go= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1 h1:Llm6eb9B6ZtAMQNuT4Sgb9sEnE9MKxBrHCdjyUSTFLU= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.1/go.mod h1:zTqrzk3TCJkjP5ldAYZpUhXWiczImO7zMAl1NeCI9xs= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2 h1:pyyb8LLmAHx8VrmuKUY1uED5YEnuRLzen/OT5eA7hXo= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.2/go.mod h1:9Z/1JSEe3knSXqJJ1jV5aE6zoIRjx+r6zEfea2uAyrE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2 h1:qcFIg8bd4/3pMAZyXxAKBhhcA80RN41BseuVNHAsx/0= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.2/go.mod h1:gpReX9eEM8p3Gi2Dm/t9MCJNrSavNxdtPVBO5ID1Vrw= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.1 h1:6otLgBZi+sTyvITTL+EBPsVlFkb4ERjhmkj1fMUkIpc= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.1/go.mod h1:xjlXiD9EH43JC5vsH5NbMsFGeMZlRpls7OtsaZtl0Yo= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2 h1:OcSQGKZKXqIx+XZcqtkNNepsuN2/aVLiqrqbNxtgJEY= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.2/go.mod h1:mY/D6ARZ4fCYBlJpJnAXBeqMn3+Hl5mjr6EGBzVK4E8= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2 h1:ZMC54cWTeean7YW6zcQB4pFi9pGgziRvtUQbgfiJjzw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.2/go.mod h1:SHygAmKFOQ3n/HVh/jZ2SV3p/T4Cx9/MDIxAOZcvJnk= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2 h1:ckbblL+tBFcD0a5OHadeP+8nje1x1NqvjvunvCpuDUQ= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.2/go.mod h1:NusGIyyw/Ml03C8jaf4FHub6ZFGl5IaN54zI/iZ/3ho= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1 h1:m7mVu4/mwg0G2pKJ4W68bBRvm6+/LiZAlah1XyK1qsQ= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.1/go.mod h1:jdVmwsQ8r3JFTVeeZWIBLcZ/qV+OoUToWU0Mn9tuThA= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1 h1:vXCCnaKvQ6StrwVu2VR4dLS56iG+mUw5t7y0SoIdERk= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.1/go.mod h1:ff44LnOrAky3P+BxilUkmLU3377cJsyyxFS/+qqMK18= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2 h1:3d0rfdZK9tqSpv1uEal2MyF7kFhCV1lU7PXDxliQYjo= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.2/go.mod h1:gmY3w3v81216hqqABbBwuA76VlIufDxUepGdrwyGEm0= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2 h1:ZxESRTr6uhTjoCq5Ir13duz0GuU+iDQQKWdiqCWATE0= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.2/go.mod h1:Sb0I32Nr9cdnsHRvNLm1a32S09l5E4sU7Z2FJEuXMrA= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0 h1:DzZRnYSon5Q+TosTJfm9rlRNc4xanaKI1Crwwyn/Sxc= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.0/go.mod h1:gwoKhKL/bJb8KQfclDrJQrWYG1iRBU/3joSnCfQ5b70= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1 h1:ueH6Bqa3puxCxJZ7VNp8TnAmaBRcZxor5BoQMJ22RbM= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.1/go.mod h1:hB8cjaYZYBPvqnGuuqmUCW4VOmK++aoItn0AJJQ9euM= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.1 h1:vVyc5/p3q0566oUS79ImDNmnAc1CPcr3bG9njSCTG1Q= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.1/go.mod h1:HUh23PKbDr6cNfjEP3nNW2VERZsXrpWSyBorSwUXYQw= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2 h1:jy4ECSfJbGk5ypLIbxhXJT4JZK1QmkyPO7U88cpadG4= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.2/go.mod h1:7LQxO2vewIZKimr1IYFmYxi0h6QLZoJ5u1Vp2QXgYpo= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2 h1:2DlTie50vaR48vl7qfhwO4/Wcyp0EZfJvAafVERdj5w= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.2/go.mod h1:AJoCa1C5NTIPrb+ipa37XCLmzJx8+yR0oR0RthAX3i0= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2 h1:giFfWGLth/IiJZ3LgvG/hy6T8J4vbaB+X5K4MN0CX8I= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.2/go.mod h1:o/TFtOOoVM7yZX2qHtHd1i0UBGI49Wt0lTzauYbKEJc= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0 h1:n+zawjC5CTE4MJg+uBm8gJt1tEVoMX6zyZZpGV7DR2M= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.0/go.mod h1:6CKjfL6oQH63mt1VFvewFsu4ySbRsCJ5UvPc/idWWvI= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2 h1:b9rCSKtYt9bzjTKhvM9HJlSOkX9nrbvOM+Bx2OrLmD0= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.2/go.mod h1:cyuDqMRRIARXm/gndad2OF+XeXotAL349N6/hZympDY= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2 h1:pEI+JZb/82WZpqO0dTxipiZeBCl6UhCYUkDDsFcxs5Q= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.2/go.mod h1:L53nfLqk4M1G+rZek3o4rOzimvntauPKkGrWWjQ1F/Y= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.0 h1:/bIf4FBZdnYsciaXBoTgRMgUwVkU0AZNF9R6e1FejqU= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.0/go.mod h1:k0r/zDiz2HVcFUqlTVy6g2rpRT0zkoQPsSP7vsravIg= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7/go.mod h1:vVYfbpd2l+pKqlSIDIOgouxNsGu5il9uDp0ooWb0jys= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 h1:VN9u746Erhm6xnVSmaUd1Saxs1MVZVum6v2yPOqj8xQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7/go.mod h1:j0BhJWTdVsYsllEfO0E8EXtLToU8U7QeA7Gztxrl/8g= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgOy26qyh5bvW+nDoAppxgn3J2WV3m9ewq7+8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp2iC2aQqPMOSXyx7QpATrRzSWB04= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF8Mn6s2G22HOI2cyiHiP8= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJxk7DDcYZ73jJ/s4= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgDv3j/jeSmyD52xEY= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrze1jmq7nx60P7hIFmSLA= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+sJIm2sJMLltK2unRSk= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQrI2bkJ2sQpN84mRcEcBNV9LZU= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxju7ahxkdmmXCQBIUU1k= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDRux7yw7tIKDEZbjmQ+8thE= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68IgDVXLnz9B8brLDLuJjiA= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMgptRcCWeRly7bh2qnaWLu9MSkTVU8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaFL6A62A/7/58SK+cGoZUycB+pqI/Ll4= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx40rnzsCwu4Ak+cZ1yD2rQ+44M= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FDoUckCOfCY3hj1n4= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4CcKg5S13cY+tN9o+4D9VKPSBwI= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27ACbUfULROVoe+2eAdng0= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQM5Urs36ARzbEP8L3nYypc2Q4= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB6/wGEBdKTSv+jjfLTb7g4a6RwsqiVHE1TEE= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7WhJO5xpYiA7f1LH2YQZVh4Fio= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7VtNyZLsM9Uz1Zl8VMe/NVQgEWtpY= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJqozcrpumFh9+P7RQuXFJw= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= +github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK2rY+2xBEUAVxxz7iSJvQ= +github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hrSUtqfXVJP15KShbRle+mq/6VV4= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh4kV5MFdWnYHKeM= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0OjHi1dTFkG5LpaOf3FI= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9pawjWdGGF1r/CAdDFZVot7GeQ= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcLmFLUXI84JEqnIYW9lkiLV1ws= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG/wHpY2SaH3eODO3jVwAIM= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 h1:VFsXwfXdn+R7mJpW6RojrBbPR7PKzNqdLRdijyVRN48= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/HhUeTHxiWqsvQQgocL48= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4KZRdjN06PAFlt9o= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+RvB5sblqeVmiNAI= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOUarwehGgE2V8v3Dqo= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9nbq+UxcpQAuXQxVjvsY= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHMlwaw26mFUUcVQEVqY/I4oA7A= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YVNLJI1/i9OEzflSg1B7EJ2CTnq2I= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPItMeYp9pw2S+VG5CITFdXy1zQyg= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM9t7ag2468xgqWQs9H48iEBCs5Q= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJjOFM4FMrbZbawG8NscGKHsxw= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2YD8IhcKDETZNLxmticIRESuyafaqSi/PA= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy4rf0V0p1yZF5rIQ= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7kArD8EuXN8jTrPs= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJFjaozIVkQ1o+JPlggNzhCs= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 h1:pokghrmP5zmoAOwXuQT29pCCQ+obzpqxD1M+QOxNJu8= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcTju7vc4t7aj2d2gvXvkH4ktuwFf3Op8s= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1h0im145UBakpEmOCCkXTGnOkoM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02eeV6w924Pbbw2Vdfs= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQaoVoDFtZz92A9OWddBuFA= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqzbYCXC8Ke2S/O6K9/QXl5MZRXmA8iMU= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7GKi9eemWNYFNrmyx0= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bgHCpyj9cTg5dOZ8tLw= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBDK8HthRDBr5deAQ5Pb3s= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUEJYFj6C+UzlCy+Lb0Xu+8k= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgAJklcYcApJuRMoYOU= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/RjNZo72wiWbIxR7pT+XEmQ= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k05kzFIQhpgyLEMI= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLImbS+DZnxB08lpYps= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4m6dQYOZNgqyYDj2o= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4Yl4+pf6Se2xSeCjqXa6w= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS1SdD95fPhVji6FGceW2/5gMg= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyNGf7Ls2OFIOrDzWZX97f5Uljgw/iJGM= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8UNkdFX85Ttk+bOMEICuIljgQ= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDheFISpJ/AF6WM6Yt2sSQUG9qqFg= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRPVQhlqxGjco8HePVXCBsdazota6EUw= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8OLb/SBOJdwjHB/MvEwg38JbaMBI= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzFXI35uo7KknYTViOtZux/kSh0Fu3vOcTQ5REE= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6PgFQiuGd1ZLfoD1kHjlHFSiK0= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiqBGMEZa6eNfr5oL8grOA= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsXefhtvI2AJIDv712MZTKeImxOAY= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADhx/A01nfm8j55iOo9aTDNoY59lA= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4RJNmyvJ9w1xzaIZyckMWxIhJ3mgqHUbP/0zB4A0+E= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5ORL+P6y+YkGPKsFlqaWbgX9tXZyFTBhJyEYMb4= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 h1:pniIup6rzD25rCcheV/g15zkvc+Hvkl+dHlP4TyY/4g= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 h1:XBhTNPtS3JdGkqE+sMUCToFGUMm5x6dVcR6IfwbacVo= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.4/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe/t/WE+RxSOoHWaK6P9Hg0= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr8Snf8RvyGJfVveILKOR9uY= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoKlDpGiTXnBhKN98xcZkAc= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 h1:ql9qBtq3g5uYsOyDUsXRBo7JcW8D67PxUkolgw1kjS4= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mbwXV5xFXQyNJuR8X0gfcbTXFjHk= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5MO8lnR2vabp2q5i7zPUoyJM= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemPQ8R8BNang/sAbuut12LOOfg0= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1:ch8Iz6TsqfK3USQn9/NEVFgC6QbG1uW3K7fcZSiDKKY= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhKgesbP4VSEBivrVx+u8XcpCtRno= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaFzarpVWRQdLSHU+KKeKoPOmA7SPXmb4zlnFfmQ= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3/ha0nyZbpQGtC8iFYS0zGKj9LnTo= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Guqm1hHymfwOvn8nI7aCJcePv8g= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2TuVXFYCLnxEBvyA= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs+pmesFvq2J5F80kyo= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/pJTUTs4ww/WqOxTA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJmiH4alWEdnISAWkDaX0= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t0To86r5oewWmuplU08= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2AqiN1AXrtq/rBdY= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+nBt6mnK5iPjjSzk= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3qlSxWllTzuAImA0= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T7x9sWfubbppvulyj9crp5mk= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTITHiVpo/VCn2q0IZdGqBGhF10= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 h1:MXTDAHwEZ5NzaLnsq34xjPXEVh0VaeGD5rATFCgFqvg= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 h1:SfEgky1fDjAGRFYxLnrnDVlo0ZOqH39t6KsspYJPebM= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 h1:yzeq9QvTmQfUMY4FHs11SxWJhBqeaaTEPpfzdHa1BZo= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 h1:091+jMFSSt/41p2PqQzhKHi6SDZhGikc85jF/rHKzxM= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zcJsTF4awNHHaMYIY= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojtyt1UuaeJdXbLhrvVZlc1cw= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhXJppa4xzWCh00mIE5hJyET6A= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a8LjhJwsMCkpdVJUMRuIy61LghA0XHY= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdVguofsIheoDIv1ntzNJBJ8Y12l3Q= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTwo5fOTHBoBEJBg7s1h4J0ohi/DY4= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wGcBfOqphwX7gXy9oSMO78Vs= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/E4lZGOhg+F1qzAPSIJwE= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+eflgSmIju0rD0QjwKZq1OFZt5pBB6Og4= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpAbcEJY0Ujo6hyQXv+m20SCk= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53Hv3YxFLl5mZatRM= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 h1:Ea4CMk5sZOknJttA28mqYSQcH5IQyCBEhwoXcu7sxyc= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/OV9nUFILLuflBXxNjZvrDo= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 h1:7XygyvejhD059PzkTVCo5ZWnKNE249ju6aBTfV9rYho= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 h1:hm+vuMO3n7s7E/fv32zOhdWGxb4eO4P5SEMSJpdY+KM= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.1/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= From 36a3b83f6e4ddec3ad736138ac51cc9cf65fffae Mon Sep 17 00:00:00 2001 From: tabito Date: Wed, 10 Sep 2025 22:54:39 +0900 Subject: [PATCH 2004/2115] add changelog --- .changelog/44224.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44224.txt diff --git a/.changelog/44224.txt b/.changelog/44224.txt new file mode 100644 index 000000000000..5c353227acae --- /dev/null +++ b/.changelog/44224.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_bedrock_guardrail: Add `input_action`, `output_action`, `input_enabled`, and `output_enabled` arguments to `word_policy_config.managed_word_lists_config` and `word_policy_config.words_config` configuration blocks +``` From 7bb89a10bbe2eeccfd4e1a16b6cf3865d895640c Mon Sep 17 00:00:00 2001 From: Asim Date: Wed, 10 Sep 2025 15:20:05 +0100 Subject: [PATCH 2005/2115] updating copyright header and documentation fixes. --- examples/odb/exadata_infra.tf | 3 ++- internal/service/odb/cloud_exadata_infrastructure.go | 3 ++- .../odb/cloud_exadata_infrastructure_data_source.go | 3 ++- .../cloud_exadata_infrastructure_data_source_test.go | 3 ++- .../service/odb/cloud_exadata_infrastructure_test.go | 3 ++- .../d/odb_cloud_exadata_infrastructure.html.markdown | 11 +++++++---- .../r/odb_cloud_exadata_infrastructure.html.markdown | 6 +++--- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/examples/odb/exadata_infra.tf b/examples/odb/exadata_infra.tf index 956d39f91c4f..0cc31c1cb968 100644 --- a/examples/odb/exadata_infra.tf +++ b/examples/odb/exadata_infra.tf @@ -1,4 +1,5 @@ -# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) HashiCorp, Inc. +# SPDX-License-Identifier: MPL-2.0 # Exadata Infrastructure with customer managed maintenance window resource "aws_odb_cloud_exadata_infrastructure" "exa_infra_all_params" { diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index 00f23d2854d5..a336b7978672 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -1,4 +1,5 @@ -// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 package odb diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source.go b/internal/service/odb/cloud_exadata_infrastructure_data_source.go index c3d41b787704..5543fca1e4d0 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source.go @@ -1,4 +1,5 @@ -// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 package odb diff --git a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go index cac1e6ba55cd..83df2759c16e 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_data_source_test.go @@ -1,4 +1,5 @@ -// Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 package odb_test diff --git a/internal/service/odb/cloud_exadata_infrastructure_test.go b/internal/service/odb/cloud_exadata_infrastructure_test.go index 6805ab9bb3c8..44678001f9b6 100644 --- a/internal/service/odb/cloud_exadata_infrastructure_test.go +++ b/internal/service/odb/cloud_exadata_infrastructure_test.go @@ -1,4 +1,5 @@ -// Copyright © 2025, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 package odb_test diff --git a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown index 3fda21d5af21..1c1652a2c800 100644 --- a/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/d/odb_cloud_exadata_infrastructure.html.markdown @@ -3,12 +3,12 @@ subcategory: "Oracle Database@AWS" layout: "AWS: aws_odb_cloud_exadata_infrastructure" page_title: "AWS: aws_odb_cloud_exadata_infrastructure" description: |- - Terraform data source for managing Exadata Infrastructure resource in AWS for Oracle Database@AWS. + Terraform data source for managing exadata infrastructure resource in AWS for Oracle Database@AWS. --- # Data Source: aws_odb_cloud_exadata_infrastructure -Terraform data source for Exadata Infrastructure resource in AWS for Oracle Database@AWS. +Terraform data source for exadata infrastructure resource in AWS for Oracle Database@AWS. You can find out more about Oracle Database@AWS from [User Guide](https://docs.aws.amazon.com/odb/latest/UserGuide/what-is-odb.html). @@ -24,16 +24,18 @@ data "aws_odb_cloud_exadata_infrastructure" "example" { ## Argument Reference -The following arguments are optional: +The following arguments are required: * `id` - (Required) The unique identifier of the Exadata infrastructure. + +The following arguments are optional: + * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). ## Attribute Reference This data source exports the following attributes in addition to the arguments above: -* `arn` - The Amazon Resource Name (ARN) for the Exadata infrastructure. * `activated_storage_count` - The number of storage servers requested for the Exadata infrastructure. * `additional_storage_count` - The number of storage servers requested for the Exadata infrastructure. * `availability_zone` - The name of the Availability Zone (AZ) where the Exadata infrastructure is located. @@ -70,3 +72,4 @@ This data source exports the following attributes in addition to the arguments a * `database_server_type` - The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `storage_server_type` - The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. * `maintenance_window` - The scheduling details of the maintenance window. Patching and system updates take place during the maintenance window. +* `tags` - (Optional) A map of tags to assign to the exadata infrastructure. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. diff --git a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown index 4d1364eebe77..53c3232eee89 100644 --- a/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown +++ b/website/docs/r/odb_cloud_exadata_infrastructure.html.markdown @@ -3,12 +3,12 @@ subcategory: "Oracle Database@AWS" layout: "aws" page_title: "AWS: aws_odb_cloud_exadata_infrastructure" description: |- - Terraform resource for managing an Oracle Database@AWS. + Terraform resource for managing exadata infrastructure resource for Oracle Database@AWS. --- # Resource: aws_odb_cloud_exadata_infrastructure -Terraform resource for creating Exadata Infrastructure resource in AWS for Oracle Database@AWS. +Terraform resource for managing exadata infrastructure resource in AWS for Oracle Database@AWS. ## Example Usage @@ -70,7 +70,7 @@ The following arguments are required: The following arguments are optional: * `customer_contacts_to_send_to_oci` - (Optional) The email addresses of contacts to receive notification from Oracle about maintenance updates for the Exadata infrastructure. Changing this will force terraform to create new resource. -* `availability_zone`: The name of the Availability Zone (AZ) where the Exadata infrastructure is located. Changing this will force terraform to create new resource. +* `availability_zone`: (Optional) The name of the Availability Zone (AZ) where the Exadata infrastructure is located. Changing this will force terraform to create new resource. * `database_server_type` - (Optional) The database server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `storage_server_type` - (Optional) The storage server model type of the Exadata infrastructure. For the list of valid model names, use the ListDbSystemShapes operation. This is a mandatory parameter for Exadata.X11M system shape. Changing this will force terraform to create new resource. * `tags` - (Optional) A map of tags to assign to the exadata infrastructure. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. From 20dd7772787e95f8305a0e748c2a99c2f63bca91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 10:43:13 -0400 Subject: [PATCH 2006/2115] build(deps): bump golang.org/x/crypto from 0.41.0 to 0.42.0 (#44219) * build(deps): bump golang.org/x/crypto from 0.41.0 to 0.42.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.41.0 to 0.42.0. - [Commits](https://github.com/golang/crypto/compare/v0.41.0...v0.42.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.42.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 4 ++-- go.sum | 12 ++++++------ tools/tfsdk2fw/go.mod | 4 ++-- tools/tfsdk2fw/go.sum | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 8a61dbd790e4..891af8729c4b 100644 --- a/go.mod +++ b/go.mod @@ -310,7 +310,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/pquerna/otp v1.5.0 github.com/shopspring/decimal v1.4.0 - golang.org/x/crypto v0.41.0 + golang.org/x/crypto v0.42.0 golang.org/x/text v0.29.0 golang.org/x/tools v0.36.0 gopkg.in/dnaeon/go-vcr.v4 v4.0.5 @@ -378,7 +378,7 @@ require ( golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/sync v0.17.0 // indirect - golang.org/x/sys v0.35.0 // indirect + golang.org/x/sys v0.36.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect google.golang.org/grpc v1.72.1 // indirect diff --git a/go.sum b/go.sum index 8137fd9618eb..92ce8e82f3c7 100644 --- a/go.sum +++ b/go.sum @@ -809,8 +809,8 @@ go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42s golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA= golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -840,13 +840,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index ea7068613c0b..3e5eda96c9f4 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -362,12 +362,12 @@ require ( go.opentelemetry.io/otel v1.38.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect - golang.org/x/crypto v0.41.0 // indirect + golang.org/x/crypto v0.42.0 // indirect golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect golang.org/x/mod v0.27.0 // indirect golang.org/x/net v0.43.0 // indirect golang.org/x/sync v0.17.0 // indirect - golang.org/x/sys v0.35.0 // indirect + golang.org/x/sys v0.36.0 // indirect golang.org/x/text v0.29.0 // indirect golang.org/x/tools v0.36.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index 6a8f2a0a4928..a1e57fd69728 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -804,8 +804,8 @@ go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42s golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -835,13 +835,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= From b7671c4ac8d9e38dc59aebbeac521ccdd325be7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 10:52:37 -0400 Subject: [PATCH 2007/2115] Fix release-note casing for `enhancement` --- .changelog/44215.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/44215.txt b/.changelog/44215.txt index abbe682b91df..9e7d2f6100d4 100644 --- a/.changelog/44215.txt +++ b/.changelog/44215.txt @@ -1,3 +1,3 @@ -```release-note:Enhancement +```release-note:enhancement resource/aws_networkfirewall_rule_group: Add IPv6 CIDR block support to `address_definition` arguments in `source` and `destination` blocks within `rule_group.rules_source.stateless_rules_and_custom_actions.stateless_rule.rule_definition.match_attributes` ``` From 23aa22932c60bb745498cbf3a7038f71519c8ae7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 11:04:57 -0400 Subject: [PATCH 2008/2115] r/aws_appautoscaling_policy: Add `predictive_scaling_policy_configuration` argument. --- .changelog/44211.txt | 4 + internal/service/appautoscaling/policy.go | 1230 ++++++++++++++--- .../service/appautoscaling/policy_test.go | 5 +- 3 files changed, 1010 insertions(+), 229 deletions(-) diff --git a/.changelog/44211.txt b/.changelog/44211.txt index d5ec5b4d54b9..34075df08df2 100644 --- a/.changelog/44211.txt +++ b/.changelog/44211.txt @@ -8,4 +8,8 @@ resource/aws_appautoscaling_policy: Add plan-time validation of `policy_type` ```release-note:enhancement resource/aws_appautoscaling_policy: Add plan-time validation of `step_scaling_policy_configuration.adjustment_type` and `step_scaling_policy_configuration.metric_aggregation_type` +``` + +```release-note:enhancement +resource/aws_appautoscaling_policy: Add `predictive_scaling_policy_configuration` argument ``` \ No newline at end of file diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 2c4af60e59c3..25ab4c320288 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -38,265 +38,458 @@ func resourcePolicy() *schema.Resource { StateContext: resourcePolicyImport, }, - Schema: map[string]*schema.Schema{ - "alarm_arns": { - Type: schema.TypeList, - Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + SchemaFunc: func() map[string]*schema.Schema { + return map[string]*schema.Schema{ + "alarm_arns": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, }, - }, - names.AttrARN: { - Type: schema.TypeString, - Computed: true, - }, - names.AttrName: { - Type: schema.TypeString, - Required: true, - ForceNew: true, - // https://github.com/boto/botocore/blob/9f322b1/botocore/data/autoscaling/2011-01-01/service-2.json#L1862-L1873 - ValidateFunc: validation.StringLenBetween(0, 255), - }, - "policy_type": { - Type: schema.TypeString, - Optional: true, - Default: awstypes.PolicyTypeStepScaling, - ValidateDiagFunc: enum.Validate[awstypes.PolicyType](), - }, - names.AttrResourceID: { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "scalable_dimension": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "service_namespace": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - }, - "step_scaling_policy_configuration": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "adjustment_type": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.AdjustmentType](), - }, - "cooldown": { - Type: schema.TypeInt, - Optional: true, - }, - "metric_aggregation_type": { - Type: schema.TypeString, - Optional: true, - ValidateDiagFunc: enum.Validate[awstypes.MetricAggregationType](), - }, - "min_adjustment_magnitude": { - Type: schema.TypeInt, - Optional: true, - }, - "step_adjustment": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric_interval_lower_bound": { - Type: nullable.TypeNullableFloat, - Optional: true, - ValidateFunc: nullable.ValidateTypeStringNullableFloat, - }, - "metric_interval_upper_bound": { - Type: nullable.TypeNullableFloat, - Optional: true, - ValidateFunc: nullable.ValidateTypeStringNullableFloat, + names.AttrARN: { + Type: schema.TypeString, + Computed: true, + }, + names.AttrName: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + // https://github.com/boto/botocore/blob/9f322b1/botocore/data/autoscaling/2011-01-01/service-2.json#L1862-L1873 + ValidateFunc: validation.StringLenBetween(0, 255), + }, + "policy_type": { + Type: schema.TypeString, + Optional: true, + Default: awstypes.PolicyTypeStepScaling, + ValidateDiagFunc: enum.Validate[awstypes.PolicyType](), + }, + "predictive_scaling_policy_configuration": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "max_capacity_breach_behavior": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.PredictiveScalingMaxCapacityBreachBehavior](), + }, + "max_capacity_buffer": { + Type: schema.TypeInt, + Optional: true, + ValidateFunc: validation.IntBetween(0, 100), + }, + "metric_specification": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "customized_capacity_metric_specification": predictiveScalingCustomizedMetricSpecificationSchema(), + "customized_load_metric_specification": predictiveScalingCustomizedMetricSpecificationSchema(), + "customized_scaling_metric_specification": predictiveScalingCustomizedMetricSpecificationSchema(), + "predefined_load_metric_specification": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "predefined_metric_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "resource_label": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1023), + }, + }, + }, + }, + "predefined_metric_pair_specification": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "predefined_metric_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "resource_label": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1023), + }, + }, + }, + }, + "predefined_scaling_metric_specification": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "predefined_metric_type": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 128), + }, + "resource_label": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 1023), + }, + }, + }, + }, + "target_value": { + Type: nullable.TypeNullableFloat, + Optional: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, + }, }, - "scaling_adjustment": { - Type: schema.TypeInt, - Required: true, + }, + }, + "mode": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[awstypes.PredictiveScalingMode](), + }, + "scheduling_buffer_time": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + ValidateFunc: validation.IntBetween(0, 3600), + }, + }, + }, + }, + names.AttrResourceID: { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "scalable_dimension": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "service_namespace": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + "step_scaling_policy_configuration": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "adjustment_type": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.AdjustmentType](), + }, + "cooldown": { + Type: schema.TypeInt, + Optional: true, + }, + "metric_aggregation_type": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[awstypes.MetricAggregationType](), + }, + "min_adjustment_magnitude": { + Type: schema.TypeInt, + Optional: true, + }, + "step_adjustment": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_interval_lower_bound": { + Type: nullable.TypeNullableFloat, + Optional: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, + }, + "metric_interval_upper_bound": { + Type: nullable.TypeNullableFloat, + Optional: true, + ValidateFunc: nullable.ValidateTypeStringNullableFloat, + }, + "scaling_adjustment": { + Type: schema.TypeInt, + Required: true, + }, }, }, }, }, }, }, - }, - "target_tracking_scaling_policy_configuration": { - Type: schema.TypeList, - MinItems: 1, - MaxItems: 1, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "customized_metric_specification": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.predefined_metric_specification"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "dimensions": { - Type: schema.TypeSet, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Required: true, - }, - names.AttrValue: { - Type: schema.TypeString, - Required: true, + "target_tracking_scaling_policy_configuration": { + Type: schema.TypeList, + MinItems: 1, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "customized_metric_specification": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.predefined_metric_specification"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimensions": { + Type: schema.TypeSet, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + names.AttrValue: { + Type: schema.TypeString, + Required: true, + }, }, }, }, - }, - names.AttrMetricName: { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, - }, - "metrics": { - Type: schema.TypeSet, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.dimensions", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metric_name", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.namespace", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.statistic", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.unit"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrExpression: { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 2047), - }, - names.AttrID: { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 255), - }, - "label": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(1, 2047), - }, - "metric_stat": { - Type: schema.TypeList, - Optional: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "metric": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "dimensions": { - Type: schema.TypeSet, - Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - names.AttrName: { - Type: schema.TypeString, - Required: true, - }, - names.AttrValue: { - Type: schema.TypeString, - Required: true, + names.AttrMetricName: { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + }, + "metrics": { + Type: schema.TypeSet, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.dimensions", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metric_name", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.namespace", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.statistic", "target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.unit"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrExpression: { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 2047), + }, + names.AttrID: { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 255), + }, + "label": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 2047), + }, + "metric_stat": { + Type: schema.TypeList, + Optional: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric": { + Type: schema.TypeList, + Required: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimensions": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + names.AttrValue: { + Type: schema.TypeString, + Required: true, + }, }, }, }, - }, - names.AttrMetricName: { - Type: schema.TypeString, - Required: true, - }, - names.AttrNamespace: { - Type: schema.TypeString, - Required: true, + names.AttrMetricName: { + Type: schema.TypeString, + Required: true, + }, + names.AttrNamespace: { + Type: schema.TypeString, + Required: true, + }, }, }, }, - }, - "stat": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringLenBetween(1, 100), - }, - names.AttrUnit: { - Type: schema.TypeString, - Optional: true, + "stat": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringLenBetween(1, 100), + }, + names.AttrUnit: { + Type: schema.TypeString, + Optional: true, + }, }, }, }, - }, - "return_data": { - Type: schema.TypeBool, - Optional: true, - Default: true, + "return_data": { + Type: schema.TypeBool, + Optional: true, + Default: true, + }, }, }, }, + names.AttrNamespace: { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + }, + "statistic": { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + ValidateDiagFunc: enum.Validate[awstypes.MetricStatistic](), + }, + names.AttrUnit: { + Type: schema.TypeString, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + }, }, - names.AttrNamespace: { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, - }, - "statistic": { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, - ValidateDiagFunc: enum.Validate[awstypes.MetricStatistic](), - }, - names.AttrUnit: { - Type: schema.TypeString, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification.0.metrics"}, + }, + }, + "disable_scale_in": { + Type: schema.TypeBool, + Default: false, + Optional: true, + }, + "predefined_metric_specification": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification"}, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "predefined_metric_type": { + Type: schema.TypeString, + Required: true, + }, + "resource_label": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(0, 1023), + }, }, }, }, + "scale_in_cooldown": { + Type: schema.TypeInt, + Optional: true, + }, + "scale_out_cooldown": { + Type: schema.TypeInt, + Optional: true, + }, + "target_value": { + Type: schema.TypeFloat, + Required: true, + }, }, - "disable_scale_in": { - Type: schema.TypeBool, - Default: false, - Optional: true, - }, - "predefined_metric_specification": { - Type: schema.TypeList, - MaxItems: 1, - Optional: true, - ConflictsWith: []string{"target_tracking_scaling_policy_configuration.0.customized_metric_specification"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ - "predefined_metric_type": { - Type: schema.TypeString, - Required: true, - }, - "resource_label": { - Type: schema.TypeString, - Optional: true, - ValidateFunc: validation.StringLenBetween(0, 1023), + }, + }, + } + }, + } +} + +func predictiveScalingCustomizedMetricSpecificationSchema() *schema.Schema { + return &schema.Schema{ + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric_data_query": { + Type: schema.TypeList, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "expression": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: validation.StringLenBetween(1, 2048), + }, + names.AttrID: { + Type: schema.TypeString, + Required: true, + }, + "label": { + Type: schema.TypeString, + Optional: true, + }, + "metric_stat": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "metric": { + Type: schema.TypeList, + MaxItems: 1, + Required: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "dimension": { + Type: schema.TypeSet, + Optional: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + names.AttrName: { + Type: schema.TypeString, + Required: true, + }, + names.AttrValue: { + Type: schema.TypeString, + Required: true, + }, + }, + }, + }, + names.AttrMetricName: { + Type: schema.TypeString, + Optional: true, + }, + names.AttrNamespace: { + Type: schema.TypeString, + Optional: true, + }, + }, + }, + }, + "stat": { + Type: schema.TypeString, + Required: true, + }, + "unit": { + Type: schema.TypeString, + Optional: true, + }, }, }, }, - }, - "scale_in_cooldown": { - Type: schema.TypeInt, - Optional: true, - }, - "scale_out_cooldown": { - Type: schema.TypeInt, - Optional: true, - }, - "target_value": { - Type: schema.TypeFloat, - Required: true, + "return_data": { + Type: schema.TypeBool, + Optional: true, + }, }, }, }, @@ -319,6 +512,10 @@ func resourcePolicyPut(ctx context.Context, d *schema.ResourceData, meta any) di input.PolicyType = awstypes.PolicyType(v.(string)) } + if v, ok := d.GetOk("predictive_scaling_policy_configuration"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { + input.PredictiveScalingPolicyConfiguration = expandPredictiveScalingPolicyConfiguration(v.([]any)[0].(map[string]any)) + } + if v, ok := d.GetOk("scalable_dimension"); ok { input.ScalableDimension = awstypes.ScalableDimension(v.(string)) } @@ -374,6 +571,13 @@ func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta any) d d.Set(names.AttrARN, output.PolicyARN) d.Set(names.AttrName, output.PolicyName) d.Set("policy_type", output.PolicyType) + if output.PredictiveScalingPolicyConfiguration != nil { + if err := d.Set("predictive_scaling_policy_configuration", []any{flattenPredictiveScalingPolicyConfiguration(output.PredictiveScalingPolicyConfiguration)}); err != nil { + return sdkdiag.AppendErrorf(diags, "setting predictive_scaling_policy_configuration: %s", err) + } + } else { + d.Set("predictive_scaling_policy_configuration", nil) + } d.Set(names.AttrResourceID, output.ResourceId) d.Set("scalable_dimension", output.ScalableDimension) d.Set("service_namespace", output.ServiceNamespace) @@ -950,3 +1154,573 @@ func flattenPredefinedMetricSpecification(apiObject *awstypes.PredefinedMetricSp return []any{tfMap} } + +func expandPredictiveScalingPolicyConfiguration(tfMap map[string]any) *awstypes.PredictiveScalingPolicyConfiguration { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingPolicyConfiguration{} + + if v, ok := tfMap["max_capacity_breach_behavior"].(string); ok && v != "" { + apiObject.MaxCapacityBreachBehavior = awstypes.PredictiveScalingMaxCapacityBreachBehavior(v) + } + + if v, ok := tfMap["max_capacity_buffer"].(int); ok && v != 0 { + apiObject.MaxCapacityBuffer = aws.Int32(int32(v)) + } + + if v, ok := tfMap["metric_specification"].([]any); ok && len(v) > 0 { + apiObject.MetricSpecifications = expandPredictiveScalingMetricSpecifications(v) + } + + if v, ok := tfMap["mode"].(string); ok && v != "" { + apiObject.Mode = awstypes.PredictiveScalingMode(v) + } + + if v, ok := tfMap["scheduling_buffer_time"].(int); ok && v != 0 { + apiObject.SchedulingBufferTime = aws.Int32(int32(v)) + } + + return apiObject +} + +func expandPredictiveScalingMetricSpecifications(tfList []any) []awstypes.PredictiveScalingMetricSpecification { + if len(tfList) == 0 { + return nil + } + + var apiObjects []awstypes.PredictiveScalingMetricSpecification + + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]any) + if !ok { + continue + } + + apiObject := expandPredictiveScalingMetricSpecification(tfMap) + + if apiObject == nil { + continue + } + + apiObjects = append(apiObjects, *apiObject) + } + + return apiObjects +} + +func expandPredictiveScalingMetricSpecification(tfMap map[string]any) *awstypes.PredictiveScalingMetricSpecification { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingMetricSpecification{} + + if v, ok := tfMap["customized_capacity_metric_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.CustomizedCapacityMetricSpecification = expandPredictiveScalingCustomizedMetricSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["customized_load_metric_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.CustomizedLoadMetricSpecification = expandPredictiveScalingCustomizedMetricSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["customized_scaling_metric_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.CustomizedScalingMetricSpecification = expandPredictiveScalingCustomizedMetricSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["predefined_load_metric_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.PredefinedLoadMetricSpecification = expandPredictiveScalingPredefinedLoadMetricSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["predefined_metric_pair_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.PredefinedMetricPairSpecification = expandPredictiveScalingPredefinedMetricPairSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["predefined_scaling_metric_specification"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.PredefinedScalingMetricSpecification = expandPredictiveScalingPredefinedScalingMetricSpecification(v[0].(map[string]any)) + } + + if v, ok := tfMap["target_value"].(string); ok { + if v, null, _ := nullable.Float(v).ValueFloat64(); !null { + apiObject.TargetValue = aws.Float64(v) + } + } + + return apiObject +} + +func expandPredictiveScalingCustomizedMetricSpecification(tfMap map[string]any) *awstypes.PredictiveScalingCustomizedMetricSpecification { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingCustomizedMetricSpecification{} + + if v, ok := tfMap["metric_data_query"].([]any); ok && len(v) > 0 { + apiObject.MetricDataQueries = expandPredictiveScalingMetricDataQueries(v) + } + + return apiObject +} + +func expandPredictiveScalingMetricDataQueries(tfList []any) []awstypes.PredictiveScalingMetricDataQuery { + if len(tfList) == 0 { + return nil + } + + var apiObjects []awstypes.PredictiveScalingMetricDataQuery + + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]any) + if !ok { + continue + } + + apiObject := expandPredictiveScalingMetricDataQuery(tfMap) + + if apiObject == nil { + continue + } + + apiObjects = append(apiObjects, *apiObject) + } + + return apiObjects +} + +func expandPredictiveScalingMetricDataQuery(tfMap map[string]any) *awstypes.PredictiveScalingMetricDataQuery { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingMetricDataQuery{} + + if v, ok := tfMap["expression"].(string); ok && v != "" { + apiObject.Expression = aws.String(v) + } + + if v, ok := tfMap[names.AttrID].(string); ok && v != "" { + apiObject.Id = aws.String(v) + } + + if v, ok := tfMap["label"].(string); ok && v != "" { + apiObject.Label = aws.String(v) + } + + if v, ok := tfMap["metric_stat"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.MetricStat = expandPredictiveScalingMetricStat(v[0].(map[string]any)) + } + + if v, ok := tfMap["return_data"]; ok { + apiObject.ReturnData = aws.Bool(v.(bool)) + } + + return apiObject +} + +func expandPredictiveScalingMetricStat(tfMap map[string]any) *awstypes.PredictiveScalingMetricStat { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingMetricStat{} + + if v, ok := tfMap["metric"].([]any); ok && len(v) > 0 && v[0] != nil { + apiObject.Metric = expandPredictiveScalingMetric(v[0].(map[string]any)) + } + + if v, ok := tfMap["stat"].(string); ok && v != "" { + apiObject.Stat = aws.String(v) + } + + if v, ok := tfMap["unit"].(string); ok && v != "" { + apiObject.Unit = aws.String(v) + } + + return apiObject +} + +func expandPredictiveScalingMetric(tfMap map[string]any) *awstypes.PredictiveScalingMetric { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingMetric{} + + if v, ok := tfMap["dimension"].([]any); ok && len(v) > 0 { + apiObject.Dimensions = expandPredictiveScalingMetricDimensions(v) + } + + if v, ok := tfMap[names.AttrMetricName].(string); ok && v != "" { + apiObject.MetricName = aws.String(v) + } + + if v, ok := tfMap[names.AttrNamespace].(string); ok && v != "" { + apiObject.Namespace = aws.String(v) + } + + return apiObject +} + +func expandPredictiveScalingMetricDimensions(tfList []any) []awstypes.PredictiveScalingMetricDimension { + if len(tfList) == 0 { + return nil + } + + var apiObjects []awstypes.PredictiveScalingMetricDimension + + for _, tfMapRaw := range tfList { + tfMap, ok := tfMapRaw.(map[string]any) + if !ok { + continue + } + + apiObject := expandPredictiveScalingMetricDimension(tfMap) + + if apiObject == nil { + continue + } + + apiObjects = append(apiObjects, *apiObject) + } + + return apiObjects +} + +func expandPredictiveScalingMetricDimension(tfMap map[string]any) *awstypes.PredictiveScalingMetricDimension { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingMetricDimension{} + + if v, ok := tfMap[names.AttrName].(string); ok && v != "" { + apiObject.Name = aws.String(v) + } + + if v, ok := tfMap[names.AttrValue].(string); ok && v != "" { + apiObject.Value = aws.String(v) + } + + return apiObject +} + +func expandPredictiveScalingPredefinedLoadMetricSpecification(tfMap map[string]any) *awstypes.PredictiveScalingPredefinedLoadMetricSpecification { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingPredefinedLoadMetricSpecification{} + + if v, ok := tfMap["predefined_metric_type"].(string); ok && v != "" { + apiObject.PredefinedMetricType = aws.String(v) + } + + if v, ok := tfMap["resource_label"].(string); ok && v != "" { + apiObject.ResourceLabel = aws.String(v) + } + + return apiObject +} + +func expandPredictiveScalingPredefinedMetricPairSpecification(tfMap map[string]any) *awstypes.PredictiveScalingPredefinedMetricPairSpecification { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingPredefinedMetricPairSpecification{} + + if v, ok := tfMap["predefined_metric_type"].(string); ok && v != "" { + apiObject.PredefinedMetricType = aws.String(v) + } + + if v, ok := tfMap["resource_label"].(string); ok && v != "" { + apiObject.ResourceLabel = aws.String(v) + } + + return apiObject +} + +func expandPredictiveScalingPredefinedScalingMetricSpecification(tfMap map[string]any) *awstypes.PredictiveScalingPredefinedScalingMetricSpecification { + if tfMap == nil { + return nil + } + + apiObject := &awstypes.PredictiveScalingPredefinedScalingMetricSpecification{} + + if v, ok := tfMap["predefined_metric_type"].(string); ok && v != "" { + apiObject.PredefinedMetricType = aws.String(v) + } + + if v, ok := tfMap["resource_label"].(string); ok && v != "" { + apiObject.ResourceLabel = aws.String(v) + } + + return apiObject +} + +func flattenPredictiveScalingPolicyConfiguration(apiObject *awstypes.PredictiveScalingPolicyConfiguration) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{ + "max_capacity_breach_behavior": apiObject.MaxCapacityBreachBehavior, + "mode": apiObject.Mode, + } + + if v := apiObject.MaxCapacityBuffer; v != nil { + tfMap["max_capacity_buffer"] = aws.ToInt32(v) + } + + if v := apiObject.MetricSpecifications; v != nil { + tfMap["metric_specification"] = flattenPredictiveScalingMetricSpecifications(v) + } + + if v := apiObject.SchedulingBufferTime; v != nil { + tfMap["scheduling_buffer_time"] = aws.ToInt32(v) + } + + return tfMap +} + +func flattenPredictiveScalingMetricSpecifications(apiObjects []awstypes.PredictiveScalingMetricSpecification) []any { + if len(apiObjects) == 0 { + return nil + } + + var tfList []any + + for _, apiObject := range apiObjects { + tfList = append(tfList, flattenPredictiveScalingMetricSpecification(&apiObject)) + } + + return tfList +} + +func flattenPredictiveScalingMetricSpecification(apiObject *awstypes.PredictiveScalingMetricSpecification) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.CustomizedCapacityMetricSpecification; v != nil { + tfMap["customized_capacity_metric_specification"] = []any{flattenPredictiveScalingCustomizedMetricSpecification(v)} + } + + if v := apiObject.CustomizedLoadMetricSpecification; v != nil { + tfMap["customized_load_metric_specification"] = []any{flattenPredictiveScalingCustomizedMetricSpecification(v)} + } + + if v := apiObject.CustomizedScalingMetricSpecification; v != nil { + tfMap["customized_scaling_metric_specification"] = []any{flattenPredictiveScalingCustomizedMetricSpecification(v)} + } + + if v := apiObject.PredefinedLoadMetricSpecification; v != nil { + tfMap["predefined_load_metric_specification"] = []any{flattenPredictiveScalingPredefinedLoadMetricSpecification(v)} + } + + if v := apiObject.PredefinedMetricPairSpecification; v != nil { + tfMap["predefined_metric_pair_specification"] = []any{flattenPredictiveScalingPredefinedMetricPairSpecification(v)} + } + + if v := apiObject.PredefinedScalingMetricSpecification; v != nil { + tfMap["predefined_scaling_metric_specification"] = []any{flattenPredictiveScalingPredefinedScalingMetricSpecification(v)} + } + + if apiObject.TargetValue != nil { + tfMap["target_value"] = flex.Float64ToStringValue(apiObject.TargetValue) + } + + return tfMap +} + +func flattenPredictiveScalingCustomizedMetricSpecification(apiObject *awstypes.PredictiveScalingCustomizedMetricSpecification) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.MetricDataQueries; v != nil { + tfMap["metric_data_query"] = flattenPredictiveScalingMetricDataQueries(v) + } + + return tfMap +} + +func flattenPredictiveScalingMetricDataQueries(apiObjects []awstypes.PredictiveScalingMetricDataQuery) []any { + if len(apiObjects) == 0 { + return nil + } + + var tfList []any + + for _, apiObject := range apiObjects { + tfList = append(tfList, flattenPredictiveScalingMetricDataQuery(&apiObject)) + } + + return tfList +} + +func flattenPredictiveScalingMetricDataQuery(apiObject *awstypes.PredictiveScalingMetricDataQuery) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.Expression; v != nil { + tfMap["expression"] = aws.ToString(v) + } + + if v := apiObject.Id; v != nil { + tfMap[names.AttrID] = aws.ToString(v) + } + + if v := apiObject.Label; v != nil { + tfMap["label"] = aws.ToString(v) + } + + if v := apiObject.MetricStat; v != nil { + tfMap["metric_stat"] = []any{flattenPredictiveScalingMetricStat(v)} + } + + if v := apiObject.ReturnData; v != nil { + tfMap["return_data"] = aws.ToBool(v) + } + + return tfMap +} + +func flattenPredictiveScalingMetricStat(apiObject *awstypes.PredictiveScalingMetricStat) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.Metric; v != nil { + tfMap["metric"] = []any{flattenPredictiveScalingMetric(v)} + } + + if v := apiObject.Stat; v != nil { + tfMap["stat"] = aws.ToString(v) + } + + if v := apiObject.Unit; v != nil { + tfMap["unit"] = aws.ToString(v) + } + + return tfMap +} + +func flattenPredictiveScalingMetric(apiObject *awstypes.PredictiveScalingMetric) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.Dimensions; v != nil { + tfMap["dimension"] = flattenPredictiveScalingMetricDimensions(v) + } + + if v := apiObject.MetricName; v != nil { + tfMap[names.AttrMetricName] = aws.ToString(v) + } + + if v := apiObject.Namespace; v != nil { + tfMap[names.AttrNamespace] = aws.ToString(v) + } + + return tfMap +} + +func flattenPredictiveScalingMetricDimensions(apiObjects []awstypes.PredictiveScalingMetricDimension) []any { + if len(apiObjects) == 0 { + return nil + } + + var tfList []any + + for _, apiObject := range apiObjects { + tfList = append(tfList, flattenPredictiveScalingMetricDimension(&apiObject)) + } + + return tfList +} + +func flattenPredictiveScalingMetricDimension(apiObject *awstypes.PredictiveScalingMetricDimension) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.Name; v != nil { + tfMap[names.AttrName] = aws.ToString(v) + } + + if v := apiObject.Value; v != nil { + tfMap[names.AttrValue] = aws.ToString(v) + } + + return tfMap +} + +func flattenPredictiveScalingPredefinedLoadMetricSpecification(apiObject *awstypes.PredictiveScalingPredefinedLoadMetricSpecification) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.PredefinedMetricType; v != nil { + tfMap["predefined_metric_type"] = aws.ToString(v) + } + + if v := apiObject.ResourceLabel; v != nil { + tfMap["resource_label"] = aws.ToString(v) + } + + return tfMap +} + +func flattenPredictiveScalingPredefinedMetricPairSpecification(apiObject *awstypes.PredictiveScalingPredefinedMetricPairSpecification) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.PredefinedMetricType; v != nil { + tfMap["predefined_metric_type"] = aws.ToString(v) + } + + if v := apiObject.ResourceLabel; v != nil { + tfMap["resource_label"] = aws.ToString(v) + } + + return tfMap +} + +func flattenPredictiveScalingPredefinedScalingMetricSpecification(apiObject *awstypes.PredictiveScalingPredefinedScalingMetricSpecification) map[string]any { + if apiObject == nil { + return nil + } + + tfMap := map[string]any{} + + if v := apiObject.PredefinedMetricType; v != nil { + tfMap["predefined_metric_type"] = aws.ToString(v) + } + + if v := apiObject.ResourceLabel; v != nil { + tfMap["resource_label"] = aws.ToString(v) + } + + return tfMap +} diff --git a/internal/service/appautoscaling/policy_test.go b/internal/service/appautoscaling/policy_test.go index 68001439c4a5..e1f9bfe5ad37 100644 --- a/internal/service/appautoscaling/policy_test.go +++ b/internal/service/appautoscaling/policy_test.go @@ -117,14 +117,16 @@ func TestAccAppAutoScalingPolicy_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccPolicyConfig_basic(rName), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &policy), resource.TestCheckResourceAttr(resourceName, "alarm_arns.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "policy_type", "StepScaling"), + resource.TestCheckResourceAttr(resourceName, "predictive_scaling_policy_configuration.#", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceID, appAutoscalingTargetResourceName, names.AttrResourceID), resource.TestCheckResourceAttrPair(resourceName, "scalable_dimension", appAutoscalingTargetResourceName, "scalable_dimension"), resource.TestCheckResourceAttrPair(resourceName, "service_namespace", appAutoscalingTargetResourceName, "service_namespace"), + resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.0.adjustment_type", "ChangeInCapacity"), resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.0.cooldown", "60"), resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.0.step_adjustment.#", "1"), @@ -133,6 +135,7 @@ func TestAccAppAutoScalingPolicy_basic(t *testing.T) { "metric_interval_lower_bound": "0", "metric_interval_upper_bound": "", }), + resource.TestCheckResourceAttr(resourceName, "target_tracking_scaling_policy_configuration.#", "0"), ), }, { From a9b8af0a689ba1ba8014f50acb2133629529598f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 11:05:43 -0400 Subject: [PATCH 2009/2115] r/aws_networkmanager_vpc_attachment: Wait after `tags` update. --- internal/service/networkmanager/vpc_attachment.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 266ef0c95e99..3c61c67d5381 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -307,10 +307,11 @@ func resourceVPCAttachmentUpdate(ctx context.Context, d *schema.ResourceData, me if err != nil { return sdkdiag.AppendErrorf(diags, "updating Network Manager VPC Attachment (%s): %s", d.Id(), err) } + } - if _, err := waitVPCAttachmentUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { - return sdkdiag.AppendErrorf(diags, "waiting for Network Manager VPC Attachment (%s) update: %s", d.Id(), err) - } + // An update (via transparent tagging) to tags can put the attachment into PENDING_NETWORK_UPDATE state. + if _, err := waitVPCAttachmentUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { + return sdkdiag.AppendErrorf(diags, "waiting for Network Manager VPC Attachment (%s) update: %s", d.Id(), err) } return append(diags, resourceVPCAttachmentRead(ctx, d, meta)...) @@ -498,7 +499,7 @@ func waitVPCAttachmentDeleted(ctx context.Context, conn *networkmanager.Client, func waitVPCAttachmentUpdated(ctx context.Context, conn *networkmanager.Client, id string, timeout time.Duration) (*awstypes.VpcAttachment, error) { stateConf := &retry.StateChangeConf{ - Pending: enum.Slice(awstypes.AttachmentStateUpdating), + Pending: enum.Slice(awstypes.AttachmentStatePendingNetworkUpdate, awstypes.AttachmentStateUpdating), Target: enum.Slice(awstypes.AttachmentStateAvailable, awstypes.AttachmentStatePendingTagAcceptance), Timeout: timeout, Refresh: statusVPCAttachment(ctx, conn, id), From 65cc7786d7183035930a2a2177c1f50d90e383f6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 11:18:39 -0400 Subject: [PATCH 2010/2115] Acceptance test output: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit % make testacc TESTARGS='-run=TestAccAppAutoScalingPolicy_basic' PKG=appautoscaling make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 aws_appautoscaling_policy.fixes 🌿... TF_ACC=1 go1.24.6 test ./internal/service/appautoscaling/... -v -count 1 -parallel 20 -run=TestAccAppAutoScalingPolicy_basic -timeout 360m -vet=off 2025/09/10 11:02:16 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/10 11:02:16 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccAppAutoScalingPolicy_basic === PAUSE TestAccAppAutoScalingPolicy_basic === CONT TestAccAppAutoScalingPolicy_basic --- PASS: TestAccAppAutoScalingPolicy_basic (76.33s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/appautoscaling 81.875s From d50be2c5029f18de0e056506eb692515aabe3631 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 10:57:01 -0500 Subject: [PATCH 2011/2115] aws_controltower: standard naming for synchronous tests --- internal/service/controltower/baseline_test.go | 4 ++-- internal/service/controltower/controltower_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 017396c7055b..c36091d4d7d0 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/names" ) -func TestAccControlTowerBaseline_basic(t *testing.T) { +func testAccBaseline_basic(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") @@ -64,7 +64,7 @@ func TestAccControlTowerBaseline_basic(t *testing.T) { }) } -func TestAccControlTowerBaseline_disappears(t *testing.T) { +func testAccBaseline_disappears(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { t.Skip("skipping long-running test in short mode") diff --git a/internal/service/controltower/controltower_test.go b/internal/service/controltower/controltower_test.go index 0b3670ebe3fe..02e3ea708678 100644 --- a/internal/service/controltower/controltower_test.go +++ b/internal/service/controltower/controltower_test.go @@ -24,8 +24,8 @@ func TestAccControlTower_serial(t *testing.T) { "parameters": testAccControl_parameters, }, "Baseline": { - acctest.CtBasic: TestAccControlTowerBaseline_basic, - acctest.CtDisappears: TestAccControlTowerBaseline_disappears, + acctest.CtBasic: testAccBaseline_basic, + acctest.CtDisappears: testAccBaseline_disappears, }, } From f476a1039fd772dcc95b4f86bdd50f100f4b9534 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 11:59:39 -0400 Subject: [PATCH 2012/2115] r/aws_appautoscaling_policy: Document `predictive_scaling_policy_configuration` argument. --- internal/service/appautoscaling/policy.go | 8 +- .../r/appautoscaling_policy.html.markdown | 89 ++++++++++++++++++- 2 files changed, 90 insertions(+), 7 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 25ab4c320288..6a6b63074ff0 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -101,7 +101,7 @@ func resourcePolicy() *schema.Resource { }, "resource_label": { Type: schema.TypeString, - Required: true, + Optional: true, ValidateFunc: validation.StringLenBetween(1, 1023), }, }, @@ -120,7 +120,7 @@ func resourcePolicy() *schema.Resource { }, "resource_label": { Type: schema.TypeString, - Required: true, + Optional: true, ValidateFunc: validation.StringLenBetween(1, 1023), }, }, @@ -139,7 +139,7 @@ func resourcePolicy() *schema.Resource { }, "resource_label": { Type: schema.TypeString, - Required: true, + Optional: true, ValidateFunc: validation.StringLenBetween(1, 1023), }, }, @@ -147,7 +147,7 @@ func resourcePolicy() *schema.Resource { }, "target_value": { Type: nullable.TypeNullableFloat, - Optional: true, + Required: true, ValidateFunc: nullable.ValidateTypeStringNullableFloat, }, }, diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index e7942ce1bcd7..068d1bf63bc6 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -200,14 +200,97 @@ resource "aws_appautoscaling_policy" "example" { This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `name` - (Required) Name of the policy. Must be between 1 and 255 characters in length. -* `policy_type` - (Optional) Policy type. Valid values are `StepScaling` and `TargetTrackingScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) and [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) documentation. +* `policy_type` - (Optional) Policy type. Valid values are `StepScaling`, `TargetTrackingScaling`, and `PredictiveScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html), [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html), and [Predictive Scaling](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-predictive-scaling.html) documentation. +* `predictive_scaling_policy_configuration` - (Optional) Predictive scaling policy configuration, requires `policy_type = "PredictiveScaling"`. See supported fields below. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `resource_id` - (Required) Resource type and unique identifier string for the resource associated with the scaling policy. Documentation can be found in the `ResourceId` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `scalable_dimension` - (Required) Scalable dimension of the scalable target. Documentation can be found in the `ScalableDimension` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `service_namespace` - (Required) AWS service namespace of the scalable target. Documentation can be found in the `ServiceNamespace` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `step_scaling_policy_configuration` - (Optional) Step scaling policy configuration, requires `policy_type = "StepScaling"` (default). See supported fields below. -* `target_tracking_scaling_policy_configuration` - (Optional) Target tracking policy, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. +* `target_tracking_scaling_policy_configuration` - (Optional) Target tracking policy configuration, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. + +### predictive_scaling_policy_configuration + +The `predictive_scaling_policy_configuration` configuration block supports the following arguments: + +* `max_capacity_breach_behavior` - (Optional) The behavior that should be applied if the forecast capacity approaches or exceeds the maximum capacity. Valid values are `HonorMaxCapacity` and `IncreaseMaxCapacity`. +* `max_capacity_buffer` - (Optional) Size of the capacity buffer to use when the forecast capacity is close to or exceeds the maximum capacity. The value is specified as a percentage relative to the forecast capacity. Required if the `max_capacity_breach_behavior` argument is set to `IncreaseMaxCapacity`, and cannot be used otherwise. +* `metric_specification` - (Required) Metrics and target utilization to use for predictive scaling. See supported fields below. +* `mode` - (Optional) Predictive scaling mode. Valid values are `ForecastOnly` and `ForecastAndScale`. +* `scheduling_buffer_time` - (Optional) Amount of time, in seconds, that the start time can be advanced. + +### predictive_scaling_policy_configuration metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` configuration block supports the following arguments: + +* `customized_capacity_metric_specification` - (Optional) Customized capacity metric specification. See supported fields below. +* `customized_load_metric_specification` - (Optional) Customized load metric specification. See supported fields below. +* `customized_scaling_metric_specification` - (Optional) Customized scaling metric specification. See supported fields below. +* `predefined_load_metric_specification` - (Optional) Predefined load metric specification. See supported fields below. +* `predefined_metric_pair_specification` - (Optional) Predefined metric pair specification that determines the appropriate scaling metric and load metric to use. See supported fields below. +* `predefined_scaling_metric_specification` - (Optional) Predefined scaling metric specification. See supported fields below. +* `target_value` - (Required) Target utilization. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification, customized_load_metric_specification and customized_scaling_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification`, `customized_load_metric_specification`, and `customized_scaling_metric_specification` configuration blocks supports the following arguments: + +* `metric_data_query` - (Required) One or more metric data queries to provide data points for a metric specification. See supported fields below. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` configuration block supports the following arguments: + +* `expression` - (Optional) Math expression to perform on the returned data, if this object is performing a math expression. +* `id` - (Required) Short name that identifies the object's results in the response. +* `label` - (Optional) Human-readable label for this metric or expression. +* `metric_stat` - (Optional) Information about the metric data to return. See supported fields below. +* `return_data` - (Optional) Whether to return the timestamps and raw data values of this metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` configuration block supports the following arguments: + +* `metric` - (Required) CloudWatch metric to return, including the metric name, namespace, and dimensions. See supported fields below. +* `stat` - (Required) Statistic to return. +* `unit` - (Optional) Unit to use for the returned data points. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` `metric` configuration block supports the following arguments: + +* `dimension` - (Optional) Dimensions of the metric. See supported fields below. +* `metric_name` - (Optional) Name of the metric. +* `namespace` - (Optional) Namespace of the metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric dimension + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` `metric` `dimension` configuration block supports the following arguments: + +* `name` - (Optional) Name of the dimension. +* `value` - (Optional) Value of the dimension. + +### predictive_scaling_policy_configuration metric_specification predefined_load_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_load_metric_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Metric type. +* `resource_label` - (Optional) Label that uniquely identifies a target group. + +### predictive_scaling_policy_configuration metric_specification predefined_metric_pair_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_metric_pair_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Which metrics to use. There are two different types of metrics for each metric type: one is a load metric and one is a scaling metric. +* `resource_label` - (Optional) Label that uniquely identifies a specific target group from which to determine the total and average request count. + +### predictive_scaling_policy_configuration metric_specification predefined_scaling_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_scaling_metric_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Metric type. +* `resource_label` - (Optional) Label that uniquely identifies a specific target group from which to determine the average request count. ### step_scaling_policy_configuration From 634f206839668d6bb7d3ecd1b0d7326540914b64 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 12:21:51 -0400 Subject: [PATCH 2013/2115] Add 'TestAccAppAutoScalingPolicy_predictiveScalingSimple'. --- .../service/appautoscaling/policy_test.go | 224 ++++++++++++------ 1 file changed, 154 insertions(+), 70 deletions(-) diff --git a/internal/service/appautoscaling/policy_test.go b/internal/service/appautoscaling/policy_test.go index e1f9bfe5ad37..989c7e484635 100644 --- a/internal/service/appautoscaling/policy_test.go +++ b/internal/service/appautoscaling/policy_test.go @@ -503,64 +503,42 @@ func TestAccAppAutoScalingPolicy_TargetTrack_metricMath(t *testing.T) { }) } -func testAccPolicyConfig_targetTrackingMetricMath(rName string) string { - return acctest.ConfigCompose(testAccPolicyConfig_basic(rName), fmt.Sprintf(` -resource "aws_appautoscaling_policy" "metric_math_test" { - name = "%[1]s-tracking" - policy_type = "TargetTrackingScaling" - resource_id = aws_appautoscaling_target.test.resource_id - scalable_dimension = aws_appautoscaling_target.test.scalable_dimension - service_namespace = aws_appautoscaling_target.test.service_namespace +func TestAccAppAutoScalingPolicy_predictiveScalingSimple(t *testing.T) { + ctx := acctest.Context(t) + var policy awstypes.ScalingPolicy + appAutoscalingTargetResourceName := "aws_appautoscaling_target.test" + resourceName := "aws_appautoscaling_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - target_tracking_scaling_policy_configuration { - customized_metric_specification { - metrics { - id = "m1" - expression = "TIME_SERIES(20)" - return_data = false - } - metrics { - id = "m2" - metric_stat { - metric { - namespace = "foo" - metric_name = "bar" - } - unit = "Percent" - stat = "Sum" - } - return_data = false - } - metrics { - id = "m3" - metric_stat { - metric { - namespace = "foo" - metric_name = "bar" - dimensions { - name = "x" - value = "y" - } - dimensions { - name = "y" - value = "x" - } - } - unit = "Percent" - stat = "Sum" - } - return_data = false - } - metrics { - id = "e1" - expression = "m1 + m2 + m3" - return_data = true - } - } - target_value = 12.3 - } -} -`, rName)) + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.AppAutoScalingServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPolicyConfig_predictiveScalingSimple(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPolicyExists(ctx, resourceName, &policy), + resource.TestCheckResourceAttr(resourceName, "alarm_arns.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "policy_type", "PredictiveScaling"), + resource.TestCheckResourceAttr(resourceName, "predictive_scaling_policy_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceID, appAutoscalingTargetResourceName, names.AttrResourceID), + resource.TestCheckResourceAttrPair(resourceName, "scalable_dimension", appAutoscalingTargetResourceName, "scalable_dimension"), + resource.TestCheckResourceAttrPair(resourceName, "service_namespace", appAutoscalingTargetResourceName, "service_namespace"), + resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "target_tracking_scaling_policy_configuration.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccPolicyImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, + }, + }) } func testAccCheckPolicyExists(ctx context.Context, n string, v *awstypes.ScalingPolicy) resource.TestCheckFunc { @@ -610,6 +588,10 @@ func testAccCheckPolicyDestroy(ctx context.Context) resource.TestCheckFunc { } } +func testAccPolicyImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { + return acctest.AttrsImportStateIdFunc(resourceName, "/", "service_namespace", names.AttrResourceID, "scalable_dimension", names.AttrName) +} + func testAccPolicyConfig_basic(rName string) string { return fmt.Sprintf(` resource "aws_ecs_cluster" "test" { @@ -1245,19 +1227,121 @@ resource "aws_cloudwatch_metric_alarm" "test" { `, rName)) } -func testAccPolicyImportStateIdFunc(resourceName string) resource.ImportStateIdFunc { - return func(s *terraform.State) (string, error) { - rs, ok := s.RootModule().Resources[resourceName] - if !ok { - return "", fmt.Errorf("Not found: %s", resourceName) - } +func testAccPolicyConfig_targetTrackingMetricMath(rName string) string { + return acctest.ConfigCompose(testAccPolicyConfig_basic(rName), fmt.Sprintf(` +resource "aws_appautoscaling_policy" "metric_math_test" { + name = "%[1]s-tracking" + policy_type = "TargetTrackingScaling" + resource_id = aws_appautoscaling_target.test.resource_id + scalable_dimension = aws_appautoscaling_target.test.scalable_dimension + service_namespace = aws_appautoscaling_target.test.service_namespace - id := fmt.Sprintf("%s/%s/%s/%s", - rs.Primary.Attributes["service_namespace"], - rs.Primary.Attributes[names.AttrResourceID], - rs.Primary.Attributes["scalable_dimension"], - rs.Primary.Attributes[names.AttrName]) + target_tracking_scaling_policy_configuration { + customized_metric_specification { + metrics { + id = "m1" + expression = "TIME_SERIES(20)" + return_data = false + } + metrics { + id = "m2" + metric_stat { + metric { + namespace = "foo" + metric_name = "bar" + } + unit = "Percent" + stat = "Sum" + } + return_data = false + } + metrics { + id = "m3" + metric_stat { + metric { + namespace = "foo" + metric_name = "bar" + dimensions { + name = "x" + value = "y" + } + dimensions { + name = "y" + value = "x" + } + } + unit = "Percent" + stat = "Sum" + } + return_data = false + } + metrics { + id = "e1" + expression = "m1 + m2 + m3" + return_data = true + } + } + target_value = 12.3 + } +} +`, rName)) +} - return id, nil - } +func testAccPolicyConfig_predictiveScalingSimple(rName string) string { + return fmt.Sprintf(` +resource "aws_ecs_cluster" "test" { + name = %[1]q +} + +resource "aws_ecs_task_definition" "test" { + family = %[1]q + + container_definitions = < Date: Wed, 10 Sep 2025 12:22:11 -0400 Subject: [PATCH 2014/2115] Acceptance test output: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit % make testacc TESTARGS='-run=TestAccAppAutoScalingPolicy_predictiveScalingSimple' PKG=appautoscaling make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 aws_appautoscaling_policy.fixes 🌿... TF_ACC=1 go1.24.6 test ./internal/service/appautoscaling/... -v -count 1 -parallel 20 -run=TestAccAppAutoScalingPolicy_predictiveScalingSimple -timeout 360m -vet=off 2025/09/10 12:19:47 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/10 12:19:47 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccAppAutoScalingPolicy_predictiveScalingSimple === PAUSE TestAccAppAutoScalingPolicy_predictiveScalingSimple === CONT TestAccAppAutoScalingPolicy_predictiveScalingSimple --- PASS: TestAccAppAutoScalingPolicy_predictiveScalingSimple (45.15s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/appautoscaling 50.815s From e66966c72a0af107a89d4f1f6b11cea4eb397c94 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 12:23:32 -0400 Subject: [PATCH 2015/2115] Run 'make fix-constants PKG=appautoscaling'. --- internal/service/appautoscaling/policy.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index 6a6b63074ff0..fba80359db4d 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -153,7 +153,7 @@ func resourcePolicy() *schema.Resource { }, }, }, - "mode": { + names.AttrMode: { Type: schema.TypeString, Optional: true, Computed: true, @@ -423,7 +423,7 @@ func predictiveScalingCustomizedMetricSpecificationSchema() *schema.Schema { Required: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ - "expression": { + names.AttrExpression: { Type: schema.TypeString, Optional: true, ValidateFunc: validation.StringLenBetween(1, 2048), @@ -479,7 +479,7 @@ func predictiveScalingCustomizedMetricSpecificationSchema() *schema.Schema { Type: schema.TypeString, Required: true, }, - "unit": { + names.AttrUnit: { Type: schema.TypeString, Optional: true, }, @@ -1174,7 +1174,7 @@ func expandPredictiveScalingPolicyConfiguration(tfMap map[string]any) *awstypes. apiObject.MetricSpecifications = expandPredictiveScalingMetricSpecifications(v) } - if v, ok := tfMap["mode"].(string); ok && v != "" { + if v, ok := tfMap[names.AttrMode].(string); ok && v != "" { apiObject.Mode = awstypes.PredictiveScalingMode(v) } @@ -1296,7 +1296,7 @@ func expandPredictiveScalingMetricDataQuery(tfMap map[string]any) *awstypes.Pred apiObject := &awstypes.PredictiveScalingMetricDataQuery{} - if v, ok := tfMap["expression"].(string); ok && v != "" { + if v, ok := tfMap[names.AttrExpression].(string); ok && v != "" { apiObject.Expression = aws.String(v) } @@ -1334,7 +1334,7 @@ func expandPredictiveScalingMetricStat(tfMap map[string]any) *awstypes.Predictiv apiObject.Stat = aws.String(v) } - if v, ok := tfMap["unit"].(string); ok && v != "" { + if v, ok := tfMap[names.AttrUnit].(string); ok && v != "" { apiObject.Unit = aws.String(v) } @@ -1467,7 +1467,7 @@ func flattenPredictiveScalingPolicyConfiguration(apiObject *awstypes.PredictiveS tfMap := map[string]any{ "max_capacity_breach_behavior": apiObject.MaxCapacityBreachBehavior, - "mode": apiObject.Mode, + names.AttrMode: apiObject.Mode, } if v := apiObject.MaxCapacityBuffer; v != nil { @@ -1573,7 +1573,7 @@ func flattenPredictiveScalingMetricDataQuery(apiObject *awstypes.PredictiveScali tfMap := map[string]any{} if v := apiObject.Expression; v != nil { - tfMap["expression"] = aws.ToString(v) + tfMap[names.AttrExpression] = aws.ToString(v) } if v := apiObject.Id; v != nil { @@ -1611,7 +1611,7 @@ func flattenPredictiveScalingMetricStat(apiObject *awstypes.PredictiveScalingMet } if v := apiObject.Unit; v != nil { - tfMap["unit"] = aws.ToString(v) + tfMap[names.AttrUnit] = aws.ToString(v) } return tfMap From 336d7c1ff139aa291648f6e074f92d7a9ef2a119 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 10 Sep 2025 16:35:22 +0000 Subject: [PATCH 2016/2115] Update CHANGELOG.md for #44226 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1655b8b8d6e3..1a835aaea0f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,13 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* resource/aws_bedrock_guardrail: Add `input_action`, `output_action`, `input_enabled`, and `output_enabled` arguments to `word_policy_config.managed_word_lists_config` and `word_policy_config.words_config` configuration blocks ([#44224](https://github.com/hashicorp/terraform-provider-aws/issues/44224)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) * resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block ([#44201](https://github.com/hashicorp/terraform-provider-aws/issues/44201)) * resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_glue_catalog_table_optimizer: Add `iceberg_configuration.run_rate_in_hours` argument to `retention_configuration` and `orphan_file_deletion_configuration` blocks ([#44207](https://github.com/hashicorp/terraform-provider-aws/issues/44207)) +* resource/aws_networkfirewall_rule_group: Add IPv6 CIDR block support to `address_definition` arguments in `source` and `destination` blocks within `rule_group.rules_source.stateless_rules_and_custom_actions.stateless_rule.rule_definition.match_attributes` ([#44215](https://github.com/hashicorp/terraform-provider-aws/issues/44215)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_vpc_endpoint: Add resource identity support ([#44194](https://github.com/hashicorp/terraform-provider-aws/issues/44194)) From d94f5bf3238efaa8dfd8d273bee050be76f29b8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 14:11:34 -0400 Subject: [PATCH 2017/2115] Add 'TestAccAppAutoScalingPolicy_predictiveScalingCustom'. --- internal/service/appautoscaling/policy.go | 4 +- .../service/appautoscaling/policy_test.go | 140 ++++++++++++++++++ 2 files changed, 142 insertions(+), 2 deletions(-) diff --git a/internal/service/appautoscaling/policy.go b/internal/service/appautoscaling/policy.go index fba80359db4d..a32c82d53201 100644 --- a/internal/service/appautoscaling/policy.go +++ b/internal/service/appautoscaling/policy.go @@ -1348,8 +1348,8 @@ func expandPredictiveScalingMetric(tfMap map[string]any) *awstypes.PredictiveSca apiObject := &awstypes.PredictiveScalingMetric{} - if v, ok := tfMap["dimension"].([]any); ok && len(v) > 0 { - apiObject.Dimensions = expandPredictiveScalingMetricDimensions(v) + if v, ok := tfMap["dimension"].(*schema.Set); ok && v.Len() > 0 { + apiObject.Dimensions = expandPredictiveScalingMetricDimensions(v.List()) } if v, ok := tfMap[names.AttrMetricName].(string); ok && v != "" { diff --git a/internal/service/appautoscaling/policy_test.go b/internal/service/appautoscaling/policy_test.go index 989c7e484635..b33215f24488 100644 --- a/internal/service/appautoscaling/policy_test.go +++ b/internal/service/appautoscaling/policy_test.go @@ -541,6 +541,44 @@ func TestAccAppAutoScalingPolicy_predictiveScalingSimple(t *testing.T) { }) } +func TestAccAppAutoScalingPolicy_predictiveScalingCustom(t *testing.T) { + ctx := acctest.Context(t) + var policy awstypes.ScalingPolicy + appAutoscalingTargetResourceName := "aws_appautoscaling_target.test" + resourceName := "aws_appautoscaling_policy.test" + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.AppAutoScalingServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckPolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccPolicyConfig_predictiveScalingCustom(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckPolicyExists(ctx, resourceName, &policy), + resource.TestCheckResourceAttr(resourceName, "alarm_arns.#", "0"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "policy_type", "PredictiveScaling"), + resource.TestCheckResourceAttr(resourceName, "predictive_scaling_policy_configuration.#", "1"), + resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceID, appAutoscalingTargetResourceName, names.AttrResourceID), + resource.TestCheckResourceAttrPair(resourceName, "scalable_dimension", appAutoscalingTargetResourceName, "scalable_dimension"), + resource.TestCheckResourceAttrPair(resourceName, "service_namespace", appAutoscalingTargetResourceName, "service_namespace"), + resource.TestCheckResourceAttr(resourceName, "step_scaling_policy_configuration.#", "0"), + resource.TestCheckResourceAttr(resourceName, "target_tracking_scaling_policy_configuration.#", "0"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: testAccPolicyImportStateIdFunc(resourceName), + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckPolicyExists(ctx context.Context, n string, v *awstypes.ScalingPolicy) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -1345,3 +1383,105 @@ resource "aws_appautoscaling_policy" "test" { } `, rName) } + +func testAccPolicyConfig_predictiveScalingCustom(rName string) string { + return fmt.Sprintf(` +resource "aws_ecs_cluster" "test" { + name = %[1]q +} + +resource "aws_ecs_task_definition" "test" { + family = %[1]q + + container_definitions = < Date: Wed, 10 Sep 2025 14:11:45 -0400 Subject: [PATCH 2018/2115] Acceptance test output: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit % make testacc TESTARGS='-run=TestAccAppAutoScalingPolicy_predictiveScalingCustom' PKG=appautoscaling make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 aws_appautoscaling_policy.fixes 🌿... TF_ACC=1 go1.24.6 test ./internal/service/appautoscaling/... -v -count 1 -parallel 20 -run=TestAccAppAutoScalingPolicy_predictiveScalingCustom -timeout 360m -vet=off 2025/09/10 14:09:33 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/10 14:09:33 Initializing Terraform AWS Provider (SDKv2-style)... === RUN TestAccAppAutoScalingPolicy_predictiveScalingCustom === PAUSE TestAccAppAutoScalingPolicy_predictiveScalingCustom === CONT TestAccAppAutoScalingPolicy_predictiveScalingCustom --- PASS: TestAccAppAutoScalingPolicy_predictiveScalingCustom (75.96s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/appautoscaling 81.641s From f53b0333819ebff7d76984503813d13f9b1f2ad6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 14:19:02 -0400 Subject: [PATCH 2019/2115] Add predictive scaling example. --- .../r/appautoscaling_policy.html.markdown | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index 068d1bf63bc6..907411ea7664 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -196,6 +196,28 @@ resource "aws_appautoscaling_policy" "example" { } ``` +### Predictive Scaling + +```terraform +resource "aws_appautoscaling_policy" "example" { + name = %[1]q + resource_id = aws_appautoscaling_target.example.resource_id + scalable_dimension = aws_appautoscaling_target.example.scalable_dimension + service_namespace = aws_appautoscaling_target.example.service_namespace + policy_type = "PredictiveScaling" + + predictive_scaling_policy_configuration { + metric_specification { + target_value = 40 + + predefined_metric_pair_specification { + predefined_metric_type = "ECSServiceMemoryUtilization" + } + } + } +} +``` + ## Argument Reference This resource supports the following arguments: From 6ad6bd8da8a3ef7f55ec679bb8846c19698ae95d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 14:29:49 -0400 Subject: [PATCH 2020/2115] Fix terrafmt error. --- website/docs/r/appautoscaling_policy.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/appautoscaling_policy.html.markdown b/website/docs/r/appautoscaling_policy.html.markdown index 907411ea7664..512f14f19d6f 100644 --- a/website/docs/r/appautoscaling_policy.html.markdown +++ b/website/docs/r/appautoscaling_policy.html.markdown @@ -200,7 +200,7 @@ resource "aws_appautoscaling_policy" "example" { ```terraform resource "aws_appautoscaling_policy" "example" { - name = %[1]q + name = "example-policy" resource_id = aws_appautoscaling_target.example.resource_id scalable_dimension = aws_appautoscaling_target.example.scalable_dimension service_namespace = aws_appautoscaling_target.example.service_namespace From e44a15e3eb83110d1d38155b4b061d4c35878c78 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 14:12:39 -0500 Subject: [PATCH 2021/2115] aws_secretsmanager_secret: return diagnostic warning when policy is invalid --- internal/service/secretsmanager/secret.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 06af6b8fef04..0b3f5c593a88 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -9,6 +9,7 @@ import ( "errors" "fmt" "log" + "strings" "time" "github.com/aws/aws-sdk-go-v2/aws" @@ -269,6 +270,11 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta any) d }) if err != nil { + if strings.Contains(err.Error(), "contains invalid principals") { + d.Set(names.AttrPolicy, "") + return sdkdiag.AppendWarningf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) + } + return sdkdiag.AppendErrorf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) } else if v := policy.ResourcePolicy; v != nil { policyToSet, err := verify.PolicyToSet(d.Get(names.AttrPolicy).(string), aws.ToString(v)) From f9413aa944042985893f642991965369bafb8e2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 15:17:14 -0400 Subject: [PATCH 2022/2115] Remove 'helper-schema-retry-RetryContext-without-TimeoutError-check' semgrep check. --- .ci/.semgrep.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index 931ae93882a9..a2bc2223d1c7 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -205,51 +205,6 @@ rules: ... severity: WARNING - - id: helper-schema-retry-RetryContext-without-TimeoutError-check - languages: [go] - message: Check retry.RetryContext() errors with tfresource.TimedOut() - paths: - exclude: - - "**/*_test.go" - - "**/sweep.go" - include: - - "/internal" - patterns: - - pattern-either: - - pattern: | - $ERR := retry.RetryContext(...) - ... - return ... - - pattern: | - $ERR = retry.RetryContext(...) - ... - return ... - - pattern-not: | - $ERR := retry.RetryContext(...) - ... - if isResourceTimeoutError($ERR) { ... } - ... - return ... - - pattern-not: | - $ERR = retry.RetryContext(...) - ... - if isResourceTimeoutError($ERR) { ... } - ... - return ... - - pattern-not: | - $ERR := retry.RetryContext(...) - ... - if tfresource.TimedOut($ERR) { ... } - ... - return ... - - pattern-not: | - $ERR = retry.RetryContext(...) - ... - if tfresource.TimedOut($ERR) { ... } - ... - return ... - severity: WARNING - - id: helper-schema-TimeoutError-check-doesnt-return-output languages: [go] message: If the retry.RetryContext() or tfresource.Retry() function returns a value, ensure the isResourceTimeoutError() check does as well From e45c22ed888efeac3e21a4ce7ce807d66b4fe836 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 15:18:25 -0400 Subject: [PATCH 2023/2115] Remove 'helper-schema-TimeoutError-check-doesnt-return-output' semgrep check. --- .ci/.semgrep.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index a2bc2223d1c7..6b65d53e37e6 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -205,44 +205,6 @@ rules: ... severity: WARNING - - id: helper-schema-TimeoutError-check-doesnt-return-output - languages: [go] - message: If the retry.RetryContext() or tfresource.Retry() function returns a value, ensure the isResourceTimeoutError() check does as well - paths: - exclude: - - "*_test.go" - include: - - "/internal" - patterns: - - pattern-either: - - patterns: - - pattern: | - if isResourceTimeoutError($ERR) { - _, $ERR = $CONN.$FUNC(...) - } - - pattern-not-inside: | - $ERR = retry.RetryContext(..., func() *retry.RetryError { - ... - _, $ERR2 = $CONN.$FUNC(...) - ... - }) - ... - if isResourceTimeoutError($ERR) { ... } - - patterns: - - pattern: | - if tfresource.TimedOut($ERR) { - _, $ERR = $CONN.$FUNC(...) - } - - pattern-not-inside: | - $ERR = retry.RetryContext(..., func() *retry.RetryError { - ... - _, $ERR2 = $CONN.$FUNC(...) - ... - }) - ... - if tfresource.TimedOut($ERR) { ... } - severity: WARNING - - id: is-not-found-error languages: [go] message: Check for retry.NotFoundError errors with tfresource.NotFound() From 9dc8937a0fc3f4667e94b006f11604d1d755ffc3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 15:21:04 -0400 Subject: [PATCH 2024/2115] Fix 'non-tags-change-detection' semgrep check. --- .ci/.semgrep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.semgrep.yml b/.ci/.semgrep.yml index 6b65d53e37e6..818b0792bede 100644 --- a/.ci/.semgrep.yml +++ b/.ci/.semgrep.yml @@ -393,7 +393,7 @@ rules: include: - "/internal" patterns: - - pattern: 'if d.HasChangeExcept("tags_all") {...}' + - pattern: 'if d.HasChangeExcept(names.AttrTagsAll) {...}' severity: WARNING - id: unnecessary-literal-type-conversion From 3b9d770b6bdf8771c0965241e534af57c2e9dd93 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 10 Sep 2025 19:27:34 +0000 Subject: [PATCH 2025/2115] Update CHANGELOG.md for #44211 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a835aaea0f8..cb46c28dc09f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ ENHANCEMENTS: * data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_lb_hosted_zone_id: Add hosted zone IDs for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_s3_bucket: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) +* resource/aws_appautoscaling_policy: Add `predictive_scaling_policy_configuration` argument ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) +* resource/aws_appautoscaling_policy: Add plan-time validation of `policy_type` ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) +* resource/aws_appautoscaling_policy: Add plan-time validation of `step_scaling_policy_configuration.adjustment_type` and `step_scaling_policy_configuration.metric_aggregation_type` ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) * resource/aws_bedrock_guardrail: Add `input_action`, `output_action`, `input_enabled`, and `output_enabled` arguments to `word_policy_config.managed_word_lists_config` and `word_policy_config.words_config` configuration blocks ([#44224](https://github.com/hashicorp/terraform-provider-aws/issues/44224)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) * resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block ([#44201](https://github.com/hashicorp/terraform-provider-aws/issues/44201)) @@ -14,6 +17,8 @@ ENHANCEMENTS: * resource/aws_ecs_account_setting_default: Support `dualStackIPv6` as a valid value for `name` ([#44165](https://github.com/hashicorp/terraform-provider-aws/issues/44165)) * resource/aws_glue_catalog_table_optimizer: Add `iceberg_configuration.run_rate_in_hours` argument to `retention_configuration` and `orphan_file_deletion_configuration` blocks ([#44207](https://github.com/hashicorp/terraform-provider-aws/issues/44207)) * resource/aws_networkfirewall_rule_group: Add IPv6 CIDR block support to `address_definition` arguments in `source` and `destination` blocks within `rule_group.rules_source.stateless_rules_and_custom_actions.stateless_rule.rule_definition.match_attributes` ([#44215](https://github.com/hashicorp/terraform-provider-aws/issues/44215)) +* resource/aws_networkmanager_vpc_attachment: Add `options.dns_support` and `options.security_group_referencing_support` arguments ([#43742](https://github.com/hashicorp/terraform-provider-aws/issues/43742)) +* resource/aws_networkmanager_vpc_attachment: Change `options` to Optional and Computed ([#43742](https://github.com/hashicorp/terraform-provider-aws/issues/43742)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_vpc_endpoint: Add resource identity support ([#44194](https://github.com/hashicorp/terraform-provider-aws/issues/44194)) @@ -22,6 +27,7 @@ ENHANCEMENTS: BUG FIXES: +* resource/aws_appautoscaling_policy: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `step_scaling_policy_configuration` is empty ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) * resource/aws_cognito_managed_login_branding: Fix `reading Cognito Managed Login Branding by client ... couldn't find resource` errors when a user pool contains multiple client apps ([#44204](https://github.com/hashicorp/terraform-provider-aws/issues/44204)) * resource/aws_flow_log: Fix `Error decoding ... from prior state: unsupported attribute "log_group_name"` errors when upgrading from a pre-v6.0.0 provider version ([#44191](https://github.com/hashicorp/terraform-provider-aws/issues/44191)) * resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) From 63ca3be315b202a71d45e61a638719998e6894b7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 15:35:47 -0400 Subject: [PATCH 2026/2115] Add semgrep check for use of Plugin SDK retry functionality. --- .ci/semgrep/pluginsdk/retry.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .ci/semgrep/pluginsdk/retry.yml diff --git a/.ci/semgrep/pluginsdk/retry.yml b/.ci/semgrep/pluginsdk/retry.yml new file mode 100644 index 000000000000..69459c208e0c --- /dev/null +++ b/.ci/semgrep/pluginsdk/retry.yml @@ -0,0 +1,18 @@ +rules: + - id: retry + languages: [go] + message: Don't use Plugin SDK retry functionality, use internal/retry instead + patterns: + - pattern: | + retry.RetryContext(...) + - pattern: | + sdkretry.RetryContext(...) + - pattern: | + retry.RetryableError(...) + - pattern: | + sdkretry.RetryableError(...) + - pattern: | + retry.NonRetryableError(...) + - pattern: | + sdkretry.NonRetryableError(...) + severity: WARNING \ No newline at end of file From 68092a537d43913421cb805e50e24c861f54e2ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 15:59:16 -0400 Subject: [PATCH 2027/2115] `retry.RetryContext` -> `tfresource.Retry` in the Contributor Guide. --- docs/error-handling.md | 3 -- docs/raising-a-pull-request.md | 2 +- docs/retries-and-waiters.md | 98 +++++++++++----------------------- 3 files changed, 32 insertions(+), 71 deletions(-) diff --git a/docs/error-handling.md b/docs/error-handling.md index 0b8c2d68038b..5fa619176359 100644 --- a/docs/error-handling.md +++ b/docs/error-handling.md @@ -111,9 +111,6 @@ tfawserr.ErrCodeEquals(err, tf{SERVICE}.ErrCodeInvalidParameterException) The Terraform Plugin SDK includes some error types which are used in certain operations and typically preferred over implementing new types: * [`retry.NotFoundError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry#NotFoundError) -* [`retry.TimeoutError`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry#TimeoutError) - * Returned from [`retry.RetryContext()`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry#RetryContext) and - [`(retry.StateChangeConf).WaitForStateContext()`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry#StateChangeConf.WaitForStateContext) !!! note While these helpers currently reside in the Terraform Plugin SDK V2 package, they can be used with Plugin Framework based resources. In the future these functions will likely be migrated into the provider itself, or a standalone library as there is no direct dependency on Plugin SDK functionality. diff --git a/docs/raising-a-pull-request.md b/docs/raising-a-pull-request.md index 5ceaf2a32d10..01355d2f2508 100644 --- a/docs/raising-a-pull-request.md +++ b/docs/raising-a-pull-request.md @@ -110,7 +110,7 @@ This Contribution Guide also includes separate sections on topics such as [Error - __Passes Testing__: All code and documentation changes must pass unit testing, code linting, and website link testing. Resource code changes must pass all acceptance testing for the resource. - __Avoids API Calls Across Account, Region, and Service Boundaries__: Resources should not implement cross-account, cross-region, or cross-service API calls. - __Does Not Set Optional or Required for Non-Configurable Attributes__: Resource schema definitions for read-only attributes must not include `Optional: true` or `Required: true`. -- __Avoids retry.RetryContext() without retry.RetryableError()__: Resource logic should only implement [`retry.Retry()`](https://godoc.org/github.com/hashicorp/terraform/helper/retry#Retry) if there is a retryable condition (e.g., `return retry.RetryableError(err)`). +- __Avoids tfresource.Retry() without tfresource.RetryableError()__: Resource logic should only implement `tfresource.Retry()` if there is a retryable condition (e.g., `return tfresource.RetryableError(err)`). - __Avoids Reusing Resource Read Function in Data Source Read Function__: Data sources should fully implement their own resource `Read` functionality. - __Avoids Reading Schema Structure in Resource Code__: The resource `Schema` should not be read in resource `Create`/`Read`/`Update`/`Delete` functions to perform looping or otherwise complex attribute logic. Use [`d.Get()`](https://godoc.org/github.com/hashicorp/terraform/helper/schema#ResourceData.Get) and [`d.Set()`](https://godoc.org/github.com/hashicorp/terraform/helper/schema#ResourceData.Set) directly with individual attributes instead. - __Avoids ResourceData.GetOkExists()__: Resource logic should avoid using [`ResourceData.GetOkExists()`](https://godoc.org/github.com/hashicorp/terraform/helper/schema#ResourceData.GetOkExists) as its expected functionality is not guaranteed in all scenarios. diff --git a/docs/retries-and-waiters.md b/docs/retries-and-waiters.md index a1554358fda8..8943b5744338 100644 --- a/docs/retries-and-waiters.md +++ b/docs/retries-and-waiters.md @@ -15,9 +15,9 @@ This guide describes the behavior of the Terraform AWS Provider and provides cod ## Terraform Plugin SDK Functionality -The [Terraform Plugin SDK](https://github.com/hashicorp/terraform-plugin-sdk/), which the AWS Provider uses, provides vital tools for handling consistency: the `retry.StateChangeConf{}` struct, and the retry function `retry.RetryContext()`. -We will discuss these throughout the rest of this guide. -Since they help keep the AWS Provider code consistent, we heavily prefer them over custom implementations. +The [Terraform Plugin SDK](https://github.com/hashicorp/terraform-plugin-sdk/), which the AWS Provider uses, provides the `retry.StateChangeConf{}` struct, used for handling resource state consistency. +We will discuss it throughout the rest of this guide. +Since it helps keep the AWS Provider code consistent, we heavily prefer it over custom implementations. This guide goes beyond the [Terraform Plugin SDK v2 documentation](https://www.terraform.io/plugin/sdkv2/resources/retries-and-customizable-timeouts) by providing additional context and emergent implementations specific to the Terraform AWS Provider. @@ -29,9 +29,9 @@ The [`retry.StateChangeConf` type](https://pkg.go.dev/github.com/hashicorp/terra - Expecting the target value(s) to be returned multiple times in succession. - Allowing various polling configurations such as delaying the initial request and setting the time between polls. -### Retry Functions +## Retry Functions -The [`retry.RetryContext()`](https://pkg.go.dev/github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry#RetryContext) function provides a simplified retry implementation around `retry.StateChangeConf`. +The `tfresource.Retry()` function provides a simplified retry implementation. The most common use is for simple error-based retries. ## AWS Request Handling @@ -117,7 +117,7 @@ These issues are _not_ reliably reproducible, especially in the case of writing Even given a properly ordered Terraform configuration, eventual consistency can unexpectedly prevent downstream operations from succeeding. A simple retry after a few seconds resolves many of these issues. -To reduce frustrating behavior for operators, wrap AWS Go SDK operations with the `retry.RetryContext()` function. +To reduce frustrating behavior for operators, wrap AWS Go SDK operations with the `tfresource.Retry()` function. These retries should have a reasonably low timeout (typically two minutes but up to five minutes). Save them in a constant for reusability. These functions are preferably in line with the associated resource logic to remove any indirection with the code. @@ -136,30 +136,22 @@ const ( // internal/service/{service}/{thing}.go // ... Create, Read, Update, or Delete function ... - err := retry.RetryContext(ctx, ThingOperationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, ThingOperationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn./* ... AWS Go SDK operation with eventual consistency errors ... */ // Retryable conditions which can be checked. // These must be updated to match the AWS service API error code and message. if errs.IsAErrorMessageContains[/* error type */](err, /* error message */) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - // This check is important - it handles when the AWS Go SDK operation retries without returning. - // e.g., any automatic retries due to network or throttling errors. - if tfresource.TimedOut(err) { - // The use of equals assignment (over colon equals) is also important here. - // This overwrites the error variable to simplify logic. - _, err = conn./* ... AWS Go SDK operation with IAM eventual consistency errors ... */ - } - if err != nil { return fmt.Errorf("... error message context ... : %w", err) } @@ -190,26 +182,22 @@ import ( ) // ... Create and typically Update function ... - err := retry.RetryContext(ctx, iamwaiter.PropagationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, iamwaiter.PropagationTimeout, func(ctx context.Context) *tfresource.RetryError { _, err := conn./* ... AWS Go SDK operation with IAM eventual consistency errors ... */ // Example retryable condition // This must be updated to match the AWS service API error code and message. if errs.IsAErrorMessageContains[/* error type */](err, /* error message */) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - if tfresource.TimedOut(err) { - _, err = conn./* ... AWS Go SDK operation with IAM eventual consistency errors ... */ - } - if err != nil { return fmt.Errorf("... error message context ... : %w", err) } @@ -238,42 +226,28 @@ import ( iamwaiterStopTime := time.Now().Add(tfiam.PropagationTimeout) // Ensure to add IAM eventual consistency timeout in case of retries - err = retry.RetryContext(ctx, tfiam.PropagationTimeout+ThingOperationTimeout, func() *retry.RetryError { + err = tfresource.Retry(ctx, tfiam.PropagationTimeout+ThingOperationTimeout, func(ctx context.Context) *tfresource.RetryError { // Only retry IAM eventual consistency errors up to that timeout iamwaiterRetry := time.Now().Before(iamwaiterStopTime) _, err := conn./* ... AWS Go SDK operation without eventual consistency errors ... */ if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } _, err = ThingOperation(conn, d.Id()) if err != nil { if iamwaiterRetry && /* eventual consistency error checking */ { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - - if tfresource.TimedOut(err) { - _, err = conn./* ... AWS Go SDK operation without eventual consistency errors ... */ - - if err != nil { - return err - } - - _, err = ThingOperation(conn, d.Id()) - - if err != nil { - return err - } - } ``` ### Resource Lifecycle Retries @@ -310,26 +284,21 @@ const ( var output *example.OperationOutput createTimeout := r.CreateTimeout(ctx, plan.Timeouts) - err := retry.RetryContext(ctx, createTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, createTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.Operation(ctx, &input) if errs.IsA[*types.ResourceNotFoundException(err) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - // Retry AWS Go SDK operation if no response from automatic retries. - if tfresource.TimedOut(err) { - output, err = conn.Operation(ctx, &input) - } - if err != nil { resp.Diagnostics.AddError( create.ProblemStandardMessage(names.Example, create.ErrActionWaitingForCreation, ResNameThing, plan.ID.String(), err), @@ -355,13 +324,13 @@ const ( ```go // internal/service/{service}/{thing}.go - func ExampleThingCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + func ExampleThingCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics // ... return append(diags, ExampleThingRead(ctx, d, meta)...) } - func ExampleThingRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + func ExampleThingRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*AWSClient).ExampleConn() @@ -369,27 +338,22 @@ const ( input := example.OperationInput{/* ... */} var output *example.OperationOutput - err := retry.RetryContext(ctx, ThingCreationTimeout, func() *retry.RetryError { + err := tfresource.Retry(ctx, ThingCreationTimeout, func(ctx context.Context) *tfresource.RetryError { var err error output, err = conn.Operation(ctx, &input) // Retry on any API "not found" errors, but only on new resources. if d.IsNewResource() && tfawserr.ErrorCodeEquals(err, example.ErrCodeResourceNotFoundException) { - return retry.RetryableError(err) + return tfresource.RetryableError(err) } if err != nil { - return retry.NonRetryableError(err) + return tfresource.NonRetryableError(err) } return nil }) - // Retry AWS Go SDK operation if no response from automatic retries. - if tfresource.TimedOut(err) { - output, err = conn.Operation(ctx, &input) - } - // Prevent confusing Terraform error messaging to operators by // Only ignoring API "not found" errors if not a new resource. if !d.IsNewResource() && tfawserr.ErrorCodeEquals(err, example.ErrCodeNoSuchEntityException) { @@ -415,7 +379,7 @@ const ( Some other general guidelines are: - If the `Create` function uses `retry.StateChangeConf`, the underlying `resource.RefreshStateFunc` should `return nil, "", nil` instead of the API "not found" error. This way the `StateChangeConf` logic will automatically retry. - - If the `Create` function uses `retry.RetryContext()`, the API "not found" error should be caught and `return retry.RetryableError(err)` to automatically retry. + - If the `Create` function uses `tfresource.Retry()`, the API "not found" error should be caught and `return tfresource.RetryableError(err)` to automatically retry. In rare cases, it may be easier to duplicate all `Read` function logic in the `Create` function to handle all retries in one place. @@ -426,7 +390,7 @@ An emergent solution for handling eventual consistency with attribute values on ```go // ThingAttribute fetches the Thing and its Attribute func ThingAttribute(ctx context.Context, conn *example.Client, id string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { + return func() (any, string, error) { output, err := /* ... AWS Go SDK operation to fetch resource/value ... */ if errs.IsA[*types.ResourceNotFoundException](err) { @@ -489,7 +453,7 @@ And consumed within the resource update workflow as follows: === "Terraform Plugin SDK V2" ```go - func resourceThingUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diags.Diagnostics { + func resourceThingUpdate(ctx context.Context, d *schema.ResourceData, meta any) diags.Diagnostics { // ... d.HasChange("attribute") { @@ -512,7 +476,7 @@ Terraform resources should wait for these background operations to complete. Fai ### AWS Go SDK Waiters -The AWS SDK for Go provides [waiters](https://docs.aws.amazon.com/sdk-for-go/v2/developer-guide/using.html#using-waiters) for some asynchronous operations. We prefer using [Resource Lifecycle Waiters](#resource-lifecycle-waiters) instead since they are more commonly used throughout the codebase and provide more options for customization. +The AWS SDK for Go provides [waiters](https://docs.aws.amazon.com/sdk-for-go/v2/developer-guide/using.html#using-waiters) for some asynchronous operations. We required using [Resource Lifecycle Waiters](#resource-lifecycle-waiters) instead since they are more commonly used throughout the codebase and provide more options for customization. ### Resource Lifecycle Waiters @@ -522,7 +486,7 @@ These should be placed in the `internal/service/{SERVICE}` package and split int ```go // ThingStatus fetches the Thing and its Status func ThingStatus(ctx context.Context, conn *example.Client, id string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { + return func() (any, string, error) { output, err := /* ... AWS Go SDK operation to fetch resource/status ... */ if errs.IsA[*types.ResourceNotFoundException](err) { @@ -613,7 +577,7 @@ func waitThingDeleted(ctx context.Context, conn *example.Example, id string, tim === "Terraform Plugin SDK V2" ```go - func resourceThingCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + func resourceThingCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { var diags diag.Diagnostics // ... AWS Go SDK logic to create resource ... @@ -625,7 +589,7 @@ func waitThingDeleted(ctx context.Context, conn *example.Example, id string, tim return append(diags, ExampleThingRead(ctx, d, meta)...) } - func resourceThingDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + func resourceThingDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics { // ... AWS Go SDK logic to delete resource ... if _, err := waitThingDeleted(conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { From 9ab23ad36d717d87e876849059064c58e20577ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 16:04:40 -0400 Subject: [PATCH 2028/2115] r/aws_vpc_endpoint_subnet_association: Use 'internal/retry'. --- internal/service/ec2/vpc_endpoint_subnet_association.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ec2/vpc_endpoint_subnet_association.go b/internal/service/ec2/vpc_endpoint_subnet_association.go index 36d0e04b7596..7d41e956b220 100644 --- a/internal/service/ec2/vpc_endpoint_subnet_association.go +++ b/internal/service/ec2/vpc_endpoint_subnet_association.go @@ -15,11 +15,11 @@ import ( "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/hashicorp/aws-sdk-go-base/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/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/retry" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" ) @@ -162,7 +162,7 @@ func modifyVPCEndpointExclusive(ctx context.Context, conn *ec2.Client, input *ec Delay: 1 * time.Minute, Timeout: 3 * time.Minute, Target: []string{strconv.FormatBool(true)}, - Refresh: func() (any, string, error) { + Refresh: func(ctx context.Context) (any, string, error) { output, err := conn.ModifyVpcEndpoint(ctx, input) if err != nil { From 42a5795565b3558015d944e300a5b4ac523eb06f Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 15:13:20 -0500 Subject: [PATCH 2029/2115] aws_controltower_baseline: skip test if env variable not set --- docs/acc-test-environment-variables.md | 207 +++++++++--------- .../service/controltower/baseline_test.go | 12 +- 2 files changed, 111 insertions(+), 108 deletions(-) diff --git a/docs/acc-test-environment-variables.md b/docs/acc-test-environment-variables.md index f7b999109042..4cd8a96ceaf5 100644 --- a/docs/acc-test-environment-variables.md +++ b/docs/acc-test-environment-variables.md @@ -2,106 +2,107 @@ Environment variables (beyond standard AWS Go SDK ones) used by acceptance testing. See also the `internal/acctest` package. -| Variable | Description | -|----------|-------------| -| `ACM_CERTIFICATE_ROOT_DOMAIN` | Root domain name to use with ACM Certificate testing. | -| `ACM_TEST_CERTIFICATE_EXPORT` | Flag to execute tests that enable exportable certificates. | -| `ADM_CLIENT_ID` | Identifier for Amazon Device Manager Client in Pinpoint testing. | -| `AMPLIFY_DOMAIN_NAME` | Domain name to use for Amplify domain association testing. | -| `AMPLIFY_GITHUB_ACCESS_TOKEN` | GitHub access token used for AWS Amplify testing. | -| `AMPLIFY_GITHUB_REPOSITORY` | GitHub repository used for AWS Amplify testing. | -| `ADM_CLIENT_SECRET` | Secret for Amazon Device Manager Client in Pinpoint testing. | -| `APNS_BUNDLE_ID` | Identifier for Apple Push Notification Service Bundle in Pinpoint testing. | -| `APNS_CERTIFICATE` | Certificate (PEM format) for Apple Push Notification Service in Pinpoint testing. | -| `APNS_CERTIFICATE_PRIVATE_KEY` | Private key for Apple Push Notification Service in Pinpoint testing. | -| `APNS_SANDBOX_BUNDLE_ID` | Identifier for Sandbox Apple Push Notification Service Bundle in Pinpoint testing. | -| `APNS_SANDBOX_CERTIFICATE` | Certificate (PEM format) for Sandbox Apple Push Notification Service in Pinpoint testing. | -| `APNS_SANDBOX_CERTIFICATE_PRIVATE_KEY` | Private key for Sandbox Apple Push Notification Service in Pinpoint testing. | -| `APNS_SANDBOX_CREDENTIAL` | Credential contents for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_CREDENTIAL_PATH`. | -| `APNS_SANDBOX_CREDENTIAL_PATH` | Path to credential for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_CREDENTIAL`. | -| `APNS_SANDBOX_PRINCIPAL` | Principal contents for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_PRINCIPAL_PATH`. | -| `APNS_SANDBOX_PRINCIPAL_PATH` | Path to the principal for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_PRINCIPAL`. | -| `APNS_SANDBOX_TEAM_ID` | Identifier for Sandbox Apple Push Notification Service Team in Pinpoint testing. | -| `APNS_SANDBOX_TOKEN_KEY` | Token key file content (.p8 format) for Sandbox Apple Push Notification Service in Pinpoint testing. | -| `APNS_SANDBOX_TOKEN_KEY_ID` | Identifier for Sandbox Apple Push Notification Service Token Key in Pinpoint testing. | -| `APNS_TEAM_ID` | Identifier for Apple Push Notification Service Team in Pinpoint testing. | -| `APNS_TOKEN_KEY` | Token key file content (.p8 format) for Apple Push Notification Service in Pinpoint testing. | -| `APNS_TOKEN_KEY_ID` | Identifier for Apple Push Notification Service Token Key in Pinpoint testing. | -| `APNS_VOIP_BUNDLE_ID` | Identifier for VOIP Apple Push Notification Service Bundle in Pinpoint testing. | -| `APNS_VOIP_CERTIFICATE` | Certificate (PEM format) for VOIP Apple Push Notification Service in Pinpoint testing. | -| `APNS_VOIP_CERTIFICATE_PRIVATE_KEY` | Private key for VOIP Apple Push Notification Service in Pinpoint testing. | -| `APNS_VOIP_TEAM_ID` | Identifier for VOIP Apple Push Notification Service Team in Pinpoint testing. | -| `APNS_VOIP_TOKEN_KEY` | Token key file content (.p8 format) for VOIP Apple Push Notification Service in Pinpoint testing. | -| `APNS_VOIP_TOKEN_KEY_ID` | Identifier for VOIP Apple Push Notification Service Token Key in Pinpoint testing. | -| `APPRUNNER_CUSTOM_DOMAIN` | A custom domain endpoint (root domain, subdomain, or wildcard) for AppRunner Custom Domain Association testing. | -| `AUDITMANAGER_DEREGISTER_ACCOUNT_ON_DESTROY` | Flag to execute tests that will disable AuditManager in the account upon destruction. | -| `AUDITMANAGER_ORGANIZATION_ADMIN_ACCOUNT_ID` | Organization admin account identifier for use in AuditManager testing. | -| `AWS_ALTERNATE_ACCESS_KEY_ID` | AWS access key ID with access to a secondary AWS account for tests requiring multiple accounts. Requires `AWS_ALTERNATE_SECRET_ACCESS_KEY`. Conflicts with `AWS_ALTERNATE_PROFILE`. | -| `AWS_ALTERNATE_SECRET_ACCESS_KEY` | AWS secret access key with access to a secondary AWS account for tests requiring multiple accounts. Requires `AWS_ALTERNATE_ACCESS_KEY_ID`. Conflicts with `AWS_ALTERNATE_PROFILE`. | -| `AWS_ALTERNATE_PROFILE` | AWS profile with access to a secondary AWS account for tests requiring multiple accounts. Conflicts with `AWS_ALTERNATE_ACCESS_KEY_ID` and `AWS_ALTERNATE_SECRET_ACCESS_KEY`. | -| `AWS_ALTERNATE_REGION` | Secondary AWS region for tests requiring multiple regions. Defaults to `us-east-1`. | -| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_BODY` | Certificate body of publicly trusted certificate for API Gateway Domain Name testing. | -| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_CHAIN` | Certificate chain of publicly trusted certificate for API Gateway Domain Name testing. | -| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_PRIVATE_KEY` | Private key of publicly trusted certificate for API Gateway Domain Name testing. | -| `AWS_API_GATEWAY_DOMAIN_NAME_REGIONAL_CERTIFICATE_NAME_ENABLED` | Flag to enable API Gateway Domain Name regional certificate upload testing. | -| `AWS_CODEBUILD_BITBUCKET_SOURCE_LOCATION` | BitBucket source URL for CodeBuild testing. CodeBuild must have access to this repository via OAuth or Source Credentials. Defaults to `https://terraform@bitbucket.org/terraform/aws-test.git`. | -| `AWS_CODEBUILD_GITHUB_SOURCE_LOCATION` | GitHub source URL for CodeBuild testing. CodeBuild must have access to this repository via OAuth or Source Credentials. Defaults to `https://github.com/hashibot-test/aws-test.git`. | -| `AWS_DEFAULT_REGION` | Primary AWS region for tests. Defaults to `us-west-2`. | -| `AWS_DETECTIVE_MEMBER_EMAIL` | Email address for Detective Member testing. A valid email address associated with an AWS root account is required for tests to pass. | -| `AWS_EC2_CLIENT_VPN_LIMIT` | Concurrency limit for Client VPN acceptance tests. [Default is 5](https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/limits.html) if not specified. | -| `AWS_EC2_EIP_PUBLIC_IPV4_POOL` | Identifier for EC2 Public IPv4 Pool for EC2 EIP testing. | -| `AWS_EC2_TRANSIT_GATEWAY_LIMIT` | Concurrency limit for Transit Gateway acceptance tests. [Default is 5](https://docs.aws.amazon.com/vpc/latest/tgw/transit-gateway-quotas.html) if not specified. | -| `AWS_EC2_VERIFIED_ACCESS_INSTANCE_LIMIT` | Concurrency limit for Verified Access acceptance tests. [Default is 5](https://docs.aws.amazon.com/verified-access/latest/ug/verified-access-quotas.html) if not specified. | -| `AWS_GUARDDUTY_MEMBER_ACCOUNT_ID` | Identifier of AWS Account for GuardDuty Member testing. **DEPRECATED:** Should be replaced with standard alternate account handling for tests. | -| `AWS_GUARDDUTY_MEMBER_EMAIL` | Email address for GuardDuty Member testing. **DEPRECATED:** It may be possible to use a placeholder email address instead. | -| `AWS_LAMBDA_IMAGE_LATEST_ID` | ECR repository image URI (tagged as `latest`) for Lambda container image acceptance tests. | -| `AWS_LAMBDA_IMAGE_V1_ID` | ECR repository image URI (tagged as `v1`) for Lambda container image acceptance tests. | -| `AWS_LAMBDA_IMAGE_V2_ID` | ECR repository image URI (tagged as `v2`) for Lambda container image acceptance tests. | -| `AWS_THIRD_ACCESS_KEY_ID` | AWS access key ID with access to a third AWS account for tests requiring multiple accounts. Requires `AWS_THIRD_SECRET_ACCESS_KEY`. Conflicts with `AWS_THIRD_PROFILE`. | -| `AWS_THIRD_SECRET_ACCESS_KEY` | AWS secret access key with access to a third AWS account for tests requiring multiple accounts. Requires `AWS_THIRD_ACCESS_KEY_ID`. Conflicts with `AWS_THIRD_PROFILE`. | -| `AWS_THIRD_PROFILE` | AWS profile with access to a third AWS account for tests requiring multiple accounts. Conflicts with `AWS_THIRD_ACCESS_KEY_ID` and `AWS_THIRD_SECRET_ACCESS_KEY`. | -| `AWS_THIRD_REGION` | Third AWS region for tests requiring multiple regions. Defaults to `us-east-2`. | -| `CHATBOT_SLACK_CHANNEL_ID` | ID of the Slack channel. | -| `CHATBOT_SLACK_TEAM_ID` | ID of the Slack workspace authorized with AWS Chatbot. | -| `CHATBOT_TEAMS_CHANNEL_ID` | ID of the Microsoft Teams channel. | -| `CHATBOT_TEAMS_TEAM_ID` | ID of the Microsoft Teams workspace authorized with AWS Chatbot. | -| `CHATBOT_TEAMS_TENANT_ID` | ID of the Microsoft Teams tenant. | -| `CLOUD_HSM_CLUSTER_ID` | Cloud HSM cluster identifier for KMS custom key store acceptance tests. | -| `DX_CONNECTION_ID` | Identifier for Direct Connect Connection testing. | -| `DX_VIRTUAL_INTERFACE_ID` | Identifier for Direct Connect Virtual Interface testing. | -| `EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT` | EC2 Quota for Rules per Security Group. Defaults to 50. **DEPRECATED:** Can be augmented or replaced with Service Quotas lookup. | -| `EVENT_BRIDGE_PARTNER_EVENT_BUS_NAME` | Amazon EventBridge partner event bus name. | -| `EVENT_BRIDGE_PARTNER_EVENT_SOURCE_NAME` | Amazon EventBridge partner event source name. | -| `FINSPACE_MANAGED_KX_LICENSE_ENABLED` | Enables tests requiring a license to provision managed KX resources. | -| `GCM_API_KEY` | API Key for Google Cloud Messaging in Pinpoint and SNS Platform Application testing. | -| `GITHUB_TOKEN` | GitHub token for CodePipeline testing. | -| `GLOBALACCERATOR_BYOIP_IPV4_ADDRESS` | IPv4 address from a BYOIP CIDR of AWS Account used for testing Global Accelerator's BYOIP accelerator. | -| `GRAFANA_SSO_GROUP_ID` | AWS SSO group ID for Grafana testing. | -| `GRAFANA_SSO_USER_ID` | AWS SSO user ID for Grafana testing. | -| `MACIE_MEMBER_ACCOUNT_ID` | Identifier of AWS Account for Macie Member testing. **DEPRECATED:** Should be replaced with standard alternate account handling for tests. | -| `QUICKSIGHT_NAMESPACE` | QuickSight namespace name for testing. | -| `QUICKSIGHT_ATHENA_TESTING_ENABLED` | Enable QuickSight tests dependent on Amazon Athena resources. | -| `ROUTE53DOMAINS_DOMAIN_NAME` | Registered domain for Route 53 Domains testing. | -| `RESOURCEEXPLORER_INDEX_TYPE` | Index Type for Resource Explorer 2 Search datasource testing. | -| `SAGEMAKER_IMAGE_VERSION_BASE_IMAGE` | SageMaker base image to use for tests. | -| `SERVICEQUOTAS_INCREASE_ON_CREATE_QUOTA_CODE` | Quota Code for Service Quotas testing (submits support case). | -| `SERVICEQUOTAS_INCREASE_ON_CREATE_SERVICE_CODE` | Service Code for Service Quotas testing (submits support case). | -| `SERVICEQUOTAS_INCREASE_ON_CREATE_VALUE` | Value of quota increase for Service Quotas testing (submits support case). | -| `SES_DOMAIN_IDENTITY_ROOT_DOMAIN` | Root domain name of publicly accessible and Route 53 configurable domain for SES Domain Identity testing. | -| `SES_DEDICATED_IP` | Dedicated IP address for testing IP assignment with a "Standard" (non-managed) SES dedicated IP pool. | -| `SWF_DOMAIN_TESTING_ENABLED` | Enables SWF Domain testing (API does not support deletions). | -| `TEST_AWS_ORGANIZATION_ACCOUNT_EMAIL_DOMAIN` | Email address for Organizations Account testing. | -| `TEST_AWS_SES_VERIFIED_EMAIL_ARN` | Verified SES Email Identity for use in Cognito User Pool testing. | -| `TF_ACC` | Enables Go tests containing `resource.Test()` and `resource.ParallelTest()`. | -| `TF_ACC_ASSUME_ROLE_ARN` | Amazon Resource Name of existing IAM Role to use for limited permissions acceptance testing. | -| `TF_AWS_BEDROCK_OSS_COLLECTION_NAME` | Name of the OpenSearch Serverless collection to be used with an Amazon Bedrock Knowledge Base. | -| `TF_AWS_CONTROLTOWER_CONTROL_OU_NAME` | Organizational unit name to be targeted by the Control Tower control. | -| `TF_AWS_DATAEXCHANGE_DATA_SET_ID` | ID of DataExchange Data Set to use for testing. | -| `TF_AWS_LICENSE_MANAGER_GRANT_HOME_REGION` | Region where a License Manager license is imported. | -| `TF_AWS_LICENSE_MANAGER_GRANT_LICENSE_ARN` | ARN for a License Manager license imported into the current account. | -| `TF_AWS_LICENSE_MANAGER_GRANT_PRINCIPAL` | ARN of a principal to share the License Manager license with. Either a root user, Organization, or Organizational Unit. | -| `TF_AWS_QUICKSIGHT_IDC_GROUP` | Name of the IAM Identity Center Group to be assigned role membership. | -| `TF_TEST_CLOUDFRONT_RETAIN` | Flag to disable but dangle CloudFront Distributions during testing to reduce feedback time (must be manually destroyed afterwards). | -| `TF_TEST_ELASTICACHE_RESERVED_CACHE_NODE` | Flag to enable resource tests for ElastiCache reserved nodes. Set to `1` to run tests. | -| `TRUST_ANCHOR_CERTIFICATE` | Trust anchor certificate for KMS custom key store acceptance tests. | -| `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_CARDS` | Flag to execute tests that enable to attach multiple network interfaces. | +| Variable | Description | +|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `ACM_CERTIFICATE_ROOT_DOMAIN` | Root domain name to use with ACM Certificate testing. | +| `ACM_TEST_CERTIFICATE_EXPORT` | Flag to execute tests that enable exportable certificates. | +| `ADM_CLIENT_ID` | Identifier for Amazon Device Manager Client in Pinpoint testing. | +| `AMPLIFY_DOMAIN_NAME` | Domain name to use for Amplify domain association testing. | +| `AMPLIFY_GITHUB_ACCESS_TOKEN` | GitHub access token used for AWS Amplify testing. | +| `AMPLIFY_GITHUB_REPOSITORY` | GitHub repository used for AWS Amplify testing. | +| `ADM_CLIENT_SECRET` | Secret for Amazon Device Manager Client in Pinpoint testing. | +| `APNS_BUNDLE_ID` | Identifier for Apple Push Notification Service Bundle in Pinpoint testing. | +| `APNS_CERTIFICATE` | Certificate (PEM format) for Apple Push Notification Service in Pinpoint testing. | +| `APNS_CERTIFICATE_PRIVATE_KEY` | Private key for Apple Push Notification Service in Pinpoint testing. | +| `APNS_SANDBOX_BUNDLE_ID` | Identifier for Sandbox Apple Push Notification Service Bundle in Pinpoint testing. | +| `APNS_SANDBOX_CERTIFICATE` | Certificate (PEM format) for Sandbox Apple Push Notification Service in Pinpoint testing. | +| `APNS_SANDBOX_CERTIFICATE_PRIVATE_KEY` | Private key for Sandbox Apple Push Notification Service in Pinpoint testing. | +| `APNS_SANDBOX_CREDENTIAL` | Credential contents for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_CREDENTIAL_PATH`. | +| `APNS_SANDBOX_CREDENTIAL_PATH` | Path to credential for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_CREDENTIAL`. | +| `APNS_SANDBOX_PRINCIPAL` | Principal contents for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_PRINCIPAL_PATH`. | +| `APNS_SANDBOX_PRINCIPAL_PATH` | Path to the principal for Sandbox Apple Push Notification Service in SNS Application Platform testing. Conflicts with `APNS_SANDBOX_PRINCIPAL`. | +| `APNS_SANDBOX_TEAM_ID` | Identifier for Sandbox Apple Push Notification Service Team in Pinpoint testing. | +| `APNS_SANDBOX_TOKEN_KEY` | Token key file content (.p8 format) for Sandbox Apple Push Notification Service in Pinpoint testing. | +| `APNS_SANDBOX_TOKEN_KEY_ID` | Identifier for Sandbox Apple Push Notification Service Token Key in Pinpoint testing. | +| `APNS_TEAM_ID` | Identifier for Apple Push Notification Service Team in Pinpoint testing. | +| `APNS_TOKEN_KEY` | Token key file content (.p8 format) for Apple Push Notification Service in Pinpoint testing. | +| `APNS_TOKEN_KEY_ID` | Identifier for Apple Push Notification Service Token Key in Pinpoint testing. | +| `APNS_VOIP_BUNDLE_ID` | Identifier for VOIP Apple Push Notification Service Bundle in Pinpoint testing. | +| `APNS_VOIP_CERTIFICATE` | Certificate (PEM format) for VOIP Apple Push Notification Service in Pinpoint testing. | +| `APNS_VOIP_CERTIFICATE_PRIVATE_KEY` | Private key for VOIP Apple Push Notification Service in Pinpoint testing. | +| `APNS_VOIP_TEAM_ID` | Identifier for VOIP Apple Push Notification Service Team in Pinpoint testing. | +| `APNS_VOIP_TOKEN_KEY` | Token key file content (.p8 format) for VOIP Apple Push Notification Service in Pinpoint testing. | +| `APNS_VOIP_TOKEN_KEY_ID` | Identifier for VOIP Apple Push Notification Service Token Key in Pinpoint testing. | +| `APPRUNNER_CUSTOM_DOMAIN` | A custom domain endpoint (root domain, subdomain, or wildcard) for AppRunner Custom Domain Association testing. | +| `AUDITMANAGER_DEREGISTER_ACCOUNT_ON_DESTROY` | Flag to execute tests that will disable AuditManager in the account upon destruction. | +| `AUDITMANAGER_ORGANIZATION_ADMIN_ACCOUNT_ID` | Organization admin account identifier for use in AuditManager testing. | +| `AWS_ALTERNATE_ACCESS_KEY_ID` | AWS access key ID with access to a secondary AWS account for tests requiring multiple accounts. Requires `AWS_ALTERNATE_SECRET_ACCESS_KEY`. Conflicts with `AWS_ALTERNATE_PROFILE`. | +| `AWS_ALTERNATE_SECRET_ACCESS_KEY` | AWS secret access key with access to a secondary AWS account for tests requiring multiple accounts. Requires `AWS_ALTERNATE_ACCESS_KEY_ID`. Conflicts with `AWS_ALTERNATE_PROFILE`. | +| `AWS_ALTERNATE_PROFILE` | AWS profile with access to a secondary AWS account for tests requiring multiple accounts. Conflicts with `AWS_ALTERNATE_ACCESS_KEY_ID` and `AWS_ALTERNATE_SECRET_ACCESS_KEY`. | +| `AWS_ALTERNATE_REGION` | Secondary AWS region for tests requiring multiple regions. Defaults to `us-east-1`. | +| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_BODY` | Certificate body of publicly trusted certificate for API Gateway Domain Name testing. | +| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_CHAIN` | Certificate chain of publicly trusted certificate for API Gateway Domain Name testing. | +| `AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_PRIVATE_KEY` | Private key of publicly trusted certificate for API Gateway Domain Name testing. | +| `AWS_API_GATEWAY_DOMAIN_NAME_REGIONAL_CERTIFICATE_NAME_ENABLED` | Flag to enable API Gateway Domain Name regional certificate upload testing. | +| `AWS_CODEBUILD_BITBUCKET_SOURCE_LOCATION` | BitBucket source URL for CodeBuild testing. CodeBuild must have access to this repository via OAuth or Source Credentials. Defaults to `https://terraform@bitbucket.org/terraform/aws-test.git`. | +| `AWS_CODEBUILD_GITHUB_SOURCE_LOCATION` | GitHub source URL for CodeBuild testing. CodeBuild must have access to this repository via OAuth or Source Credentials. Defaults to `https://github.com/hashibot-test/aws-test.git`. | +| `AWS_DEFAULT_REGION` | Primary AWS region for tests. Defaults to `us-west-2`. | +| `AWS_DETECTIVE_MEMBER_EMAIL` | Email address for Detective Member testing. A valid email address associated with an AWS root account is required for tests to pass. | +| `AWS_EC2_CLIENT_VPN_LIMIT` | Concurrency limit for Client VPN acceptance tests. [Default is 5](https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/limits.html) if not specified. | +| `AWS_EC2_EIP_PUBLIC_IPV4_POOL` | Identifier for EC2 Public IPv4 Pool for EC2 EIP testing. | +| `AWS_EC2_TRANSIT_GATEWAY_LIMIT` | Concurrency limit for Transit Gateway acceptance tests. [Default is 5](https://docs.aws.amazon.com/vpc/latest/tgw/transit-gateway-quotas.html) if not specified. | +| `AWS_EC2_VERIFIED_ACCESS_INSTANCE_LIMIT` | Concurrency limit for Verified Access acceptance tests. [Default is 5](https://docs.aws.amazon.com/verified-access/latest/ug/verified-access-quotas.html) if not specified. | +| `AWS_GUARDDUTY_MEMBER_ACCOUNT_ID` | Identifier of AWS Account for GuardDuty Member testing. **DEPRECATED:** Should be replaced with standard alternate account handling for tests. | +| `AWS_GUARDDUTY_MEMBER_EMAIL` | Email address for GuardDuty Member testing. **DEPRECATED:** It may be possible to use a placeholder email address instead. | +| `AWS_LAMBDA_IMAGE_LATEST_ID` | ECR repository image URI (tagged as `latest`) for Lambda container image acceptance tests. | +| `AWS_LAMBDA_IMAGE_V1_ID` | ECR repository image URI (tagged as `v1`) for Lambda container image acceptance tests. | +| `AWS_LAMBDA_IMAGE_V2_ID` | ECR repository image URI (tagged as `v2`) for Lambda container image acceptance tests. | +| `AWS_THIRD_ACCESS_KEY_ID` | AWS access key ID with access to a third AWS account for tests requiring multiple accounts. Requires `AWS_THIRD_SECRET_ACCESS_KEY`. Conflicts with `AWS_THIRD_PROFILE`. | +| `AWS_THIRD_SECRET_ACCESS_KEY` | AWS secret access key with access to a third AWS account for tests requiring multiple accounts. Requires `AWS_THIRD_ACCESS_KEY_ID`. Conflicts with `AWS_THIRD_PROFILE`. | +| `AWS_THIRD_PROFILE` | AWS profile with access to a third AWS account for tests requiring multiple accounts. Conflicts with `AWS_THIRD_ACCESS_KEY_ID` and `AWS_THIRD_SECRET_ACCESS_KEY`. | +| `AWS_THIRD_REGION` | Third AWS region for tests requiring multiple regions. Defaults to `us-east-2`. | +| `CHATBOT_SLACK_CHANNEL_ID` | ID of the Slack channel. | +| `CHATBOT_SLACK_TEAM_ID` | ID of the Slack workspace authorized with AWS Chatbot. | +| `CHATBOT_TEAMS_CHANNEL_ID` | ID of the Microsoft Teams channel. | +| `CHATBOT_TEAMS_TEAM_ID` | ID of the Microsoft Teams workspace authorized with AWS Chatbot. | +| `CHATBOT_TEAMS_TENANT_ID` | ID of the Microsoft Teams tenant. | +| `CLOUD_HSM_CLUSTER_ID` | Cloud HSM cluster identifier for KMS custom key store acceptance tests. | +| `DX_CONNECTION_ID` | Identifier for Direct Connect Connection testing. | +| `DX_VIRTUAL_INTERFACE_ID` | Identifier for Direct Connect Virtual Interface testing. | +| `EC2_SECURITY_GROUP_RULES_PER_GROUP_LIMIT` | EC2 Quota for Rules per Security Group. Defaults to 50. **DEPRECATED:** Can be augmented or replaced with Service Quotas lookup. | +| `EVENT_BRIDGE_PARTNER_EVENT_BUS_NAME` | Amazon EventBridge partner event bus name. | +| `EVENT_BRIDGE_PARTNER_EVENT_SOURCE_NAME` | Amazon EventBridge partner event source name. | +| `FINSPACE_MANAGED_KX_LICENSE_ENABLED` | Enables tests requiring a license to provision managed KX resources. | +| `GCM_API_KEY` | API Key for Google Cloud Messaging in Pinpoint and SNS Platform Application testing. | +| `GITHUB_TOKEN` | GitHub token for CodePipeline testing. | +| `GLOBALACCERATOR_BYOIP_IPV4_ADDRESS` | IPv4 address from a BYOIP CIDR of AWS Account used for testing Global Accelerator's BYOIP accelerator. | +| `GRAFANA_SSO_GROUP_ID` | AWS SSO group ID for Grafana testing. | +| `GRAFANA_SSO_USER_ID` | AWS SSO user ID for Grafana testing. | +| `MACIE_MEMBER_ACCOUNT_ID` | Identifier of AWS Account for Macie Member testing. **DEPRECATED:** Should be replaced with standard alternate account handling for tests. | +| `QUICKSIGHT_NAMESPACE` | QuickSight namespace name for testing. | +| `QUICKSIGHT_ATHENA_TESTING_ENABLED` | Enable QuickSight tests dependent on Amazon Athena resources. | +| `ROUTE53DOMAINS_DOMAIN_NAME` | Registered domain for Route 53 Domains testing. | +| `RESOURCEEXPLORER_INDEX_TYPE` | Index Type for Resource Explorer 2 Search datasource testing. | +| `SAGEMAKER_IMAGE_VERSION_BASE_IMAGE` | SageMaker base image to use for tests. | +| `SERVICEQUOTAS_INCREASE_ON_CREATE_QUOTA_CODE` | Quota Code for Service Quotas testing (submits support case). | +| `SERVICEQUOTAS_INCREASE_ON_CREATE_SERVICE_CODE` | Service Code for Service Quotas testing (submits support case). | +| `SERVICEQUOTAS_INCREASE_ON_CREATE_VALUE` | Value of quota increase for Service Quotas testing (submits support case). | +| `SES_DOMAIN_IDENTITY_ROOT_DOMAIN` | Root domain name of publicly accessible and Route 53 configurable domain for SES Domain Identity testing. | +| `SES_DEDICATED_IP` | Dedicated IP address for testing IP assignment with a "Standard" (non-managed) SES dedicated IP pool. | +| `SWF_DOMAIN_TESTING_ENABLED` | Enables SWF Domain testing (API does not support deletions). | +| `TEST_AWS_ORGANIZATION_ACCOUNT_EMAIL_DOMAIN` | Email address for Organizations Account testing. | +| `TEST_AWS_SES_VERIFIED_EMAIL_ARN` | Verified SES Email Identity for use in Cognito User Pool testing. | +| `TF_ACC` | Enables Go tests containing `resource.Test()` and `resource.ParallelTest()`. | +| `TF_ACC_ASSUME_ROLE_ARN` | Amazon Resource Name of existing IAM Role to use for limited permissions acceptance testing. | +| `TF_AWS_BEDROCK_OSS_COLLECTION_NAME` | Name of the OpenSearch Serverless collection to be used with an Amazon Bedrock Knowledge Base. | +| `TF_AWS_CONTROLTOWER_CONTROL_OU_NAME` | Organizational unit name to be targeted by the Control Tower control. | +| `TF_AWS_CONTROLTOWER_BASELINE_ENABLE_BASELINE_ARN` | Enable baseline ARN. | +| `TF_AWS_DATAEXCHANGE_DATA_SET_ID` | ID of DataExchange Data Set to use for testing. | +| `TF_AWS_LICENSE_MANAGER_GRANT_HOME_REGION` | Region where a License Manager license is imported. | +| `TF_AWS_LICENSE_MANAGER_GRANT_LICENSE_ARN` | ARN for a License Manager license imported into the current account. | +| `TF_AWS_LICENSE_MANAGER_GRANT_PRINCIPAL` | ARN of a principal to share the License Manager license with. Either a root user, Organization, or Organizational Unit. | +| `TF_AWS_QUICKSIGHT_IDC_GROUP` | Name of the IAM Identity Center Group to be assigned role membership. | +| `TF_TEST_CLOUDFRONT_RETAIN` | Flag to disable but dangle CloudFront Distributions during testing to reduce feedback time (must be manually destroyed afterwards). | +| `TF_TEST_ELASTICACHE_RESERVED_CACHE_NODE` | Flag to enable resource tests for ElastiCache reserved nodes. Set to `1` to run tests. | +| `TRUST_ANCHOR_CERTIFICATE` | Trust anchor certificate for KMS custom key store acceptance tests. | +| `VPC_NETWORK_INTERFACE_TEST_MULTIPLE_CARDS` | Flag to execute tests that enable to attach multiple network interfaces. | diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index c36091d4d7d0..cefaa5ba9bfd 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -32,6 +32,7 @@ func testAccBaseline_basic(t *testing.T) { var baseline types.EnabledBaselineDetails rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_controltower_baseline.test" + baselineARN := acctest.SkipIfEnvVarNotSet(t, "TF_AWS_CONTROLTOWER_BASELINE_ENABLE_BASELINE_ARN") resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -44,7 +45,7 @@ func testAccBaseline_basic(t *testing.T) { CheckDestroy: testAccCheckBaselineDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccBaselineConfig_basic(rName), + Config: testAccBaselineConfig_basic(rName, baselineARN), Check: resource.ComposeTestCheckFunc( testAccCheckBaselineExists(ctx, resourceName, &baseline), resource.TestCheckResourceAttr(resourceName, "baseline_version", "4.0"), @@ -73,6 +74,7 @@ func testAccBaseline_disappears(t *testing.T) { var baseline types.EnabledBaselineDetails rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) resourceName := "aws_controltower_baseline.test" + baselineARN := acctest.SkipIfEnvVarNotSet(t, "TF_AWS_CONTROLTOWER_BASELINE_ENABLE_BASELINE_ARN") resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -85,7 +87,7 @@ func testAccBaseline_disappears(t *testing.T) { CheckDestroy: testAccCheckBaselineDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccBaselineConfig_basic(rName), + Config: testAccBaselineConfig_basic(rName, baselineARN), Check: resource.ComposeTestCheckFunc( testAccCheckBaselineExists(ctx, resourceName, &baseline), acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfcontroltower.ResourceBaseline, resourceName), @@ -163,7 +165,7 @@ func testAccEnabledBaselinesPreCheck(ctx context.Context, t *testing.T) { // IdentityCenterEnabledBaselineArn needs to be updated based on user account to test // we can change it to data block when datasource is implemented. -func testAccBaselineConfig_basic(rName string) string { +func testAccBaselineConfig_basic(rName, baselineARN string) string { return fmt.Sprintf(` data "aws_partition" "current" {} data "aws_region" "current" {} @@ -182,11 +184,11 @@ resource "aws_controltower_baseline" "test" { target_identifier = aws_organizations_organizational_unit.test.arn parameters { key = "IdentityCenterEnabledBaselineArn" - value = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:enabledbaseline/XALULM96QHI525UOC" + value = %[2]q } depends_on = [ aws_organizations_organizational_unit.test ] } -`, rName) +`, rName, baselineARN) } From feb806ea5dea259ba3128b499ded92456dbd33b3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 10 Sep 2025 16:18:50 -0400 Subject: [PATCH 2030/2115] Fix yamllint '[new-line-at-end-of-file] no new line character at the end of file'. --- .ci/semgrep/pluginsdk/retry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/semgrep/pluginsdk/retry.yml b/.ci/semgrep/pluginsdk/retry.yml index 69459c208e0c..e17df0c4764c 100644 --- a/.ci/semgrep/pluginsdk/retry.yml +++ b/.ci/semgrep/pluginsdk/retry.yml @@ -15,4 +15,4 @@ rules: retry.NonRetryableError(...) - pattern: | sdkretry.NonRetryableError(...) - severity: WARNING \ No newline at end of file + severity: WARNING From b310725d3796ae8c7d34755804366ad5804667c2 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 15:23:44 -0500 Subject: [PATCH 2031/2115] add CHANGELOG entry --- .changelog/44228.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44228.txt diff --git a/.changelog/44228.txt b/.changelog/44228.txt new file mode 100644 index 000000000000..c02873d7eea8 --- /dev/null +++ b/.changelog/44228.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_secretsmanager_secret: Return diagnostic `warning` when remote policy is invalid +``` \ No newline at end of file From 2fd0ea8f04ce55f9524ff6b0e98717228ab9f65a Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 15:28:36 -0500 Subject: [PATCH 2032/2115] aws_controltower_baseline: add tags test --- .../service/controltower/baseline_test.go | 122 ++++++++++++++++++ .../service/controltower/controltower_test.go | 1 + 2 files changed, 123 insertions(+) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index cefaa5ba9bfd..31854e6aa4dc 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -98,6 +98,61 @@ func testAccBaseline_disappears(t *testing.T) { }) } +func testAccBaseline_tags(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var baseline types.EnabledBaselineDetails + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_controltower_baseline.test" + baselineARN := acctest.SkipIfEnvVarNotSet(t, "TF_AWS_CONTROLTOWER_BASELINE_ENABLE_BASELINE_ARN") + + resource.Test(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.ControlTowerEndpointID) + testAccEnabledBaselinesPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.ControlTowerServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBaselineDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBaselineConfig_tags1(rName, baselineARN, acctest.CtKey1, acctest.CtValue1), + Check: resource.ComposeTestCheckFunc( + testAccCheckBaselineExists(ctx, resourceName, &baseline), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccBaselineConfig_tags2(rName, baselineARN, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), + Check: resource.ComposeTestCheckFunc( + testAccCheckBaselineExists(ctx, resourceName, &baseline), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), + ), + }, + { + Config: testAccLandingZoneConfig_tags1(acctest.CtKey2, acctest.CtValue2), + Check: resource.ComposeTestCheckFunc( + testAccCheckBaselineExists(ctx, resourceName, &baseline), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), + resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), + ), + }, + }, + }) +} + func testAccCheckBaselineDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerClient(ctx) @@ -192,3 +247,70 @@ resource "aws_controltower_baseline" "test" { } `, rName, baselineARN) } + +func testAccBaselineConfig_tags1(rName, baselineARN, tagKey1, tagValue1 string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} +data "aws_region" "current" {} +data "aws_caller_identity" "current" {} + +data "aws_organizations_organization" "current" {} + +resource "aws_organizations_organizational_unit" "test" { + name = %[1]q + parent_id = data.aws_organizations_organization.current.roots[0].id +} + +resource "aws_controltower_baseline" "test" { + baseline_identifier = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}::baseline/17BSJV3IGJ2QSGA2" + baseline_version = "4.0" + target_identifier = aws_organizations_organizational_unit.test.arn + parameters { + key = "IdentityCenterEnabledBaselineArn" + value = %[2]q + } + + tags = { + %[3]q = %[4]q + } + + depends_on = [ + aws_organizations_organizational_unit.test + ] +} +`, rName, baselineARN, tagKey1, tagValue1) +} + +func testAccBaselineConfig_tags2(rName, baselineARN, tagKey1, tagValue1, tagKey2, tagValue2 string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} +data "aws_region" "current" {} +data "aws_caller_identity" "current" {} + +data "aws_organizations_organization" "current" {} + +resource "aws_organizations_organizational_unit" "test" { + name = %[1]q + parent_id = data.aws_organizations_organization.current.roots[0].id +} + +resource "aws_controltower_baseline" "test" { + baseline_identifier = "arn:${data.aws_partition.current.id}:controltower:${data.aws_region.current.region}::baseline/17BSJV3IGJ2QSGA2" + baseline_version = "4.0" + target_identifier = aws_organizations_organizational_unit.test.arn + parameters { + key = "IdentityCenterEnabledBaselineArn" + value = %[2]q + } + + tags = { + %[3]q = %[4]q + %[5]q = %[6]q + } + + depends_on = [ + aws_organizations_organizational_unit.test + ] +} +`, rName, baselineARN, tagKey1, tagValue1, tagKey2, tagValue2) +} diff --git a/internal/service/controltower/controltower_test.go b/internal/service/controltower/controltower_test.go index 02e3ea708678..57f6a09485f9 100644 --- a/internal/service/controltower/controltower_test.go +++ b/internal/service/controltower/controltower_test.go @@ -26,6 +26,7 @@ func TestAccControlTower_serial(t *testing.T) { "Baseline": { acctest.CtBasic: testAccBaseline_basic, acctest.CtDisappears: testAccBaseline_disappears, + "tags": testAccBaseline_tags, }, } From 273ba1230a546472ec3194557b15ec517206de91 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 10 Sep 2025 16:17:34 -0500 Subject: [PATCH 2033/2115] aws_secretsmanager_secret: only return if diagnostics have an error --- internal/service/secretsmanager/secret.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 0b3f5c593a88..0637722809e2 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -271,13 +271,18 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta any) d if err != nil { if strings.Contains(err.Error(), "contains invalid principals") { - d.Set(names.AttrPolicy, "") - return sdkdiag.AppendWarningf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) + diags = sdkdiag.AppendWarningf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) + } else { + diags = sdkdiag.AppendErrorf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) } + } + + if diags.HasError() { + return diags + } - return sdkdiag.AppendErrorf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) - } else if v := policy.ResourcePolicy; v != nil { - policyToSet, err := verify.PolicyToSet(d.Get(names.AttrPolicy).(string), aws.ToString(v)) + if policy != nil && policy.ResourcePolicy != nil { + policyToSet, err := verify.PolicyToSet(d.Get(names.AttrPolicy).(string), aws.ToString(policy.ResourcePolicy)) if err != nil { return sdkdiag.AppendFromErr(diags, err) } From 5e784170741a5601257241ed3b628057765a9551 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 13:58:01 +0900 Subject: [PATCH 2034/2115] Restore removed timeouts.read argument --- internal/service/servicecatalog/provisioned_product.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/servicecatalog/provisioned_product.go b/internal/service/servicecatalog/provisioned_product.go index 8551698fd9f8..7c3c831d87b0 100644 --- a/internal/service/servicecatalog/provisioned_product.go +++ b/internal/service/servicecatalog/provisioned_product.go @@ -46,6 +46,7 @@ func resourceProvisionedProduct() *schema.Resource { Timeouts: &schema.ResourceTimeout{ Create: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(10 * time.Minute), Update: schema.DefaultTimeout(30 * time.Minute), Delete: schema.DefaultTimeout(30 * time.Minute), }, From f6ef32e375b0d0ff2e2fdd8cc01fc7d57bf35ecf Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 19:20:59 +0900 Subject: [PATCH 2035/2115] add changelog --- .changelog/44238.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44238.txt diff --git a/.changelog/44238.txt b/.changelog/44238.txt new file mode 100644 index 000000000000..9fb84ac38c9a --- /dev/null +++ b/.changelog/44238.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_servicecatalog_provisioned_product: Restore `timeouts.read` arguments removed in v6.12.0 +``` From a2b21e94252f8025e7acf0297626666b54c51129 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:14:34 +0900 Subject: [PATCH 2036/2115] Implement billing_view_arn argument --- internal/service/budgets/budget.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/internal/service/budgets/budget.go b/internal/service/budgets/budget.go index 6e669eb80b9b..d480ae1094ff 100644 --- a/internal/service/budgets/budget.go +++ b/internal/service/budgets/budget.go @@ -95,6 +95,11 @@ func ResourceBudget() *schema.Resource { }, }, }, + "billing_view_arn": { + Type: schema.TypeString, + Optional: true, + ValidateFunc: verify.ValidARN, + }, "budget_type": { Type: schema.TypeString, Required: true, @@ -378,6 +383,7 @@ func resourceBudgetRead(ctx context.Context, d *schema.ResourceData, meta any) d } d.Set(names.AttrARN, arn.String()) d.Set("budget_type", budget.BudgetType) + d.Set("billing_view_arn", budget.BillingViewArn) if err := d.Set("cost_filter", convertCostFiltersToMap(budget.CostFilters)); err != nil { return sdkdiag.AppendErrorf(diags, "setting cost_filter: %s", err) @@ -881,6 +887,10 @@ func expandBudgetUnmarshal(d *schema.ResourceData) (*awstypes.Budget, error) { } } + if v, ok := d.GetOk("billing_view_arn"); ok { + budget.BillingViewArn = aws.String(v.(string)) + } + if v, ok := d.GetOk("cost_types"); ok && len(v.([]any)) > 0 && v.([]any)[0] != nil { budget.CostTypes = expandCostTypes(v.([]any)[0].(map[string]any)) } From ef3156d29605f6c87a36cd5bc9d133ca53eb4a05 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:14:58 +0900 Subject: [PATCH 2037/2115] Add an acceptance test for billing_view_arn argument --- internal/service/budgets/budget_test.go | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/internal/service/budgets/budget_test.go b/internal/service/budgets/budget_test.go index 1e4a093e3c71..402c47b17ae1 100644 --- a/internal/service/budgets/budget_test.go +++ b/internal/service/budgets/budget_test.go @@ -67,6 +67,7 @@ func TestAccBudgetsBudget_basic(t *testing.T) { testAccCheckBudgetExists(ctx, resourceName, &budget), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", fmt.Sprintf(`budget/%s`, rName)), + resource.TestCheckResourceAttr(resourceName, "billing_view_arn", ""), resource.TestCheckResourceAttr(resourceName, "budget_type", "RI_UTILIZATION"), resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "cost_filter.*", map[string]string{ @@ -508,6 +509,51 @@ func TestAccBudgetsBudget_plannedLimits(t *testing.T) { }) } +func TestAccBudgetsBudget_billingViewArn(t *testing.T) { + ctx := acctest.Context(t) + var budget awstypes.Budget + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_budgets_budget.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.BudgetsEndpointID) }, + ErrorCheck: acctest.ErrorCheck(t, names.BudgetsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckBudgetDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccBudgetConfig_billingViewArn(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckBudgetExists(ctx, resourceName, &budget), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", fmt.Sprintf(`budget/%s`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "billing_view_arn", "billing", "billingview/primary"), + resource.TestCheckResourceAttr(resourceName, "budget_type", "RI_UTILIZATION"), + resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "1"), + resource.TestCheckTypeSetElemNestedAttrs(resourceName, "cost_filter.*", map[string]string{ + names.AttrName: "Service", + "values.#": "1", + "values.0": "Amazon Redshift", + }), + resource.TestCheckResourceAttr(resourceName, "limit_amount", "100.0"), + resource.TestCheckResourceAttr(resourceName, "limit_unit", "PERCENTAGE"), + resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), + resource.TestCheckResourceAttr(resourceName, "notification.#", "0"), + resource.TestCheckResourceAttr(resourceName, "planned_limit.#", "0"), + resource.TestCheckResourceAttrSet(resourceName, "time_period_end"), + resource.TestCheckResourceAttrSet(resourceName, "time_period_start"), + resource.TestCheckResourceAttr(resourceName, "time_unit", "QUARTERLY"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccCheckBudgetExists(ctx context.Context, resourceName string, v *awstypes.Budget) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[resourceName] @@ -798,6 +844,29 @@ resource "aws_budgets_budget" "test" { `, rName, config) } +func testAccBudgetConfig_billingViewArn(rName string) string { + return fmt.Sprintf(` +data "aws_partition" "current" {} +data "aws_caller_identity" "current" {} + +resource "aws_budgets_budget" "test" { + name = %[1]q + budget_type = "RI_UTILIZATION" + limit_amount = "100.0" + limit_unit = "PERCENTAGE" + time_unit = "QUARTERLY" + + cost_filter { + name = "Service" + values = ["Amazon Redshift"] + } + + billing_view_arn = "arn:${data.aws_partition.current.partition}:billing::${data.aws_caller_identity.current.account_id}:billingview/primary" + +} +`, rName) +} + func generateStartTimes(resourceName, amount string, now time.Time) (string, []resource.TestCheckFunc) { startTimes := make([]time.Time, 12) From da4c8e20d6a8738e41ee138bcc7a1ab130fc8cbc Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:20:48 +0900 Subject: [PATCH 2038/2115] Implement billing_view_arn for the data source --- internal/service/budgets/budget_data_source.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/service/budgets/budget_data_source.go b/internal/service/budgets/budget_data_source.go index 3f3203988033..b1026ad6168d 100644 --- a/internal/service/budgets/budget_data_source.go +++ b/internal/service/budgets/budget_data_source.go @@ -68,6 +68,10 @@ func DataSourceBudget() *schema.Resource { }, }, }, + "billing_view_arn": { + Type: schema.TypeString, + Computed: true, + }, "budget_type": { Type: schema.TypeString, Computed: true, @@ -299,6 +303,8 @@ func dataSourceBudgetRead(ctx context.Context, d *schema.ResourceData, meta any) } d.Set(names.AttrARN, arn.String()) + d.Set("billing_view_arn", budget.BillingViewArn) + d.Set("budget_type", budget.BudgetType) if err := d.Set("budget_limit", flattenSpend(budget.BudgetLimit)); err != nil { From 19117dfebbd3ef09632b812c33c074933a2c9793 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:21:05 +0900 Subject: [PATCH 2039/2115] Add billing_view_arn check to the data source acceptance test --- internal/service/budgets/budget_data_source_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/budgets/budget_data_source_test.go b/internal/service/budgets/budget_data_source_test.go index e6f61288df29..80c078999618 100644 --- a/internal/service/budgets/budget_data_source_test.go +++ b/internal/service/budgets/budget_data_source_test.go @@ -41,6 +41,7 @@ func TestAccBudgetsBudgetDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "budget_limit.#"), resource.TestCheckResourceAttrPair(dataSourceName, acctest.CtTagsPercent, resourceName, acctest.CtTagsPercent), resource.TestCheckResourceAttrPair(dataSourceName, acctest.CtTagsKey1, resourceName, acctest.CtTagsKey1), + resource.TestCheckResourceAttrPair(dataSourceName, "billing_view_arn", resourceName, "billing_view_arn"), ), }, }, From 13156cb5fb162c42b669e98b82b031d4d66d6eea Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:22:59 +0900 Subject: [PATCH 2040/2115] Update the document for the resource --- website/docs/r/budgets_budget.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/r/budgets_budget.html.markdown b/website/docs/r/budgets_budget.html.markdown index 32f9808f3b0b..8f32a2e363ef 100644 --- a/website/docs/r/budgets_budget.html.markdown +++ b/website/docs/r/budgets_budget.html.markdown @@ -184,6 +184,7 @@ The following arguments are optional: * `account_id` - (Optional) The ID of the target account for budget. Will use current user's account_id by default if omitted. * `auto_adjust_data` - (Optional) Object containing [AutoAdjustData](#auto-adjust-data) which determines the budget amount for an auto-adjusting budget. +* `billing_view_arn` - (Optional) ARN of the billing view. * `cost_filter` - (Optional) A list of [CostFilter](#cost-filter) name/values pair to apply to budget. * `cost_types` - (Optional) Object containing [CostTypes](#cost-types) The types of cost included in a budget, such as tax and subscriptions. * `limit_amount` - (Optional) The amount of cost or usage being measured for a budget. From 7649696ec4d5f4d7394736709fc2e3e1e2dbcc43 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:23:14 +0900 Subject: [PATCH 2041/2115] Update the documentation for the data source --- website/docs/d/budgets_budget.html.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/website/docs/d/budgets_budget.html.markdown b/website/docs/d/budgets_budget.html.markdown index 239f1aa32c78..1cd53de20e18 100644 --- a/website/docs/d/budgets_budget.html.markdown +++ b/website/docs/d/budgets_budget.html.markdown @@ -36,6 +36,7 @@ The following arguments are optional: This data source exports the following attributes in addition to the arguments above: * `auto_adjust_data` - Object containing [AutoAdjustData] which determines the budget amount for an auto-adjusting budget. +* `billing_view_arn` - ARN of the billing view. * `budget_exceeded` - Boolean indicating whether this budget has been exceeded. * `budget_limit` - The total amount of cost, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage that you want to track with your budget. Contains object [Spend](#spend). * `budget_type` - Whether this budget tracks monetary cost or usage. From 81c2b79f9b6ae4d11207655a64e86870b0e457f1 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:29:56 +0900 Subject: [PATCH 2042/2115] add changelog --- .changelog/44241.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44241.txt diff --git a/.changelog/44241.txt b/.changelog/44241.txt new file mode 100644 index 000000000000..8b4c5e02f132 --- /dev/null +++ b/.changelog/44241.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_budgets_budget: Add `billing_view_arn` argument +``` From 2fbc72927eea40b1881f8162da1d9a80e849eeb5 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 20:48:33 +0900 Subject: [PATCH 2043/2115] Fix to follow the CAPS rule --- internal/service/budgets/budget_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/budgets/budget_test.go b/internal/service/budgets/budget_test.go index 402c47b17ae1..01a6c01b6be7 100644 --- a/internal/service/budgets/budget_test.go +++ b/internal/service/budgets/budget_test.go @@ -509,7 +509,7 @@ func TestAccBudgetsBudget_plannedLimits(t *testing.T) { }) } -func TestAccBudgetsBudget_billingViewArn(t *testing.T) { +func TestAccBudgetsBudget_billingViewARN(t *testing.T) { ctx := acctest.Context(t) var budget awstypes.Budget rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) @@ -522,7 +522,7 @@ func TestAccBudgetsBudget_billingViewArn(t *testing.T) { CheckDestroy: testAccCheckBudgetDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccBudgetConfig_billingViewArn(rName), + Config: testAccBudgetConfig_billingViewARN(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBudgetExists(ctx, resourceName, &budget), acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), @@ -844,7 +844,7 @@ resource "aws_budgets_budget" "test" { `, rName, config) } -func testAccBudgetConfig_billingViewArn(rName string) string { +func testAccBudgetConfig_billingViewARN(rName string) string { return fmt.Sprintf(` data "aws_partition" "current" {} data "aws_caller_identity" "current" {} From 920ae8bfde73e1c26d48c745008c67813674846d Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 21:45:24 +0900 Subject: [PATCH 2044/2115] Implement retry_config configuration block --- internal/service/synthetics/canary.go | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 3dea6bc62376..1cc095dcb73b 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -195,6 +195,21 @@ func ResourceCanary() *schema.Resource { return (new == "rate(0 minute)" || new == "rate(0 minutes)") && old == "rate(0 hour)" }, }, + "retry_config": { + Type: schema.TypeList, + MaxItems: 1, + Optional: true, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "max_retries": { + Type: schema.TypeInt, + Required: true, + ValidateFunc: validation.IntBetween(0, 2), + }, + }, + }, + }, }, }, }, @@ -687,9 +702,26 @@ func expandCanarySchedule(l []any) *awstypes.CanaryScheduleInput { codeConfig.DurationInSeconds = aws.Int64(int64(v.(int))) } + if v, ok := m["retry_config"]; ok { + codeConfig.RetryConfig = expandCanaryScheduleRetryConfig(v.([]any)) + } + return codeConfig } +func expandCanaryScheduleRetryConfig(l []any) *awstypes.RetryConfigInput { + if len(l) == 0 || l[0] == nil { + return nil + } + m := l[0].(map[string]any) + + config := &awstypes.RetryConfigInput{ + MaxRetries: aws.Int32(int32(m["max_retries"].(int))), + } + + return config +} + func flattenCanarySchedule(canarySchedule *awstypes.CanaryScheduleOutput) []any { if canarySchedule == nil { return []any{} @@ -700,6 +732,21 @@ func flattenCanarySchedule(canarySchedule *awstypes.CanaryScheduleOutput) []any "duration_in_seconds": aws.ToInt64(canarySchedule.DurationInSeconds), } + if canarySchedule.RetryConfig != nil { + m["retry_config"] = flattenCanaryScheduleRetryConfig(canarySchedule.RetryConfig) + } + + return []any{m} +} + +func flattenCanaryScheduleRetryConfig(retryConfig *awstypes.RetryConfigOutput) []any { + if retryConfig == nil { + return []any{} + } + m := map[string]any{ + "max_retries": aws.ToInt32(retryConfig.MaxRetries), + } + return []any{m} } From 0295532f0838590cec4e913236a0eaeda64c3602 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 21:46:05 +0900 Subject: [PATCH 2045/2115] Add an acceptance test for retry_config --- internal/service/synthetics/canary_test.go | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index c436b1611fd2..7c8bc6f00734 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -50,6 +50,8 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.0.max_retries", "0"), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), //acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), @@ -677,6 +679,59 @@ func TestAccSyntheticsCanary_runConfigEphemeralStorage(t *testing.T) { }) } +func TestAccSyntheticsCanary_scheduleRetryConfig(t *testing.T) { + ctx := acctest.Context(t) + var conf1, conf2 awstypes.Canary + rName := fmt.Sprintf("tf-acc-test-%s", sdkacctest.RandString(8)) + resourceName := "aws_synthetics_canary.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SyntheticsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckCanaryDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccCanaryConfig_scheduleRetryConfig(rName, 1), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf1), + resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.0.max_retries", "1"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"zip_file", "start_canary", "delete_lambda"}, + }, + { + Config: testAccCanaryConfig_scheduleRetryConfig(rName, 2), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf2), + resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.0.max_retries", "2"), + testAccCheckCanaryIsUpdated(&conf1, &conf2), + ), + }, + { + Config: testAccCanaryConfig_basic(rName), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckCanaryExists(ctx, resourceName, &conf2), + resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.#", "1"), + resource.TestCheckResourceAttr(resourceName, "schedule.0.retry_config.0.max_retries", "2"), // unchanged + ), + }, + }, + }) +} + func TestAccSyntheticsCanary_tags(t *testing.T) { ctx := acctest.Context(t) var conf awstypes.Canary @@ -1489,6 +1544,35 @@ resource "aws_synthetics_canary" "test" { `, rName, ephemeralStorage)) } +func testAccCanaryConfig_scheduleRetryConfig(rName string, maxRetries int) string { + return acctest.ConfigCompose( + testAccCanaryConfig_base(rName), + fmt.Sprintf(` +resource "aws_synthetics_canary" "test" { + # Must have bucket versioning enabled first + depends_on = [aws_s3_bucket_versioning.test, aws_iam_role.test, aws_iam_role_policy.test] + + name = %[1]q + artifact_s3_location = "s3://${aws_s3_bucket.test.bucket}/" + execution_role_arn = aws_iam_role.test.arn + handler = "exports.handler" + zip_file = "test-fixtures/lambdatest.zip" + runtime_version = data.aws_synthetics_runtime_version.test.version_name + delete_lambda = true + + schedule { + expression = "rate(0 minute)" + retry_config { + max_retries = %[2]d + } + } + run_config { + timeout_in_seconds = 60 + } +} +`, rName, maxRetries)) +} + func testAccCanaryConfig_tags1(rName, tagKey1, tagValue1 string) string { return acctest.ConfigCompose( testAccCanaryConfig_base(rName), From 25d4984b089bc829886139dab9ed4cb0137100f3 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 11 Sep 2025 12:48:34 +0000 Subject: [PATCH 2046/2115] Update CHANGELOG.md for #44230 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb46c28dc09f..be436bc9cc65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ BUG FIXES: * resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) * resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) * resource/aws_s3_bucket_lifecycle_configuration: Ignore `MethodNotAllowed` errors when deleting non-existent lifecycle configurations ([#44189](https://github.com/hashicorp/terraform-provider-aws/issues/44189)) +* resource/aws_servicecatalog_provisioned_product: Restore `timeouts.read` arguments removed in v6.12.0 ([#44238](https://github.com/hashicorp/terraform-provider-aws/issues/44238)) ## 6.12.0 (September 4, 2025) From d6b58dcb0008804f02b218e6b29ea23f40b47e09 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 11 Sep 2025 07:57:49 -0500 Subject: [PATCH 2047/2115] aws_controltower_baseline: use correct import check values --- internal/service/controltower/baseline_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index 31854e6aa4dc..a10ef6011ad4 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -128,9 +128,12 @@ func testAccBaseline_tags(t *testing.T) { ), }, { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, + ResourceName: resourceName, + ImportState: true, + ImportStateIdFunc: acctest.AttrImportStateIdFunc(resourceName, names.AttrARN), + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: names.AttrARN, + ImportStateVerifyIgnore: []string{"operation_identifier"}, }, { Config: testAccBaselineConfig_tags2(rName, baselineARN, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), From b1b4d1e9ee8d0ddf0655ed954f71c3eb5ee0ed91 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 21:58:47 +0900 Subject: [PATCH 2048/2115] docs: add description of retry_config --- website/docs/r/synthetics_canary.html.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/docs/r/synthetics_canary.html.markdown b/website/docs/r/synthetics_canary.html.markdown index ebb1c6c5cb0a..d7f01d278105 100644 --- a/website/docs/r/synthetics_canary.html.markdown +++ b/website/docs/r/synthetics_canary.html.markdown @@ -69,6 +69,11 @@ The following arguments are optional: * `expression` - (Required) Rate expression or cron expression that defines how often the canary is to run. For rate expression, the syntax is `rate(number unit)`. _unit_ can be `minute`, `minutes`, or `hour`. For cron expression, the syntax is `cron(expression)`. For more information about the syntax for cron expressions, see [Scheduling canary runs using cron](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_cron.html). * `duration_in_seconds` - (Optional) Duration in seconds, for the canary to continue making regular runs according to the schedule in the Expression value. +* `retry_config` - (Optional) Configuration block for canary retries. Detailed [below](#retry_config). + +### retry_config + +* `max_retries` - (Required) Maximum number of retries. The value must be less than or equal to `2`. If `max_retries` is `2`, `run_config.timeout_in_seconds` should be less than 600 seconds. Defaults to `0`. ### run_config From 26a61314042f5b5883b63f90fe3b1fa7f95f485b Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 21:59:17 +0900 Subject: [PATCH 2049/2115] docs: alphabetize and add links to subsections --- website/docs/r/synthetics_canary.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/synthetics_canary.html.markdown b/website/docs/r/synthetics_canary.html.markdown index d7f01d278105..0a8ea30102f2 100644 --- a/website/docs/r/synthetics_canary.html.markdown +++ b/website/docs/r/synthetics_canary.html.markdown @@ -38,22 +38,22 @@ The following arguments are required: * `handler` - (Required) Entry point to use for the source code when running the canary. This value must end with the string `.handler` . * `name` - (Required) Name for this canary. Has a maximum length of 255 characters. Valid characters are lowercase alphanumeric, hyphen, or underscore. * `runtime_version` - (Required) Runtime version to use for the canary. Versions change often so consult the [Amazon CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_Library.html) for the latest valid versions. Values include `syn-python-selenium-1.0`, `syn-nodejs-puppeteer-3.0`, `syn-nodejs-2.2`, `syn-nodejs-2.1`, `syn-nodejs-2.0`, and `syn-1.0`. -* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed below. +* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed [below](#schedule). The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `artifact_config` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). * `delete_lambda` - (Optional) Specifies whether to also delete the Lambda functions and layers used by this canary. The default is `false`. -* `vpc_config` - (Optional) Configuration block. Detailed below. * `failure_retention_period` - (Optional) Number of days to retain data about failed runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. -* `run_config` - (Optional) Configuration block for individual canary runs. Detailed below. +* `run_config` - (Optional) Configuration block for individual canary runs. Detailed [below](#run_config). * `s3_bucket` - (Optional) Full bucket name which is used if your canary script is located in S3. The bucket must already exist. **Conflicts with `zip_file`.** * `s3_key` - (Optional) S3 key of your script. **Conflicts with `zip_file`.** * `s3_version` - (Optional) S3 version ID of your script. **Conflicts with `zip_file`.** * `start_canary` - (Optional) Whether to run or stop the canary. * `success_retention_period` - (Optional) Number of days to retain data about successful runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -* `artifact_config` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). +* `vpc_config` - (Optional) Configuration block. Detailed [below](#vpc_config). * `zip_file` - (Optional) ZIP file that contains the script, if you input your canary script directly into the canary instead of referring to an S3 location. It can be up to 225KB. **Conflicts with `s3_bucket`, `s3_key`, and `s3_version`.** ### artifact_config From e155b12e1c3d54c0e29f5254dc65aaeb2c3a3a6e Mon Sep 17 00:00:00 2001 From: Tabito Hara <105637744+tabito-hara@users.noreply.github.com> Date: Thu, 11 Sep 2025 22:03:25 +0900 Subject: [PATCH 2050/2115] Fix to include description of the data source --- .changelog/44241.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.changelog/44241.txt b/.changelog/44241.txt index 8b4c5e02f132..74d29b678a9f 100644 --- a/.changelog/44241.txt +++ b/.changelog/44241.txt @@ -1,3 +1,7 @@ ```release-note:enhancement resource/aws_budgets_budget: Add `billing_view_arn` argument ``` + +```release-note:enhancement +data-source/aws_budgets_budget: Add `billing_view_arn` attribute +``` From fbe9811a59ce4d34e1f0653460bc49b032c41b21 Mon Sep 17 00:00:00 2001 From: tabito Date: Thu, 11 Sep 2025 22:17:54 +0900 Subject: [PATCH 2051/2115] add changelog --- .changelog/44244.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/44244.txt diff --git a/.changelog/44244.txt b/.changelog/44244.txt new file mode 100644 index 000000000000..5f4a7425e5e7 --- /dev/null +++ b/.changelog/44244.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_synthetics_canary: Add `schedule.retry_config` configuration block +``` From 4c18c94e05b38785f849a781756f5bd1943a5c25 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 11 Sep 2025 09:28:28 -0500 Subject: [PATCH 2052/2115] Update secret.go Co-authored-by: Jared Baker --- internal/service/secretsmanager/secret.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/internal/service/secretsmanager/secret.go b/internal/service/secretsmanager/secret.go index 0637722809e2..ae18e7916300 100644 --- a/internal/service/secretsmanager/secret.go +++ b/internal/service/secretsmanager/secret.go @@ -273,14 +273,10 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta any) d if strings.Contains(err.Error(), "contains invalid principals") { diags = sdkdiag.AppendWarningf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) } else { - diags = sdkdiag.AppendErrorf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) + return sdkdiag.AppendErrorf(diags, "reading Secrets Manager Secret (%s) policy: %s", d.Id(), err) } } - if diags.HasError() { - return diags - } - if policy != nil && policy.ResourcePolicy != nil { policyToSet, err := verify.PolicyToSet(d.Get(names.AttrPolicy).(string), aws.ToString(policy.ResourcePolicy)) if err != nil { From a99e6beeb07f0d7cf15d25d4db8e24e1e8aab81a Mon Sep 17 00:00:00 2001 From: Loren Gordon <8457307+lorengordon@users.noreply.github.com> Date: Mon, 5 May 2025 09:44:13 -0700 Subject: [PATCH 2053/2115] r/aws_eks_cluster: Supports null `compute_config.node_role_arn` when disabling auto mode or built-in node pools --- .changelog/42483.txt | 3 +++ internal/service/eks/cluster.go | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 .changelog/42483.txt diff --git a/.changelog/42483.txt b/.changelog/42483.txt new file mode 100644 index 000000000000..70885cdcab21 --- /dev/null +++ b/.changelog/42483.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_eks_cluster: Supports null `compute_config.node_role_arn` when disabling auto mode or built-in node pools +``` diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index 1c547807b444..49b43f0f0123 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -74,6 +74,18 @@ func resourceCluster() *schema.Resource { oldRoleARN := aws.ToString(oldComputeConfig.NodeRoleArn) newRoleARN := aws.ToString(newComputeConfig.NodeRoleArn) + newComputeConfigEnabled := aws.ToBool(newComputeConfig.Enabled) + + // Do not force new if auto mode is disabled in new config and role ARN is unset + if !newComputeConfigEnabled && newRoleARN == "" { + return nil + } + + // Do not force new if built-in node pools are zeroed in new config and role ARN is unset + if len(newComputeConfig.NodePools) == 0 && newRoleARN == "" { + return nil + } + // only force new if an existing role has changed, not if a new role is added if oldRoleARN != "" && oldRoleARN != newRoleARN { if err := rd.ForceNew("compute_config.0.node_role_arn"); err != nil { From 6770940910e49970acb9b5e52cd5fe354bfab56a Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 11 Sep 2025 10:59:55 -0500 Subject: [PATCH 2054/2115] aws_controltower_baseline: set plan to previous value on tags update --- internal/service/controltower/baseline.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index 65d467c0a633..cf5b78240b7a 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -255,6 +255,10 @@ func (r *resourceBaseline) Update(ctx context.Context, request resource.UpdateRe } } + if plan.OperationIdentifier.IsNull() || plan.BaselineIdentifier.IsUnknown() { + plan.OperationIdentifier = state.OperationIdentifier + } + response.Diagnostics.Append(response.State.Set(ctx, &plan)...) } From dcb6a7416616e6018658cf8661121ad8af08b538 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 11 Sep 2025 16:09:01 +0000 Subject: [PATCH 2055/2115] Update CHANGELOG.md for #44228 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be436bc9cc65..bde99db7ce86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ENHANCEMENTS: +* data-source/aws_budgets_budget: Add `billing_view_arn` attribute ([#44241](https://github.com/hashicorp/terraform-provider-aws/issues/44241)) * data-source/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` attributes ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) * data-source/aws_elastic_beanstalk_hosted_zone: Add hosted zone IDs for `ap-southeast-5`, `ap-southeast-7`, `eu-south-2`, and `me-central-1` AWS Regions ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) * data-source/aws_elb_hosted_zone_id: Add hosted zone ID for `ap-southeast-6` AWS Region ([#44132](https://github.com/hashicorp/terraform-provider-aws/issues/44132)) @@ -11,6 +12,7 @@ ENHANCEMENTS: * resource/aws_appautoscaling_policy: Add plan-time validation of `policy_type` ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) * resource/aws_appautoscaling_policy: Add plan-time validation of `step_scaling_policy_configuration.adjustment_type` and `step_scaling_policy_configuration.metric_aggregation_type` ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) * resource/aws_bedrock_guardrail: Add `input_action`, `output_action`, `input_enabled`, and `output_enabled` arguments to `word_policy_config.managed_word_lists_config` and `word_policy_config.words_config` configuration blocks ([#44224](https://github.com/hashicorp/terraform-provider-aws/issues/44224)) +* resource/aws_budgets_budget: Add `billing_view_arn` argument ([#44241](https://github.com/hashicorp/terraform-provider-aws/issues/44241)) * resource/aws_cloudfront_distribution: Add `origin.response_completion_timeout` argument ([#44163](https://github.com/hashicorp/terraform-provider-aws/issues/44163)) * resource/aws_codebuild_webhook: Add `pull_request_build_policy` configuration block ([#44201](https://github.com/hashicorp/terraform-provider-aws/issues/44201)) * resource/aws_dynamodb_table: Add `warm_throughput` and `global_secondary_index.warm_throughput` arguments ([#41308](https://github.com/hashicorp/terraform-provider-aws/issues/41308)) @@ -33,6 +35,7 @@ BUG FIXES: * resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) * resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) * resource/aws_s3_bucket_lifecycle_configuration: Ignore `MethodNotAllowed` errors when deleting non-existent lifecycle configurations ([#44189](https://github.com/hashicorp/terraform-provider-aws/issues/44189)) +* resource/aws_secretsmanager_secret: Return diagnostic `warning` when remote policy is invalid ([#44228](https://github.com/hashicorp/terraform-provider-aws/issues/44228)) * resource/aws_servicecatalog_provisioned_product: Restore `timeouts.read` arguments removed in v6.12.0 ([#44238](https://github.com/hashicorp/terraform-provider-aws/issues/44238)) ## 6.12.0 (September 4, 2025) From 613d95a4b231e59c258f890501326dd9953ff7e4 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 11 Sep 2025 12:29:17 -0500 Subject: [PATCH 2056/2115] aws_controltower_baseline: usestateforunknown --- internal/service/controltower/baseline.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/internal/service/controltower/baseline.go b/internal/service/controltower/baseline.go index cf5b78240b7a..570e99dc4bd9 100644 --- a/internal/service/controltower/baseline.go +++ b/internal/service/controltower/baseline.go @@ -74,6 +74,9 @@ func (r *resourceBaseline) Schema(ctx context.Context, _ resource.SchemaRequest, }, "operation_identifier": schema.StringAttribute{ Computed: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.UseStateForUnknown(), + }, }, names.AttrTags: tftags.TagsAttribute(), names.AttrTagsAll: tftags.TagsAttributeComputedOnly(), @@ -255,10 +258,6 @@ func (r *resourceBaseline) Update(ctx context.Context, request resource.UpdateRe } } - if plan.OperationIdentifier.IsNull() || plan.BaselineIdentifier.IsUnknown() { - plan.OperationIdentifier = state.OperationIdentifier - } - response.Diagnostics.Append(response.State.Set(ctx, &plan)...) } From 240342effb6bf8ace8db09fb1e63601f36f677c2 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 11 Sep 2025 17:37:03 +0000 Subject: [PATCH 2057/2115] Update CHANGELOG.md (Manual Trigger) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bde99db7ce86..198ddbfca1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ ENHANCEMENTS: * resource/aws_networkmanager_vpc_attachment: Change `options` to Optional and Computed ([#43742](https://github.com/hashicorp/terraform-provider-aws/issues/43742)) * resource/aws_opensearch_package: Add `engine_version` argument ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) * resource/aws_opensearch_package: Add waiter to ensure package validation completes ([#44155](https://github.com/hashicorp/terraform-provider-aws/issues/44155)) +* resource/aws_synthetics_canary: Add `schedule.retry_config` configuration block ([#44244](https://github.com/hashicorp/terraform-provider-aws/issues/44244)) * resource/aws_vpc_endpoint: Add resource identity support ([#44194](https://github.com/hashicorp/terraform-provider-aws/issues/44194)) * resource/aws_vpc_security_group_egress_rule: Add resource identity support ([#44198](https://github.com/hashicorp/terraform-provider-aws/issues/44198)) * resource/aws_vpc_security_group_ingress_rule: Add resource identity support ([#44198](https://github.com/hashicorp/terraform-provider-aws/issues/44198)) @@ -31,6 +32,7 @@ BUG FIXES: * resource/aws_appautoscaling_policy: Fix `interface conversion: interface {} is nil, not map[string]interface {}` panics when `step_scaling_policy_configuration` is empty ([#44211](https://github.com/hashicorp/terraform-provider-aws/issues/44211)) * resource/aws_cognito_managed_login_branding: Fix `reading Cognito Managed Login Branding by client ... couldn't find resource` errors when a user pool contains multiple client apps ([#44204](https://github.com/hashicorp/terraform-provider-aws/issues/44204)) +* resource/aws_eks_cluster: Supports null `compute_config.node_role_arn` when disabling auto mode or built-in node pools ([#42483](https://github.com/hashicorp/terraform-provider-aws/issues/42483)) * resource/aws_flow_log: Fix `Error decoding ... from prior state: unsupported attribute "log_group_name"` errors when upgrading from a pre-v6.0.0 provider version ([#44191](https://github.com/hashicorp/terraform-provider-aws/issues/44191)) * resource/aws_launch_template: Fix `Error decoding ... from prior state: unsupported attribute "elastic_gpu_specifications"` errors when upgrading from a pre-v6.0.0 provider version ([#44195](https://github.com/hashicorp/terraform-provider-aws/issues/44195)) * resource/aws_rds_cluster_role_association: Make `feature_name` optional ([#44143](https://github.com/hashicorp/terraform-provider-aws/issues/44143)) From 2f0bf48c5f143d7e9a07ae0efef17d1b09f9d10c Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Thu, 11 Sep 2025 13:01:19 -0500 Subject: [PATCH 2058/2115] prep changelog and version for release (#44253) --- CHANGELOG.md | 2 +- version/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 198ddbfca1ef..f7ef79f2db51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 6.13.0 (Unreleased) +## 6.13.0 (September 11, 2025) ENHANCEMENTS: diff --git a/version/VERSION b/version/VERSION index 5c3f3640cc97..477ec2405b51 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.12.1 \ No newline at end of file +6.13.0 \ No newline at end of file From 0246ccac2ef007c14de38b419462b7bbe5344386 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:02:07 -0400 Subject: [PATCH 2059/2115] Bumped product version to 6.13.1. --- version/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/VERSION b/version/VERSION index 477ec2405b51..e2983690bef3 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -6.13.0 \ No newline at end of file +6.13.1 \ No newline at end of file From 8ae3445795f61e14346c2394c43013428284c151 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 11 Sep 2025 19:03:59 +0000 Subject: [PATCH 2060/2115] Add changelog entry for v6.14.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7ef79f2db51..71b2ca226601 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 6.14.0 (Unreleased) + ## 6.13.0 (September 11, 2025) ENHANCEMENTS: From 55ebc2cd84ec143426de53d0774e3c374225d2be Mon Sep 17 00:00:00 2001 From: Sasi Date: Thu, 11 Sep 2025 15:41:19 -0400 Subject: [PATCH 2061/2115] fix: corrected tags testcase --- internal/service/controltower/baseline_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/controltower/baseline_test.go b/internal/service/controltower/baseline_test.go index a10ef6011ad4..8fb79dd60a3f 100644 --- a/internal/service/controltower/baseline_test.go +++ b/internal/service/controltower/baseline_test.go @@ -145,7 +145,7 @@ func testAccBaseline_tags(t *testing.T) { ), }, { - Config: testAccLandingZoneConfig_tags1(acctest.CtKey2, acctest.CtValue2), + Config: testAccBaselineConfig_tags1(rName, baselineARN, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckBaselineExists(ctx, resourceName, &baseline), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), From 7b22fb5cc3a9f5ddd73951e82e8807e209a57ea2 Mon Sep 17 00:00:00 2001 From: Asim Date: Fri, 12 Sep 2025 12:21:15 +0100 Subject: [PATCH 2062/2115] Maintenance Window made mandatory. --- internal/service/odb/cloud_exadata_infrastructure.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/odb/cloud_exadata_infrastructure.go b/internal/service/odb/cloud_exadata_infrastructure.go index a336b7978672..230212d0b3de 100644 --- a/internal/service/odb/cloud_exadata_infrastructure.go +++ b/internal/service/odb/cloud_exadata_infrastructure.go @@ -267,7 +267,7 @@ func (r *resourceCloudExadataInfrastructure) Schema(ctx context.Context, req res CustomType: fwtypes.NewListNestedObjectTypeOf[cloudExadataInfraMaintenanceWindowResourceModel](ctx), Validators: []validator.List{ listvalidator.SizeAtMost(1), - listvalidator.SizeAtLeast(1), + listvalidator.IsRequired(), }, Description: " The scheduling details for the maintenance window. Patching and system updates take place during the maintenance window ", NestedObject: schema.NestedBlockObject{ From a6f9d9c204057fe4aad4166510643ac5080414fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:05:02 -0400 Subject: [PATCH 2063/2115] build(deps): bump golang.org/x/tools from 0.36.0 to 0.37.0 (#44258) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.36.0 to 0.37.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 891af8729c4b..ab9e57bb3ebd 100644 --- a/go.mod +++ b/go.mod @@ -312,7 +312,7 @@ require ( github.com/shopspring/decimal v1.4.0 golang.org/x/crypto v0.42.0 golang.org/x/text v0.29.0 - golang.org/x/tools v0.36.0 + golang.org/x/tools v0.37.0 gopkg.in/dnaeon/go-vcr.v4 v4.0.5 ) @@ -375,8 +375,8 @@ require ( go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.36.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/go.sum b/go.sum index 92ce8e82f3c7..f7c4de0456dc 100644 --- a/go.sum +++ b/go.sum @@ -814,15 +814,15 @@ golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA= golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -857,8 +857,8 @@ golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= From 02ae0c1f09fc46b12b653dbb80f11228c16ea806 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:05:51 -0400 Subject: [PATCH 2064/2115] build(deps): bump golang.org/x/tools from 0.36.0 to 0.37.0 in /.ci/tools (#44235) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.36.0 to 0.37.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .ci/tools/go.mod | 16 ++++++++-------- .ci/tools/go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci/tools/go.mod b/.ci/tools/go.mod index 7fa09a7607f5..b075bdd7bd94 100644 --- a/.ci/tools/go.mod +++ b/.ci/tools/go.mod @@ -12,7 +12,7 @@ require ( github.com/pavius/impi v0.0.3 github.com/rhysd/actionlint v1.7.7 github.com/terraform-linters/tflint v0.58.1 - golang.org/x/tools v0.36.0 + golang.org/x/tools v0.37.0 mvdan.cc/gofumpt v0.9.1 ) @@ -372,16 +372,16 @@ require ( go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.41.0 // indirect + golang.org/x/crypto v0.42.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.35.0 // indirect - golang.org/x/term v0.34.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/term v0.35.0 // indirect + golang.org/x/text v0.29.0 // indirect golang.org/x/time v0.12.0 // indirect google.golang.org/api v0.242.0 // indirect google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect diff --git a/.ci/tools/go.sum b/.ci/tools/go.sum index c52fea5f710a..24f84517c275 100644 --- a/.ci/tools/go.sum +++ b/.ci/tools/go.sum @@ -2051,8 +2051,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2121,8 +2121,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2192,8 +2192,8 @@ golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2247,8 +2247,8 @@ golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2360,8 +2360,8 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -2377,8 +2377,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= -golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4= -golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw= +golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= +golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2400,8 +2400,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2485,8 +2485,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM= golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM= From 875416d1da34ff33013594949a4a82ce27caad51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:06:44 -0400 Subject: [PATCH 2065/2115] build(deps): bump golang.org/x/tools in /.ci/providerlint (#44234) Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.36.0 to 0.37.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-version: 0.37.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .ci/providerlint/go.mod | 14 +++++++------- .ci/providerlint/go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.ci/providerlint/go.mod b/.ci/providerlint/go.mod index 328a1384f71e..18463cd78e6b 100644 --- a/.ci/providerlint/go.mod +++ b/.ci/providerlint/go.mod @@ -6,7 +6,7 @@ require ( github.com/bflad/tfproviderlint v0.31.0 github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66 github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 - golang.org/x/tools v0.36.0 + golang.org/x/tools v0.37.0 ) require ( @@ -54,12 +54,12 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.16.2 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect - golang.org/x/crypto v0.41.0 // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.35.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/crypto v0.42.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.29.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect google.golang.org/grpc v1.72.1 // indirect diff --git a/.ci/providerlint/go.sum b/.ci/providerlint/go.sum index 4d6b5323a34d..9f143289f208 100644 --- a/.ci/providerlint/go.sum +++ b/.ci/providerlint/go.sum @@ -179,23 +179,23 @@ go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42s golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -208,22 +208,22 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200214201135-548b770e2dfa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 25ab87ca49d9e6eaaab1ace30e3211283353534a Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 12 Sep 2025 14:11:50 +0000 Subject: [PATCH 2066/2115] Update CHANGELOG.md for #44234 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b2ca226601..adf6cfa24837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 6.14.0 (Unreleased) +FEATURES: + +* **New Resource:** `aws_controltower_baseline` ([#42397](https://github.com/hashicorp/terraform-provider-aws/issues/42397)) + ## 6.13.0 (September 11, 2025) ENHANCEMENTS: From 19a0cf3ddefe4f3daffb9150bfaab5e8b28c1f05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 15:49:00 -0400 Subject: [PATCH 2067/2115] build(deps): bump the aws-sdk-go-v2 group across 1 directory with 258 updates (#44236) * build(deps): bump the aws-sdk-go-v2 group across 1 directory with 258 updates --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/credentials dependency-version: 1.18.12 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/feature/s3/manager dependency-version: 1.19.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/accessanalyzer dependency-version: 1.44.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/account dependency-version: 1.28.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acm dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/acmpca dependency-version: 1.44.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amp dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/amplify dependency-version: 1.37.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigateway dependency-version: 1.35.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apigatewayv2 dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appconfig dependency-version: 1.42.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appfabric dependency-version: 1.16.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appflow dependency-version: 1.50.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appintegrations dependency-version: 1.36.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationautoscaling dependency-version: 1.40.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationinsights dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/applicationsignals dependency-version: 1.15.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appmesh dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/apprunner dependency-version: 1.38.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appstream dependency-version: 1.49.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/appsync dependency-version: 1.51.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/arcregionswitch dependency-version: 1.2.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/athena dependency-version: 1.55.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/auditmanager dependency-version: 1.45.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-version: 1.59.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscalingplans dependency-version: 1.29.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/backup dependency-version: 1.47.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/batch dependency-version: 1.57.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bcmdataexports dependency-version: 1.11.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrock dependency-version: 1.46.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagent dependency-version: 1.50.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol dependency-version: 1.4.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/billing dependency-version: 1.7.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/budgets dependency-version: 1.37.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chatbot dependency-version: 1.14.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chime dependency-version: 1.40.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines dependency-version: 1.26.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/chimesdkvoice dependency-version: 1.26.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cleanrooms dependency-version: 1.33.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloud9 dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudcontrol dependency-version: 1.28.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.66.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfront dependency-version: 1.54.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore dependency-version: 1.12.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudsearch dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudtrail dependency-version: 1.53.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.50.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs dependency-version: 1.57.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeartifact dependency-version: 1.38.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codebuild dependency-version: 1.67.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecatalyst dependency-version: 1.20.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codecommit dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeconnections dependency-version: 1.10.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codedeploy dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codeguruprofiler dependency-version: 1.29.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codegurureviewer dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codepipeline dependency-version: 1.46.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarconnections dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/codestarnotifications dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentity dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider dependency-version: 1.57.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/comprehend dependency-version: 1.40.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/computeoptimizer dependency-version: 1.47.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/configservice dependency-version: 1.57.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connect dependency-version: 1.139.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/connectcases dependency-version: 1.30.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/controltower dependency-version: 1.26.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costandusagereportservice dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costexplorer dependency-version: 1.55.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/costoptimizationhub dependency-version: 1.20.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/customerprofiles dependency-version: 1.52.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databasemigrationservice dependency-version: 1.57.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/databrew dependency-version: 1.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dataexchange dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datapipeline dependency-version: 1.30.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datasync dependency-version: 1.54.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datazone dependency-version: 1.40.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dax dependency-version: 1.28.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/detective dependency-version: 1.37.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devicefarm dependency-version: 1.35.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/devopsguru dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directconnect dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/directoryservice dependency-version: 1.37.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dlm dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdb dependency-version: 1.46.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/docdbelastic dependency-version: 1.19.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/drs dependency-version: 1.35.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dsql dependency-version: 1.9.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/dynamodb dependency-version: 1.50.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.251.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecr dependency-version: 1.50.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecrpublic dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-version: 1.63.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/efs dependency-version: 1.40.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-version: 1.73.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticache dependency-version: 1.50.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk dependency-version: 1.33.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 dependency-version: 1.50.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elasticsearchservice dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/elastictranscoder dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emr dependency-version: 1.54.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrcontainers dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrserverless dependency-version: 1.36.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/eventbridge dependency-version: 1.45.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evidently dependency-version: 1.28.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evs dependency-version: 1.4.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/finspace dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/firehose dependency-version: 1.41.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fis dependency-version: 1.37.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fms dependency-version: 1.44.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/fsx dependency-version: 1.61.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/gamelift dependency-version: 1.46.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glacier dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/globalaccelerator dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/glue dependency-version: 1.128.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/grafana dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/greengrass dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/groundstation dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/guardduty dependency-version: 1.63.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/healthlake dependency-version: 1.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-version: 1.47.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/identitystore dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/imagebuilder dependency-version: 1.46.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector dependency-version: 1.30.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/inspector2 dependency-version: 1.44.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/internetmonitor dependency-version: 1.25.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/invoicing dependency-version: 1.6.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/iot dependency-version: 1.69.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivs dependency-version: 1.47.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ivschat dependency-version: 1.21.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafka dependency-version: 1.43.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kafkaconnect dependency-version: 1.27.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kendra dependency-version: 1.60.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/keyspaces dependency-version: 1.23.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesis dependency-version: 1.40.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalytics dependency-version: 1.30.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 dependency-version: 1.36.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kinesisvideo dependency-version: 1.32.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/kms dependency-version: 1.45.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lakeformation dependency-version: 1.45.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lambda dependency-version: 1.77.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/launchwizard dependency-version: 1.13.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 dependency-version: 1.56.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/licensemanager dependency-version: 1.36.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lightsail dependency-version: 1.48.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/location dependency-version: 1.49.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/lookoutmetrics dependency-version: 1.36.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/m2 dependency-version: 1.25.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/macie2 dependency-version: 1.49.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconnect dependency-version: 1.44.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediaconvert dependency-version: 1.82.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/medialive dependency-version: 1.81.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackage dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagev2 dependency-version: 1.31.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediapackagevod dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mediastore dependency-version: 1.29.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/memorydb dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mgn dependency-version: 1.37.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mq dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/mwaa dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptune dependency-version: 1.42.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/neptunegraph dependency-version: 1.21.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkfirewall dependency-version: 1.55.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmanager dependency-version: 1.39.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/networkmonitor dependency-version: 1.12.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notifications dependency-version: 1.7.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/notificationscontacts dependency-version: 1.5.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/oam dependency-version: 1.22.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/odb dependency-version: 1.4.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearch dependency-version: 1.52.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/opensearchserverless dependency-version: 1.26.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/organizations dependency-version: 1.45.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/osis dependency-version: 1.19.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/outposts dependency-version: 1.56.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/paymentcryptography dependency-version: 1.24.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcaconnectorad dependency-version: 1.15.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pcs dependency-version: 1.12.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpoint dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 dependency-version: 1.25.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pipes dependency-version: 1.23.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/polly dependency-version: 1.53.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/pricing dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qbusiness dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/qldb dependency-version: 1.30.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/quicksight dependency-version: 1.93.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ram dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rbin dependency-version: 1.26.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.106.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshift dependency-version: 1.58.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftdata dependency-version: 1.37.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftserverless dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rekognition dependency-version: 1.51.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resiliencehub dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 dependency-version: 1.21.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroups dependency-version: 1.33.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi dependency-version: 1.30.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rolesanywhere dependency-version: 1.21.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53 dependency-version: 1.58.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53domains dependency-version: 1.34.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53profiles dependency-version: 1.9.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig dependency-version: 1.31.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness dependency-version: 1.26.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/route53resolver dependency-version: 1.40.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rum dependency-version: 1.28.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3 dependency-version: 1.88.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3control dependency-version: 1.65.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3outposts dependency-version: 1.33.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3tables dependency-version: 1.10.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/s3vectors dependency-version: 1.4.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sagemaker dependency-version: 1.215.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/scheduler dependency-version: 1.17.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/schemas dependency-version: 1.33.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/secretsmanager dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securityhub dependency-version: 1.64.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/securitylake dependency-version: 1.24.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository dependency-version: 1.29.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalog dependency-version: 1.38.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry dependency-version: 1.35.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicediscovery dependency-version: 1.39.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/servicequotas dependency-version: 1.32.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ses dependency-version: 1.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sesv2 dependency-version: 1.53.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sfn dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/shield dependency-version: 1.34.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/signer dependency-version: 1.31.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sns dependency-version: 1.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sqs dependency-version: 1.42.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssm dependency-version: 1.64.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmcontacts dependency-version: 1.30.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmincidents dependency-version: 1.39.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmquicksetup dependency-version: 1.8.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssmsap dependency-version: 1.25.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sso dependency-version: 1.29.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ssoadmin dependency-version: 1.35.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/storagegateway dependency-version: 1.42.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/sts dependency-version: 1.38.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/swf dependency-version: 1.32.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/synthetics dependency-version: 1.40.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/taxsettings dependency-version: 1.16.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb dependency-version: 1.16.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamquery dependency-version: 1.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/timestreamwrite dependency-version: 1.35.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transcribe dependency-version: 1.52.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/transfer dependency-version: 1.65.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/verifiedpermissions dependency-version: 1.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/vpclattice dependency-version: 1.18.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/waf dependency-version: 1.30.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafregional dependency-version: 1.30.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wafv2 dependency-version: 1.67.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/wellarchitected dependency-version: 1.39.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workmail dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspaces dependency-version: 1.63.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/workspacesweb dependency-version: 1.32.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/xray dependency-version: 1.36.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 518 ++++++++++---------- go.sum | 1036 ++++++++++++++++++++-------------------- skaff/go.mod | 4 +- skaff/go.sum | 8 +- tools/tfsdk2fw/go.mod | 524 ++++++++++----------- tools/tfsdk2fw/go.sum | 1048 ++++++++++++++++++++--------------------- 6 files changed, 1569 insertions(+), 1569 deletions(-) diff --git a/go.mod b/go.mod index ab9e57bb3ebd..96abbd43e61a 100644 --- a/go.mod +++ b/go.mod @@ -12,265 +12,265 @@ require ( github.com/YakDriver/regexache v0.24.0 github.com/YakDriver/smarterr v0.6.0 github.com/aws/aws-sdk-go-v2 v1.39.0 - github.com/aws/aws-sdk-go-v2/config v1.31.7 - github.com/aws/aws-sdk-go-v2/credentials v1.18.11 + github.com/aws/aws-sdk-go-v2/config v1.31.8 + github.com/aws/aws-sdk-go-v2/credentials v1.18.12 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 - github.com/aws/aws-sdk-go-v2/service/account v1.28.3 - github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 - github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 - github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 - github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 - github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 - github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 - github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 - github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 - github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 - github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 - github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 - github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 - github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 - github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 - github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 - github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 - github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 - github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 - github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 - github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 - github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 - github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 - github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 - github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 - github.com/aws/aws-sdk-go-v2/service/location v1.49.3 - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 - github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 - github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 - github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 - github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 - github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 - github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 - github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 - github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 - github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 - github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 - github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 - github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 - github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 - github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 - github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 - github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 - github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 - github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 - github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 - github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 - github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 - github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 - github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 - github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 - github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6 + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4 + github.com/aws/aws-sdk-go-v2/service/account v1.28.4 + github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 + github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4 + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4 + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4 + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4 + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3 + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3 + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6 + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4 + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5 + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4 + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4 + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6 + github.com/aws/aws-sdk-go-v2/service/athena v1.55.4 + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1 + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3 + github.com/aws/aws-sdk-go-v2/service/backup v1.47.4 + github.com/aws/aws-sdk-go-v2/service/batch v1.57.7 + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6 + github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1 + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4 + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4 + github.com/aws/aws-sdk-go-v2/service/billing v1.7.5 + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5 + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4 + github.com/aws/aws-sdk-go-v2/service/chime v1.40.3 + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4 + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3 + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2 + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3 + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4 + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2 + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6 + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3 + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4 + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4 + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4 + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3 + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6 + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4 + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3 + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3 + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3 + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3 + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4 + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4 + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4 + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4 + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5 + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4 + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3 + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4 + github.com/aws/aws-sdk-go-v2/service/connect v1.139.1 + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4 + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4 + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4 + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5 + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4 + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4 + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4 + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3 + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 + github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 + github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 + github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4 + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4 + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3 + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4 + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4 + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4 + github.com/aws/aws-sdk-go-v2/service/drs v1.35.4 + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3 + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 + github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 + github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4 + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 + github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 + github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 + github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 + github.com/aws/aws-sdk-go-v2/service/fms v1.44.3 + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4 + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4 + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4 + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4 + github.com/aws/aws-sdk-go-v2/service/glue v1.128.3 + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 + github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4 + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3 + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4 + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3 + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6 + github.com/aws/aws-sdk-go-v2/service/iot v1.69.3 + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4 + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3 + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4 + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3 + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4 + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4 + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3 + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4 + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5 + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3 + github.com/aws/aws-sdk-go-v2/service/kms v1.45.3 + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3 + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4 + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4 + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3 + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4 + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4 + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4 + github.com/aws/aws-sdk-go-v2/service/location v1.49.4 + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4 + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4 + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4 + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4 + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3 + github.com/aws/aws-sdk-go-v2/service/mq v1.34.2 + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4 + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2 + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3 + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3 + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5 + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4 + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2 + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6 + github.com/aws/aws-sdk-go-v2/service/oam v1.22.3 + github.com/aws/aws-sdk-go-v2/service/odb v1.4.4 + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3 + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2 + github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 + github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3 + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3 + github.com/aws/aws-sdk-go-v2/service/polly v1.53.4 + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 + github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 + github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5 + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4 + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4 + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2 + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2 + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4 + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5 + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4 + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4 + github.com/aws/aws-sdk-go-v2/service/rum v1.28.5 + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6 + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4 + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3 + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6 + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1 + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3 + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4 + github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1 + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4 + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4 + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4 + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4 + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7 + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3 + github.com/aws/aws-sdk-go-v2/service/ses v1.34.3 + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3 + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4 + github.com/aws/aws-sdk-go-v2/service/shield v1.34.4 + github.com/aws/aws-sdk-go-v2/service/signer v1.31.4 + github.com/aws/aws-sdk-go-v2/service/sns v1.38.3 + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5 + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4 + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6 + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3 + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4 + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3 + github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4 + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4 + github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 + github.com/aws/aws-sdk-go-v2/service/swf v1.32.3 + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4 + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4 + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4 + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3 + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3 + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4 + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4 + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2 + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3 + github.com/aws/aws-sdk-go-v2/service/waf v1.30.3 + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4 + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5 + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4 + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2 + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4 + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4 + github.com/aws/aws-sdk-go-v2/service/xray v1.36.2 github.com/aws/smithy-go v1.23.0 github.com/beevik/etree v1.6.0 github.com/cedar-policy/cedar-go v1.2.6 @@ -333,7 +333,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/cloudflare/circl v1.6.1 // indirect diff --git a/go.sum b/go.sum index f7c4de0456dc..3863f8f3b249 100644 --- a/go.sum +++ b/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.39.0 h1:xm5WV/2L4emMRmMjHFykqiA4M/ra0DJVSWUkDyBj github.com/aws/aws-sdk-go-v2 v1.39.0/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.7 h1:zS1O6hr6t0nZdBCMFc/c9OyZFyLhXhf/B2IZ9Y0lRQE= -github.com/aws/aws-sdk-go-v2/config v1.31.7/go.mod h1:GpHmi1PQDdL5pP4JaB00pU0ek4EXVcYH7IkjkUadQmM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.11 h1:1Fnb+7Dk96/VYx/uYfzk5sU2V0b0y2RWZROiMZCN/Io= -github.com/aws/aws-sdk-go-v2/credentials v1.18.11/go.mod h1:iuvn9v10dkxU4sDgtTXGWY0MrtkEcmkUmjv4clxhuTc= +github.com/aws/aws-sdk-go-v2/config v1.31.8 h1:kQjtOLlTU4m4A64TsRcqwNChhGCwaPBt+zCQt/oWsHU= +github.com/aws/aws-sdk-go-v2/config v1.31.8/go.mod h1:QPpc7IgljrKwH0+E6/KolCgr4WPLerURiU592AYzfSY= +github.com/aws/aws-sdk-go-v2/credentials v1.18.12 h1:zmc9e1q90wMn8wQbjryy8IwA6Q4XlaL9Bx2zIqdNNbk= +github.com/aws/aws-sdk-go-v2/credentials v1.18.12/go.mod h1:3VzdRDR5u3sSJRI4kYcOSIBbeYsgtVk7dG5R/U6qLWY= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 h1:Is2tPmieqGS2edBnmOJIbdvOA6Op+rRpaYR60iBAwXM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7/go.mod h1:F1i5V5421EGci570yABvpIXgRIBPb5JM+lSkHF6Dq5w= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 h1:fSuJX/VBJKufwJG/szWgUdRJVyRiEQDDXNh/6NPrTBg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5/go.mod h1:LvN0noQuST+3Su55Wl++BkITpptnfN9g6Ohkv4zs9To= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6 h1:bByPm7VcaAgeT2+z5m0Lj5HDzm+g9AwbA3WFx2hPby0= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6/go.mod h1:PhTe8fR8aFW0wDc6IV9BHeIzXhpv3q6AaVHnqiv5Pyc= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 h1:UCxq0X9O3xrlENdKf1r9eRJoKz/b0AfGkpp3a7FPlhg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7/go.mod h1:rHRoJUNUASj5Z/0eqI4w32vKvC7atoWR0jC+IkmVH8k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 h1:Y6DTZUn7ZUC4th9FMBbo8LVE+1fyq3ofw+tRwkUd3PY= @@ -43,256 +43,256 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cROM8iBd3f6hrpuMQ= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCKRI8m9Ib2xdAtLT4W1qhqSf548I= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= -github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn+TgaJy4gh/wy8QKF0i0= -github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y70pnL22UW4DBocAw= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SISFxiZdCSbxqPQ4GXrYk= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhppHopnqYKSxvY6Xg= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamtCTGxTqEsEOXOi6mYswk= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9WvdHd0DCEEekikPII1UJ6Y= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2E3s+tK7Qz145wF7gBj/V+HDk= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSztn51D3bOlTZx7i8UbxIq3s= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJg0HSf4/YLZtk8JcHnhtWQ= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH0OWcSj4mzlFanfHVYao= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu7Ju+Br2LmmviiMWQ0KOtXffGKW4= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGXNYqiTKzGIoi93kxSrJNZ+vNoMMwMUE3B7Q= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sCnUEfX634HFbblmsngzLZw+q5HenUh+o= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFqdwzE2bhlI1+uh/t/l4fU3byJXSHNxI= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJGmBF1HYfb12IzSJOIYfI= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxznO/dEo8mlokULdMq3DhMpM= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVBje+wEoCOCwSkaM1hfo/9U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvjFpQrBf8bWqvBkrLKDD0= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adnpQQd8TjOW42xnLjhftmBFGxxFY= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVTUSucooSSNMjVjihVRI= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 h1:3gdYbEifG0hBOi3j43F/5B5Wln0uzdk6sAZzULZFAUA= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iSiyizfy7iAzomncMeo= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqVH2avSawMrgd07kKNOx8E1jSR1s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6qFk/aF35pL7D5JjRhYXU= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+rgc+bPcr/+Oi78TwrzGfMKAw= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG58QgDZ2oIekzSBMW5eEcSNZPenN076/+F0= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5GjOXuHrAj76Fsv+SBI= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTkjnYSjNBCo8a3RVdYZaM= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEygnECFM3aDz/RT79sMqNs= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ6bCh0EqJpWIOYPfnI= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj46/GZRk2vCBprtN0PADIF8O6xL80cv4lrb4= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUcoR6GiaQeelzF8Y0c/lN+qlA/UM= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJxCsEgi/Vyy4Q76ufj/zJBg= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaVS66dAXvZdjlCfJfuIg= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQeRGifq/e3EgxevAAeD/rNa+Y= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07q4Tu2AGPcttKxLRri8LCstfZs8= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/XNc49hUAOLcVdzeYZqYReU= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUDQ+2mkExTq2WiWTnnRPwLpu/HjUtaPIddgMU= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyXbGh3YwxqD0Y+3wWNG1yeDs= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYMUR7/DOPDkrCpuBBKzvoql24= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 h1:6ly6/OBsK9fGwyEc2BNFs8bvCL25/vp5LF7Vt+NJW6s= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZBQ/JNM8j6JZEux+MjUrg0E= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+NBuXT6PeJmr/VN6Zo9Dy9jxVk= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBipmU3ZTitH91temRUTZMEPo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tPlqJ01kxMWK2/PfGlM5YiFutMw4Q= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94el09NUC8Z++6ncPnGEvpQs= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6okF5hNmuZZmAHkqxdcId8ilxkMIs= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv6VeLYNcX6geP40LFUxrkkHIvQaXE= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27KVNxn24VWtGQA+V6JredhXx7A= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN5xx0jzebrkdkmeP6ZkAd+3Ij9ajy+EA= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8BZUsggJHY7SJktmEDdJ57UEI4mDEeIFvqY= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/1kKMhj4Q75SWK05KQHHRHaoZSlU= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6tafmdmmiFCUALzMZtrYQ6N3xbRKjRbH5TtFI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpke8z9rxb6Dh0y2OvFtlUhM0= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8MPax3sHFejHHCqFl+fdRqa7S8ztB0= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= -github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 h1:dIa+kK5GZCIRDjBcOxBDRCFhfRcL29X1F72Is14VBeE= -github.com/aws/aws-sdk-go-v2/service/connect v1.139.0/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xOjSPlZfvc4UvUIKwZpMMJfuQgQwQR6ufdQZ5Is= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4vuvEtqHjxU+cPklfCR+2uQwPA= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWokSMewfFPNIDaYOJg02HxZQYb83bkIu8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPpNpM0HuV1pfYz3B1ppUSU2y0Cu6OY= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQiY1kknfxJ/nwmvHVfQ3eMgiOLEUDpEOLkzpQ= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsHjURn201IENzNUENNj8SI= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9CoGpnckvCzfBePSZC/N2sSfSM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe1jZauBE+WBMw/GrrmFRka5iM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 h1:tYG+bkHqTjuylERnj4fkeKX//pI635rPecfd92c/Csw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2QKKPEjT4ClxdvF4ntWQTSs= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0TuFHmiKc9PSMkDeEdy8if/I= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnBGzjPu79AQDmI/sqh5gWfDAjYw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJFjOPrPyVGTT6eoCfEzRQn7hwPhnw= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36WlzAsN21voQLdcA3Cs= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1HBTHUhzxbrE67SwmqA= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4PWkwoXDlMNnD0CmGxG8qaBRA= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunKOfeT8HJBE9GpHrQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxTkqxd/oAYKY5RaaM= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcplH3O3LDSbRYSEU77RafeI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIACV9+bZD1Pq/s1dzc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue2KwFWm1A/lILQfY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/UqDGxjl69/4eMbVBiW/00= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eGF+Z3xAR/VBlf84Q= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7VhJSmgoUCVEakyM4= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5LXgQrrNkMa4AcNY= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUTJ4KJ+fzyS6xoTnB0TxVA1w8= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2ciJit4cOOPSdB9UTv47b/AD/tSMY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1blhU1mpj3lyxgZaBaO7EcZrAZ4Ryj+pk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+O1wOnvKLUoo+jGM9vzghqEouBb29W2hcOs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNgG2sqhx+CHOXSqrIXnVDnZeHAhPZppIsM= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UVGxsteGA2RzeubDtXPFdefEHQJDUMk= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDamfVylxdI5Ap8uGps= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2vc9yMEj0eHVT4mHRTp7nX/gvg= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/c1fNQ6bZvh+cOh5WSnEYDviss= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZl2QtFQyrZQFoUVuqnA8fRA4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf2twd5yOawH7AbEBnjjfs0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVTCHipzZwiAkS+HE= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw80cgPIyDjKDmQg8yhyss= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU8PtytX+mbDQ3pDrfDRq4= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgdfSSpqh2iJenR07k= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/jgNVOmV80ZvqAUQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z8fBNVAt8JImC6Rk= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/4cvxvDywFbRSahtzb70k= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMeSb/2uvmz+5SKMElnwLg= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1rse3iZPdH+nfOIgAfbT1Cpyob5hKE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkrlPFE3St8Hb0HasyWY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAOdnHtFtcCV83HjPvlXD4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwGbfEULKHdTWFtfM0PtS4tRw= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP2V+GbkDZSD2ssy09CG/UbV6/U= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2CpfUjEuYQw9JuCyRq+JHk= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+BeDgJXZAeUaBMOJUBLPAelw= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8vp8a0KqWThrXnhpI= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2DqiehXiA6JDOyYPoG9FOuihV9Mg= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90TQn2DyKXC5t7ojFo9f+DMgtM= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 h1:5vo4H66qsNDlcYkIWHoUdgiI1nlKyUbCbyrjA4gFLE4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 h1:N0c2Xhm+jL85dxldlPy8vB/iqLXIevRz9xgt1suQ1Aw= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4 h1:xMTRgWRG0wb0n16sdeUzOysJkolU4uAxhgMaGekSHJc= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= +github.com/aws/aws-sdk-go-v2/service/account v1.28.4 h1:aydP/dwNvf4rGrIhiZbYzVqI6eqUvy5QT/leMr4KOrY= +github.com/aws/aws-sdk-go-v2/service/account v1.28.4/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 h1:gpzR1xWvsrNJeKgkFQHGXJMUr6+VHVBhEpDo2MfkaK0= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.4/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 h1:1bdOr2ALn/hXmSu55cn3meYg17IZj9QdRAMWqTURv6s= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 h1:ZdrAxWlzkxx3rFcbr07+7gOwxepzoTRdNZOMCNC6EIc= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.4/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 h1:Wf3pQg+WebfAI5aklg3B6x8/5UDjXSFxzVaX4a30BBs= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 h1:UoAThO0F16j0XhBF0xVhur/ceXiidEtSTOL1AiUhBZw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 h1:L7sv5WDeqp2MnRfw3+gFq+kFZT8gP+jeJheuAPS+BNA= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4 h1:fU75lgQ3pTsilkNYkU3uWO7JrU/GnShkvk7zmy08Pw4= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4 h1:rIQoPkHmZqRv75QTWIq4Jmq4ZVKI95YNfwbKNE6WNIs= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4 h1:150FCG6u3IITCJhc5uCnpF7Y9rQtDQZgo1UNOdl/Vzk= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4 h1:Qas4CJ9dtjNoyscxK5f3+26KOvmMJt9sV9KHQCp5his= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3 h1:ba6H23hZ5TGoqP5d/qwR8Pd/5vPpgHgWo+iTMavnxro= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3 h1:AVa+7o9GYeSg5qklgUWpAklJj+wlPV9AOnFmt1lQLJs= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6 h1:gv6lQ4vtMjkRmW7THRzMOv6Ftf169KrxwXb85h0Qk2c= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4 h1:jvzu4hfjfKfELV/ZYJwMu1BEvdBEd2lCwGAuYk8OPJY= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5 h1:0TR6WL0tfj3wMkm8xVcFxzJMKuXML5marAMGO8OKEIw= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4 h1:E1JXCmaYQe6ySAcFiQ7atX891fqtNtT+ILFFL0aRs3k= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4 h1:76jUhK9kCrcmNv8xj1BiMsPBoBIQqCfuL0Lh+XnWAF8= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6 h1:EMvtMNY56NfNpBKFLKI8srgmtb4DSvlFCy8l8QYv4gQ= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.4 h1:TUJjhgsNyMCxtUMJlUuEcUkiM3wxdM3pWVCWtSlM5H4= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.4/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4 h1:t2TnOPTclJrmPOn6ly+5K+bI4yCR9pUFlguT8viVqQQ= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1 h1:R6r+//CnZNEOyUQDjTaqfUNk5FE/umPWbLo4l3b0glQ= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3 h1:Erjv3OrmWRuNnHnAjNHjdgKppmqIzrqyY5OPFXdMcvQ= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.4 h1:IDO4noL9SPjjRDYgQPN5pQkvlWa65Z8U4fxJcMqwgZI= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.4/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.7 h1:U70jYmNrPFDJKxAGi8Va6BQ6iOQpYPgofG7B5QSZVoM= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.7/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6 h1:J39E926fD+zbL9qBNPK235Zn+KarvEPOuTtCH/WNN8k= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1 h1:hZwht+1MdXlNot+A/r7SWqk0w2WVpiDUzRasdQFv1Vw= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4 h1:2jf7uhcRTPdNU+rmKmePMC67sW3DwXD0BZe8eqvrFbU= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4 h1:nYvxys7OuH+D5QYlJuVaTSRCuxaeLVpQLwifpt9tQP0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.5 h1:Nb77k+S9tLLyBlcGOlnyfR04KzoSXc6/+O+1EKeVITw= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.5/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5 h1:+DDKTfPDgM/arwXWWn3bzzzEULgL22WugDHm8zyWaio= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4 h1:rahhkonNJRm0BvfnNE19U9t0xBKXnfwEcnqroRmY2ec= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.3 h1:VU1s4PIE+qoO7mgUw+Q0CnMKTcovQIbLwWjsAlxampY= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.3/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4 h1:Y/BCDbNlaidX5uZFL5S1Tqf+yFTIn9FU7sX5V0Ma4A4= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3 h1:CVBV4QSP4X7nzzfDEZk36g+QpnQlpnynLxDRgdKViPc= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2 h1:L0DsPxkujlIhY4CXQJrDwExRlVnjImaVJM603INQRF4= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3 h1:ZO01YSLeh7hMFOXmEIS/1/qBl96iQxJuM6bn1g9FnLM= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4 h1:iU9bsK7azwrRuBbTGID4y0lc/EiRSYNgPebNx0sElk0= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2 h1:NsxbnWtrrFysJ3bjBAaXshvGA4OLtdW/x8gHQ+eYdo0= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2 h1:DJuk4/xsGQhZOUsHrkA42/fv0286tWOVFzf4O1dO/yA= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6 h1:tGnVQqQACXWOokzoWwaY8iUsnw+uTLXaReXSDEYHir0= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3 h1:ZjZVJviRZ+Bx8h9Wcb5JlGRRIU1KiulReIdpWv1O4zk= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4 h1:Nk/GP0JrQfxA58QMasIqZPnb6T1DMYTg0Ut5BWqmauc= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4 h1:Ct4RSaeHLX4h6eua12PFjz5HoZtWrCWzlNkATPvZjDw= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1 h1:OSye2F+X+KfxEdbrOT3x+p7L3kr5zPtm3BMkNWGVXQ8= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4 h1:3iaxLk54jdxyeYAW0t07bjF0Y+T456dLFxhd5BVeD50= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4 h1:w4KTIyi00VkvstzYrFNBpYMkgjNHTkKmYpJhpvWKf5E= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3 h1:ndr4GuUl/NrlBAz5gJ8Zyeb1Zn4iHYpJRWnjHLK7GRs= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6 h1:8m0xSqNJqmbjAqI5qSSyX2DstjmjdFqYwGMVtmQfozU= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4 h1:mpSJqoSQ72txLeDIMITdB7BrympxSJKHKyDZlloDYEQ= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3 h1:qiEVvlxSiJSLAU1mE7cJekrtRSfeouALHAcb6CddzkU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3 h1:DZHdW0Tw4FgzzM9X8Lxlm7DnPoJF7ut+R3ulwspBC0w= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3 h1:0VKjWe92lu13piBobyz2HSPZMfTcONDCa8XkeH+TT7c= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3 h1:X35geUOBvQGKZiCZQdKhSCx27pwIO8z1jXb+oYYoaCU= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4 h1:jCsKpcD6Dj8daCTpwQb4FcNxnIjXL7+5vuGGzS0u8HM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4 h1:MTq/vcMa/kVYHDpYIqCNfELGGyN+ULT6oH4Fmt5Q55Y= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4 h1:cp+djURkd0cUDi/dVkx9MCCDv84Kd8TY9Et3KmCFBjY= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4 h1:0u9XT6Mi5V6U0GGI0EG/QHKRu44PO+9vor1awxLywxc= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5 h1:FOD3qP3yqkNE7WN8PjX9Y+9fPgJdvOqLXnA4DZlXuiY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4 h1:29BM732laN08dVs+5z+qh+vBPeZEnj15IqobW4y4oNM= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3 h1:VPxguqTtIcjVPnwHiJ7rNQr9gPERlI/vKzrkl/sM7Fc= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4 h1:Qk1P7ltOokM7JTpOJaZH6ALesaxVwBgoDHtktjfrm7Q= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.1 h1:EcjVKcOcPh+ZBHOVVa+fqvBSPlppFSaGWL+WPHFDzYc= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.1/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4 h1:KjM2HAQgsH9gaofgy+JKHF664UH9zwuetSo42il9eLk= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4 h1:mDhXopIZ9wA+rRujZzTFZAQyqQ1YAWiWYJBoVy0SqZA= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4 h1:IDrhAstiKNG91mcFFQsAMcuimNxOUawoOOYUYCFGJz8= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5 h1:spKO2HoyWCtig4QSTHs/ax3hwtZtKVg1LsbWTp+N/rg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4 h1:+uszhA1bSLFZSgAMi/Yro8CzUb+iFIpNvT20CY7VFPY= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4 h1:4xkoNwaiDfIo9BgELVPBf+NGHJcC0JYCuGMVSGJemmk= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4 h1:2E9WtBb3Q2XSmjYtKK8W69pHnGH7suHw8bkQxoV3ZUY= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3 h1:75aFq5weR8mWFlXKVcf+w8cHRvPTvmpd5ne2KX7fsdE= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 h1:nuCRmWnECQ6dt4dgnj2twKS0VWIKcAeXwOUCFpLhSKo= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 h1:RT2vYyEURb1Y2c9WoufFdJYt9RP5cPIlvZqT7gcg7vc= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 h1:HaqO010CgYxtu8mNUUQUd2QC3yDN4JS9Olt4vOQpR20= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 h1:nrtKiE7MDX32FQ1cHI404PJvYXdyP5a1g1WbKdGgf7k= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 h1:0H43bqbpiPF4WV+2ppV9l6T30lWolBsshd8ZQYt//wk= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.4/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 h1:a/VOCosbBdJUSyaEXRN4hsqGbXG/itfOquy7GX1vBeU= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.5/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 h1:jlHUydwGygu48BGAxwnLVRXoWSBJj0Bcxp3vlPutrB4= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4 h1:cOxtWV1GUyZNnjTjtMubcxcxxPML9UDPpvXHPDXYwiI= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4 h1:S6rzGfjYIEEI/VDbePk0+FpOVwLbHu2HnHvvFBwvomo= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3 h1:iUQ+6c3yr+bCq5gg9eNQEfuvolqyNQjFXKGmTXUg6Fk= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4 h1:XMYBoEVe4osddab0s2QSUSoPLMTaVSIO8yILapboDDc= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4 h1:3/Q8u8WFz26PNHnbysOVqW/SKM1eZyYpiGGCOQpbzc0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4 h1:0HSQQ+x/2cMMfOMQWSB6QZSBfaOF31QtfDEvppMkuZQ= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.4 h1:Oe3tvXkRSvtyJAtmD+bK0yTPNCqb9jPfHmVjWD+Ny3Y= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.4/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6 h1:hgRu1NFDnCR5V0FkuGiI7WB9xR/xEtSNoCLqRzB8W1E= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3 h1:fbhq/XgBDNAVreNMY8E7JWxlqeHH8O3UAunPvV9XY5A= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 h1:6TssXFfLHcwUS5E3MdYKkCFeOrYVBlDhJjs5kRJp0ic= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 h1:phfqjO8ebHGoC/GrjHcuTrVkDCeM9A6atOYTCY1XsXo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 h1:/HxbCJjqyO4eJ1FCVnvUJtXbWOnG217jMpkYaTUP6V8= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 h1:VwvvHn/XroaU+md5moLOuFtvGjrExOVr2s3JP+3I2FI= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 h1:iOfTDjU/S2b0BSWCqv7fDbT4uKo0e3jdtnRHVwXXggI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.5/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 h1:V6MAr82kSLdj3/tN4UcPtlXDbvkNcAxsIvq59CNe704= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.3/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 h1:uiWSUtTWqpvhP7KSEpVpIm0LqOtXtzOx049rmukP/gI= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5 h1:G8Fc8YJ8bTHvyWu0qAp/HJebp9Mjtg2qpmQ0L071OKs= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4 h1:LU+R9E1B8FXjKbGxL4TSmaTrmUk8JOx2Ad2rJBFh4JY= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4 h1:gV2I0ie9/hnwYc+HO7H6m4iSQ5n9s0n0KO5TsmOKn24= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 h1:x0GTanUupmZLHUqqxR1zTubiBsJt9BXu1RGPSAwqGwY= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 h1:fcnPiM4WIbUoEk5VJ45fJlIVk8zkcSMuepuI8IZ+FNQ= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 h1:pXKG3/B5OVTYmautR+UpCWbeLhmaVnxeiWkEXVGzzSE= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.3/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 h1:UOLh0c5Zjnn8/JA25dFE6BtBIELqYi6fATod7ZKP0ZY= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 h1:zOWo+iUy8bWSXDxz99OiZGBl8KBbgexMTCP3rDxwzQ4= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 h1:390U/RkWYmxI9z2konFlfhXi05PV6+ywYy1rDvGvD9c= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 h1:mmhBtyY6j9ncbB417ldmSvpQH9MIW8C6H20OZstvzTI= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 h1:DOHjB2RH/hJvp+QETG9HgENH+Td7iGQ5gNniSc5GuQs= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.4/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 h1:nIMnqlQNvnMuMkNvSrcaykHHHBZtsSZ+uPeKCpKyBx4= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 h1:LRa23ftG+djfUEQ5rGQxm0IfX5pc1bJ1HL1J/F61074= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 h1:w86eWbktz/0doyawd+dayOgnEb4DZ8n0prb4kTsYAgE= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.3/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.3 h1:UyOwFgg45R332kOkxOHB5p5Eyg9e+s2fhSJS1fx9Ypg= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.3/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4 h1:7cOXwp36LxpPZfZYeNvnBI1UD5wWo1IQBHI6SiO8nkE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4 h1:LW3GDoIL0+6ZLxu3j1Fpcfb0RTNjLcZfYBIRSp8HKdM= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4 h1:9PpI5RumQIRZj/nwwxg3EI+pXiytPQpfhExsWrVarIw= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4 h1:qXSfvvkko/4z1mRyMVXpjwy76Gu5Gu/Sp7u/3rcfUq8= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.3 h1:ej5T/e0mz7iMwahKmImq/V2gVg0MUwfu3ylPXk5ZccY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.3/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 h1:1TEsqjvmsw8853+Pe6H/mMFySsZX0aoMJ4XDqEkwdg8= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 h1:a0xWOiAVwUN6lFLLyo//ZmlYisRBShtqWAK13Wq7Gqk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 h1:QD71EO8w7RDwT/w6gnUS7dD+JZZljeomz/Gx9XvHxNg= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 h1:dlchWELsKc+8CHOQ/QBzWRo0DyxyN2VfaFOKjY8yqzU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 h1:pKDsKc5fov+2XJx4JcdonlpUddvvHozYPw/XEBfgQMA= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 h1:o2gRl9x3A/Sp6q4oHinnrS+2AC9Ud8DaG4JL9ygMACk= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.5/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 h1:KO3Plw+lTPS+Yz9F7gHJlaIoehZ7j9eVwcLYHqTKXQE= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4 h1:demzU11+z1wDbJtku9SX27AOaIKkcv6uuUipJm1Af0M= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3 h1:7DQM0hDZ5XZbH7gTRUarFkO0enCCn0k5kr8GCTXkLn4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4 h1:Xp+30qFm4R/ZHIT79K/2HMzHYm1S4ipMctmWttaSQQM= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= @@ -303,268 +303,268 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgO github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp2iC2aQqPMOSXyx7QpATrRzSWB04= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF8Mn6s2G22HOI2cyiHiP8= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJxk7DDcYZ73jJ/s4= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgDv3j/jeSmyD52xEY= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrze1jmq7nx60P7hIFmSLA= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+sJIm2sJMLltK2unRSk= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQrI2bkJ2sQpN84mRcEcBNV9LZU= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxju7ahxkdmmXCQBIUU1k= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDRux7yw7tIKDEZbjmQ+8thE= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68IgDVXLnz9B8brLDLuJjiA= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMgptRcCWeRly7bh2qnaWLu9MSkTVU8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaFL6A62A/7/58SK+cGoZUycB+pqI/Ll4= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx40rnzsCwu4Ak+cZ1yD2rQ+44M= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FDoUckCOfCY3hj1n4= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4CcKg5S13cY+tN9o+4D9VKPSBwI= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27ACbUfULROVoe+2eAdng0= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQM5Urs36ARzbEP8L3nYypc2Q4= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB6/wGEBdKTSv+jjfLTb7g4a6RwsqiVHE1TEE= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7WhJO5xpYiA7f1LH2YQZVh4Fio= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7VtNyZLsM9Uz1Zl8VMe/NVQgEWtpY= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJqozcrpumFh9+P7RQuXFJw= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= -github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK2rY+2xBEUAVxxz7iSJvQ= -github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hrSUtqfXVJP15KShbRle+mq/6VV4= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh4kV5MFdWnYHKeM= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0OjHi1dTFkG5LpaOf3FI= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9pawjWdGGF1r/CAdDFZVot7GeQ= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcLmFLUXI84JEqnIYW9lkiLV1ws= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG/wHpY2SaH3eODO3jVwAIM= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 h1:VFsXwfXdn+R7mJpW6RojrBbPR7PKzNqdLRdijyVRN48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/HhUeTHxiWqsvQQgocL48= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4KZRdjN06PAFlt9o= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+RvB5sblqeVmiNAI= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOUarwehGgE2V8v3Dqo= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9nbq+UxcpQAuXQxVjvsY= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHMlwaw26mFUUcVQEVqY/I4oA7A= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YVNLJI1/i9OEzflSg1B7EJ2CTnq2I= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPItMeYp9pw2S+VG5CITFdXy1zQyg= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM9t7ag2468xgqWQs9H48iEBCs5Q= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJjOFM4FMrbZbawG8NscGKHsxw= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2YD8IhcKDETZNLxmticIRESuyafaqSi/PA= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy4rf0V0p1yZF5rIQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7kArD8EuXN8jTrPs= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJFjaozIVkQ1o+JPlggNzhCs= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= -github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 h1:pokghrmP5zmoAOwXuQT29pCCQ+obzpqxD1M+QOxNJu8= -github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcTju7vc4t7aj2d2gvXvkH4ktuwFf3Op8s= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1h0im145UBakpEmOCCkXTGnOkoM= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02eeV6w924Pbbw2Vdfs= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQaoVoDFtZz92A9OWddBuFA= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqzbYCXC8Ke2S/O6K9/QXl5MZRXmA8iMU= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7GKi9eemWNYFNrmyx0= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bgHCpyj9cTg5dOZ8tLw= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBDK8HthRDBr5deAQ5Pb3s= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUEJYFj6C+UzlCy+Lb0Xu+8k= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgAJklcYcApJuRMoYOU= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/RjNZo72wiWbIxR7pT+XEmQ= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k05kzFIQhpgyLEMI= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLImbS+DZnxB08lpYps= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4m6dQYOZNgqyYDj2o= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4Yl4+pf6Se2xSeCjqXa6w= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS1SdD95fPhVji6FGceW2/5gMg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyNGf7Ls2OFIOrDzWZX97f5Uljgw/iJGM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8UNkdFX85Ttk+bOMEICuIljgQ= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDheFISpJ/AF6WM6Yt2sSQUG9qqFg= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRPVQhlqxGjco8HePVXCBsdazota6EUw= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8OLb/SBOJdwjHB/MvEwg38JbaMBI= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzFXI35uo7KknYTViOtZux/kSh0Fu3vOcTQ5REE= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6PgFQiuGd1ZLfoD1kHjlHFSiK0= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiqBGMEZa6eNfr5oL8grOA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsXefhtvI2AJIDv712MZTKeImxOAY= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADhx/A01nfm8j55iOo9aTDNoY59lA= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4RJNmyvJ9w1xzaIZyckMWxIhJ3mgqHUbP/0zB4A0+E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5ORL+P6y+YkGPKsFlqaWbgX9tXZyFTBhJyEYMb4= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 h1:pniIup6rzD25rCcheV/g15zkvc+Hvkl+dHlP4TyY/4g= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 h1:XBhTNPtS3JdGkqE+sMUCToFGUMm5x6dVcR6IfwbacVo= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.4/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe/t/WE+RxSOoHWaK6P9Hg0= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr8Snf8RvyGJfVveILKOR9uY= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoKlDpGiTXnBhKN98xcZkAc= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 h1:ql9qBtq3g5uYsOyDUsXRBo7JcW8D67PxUkolgw1kjS4= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mbwXV5xFXQyNJuR8X0gfcbTXFjHk= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5MO8lnR2vabp2q5i7zPUoyJM= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemPQ8R8BNang/sAbuut12LOOfg0= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1:ch8Iz6TsqfK3USQn9/NEVFgC6QbG1uW3K7fcZSiDKKY= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhKgesbP4VSEBivrVx+u8XcpCtRno= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaFzarpVWRQdLSHU+KKeKoPOmA7SPXmb4zlnFfmQ= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3/ha0nyZbpQGtC8iFYS0zGKj9LnTo= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Guqm1hHymfwOvn8nI7aCJcePv8g= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2TuVXFYCLnxEBvyA= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs+pmesFvq2J5F80kyo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/pJTUTs4ww/WqOxTA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJmiH4alWEdnISAWkDaX0= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t0To86r5oewWmuplU08= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2AqiN1AXrtq/rBdY= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+nBt6mnK5iPjjSzk= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3qlSxWllTzuAImA0= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T7x9sWfubbppvulyj9crp5mk= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTITHiVpo/VCn2q0IZdGqBGhF10= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 h1:MXTDAHwEZ5NzaLnsq34xjPXEVh0VaeGD5rATFCgFqvg= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 h1:SfEgky1fDjAGRFYxLnrnDVlo0ZOqH39t6KsspYJPebM= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 h1:yzeq9QvTmQfUMY4FHs11SxWJhBqeaaTEPpfzdHa1BZo= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 h1:091+jMFSSt/41p2PqQzhKHi6SDZhGikc85jF/rHKzxM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zcJsTF4awNHHaMYIY= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojtyt1UuaeJdXbLhrvVZlc1cw= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhXJppa4xzWCh00mIE5hJyET6A= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a8LjhJwsMCkpdVJUMRuIy61LghA0XHY= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdVguofsIheoDIv1ntzNJBJ8Y12l3Q= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTwo5fOTHBoBEJBg7s1h4J0ohi/DY4= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wGcBfOqphwX7gXy9oSMO78Vs= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/E4lZGOhg+F1qzAPSIJwE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+eflgSmIju0rD0QjwKZq1OFZt5pBB6Og4= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpAbcEJY0Ujo6hyQXv+m20SCk= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53Hv3YxFLl5mZatRM= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 h1:Ea4CMk5sZOknJttA28mqYSQcH5IQyCBEhwoXcu7sxyc= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/OV9nUFILLuflBXxNjZvrDo= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 h1:7XygyvejhD059PzkTVCo5ZWnKNE249ju6aBTfV9rYho= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 h1:hm+vuMO3n7s7E/fv32zOhdWGxb4eO4P5SEMSJpdY+KM= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.1/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3 h1:v+M3A2R7TNmbVhw7wytXX9ctBvvnTv010rwFJcZNcs0= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6 h1:VNUsqkO+szznLLFD52B/2SZ48L3jbZQH0ofpc71sC9w= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.3 h1:o19grvwrTdqhYCpajI8OxAlNVR5dOqvM14oVSVK8PzI= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.3/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4 h1:xDy3gXOGhNAxDW3WQWKocY5+48cS7cLPmiFd8yWBmZQ= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3 h1:LSpJln8/THTOxbnQw2YISj2++4s2oWLIC7eQ2sCwRi0= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4 h1:SbVDfvwIpB3c3FWTDw8VnGatPxVEn3HjOiR6y3iUY9M= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3 h1:CF89p3rDUgZy4wI+1l2naDAwjae62ZkF98Q5gy3FZ80= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4 h1:5GheR8I6Qb4Oa8ipPBTVes6rLMJ4gpTcbg2hoXFa4+Q= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4 h1:Rok4GMqmZ3wyP4ubfM5a1ia3cGuUKzNMjW9HfNWPyEs= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3 h1:AoRNFVaU2jdjK7/U54bUHi4ebqCyylITnTYunhJR/FM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4 h1:JhFlkXPYduCLdZlgKcImnTxpVoC6sfIruCx6RbXHO6w= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5 h1:vdO631vuDYqochDF84nI9PchF0SU5mc8d/SASKlV3H0= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3 h1:lpi4DqhhfZJu8NfbMqwX2boeMvkFKu6xAgkkJvqwClU= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.3 h1:hp7qDEQkW3IwV5eaTy2inECTgRHo0o/vgIVxq+ydNiU= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.3/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3 h1:5En5SduZgfy7CMqJrrwqhsydJNn2Il+v+149eaR/czU= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4 h1:jUPCc+cetLIJK/YJnuLou24IjY5vIpt+8pwOgX2n6eI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4 h1:HhwP4DuLp2bgrEIjOt4XF0Y8YeOaMaPcQZzs4eX+xBw= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3 h1:f9RSnGMIyc+WyBMJsrly9mVxb5Up0Jz8PzptVYJvAcs= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4 h1:K297CdV2flRnCUNuxfXbomdBULprxHfCbnVp7r9Sa/M= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4 h1:mRg6eaBhdPScsiNhZx+v13yhR85l+ekqGq2x+D4ge8g= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4 h1:rJjEP5CSJw3Xsoe5Lvhbvr5P8q+rdt8/5IL2MDCc5n0= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= +github.com/aws/aws-sdk-go-v2/service/location v1.49.4 h1:0t8gadZLdquTVjABf62XpZ8yW5oMj6oRWmmc8OQUktI= +github.com/aws/aws-sdk-go-v2/service/location v1.49.4/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4 h1:8RKWBINRxIMnPvlLQer6GmoD8kxEwRaodsEVxiZRDt0= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4 h1:KswHF/oPvDYmumr9vj3d1jwfFDZCKPh7vI/OiLrYzRM= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 h1:1ExmmTFrP7UgFHOoNEiSrqWH7Yr52+VtAhxmbSyKKEA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 h1:c4LeHvhTAYsO8md5in7QrPUFpGqOXFYdRTxBULlOE74= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 h1:88tdsQqAz0hhrCo4jVxjrTSB9eoNtRLRW1FyfLUCDB0= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 h1:g7OqgKXlgCgtpG2/IFkxoQKguUYXJ3/XO1QOEoZgwFE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 h1:1vRJmRaj700hsd9p+gXRrbSu13xheA5YPkpVALYNC7U= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 h1:GJPo1aJDfnKPRcdsw9zOCY0zsoA8bN0jRJYADGzUfTo= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 h1:vDkjDkQM5EpRWQeOz1PKi1TpcdtmFjcLJxLPAjxjmg8= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4 h1:Ighjb/ZyKkpHgkbNJsV1g794OaYOMkZ0joAUbXEAL+M= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4 h1:MUW9N/0Y/Wkl4Jt5l9xDWB+nZjaEUwUm56ViraOiBks= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3 h1:vkmwiUCG5x9JH4tyrrsFQFspXTGnIpZpUo7kPt2A3Ak= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.2 h1:I16KUtaBYENTDjorLAxJRCjVqax9O323KlVCqwLMKM8= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.2/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4 h1:O11wfyGLkKU6lFrVF2qbikVyqJ22MiEVtFhbRc3ndzE= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2 h1:CM7nhsuvZf0mCv6TMqG5tzKUQb3x/tW99jnEpDchtbQ= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3 h1:jrJGbbokc3KIB6IzSB/JJuQOwWHqdWmZpkEEl/Zmyf0= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3 h1:OkuKInB52h0/mW5Z1OkIkQ+umda8vxpcMkUkF+/AoPI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5 h1:e/d9+n5bKYXCR6A6xuqWoFVsDEm5FNJh526rS1sXyC4= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4 h1:idjLJX03bHXAly/JajH7FDi1LnTjm+vz1Bm74l3+5jo= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2 h1:+zM/r3nG0slry9af+m0jgaiFJJvinNHSXj2uOVZNMdo= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6 h1:iGhPRaXDmVgFkoJp/VPZqxN7gx8mXqiOJsW0aDKKQpU= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.3 h1:DCKlfaaVB7mE7dtfGD60gWX1Y5nc+yh8qcBHvpdkRqs= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.3/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.4 h1:e72yFD4IgA7oHv5VPwnpT7vsiPUdxUw7tMky2k+LBE8= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.4/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3 h1:lHnod6e9i7gBkixiA3Wqoj3hX3a/NQELZl1/yPpPXpE= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2 h1:7d4lqzz/V3uC/AkHGwIPHvh1SBXkvM+eJlV+nb3pi2o= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 h1:j5Cyl8uJi7rF8FczVWWVI0A7WQgqN+ED2OSRe5IZCec= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 h1:5iK3XJb7lqznX5wFGu3hCs+hnYaqeihBs5qLs724nfE= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.3/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 h1:aGSJR31Z33MIDBz3imAxNYe3VJuev7pcyT3pIQUnTA8= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 h1:2xi1ySvJWcYhd0Uu/SuMkWAVZl4DXKb6KYbyo7Suk7E= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 h1:fSfw+4bF7B23fCjB63HZOVsJmAYMz3SIcCK28B6kvPk= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 h1:3btzBHLKRPz9ecnk0EIE+EAGbMtl99x2VWdTflAml2k= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 h1:qMVA3qezunrP0ZIvF75T8ktwA20HBXlBsHwR1U0A0H8= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3 h1:yQLjzkSYNfTFg0W03zmAvhykcAVCIoupphhKb9LKbWY= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3 h1:39TMmOdMKH69U8Srk6BFgH/yOyl8vAJc81ArWTAVXNE= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.4 h1:1EFYY1zW80E/1CdoEdKkRjq0F/3V9Q5KRh8eWbf4FQU= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.4/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 h1:FLRgwQXpnb+NWOAg1oP0VD0wM+q7OWJRssKyDsbrIEo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 h1:TQ0TJxq5Ke7E5bPP8fEBsvqqgacjQA6xa/kS/Js6Jpc= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 h1:ezX6I8vkNJDSYWH6Fxs3HZif3vCXXm1d8lg9BjhSdic= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 h1:cjQhZCAWDV6f7nFeR8DJaQz8qyFP0zwvUluOdojrIn8= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 h1:TCaXm9jWgdARQXQg5geTepn5/v6Iqn6d4JkAmODNpbc= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.4/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 h1:NDgqGmtlBkSNxDzbYFLfPnCq91kyr1kkf9Wa68Im9MQ= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 h1:SCHx0JQl2E24HbpZltlQdaQOD9BsjSa0fjDMz3OZYtY= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.2/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 h1:rXoN3hvwUimq8Z6uu2lsYncGPDQS+i70Rp1G0c0C/zk= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 h1:egzZblPqPYLXClImxh6zL0kVt+aINhKMtj0Dlzt6LgM= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 h1:zdjzJy+tcuRwgCI55ItwodgtmCqCdamIWPZZEEvdx+4= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 h1:1440u1Pza3HtYqsUiofmOYUB/i4fwLXRgvG9c37wz8w= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 h1:50EjSzYo2Zl1WRSRtNTNqH0inalyK5xzGjzNsxoP/Qw= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 h1:GWT+w34GEzacg4VLVFOAJrBMgWZqKSMe2LQqvjA5I64= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5 h1:2TQhiZYYw3PG/ZuX4m/ge6knQxHIWdJjnMRJASe9u+8= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4 h1:LmoqYCi723i8jvkALGA7E+1GeaOc2OHZNLdkwp7cjZA= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4 h1:LGXwwMDiIEAoUtzqVAqh96G6sFQ7bybZ/2sYGMiTYoc= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2 h1:uqxTxY0i8b1ZFHxIf6pZYpUCOuYV/xxcgTv0vDz8Iig= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2 h1:YT611m4CLcfXC6/qJxAk5AWWiFr4Ojt794aTk4a+HUA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4 h1:xSBL13ZwehSHGJf8hjCMDj4s4OTrSLl79LBbVpFv3Kc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5 h1:1xhgFCZOCiGCKfz9FmPc9mVLotoY2UVfA247qQeCQnc= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4 h1:1/zOH9q49LFP84tXlP2eyNmFK/wM+F5241kWWujDn4A= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4 h1:v3OoF8GxebOBR1XEW4FEvuFQwDUxiG8S/XxfYtB6fVI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.5 h1:5kyaUvSPlD4a9c788wy5uUxEnn3AKviElMtSYh7mFKE= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.5/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 h1:+RpGuaQ72qnU83qBKVwxkznewEdAGhIWo/PQCmkhhog= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6 h1:eOHf8IowLgbcHyL5lkofjq9Oiwox62NZfJanQ+mFLhY= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4 h1:GD28/y7URKoEGUS0OLSxnVl/j7zd7njJHzvKAKBuvA8= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3 h1:EdifhWi+JJJxF3cNWeam8camVWASGJrWl89ewbUvqhM= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6 h1:iUPmajNNwGUNByohjkfZIHDh5OtS7uWYevZ2xpdPCs4= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1 h1:KKqYw88o9dAaD4Cr36kw6lzy/ZIGKlF6x1uK2ufqvJs= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3 h1:it6H2TgSLlwa0RAR5Mb0f2HrrJDbCYAoIpmZHXp+5do= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3 h1:imDQ/7RtFfGZssclTJRJq0QADHBHAbI6kW/SYd3qE6Q= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4 h1:zWISPZre5hQb3mDMCEl6uni9rJ8K2cmvp64EXF7FXkk= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1 h1:wg+ZmlmqmnQjdTPpsMYBZQ+rn6x+2LPq28SwlQkRU74= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4 h1:CtJyph+31QRGcBa9Z6AZKx0uNdLpoMK+jQeIxaGqqdM= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4 h1:Mf9vV6JHwq7RMHeX6IUxyARZSCRrLKZAMDIbeQJBg18= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4 h1:ToxRxnVNC+UMHc6JYX/LtVywHtPFAgnFXFbP2OXEmwU= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4 h1:cqQhPQGmTOmMgMMmp4SZh0X1DxQhtWKMVqOM6VhDeiE= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7 h1:18YXcNXXEZ9kcHUkXP351Am/VxZtIJFSXPWY/JPbXrE= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3 h1:v+COFz9X0cbchDgyLpkteKIeGRYoMPgmqfPvJkIv6tY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.3 h1:pqqG8002es1CoJdDa0iIMITLoEAgMv0d5Pznnmo90i8= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.3/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3 h1:Ln5b+2lKA/amSuuKqjkEtL7hz1woblO14OfQ8dmB0J0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4 h1:/UOPu+KSWWd6x7rIUSCmu8l2tnmTrrdwhe+77JzRPXA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.4 h1:bsm64pDIz5N1TRqftK218TXsWWf3GxP2CDIvar8SPQw= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.4/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.4 h1:dX2NzZmdQQuCUQ1gPnrcad6xNlE4tIId1ftXVj8kN70= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.4/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.3 h1:4T0EjsLqUANqnBWafst2+Nr3Uw44MPdrPgysNbxDqBs= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.3/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5 h1:HbaHWaTkGec2pMa/UQa3+WNWtUaFFF1ZLfwCeVFtBns= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4 h1:GaIjQJwGv06w4/vdgYDpkbuNJ2sX7ROHD3/J4YWRvpA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6 h1:Tpm/fpaqiA2+70esCG+ZURVZiQ05V2+GBQPvFrwnFI8= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3 h1:8s1MuIH1Zinwe64qbt6ekR3mPK+RYUY3+qBQbhX9iV0= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4 h1:VFWAEcHK1Ci9FpBMzsD+sKAxQRFSV9Mq4uvzXyNLSL4= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3 h1:+3Y7HSw3r6w5C5hpthlykvHcAyQeQGpSk6Q+m4X5Ezc= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 h1:7PKX3VYsZ8LUWceVRuv0+PU+E7OtQb1lgmi5vmUE9CM= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.3/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4 h1:72Upm349w28OYUiynjP7pIyzWYjDLpT0YQMGGyq/Wzg= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 h1:e0XBRn3AptQotkyBFrHAxFB8mDhAIOfsG+7KyJ0dg98= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4 h1:Gh7vhnzighFyKJJcdYiYRjxKO0Nlofu9VpaGp+ZgKvQ= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 h1:PR00NXRYgY4FWHqOGx3fC3lhVKjsp1GdloDv2ynMSd8= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.4/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.3 h1:tL0fQyve3dknUaaWBeAvqRe2mb9AjaSfw/6ynBhIx3A= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.3/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4 h1:/25TExlOUQ+ujvARatWJq6vn8JBHSGx50HhkZQQO3R0= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4 h1:/yeQDqRM0QY715QgXA6WZaW5VqTK6uw04Hq+M1w4l0w= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4 h1:XRb8NiG+6sz3tApwcIFzZiu2TJeRV318W3qdRhhggiY= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3 h1:gtt7zDM6ZlB0xciw21A+vbl/A4myL/NK6am2y0Pl1kE= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3 h1:lG559VMq/SjLPgJ4sz7Qh8LVHKCi+En0CBz4Cx6YgIQ= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4 h1:4JC0KVW1KO0h8iOrV+4aw6OcbevCPizyiblhnl+e4aM= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4 h1:WDZSB1l2MxHuLOeblYZdsgD3WgtioapYnQvplItIsbQ= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2 h1:20JAmlxhN45SbHV2oXvdTJKURR+ZHCcTES3wQeOq8B4= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3 h1:FtX5kYvSuq4y03jSuAX7nDsIqU5jNSb4c3iWLgmgFqA= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.3 h1:PCF7qkr1aYxZlBhCjoQjwoogEHhAJpT0d+AgeVKWvWg= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.3/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4 h1:JtmylnUAIto+udJAxmyx9L5gLemItC+BFf9HQ/L1DeY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5 h1:e4ecT6WQrX02XTgDgE/UCJFF2vKQyuEBsUdnp/I/IGk= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4 h1:TG2MJZFEVhB7VHS8T9BCPRgOOguWtimq+yI937Q60fo= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2 h1:weOe+mOfoNacPyRBWVFe+aMxMVzj+LJjdUYE6piMWmc= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4 h1:HFApAbF5FyX/y+Rjbis/kFWbXDDFPnfrTLmzGXgDbyE= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4 h1:AThzT7RGEAmXLcawvUvxCDAZqLCH1pqqeIB60qeBtZo= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.2 h1:XE8FE0DcJ+NftSdKx4b5Ahx4gaBTZPD17N9Jn4yqbBU= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.2/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= diff --git a/skaff/go.mod b/skaff/go.mod index 0beb5dd97e42..753b5180948b 100644 --- a/skaff/go.mod +++ b/skaff/go.mod @@ -19,10 +19,10 @@ require ( github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/spf13/pflag v1.0.9 // indirect github.com/zclconf/go-cty v1.16.3 // indirect - golang.org/x/mod v0.27.0 // indirect + golang.org/x/mod v0.28.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/text v0.29.0 // indirect - golang.org/x/tools v0.36.0 // indirect + golang.org/x/tools v0.37.0 // indirect ) replace github.com/hashicorp/terraform-provider-aws => ../ diff --git a/skaff/go.sum b/skaff/go.sum index 5bee91b63b87..7af9dc3c3a4d 100644 --- a/skaff/go.sum +++ b/skaff/go.sum @@ -30,13 +30,13 @@ github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo= github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index 3e5eda96c9f4..a36736da7759 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -20,275 +20,275 @@ require ( github.com/armon/go-radix v1.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.39.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/config v1.31.7 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.11 // indirect + github.com/aws/aws-sdk-go-v2/config v1.31.8 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.18.12 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 // indirect - github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 // indirect - github.com/aws/aws-sdk-go-v2/service/account v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 // indirect - github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 // indirect - github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 // indirect - github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 // indirect - github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 // indirect - github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 // indirect - github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 // indirect - github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 // indirect - github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 // indirect - github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 // indirect - github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 // indirect - github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 // indirect - github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 // indirect - github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 // indirect - github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 // indirect - github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 // indirect - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 // indirect - github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 // indirect - github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 // indirect - github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 // indirect - github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 // indirect - github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 // indirect - github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 // indirect - github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 // indirect - github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 // indirect - github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 // indirect - github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 // indirect - github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 // indirect - github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 // indirect - github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 // indirect - github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 // indirect - github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 // indirect - github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 // indirect - github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 // indirect - github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 // indirect - github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 // indirect - github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 // indirect - github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 // indirect - github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 // indirect - github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 // indirect - github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 // indirect - github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 // indirect - github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 // indirect - github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4 // indirect + github.com/aws/aws-sdk-go-v2/service/account v1.28.4 // indirect + github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 // indirect + github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6 // indirect + github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5 // indirect + github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4 // indirect + github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4 // indirect + github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6 // indirect + github.com/aws/aws-sdk-go-v2/service/athena v1.55.4 // indirect + github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1 // indirect + github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/backup v1.47.4 // indirect + github.com/aws/aws-sdk-go-v2/service/batch v1.57.7 // indirect + github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4 // indirect + github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/billing v1.7.5 // indirect + github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5 // indirect + github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4 // indirect + github.com/aws/aws-sdk-go-v2/service/chime v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4 // indirect + github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1 // indirect + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6 // indirect + github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5 // indirect + github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4 // indirect + github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3 // indirect + github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4 // indirect + github.com/aws/aws-sdk-go-v2/service/connect v1.139.1 // indirect + github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4 // indirect + github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5 // indirect + github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4 // indirect + github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4 // indirect + github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4 // indirect + github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 // indirect + github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 // indirect + github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 // indirect + github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4 // indirect + github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4 // indirect + github.com/aws/aws-sdk-go-v2/service/drs v1.35.4 // indirect + github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 // indirect + github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 // indirect + github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4 // indirect + github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 // indirect + github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 // indirect + github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 // indirect + github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fms v1.44.3 // indirect + github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4 // indirect + github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4 // indirect + github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/glue v1.128.3 // indirect + github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 // indirect + github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 // indirect + github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 // indirect - github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 // indirect - github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 // indirect - github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 // indirect - github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 // indirect - github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 // indirect - github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 // indirect - github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 // indirect - github.com/aws/aws-sdk-go-v2/service/location v1.49.3 // indirect - github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 // indirect - github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 // indirect - github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 // indirect - github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 // indirect - github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 // indirect - github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 // indirect - github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 // indirect - github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 // indirect - github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 // indirect - github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 // indirect - github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 // indirect - github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 // indirect - github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 // indirect - github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 // indirect - github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 // indirect - github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 // indirect - github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 // indirect - github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 // indirect - github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 // indirect - github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 // indirect - github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 // indirect - github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 // indirect - github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 // indirect - github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 // indirect - github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 // indirect - github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 // indirect - github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 // indirect - github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 // indirect - github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 // indirect - github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 // indirect - github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 // indirect - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 // indirect - github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 // indirect - github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 // indirect - github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 // indirect - github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 // indirect - github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 // indirect - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 // indirect - github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 // indirect - github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 // indirect - github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 // indirect - github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 // indirect - github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 // indirect - github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 // indirect - github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 // indirect - github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 // indirect - github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 // indirect - github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 // indirect - github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 // indirect - github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 // indirect - github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 // indirect - github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6 // indirect + github.com/aws/aws-sdk-go-v2/service/iot v1.69.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4 // indirect + github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4 // indirect + github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5 // indirect + github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.45.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4 // indirect + github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4 // indirect + github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4 // indirect + github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4 // indirect + github.com/aws/aws-sdk-go-v2/service/location v1.49.4 // indirect + github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4 // indirect + github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4 // indirect + github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 // indirect + github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4 // indirect + github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3 // indirect + github.com/aws/aws-sdk-go-v2/service/mq v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2 // indirect + github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3 // indirect + github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5 // indirect + github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4 // indirect + github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2 // indirect + github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6 // indirect + github.com/aws/aws-sdk-go-v2/service/oam v1.22.3 // indirect + github.com/aws/aws-sdk-go-v2/service/odb v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3 // indirect + github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2 // indirect + github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 // indirect + github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 // indirect + github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 // indirect + github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3 // indirect + github.com/aws/aws-sdk-go-v2/service/polly v1.53.4 // indirect + github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 // indirect + github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 // indirect + github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5 // indirect + github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2 // indirect + github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5 // indirect + github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4 // indirect + github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4 // indirect + github.com/aws/aws-sdk-go-v2/service/rum v1.28.5 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 // indirect + github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6 // indirect + github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4 // indirect + github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6 // indirect + github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1 // indirect + github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3 // indirect + github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3 // indirect + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1 // indirect + github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4 // indirect + github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4 // indirect + github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4 // indirect + github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7 // indirect + github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ses v1.34.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/shield v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/signer v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sns v1.38.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect + github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect + github.com/aws/aws-sdk-go-v2/service/swf v1.32.3 // indirect + github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4 // indirect + github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3 // indirect + github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4 // indirect + github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4 // indirect + github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2 // indirect + github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3 // indirect + github.com/aws/aws-sdk-go-v2/service/waf v1.30.3 // indirect + github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5 // indirect + github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2 // indirect + github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4 // indirect + github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/xray v1.36.2 // indirect github.com/aws/smithy-go v1.23.0 // indirect github.com/beevik/etree v1.6.0 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect @@ -364,12 +364,12 @@ require ( go.opentelemetry.io/otel/trace v1.38.0 // indirect golang.org/x/crypto v0.42.0 // indirect golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect - golang.org/x/mod v0.27.0 // indirect - golang.org/x/net v0.43.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect golang.org/x/sync v0.17.0 // indirect golang.org/x/sys v0.36.0 // indirect golang.org/x/text v0.29.0 // indirect - golang.org/x/tools v0.36.0 // indirect + golang.org/x/tools v0.37.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect google.golang.org/grpc v1.72.1 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index a1e57fd69728..dc7404b5bae1 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -27,14 +27,14 @@ github.com/aws/aws-sdk-go-v2 v1.39.0 h1:xm5WV/2L4emMRmMjHFykqiA4M/ra0DJVSWUkDyBj github.com/aws/aws-sdk-go-v2 v1.39.0/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.7 h1:zS1O6hr6t0nZdBCMFc/c9OyZFyLhXhf/B2IZ9Y0lRQE= -github.com/aws/aws-sdk-go-v2/config v1.31.7/go.mod h1:GpHmi1PQDdL5pP4JaB00pU0ek4EXVcYH7IkjkUadQmM= -github.com/aws/aws-sdk-go-v2/credentials v1.18.11 h1:1Fnb+7Dk96/VYx/uYfzk5sU2V0b0y2RWZROiMZCN/Io= -github.com/aws/aws-sdk-go-v2/credentials v1.18.11/go.mod h1:iuvn9v10dkxU4sDgtTXGWY0MrtkEcmkUmjv4clxhuTc= +github.com/aws/aws-sdk-go-v2/config v1.31.8 h1:kQjtOLlTU4m4A64TsRcqwNChhGCwaPBt+zCQt/oWsHU= +github.com/aws/aws-sdk-go-v2/config v1.31.8/go.mod h1:QPpc7IgljrKwH0+E6/KolCgr4WPLerURiU592AYzfSY= +github.com/aws/aws-sdk-go-v2/credentials v1.18.12 h1:zmc9e1q90wMn8wQbjryy8IwA6Q4XlaL9Bx2zIqdNNbk= +github.com/aws/aws-sdk-go-v2/credentials v1.18.12/go.mod h1:3VzdRDR5u3sSJRI4kYcOSIBbeYsgtVk7dG5R/U6qLWY= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7 h1:Is2tPmieqGS2edBnmOJIbdvOA6Op+rRpaYR60iBAwXM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.7/go.mod h1:F1i5V5421EGci570yABvpIXgRIBPb5JM+lSkHF6Dq5w= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5 h1:fSuJX/VBJKufwJG/szWgUdRJVyRiEQDDXNh/6NPrTBg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.5/go.mod h1:LvN0noQuST+3Su55Wl++BkITpptnfN9g6Ohkv4zs9To= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6 h1:bByPm7VcaAgeT2+z5m0Lj5HDzm+g9AwbA3WFx2hPby0= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.6/go.mod h1:PhTe8fR8aFW0wDc6IV9BHeIzXhpv3q6AaVHnqiv5Pyc= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 h1:UCxq0X9O3xrlENdKf1r9eRJoKz/b0AfGkpp3a7FPlhg= github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7/go.mod h1:rHRoJUNUASj5Z/0eqI4w32vKvC7atoWR0jC+IkmVH8k= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 h1:Y6DTZUn7ZUC4th9FMBbo8LVE+1fyq3ofw+tRwkUd3PY= @@ -43,256 +43,256 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7 h1:BszAktdUo2xlzmYHjWMq70DqJ7cROM8iBd3f6hrpuMQ= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.7/go.mod h1:XJ1yHki/P7ZPuG4fd3f0Pg/dSGA2cTQBCLw82MH2H48= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3 h1:f8m2fHeWnjxo8RmCKRI8m9Ib2xdAtLT4W1qhqSf548I= -github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.3/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= -github.com/aws/aws-sdk-go-v2/service/account v1.28.3 h1:/nIFi7EtRokSS9sD0n5Lfafn+TgaJy4gh/wy8QKF0i0= -github.com/aws/aws-sdk-go-v2/service/account v1.28.3/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.3 h1:VUbqaG9R8mS6ogJGx+AHJ9W+F4Y70pnL22UW4DBocAw= -github.com/aws/aws-sdk-go-v2/service/acm v1.37.3/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2 h1:jMtwhVK2zCFnbK7TppPMv+SISFxiZdCSbxqPQ4GXrYk= -github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.2/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.3 h1:O5ijORj54OWqgL0ti7omJHl/iRhppHopnqYKSxvY6Xg= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.3/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2 h1:AxD7pJWzt03vHJIr7qkQFamtCTGxTqEsEOXOi6mYswk= -github.com/aws/aws-sdk-go-v2/service/amplify v1.37.2/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3 h1:1UsbZF54/TUa8YctxxS/9WvdHd0DCEEekikPII1UJ6Y= -github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.3/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3 h1:OKqCP0nhRd6D6o2hXX2E3s+tK7Qz145wF7gBj/V+HDk= -github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.3/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3 h1:R7qp2tPBLf2JlCGw5ssSztn51D3bOlTZx7i8UbxIq3s= -github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.3/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3 h1:J65Qy2i90Od5Hu7wT59tGJg0HSf4/YLZtk8JcHnhtWQ= -github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.3/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3 h1:e0wfA6NaMLUp9djTYlpJlaQH0OWcSj4mzlFanfHVYao= -github.com/aws/aws-sdk-go-v2/service/appflow v1.50.3/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3 h1:1up9FrDaFLBTUhOu7Ju+Br2LmmviiMWQ0KOtXffGKW4= -github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.3/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2 h1:uRuEgkGGXNYqiTKzGIoi93kxSrJNZ+vNoMMwMUE3B7Q= -github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.2/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2 h1:zx0HlHEbr1sCnUEfX634HFbblmsngzLZw+q5HenUh+o= -github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.2/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5 h1:dgQp3KXkmAsFqdwzE2bhlI1+uh/t/l4fU3byJXSHNxI= -github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.5/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3 h1:MGxizX4Dxif1+MaLusLI5hJGmBF1HYfb12IzSJOIYfI= -github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.3/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4 h1:BILINXfCNAdTAsLLWOgxznO/dEo8mlokULdMq3DhMpM= -github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.4/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3 h1:H2gFbd8AxHyxH0ebyHrzVBje+wEoCOCwSkaM1hfo/9U= -github.com/aws/aws-sdk-go-v2/service/appstream v1.49.3/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3 h1:xjzB3UyWJhS1jxiol4HVttvjFpQrBf8bWqvBkrLKDD0= -github.com/aws/aws-sdk-go-v2/service/appsync v1.51.3/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5 h1:oNGu1uGogf8EC0adnpQQd8TjOW42xnLjhftmBFGxxFY= -github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.5/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.3 h1:QLcZcW603a5Qvy3AfLiE40zVTUSucooSSNMjVjihVRI= -github.com/aws/aws-sdk-go-v2/service/athena v1.55.3/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3 h1:fEUbIysbq6SgJKkJZqY+KkD0nh/rjjXJyNCYv7i2hXU= -github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.3/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0 h1:3gdYbEifG0hBOi3j43F/5B5Wln0uzdk6sAZzULZFAUA= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.0/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2 h1:e1q22AQaQFCGaKOSR/Ce/IuKuUOGGf3ptuG6qRGMA0c= -github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.2/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.3 h1:VKQUbni9xYgTeGSJKTQJBp6ZSc4y5IhGbdN9uRWZ6lk= -github.com/aws/aws-sdk-go-v2/service/backup v1.47.3/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.6 h1:RFG+p+0+AGIHMJ+7SjzqM3a5iSiyizfy7iAzomncMeo= -github.com/aws/aws-sdk-go-v2/service/batch v1.57.6/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5 h1:0IBAM429oJEn+ZkqVH2avSawMrgd07kKNOx8E1jSR1s= -github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.5/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0 h1:vu8aKhx4RW0s6HYTSKsNCK6qFk/aF35pL7D5JjRhYXU= -github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.0/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3 h1:8XFuUGy9xvk1oyk3f1+rgc+bPcr/+Oi78TwrzGfMKAw= -github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.3/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3 h1:DdfGhDVYG58QgDZ2oIekzSBMW5eEcSNZPenN076/+F0= -github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.3/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.4 h1:g/3urydmGQnGIaJdO9J1LjQI5GjOXuHrAj76Fsv+SBI= -github.com/aws/aws-sdk-go-v2/service/billing v1.7.4/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4 h1:c1bhN5cKj9dQORUCR5Wv9DTkjnYSjNBCo8a3RVdYZaM= -github.com/aws/aws-sdk-go-v2/service/budgets v1.37.4/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3 h1:Q5DA5tDXRRdUuBuyd7vWMEygnECFM3aDz/RT79sMqNs= -github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.3/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.2 h1:Tbt4bajhFg0K72RyydkP/lD2PJ6bCh0EqJpWIOYPfnI= -github.com/aws/aws-sdk-go-v2/service/chime v1.40.2/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3 h1:wkQtfnDj46/GZRk2vCBprtN0PADIF8O6xL80cv4lrb4= -github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.3/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2 h1:5wkeUfJxR//QcNoUcoR6GiaQeelzF8Y0c/lN+qlA/UM= -github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.2/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1 h1:X8F3aT3L82nsA6EDXCZFJxCsEgi/Vyy4Q76ufj/zJBg= -github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.1/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2 h1:g3HwswgF0I/r9hpRfDI6x1gaVS66dAXvZdjlCfJfuIg= -github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.2/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3 h1:CgiwKnoXCnBIGjfszZQeRGifq/e3EgxevAAeD/rNa+Y= -github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.3/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1 h1:5HZUkH4sPTJkivr07q4Tu2AGPcttKxLRri8LCstfZs8= -github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.1/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1 h1:zDW02Yz5oAAdtZbIN8d5/XNc49hUAOLcVdzeYZqYReU= -github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.1/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5 h1:K2fWBYUDQ+2mkExTq2WiWTnnRPwLpu/HjUtaPIddgMU= -github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.5/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2 h1:NT48mne7aTpjDsCvUCcyXbGh3YwxqD0Y+3wWNG1yeDs= -github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.2/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3 h1:9MOxGs/G03cbi9f0LsYMUR7/DOPDkrCpuBBKzvoql24= -github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.3/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3 h1:o04FlK/Mkm2UvctYIPOrpgMpLYwFq3WIpceUk0d8c0o= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.3/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0 h1:6ly6/OBsK9fGwyEc2BNFs8bvCL25/vp5LF7Vt+NJW6s= -github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.0/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3 h1:7IR8c3gRjh67jHyUEkBa6cnt6KPAeBVTCpYExTlP0/4= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.3/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3 h1:Oh1V3SK2iV8WvZS5vnU66xRGbskZ77yR/YthjwaBOCM= -github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.3/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2 h1:3SHjoAwZWC9hQO0OinncZBQ/JNM8j6JZEux+MjUrg0E= -github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.2/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5 h1:TZfGQogiuK/0nfiNf+NBuXT6PeJmr/VN6Zo9Dy9jxVk= -github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.5/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3 h1:yN1lwOc+ucNgPfMRZoVBipmU3ZTitH91temRUTZMEPo= -github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.3/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2 h1:Q/P6xE+b50ySj3tPlqJ01kxMWK2/PfGlM5YiFutMw4Q= -github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.2/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2 h1:q+VB2EEg0X0wQQe/K/x94el09NUC8Z++6ncPnGEvpQs= -github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.2/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2 h1:4cc6TKkpfEv/oX6okF5hNmuZZmAHkqxdcId8ilxkMIs= -github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.2/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2 h1:t9g0XO+iyhOMfqv6VeLYNcX6geP40LFUxrkkHIvQaXE= -github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.2/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3 h1:sGA055gwWp3JrYUU27KVNxn24VWtGQA+V6JredhXx7A= -github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.3/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3 h1:Gk5a11gu9ggN5xx0jzebrkdkmeP6ZkAd+3Ij9ajy+EA= -github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.3/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3 h1:lRCBGmRp8BZUsggJHY7SJktmEDdJ57UEI4mDEeIFvqY= -github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.3/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3 h1:U9DXGIWSdKJysfQ/1kKMhj4Q75SWK05KQHHRHaoZSlU= -github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.3/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4 h1:76AcPx6tafmdmmiFCUALzMZtrYQ6N3xbRKjRbH5TtFI= -github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.4/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3 h1:hlqrLBGjN2jT1l1X2UKpke8z9rxb6Dh0y2OvFtlUhM0= -github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.3/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2 h1:J4FsRjoLyC6rc8MPax3sHFejHHCqFl+fdRqa7S8ztB0= -github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.2/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3 h1:26wPBwPmguOnursKuVr5OXwFrKqW4BxISsoVVCSMG9U= -github.com/aws/aws-sdk-go-v2/service/configservice v1.57.3/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= -github.com/aws/aws-sdk-go-v2/service/connect v1.139.0 h1:dIa+kK5GZCIRDjBcOxBDRCFhfRcL29X1F72Is14VBeE= -github.com/aws/aws-sdk-go-v2/service/connect v1.139.0/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3 h1:3FET8kX8y3S5r4WUqDbIYau29foqrEl9nvdT5jOWnkk= -github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.3/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3 h1:9kPT6XJHTs+m2IiBbAsqO8UeMIiNIAxnulp38TGlgbE= -github.com/aws/aws-sdk-go-v2/service/controltower v1.26.3/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3 h1:Wx48xOjSPlZfvc4UvUIKwZpMMJfuQgQwQR6ufdQZ5Is= -github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.3/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4 h1:XzfWQmz24jPT9659r4vuvEtqHjxU+cPklfCR+2uQwPA= -github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.4/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3 h1:99NPYrFnCOWokSMewfFPNIDaYOJg02HxZQYb83bkIu8= -github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.3/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3 h1:ehDPY5vVIm03qPpNpM0HuV1pfYz3B1ppUSU2y0Cu6OY= -github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.3/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3 h1:KjkuARQiY1kknfxJ/nwmvHVfQ3eMgiOLEUDpEOLkzpQ= -github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.3/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2 h1:KV6LpYH6JgtXdymUBMQqHsHjURn201IENzNUENNj8SI= -github.com/aws/aws-sdk-go-v2/service/databrew v1.38.2/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3 h1:kB0J8Hkp86ykWQEYA9CoGpnckvCzfBePSZC/N2sSfSM= -github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.3/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2 h1:nHeBOQd/PQ0ASg2gefe1jZauBE+WBMw/GrrmFRka5iM= -github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.2/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3 h1:7xY1NeW0NiqO0eZRRhhvRZ6e9NAlhrwvugWoytrz1Ew= -github.com/aws/aws-sdk-go-v2/service/datasync v1.54.3/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0 h1:tYG+bkHqTjuylERnj4fkeKX//pI635rPecfd92c/Csw= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.3 h1:ohs9RseCKRDqWRGYq393OfLVwBBMqBQJNOWkMQVOVNQ= -github.com/aws/aws-sdk-go-v2/service/dax v1.28.3/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.4 h1:94/VNUYyIlHmcc7hUQaJCTkHOZNjSB+wgWtrnJ2bfcY= -github.com/aws/aws-sdk-go-v2/service/detective v1.37.4/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3 h1:qMvHOfxgxlDcOATW+0qb2QKKPEjT4ClxdvF4ntWQTSs= -github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.3/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3 h1:XX5COtPs8mqWCpOGYvA0TuFHmiKc9PSMkDeEdy8if/I= -github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.3/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3 h1:meYxFM5Av7DIHO2bnBGzjPu79AQDmI/sqh5gWfDAjYw= -github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.3/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2 h1:nujiDIF/WC8PoaJFjOPrPyVGTT6eoCfEzRQn7hwPhnw= -github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.2/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3 h1:hIrO9Mqdwo+7iG/0Jc3MYou36WlzAsN21voQLdcA3Cs= -github.com/aws/aws-sdk-go-v2/service/dlm v1.34.3/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3 h1:BORh3m2vuX2EnrvGPPUAAYno1HBTHUhzxbrE67SwmqA= -github.com/aws/aws-sdk-go-v2/service/docdb v1.46.3/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3 h1:/AhMIB4EVvFTJoP/3P4PWkwoXDlMNnD0CmGxG8qaBRA= -github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.3/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.3 h1:UpoZ31y+1yg3kdwSjD0thOuKcunKOfeT8HJBE9GpHrQ= -github.com/aws/aws-sdk-go-v2/service/drs v1.35.3/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5 h1:CFxQf42CuJrS3X+mIzg84gcMtGxTkqxd/oAYKY5RaaM= -github.com/aws/aws-sdk-go-v2/service/dsql v1.9.5/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2 h1:oQT34UrvH3ZyaRZsIuoPcplH3O3LDSbRYSEU77RafeI= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.2/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1 h1:DCsvFxkh1mpniU8TC6mBNlCmGIACV9+bZD1Pq/s1dzc= -github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.1/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2 h1:ZZwP7uQl6BU9qjOPyjT0vbrEgAue2KwFWm1A/lILQfY= -github.com/aws/aws-sdk-go-v2/service/ecr v1.50.2/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3 h1:TseGWPsifeIe+JE5FevuC/UqDGxjl69/4eMbVBiW/00= -github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.3/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6 h1:vdwGoP5jv8/8wkuuKpLleGMoT4eGF+Z3xAR/VBlf84Q= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.6/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.4 h1:OXBbcwzHzcYKXa149dOa3cLdpj7VhJSmgoUCVEakyM4= -github.com/aws/aws-sdk-go-v2/service/efs v1.40.4/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.2 h1:3IRC5NLi6wDDO1sp1Nh27I1fBkp5LXgQrrNkMa4AcNY= -github.com/aws/aws-sdk-go-v2/service/eks v1.73.2/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2 h1:HoAgowQhaTnZbG1WvFUTJ4KJ+fzyS6xoTnB0TxVA1w8= -github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.2/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4 h1:jS5WUYvgF7l9ej2ciJit4cOOPSdB9UTv47b/AD/tSMY= -github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.4/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3 h1:61XdTI0Yol1blhU1mpj3lyxgZaBaO7EcZrAZ4Ryj+pk= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.3/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3 h1:PGutY1v6+O1wOnvKLUoo+jGM9vzghqEouBb29W2hcOs= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.3/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3 h1:2qIOcFxanNgG2sqhx+CHOXSqrIXnVDnZeHAhPZppIsM= -github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.3/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3 h1:EutZtbefSYP5UVGxsteGA2RzeubDtXPFdefEHQJDUMk= -github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.3/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.2 h1:Wi0OchAG+ziv9bpqVVP+lBz4nDamfVylxdI5Ap8uGps= -github.com/aws/aws-sdk-go-v2/service/emr v1.54.2/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3 h1:uaZeVBAtlx5GFml0R2vc9yMEj0eHVT4mHRTp7nX/gvg= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.3/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3 h1:ZTIEgVUstAjEo4pam/c1fNQ6bZvh+cOh5WSnEYDviss= -github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.3/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2 h1:p7FpDOf/ekz0XzY32MYZl2QtFQyrZQFoUVuqnA8fRA4= -github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.2/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2 h1:CMz0+ncQrlCmXEXtllvqBf2twd5yOawH7AbEBnjjfs0= -github.com/aws/aws-sdk-go-v2/service/evidently v1.28.2/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.3 h1:skIIOiOWutrNk8XRlKjBDd5EInhVTCHipzZwiAkS+HE= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.3/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3 h1:oDwsLH15IM1qKRZAEEXYMBw80cgPIyDjKDmQg8yhyss= -github.com/aws/aws-sdk-go-v2/service/finspace v1.33.3/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3 h1:ZzaGDAggi7ndY+k7USUoelU8PtytX+mbDQ3pDrfDRq4= -github.com/aws/aws-sdk-go-v2/service/firehose v1.41.3/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.2 h1:Vc7+H3j1TS6FcReN2Hju3FjVirgdfSSpqh2iJenR07k= -github.com/aws/aws-sdk-go-v2/service/fis v1.37.2/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.2 h1:uElMRGOynBQJykoMTa0mFYBbS5E/jgNVOmV80ZvqAUQ= -github.com/aws/aws-sdk-go-v2/service/fms v1.44.2/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3 h1://iOzRyqTsVZclZbRVZ9m/japj8Z8fBNVAt8JImC6Rk= -github.com/aws/aws-sdk-go-v2/service/fsx v1.61.3/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3 h1:TBhAwun8zzNxHqVRmgDZf+/4cvxvDywFbRSahtzb70k= -github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.3/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3 h1:ZAZdVjWaUlvgH19xNOstpLMeSb/2uvmz+5SKMElnwLg= -github.com/aws/aws-sdk-go-v2/service/glacier v1.31.3/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3 h1:N5p9nkju9teQB1rse3iZPdH+nfOIgAfbT1Cpyob5hKE= -github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.3/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.2 h1:Vr1IS+G4kRd/q0hhnhivFYwtkrlPFE3St8Hb0HasyWY= -github.com/aws/aws-sdk-go-v2/service/glue v1.128.2/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3 h1:qIryzNcEG2nP0nO2KU07BfAOdnHtFtcCV83HjPvlXD4= -github.com/aws/aws-sdk-go-v2/service/grafana v1.31.3/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3 h1:FzPf8lsswZi7C0DTBOQwGbfEULKHdTWFtfM0PtS4tRw= -github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.3/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3 h1:itiLwxZhI5LgoQY9zP2V+GbkDZSD2ssy09CG/UbV6/U= -github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.3/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3 h1:WR2Q5YJVzcq0FGHg37UwI2CpfUjEuYQw9JuCyRq+JHk= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.3/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2 h1:xQ/vq7ZDPevhCmApsO/+BeDgJXZAeUaBMOJUBLPAelw= -github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.2/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.4 h1:3jK50qpmtonshV/dumtlzZA/0i8vp8a0KqWThrXnhpI= -github.com/aws/aws-sdk-go-v2/service/iam v1.47.4/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3 h1:ykjlRa7GQnn8vUL2DqiehXiA6JDOyYPoG9FOuihV9Mg= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.3/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3 h1:ME8pnAvLlwjyktTKs90TQn2DyKXC5t7ojFo9f+DMgtM= -github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.3/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2 h1:5vo4H66qsNDlcYkIWHoUdgiI1nlKyUbCbyrjA4gFLE4= -github.com/aws/aws-sdk-go-v2/service/inspector v1.30.2/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3 h1:N0c2Xhm+jL85dxldlPy8vB/iqLXIevRz9xgt1suQ1Aw= -github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.3/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4 h1:xMTRgWRG0wb0n16sdeUzOysJkolU4uAxhgMaGekSHJc= +github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.44.4/go.mod h1:RnQs1hNYaG/DtynraB96hzZeNJn4SFQ61DWJVSwIzY0= +github.com/aws/aws-sdk-go-v2/service/account v1.28.4 h1:aydP/dwNvf4rGrIhiZbYzVqI6eqUvy5QT/leMr4KOrY= +github.com/aws/aws-sdk-go-v2/service/account v1.28.4/go.mod h1:vEEsv0UwyJVpz6O9xcEl21qW9JyHqsyw6NJV/Q3FKWs= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 h1:gpzR1xWvsrNJeKgkFQHGXJMUr6+VHVBhEpDo2MfkaK0= +github.com/aws/aws-sdk-go-v2/service/acm v1.37.4/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 h1:1bdOr2ALn/hXmSu55cn3meYg17IZj9QdRAMWqTURv6s= +github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 h1:ZdrAxWlzkxx3rFcbr07+7gOwxepzoTRdNZOMCNC6EIc= +github.com/aws/aws-sdk-go-v2/service/amp v1.39.4/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 h1:Wf3pQg+WebfAI5aklg3B6x8/5UDjXSFxzVaX4a30BBs= +github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 h1:UoAThO0F16j0XhBF0xVhur/ceXiidEtSTOL1AiUhBZw= +github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4/go.mod h1:75e40kpEp0xN8GV96hOqVZsJS/8w0kUqOtX8GD5uFZI= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 h1:L7sv5WDeqp2MnRfw3+gFq+kFZT8gP+jeJheuAPS+BNA= +github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4/go.mod h1:d4d6vBDxwSDXrJgsbbqnew9xpWj37flCD3TucpbVGBA= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4 h1:fU75lgQ3pTsilkNYkU3uWO7JrU/GnShkvk7zmy08Pw4= +github.com/aws/aws-sdk-go-v2/service/appconfig v1.42.4/go.mod h1:cOfEo7trL6GKGg7xPkYl7K9enEqxDPWwP5Z9g9Ota0s= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4 h1:rIQoPkHmZqRv75QTWIq4Jmq4ZVKI95YNfwbKNE6WNIs= +github.com/aws/aws-sdk-go-v2/service/appfabric v1.16.4/go.mod h1:aoke3oc5BgdoMNHsoRjD0iVoDG5sMXzsTf6ZhAnCxvE= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4 h1:150FCG6u3IITCJhc5uCnpF7Y9rQtDQZgo1UNOdl/Vzk= +github.com/aws/aws-sdk-go-v2/service/appflow v1.50.4/go.mod h1:cT3dUJToRgxxIEivPPCxtBeTbr/jhbl1OswvhxBurbA= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4 h1:Qas4CJ9dtjNoyscxK5f3+26KOvmMJt9sV9KHQCp5his= +github.com/aws/aws-sdk-go-v2/service/appintegrations v1.36.4/go.mod h1:L2vWx3ByDvexI+QuR5y5ksGcDyt7NizWVoW5L6+QmhQ= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3 h1:ba6H23hZ5TGoqP5d/qwR8Pd/5vPpgHgWo+iTMavnxro= +github.com/aws/aws-sdk-go-v2/service/applicationautoscaling v1.40.3/go.mod h1:vk1Unns8uKVcZaMw4E+RFh/WuI9dG0jcIjaFUBaBrg8= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3 h1:AVa+7o9GYeSg5qklgUWpAklJj+wlPV9AOnFmt1lQLJs= +github.com/aws/aws-sdk-go-v2/service/applicationinsights v1.34.3/go.mod h1:ewshZ4xF51yMvIcD0wpgMqwTBHbQV5ELFacslzemz2U= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6 h1:gv6lQ4vtMjkRmW7THRzMOv6Ftf169KrxwXb85h0Qk2c= +github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.15.6/go.mod h1:qsBM3LROOTfueX2pVHqnN0GcPt+CdpjNnlFZwFhuZko= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4 h1:jvzu4hfjfKfELV/ZYJwMu1BEvdBEd2lCwGAuYk8OPJY= +github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.4/go.mod h1:ERK1VWUlMk2GgKlvHuF7WC5yPk009A8/YwtxAyT1xA8= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5 h1:0TR6WL0tfj3wMkm8xVcFxzJMKuXML5marAMGO8OKEIw= +github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.5/go.mod h1:hdYYVSK5A1bt+RV9VvQKTNU3n7RVBBqsd3ijROVn1ww= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4 h1:E1JXCmaYQe6ySAcFiQ7atX891fqtNtT+ILFFL0aRs3k= +github.com/aws/aws-sdk-go-v2/service/appstream v1.49.4/go.mod h1:yyJRdhDbEYWY3Lf9ifvt8I0dNU30giDqEIouPiTStGg= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4 h1:76jUhK9kCrcmNv8xj1BiMsPBoBIQqCfuL0Lh+XnWAF8= +github.com/aws/aws-sdk-go-v2/service/appsync v1.51.4/go.mod h1:HuCfVTh3NTChkfGdN+nOqu28fVRoTwMoM2/0PWzYJtw= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6 h1:EMvtMNY56NfNpBKFLKI8srgmtb4DSvlFCy8l8QYv4gQ= +github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.6/go.mod h1:mVQARE6itL/U8epIkgnzd2hhJ8AAQat5FunwaypDM3g= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.4 h1:TUJjhgsNyMCxtUMJlUuEcUkiM3wxdM3pWVCWtSlM5H4= +github.com/aws/aws-sdk-go-v2/service/athena v1.55.4/go.mod h1:xjxXyztlj3tAPouK67eDm2PnxH/Ceg4btt2y+KJe+Hs= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4 h1:t2TnOPTclJrmPOn6ly+5K+bI4yCR9pUFlguT8viVqQQ= +github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.4/go.mod h1:h5adZ0NMh3SMmGC3aG5AZ7XpmRFUrlsYYgu9FMCgRCc= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1 h1:R6r+//CnZNEOyUQDjTaqfUNk5FE/umPWbLo4l3b0glQ= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.1/go.mod h1:EjcucApl+Do5h3SFDSqYdTd8KA25sWmttgF0J9YXDkc= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3 h1:Erjv3OrmWRuNnHnAjNHjdgKppmqIzrqyY5OPFXdMcvQ= +github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.3/go.mod h1:WxM0Cy6cIXwyJitcXHzWzUKYHXC/23gp+xZ5OIsvgA4= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.4 h1:IDO4noL9SPjjRDYgQPN5pQkvlWa65Z8U4fxJcMqwgZI= +github.com/aws/aws-sdk-go-v2/service/backup v1.47.4/go.mod h1:QTx4WU73HyMzHtHeOjeNNUBx8ZTgri+R8qTJKg+JZBE= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.7 h1:U70jYmNrPFDJKxAGi8Va6BQ6iOQpYPgofG7B5QSZVoM= +github.com/aws/aws-sdk-go-v2/service/batch v1.57.7/go.mod h1:kQNvBp+FpFZaQ9NGTPuGRqREOs//GhoVSXnYjcV9f8s= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6 h1:J39E926fD+zbL9qBNPK235Zn+KarvEPOuTtCH/WNN8k= +github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.6/go.mod h1:Qy7ki+Cj48OXfe7zIRSQ7IjXYMvTE/ddhnpR98VyyM4= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1 h1:hZwht+1MdXlNot+A/r7SWqk0w2WVpiDUzRasdQFv1Vw= +github.com/aws/aws-sdk-go-v2/service/bedrock v1.46.1/go.mod h1:NFnqdOIaYD3MVMIlRjZ0sUzQPTWiWfES1sdalmLk5RA= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4 h1:2jf7uhcRTPdNU+rmKmePMC67sW3DwXD0BZe8eqvrFbU= +github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.4/go.mod h1:O04szfwjoDC5j/tazBZ2hb1hXQkhoJgglRIW6vJWw/o= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4 h1:nYvxys7OuH+D5QYlJuVaTSRCuxaeLVpQLwifpt9tQP0= +github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.4.4/go.mod h1:73rs+5WDpBLlZUtgV0IO3+4EjRS8AW7vFbA4RBFd6R8= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.5 h1:Nb77k+S9tLLyBlcGOlnyfR04KzoSXc6/+O+1EKeVITw= +github.com/aws/aws-sdk-go-v2/service/billing v1.7.5/go.mod h1:qrv8fPqdJSgnc1Ue7O3otSwQXVho0/z27T+r8hdPxAM= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5 h1:+DDKTfPDgM/arwXWWn3bzzzEULgL22WugDHm8zyWaio= +github.com/aws/aws-sdk-go-v2/service/budgets v1.37.5/go.mod h1:IqipleKaucVL842LZ5vJECSJZFNHvUBE883fk8lwLkk= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4 h1:rahhkonNJRm0BvfnNE19U9t0xBKXnfwEcnqroRmY2ec= +github.com/aws/aws-sdk-go-v2/service/chatbot v1.14.4/go.mod h1:Wv362fC5OMvg61LsaygecobiBobnZpSFivKsN17JHvM= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.3 h1:VU1s4PIE+qoO7mgUw+Q0CnMKTcovQIbLwWjsAlxampY= +github.com/aws/aws-sdk-go-v2/service/chime v1.40.3/go.mod h1:VPxmIOTeFIvxA+yAzZCwmiEa3Y/UBUdbnPk1CYIIS50= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4 h1:Y/BCDbNlaidX5uZFL5S1Tqf+yFTIn9FU7sX5V0Ma4A4= +github.com/aws/aws-sdk-go-v2/service/chimesdkmediapipelines v1.26.4/go.mod h1:pyv6oP2apt0MygRhKSEH8xKqn9PPTMMdoaxlZzxUl0M= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3 h1:CVBV4QSP4X7nzzfDEZk36g+QpnQlpnynLxDRgdKViPc= +github.com/aws/aws-sdk-go-v2/service/chimesdkvoice v1.26.3/go.mod h1:6A5I395go5amjKIMv5RxecQfIQQvjDS9I465L11NgWY= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2 h1:L0DsPxkujlIhY4CXQJrDwExRlVnjImaVJM603INQRF4= +github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.33.2/go.mod h1:/h5x7oPNBdml80MyUvU1AYeICd+CzxBhSnsnkIGBxpQ= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3 h1:ZO01YSLeh7hMFOXmEIS/1/qBl96iQxJuM6bn1g9FnLM= +github.com/aws/aws-sdk-go-v2/service/cloud9 v1.33.3/go.mod h1:wA4Inqja1Ct1F0GtY63IakddYVmrQMAAbugZArB2c00= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4 h1:iU9bsK7azwrRuBbTGID4y0lc/EiRSYNgPebNx0sElk0= +github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.28.4/go.mod h1:HYQkrJctfx1pey/YAFRMAKcOlp01pBY5xpVGVZt6kxk= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2 h1:NsxbnWtrrFysJ3bjBAaXshvGA4OLtdW/x8gHQ+eYdo0= +github.com/aws/aws-sdk-go-v2/service/cloudformation v1.66.2/go.mod h1:eTAwEMBFx1uY9cnjh98c1V7GFqftJRb5X3wrUW04BTg= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2 h1:DJuk4/xsGQhZOUsHrkA42/fv0286tWOVFzf4O1dO/yA= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.54.2/go.mod h1:InweIIn0Fz58J7FIBpBOPfjLuIhKcK1G+Ia8Gwxod9w= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6 h1:tGnVQqQACXWOokzoWwaY8iUsnw+uTLXaReXSDEYHir0= +github.com/aws/aws-sdk-go-v2/service/cloudfrontkeyvaluestore v1.12.6/go.mod h1:t6/E3+Hx3v30UOBBaH1tswaUWK4H7JyUdIEkVe067FY= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3 h1:ZjZVJviRZ+Bx8h9Wcb5JlGRRIU1KiulReIdpWv1O4zk= +github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.34.3/go.mod h1:0+GiOMpYxe/WgFyJVtHl4lUL+SiXXWaVFmN7AowVw3k= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4 h1:Nk/GP0JrQfxA58QMasIqZPnb6T1DMYTg0Ut5BWqmauc= +github.com/aws/aws-sdk-go-v2/service/cloudsearch v1.31.4/go.mod h1:9mOeWgtN/8Y/v2WCfwYr+zpedhfGmtltk6rM30XCRt4= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4 h1:Ct4RSaeHLX4h6eua12PFjz5HoZtWrCWzlNkATPvZjDw= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.53.4/go.mod h1:NE9Jd1chPuOVkgPPMkIthFg99iIqlLvZGxI+H3bJB3E= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1 h1:OSye2F+X+KfxEdbrOT3x+p7L3kr5zPtm3BMkNWGVXQ8= +github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.50.1/go.mod h1:bNNaZaAX81KIuYDaj5ODgZwA1ybBJzpDeKYoNxEGGqw= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4 h1:3iaxLk54jdxyeYAW0t07bjF0Y+T456dLFxhd5BVeD50= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.57.4/go.mod h1:ptJgRWK9opQK1foOTBKUg3PokkKA0/xcTXWIxwliaIY= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4 h1:w4KTIyi00VkvstzYrFNBpYMkgjNHTkKmYpJhpvWKf5E= +github.com/aws/aws-sdk-go-v2/service/codeartifact v1.38.4/go.mod h1:7BroBfL6xrlb00bp3fugPU/DJW/5wLgcmhBasBnC+ro= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3 h1:ndr4GuUl/NrlBAz5gJ8Zyeb1Zn4iHYpJRWnjHLK7GRs= +github.com/aws/aws-sdk-go-v2/service/codebuild v1.67.3/go.mod h1:Vr6PJ4LOxgkyhWPEwjYsyETCbGm7Q99M4UZ/nnJtEJY= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6 h1:8m0xSqNJqmbjAqI5qSSyX2DstjmjdFqYwGMVtmQfozU= +github.com/aws/aws-sdk-go-v2/service/codecatalyst v1.20.6/go.mod h1:F/eq1WqUWcvdqr6W+ost/HzzTHUS9TV5roxmWTbLyz8= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4 h1:mpSJqoSQ72txLeDIMITdB7BrympxSJKHKyDZlloDYEQ= +github.com/aws/aws-sdk-go-v2/service/codecommit v1.32.4/go.mod h1:si5vnuLTMYup65U6CmTp+n1+q5Uzpdl2Hx8882j3Q5Q= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3 h1:qiEVvlxSiJSLAU1mE7cJekrtRSfeouALHAcb6CddzkU= +github.com/aws/aws-sdk-go-v2/service/codeconnections v1.10.3/go.mod h1:lKknoh1Th7WZCnqc8/b7qkfbTvqzh/QiU5QGHX+Q3rE= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3 h1:DZHdW0Tw4FgzzM9X8Lxlm7DnPoJF7ut+R3ulwspBC0w= +github.com/aws/aws-sdk-go-v2/service/codedeploy v1.34.3/go.mod h1:QPWLaCXIoNHNlo+GTCccx63QD9F5OkPjZ3Jr6pPswyI= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3 h1:0VKjWe92lu13piBobyz2HSPZMfTcONDCa8XkeH+TT7c= +github.com/aws/aws-sdk-go-v2/service/codeguruprofiler v1.29.3/go.mod h1:wxXJv5Q2RUzp3H8WsU7HR/vfHnlVjA+01QvgkMB3bf4= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3 h1:X35geUOBvQGKZiCZQdKhSCx27pwIO8z1jXb+oYYoaCU= +github.com/aws/aws-sdk-go-v2/service/codegurureviewer v1.34.3/go.mod h1:gHPuA0INnzSbuQVAW27Mmb9OgPZxKzxY7gimzZDQIIs= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4 h1:jCsKpcD6Dj8daCTpwQb4FcNxnIjXL7+5vuGGzS0u8HM= +github.com/aws/aws-sdk-go-v2/service/codepipeline v1.46.4/go.mod h1:xbTz5WMnoORVyPmGoDDz68krfdSj9gcA/WLQq+o9qmg= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4 h1:MTq/vcMa/kVYHDpYIqCNfELGGyN+ULT6oH4Fmt5Q55Y= +github.com/aws/aws-sdk-go-v2/service/codestarconnections v1.34.4/go.mod h1:xgzHvEw4wFGJtePq+mnxuvXbIgHjR2Bm7bY+tbqbv/8= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4 h1:cp+djURkd0cUDi/dVkx9MCCDv84Kd8TY9Et3KmCFBjY= +github.com/aws/aws-sdk-go-v2/service/codestarnotifications v1.31.4/go.mod h1:9yO2ora+z+V7i5UcoVZRkTN+wrqKk+blZE6HapRoXhE= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4 h1:0u9XT6Mi5V6U0GGI0EG/QHKRu44PO+9vor1awxLywxc= +github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.33.4/go.mod h1:FTlFWei9isFDa6mU66SHEzMpK+VVWqMbc1V3G+WCnOI= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5 h1:FOD3qP3yqkNE7WN8PjX9Y+9fPgJdvOqLXnA4DZlXuiY= +github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.57.5/go.mod h1:M535tDOpoNJrgl2FV6nUxWq8asER7mY+xoTiTPcgLJ8= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4 h1:29BM732laN08dVs+5z+qh+vBPeZEnj15IqobW4y4oNM= +github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.4/go.mod h1:H3n/gYCQF6ZkjFQI+fVVXwbkRLDPXbEtbBi3NwZTnm0= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3 h1:VPxguqTtIcjVPnwHiJ7rNQr9gPERlI/vKzrkl/sM7Fc= +github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.3/go.mod h1:aGw9jt6otTqJ3zwm+AlUoNl6Vrl8AkfFWIibvk+BIeE= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4 h1:Qk1P7ltOokM7JTpOJaZH6ALesaxVwBgoDHtktjfrm7Q= +github.com/aws/aws-sdk-go-v2/service/configservice v1.57.4/go.mod h1:Ao+h1Szn6S3ZemyfA9I8YMmqu/sRgexyx2xZJdwH9bY= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.1 h1:EcjVKcOcPh+ZBHOVVa+fqvBSPlppFSaGWL+WPHFDzYc= +github.com/aws/aws-sdk-go-v2/service/connect v1.139.1/go.mod h1:ybFXrfh8spGBlbgd8q/MVqzt2RvdSMhWO6EiD4UkHRg= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4 h1:KjM2HAQgsH9gaofgy+JKHF664UH9zwuetSo42il9eLk= +github.com/aws/aws-sdk-go-v2/service/connectcases v1.30.4/go.mod h1:gJJ6zE3RWdeQfnNcpaD9Hyx1rqLqMA3RLYR9fveHWkQ= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4 h1:mDhXopIZ9wA+rRujZzTFZAQyqQ1YAWiWYJBoVy0SqZA= +github.com/aws/aws-sdk-go-v2/service/controltower v1.26.4/go.mod h1:Wxn4D3He/BjPolAe7+Piw/z3QwX/gKf8y1qgm5i30pk= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4 h1:IDrhAstiKNG91mcFFQsAMcuimNxOUawoOOYUYCFGJz8= +github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.4/go.mod h1:q6iPHDrwx+9RYDKoghNCP5g35n86VB+6d4E7nx4G1gg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5 h1:spKO2HoyWCtig4QSTHs/ax3hwtZtKVg1LsbWTp+N/rg= +github.com/aws/aws-sdk-go-v2/service/costexplorer v1.55.5/go.mod h1:wqo8rV2j3/Uh59hqumqQUgY3YgiVjHsnPRY3FzNDx3A= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4 h1:+uszhA1bSLFZSgAMi/Yro8CzUb+iFIpNvT20CY7VFPY= +github.com/aws/aws-sdk-go-v2/service/costoptimizationhub v1.20.4/go.mod h1:czyjqxobbmdUEEm1n7bLoIKkOVkci8YJ5visLKUyBuk= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4 h1:4xkoNwaiDfIo9BgELVPBf+NGHJcC0JYCuGMVSGJemmk= +github.com/aws/aws-sdk-go-v2/service/customerprofiles v1.52.4/go.mod h1:5sgiN0bU/hz16O02ZdbyT09W8ronvsf6G/o5RhtOqzE= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4 h1:2E9WtBb3Q2XSmjYtKK8W69pHnGH7suHw8bkQxoV3ZUY= +github.com/aws/aws-sdk-go-v2/service/databasemigrationservice v1.57.4/go.mod h1:yFELb3hbh4s37dNPx/9Cw1WqNvIQpUZ1DDUOwyujG4M= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3 h1:75aFq5weR8mWFlXKVcf+w8cHRvPTvmpd5ne2KX7fsdE= +github.com/aws/aws-sdk-go-v2/service/databrew v1.38.3/go.mod h1:tQud/P2f/T2PMfBxim1wMxbszPxVgqOWwn7B/5k01c8= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 h1:nuCRmWnECQ6dt4dgnj2twKS0VWIKcAeXwOUCFpLhSKo= +github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4/go.mod h1:t1Zf/bmvRLSbrmOnS9B90Onwj9IGknjw2IGCKE1MrSQ= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 h1:RT2vYyEURb1Y2c9WoufFdJYt9RP5cPIlvZqT7gcg7vc= +github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 h1:HaqO010CgYxtu8mNUUQUd2QC3yDN4JS9Olt4vOQpR20= +github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 h1:nrtKiE7MDX32FQ1cHI404PJvYXdyP5a1g1WbKdGgf7k= +github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 h1:0H43bqbpiPF4WV+2ppV9l6T30lWolBsshd8ZQYt//wk= +github.com/aws/aws-sdk-go-v2/service/dax v1.28.4/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 h1:a/VOCosbBdJUSyaEXRN4hsqGbXG/itfOquy7GX1vBeU= +github.com/aws/aws-sdk-go-v2/service/detective v1.37.5/go.mod h1:Wd/1AyIHcEie1jxULqHsyyDQyCp7t7qZGkTdHYWIxH0= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 h1:jlHUydwGygu48BGAxwnLVRXoWSBJj0Bcxp3vlPutrB4= +github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4/go.mod h1:7uG8mxCsfVnpqJena2CnrcZq/ErivfTfUhQJSSm4Hgk= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4 h1:cOxtWV1GUyZNnjTjtMubcxcxxPML9UDPpvXHPDXYwiI= +github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.4/go.mod h1:xay2+q3bE2RGgYETO5xT6azzyur8hJA95wBVbqXGevw= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4 h1:S6rzGfjYIEEI/VDbePk0+FpOVwLbHu2HnHvvFBwvomo= +github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.4/go.mod h1:CIj8gf7lhOeB2QC4bluEXD+boHFBQdXdiKDwDIfMaX0= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3 h1:iUQ+6c3yr+bCq5gg9eNQEfuvolqyNQjFXKGmTXUg6Fk= +github.com/aws/aws-sdk-go-v2/service/directoryservice v1.37.3/go.mod h1:YWvsW4SIxjxmspcZp26ax/TDaEuqBV/3fh3wXKw+sRk= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4 h1:XMYBoEVe4osddab0s2QSUSoPLMTaVSIO8yILapboDDc= +github.com/aws/aws-sdk-go-v2/service/dlm v1.34.4/go.mod h1:+4Ps1fcvfOwtempXFqmTVkqKHz0Szj4QNZdZ6eg01r0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4 h1:3/Q8u8WFz26PNHnbysOVqW/SKM1eZyYpiGGCOQpbzc0= +github.com/aws/aws-sdk-go-v2/service/docdb v1.46.4/go.mod h1:8Vo8DDQJM/x5yD0zkKJUqydUnpmES8rZNNjEhSSDHKA= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4 h1:0HSQQ+x/2cMMfOMQWSB6QZSBfaOF31QtfDEvppMkuZQ= +github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.4/go.mod h1:67W8iJW1OBEPN3zSouebHSuWkAuZ6VJ3hnn+t0XJRIc= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.4 h1:Oe3tvXkRSvtyJAtmD+bK0yTPNCqb9jPfHmVjWD+Ny3Y= +github.com/aws/aws-sdk-go-v2/service/drs v1.35.4/go.mod h1:Wqni3gRHuu9pIb42cL9m+jdBNntA4a+dk11KFeRv+sg= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6 h1:hgRu1NFDnCR5V0FkuGiI7WB9xR/xEtSNoCLqRzB8W1E= +github.com/aws/aws-sdk-go-v2/service/dsql v1.9.6/go.mod h1:/ApNiCtQwiyM/KNe14Q9wkQ4zN5HqECXea86ADGRCCQ= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3 h1:fbhq/XgBDNAVreNMY8E7JWxlqeHH8O3UAunPvV9XY5A= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.50.3/go.mod h1:lXFSTFpnhgc8Qb/meseIt7+UXPiidZm0DbiDqmPHBTQ= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 h1:6TssXFfLHcwUS5E3MdYKkCFeOrYVBlDhJjs5kRJp0ic= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2/go.mod h1:MXJiLJZtMqb2dVXgEIn35d5+7MqLd4r8noLen881kpk= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 h1:phfqjO8ebHGoC/GrjHcuTrVkDCeM9A6atOYTCY1XsXo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 h1:/HxbCJjqyO4eJ1FCVnvUJtXbWOnG217jMpkYaTUP6V8= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 h1:VwvvHn/XroaU+md5moLOuFtvGjrExOVr2s3JP+3I2FI= +github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 h1:iOfTDjU/S2b0BSWCqv7fDbT4uKo0e3jdtnRHVwXXggI= +github.com/aws/aws-sdk-go-v2/service/efs v1.40.5/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 h1:V6MAr82kSLdj3/tN4UcPtlXDbvkNcAxsIvq59CNe704= +github.com/aws/aws-sdk-go-v2/service/eks v1.73.3/go.mod h1:FeDTTHze8jWVCZBiMkUYxJ/TQdOpTf9zbJjf0RI0ajo= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 h1:uiWSUtTWqpvhP7KSEpVpIm0LqOtXtzOx049rmukP/gI= +github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3/go.mod h1:igTRxVYuxplMPKS5J1AEThtbeFJQhUz845YtDRDzJhY= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5 h1:G8Fc8YJ8bTHvyWu0qAp/HJebp9Mjtg2qpmQ0L071OKs= +github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.5/go.mod h1:FxgAAgHLfYKd4H/+e1hSUjdS6wFHkAlC6IsVNwjwe3A= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4 h1:LU+R9E1B8FXjKbGxL4TSmaTrmUk8JOx2Ad2rJBFh4JY= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.4/go.mod h1:k1o3miorfzvEEwJJUbM+N+3Th3HhaLYgCUPdphBVMzw= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4 h1:gV2I0ie9/hnwYc+HO7H6m4iSQ5n9s0n0KO5TsmOKn24= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.4/go.mod h1:YXClVP0EJ91D+khPRye/nUxK6/uQOsFEhMTKYiOnnrw= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 h1:x0GTanUupmZLHUqqxR1zTubiBsJt9BXu1RGPSAwqGwY= +github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4/go.mod h1:BYpnrLyOHFPjo962ieMDYnMVV+DX/vhHv+fC5xqaDX0= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 h1:fcnPiM4WIbUoEk5VJ45fJlIVk8zkcSMuepuI8IZ+FNQ= +github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 h1:pXKG3/B5OVTYmautR+UpCWbeLhmaVnxeiWkEXVGzzSE= +github.com/aws/aws-sdk-go-v2/service/emr v1.54.3/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 h1:UOLh0c5Zjnn8/JA25dFE6BtBIELqYi6fATod7ZKP0ZY= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 h1:zOWo+iUy8bWSXDxz99OiZGBl8KBbgexMTCP3rDxwzQ4= +github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 h1:390U/RkWYmxI9z2konFlfhXi05PV6+ywYy1rDvGvD9c= +github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 h1:mmhBtyY6j9ncbB417ldmSvpQH9MIW8C6H20OZstvzTI= +github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 h1:DOHjB2RH/hJvp+QETG9HgENH+Td7iGQ5gNniSc5GuQs= +github.com/aws/aws-sdk-go-v2/service/evs v1.4.4/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 h1:nIMnqlQNvnMuMkNvSrcaykHHHBZtsSZ+uPeKCpKyBx4= +github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 h1:LRa23ftG+djfUEQ5rGQxm0IfX5pc1bJ1HL1J/F61074= +github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4/go.mod h1:QgY+jFd7FTNnRsurxGobEQ1uRp+8kFP/UkkWVXF6DzA= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 h1:w86eWbktz/0doyawd+dayOgnEb4DZ8n0prb4kTsYAgE= +github.com/aws/aws-sdk-go-v2/service/fis v1.37.3/go.mod h1:PsJ4ekpdvwqIFBlgMZ1HaZ5P3iituQJfQEy1eLz2fAc= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.3 h1:UyOwFgg45R332kOkxOHB5p5Eyg9e+s2fhSJS1fx9Ypg= +github.com/aws/aws-sdk-go-v2/service/fms v1.44.3/go.mod h1:lgy7T6HGD6w11vJ0HsLm/HMONw8laHCu5OSH+sJR4/A= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4 h1:7cOXwp36LxpPZfZYeNvnBI1UD5wWo1IQBHI6SiO8nkE= +github.com/aws/aws-sdk-go-v2/service/fsx v1.61.4/go.mod h1:ZF1kKlh39RVJXsTfjjn+ndGeGyOgymTfBKDLAQt4Neo= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4 h1:LW3GDoIL0+6ZLxu3j1Fpcfb0RTNjLcZfYBIRSp8HKdM= +github.com/aws/aws-sdk-go-v2/service/gamelift v1.46.4/go.mod h1:zIiSTDYhzmpmhTwpMBTM2GCqYUrT4RXXGjbucKY11sc= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4 h1:9PpI5RumQIRZj/nwwxg3EI+pXiytPQpfhExsWrVarIw= +github.com/aws/aws-sdk-go-v2/service/glacier v1.31.4/go.mod h1:berXJQ3VzyaSs0GMWAxbR8WUoyTAbhl4V/Y2KP0qNWI= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4 h1:qXSfvvkko/4z1mRyMVXpjwy76Gu5Gu/Sp7u/3rcfUq8= +github.com/aws/aws-sdk-go-v2/service/globalaccelerator v1.34.4/go.mod h1:cTDgKOHww9GcdugD6O68jqZiYxWawuWGth2KgugvEnY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.3 h1:ej5T/e0mz7iMwahKmImq/V2gVg0MUwfu3ylPXk5ZccY= +github.com/aws/aws-sdk-go-v2/service/glue v1.128.3/go.mod h1:5V7k8XWjeKYJUVU1bwMcudAVTi7RoexWqKdg67uhtRY= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 h1:1TEsqjvmsw8853+Pe6H/mMFySsZX0aoMJ4XDqEkwdg8= +github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4/go.mod h1:Y21s9nnGF+FqLqVMy80j9lxhGTFE7wcxrtJNKH+wazs= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 h1:a0xWOiAVwUN6lFLLyo//ZmlYisRBShtqWAK13Wq7Gqk= +github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 h1:QD71EO8w7RDwT/w6gnUS7dD+JZZljeomz/Gx9XvHxNg= +github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 h1:dlchWELsKc+8CHOQ/QBzWRo0DyxyN2VfaFOKjY8yqzU= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 h1:pKDsKc5fov+2XJx4JcdonlpUddvvHozYPw/XEBfgQMA= +github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 h1:o2gRl9x3A/Sp6q4oHinnrS+2AC9Ud8DaG4JL9ygMACk= +github.com/aws/aws-sdk-go-v2/service/iam v1.47.5/go.mod h1:0y7wFmnEg9xTZxjmr2gHQ4xOHpCfrt70lFWTOAkrij4= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 h1:KO3Plw+lTPS+Yz9F7gHJlaIoehZ7j9eVwcLYHqTKXQE= +github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4/go.mod h1:FUWsCCyCZzfPI6GVh+ASz+f1M+GG/ZWGaUjqWp4ttR8= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4 h1:demzU11+z1wDbJtku9SX27AOaIKkcv6uuUipJm1Af0M= +github.com/aws/aws-sdk-go-v2/service/imagebuilder v1.46.4/go.mod h1:Mqot1KEfp6SOthyGtSV/2vcATRychQtv8mugiydCUfs= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3 h1:7DQM0hDZ5XZbH7gTRUarFkO0enCCn0k5kr8GCTXkLn4= +github.com/aws/aws-sdk-go-v2/service/inspector v1.30.3/go.mod h1:Wzq73ChjlQ2LxaO73XnOD55Jqz/J5kSHU6Gd1YB1yE4= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4 h1:Xp+30qFm4R/ZHIT79K/2HMzHYm1S4ipMctmWttaSQQM= +github.com/aws/aws-sdk-go-v2/service/inspector2 v1.44.4/go.mod h1:33s7mmxOLzrYa4M5pRUkDCe/5wgSRi8UlNJ7z7AGDRU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebPEMA/1Jny7kvwejowCaHz1FWZAQ94WXFNCyTM= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.7 h1:zmZ8qvtE9chfhBPuKB2aQFxW5F/rpwXUgmcVCgQzqRw= @@ -303,268 +303,268 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgO github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2 h1:E0aEhyEIYT6037Mp2iC2aQqPMOSXyx7QpATrRzSWB04= -github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.2/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5 h1:Q0EhGuaHAj4JoORLDAjBVjF8Mn6s2G22HOI2cyiHiP8= -github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.5/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.2 h1:oylzB+N5zgt9a8r1KFF4fUjyMCmJxk7DDcYZ73jJ/s4= -github.com/aws/aws-sdk-go-v2/service/iot v1.69.2/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3 h1:Y6U+oOSbmvBEZVCBXGV9Lg2w/TgDv3j/jeSmyD52xEY= -github.com/aws/aws-sdk-go-v2/service/ivs v1.47.3/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2 h1:PtWcIGMEgmZw7dPtmyQtrRrze1jmq7nx60P7hIFmSLA= -github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.2/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3 h1:YOs7Wh8W57BePosZeyZ1ttQz+sJIm2sJMLltK2unRSk= -github.com/aws/aws-sdk-go-v2/service/kafka v1.43.3/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2 h1:uUTuq15rr4cBtmjaIQrI2bkJ2sQpN84mRcEcBNV9LZU= -github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.2/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3 h1:Xvvu/WhFR8FFFG04reXXcfwxju7ahxkdmmXCQBIUU1k= -github.com/aws/aws-sdk-go-v2/service/kendra v1.60.3/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3 h1:AxYLc29OAKJcNHt/yc8lDRux7yw7tIKDEZbjmQ+8thE= -github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.3/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2 h1:/1ePalSfTJFvFaAgVfmk68IgDVXLnz9B8brLDLuJjiA= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.2/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3 h1:ntVUKs2OANJzUMgptRcCWeRly7bh2qnaWLu9MSkTVU8= -github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.3/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4 h1:7dUCNxVqzajaFL6A62A/7/58SK+cGoZUycB+pqI/Ll4= -github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.4/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2 h1:JZc+TmV7GhZpLNihKx40rnzsCwu4Ak+cZ1yD2rQ+44M= -github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.2/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.2 h1:8ZT2x7reXVcZ1WTL1ZhbrtHAZ0FDoUckCOfCY3hj1n4= -github.com/aws/aws-sdk-go-v2/service/kms v1.45.2/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2 h1:ZPVbkV2ml9HNlQrj4CcKg5S13cY+tN9o+4D9VKPSBwI= -github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.2/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3 h1:SJV093tdmw7stxbBVsI3w27ACbUfULROVoe+2eAdng0= -github.com/aws/aws-sdk-go-v2/service/lambda v1.77.3/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3 h1:zZ9mPrGdmGP1PODsPeQM5Urs36ARzbEP8L3nYypc2Q4= -github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.3/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2 h1:oAeHK1qB6/wGEBdKTSv+jjfLTb7g4a6RwsqiVHE1TEE= -github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.2/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3 h1:vUqoKCjfg7L+zVZzV7WhJO5xpYiA7f1LH2YQZVh4Fio= -github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.3/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3 h1:1wLoyS3UyZ/Zff7VtNyZLsM9Uz1Zl8VMe/NVQgEWtpY= -github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.3/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3 h1:rM9m9IqU8Xe2iri5POlPYJqozcrpumFh9+P7RQuXFJw= -github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.3/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= -github.com/aws/aws-sdk-go-v2/service/location v1.49.3 h1:XkOxlF5yDs7O6kUuWu0v7nK2rY+2xBEUAVxxz7iSJvQ= -github.com/aws/aws-sdk-go-v2/service/location v1.49.3/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3 h1:SW8XsWLEQEYI3b/hrSUtqfXVJP15KShbRle+mq/6VV4= -github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.3/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3 h1:gZ73DX1ajTdB9YIl3WBCjtISEv4jh4kV5MFdWnYHKeM= -github.com/aws/aws-sdk-go-v2/service/m2 v1.25.3/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3 h1:7/eiPiRzlh3gGGsw9fut/jF0OjHi1dTFkG5LpaOf3FI= -github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.3/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3 h1:kOh5W0lkjk32TUHee9pawjWdGGF1r/CAdDFZVot7GeQ= -github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.3/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3 h1:CWSViTh02oGiL5HzVcLmFLUXI84JEqnIYW9lkiLV1ws= -github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.3/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3 h1:Tl8XbLylRjbQ/bNHJ1/4jG/wHpY2SaH3eODO3jVwAIM= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.3/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3 h1:eNse7c/+jyArttO47CCDu8OR2XlcYsxz3fZeJUuT3IQ= -github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.3/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0 h1:VFsXwfXdn+R7mJpW6RojrBbPR7PKzNqdLRdijyVRN48= -github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.0/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3 h1:XHvJ5EaNMHxAVPLjjJ4W998ts071nncetNCBynSHBHg= -github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.3/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3 h1:kGj5haaPlv/4N9WchQ6b9ce2ybREzkMhk98mSfaWZYM= -github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.3/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3 h1:EOfp/PVReiMGq0pTZ+nxC9/HhUeTHxiWqsvQQgocL48= -github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.3/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2 h1:v23iVYQ+iFfFZNLsr/ywLhjZRbo4KZRdjN06PAFlt9o= -github.com/aws/aws-sdk-go-v2/service/mgn v1.37.2/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.1 h1:lVMaetZYyVU+wjGJZPDiK7Ukg47+RvB5sblqeVmiNAI= -github.com/aws/aws-sdk-go-v2/service/mq v1.34.1/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3 h1:CreP/c9+Vm67Pnt8m2fMQbj8nOUarwehGgE2V8v3Dqo= -github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.3/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1 h1:xfXl8YaVk6cD4Xh0oZQLxoi9nbq+UxcpQAuXQxVjvsY= -github.com/aws/aws-sdk-go-v2/service/neptune v1.42.1/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2 h1:uv+Tytn65YD51XUSGHMlwaw26mFUUcVQEVqY/I4oA7A= -github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.2/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2 h1:rOqGg/U8hwKjE1YVNLJI1/i9OEzflSg1B7EJ2CTnq2I= -github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.2/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4 h1:Eg17S+7DxbDcTESPItMeYp9pw2S+VG5CITFdXy1zQyg= -github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.4/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3 h1:bnQQ6UMsM28gqMYfM9t7ag2468xgqWQs9H48iEBCs5Q= -github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.3/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1 h1:zx0pG7+L5q+MrDR+GuJjOFM4FMrbZbawG8NscGKHsxw= -github.com/aws/aws-sdk-go-v2/service/notifications v1.7.1/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5 h1:ChWNG3Mdf2YD8IhcKDETZNLxmticIRESuyafaqSi/PA= -github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.5/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.2 h1:h/+TbMyoxyDoajB6Hz/cZxKpbwHy4rf0V0p1yZF5rIQ= -github.com/aws/aws-sdk-go-v2/service/oam v1.22.2/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.3 h1:4rTMTDwCr3r0A7OVz+1cSJvYF1s7kArD8EuXN8jTrPs= -github.com/aws/aws-sdk-go-v2/service/odb v1.4.3/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2 h1:rOSllKhojjc7F+WiWJjgJFjaozIVkQ1o+JPlggNzhCs= -github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.2/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1 h1:C6IH6Ho5ZnQl9STch9D85P2APWYbTt5AoWon5TYOvc4= -github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.1/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= -github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0 h1:pokghrmP5zmoAOwXuQT29pCCQ+obzpqxD1M+QOxNJu8= -github.com/aws/aws-sdk-go-v2/service/organizations v1.45.0/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.2 h1:sjNBrTfaAs3FYz/2dLHGpJoheoEfBVOoMWUm196khLM= -github.com/aws/aws-sdk-go-v2/service/osis v1.19.2/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3 h1:TkxBxJJ40xug1O/LKAx5gDgIzbne8s5z+01JZsiOdeQ= -github.com/aws/aws-sdk-go-v2/service/outposts v1.56.3/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3 h1:tiEJt6LP4GcTju7vc4t7aj2d2gvXvkH4ktuwFf3Op8s= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.23.3/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3 h1:n8W6n1e1nm9iHo3O1h0im145UBakpEmOCCkXTGnOkoM= -github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.3/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3 h1:dg8pXY37N+jlkBNMtqmN1RIA02eeV6w924Pbbw2Vdfs= -github.com/aws/aws-sdk-go-v2/service/pcs v1.12.3/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3 h1:T3sijNk4rqJI3ajHRFJgkQaoVoDFtZz92A9OWddBuFA= -github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.3/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2 h1:vxG5ai0YDDGqzbYCXC8Ke2S/O6K9/QXl5MZRXmA8iMU= -github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.2/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2 h1:0BafcFFkj1/vdltDq4HCqiTJO7GKi9eemWNYFNrmyx0= -github.com/aws/aws-sdk-go-v2/service/pipes v1.23.2/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.3 h1:xjs5fRla7BJgX/O/wjwinS18bgHCpyj9cTg5dOZ8tLw= -github.com/aws/aws-sdk-go-v2/service/polly v1.53.3/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3 h1:2Vs4rdjtC3C2yv9I8ZSa6SBDK8HthRDBr5deAQ5Pb3s= -github.com/aws/aws-sdk-go-v2/service/pricing v1.39.3/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3 h1:2LbASrBr88g+ApHFBCdXUEJYFj6C+UzlCy+Lb0Xu+8k= -github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.3/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3 h1:DffGWHTp3dA0ExQ9sGZHJFWYDgAJklcYcApJuRMoYOU= -github.com/aws/aws-sdk-go-v2/service/qldb v1.30.3/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3 h1:moedI6EMWizWJZGLESDf/RjNZo72wiWbIxR7pT+XEmQ= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.3/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.3 h1:EI5MwUgodlf445rcKXTp/fFFoe7k05kzFIQhpgyLEMI= -github.com/aws/aws-sdk-go-v2/service/ram v1.34.3/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3 h1:/ZeGWrqKQ1No76MZ6ltR/J6piLImbS+DZnxB08lpYps= -github.com/aws/aws-sdk-go-v2/service/rbin v1.26.3/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.1 h1:z/PNnuOCKZDfeaSHwRUiP6GxsP4m6dQYOZNgqyYDj2o= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.1/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2 h1:B2RvKy5bH5rJCQCp504tXY4Yl4+pf6Se2xSeCjqXa6w= -github.com/aws/aws-sdk-go-v2/service/redshift v1.58.2/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3 h1:0Jpu/NrAmGknpn+ziFS1SdD95fPhVji6FGceW2/5gMg= -github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.3/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3 h1:OxFP9d3Z36IyNGf7Ls2OFIOrDzWZX97f5Uljgw/iJGM= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.3/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2 h1:QOXHnU5Z5ZZRTXkgRX8UNkdFX85Ttk+bOMEICuIljgQ= -github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.2/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3 h1:NP1L3PejqzzBK7eDheFISpJ/AF6WM6Yt2sSQUG9qqFg= -github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.3/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3 h1:buZwM0k768yrRPVQhlqxGjco8HePVXCBsdazota6EUw= -github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.3/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4 h1:O5Dr8bBH5wGxMMc8OLb/SBOJdwjHB/MvEwg38JbaMBI= -github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.4/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3 h1:zQ/rqzFXI35uo7KknYTViOtZux/kSh0Fu3vOcTQ5REE= -github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.3/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3 h1:RIHo9aLXg2g/06Uzw6PgFQiuGd1ZLfoD1kHjlHFSiK0= -github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.3/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1 h1:qew9X9TyJrKZSrORLlzNkLiqBGMEZa6eNfr5oL8grOA= -github.com/aws/aws-sdk-go-v2/service/route53 v1.58.1/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1 h1:RJ4ZLydy7ExnxyOsXefhtvI2AJIDv712MZTKeImxOAY= -github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.1/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3 h1:RdcZ7tjaAprMW/ADhx/A01nfm8j55iOo9aTDNoY59lA= -github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.3/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4 h1:R4RJNmyvJ9w1xzaIZyckMWxIhJ3mgqHUbP/0zB4A0+E= -github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.4/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3 h1:RhBX5ORL+P6y+YkGPKsFlqaWbgX9tXZyFTBhJyEYMb4= -github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.3/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3 h1:pniIup6rzD25rCcheV/g15zkvc+Hvkl+dHlP4TyY/4g= -github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.3/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.4 h1:XBhTNPtS3JdGkqE+sMUCToFGUMm5x6dVcR6IfwbacVo= -github.com/aws/aws-sdk-go-v2/service/rum v1.28.4/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5 h1:+/jvX6kswC86XIj6gyLYIe/t/WE+RxSOoHWaK6P9Hg0= -github.com/aws/aws-sdk-go-v2/service/s3control v1.65.5/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3 h1:tls504hsQVZQju/7Dx5Yr8Snf8RvyGJfVveILKOR9uY= -github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.3/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2 h1:BCAXixlWPvxRo+YYPYrzEoKlDpGiTXnBhKN98xcZkAc= -github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.2/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5 h1:Va/+2jVlMHlUyA0nhS+v+5YDrKCMAlU6kD1pWUbsYik= -github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.5/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0 h1:ql9qBtq3g5uYsOyDUsXRBo7JcW8D67PxUkolgw1kjS4= -github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.0/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2 h1:r9r5nnaDUEk9QkhZdKm9o32e8aO0VtnkkpSNudQ1uXI= -github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.2/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2 h1:L5XX/c85QabIkQ9liNVfFC0EYIIPRmd66Am62Y2rmVA= -github.com/aws/aws-sdk-go-v2/service/schemas v1.33.2/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3 h1:IhkIkvACqBTY6I8mbwXV5xFXQyNJuR8X0gfcbTXFjHk= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.3/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0 h1:cm/NvVatIt4lclwOt4t5MO8lnR2vabp2q5i7zPUoyJM= -github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.0/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3 h1:BErslvIoc6fxcNAoemPQ8R8BNang/sAbuut12LOOfg0= -github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.3/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3 h1:ch8Iz6TsqfK3USQn9/NEVFgC6QbG1uW3K7fcZSiDKKY= -github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.3/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3 h1:9ix7ol9egITDJihhKgesbP4VSEBivrVx+u8XcpCtRno= -github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.3/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3 h1:gq3vaFzarpVWRQdLSHU+KKeKoPOmA7SPXmb4zlnFfmQ= -github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.3/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6 h1:DLXOcjG32Mp4z+3/ha0nyZbpQGtC8iFYS0zGKj9LnTo= -github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.6/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2 h1:fEoZDba5jGATkaR8Guqm1hHymfwOvn8nI7aCJcePv8g= -github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.2/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.2 h1:4JmF4Xs6Vpo+zHzHJYP+/7wZz2F2TuVXFYCLnxEBvyA= -github.com/aws/aws-sdk-go-v2/service/ses v1.34.2/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2 h1:l0Wpnl3l7/0ZoplEbEUa8q9UOs+pmesFvq2J5F80kyo= -github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.2/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3 h1:ym5gX/IWjlphJMvm65RqZjIJ6R/pJTUTs4ww/WqOxTA= -github.com/aws/aws-sdk-go-v2/service/sfn v1.39.3/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.3 h1:bBbXXHiczeUqMT0rsTNKMfsJmiH4alWEdnISAWkDaX0= -github.com/aws/aws-sdk-go-v2/service/shield v1.34.3/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.3 h1:lwm9LphdDz9YhG8zW+lj+M9+t0To86r5oewWmuplU08= -github.com/aws/aws-sdk-go-v2/service/signer v1.31.3/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.2 h1:Djc2m7mTPuizL1iMxJfMc209PDy2AqiN1AXrtq/rBdY= -github.com/aws/aws-sdk-go-v2/service/sns v1.38.2/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4 h1:zzGhn+22j9GlDxSvHM3r3esmacb+nBt6mnK5iPjjSzk= -github.com/aws/aws-sdk-go-v2/service/sqs v1.42.4/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3 h1:0vR3D1PTK2s1BDqlIgbSvGSIagR3qlSxWllTzuAImA0= -github.com/aws/aws-sdk-go-v2/service/ssm v1.64.3/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5 h1:hKkVjegD4//4n7GqC47T7x9sWfubbppvulyj9crp5mk= -github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.5/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2 h1:m+m+WtYsEyGr0MHrQTITHiVpo/VCn2q0IZdGqBGhF10= -github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.2/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3 h1:MXTDAHwEZ5NzaLnsq34xjPXEVh0VaeGD5rATFCgFqvg= -github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.3/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2 h1:SfEgky1fDjAGRFYxLnrnDVlo0ZOqH39t6KsspYJPebM= -github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.2/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.2 h1:rcoTaYOhGE/zfxE1uR6X5fvj+uKkqeCNRE0rBbiQM34= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.2/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3 h1:yzeq9QvTmQfUMY4FHs11SxWJhBqeaaTEPpfzdHa1BZo= -github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.3/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3 h1:BSIfeFtU9tlSt8vEYS7KzurMoAuYzYPWhcZiMtxVf2M= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.3/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3 h1:091+jMFSSt/41p2PqQzhKHi6SDZhGikc85jF/rHKzxM= -github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.3/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.3 h1:yEiZ0ztgji2GsCb/6uQSITXcGdtmWMfLRys0jJFiUkc= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.3/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.2 h1:0tdSVdRb758sUeOXVf4wab4Cc0zcJsTF4awNHHaMYIY= -github.com/aws/aws-sdk-go-v2/service/swf v1.32.2/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3 h1:AAkk0qqhKJNuevsjO4Ojtyt1UuaeJdXbLhrvVZlc1cw= -github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.3/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3 h1:590svEMzHYYMnp1XHwhXJppa4xzWCh00mIE5hJyET6A= -github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.3/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3 h1:NKQnk5vmAWQ7a8LjhJwsMCkpdVJUMRuIy61LghA0XHY= -github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.3/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2 h1:PAlobZ5sYo3uJhdVguofsIheoDIv1ntzNJBJ8Y12l3Q= -github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.2/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2 h1:gNybrG5g/1zlSVTwo5fOTHBoBEJBg7s1h4J0ohi/DY4= -github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.2/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3 h1:fg+lOUf9Aqy55y15Do5wGcBfOqphwX7gXy9oSMO78Vs= -github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.3/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3 h1:7d7yXb39lw8vOuGegoOlrb/E4lZGOhg+F1qzAPSIJwE= -github.com/aws/aws-sdk-go-v2/service/transfer v1.65.3/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1 h1:JjcfVFnDZk+eflgSmIju0rD0QjwKZq1OFZt5pBB6Og4= -github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.1/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2 h1:0/z4TX7EHT7bHp/YxXwpAbcEJY0Ujo6hyQXv+m20SCk= -github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.2/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.2 h1:lkY30KPjIpWlR+CgOjvgoJOeep53Hv3YxFLl5mZatRM= -github.com/aws/aws-sdk-go-v2/service/waf v1.30.2/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3 h1:bd7tAx47jDk9XaCvt93yNyGCM7X6oD+ihoQiWeiiONo= -github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.3/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4 h1:Ea4CMk5sZOknJttA28mqYSQcH5IQyCBEhwoXcu7sxyc= -github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.4/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3 h1:rha7Ulfi5bpgvnb4DpA1+Z/JcBN6SbChOxbbsTwYbro= -github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.3/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1 h1:O7C0I4BIip3plwr1ZWJYEtR7omntOt3Vo1peBlT2/j0= -github.com/aws/aws-sdk-go-v2/service/workmail v1.36.1/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3 h1:ymCkUuRheBLVBS+pw4jk/OV9nUFILLuflBXxNjZvrDo= -github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.3/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3 h1:7XygyvejhD059PzkTVCo5ZWnKNE249ju6aBTfV9rYho= -github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.3/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.1 h1:hm+vuMO3n7s7E/fv32zOhdWGxb4eO4P5SEMSJpdY+KM= -github.com/aws/aws-sdk-go-v2/service/xray v1.36.1/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3 h1:v+M3A2R7TNmbVhw7wytXX9ctBvvnTv010rwFJcZNcs0= +github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.25.3/go.mod h1:EpmzQeMyCRDtBImp/K8sRrW16WZUUlRNwNPFe9sEs6U= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6 h1:VNUsqkO+szznLLFD52B/2SZ48L3jbZQH0ofpc71sC9w= +github.com/aws/aws-sdk-go-v2/service/invoicing v1.6.6/go.mod h1:DSynFACIuJ1cnaaEX6tPX7qqrfQg1ZyQ32w+u0d89oA= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.3 h1:o19grvwrTdqhYCpajI8OxAlNVR5dOqvM14oVSVK8PzI= +github.com/aws/aws-sdk-go-v2/service/iot v1.69.3/go.mod h1:WsuAKoDHNY6zWTyNZ2/JSHfxOfvDiXo4ubuXMJYgxHk= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4 h1:xDy3gXOGhNAxDW3WQWKocY5+48cS7cLPmiFd8yWBmZQ= +github.com/aws/aws-sdk-go-v2/service/ivs v1.47.4/go.mod h1:DtvaoBrJNJvhMuvF9WUr7mO12aYHpKtoCh9Cc7I88IU= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3 h1:LSpJln8/THTOxbnQw2YISj2++4s2oWLIC7eQ2sCwRi0= +github.com/aws/aws-sdk-go-v2/service/ivschat v1.21.3/go.mod h1:ppZDSvVcyUaB2VTGhFt8WzGknMFBHvVEfzJtA4E3QDM= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4 h1:SbVDfvwIpB3c3FWTDw8VnGatPxVEn3HjOiR6y3iUY9M= +github.com/aws/aws-sdk-go-v2/service/kafka v1.43.4/go.mod h1:nQ7kmni4yUHB1Ax8GCjeQ2myyBOBxmh1XuElflbI0tA= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3 h1:CF89p3rDUgZy4wI+1l2naDAwjae62ZkF98Q5gy3FZ80= +github.com/aws/aws-sdk-go-v2/service/kafkaconnect v1.27.3/go.mod h1:bmMKA1Y2O17TwKGE/R3dWejg/V2phqFdJPlpLCQ60k8= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4 h1:5GheR8I6Qb4Oa8ipPBTVes6rLMJ4gpTcbg2hoXFa4+Q= +github.com/aws/aws-sdk-go-v2/service/kendra v1.60.4/go.mod h1:gX8HtkI85+T9s7z+q6w+573klD0kC8qcrm222lRCok8= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4 h1:Rok4GMqmZ3wyP4ubfM5a1ia3cGuUKzNMjW9HfNWPyEs= +github.com/aws/aws-sdk-go-v2/service/keyspaces v1.23.4/go.mod h1:M96RNHHtJNKYkVbFEc42Fi+4CkLC6YddWHgw5KpDfM0= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3 h1:AoRNFVaU2jdjK7/U54bUHi4ebqCyylITnTYunhJR/FM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.40.3/go.mod h1:4b0kNfWNrJ2hhTYU4/AVC4VZ3C2EdxFIk91hrW4I+k8= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4 h1:JhFlkXPYduCLdZlgKcImnTxpVoC6sfIruCx6RbXHO6w= +github.com/aws/aws-sdk-go-v2/service/kinesisanalytics v1.30.4/go.mod h1:NXGXhtu34BjQ5jWxt07Rx6ohjbnTw10mJ6p+hP7Auvw= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5 h1:vdO631vuDYqochDF84nI9PchF0SU5mc8d/SASKlV3H0= +github.com/aws/aws-sdk-go-v2/service/kinesisanalyticsv2 v1.36.5/go.mod h1:OzhZi7OpEyaniPOiAiM4pcL5LmQD27//6tlKJQ+MJdU= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3 h1:lpi4DqhhfZJu8NfbMqwX2boeMvkFKu6xAgkkJvqwClU= +github.com/aws/aws-sdk-go-v2/service/kinesisvideo v1.32.3/go.mod h1:MgPt51mNcd1Mkr3QvnHg0CS+l1ppJREra0Al+eEiXY0= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.3 h1:hp7qDEQkW3IwV5eaTy2inECTgRHo0o/vgIVxq+ydNiU= +github.com/aws/aws-sdk-go-v2/service/kms v1.45.3/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3 h1:5En5SduZgfy7CMqJrrwqhsydJNn2Il+v+149eaR/czU= +github.com/aws/aws-sdk-go-v2/service/lakeformation v1.45.3/go.mod h1:6rMPymXCx3++UxDcNSYlGj/UqJZZ7V5RMCBGw1qubws= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4 h1:jUPCc+cetLIJK/YJnuLou24IjY5vIpt+8pwOgX2n6eI= +github.com/aws/aws-sdk-go-v2/service/lambda v1.77.4/go.mod h1:uCclLX4a0dWB1ZToNE4ZhC9R1gQTWP+0uN6uxWftB1o= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4 h1:HhwP4DuLp2bgrEIjOt4XF0Y8YeOaMaPcQZzs4eX+xBw= +github.com/aws/aws-sdk-go-v2/service/launchwizard v1.13.4/go.mod h1:lsDYhMs9sGvYXgKKT9b42o4hDKjeFLCCUa6in0trELQ= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3 h1:f9RSnGMIyc+WyBMJsrly9mVxb5Up0Jz8PzptVYJvAcs= +github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.3/go.mod h1:171yAFRSu2K4YKivdeSuAwBoOls+TVM2dIBpBupv4zY= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4 h1:K297CdV2flRnCUNuxfXbomdBULprxHfCbnVp7r9Sa/M= +github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.4/go.mod h1:otunm0ffELOmfzAU963x83T50hvwlFtXg/auheggHJo= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4 h1:mRg6eaBhdPScsiNhZx+v13yhR85l+ekqGq2x+D4ge8g= +github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.4/go.mod h1:mIBfCC5hqV38YL6U6ycbPQwnP3uj3c4mIaF8ul1ImW4= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4 h1:rJjEP5CSJw3Xsoe5Lvhbvr5P8q+rdt8/5IL2MDCc5n0= +github.com/aws/aws-sdk-go-v2/service/lightsail v1.48.4/go.mod h1:O5Ew7rQ2iERj/HtA0AxBWymP0UVcG4iuMoIQzbRhcZU= +github.com/aws/aws-sdk-go-v2/service/location v1.49.4 h1:0t8gadZLdquTVjABf62XpZ8yW5oMj6oRWmmc8OQUktI= +github.com/aws/aws-sdk-go-v2/service/location v1.49.4/go.mod h1:EV0qekjOMdno6fSieFV0MHFmoKri3Mbuax62BDPK9Gs= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4 h1:8RKWBINRxIMnPvlLQer6GmoD8kxEwRaodsEVxiZRDt0= +github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.4/go.mod h1:pXoUqkAGeHjluc720BlxTdi+58Ma718i6rsyptmifa4= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4 h1:KswHF/oPvDYmumr9vj3d1jwfFDZCKPh7vI/OiLrYzRM= +github.com/aws/aws-sdk-go-v2/service/m2 v1.25.4/go.mod h1:p+b+yn/pIYO6RDpigWEPw4pdLUeaQyu1XNu1MfTLJrY= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 h1:1ExmmTFrP7UgFHOoNEiSrqWH7Yr52+VtAhxmbSyKKEA= +github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4/go.mod h1:zV6j52ML5ASJWBs+87lGFcW96tNNwu/cQymiE9ex5lo= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 h1:c4LeHvhTAYsO8md5in7QrPUFpGqOXFYdRTxBULlOE74= +github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 h1:88tdsQqAz0hhrCo4jVxjrTSB9eoNtRLRW1FyfLUCDB0= +github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 h1:g7OqgKXlgCgtpG2/IFkxoQKguUYXJ3/XO1QOEoZgwFE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 h1:1vRJmRaj700hsd9p+gXRrbSu13xheA5YPkpVALYNC7U= +github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 h1:GJPo1aJDfnKPRcdsw9zOCY0zsoA8bN0jRJYADGzUfTo= +github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1/go.mod h1:ZF/rFGHoMQ+5LDdQU+sCR2Mq5Mtii2kDfmPbDpcXCbw= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 h1:vDkjDkQM5EpRWQeOz1PKi1TpcdtmFjcLJxLPAjxjmg8= +github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4/go.mod h1:hMHrZjV9ZTsskcYRCwrd2pHs9ToNfAb1TezdX5t0HO4= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4 h1:Ighjb/ZyKkpHgkbNJsV1g794OaYOMkZ0joAUbXEAL+M= +github.com/aws/aws-sdk-go-v2/service/mediastore v1.29.4/go.mod h1:2MC38vgXki1cSD22Ihc0EMYRxURUpQ0rqEy+g+6OMgU= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4 h1:MUW9N/0Y/Wkl4Jt5l9xDWB+nZjaEUwUm56ViraOiBks= +github.com/aws/aws-sdk-go-v2/service/memorydb v1.31.4/go.mod h1:xTkekmoJ/62dew9BDNBsl3DPrDZh4eOZtxiJsi+ocas= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3 h1:vkmwiUCG5x9JH4tyrrsFQFspXTGnIpZpUo7kPt2A3Ak= +github.com/aws/aws-sdk-go-v2/service/mgn v1.37.3/go.mod h1:gBTV3R+Zq9V0oxeqNTaJGjbmiCe+G8czSZQOzgdI1KY= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.2 h1:I16KUtaBYENTDjorLAxJRCjVqax9O323KlVCqwLMKM8= +github.com/aws/aws-sdk-go-v2/service/mq v1.34.2/go.mod h1:RuIswi2hpR2gabSzQBuK4om45lb3Qebj1IO8JBtyz48= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4 h1:O11wfyGLkKU6lFrVF2qbikVyqJ22MiEVtFhbRc3ndzE= +github.com/aws/aws-sdk-go-v2/service/mwaa v1.39.4/go.mod h1:fXZkNcG4+GDd+Y4IPI7lBFKSteUCHRYJl6uJLXeM0eU= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2 h1:CM7nhsuvZf0mCv6TMqG5tzKUQb3x/tW99jnEpDchtbQ= +github.com/aws/aws-sdk-go-v2/service/neptune v1.42.2/go.mod h1:88XuulV9AwKNmG/7hAyByJoWghbrch+qltar7syXoG4= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3 h1:jrJGbbokc3KIB6IzSB/JJuQOwWHqdWmZpkEEl/Zmyf0= +github.com/aws/aws-sdk-go-v2/service/neptunegraph v1.21.3/go.mod h1:wmNqMkTjyx6wPaHH0SiSCCg812AzFJ9QFnfHCMvraxs= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3 h1:OkuKInB52h0/mW5Z1OkIkQ+umda8vxpcMkUkF+/AoPI= +github.com/aws/aws-sdk-go-v2/service/networkfirewall v1.55.3/go.mod h1:6x2e0M/7Z9XzPqgOvTZcwCNbjN761VJbIui3Zx0pEXs= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5 h1:e/d9+n5bKYXCR6A6xuqWoFVsDEm5FNJh526rS1sXyC4= +github.com/aws/aws-sdk-go-v2/service/networkmanager v1.39.5/go.mod h1:tt09THrgGMdWj38DuEy5rakTOgHaA/G4V3o6f/ChiTo= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4 h1:idjLJX03bHXAly/JajH7FDi1LnTjm+vz1Bm74l3+5jo= +github.com/aws/aws-sdk-go-v2/service/networkmonitor v1.12.4/go.mod h1:f/madZysMOG6Yf418461uIO5SpLyI264ppfbFH+p/kY= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2 h1:+zM/r3nG0slry9af+m0jgaiFJJvinNHSXj2uOVZNMdo= +github.com/aws/aws-sdk-go-v2/service/notifications v1.7.2/go.mod h1:z0eB/DYXOhMK7y8fUuIVUBcPm1WaTAZB9jynJCW670U= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6 h1:iGhPRaXDmVgFkoJp/VPZqxN7gx8mXqiOJsW0aDKKQpU= +github.com/aws/aws-sdk-go-v2/service/notificationscontacts v1.5.6/go.mod h1:exwHzGIoNxvOYtJjeYaxEW5F+ezLmzbDh/0CNrwhVXI= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.3 h1:DCKlfaaVB7mE7dtfGD60gWX1Y5nc+yh8qcBHvpdkRqs= +github.com/aws/aws-sdk-go-v2/service/oam v1.22.3/go.mod h1:uSLwrlkn0YO7P4xzMy4yJDgyyi6BYzZA73D0iv5gPpo= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.4 h1:e72yFD4IgA7oHv5VPwnpT7vsiPUdxUw7tMky2k+LBE8= +github.com/aws/aws-sdk-go-v2/service/odb v1.4.4/go.mod h1:88VYy48//R1g2YQndZDbcVPp0buXwvPljHLOhoiuPKk= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3 h1:lHnod6e9i7gBkixiA3Wqoj3hX3a/NQELZl1/yPpPXpE= +github.com/aws/aws-sdk-go-v2/service/opensearch v1.52.3/go.mod h1:Lnd0WvqAJxXC/qWrB5dFEEZ0q/GMC3WgPBVZEjWWxfM= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2 h1:7d4lqzz/V3uC/AkHGwIPHvh1SBXkvM+eJlV+nb3pi2o= +github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.26.2/go.mod h1:sAaa0p7rtN50HBxl1LEGGaHJ+w3dXd43V+wqRf/Wlfk= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 h1:j5Cyl8uJi7rF8FczVWWVI0A7WQgqN+ED2OSRe5IZCec= +github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1/go.mod h1:ot0vk4sn+d7lY8g6oI91XE41Vz74ZNnTH+7UrsIsJVg= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 h1:5iK3XJb7lqznX5wFGu3hCs+hnYaqeihBs5qLs724nfE= +github.com/aws/aws-sdk-go-v2/service/osis v1.19.3/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 h1:aGSJR31Z33MIDBz3imAxNYe3VJuev7pcyT3pIQUnTA8= +github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 h1:2xi1ySvJWcYhd0Uu/SuMkWAVZl4DXKb6KYbyo7Suk7E= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 h1:fSfw+4bF7B23fCjB63HZOVsJmAYMz3SIcCK28B6kvPk= +github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 h1:3btzBHLKRPz9ecnk0EIE+EAGbMtl99x2VWdTflAml2k= +github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4/go.mod h1:cSG0ngVM0DDPX0ETny4wHuT8pNvmYNd4pGEAS7DpMfc= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 h1:qMVA3qezunrP0ZIvF75T8ktwA20HBXlBsHwR1U0A0H8= +github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4/go.mod h1:+JWai1T8zNQiXaPy5fVSKClFUnVMU6YbWxl9yaNkuJs= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3 h1:yQLjzkSYNfTFg0W03zmAvhykcAVCIoupphhKb9LKbWY= +github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.3/go.mod h1:SaGkr4WogIn/vf0sj6Ua2W7VJxzLq5G8FrIUrEwPm0M= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3 h1:39TMmOdMKH69U8Srk6BFgH/yOyl8vAJc81ArWTAVXNE= +github.com/aws/aws-sdk-go-v2/service/pipes v1.23.3/go.mod h1:uR15p7dUhavBllTbAoskEdh/py47zVqD6j1S4VlSH7c= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.4 h1:1EFYY1zW80E/1CdoEdKkRjq0F/3V9Q5KRh8eWbf4FQU= +github.com/aws/aws-sdk-go-v2/service/polly v1.53.4/go.mod h1:zFmbFlqzPOmhtFWL2wq9Ld5U+7ub3OTPKb6vJEo4VTM= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 h1:FLRgwQXpnb+NWOAg1oP0VD0wM+q7OWJRssKyDsbrIEo= +github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4/go.mod h1:EWTrh/FVF3sDmcK5tKy1ETFPn6VX2nfLy5gDTsCy2+s= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 h1:TQ0TJxq5Ke7E5bPP8fEBsvqqgacjQA6xa/kS/Js6Jpc= +github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 h1:ezX6I8vkNJDSYWH6Fxs3HZif3vCXXm1d8lg9BjhSdic= +github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 h1:cjQhZCAWDV6f7nFeR8DJaQz8qyFP0zwvUluOdojrIn8= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 h1:TCaXm9jWgdARQXQg5geTepn5/v6Iqn6d4JkAmODNpbc= +github.com/aws/aws-sdk-go-v2/service/ram v1.34.4/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 h1:NDgqGmtlBkSNxDzbYFLfPnCq91kyr1kkf9Wa68Im9MQ= +github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 h1:SCHx0JQl2E24HbpZltlQdaQOD9BsjSa0fjDMz3OZYtY= +github.com/aws/aws-sdk-go-v2/service/rds v1.106.2/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 h1:rXoN3hvwUimq8Z6uu2lsYncGPDQS+i70Rp1G0c0C/zk= +github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 h1:egzZblPqPYLXClImxh6zL0kVt+aINhKMtj0Dlzt6LgM= +github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 h1:zdjzJy+tcuRwgCI55ItwodgtmCqCdamIWPZZEEvdx+4= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 h1:1440u1Pza3HtYqsUiofmOYUB/i4fwLXRgvG9c37wz8w= +github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 h1:50EjSzYo2Zl1WRSRtNTNqH0inalyK5xzGjzNsxoP/Qw= +github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4/go.mod h1:P/9XHmSvStom3E+8lIheJkBNqNkPBBK3pHBqzybn48s= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 h1:GWT+w34GEzacg4VLVFOAJrBMgWZqKSMe2LQqvjA5I64= +github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4/go.mod h1:3WHDQPDWkMNWmQtho56OWCTw3q0JH0rxHT77Ir/qMyU= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5 h1:2TQhiZYYw3PG/ZuX4m/ge6knQxHIWdJjnMRJASe9u+8= +github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.33.5/go.mod h1:5f2WgJnsuOpjWuycQwg93EMfEIljLN/urNxnFTrpvaU= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4 h1:LmoqYCi723i8jvkALGA7E+1GeaOc2OHZNLdkwp7cjZA= +github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.30.4/go.mod h1:KV1rGdzLiPDfq5EId56EPFzKL5f3FQ8vB4kN/RkkVC4= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4 h1:LGXwwMDiIEAoUtzqVAqh96G6sFQ7bybZ/2sYGMiTYoc= +github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.21.4/go.mod h1:rvU558bgt8FdrptMtRIuvYGGkaFsjnbHhN+MgKRjVGc= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2 h1:uqxTxY0i8b1ZFHxIf6pZYpUCOuYV/xxcgTv0vDz8Iig= +github.com/aws/aws-sdk-go-v2/service/route53 v1.58.2/go.mod h1:py/7C8W37SHqyHk6tkvZKiFDvMA/WkfPv5Qd8dUXYQw= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2 h1:YT611m4CLcfXC6/qJxAk5AWWiFr4Ojt794aTk4a+HUA= +github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.2/go.mod h1:VaHlCP2omJqU49RN4huDRy9IkwxdrKkdEojKuRt3tn0= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4 h1:xSBL13ZwehSHGJf8hjCMDj4s4OTrSLl79LBbVpFv3Kc= +github.com/aws/aws-sdk-go-v2/service/route53profiles v1.9.4/go.mod h1:m47qERwRjRAO5eIperT+g+9Yry9ugqGGoVbrWdm7uOI= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5 h1:1xhgFCZOCiGCKfz9FmPc9mVLotoY2UVfA247qQeCQnc= +github.com/aws/aws-sdk-go-v2/service/route53recoverycontrolconfig v1.31.5/go.mod h1:8TB1F5Qui8ZgO2Zlg9H23LnoQ5+SU5i4vXlp15WjDH0= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4 h1:1/zOH9q49LFP84tXlP2eyNmFK/wM+F5241kWWujDn4A= +github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness v1.26.4/go.mod h1:kyAP4Dyjtlgj16fsRVi8sE8cpTnSl/BLFOBFTpoR3dw= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4 h1:v3OoF8GxebOBR1XEW4FEvuFQwDUxiG8S/XxfYtB6fVI= +github.com/aws/aws-sdk-go-v2/service/route53resolver v1.40.4/go.mod h1:EON/gLcVKy0Q4B2SjVU442WEO18U4Nr3wbmm511ge2E= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.5 h1:5kyaUvSPlD4a9c788wy5uUxEnn3AKviElMtSYh7mFKE= +github.com/aws/aws-sdk-go-v2/service/rum v1.28.5/go.mod h1:/GaTIfsZbDtYuom89etFZvu+Pfoct6mMU786iQk98RM= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 h1:+RpGuaQ72qnU83qBKVwxkznewEdAGhIWo/PQCmkhhog= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6 h1:eOHf8IowLgbcHyL5lkofjq9Oiwox62NZfJanQ+mFLhY= +github.com/aws/aws-sdk-go-v2/service/s3control v1.65.6/go.mod h1:AVQJ22NtzirbX3shogiVLeEuEsYaPEpXSel/GD8ALF8= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4 h1:GD28/y7URKoEGUS0OLSxnVl/j7zd7njJHzvKAKBuvA8= +github.com/aws/aws-sdk-go-v2/service/s3outposts v1.33.4/go.mod h1:4KJY0ZwVCZFKfQBU3w7kgNG8LzLfcj/0G58soNebaec= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3 h1:EdifhWi+JJJxF3cNWeam8camVWASGJrWl89ewbUvqhM= +github.com/aws/aws-sdk-go-v2/service/s3tables v1.10.3/go.mod h1:uJ2LFMOgDhfLRh8vGhPSvsMR1eY0MBATt0ixY8FTtAw= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6 h1:iUPmajNNwGUNByohjkfZIHDh5OtS7uWYevZ2xpdPCs4= +github.com/aws/aws-sdk-go-v2/service/s3vectors v1.4.6/go.mod h1:bAwVCwfk1JMqw22owv6SahhVJvwWawKHyZVyZTbm6B0= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1 h1:KKqYw88o9dAaD4Cr36kw6lzy/ZIGKlF6x1uK2ufqvJs= +github.com/aws/aws-sdk-go-v2/service/sagemaker v1.215.1/go.mod h1:fKQyhwdNeHKwwLhdvxw31qUtK+rYr8i/8e9wA8eHa+A= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3 h1:it6H2TgSLlwa0RAR5Mb0f2HrrJDbCYAoIpmZHXp+5do= +github.com/aws/aws-sdk-go-v2/service/scheduler v1.17.3/go.mod h1:z2FWXQLqZxk0JJWNDacAQQFIdpcaqcjCytbapGhsGlM= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3 h1:imDQ/7RtFfGZssclTJRJq0QADHBHAbI6kW/SYd3qE6Q= +github.com/aws/aws-sdk-go-v2/service/schemas v1.33.3/go.mod h1:o11VZdyu0AgDlJ4+45ziQ3RkMcz817vxYCHWfrG4q2A= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4 h1:zWISPZre5hQb3mDMCEl6uni9rJ8K2cmvp64EXF7FXkk= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.4/go.mod h1:GrB/4Cn7N41psUAycqnwGDzT7qYJdUm+VnEZpyZAG4I= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1 h1:wg+ZmlmqmnQjdTPpsMYBZQ+rn6x+2LPq28SwlQkRU74= +github.com/aws/aws-sdk-go-v2/service/securityhub v1.64.1/go.mod h1:/yFqGxCC/m8z1L0WjTEV3X1Ml2w612hMetWFrPJrRvA= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4 h1:CtJyph+31QRGcBa9Z6AZKx0uNdLpoMK+jQeIxaGqqdM= +github.com/aws/aws-sdk-go-v2/service/securitylake v1.24.4/go.mod h1:/Okrv6oh8a+j7ZTr5Arh843M0FFxwFjTKnW/kE/lkM4= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4 h1:Mf9vV6JHwq7RMHeX6IUxyARZSCRrLKZAMDIbeQJBg18= +github.com/aws/aws-sdk-go-v2/service/serverlessapplicationrepository v1.29.4/go.mod h1:Fo3qCHv5pY+HbAouapwroSU5JkKBWrqYcaZYZdzT1NY= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4 h1:ToxRxnVNC+UMHc6JYX/LtVywHtPFAgnFXFbP2OXEmwU= +github.com/aws/aws-sdk-go-v2/service/servicecatalog v1.38.4/go.mod h1:iHaKyrKZWhjGdQ+h7SUuy6te+nI8iyctSY1iWvF3OxU= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4 h1:cqQhPQGmTOmMgMMmp4SZh0X1DxQhtWKMVqOM6VhDeiE= +github.com/aws/aws-sdk-go-v2/service/servicecatalogappregistry v1.35.4/go.mod h1:RLu3GzzFOWKqSQ7qV7A552pJA4x8VTPwobt4ALAIwc8= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7 h1:18YXcNXXEZ9kcHUkXP351Am/VxZtIJFSXPWY/JPbXrE= +github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.39.7/go.mod h1:DG2IU+u5lxfU4N/UI0oviGcFBwcQat/b+pGEbGwGeWY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3 h1:v+COFz9X0cbchDgyLpkteKIeGRYoMPgmqfPvJkIv6tY= +github.com/aws/aws-sdk-go-v2/service/servicequotas v1.32.3/go.mod h1:spOhDlIdJOt54qozrlq8UGLpUcX3Uwrs7dy7CrF/Imk= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.3 h1:pqqG8002es1CoJdDa0iIMITLoEAgMv0d5Pznnmo90i8= +github.com/aws/aws-sdk-go-v2/service/ses v1.34.3/go.mod h1:0nxuY5ZFo90mPGqqCjeDFa1luIcjWLkr8vZfa7qZ53U= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3 h1:Ln5b+2lKA/amSuuKqjkEtL7hz1woblO14OfQ8dmB0J0= +github.com/aws/aws-sdk-go-v2/service/sesv2 v1.53.3/go.mod h1:2Esboo6CABuhrL3SXNweOPeEC7OvhZvEhZhLw3uaCRA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4 h1:/UOPu+KSWWd6x7rIUSCmu8l2tnmTrrdwhe+77JzRPXA= +github.com/aws/aws-sdk-go-v2/service/sfn v1.39.4/go.mod h1:l/gPrFPuKAwI0CVumrRq5syQ9fKswotmji2dGka36ZQ= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.4 h1:bsm64pDIz5N1TRqftK218TXsWWf3GxP2CDIvar8SPQw= +github.com/aws/aws-sdk-go-v2/service/shield v1.34.4/go.mod h1:R4lwN/HQdCUYW57V0aOOxlayc65/07rGydQ+frndPmU= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.4 h1:dX2NzZmdQQuCUQ1gPnrcad6xNlE4tIId1ftXVj8kN70= +github.com/aws/aws-sdk-go-v2/service/signer v1.31.4/go.mod h1:DjrlOQ7vINGoemyAXwovy//giBjLUbWencjjp4X1v80= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.3 h1:4T0EjsLqUANqnBWafst2+Nr3Uw44MPdrPgysNbxDqBs= +github.com/aws/aws-sdk-go-v2/service/sns v1.38.3/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5 h1:HbaHWaTkGec2pMa/UQa3+WNWtUaFFF1ZLfwCeVFtBns= +github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4 h1:GaIjQJwGv06w4/vdgYDpkbuNJ2sX7ROHD3/J4YWRvpA= +github.com/aws/aws-sdk-go-v2/service/ssm v1.64.4/go.mod h1:5O20AzpAiVXhRhrJd5Tv9vh1gA5+iYHqAMVc+6t4q7g= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6 h1:Tpm/fpaqiA2+70esCG+ZURVZiQ05V2+GBQPvFrwnFI8= +github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.30.6/go.mod h1:0wE83jsojPt3FEktE7dNeT0MDYbB5faa0THNVEotmAc= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3 h1:8s1MuIH1Zinwe64qbt6ekR3mPK+RYUY3+qBQbhX9iV0= +github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.39.3/go.mod h1:cGRkPMFQDxRL0n62dql49CTDfFWFEP15BVZCZianPXQ= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4 h1:VFWAEcHK1Ci9FpBMzsD+sKAxQRFSV9Mq4uvzXyNLSL4= +github.com/aws/aws-sdk-go-v2/service/ssmquicksetup v1.8.4/go.mod h1:cRGxg1wGs1iDhAbCrw+48EK+O2R3izDN5ysTmrwbo3o= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3 h1:+3Y7HSw3r6w5C5hpthlykvHcAyQeQGpSk6Q+m4X5Ezc= +github.com/aws/aws-sdk-go-v2/service/ssmsap v1.25.3/go.mod h1:0MqV2PKowmF9iRBs6Ih8b57YLZzeP+njutpY5ziCFKw= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 h1:7PKX3VYsZ8LUWceVRuv0+PU+E7OtQb1lgmi5vmUE9CM= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.3/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4 h1:72Upm349w28OYUiynjP7pIyzWYjDLpT0YQMGGyq/Wzg= +github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.35.4/go.mod h1:rHOWsPdb3a76utx/DCpC05mhxvhIOVqOWGFuBxqKjhc= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 h1:e0XBRn3AptQotkyBFrHAxFB8mDhAIOfsG+7KyJ0dg98= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4/go.mod h1:XclEty74bsGBCr1s0VSaA11hQ4ZidK4viWK7rRfO88I= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4 h1:Gh7vhnzighFyKJJcdYiYRjxKO0Nlofu9VpaGp+ZgKvQ= +github.com/aws/aws-sdk-go-v2/service/storagegateway v1.42.4/go.mod h1:jEoHxll7uwZM3zuOsnYLDLrwgqrSVPVajshyBwWac7Q= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 h1:PR00NXRYgY4FWHqOGx3fC3lhVKjsp1GdloDv2ynMSd8= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.4/go.mod h1:Z+Gd23v97pX9zK97+tX4ppAgqCt3Z2dIXB02CtBncK8= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.3 h1:tL0fQyve3dknUaaWBeAvqRe2mb9AjaSfw/6ynBhIx3A= +github.com/aws/aws-sdk-go-v2/service/swf v1.32.3/go.mod h1:k2CTS1J6Jan+aujLBPmkfklnxS4hThnsxaX0mAmyqko= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4 h1:/25TExlOUQ+ujvARatWJq6vn8JBHSGx50HhkZQQO3R0= +github.com/aws/aws-sdk-go-v2/service/synthetics v1.40.4/go.mod h1:JRvZN5iCGfh5MIm67cR/z0LQw2p6EA6wB6UHcpqqtiw= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4 h1:/yeQDqRM0QY715QgXA6WZaW5VqTK6uw04Hq+M1w4l0w= +github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.4/go.mod h1:UpjPLGY4914sA/+KKlRaxrbNt40sP19I+WBWdBDDOXI= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4 h1:XRb8NiG+6sz3tApwcIFzZiu2TJeRV318W3qdRhhggiY= +github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.4/go.mod h1:Rk5mMcObqqP6PUQDg4+JX3wq3EhwL2D+yyX3oisK9Xo= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3 h1:gtt7zDM6ZlB0xciw21A+vbl/A4myL/NK6am2y0Pl1kE= +github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.3/go.mod h1:aSaZ8uAKSKAffxazXGUa/htcsPSg2BXh+3ySU9nw3hE= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3 h1:lG559VMq/SjLPgJ4sz7Qh8LVHKCi+En0CBz4Cx6YgIQ= +github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.3/go.mod h1:hEgxA1cAEctcJI458bb5OYbUna18HuOU0rlIYJsV5ac= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4 h1:4JC0KVW1KO0h8iOrV+4aw6OcbevCPizyiblhnl+e4aM= +github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.4/go.mod h1:66IUhA3+gDSLwS9aFz9SH4544slFSSkxuMdiUCCPTgY= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4 h1:WDZSB1l2MxHuLOeblYZdsgD3WgtioapYnQvplItIsbQ= +github.com/aws/aws-sdk-go-v2/service/transfer v1.65.4/go.mod h1:avf10drg2PsQEExButqDu6Uj3pvdVPaXA+0XDujNY1U= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2 h1:20JAmlxhN45SbHV2oXvdTJKURR+ZHCcTES3wQeOq8B4= +github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.2/go.mod h1:jT4zf0DhyP4qrrWpgE/5huVRDsEXZUATErmvWB+U5DU= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3 h1:FtX5kYvSuq4y03jSuAX7nDsIqU5jNSb4c3iWLgmgFqA= +github.com/aws/aws-sdk-go-v2/service/vpclattice v1.18.3/go.mod h1:zIRgONJlVxI2R12aS2HMT0Fr6RyZMgeyR/KyFe2vm5A= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.3 h1:PCF7qkr1aYxZlBhCjoQjwoogEHhAJpT0d+AgeVKWvWg= +github.com/aws/aws-sdk-go-v2/service/waf v1.30.3/go.mod h1:daNqb6estNKtRMyRY0gEl7RLEGUjm2ElxqmiYkqBfak= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4 h1:JtmylnUAIto+udJAxmyx9L5gLemItC+BFf9HQ/L1DeY= +github.com/aws/aws-sdk-go-v2/service/wafregional v1.30.4/go.mod h1:qGEJhA3DwwWcEovjNKTICRbQNJ9/cugefvB0AmaFYcM= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5 h1:e4ecT6WQrX02XTgDgE/UCJFF2vKQyuEBsUdnp/I/IGk= +github.com/aws/aws-sdk-go-v2/service/wafv2 v1.67.5/go.mod h1:r6GBj3SqoSMBKxvi7VszEEVazcCLcNTNOJrCWjfl86Q= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4 h1:TG2MJZFEVhB7VHS8T9BCPRgOOguWtimq+yI937Q60fo= +github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.39.4/go.mod h1:nwWzjAK91o7OmcnvMKAmMlZPVFbDGNrxQq8XfsrncvM= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2 h1:weOe+mOfoNacPyRBWVFe+aMxMVzj+LJjdUYE6piMWmc= +github.com/aws/aws-sdk-go-v2/service/workmail v1.36.2/go.mod h1:WG/X3d+YF7C+z3pjWyOBRjaMw606gE4lF8GQYtVJ4bQ= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4 h1:HFApAbF5FyX/y+Rjbis/kFWbXDDFPnfrTLmzGXgDbyE= +github.com/aws/aws-sdk-go-v2/service/workspaces v1.63.4/go.mod h1:3YIq2J58ChCezXxq/ZPrh7mCqCy8MdA8TWDRRV3zObs= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4 h1:AThzT7RGEAmXLcawvUvxCDAZqLCH1pqqeIB60qeBtZo= +github.com/aws/aws-sdk-go-v2/service/workspacesweb v1.32.4/go.mod h1:SJaiVD1WR0fWgNH4In624+g+sOpqYCtcbUHNqM/hg5E= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.2 h1:XE8FE0DcJ+NftSdKx4b5Ahx4gaBTZPD17N9Jn4yqbBU= +github.com/aws/aws-sdk-go-v2/service/xray v1.36.2/go.mod h1:o94CN7+Dy8jnBGow7cxAV3ZEOx2EMtSUclryNWV8WLc= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE= @@ -809,15 +809,15 @@ golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -852,8 +852,8 @@ golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= -golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= From 1c079bcf5dd29228d830688e030577344dfd919c Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:39:25 -0400 Subject: [PATCH 2068/2115] r/aws_appflow_connector_profile(doc): document import by identity --- .../r/appflow_connector_profile.html.markdown | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/website/docs/r/appflow_connector_profile.html.markdown b/website/docs/r/appflow_connector_profile.html.markdown index 7c33890882c4..70f24415a36e 100644 --- a/website/docs/r/appflow_connector_profile.html.markdown +++ b/website/docs/r/appflow_connector_profile.html.markdown @@ -324,6 +324,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_appflow_connector_profile.example + identity = { + name = "example_profile" + } +} + +resource "aws_appflow_connector_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the Appflow connector profile. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppFlow Connector Profile using the connector profile `name`. For example: ```terraform From c2851b2c8e89697fd22155bd57ce04f043387070 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:39:52 -0400 Subject: [PATCH 2069/2115] r/aws_appflow_flow(doc): document import by identity --- website/docs/r/appflow_flow.html.markdown | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/website/docs/r/appflow_flow.html.markdown b/website/docs/r/appflow_flow.html.markdown index cc75cc04ad95..b66576fe8ea1 100644 --- a/website/docs/r/appflow_flow.html.markdown +++ b/website/docs/r/appflow_flow.html.markdown @@ -418,6 +418,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_appflow_flow.example + identity = { + name = "example-flow" + } +} + +resource "aws_appflow_flow" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the AppFlow flow. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppFlow flows using the `name`. For example: ```terraform From 2ce0f381e82794083dd656d48fcb513441046a60 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:39:57 -0400 Subject: [PATCH 2070/2115] r/aws_cloudfront_key_value_store(doc): document import by identity --- .../cloudfront_key_value_store.html.markdown | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/website/docs/r/cloudfront_key_value_store.html.markdown b/website/docs/r/cloudfront_key_value_store.html.markdown index 6524a6a64adc..c61fac06cc8b 100644 --- a/website/docs/r/cloudfront_key_value_store.html.markdown +++ b/website/docs/r/cloudfront_key_value_store.html.markdown @@ -47,6 +47,31 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudfront_key_value_store.example + identity = { + name = "example_store" + } +} + +resource "aws_cloudfront_key_value_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the CloudFront Key Value Store. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudFront Key Value Store using the `name`. For example: ```terraform From d0721177352cef7e79cfd78f2ac829f9c0fc550b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:40:03 -0400 Subject: [PATCH 2071/2115] r/aws_cloudfrontkeyvaluestore_key(doc): document import by identity --- .../cloudfrontkeyvaluestore_key.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown b/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown index 3b3399c9973f..ab0d8e4700f1 100644 --- a/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown +++ b/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown @@ -46,6 +46,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudfrontkeyvaluestore_key.example + identity = { + key_value_store_arn = "arn:aws:cloudfront::111111111111:key-value-store/8562g61f-caba-2845-9d99-b97diwae5d3c" + key = "someKey" + } +} + +resource "aws_cloudfrontkeyvaluestore_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `key_value_store_arn` (String) ARN of the CloudFront Key Value Store. +* `key` (String) Key name. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudFront KeyValueStore Key using the `key_value_store_arn` and 'key' separated by `,`. For example: ```terraform From a46652edbdd9a7f4a5686e8257fa4918fb05b009 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:40:46 -0400 Subject: [PATCH 2072/2115] r/aws_cloudwatch_event_rule(doc): document import by identity --- .../r/cloudwatch_event_rule.html.markdown | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/website/docs/r/cloudwatch_event_rule.html.markdown b/website/docs/r/cloudwatch_event_rule.html.markdown index 6cdd2323e464..e33c7bfc026e 100644 --- a/website/docs/r/cloudwatch_event_rule.html.markdown +++ b/website/docs/r/cloudwatch_event_rule.html.markdown @@ -85,11 +85,39 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudwatch_event_rule.example + identity = { + name = "capture-console-sign-in" + event_bus_name = "example-event-bus" + } +} + +resource "aws_cloudwatch_event_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the EventBridge rule. + +#### Optional + +* `event_bus_name` (String) Name of the event bus. If omitted, `default` is used. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import EventBridge Rules using the `event_bus_name/rule_name` (if you omit `event_bus_name`, the `default` event bus will be used). For example: ```terraform import { - to = aws_cloudwatch_event_rule.console + to = aws_cloudwatch_event_rule.example id = "example-event-bus/capture-console-sign-in" } ``` @@ -97,5 +125,5 @@ import { Using `terraform import`, import EventBridge Rules using the `event_bus_name/rule_name` (if you omit `event_bus_name`, the `default` event bus will be used). For example: ```console -% terraform import aws_cloudwatch_event_rule.console example-event-bus/capture-console-sign-in +% terraform import aws_cloudwatch_event_rule.example example-event-bus/capture-console-sign-in ``` From e483e96802065bdd7842dae8316d54a7326e0318 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:40:50 -0400 Subject: [PATCH 2073/2115] r/aws_cloudwatch_event_target(doc): document import by identity --- .../r/cloudwatch_event_target.html.markdown | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/website/docs/r/cloudwatch_event_target.html.markdown b/website/docs/r/cloudwatch_event_target.html.markdown index aa7e0ff53d61..7e9891bfa928 100644 --- a/website/docs/r/cloudwatch_event_target.html.markdown +++ b/website/docs/r/cloudwatch_event_target.html.markdown @@ -690,11 +690,41 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudwatch_event_target.example + identity = { + event_bus_name = "default" + rule = "rule-name" + target_id = "target-id" + } +} + +resource "aws_cloudwatch_event_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `event_bus_name` (String) Event bus name for the target. +* `rule` (String) Rule name for the target. +* `target_id` (String) Target ID. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import EventBridge Targets using `event_bus_name/rule-name/target-id` (if you omit `event_bus_name`, the `default` event bus will be used). For example: ```terraform import { - to = aws_cloudwatch_event_target.test-event-target + to = aws_cloudwatch_event_target.example id = "rule-name/target-id" } ``` @@ -702,5 +732,5 @@ import { Using `terraform import`, import EventBridge Targets using `event_bus_name/rule-name/target-id` (if you omit `event_bus_name`, the `default` event bus will be used). For example: ```console -% terraform import aws_cloudwatch_event_target.test-event-target rule-name/target-id +% terraform import aws_cloudwatch_event_target.example rule-name/target-id ``` From f4bdae748465732a1fd47e79e58a0ea23be1f531 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:40:55 -0400 Subject: [PATCH 2074/2115] r/aws_cloudwatch_log_group(doc): document import by identity --- .../docs/r/cloudwatch_log_group.html.markdown | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/cloudwatch_log_group.html.markdown b/website/docs/r/cloudwatch_log_group.html.markdown index a626d60b284c..14110a10ef55 100644 --- a/website/docs/r/cloudwatch_log_group.html.markdown +++ b/website/docs/r/cloudwatch_log_group.html.markdown @@ -49,11 +49,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudwatch_log_group.example + identity = { + name = "yada" + } +} + +resource "aws_cloudwatch_log_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the CloudWatch log group. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Cloudwatch Log Groups using the `name`. For example: ```terraform import { - to = aws_cloudwatch_log_group.test_group + to = aws_cloudwatch_log_group.example id = "yada" } ``` @@ -61,5 +87,5 @@ import { Using `terraform import`, import Cloudwatch Log Groups using the `name`. For example: ```console -% terraform import aws_cloudwatch_log_group.test_group yada +% terraform import aws_cloudwatch_log_group.example yada ``` From 864fb65ef14663b1f608968d3308f2a8db17f5a0 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:00 -0400 Subject: [PATCH 2075/2115] r/aws_cloudwatch_metric_alarm(doc): document import by identity --- .../r/cloudwatch_metric_alarm.html.markdown | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/cloudwatch_metric_alarm.html.markdown b/website/docs/r/cloudwatch_metric_alarm.html.markdown index 9585ff9b6aba..73a3f19ba7ff 100644 --- a/website/docs/r/cloudwatch_metric_alarm.html.markdown +++ b/website/docs/r/cloudwatch_metric_alarm.html.markdown @@ -249,11 +249,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudwatch_metric_alarm.example + identity = { + alarm_name = "alarm-12345" + } +} + +resource "aws_cloudwatch_metric_alarm" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `alarm_name` (String) Name of the CloudWatch metric alarm. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudWatch Metric Alarm using the `alarm_name`. For example: ```terraform import { - to = aws_cloudwatch_metric_alarm.test + to = aws_cloudwatch_metric_alarm.example id = "alarm-12345" } ``` @@ -261,5 +287,5 @@ import { Using `terraform import`, import CloudWatch Metric Alarm using the `alarm_name`. For example: ```console -% terraform import aws_cloudwatch_metric_alarm.test alarm-12345 +% terraform import aws_cloudwatch_metric_alarm.example alarm-12345 ``` From 1e24f0c88b095e67e90f09feebdcb6fb05bca77b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:03 -0400 Subject: [PATCH 2076/2115] r/aws_cognito_log_delivery_configuration(doc): document import by identity --- ...o_log_delivery_configuration.html.markdown | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/website/docs/r/cognito_log_delivery_configuration.html.markdown b/website/docs/r/cognito_log_delivery_configuration.html.markdown index 60962f8d0a3d..b0a83c7ecfa5 100644 --- a/website/docs/r/cognito_log_delivery_configuration.html.markdown +++ b/website/docs/r/cognito_log_delivery_configuration.html.markdown @@ -202,6 +202,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cognito_log_delivery_configuration.example + identity = { + user_pool_id = "us-west-2_example123" + } +} + +resource "aws_cognito_log_delivery_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `user_pool_id` (String) ID of the Cognito User Pool. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Cognito IDP (Identity Provider) Log Delivery Configuration using the `user_pool_id`. For example: ```terraform From 839033b40368878b175bfe0c2ad6022267748619 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:07 -0400 Subject: [PATCH 2077/2115] r/aws_dx_gateway(doc): document import by identity --- website/docs/r/dx_gateway.html.markdown | 30 +++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/dx_gateway.html.markdown b/website/docs/r/dx_gateway.html.markdown index 01f1c55fce9d..6f88d75f38d9 100644 --- a/website/docs/r/dx_gateway.html.markdown +++ b/website/docs/r/dx_gateway.html.markdown @@ -43,11 +43,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dx_gateway.example + identity = { + id = "abcd1234-dcba-5678-be23-cdef9876ab45" + } +} + +resource "aws_dx_gateway" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the Direct Connect Gateway. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Direct Connect Gateways using the gateway `id`. For example: ```terraform import { - to = aws_dx_gateway.test + to = aws_dx_gateway.example id = "abcd1234-dcba-5678-be23-cdef9876ab45" } ``` @@ -55,5 +81,5 @@ import { Using `terraform import`, import Direct Connect Gateways using the gateway `id`. For example: ```console -% terraform import aws_dx_gateway.test abcd1234-dcba-5678-be23-cdef9876ab45 +% terraform import aws_dx_gateway.example abcd1234-dcba-5678-be23-cdef9876ab45 ``` From 4757f389a5d63f266afebe1cc40365378ac4d041 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:11 -0400 Subject: [PATCH 2078/2115] r/aws_iam_role(doc): document import by identity --- website/docs/r/iam_role.html.markdown | 29 +++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/website/docs/r/iam_role.html.markdown b/website/docs/r/iam_role.html.markdown index f80acdb44431..9595fb995043 100644 --- a/website/docs/r/iam_role.html.markdown +++ b/website/docs/r/iam_role.html.markdown @@ -223,11 +223,36 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_role.example + identity = { + name = "developer_name" + } +} + +resource "aws_iam_role" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `name` (String) Name of the IAM role. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM Roles using the `name`. For example: ```terraform import { - to = aws_iam_role.developer + to = aws_iam_role.example id = "developer_name" } ``` @@ -235,5 +260,5 @@ import { Using `terraform import`, import IAM Roles using the `name`. For example: ```console -% terraform import aws_iam_role.developer developer_name +% terraform import aws_iam_role.example developer_name ``` From 4e2a62666f68a6d93a81e0af8a26a3f8e2be9422 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:14 -0400 Subject: [PATCH 2079/2115] r/aws_iam_role_policy(doc): document import by identity --- website/docs/r/iam_role_policy.html.markdown | 31 ++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/website/docs/r/iam_role_policy.html.markdown b/website/docs/r/iam_role_policy.html.markdown index 6a8311948db4..0c4b6d4680ff 100644 --- a/website/docs/r/iam_role_policy.html.markdown +++ b/website/docs/r/iam_role_policy.html.markdown @@ -75,11 +75,38 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_role_policy.example + identity = { + role = "role_of_mypolicy_name" + name = "mypolicy_name" + } +} + +resource "aws_iam_role_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `role` (String) Name of the IAM role. +* `name` (String) Name of the role policy. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM Role Policies using the `role_name:role_policy_name`. For example: ```terraform import { - to = aws_iam_role_policy.mypolicy + to = aws_iam_role_policy.example id = "role_of_mypolicy_name:mypolicy_name" } ``` @@ -87,5 +114,5 @@ import { Using `terraform import`, import IAM Role Policies using the `role_name:role_policy_name`. For example: ```console -% terraform import aws_iam_role_policy.mypolicy role_of_mypolicy_name:mypolicy_name +% terraform import aws_iam_role_policy.example role_of_mypolicy_name:mypolicy_name ``` From f2e55d50b0aadb94234d3d3fa1a598343f2c5ecf Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:19 -0400 Subject: [PATCH 2080/2115] r/aws_iam_role_policy_attachment(doc): document import by identity --- .../iam_role_policy_attachment.html.markdown | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/website/docs/r/iam_role_policy_attachment.html.markdown b/website/docs/r/iam_role_policy_attachment.html.markdown index 2e900f5db313..4d2fdc9fe2eb 100644 --- a/website/docs/r/iam_role_policy_attachment.html.markdown +++ b/website/docs/r/iam_role_policy_attachment.html.markdown @@ -68,11 +68,38 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_role_policy_attachment.example + identity = { + role = "test-role" + policy_arn = "arn:aws:iam::xxxxxxxxxxxx:policy/test-policy" + } +} + +resource "aws_iam_role_policy_attachment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `role` (String) Name of the IAM role. +* `policy_arn` (String) ARN of the IAM policy. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM role policy attachments using the role name and policy arn separated by `/`. For example: ```terraform import { - to = aws_iam_role_policy_attachment.test-attach + to = aws_iam_role_policy_attachment.example id = "test-role/arn:aws:iam::xxxxxxxxxxxx:policy/test-policy" } ``` @@ -80,5 +107,5 @@ import { Using `terraform import`, import IAM role policy attachments using the role name and policy arn separated by `/`. For example: ```console -% terraform import aws_iam_role_policy_attachment.test-attach test-role/arn:aws:iam::xxxxxxxxxxxx:policy/test-policy +% terraform import aws_iam_role_policy_attachment.example test-role/arn:aws:iam::xxxxxxxxxxxx:policy/test-policy ``` From c870187471957e048f4f0891dbb4339f1d794219 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:23 -0400 Subject: [PATCH 2081/2115] r/aws_lambda_function(doc): document import by identity --- website/docs/r/lambda_function.html.markdown | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/website/docs/r/lambda_function.html.markdown b/website/docs/r/lambda_function.html.markdown index 6bf2fc2d71bd..bd27ce2410a8 100644 --- a/website/docs/r/lambda_function.html.markdown +++ b/website/docs/r/lambda_function.html.markdown @@ -599,6 +599,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lambda_function.example + identity = { + function_name = "example" + } +} + +resource "aws_lambda_function" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `function_name` (String) Name of the Lambda function. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Lambda Functions using the `function_name`. For example: ```terraform From 99f017a9ac1617d8591430abde90f48cf9a6763a Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:27 -0400 Subject: [PATCH 2082/2115] r/aws_lambda_permission(doc): document import by identity --- .../docs/r/lambda_permission.html.markdown | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/website/docs/r/lambda_permission.html.markdown b/website/docs/r/lambda_permission.html.markdown index 1209ab582c4f..de49d9a146b2 100644 --- a/website/docs/r/lambda_permission.html.markdown +++ b/website/docs/r/lambda_permission.html.markdown @@ -236,11 +236,40 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lambda_permission.example + identity = { + function_name = "my_test_lambda_function" + statement_id = "AllowExecutionFromCloudWatch" + } +} + +resource "aws_lambda_permission" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `function_name` (String) Lambda function name. +* `statement_id` (String) Statement ID for the permission. + +#### Optional + +* `qualifier` (String) Qualifier for the function version or alias. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Lambda permission statements using function_name/statement_id with an optional qualifier. For example: ```terraform import { - to = aws_lambda_permission.test_lambda_permission + to = aws_lambda_permission.example id = "my_test_lambda_function/AllowExecutionFromCloudWatch" } ``` @@ -249,7 +278,7 @@ Using `qualifier`: ```terraform import { - to = aws_lambda_permission.test_lambda_permission + to = aws_lambda_permission.example id = "my_test_lambda_function:qualifier_name/AllowExecutionFromCloudWatch" } ``` @@ -258,5 +287,5 @@ For backwards compatibility, the following legacy `terraform import` commands ar ```console % terraform import aws_lambda_permission.example my_test_lambda_function/AllowExecutionFromCloudWatch -% terraform import aws_lambda_permission.test_lambda_permission my_test_lambda_function:qualifier_name/AllowExecutionFromCloudWatch +% terraform import aws_lambda_permission.example my_test_lambda_function:qualifier_name/AllowExecutionFromCloudWatch ``` From 83a1a9c2897803daae1ba842a783c6ab4c5c6e0d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:31 -0400 Subject: [PATCH 2083/2115] r/aws_organizations_account(doc): document import by identity --- .../r/organizations_account.html.markdown | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/website/docs/r/organizations_account.html.markdown b/website/docs/r/organizations_account.html.markdown index b023cd493ebe..1b8c3109cdeb 100644 --- a/website/docs/r/organizations_account.html.markdown +++ b/website/docs/r/organizations_account.html.markdown @@ -59,11 +59,36 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_organizations_account.example + identity = { + id = "111111111111" + } +} + +resource "aws_organizations_account" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the AWS Organizations account. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import the AWS member account using the `account_id`. For example: ```terraform import { - to = aws_organizations_account.my_account + to = aws_organizations_account.example id = "111111111111" } ``` @@ -71,13 +96,13 @@ import { Using `terraform import`, import the AWS member account using the `account_id`. For example: ```console -% terraform import aws_organizations_account.my_account 111111111111 +% terraform import aws_organizations_account.example 111111111111 ``` To import accounts that have set iam_user_access_to_billing, use the following: ```console -% terraform import aws_organizations_account.my_account 111111111111_ALLOW +% terraform import aws_organizations_account.example 111111111111_ALLOW ``` Certain resource arguments, like `role_name`, do not have an Organizations API method for reading the information after account creation. If the argument is set in the Terraform configuration on an imported resource, Terraform will always show a difference. To workaround this behavior, either omit the argument from the Terraform configuration or use [`ignore_changes`](https://www.terraform.io/docs/configuration/meta-arguments/lifecycle.html#ignore_changes) to hide the difference. For example: From 4d6699eac0b9adbc692b48afc28c54040eb1a6db Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:35 -0400 Subject: [PATCH 2084/2115] r/aws_organizations_delegated_administrator(doc): document import by identity --- ...ions_delegated_administrator.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/organizations_delegated_administrator.html.markdown b/website/docs/r/organizations_delegated_administrator.html.markdown index 80b8396caca2..ed593d626ba7 100644 --- a/website/docs/r/organizations_delegated_administrator.html.markdown +++ b/website/docs/r/organizations_delegated_administrator.html.markdown @@ -41,6 +41,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_organizations_delegated_administrator.example + identity = { + service_principal = "config.amazonaws.com" + delegated_account_id = "123456789012" + } +} + +resource "aws_organizations_delegated_administrator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `service_principal` (String) Service principal for the AWS service. +* `delegated_account_id` (String) Account ID to be designated as a delegated administrator. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_organizations_delegated_administrator` using the account ID and its service principal. For example: ```terraform From 43e2a62d1c2614c605d7336d34009ba54d4ccc6b Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:39 -0400 Subject: [PATCH 2085/2115] r/aws_organizations_organization(doc): document import by identity --- .../organizations_organization.html.markdown | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/website/docs/r/organizations_organization.html.markdown b/website/docs/r/organizations_organization.html.markdown index 05082f502f82..ab202f9e9602 100644 --- a/website/docs/r/organizations_organization.html.markdown +++ b/website/docs/r/organizations_organization.html.markdown @@ -67,11 +67,36 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_organizations_organization.example + identity = { + id = "o-1234567" + } +} + +resource "aws_organizations_organization" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the AWS Organizations organization. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import the AWS organization using the `id`. For example: ```terraform import { - to = aws_organizations_organization.my_org + to = aws_organizations_organization.example id = "o-1234567" } ``` @@ -79,5 +104,5 @@ import { Using `terraform import`, import the AWS organization using the `id`. For example: ```console -% terraform import aws_organizations_organization.my_org o-1234567 +% terraform import aws_organizations_organization.example o-1234567 ``` From 6c68e3c400c505c6be4b2ef1d0aef17f7d25448d Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:43 -0400 Subject: [PATCH 2086/2115] r/aws_organizations_organizational_unit(doc): document import by identity --- ...izations_organizational_unit.html.markdown | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/website/docs/r/organizations_organizational_unit.html.markdown b/website/docs/r/organizations_organizational_unit.html.markdown index 33f5d82a8ebe..edd271258761 100644 --- a/website/docs/r/organizations_organizational_unit.html.markdown +++ b/website/docs/r/organizations_organizational_unit.html.markdown @@ -42,6 +42,31 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_organizations_organizational_unit.example + identity = { + id = "ou-1234567" + } +} + +resource "aws_organizations_organizational_unit" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the organizational unit. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Organizations Organizational Units using the `id`. For example: ```terraform From 8e96714d9a58a859f720f7e3f42c5a25979eeb69 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:47 -0400 Subject: [PATCH 2087/2115] r/aws_organizations_policy_attachment(doc): document import by identity --- ...anizations_policy_attachment.html.markdown | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/website/docs/r/organizations_policy_attachment.html.markdown b/website/docs/r/organizations_policy_attachment.html.markdown index 8b4ca98e8e2a..8f648e1de200 100644 --- a/website/docs/r/organizations_policy_attachment.html.markdown +++ b/website/docs/r/organizations_policy_attachment.html.markdown @@ -53,13 +53,40 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_organizations_policy_attachment.example + identity = { + policy_id = "p-12345678" + target_id = "123456789012" + } +} + +resource "aws_organizations_policy_attachment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `policy_id` (String) Organizations policy ID. +* `target_id` (String) Organizations target ID (account, OU, or root). + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_organizations_policy_attachment` using the target ID and policy ID. For example: With an account target: ```terraform import { - to = aws_organizations_policy_attachment.account + to = aws_organizations_policy_attachment.example id = "123456789012:p-12345678" } ``` @@ -69,5 +96,5 @@ Using `terraform import`, import `aws_organizations_policy_attachment` using the With an account target: ```console -% terraform import aws_organizations_policy_attachment.account 123456789012:p-12345678 +% terraform import aws_organizations_policy_attachment.example 123456789012:p-12345678 ``` From 160e70c1fceb92e68aa3afe4f09ecbdeb0440ed3 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:51 -0400 Subject: [PATCH 2088/2115] r/aws_route53_record(doc): document import by identity --- website/docs/r/route53_record.html.markdown | 40 ++++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/website/docs/r/route53_record.html.markdown b/website/docs/r/route53_record.html.markdown index e024f6edd11f..2ea694639230 100644 --- a/website/docs/r/route53_record.html.markdown +++ b/website/docs/r/route53_record.html.markdown @@ -249,13 +249,43 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_route53_record.example + identity = { + zone_id = "Z4KAPRWWNC7JR" + name = "dev.example.com" + type = "NS" + } +} + +resource "aws_route53_record" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `zone_id` (String) Hosted zone ID for the record. +* `name` (String) Name of the record. +* `type` (String) Record type. + +#### Optional + +* `set_identifier` (String) Set identifier for the record. +- `account_id` (String) AWS Account where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Records using the ID of the record, record name, record type, and set identifier. For example: Using the ID of the record, which is the zone identifier, record name, and record type, separated by underscores (`_`): ```terraform import { - to = aws_route53_record.myrecord + to = aws_route53_record.example id = "Z4KAPRWWNC7JR_dev.example.com_NS" } ``` @@ -264,7 +294,7 @@ If the record also contains a set identifier, append it: ```terraform import { - to = aws_route53_record.myrecord + to = aws_route53_record.example id = "Z4KAPRWWNC7JR_dev.example.com_NS_dev" } ``` @@ -273,7 +303,7 @@ If the record name is the empty string, it can be omitted: ```terraform import { - to = aws_route53_record.myrecord + to = aws_route53_record.example id = "Z4KAPRWWNC7JR__NS" } ``` @@ -283,11 +313,11 @@ import { Using the ID of the record, which is the zone identifier, record name, and record type, separated by underscores (`_`): ```console -% terraform import aws_route53_record.myrecord Z4KAPRWWNC7JR_dev_NS +% terraform import aws_route53_record.example Z4KAPRWWNC7JR_dev_NS ``` If the record also contains a set identifier, append it: ```console -% terraform import aws_route53_record.myrecord Z4KAPRWWNC7JR_dev_NS_dev +% terraform import aws_route53_record.example Z4KAPRWWNC7JR_dev_NS_dev ``` From 28160373992bb7592ef5dbb5e64c238e2bc39351 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:55 -0400 Subject: [PATCH 2089/2115] r/aws_s3_bucket(doc): document import by identity --- website/docs/r/s3_bucket.html.markdown | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/s3_bucket.html.markdown b/website/docs/r/s3_bucket.html.markdown index 42159b1e6a97..af34af4173b5 100644 --- a/website/docs/r/s3_bucket.html.markdown +++ b/website/docs/r/s3_bucket.html.markdown @@ -325,11 +325,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) Name of the S3 bucket. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket using the `bucket`. For example: ```terraform import { - to = aws_s3_bucket.bucket + to = aws_s3_bucket.example id = "bucket-name" } ``` @@ -337,5 +363,5 @@ import { Using `terraform import`, import S3 bucket using the `bucket`. For example: ```console -% terraform import aws_s3_bucket.bucket bucket-name +% terraform import aws_s3_bucket.example bucket-name ``` From 1a09615f97dfbff446c4b9ee5911d95b3113f5bf Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:41:59 -0400 Subject: [PATCH 2090/2115] r/aws_s3_bucket_acl(doc): document import by identity --- website/docs/r/s3_bucket_acl.html.markdown | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/website/docs/r/s3_bucket_acl.html.markdown b/website/docs/r/s3_bucket_acl.html.markdown index 94d0dd827798..97db96816cbe 100644 --- a/website/docs/r/s3_bucket_acl.html.markdown +++ b/website/docs/r/s3_bucket_acl.html.markdown @@ -167,6 +167,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_acl.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_acl" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +* `acl` (String) Canned ACL to apply to the bucket. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket ACL using `bucket`, `expected_bucket_owner`, and/or `acl`, depending on your situation. For example: If the owner (account ID) of the source bucket is the _same_ account used to configure the Terraform AWS Provider, and the source bucket is **not configured** with a From 64acf19d6076c2f010f57ef2d5e55ff6f2532e78 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:05 -0400 Subject: [PATCH 2091/2115] r/aws_s3_bucket_cors_configuration(doc): document import by identity --- ...s3_bucket_cors_configuration.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/s3_bucket_cors_configuration.html.markdown b/website/docs/r/s3_bucket_cors_configuration.html.markdown index 065b37386301..29fdfb8047ed 100644 --- a/website/docs/r/s3_bucket_cors_configuration.html.markdown +++ b/website/docs/r/s3_bucket_cors_configuration.html.markdown @@ -67,6 +67,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_cors_configuration.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_cors_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket CORS configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example: If the owner (account ID) of the source bucket is the same account used to configure the Terraform AWS Provider, import using the `bucket`: From f5d62bd7dde7bc763ff7ddb20974baa464cfa142 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:09 -0400 Subject: [PATCH 2092/2115] r/aws_s3_bucket_logging(doc): document import by identity --- .../docs/r/s3_bucket_logging.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/s3_bucket_logging.html.markdown b/website/docs/r/s3_bucket_logging.html.markdown index bee87410c69b..2f4b036ba86b 100644 --- a/website/docs/r/s3_bucket_logging.html.markdown +++ b/website/docs/r/s3_bucket_logging.html.markdown @@ -145,6 +145,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_logging.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_logging" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket logging using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example: If the owner (account ID) of the source bucket is the same account used to configure the Terraform AWS Provider, import using the `bucket`: From 895786dcaeb2af3706c107eadf161eeb1b304a90 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:13 -0400 Subject: [PATCH 2093/2115] r/aws_s3_bucket_object(doc): document import by identity --- website/docs/r/s3_bucket_object.html.markdown | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/website/docs/r/s3_bucket_object.html.markdown b/website/docs/r/s3_bucket_object.html.markdown index 9d88ddeb627c..5eeb80cb18ed 100644 --- a/website/docs/r/s3_bucket_object.html.markdown +++ b/website/docs/r/s3_bucket_object.html.markdown @@ -181,6 +181,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_object.example + identity = { + bucket = "some-bucket-name" + key = "some/key.txt" + } +} + +resource "aws_s3_bucket_object" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. +* `key` (String) Object key. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import objects using the `id` or S3 URL. For example: Import using the `id`, which is the bucket name and the key together: From 962b362e7df4806e58da89c51dfb1f9dde5b03da Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:16 -0400 Subject: [PATCH 2094/2115] r/aws_s3_bucket_policy(doc): document import by identity --- website/docs/r/s3_bucket_policy.html.markdown | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/s3_bucket_policy.html.markdown b/website/docs/r/s3_bucket_policy.html.markdown index bc0a4448eafd..912b4214d593 100644 --- a/website/docs/r/s3_bucket_policy.html.markdown +++ b/website/docs/r/s3_bucket_policy.html.markdown @@ -62,11 +62,37 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_policy.example + identity = { + bucket = "my-tf-test-bucket" + } +} + +resource "aws_s3_bucket_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) Name of the S3 bucket. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket policies using the bucket name. For example: ```terraform import { - to = aws_s3_bucket_policy.allow_access_from_another_account + to = aws_s3_bucket_policy.example id = "my-tf-test-bucket" } ``` @@ -74,5 +100,5 @@ import { Using `terraform import`, import S3 bucket policies using the bucket name. For example: ```console -% terraform import aws_s3_bucket_policy.allow_access_from_another_account my-tf-test-bucket +% terraform import aws_s3_bucket_policy.example my-tf-test-bucket ``` From 12c4e14b088978dc092d2a3e40e6add32a7f6edc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:21 -0400 Subject: [PATCH 2095/2115] r/aws_s3_bucket_server_side_encryption_configuration(doc): document import by identity --- ...ide_encryption_configuration.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown b/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown index 98e873c12551..eddf23cca9bf 100644 --- a/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown +++ b/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown @@ -67,6 +67,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_server_side_encryption_configuration.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_server_side_encryption_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket server-side encryption configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example: If the owner (account ID) of the source bucket is the same account used to configure the Terraform AWS Provider, import using the `bucket`: From cd4900e9fcfdedd169c38ceef255c1b8b8c13398 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:25 -0400 Subject: [PATCH 2096/2115] r/aws_s3_bucket_versioning(doc): document import by identity --- .../docs/r/s3_bucket_versioning.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/s3_bucket_versioning.html.markdown b/website/docs/r/s3_bucket_versioning.html.markdown index b8dfc460e0f9..5b9ca199d2b5 100644 --- a/website/docs/r/s3_bucket_versioning.html.markdown +++ b/website/docs/r/s3_bucket_versioning.html.markdown @@ -116,6 +116,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_versioning.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_versioning" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket versioning using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example: If the owner (account ID) of the source bucket is the same account used to configure the Terraform AWS Provider, import using the `bucket`: From d854df86eb520337e1b00801cfaaeb88c6b45075 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:29 -0400 Subject: [PATCH 2097/2115] r/aws_s3_bucket_website_configuration(doc): document import by identity --- ...bucket_website_configuration.html.markdown | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/docs/r/s3_bucket_website_configuration.html.markdown b/website/docs/r/s3_bucket_website_configuration.html.markdown index 3e54c1854cc4..bc44e3ef738c 100644 --- a/website/docs/r/s3_bucket_website_configuration.html.markdown +++ b/website/docs/r/s3_bucket_website_configuration.html.markdown @@ -135,6 +135,33 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_bucket_website_configuration.example + identity = { + bucket = "bucket-name" + } +} + +resource "aws_s3_bucket_website_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. + +#### Optional + +* `expected_bucket_owner` (String) Account ID of the expected bucket owner. +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import S3 bucket website configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example: If the owner (account ID) of the source bucket is the same account used to configure the Terraform AWS Provider, import using the `bucket`: From 65711e28328f20c3a720b87f01493caa41a86a72 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:32 -0400 Subject: [PATCH 2098/2115] r/aws_s3_object(doc): document import by identity --- website/docs/r/s3_object.html.markdown | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/website/docs/r/s3_object.html.markdown b/website/docs/r/s3_object.html.markdown index 4ebb570f43eb..57265b95b08a 100644 --- a/website/docs/r/s3_object.html.markdown +++ b/website/docs/r/s3_object.html.markdown @@ -221,6 +221,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_s3_object.example + identity = { + bucket = "some-bucket-name" + key = "some/key.txt" + } +} + +resource "aws_s3_object" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `bucket` (String) S3 bucket name. +* `key` (String) Object key. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import objects using the `id` or S3 URL. For example: Import using the `id`, which is the bucket name and the key together: From bcb2a9b220f330a1dc247360b0e7b61119479765 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:35 -0400 Subject: [PATCH 2099/2115] r/aws_sagemaker_user_profile(doc): document import by identity --- .../r/sagemaker_user_profile.html.markdown | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/website/docs/r/sagemaker_user_profile.html.markdown b/website/docs/r/sagemaker_user_profile.html.markdown index ef0179cde891..fd1a500e41b9 100644 --- a/website/docs/r/sagemaker_user_profile.html.markdown +++ b/website/docs/r/sagemaker_user_profile.html.markdown @@ -230,11 +230,39 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sagemaker_user_profile.example + identity = { + domain_id = "domain-id" + user_profile_name = "profile-name" + } +} + +resource "aws_sagemaker_user_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `domain_id` (String) SageMaker domain ID. +* `user_profile_name` (String) Name of the user profile. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SageMaker AI User Profiles using the `arn`. For example: ```terraform import { - to = aws_sagemaker_user_profile.test_user_profile + to = aws_sagemaker_user_profile.example id = "arn:aws:sagemaker:us-west-2:123456789012:user-profile/domain-id/profile-name" } ``` @@ -242,5 +270,5 @@ import { Using `terraform import`, import SageMaker AI User Profiles using the `arn`. For example: ```console -% terraform import aws_sagemaker_user_profile.test_user_profile arn:aws:sagemaker:us-west-2:123456789012:user-profile/domain-id/profile-name +% terraform import aws_sagemaker_user_profile.example arn:aws:sagemaker:us-west-2:123456789012:user-profile/domain-id/profile-name ``` From b5fb3498b6a82a0d2c9068025b22fec61f2ee35a Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:39 -0400 Subject: [PATCH 2100/2115] r/aws_security_group(doc): document import by identity --- website/docs/r/security_group.html.markdown | 30 +++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/security_group.html.markdown b/website/docs/r/security_group.html.markdown index 443fa866a5ec..d05329a2b85d 100644 --- a/website/docs/r/security_group.html.markdown +++ b/website/docs/r/security_group.html.markdown @@ -312,11 +312,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_security_group.example + identity = { + id = "sg-903004f8" + } +} + +resource "aws_security_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the security group. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Groups using the security group `id`. For example: ```terraform import { - to = aws_security_group.elb_sg + to = aws_security_group.example id = "sg-903004f8" } ``` @@ -324,5 +350,5 @@ import { Using `terraform import`, import Security Groups using the security group `id`. For example: ```console -% terraform import aws_security_group.elb_sg sg-903004f8 +% terraform import aws_security_group.example sg-903004f8 ``` From 0647e45fada78d27d75e79d80e8752523367f66e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:49 -0400 Subject: [PATCH 2101/2115] r/aws_sqs_queue(doc): document import by identity --- website/docs/r/sqs_queue.html.markdown | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/sqs_queue.html.markdown b/website/docs/r/sqs_queue.html.markdown index c147586af4b9..b13555ea745e 100644 --- a/website/docs/r/sqs_queue.html.markdown +++ b/website/docs/r/sqs_queue.html.markdown @@ -143,11 +143,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sqs_queue.example + identity = { + url = "https://queue.amazonaws.com/80398EXAMPLE/MyQueue" + } +} + +resource "aws_sqs_queue" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `url` (String) URL of the SQS queue. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SQS Queues using the queue `url`. For example: ```terraform import { - to = aws_sqs_queue.public_queue + to = aws_sqs_queue.example id = "https://queue.amazonaws.com/80398EXAMPLE/MyQueue" } ``` @@ -155,5 +181,5 @@ import { Using `terraform import`, import SQS Queues using the queue `url`. For example: ```console -% terraform import aws_sqs_queue.public_queue https://queue.amazonaws.com/80398EXAMPLE/MyQueue +% terraform import aws_sqs_queue.example https://queue.amazonaws.com/80398EXAMPLE/MyQueue ``` From 43300ac0b3080b64a47bedad3a3dcc4b9baea2e1 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:54 -0400 Subject: [PATCH 2102/2115] r/aws_subnet(doc): document import by identity --- website/docs/r/subnet.html.markdown | 30 +++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/website/docs/r/subnet.html.markdown b/website/docs/r/subnet.html.markdown index 506a8be1e069..2398a88313b9 100644 --- a/website/docs/r/subnet.html.markdown +++ b/website/docs/r/subnet.html.markdown @@ -91,11 +91,37 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_subnet.example + identity = { + id = "subnet-9d4a7b6c" + } +} + +resource "aws_subnet" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` (String) ID of the subnet. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import subnets using the subnet `id`. For example: ```terraform import { - to = aws_subnet.public_subnet + to = aws_subnet.example id = "subnet-9d4a7b6c" } ``` @@ -103,5 +129,5 @@ import { Using `terraform import`, import subnets using the subnet `id`. For example: ```console -% terraform import aws_subnet.public_subnet subnet-9d4a7b6c +% terraform import aws_subnet.example subnet-9d4a7b6c ``` From 8ef1d4d7d3aa58eb3b95f83b428d80f2e0dcca2e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:42:58 -0400 Subject: [PATCH 2103/2115] r/aws_vpc_security_group_vpc_association(doc): document import by identity --- ...curity_group_vpc_association.html.markdown | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/website/docs/r/vpc_security_group_vpc_association.html.markdown b/website/docs/r/vpc_security_group_vpc_association.html.markdown index e4c3ade46802..e408bfbb02c6 100644 --- a/website/docs/r/vpc_security_group_vpc_association.html.markdown +++ b/website/docs/r/vpc_security_group_vpc_association.html.markdown @@ -42,6 +42,34 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_vpc_association.example + identity = { + vpc_id = "vpc-67890" + security_group_id = "sg-12345" + } +} + +resource "aws_vpc_security_group_vpc_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `vpc_id` (String) VPC ID. +* `security_group_id` (String) Security Group ID. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a Security Group VPC Association using the `security_group_id` and `vpc_id` arguments, separated by a comma (`,`). For example: ```terraform From c060995ba66e140fa58bf2c3ba5e19052d261bcc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 15:56:25 -0400 Subject: [PATCH 2104/2115] chore: website linter fixes --- website/docs/r/cloudfrontkeyvaluestore_key.html.markdown | 2 +- website/docs/r/cloudwatch_event_rule.html.markdown | 3 ++- website/docs/r/cloudwatch_event_target.html.markdown | 4 ++-- website/docs/r/iam_role_policy_attachment.html.markdown | 2 +- website/docs/r/lambda_permission.html.markdown | 3 ++- .../r/organizations_delegated_administrator.html.markdown | 2 +- website/docs/r/route53_record.html.markdown | 5 +++-- website/docs/r/s3_bucket_acl.html.markdown | 1 + website/docs/r/s3_bucket_cors_configuration.html.markdown | 1 + website/docs/r/s3_bucket_logging.html.markdown | 1 + website/docs/r/s3_bucket_object.html.markdown | 2 +- ...bucket_server_side_encryption_configuration.html.markdown | 1 + website/docs/r/s3_bucket_versioning.html.markdown | 1 + website/docs/r/s3_bucket_website_configuration.html.markdown | 1 + website/docs/r/s3_object.html.markdown | 2 +- website/docs/r/sagemaker_user_profile.html.markdown | 2 +- .../docs/r/vpc_security_group_vpc_association.html.markdown | 2 +- 17 files changed, 22 insertions(+), 13 deletions(-) diff --git a/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown b/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown index ab0d8e4700f1..6a3ba1aac497 100644 --- a/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown +++ b/website/docs/r/cloudfrontkeyvaluestore_key.html.markdown @@ -53,7 +53,7 @@ import { to = aws_cloudfrontkeyvaluestore_key.example identity = { key_value_store_arn = "arn:aws:cloudfront::111111111111:key-value-store/8562g61f-caba-2845-9d99-b97diwae5d3c" - key = "someKey" + key = "someKey" } } diff --git a/website/docs/r/cloudwatch_event_rule.html.markdown b/website/docs/r/cloudwatch_event_rule.html.markdown index e33c7bfc026e..9fc36f4d43eb 100644 --- a/website/docs/r/cloudwatch_event_rule.html.markdown +++ b/website/docs/r/cloudwatch_event_rule.html.markdown @@ -91,7 +91,7 @@ In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp import { to = aws_cloudwatch_event_rule.example identity = { - name = "capture-console-sign-in" + name = "capture-console-sign-in" event_bus_name = "example-event-bus" } } @@ -110,6 +110,7 @@ resource "aws_cloudwatch_event_rule" "example" { #### Optional * `event_bus_name` (String) Name of the event bus. If omitted, `default` is used. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/cloudwatch_event_target.html.markdown b/website/docs/r/cloudwatch_event_target.html.markdown index 7e9891bfa928..aa2fd892bf6c 100644 --- a/website/docs/r/cloudwatch_event_target.html.markdown +++ b/website/docs/r/cloudwatch_event_target.html.markdown @@ -697,8 +697,8 @@ import { to = aws_cloudwatch_event_target.example identity = { event_bus_name = "default" - rule = "rule-name" - target_id = "target-id" + rule = "rule-name" + target_id = "target-id" } } diff --git a/website/docs/r/iam_role_policy_attachment.html.markdown b/website/docs/r/iam_role_policy_attachment.html.markdown index 4d2fdc9fe2eb..7977197c835c 100644 --- a/website/docs/r/iam_role_policy_attachment.html.markdown +++ b/website/docs/r/iam_role_policy_attachment.html.markdown @@ -74,7 +74,7 @@ In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp import { to = aws_iam_role_policy_attachment.example identity = { - role = "test-role" + role = "test-role" policy_arn = "arn:aws:iam::xxxxxxxxxxxx:policy/test-policy" } } diff --git a/website/docs/r/lambda_permission.html.markdown b/website/docs/r/lambda_permission.html.markdown index de49d9a146b2..7353be3acea2 100644 --- a/website/docs/r/lambda_permission.html.markdown +++ b/website/docs/r/lambda_permission.html.markdown @@ -243,7 +243,7 @@ import { to = aws_lambda_permission.example identity = { function_name = "my_test_lambda_function" - statement_id = "AllowExecutionFromCloudWatch" + statement_id = "AllowExecutionFromCloudWatch" } } @@ -262,6 +262,7 @@ resource "aws_lambda_permission" "example" { #### Optional * `qualifier` (String) Qualifier for the function version or alias. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/organizations_delegated_administrator.html.markdown b/website/docs/r/organizations_delegated_administrator.html.markdown index ed593d626ba7..cf4da004c491 100644 --- a/website/docs/r/organizations_delegated_administrator.html.markdown +++ b/website/docs/r/organizations_delegated_administrator.html.markdown @@ -47,7 +47,7 @@ In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp import { to = aws_organizations_delegated_administrator.example identity = { - service_principal = "config.amazonaws.com" + service_principal = "config.amazonaws.com" delegated_account_id = "123456789012" } } diff --git a/website/docs/r/route53_record.html.markdown b/website/docs/r/route53_record.html.markdown index 2ea694639230..5bb1978fb8ac 100644 --- a/website/docs/r/route53_record.html.markdown +++ b/website/docs/r/route53_record.html.markdown @@ -256,8 +256,8 @@ import { to = aws_route53_record.example identity = { zone_id = "Z4KAPRWWNC7JR" - name = "dev.example.com" - type = "NS" + name = "dev.example.com" + type = "NS" } } @@ -277,6 +277,7 @@ resource "aws_route53_record" "example" { #### Optional * `set_identifier` (String) Set identifier for the record. + - `account_id` (String) AWS Account where this resource is managed. In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Route53 Records using the ID of the record, record name, record type, and set identifier. For example: diff --git a/website/docs/r/s3_bucket_acl.html.markdown b/website/docs/r/s3_bucket_acl.html.markdown index 97db96816cbe..5501df69d256 100644 --- a/website/docs/r/s3_bucket_acl.html.markdown +++ b/website/docs/r/s3_bucket_acl.html.markdown @@ -192,6 +192,7 @@ resource "aws_s3_bucket_acl" "example" { * `expected_bucket_owner` (String) Account ID of the expected bucket owner. * `acl` (String) Canned ACL to apply to the bucket. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_bucket_cors_configuration.html.markdown b/website/docs/r/s3_bucket_cors_configuration.html.markdown index 29fdfb8047ed..88bb7da9536a 100644 --- a/website/docs/r/s3_bucket_cors_configuration.html.markdown +++ b/website/docs/r/s3_bucket_cors_configuration.html.markdown @@ -91,6 +91,7 @@ resource "aws_s3_bucket_cors_configuration" "example" { #### Optional * `expected_bucket_owner` (String) Account ID of the expected bucket owner. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_bucket_logging.html.markdown b/website/docs/r/s3_bucket_logging.html.markdown index 2f4b036ba86b..fa7d973e373c 100644 --- a/website/docs/r/s3_bucket_logging.html.markdown +++ b/website/docs/r/s3_bucket_logging.html.markdown @@ -169,6 +169,7 @@ resource "aws_s3_bucket_logging" "example" { #### Optional * `expected_bucket_owner` (String) Account ID of the expected bucket owner. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_bucket_object.html.markdown b/website/docs/r/s3_bucket_object.html.markdown index 5eeb80cb18ed..c7fc3498212c 100644 --- a/website/docs/r/s3_bucket_object.html.markdown +++ b/website/docs/r/s3_bucket_object.html.markdown @@ -188,7 +188,7 @@ import { to = aws_s3_bucket_object.example identity = { bucket = "some-bucket-name" - key = "some/key.txt" + key = "some/key.txt" } } diff --git a/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown b/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown index eddf23cca9bf..c69cd69a780b 100644 --- a/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown +++ b/website/docs/r/s3_bucket_server_side_encryption_configuration.html.markdown @@ -91,6 +91,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "example" { #### Optional * `expected_bucket_owner` (String) Account ID of the expected bucket owner. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_bucket_versioning.html.markdown b/website/docs/r/s3_bucket_versioning.html.markdown index 5b9ca199d2b5..bd6efdd011c1 100644 --- a/website/docs/r/s3_bucket_versioning.html.markdown +++ b/website/docs/r/s3_bucket_versioning.html.markdown @@ -140,6 +140,7 @@ resource "aws_s3_bucket_versioning" "example" { #### Optional * `expected_bucket_owner` (String) Account ID of the expected bucket owner. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_bucket_website_configuration.html.markdown b/website/docs/r/s3_bucket_website_configuration.html.markdown index bc44e3ef738c..a1e7d56710e6 100644 --- a/website/docs/r/s3_bucket_website_configuration.html.markdown +++ b/website/docs/r/s3_bucket_website_configuration.html.markdown @@ -159,6 +159,7 @@ resource "aws_s3_bucket_website_configuration" "example" { #### Optional * `expected_bucket_owner` (String) Account ID of the expected bucket owner. + - `account_id` (String) AWS Account where this resource is managed. - `region` (String) Region where this resource is managed. diff --git a/website/docs/r/s3_object.html.markdown b/website/docs/r/s3_object.html.markdown index 57265b95b08a..aa87f2dc6f4f 100644 --- a/website/docs/r/s3_object.html.markdown +++ b/website/docs/r/s3_object.html.markdown @@ -228,7 +228,7 @@ import { to = aws_s3_object.example identity = { bucket = "some-bucket-name" - key = "some/key.txt" + key = "some/key.txt" } } diff --git a/website/docs/r/sagemaker_user_profile.html.markdown b/website/docs/r/sagemaker_user_profile.html.markdown index fd1a500e41b9..a3dc7ca41548 100644 --- a/website/docs/r/sagemaker_user_profile.html.markdown +++ b/website/docs/r/sagemaker_user_profile.html.markdown @@ -236,7 +236,7 @@ In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp import { to = aws_sagemaker_user_profile.example identity = { - domain_id = "domain-id" + domain_id = "domain-id" user_profile_name = "profile-name" } } diff --git a/website/docs/r/vpc_security_group_vpc_association.html.markdown b/website/docs/r/vpc_security_group_vpc_association.html.markdown index e408bfbb02c6..30766d368b69 100644 --- a/website/docs/r/vpc_security_group_vpc_association.html.markdown +++ b/website/docs/r/vpc_security_group_vpc_association.html.markdown @@ -48,7 +48,7 @@ In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp import { to = aws_vpc_security_group_vpc_association.example identity = { - vpc_id = "vpc-67890" + vpc_id = "vpc-67890" security_group_id = "sg-12345" } } From 772315ddb3f6b2ffb15ee0ef02e2926e04543d38 Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 16:29:19 -0400 Subject: [PATCH 2105/2115] r/aws_docdb_cluster(doc): clarify `availability_zones` behavior (#44265) Clarifies that specifying less than 3 availability zones may result in persistent differences without an `ignore_changes` lifecycle argument. From the DocumentDB documentation. > When you create a cluster using the Amazon DocumentDB console, and you choose to create a replica in a different Availability Zone, Amazon DocumentDB creates two instances. It creates the primary instance in one Availability Zone and the replica instance in a different Availability Zone. **The cluster volume is always replicated across three Availability Zones.** - https://docs.aws.amazon.com/documentdb/latest/developerguide/regions-and-azs.html --- website/docs/r/docdb_cluster.html.markdown | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/docs/r/docdb_cluster.html.markdown b/website/docs/r/docdb_cluster.html.markdown index 0e43dfb151a9..6661eb06a7a1 100644 --- a/website/docs/r/docdb_cluster.html.markdown +++ b/website/docs/r/docdb_cluster.html.markdown @@ -46,8 +46,9 @@ This resource supports the following arguments: * `apply_immediately` - (Optional) Specifies whether any cluster modifications are applied immediately, or during the next maintenance window. Default is `false`. -* `availability_zones` - (Optional) A list of EC2 Availability Zones that - instances in the DB cluster can be created in. +* `availability_zones` - (Optional) A list of EC2 Availability Zones that instances in the DB cluster can be created in. + DocumentDB automatically assigns 3 AZs if less than 3 AZs are configured, which will show as a difference requiring resource recreation next Terraform apply. + We recommend specifying 3 AZs or using [the `lifecycle` configuration block `ignore_changes` argument](https://www.terraform.io/docs/configuration/meta-arguments/lifecycle.html#ignore_changes) if necessary. * `backup_retention_period` - (Optional) The days to retain backups for. Default `1` * `cluster_identifier_prefix` - (Optional, Forces new resource) Creates a unique cluster identifier beginning with the specified prefix. Conflicts with `cluster_identifier`. * `cluster_identifier` - (Optional, Forces new resources) The cluster identifier. If omitted, Terraform will assign a random, unique identifier. From 059a9d08bda1cfb2fe3c8da33726a855a2182bdc Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Fri, 12 Sep 2025 16:29:57 -0400 Subject: [PATCH 2106/2115] r/aws_scheduler_schedule: add `action_after_completion` argument (#44264) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This argument aligns with the `ActionAfterCompletion` field in the Create and Update APIs. When unset, the value defaults to `NONE`. - https://docs.aws.amazon.com/scheduler/latest/APIReference/API_CreateSchedule.html#scheduler-CreateSchedule-request-ActionAfterCompletion ```console % make testacc PKG=scheduler TESTS=TestAccSchedulerSchedule_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 tmp1 🌿... TF_ACC=1 go1.24.6 test ./internal/service/scheduler/... -v -count 1 -parallel 20 -run='TestAccSchedulerSchedule_' -timeout 360m -vet=off 2025/09/12 12:02:05 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/12 12:02:05 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccSchedulerSchedule_basic (69.73s) === CONT TestAccSchedulerSchedule_targetECSParameters --- PASS: TestAccSchedulerSchedule_nameGenerated (72.83s) === CONT TestAccSchedulerSchedule_disappears --- PASS: TestAccSchedulerSchedule_namePrefix (75.09s) === CONT TestAccSchedulerSchedule_targetARN --- PASS: TestAccSchedulerSchedule_groupName (80.71s) === CONT TestAccSchedulerSchedule_state --- PASS: TestAccSchedulerSchedule_targetInput (98.37s) --- PASS: TestAccSchedulerSchedule_scheduleExpression (102.96s) --- PASS: TestAccSchedulerSchedule_targetRoleARN (105.14s) --- PASS: TestAccSchedulerSchedule_actionAfterCompletion (108.99s) --- PASS: TestAccSchedulerSchedule_startDate (119.81s) --- PASS: TestAccSchedulerSchedule_flexibleTimeWindow (120.33s) --- PASS: TestAccSchedulerSchedule_scheduleExpressionTimezone (121.86s) --- PASS: TestAccSchedulerSchedule_targetRetryPolicy (123.36s) --- PASS: TestAccSchedulerSchedule_kmsKeyARN (124.96s) --- PASS: TestAccSchedulerSchedule_description (125.05s) --- PASS: TestAccSchedulerSchedule_endDate (125.43s) --- PASS: TestAccSchedulerSchedule_disappears (53.28s) --- PASS: TestAccSchedulerSchedule_targetSQSParameters (126.52s) --- PASS: TestAccSchedulerSchedule_targetEventBridgeParameters (127.22s) --- PASS: TestAccSchedulerSchedule_targetDeadLetterConfig (127.23s) --- PASS: TestAccSchedulerSchedule_targetKinesisParameters (136.70s) --- PASS: TestAccSchedulerSchedule_targetARN (68.21s) --- PASS: TestAccSchedulerSchedule_targetSageMakerPipelineParameters (146.42s) --- PASS: TestAccSchedulerSchedule_state (76.45s) --- PASS: TestAccSchedulerSchedule_targetECSParameters (124.94s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/scheduler 201.405s ``` --- .changelog/44264.txt | 3 + internal/service/scheduler/schedule.go | 15 ++++ internal/service/scheduler/schedule_test.go | 79 +++++++++++++++++++ .../docs/r/scheduler_schedule.html.markdown | 3 +- 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 .changelog/44264.txt diff --git a/.changelog/44264.txt b/.changelog/44264.txt new file mode 100644 index 000000000000..a89a1c3d27f5 --- /dev/null +++ b/.changelog/44264.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_scheduler_schedule: Add `action_after_completion` argument +``` diff --git a/internal/service/scheduler/schedule.go b/internal/service/scheduler/schedule.go index f0653dbf2b7d..5375e02ac1c5 100644 --- a/internal/service/scheduler/schedule.go +++ b/internal/service/scheduler/schedule.go @@ -45,6 +45,12 @@ func resourceSchedule() *schema.Resource { }, Schema: map[string]*schema.Schema{ + "action_after_completion": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateDiagFunc: enum.Validate[types.ActionAfterCompletion](), + }, names.AttrARN: { Type: schema.TypeString, Computed: true, @@ -442,6 +448,10 @@ func resourceScheduleCreate(ctx context.Context, d *schema.ResourceData, meta an ScheduleExpression: aws.String(d.Get(names.AttrScheduleExpression).(string)), } + if v, ok := d.Get("action_after_completion").(string); ok && v != "" { + in.ActionAfterCompletion = types.ActionAfterCompletion(v) + } + if v, ok := d.Get(names.AttrDescription).(string); ok && v != "" { in.Description = aws.String(v) } @@ -532,6 +542,7 @@ func resourceScheduleRead(ctx context.Context, d *schema.ResourceData, meta any) return create.AppendDiagError(diags, names.Scheduler, create.ErrActionReading, ResNameSchedule, d.Id(), err) } + d.Set("action_after_completion", out.ActionAfterCompletion) d.Set(names.AttrARN, out.Arn) d.Set(names.AttrDescription, out.Description) @@ -579,6 +590,10 @@ func resourceScheduleUpdate(ctx context.Context, d *schema.ResourceData, meta an Target: expandTarget(ctx, d.Get(names.AttrTarget).([]any)[0].(map[string]any)), } + if v, ok := d.Get("action_after_completion").(string); ok && v != "" { + in.ActionAfterCompletion = types.ActionAfterCompletion(v) + } + if v, ok := d.Get(names.AttrDescription).(string); ok && v != "" { in.Description = aws.String(v) } diff --git a/internal/service/scheduler/schedule_test.go b/internal/service/scheduler/schedule_test.go index 155c2e89f1a0..76359a5a8352 100644 --- a/internal/service/scheduler/schedule_test.go +++ b/internal/service/scheduler/schedule_test.go @@ -12,8 +12,10 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/service/scheduler" + awstypes "github.com/aws/aws-sdk-go-v2/service/scheduler/types" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/create" @@ -201,6 +203,7 @@ func TestAccSchedulerSchedule_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckScheduleExists(ctx, t, resourceName, &schedule), acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "scheduler", regexache.MustCompile(regexp.QuoteMeta(`schedule/default/`+name))), + resource.TestCheckResourceAttr(resourceName, "action_after_completion", string(awstypes.ActionAfterCompletionNone)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "end_date", ""), resource.TestCheckResourceAttr(resourceName, "flexible_time_window.0.maximum_window_in_minutes", "0"), @@ -261,12 +264,62 @@ func TestAccSchedulerSchedule_disappears(t *testing.T) { testAccCheckScheduleExists(ctx, t, resourceName, &schedule), acctest.CheckResourceDisappears(ctx, acctest.Provider, tfscheduler.ResourceSchedule(), resourceName), ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, ExpectNonEmptyPlan: true, }, }, }) } +func TestAccSchedulerSchedule_actionAfterCompletion(t *testing.T) { + ctx := acctest.Context(t) + if testing.Short() { + t.Skip("skipping long-running test in short mode") + } + + var schedule scheduler.GetScheduleOutput + name := acctest.RandomWithPrefix(t, acctest.ResourcePrefix) + resourceName := "aws_scheduler_schedule.test" + + acctest.ParallelTest(ctx, t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.SchedulerEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.SchedulerServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckScheduleDestroy(ctx, t), + Steps: []resource.TestStep{ + { + Config: testAccScheduleConfig_actionAfterCompletion(name, string(awstypes.ActionAfterCompletionNone)), + Check: resource.ComposeTestCheckFunc( + testAccCheckScheduleExists(ctx, t, resourceName, &schedule), + resource.TestCheckResourceAttr(resourceName, "action_after_completion", string(awstypes.ActionAfterCompletionNone)), + ), + }, + { + Config: testAccScheduleConfig_actionAfterCompletion(name, string(awstypes.ActionAfterCompletionDelete)), + Check: resource.ComposeTestCheckFunc( + testAccCheckScheduleExists(ctx, t, resourceName, &schedule), + resource.TestCheckResourceAttr(resourceName, "action_after_completion", string(awstypes.ActionAfterCompletionDelete)), + ), + }, + { + Config: testAccScheduleConfig_actionAfterCompletion(name, string(awstypes.ActionAfterCompletionNone)), + Check: resource.ComposeTestCheckFunc( + testAccCheckScheduleExists(ctx, t, resourceName, &schedule), + resource.TestCheckResourceAttr(resourceName, "action_after_completion", string(awstypes.ActionAfterCompletionNone)), + ), + }, + }, + }) +} + func TestAccSchedulerSchedule_description(t *testing.T) { ctx := acctest.Context(t) if testing.Short() { @@ -1695,6 +1748,32 @@ resource "aws_scheduler_schedule" "test" { ) } +func testAccScheduleConfig_actionAfterCompletion(rName, actionAfterCompletion string) string { + return acctest.ConfigCompose( + testAccScheduleConfig_base, + fmt.Sprintf(` +resource "aws_sqs_queue" "test" {} + +resource "aws_scheduler_schedule" "test" { + name = %[1]q + + action_after_completion = %[2]q + + flexible_time_window { + mode = "OFF" + } + + schedule_expression = "rate(1 hour)" + + target { + arn = aws_sqs_queue.test.arn + role_arn = aws_iam_role.test.arn + } +} +`, rName, actionAfterCompletion), + ) +} + func testAccScheduleConfig_description(name, description string) string { return acctest.ConfigCompose( testAccScheduleConfig_base, diff --git a/website/docs/r/scheduler_schedule.html.markdown b/website/docs/r/scheduler_schedule.html.markdown index 2853f5600e4f..a74d910ce3a3 100644 --- a/website/docs/r/scheduler_schedule.html.markdown +++ b/website/docs/r/scheduler_schedule.html.markdown @@ -72,13 +72,14 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `action_after_completion` - (Optional) Action that applies to the schedule after completing invocation of the target. Valid values are `NONE` and `DELETE`. Defaults to `NONE`. * `description` - (Optional) Brief description of the schedule. * `end_date` - (Optional) The date, in UTC, before which the schedule can invoke its target. Depending on the schedule's recurrence expression, invocations might stop on, or before, the end date you specify. EventBridge Scheduler ignores the end date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `group_name` - (Optional, Forces new resource) Name of the schedule group to associate with this schedule. When omitted, the `default` schedule group is used. * `kms_key_arn` - (Optional) ARN for the customer managed KMS key that EventBridge Scheduler will use to encrypt and decrypt your data. * `name` - (Optional, Forces new resource) Name of the schedule. If omitted, Terraform will assign a random, unique name. Conflicts with `name_prefix`. * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `schedule_expression_timezone` - (Optional) Timezone in which the scheduling expression is evaluated. Defaults to `UTC`. Example: `Australia/Sydney`. * `start_date` - (Optional) The date, in UTC, after which the schedule can begin invoking its target. Depending on the schedule's recurrence expression, invocations might occur on, or after, the start date you specify. EventBridge Scheduler ignores the start date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `state` - (Optional) Specifies whether the schedule is enabled or disabled. One of: `ENABLED` (default), `DISABLED`. From a789cbec225b5a7c5d54154c55b588fb7c54102f Mon Sep 17 00:00:00 2001 From: changelogbot Date: Fri, 12 Sep 2025 20:34:59 +0000 Subject: [PATCH 2107/2115] Update CHANGELOG.md for #44264 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index adf6cfa24837..19bf040cb112 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ FEATURES: * **New Resource:** `aws_controltower_baseline` ([#42397](https://github.com/hashicorp/terraform-provider-aws/issues/42397)) +ENHANCEMENTS: + +* resource/aws_scheduler_schedule: Add `action_after_completion` argument ([#44264](https://github.com/hashicorp/terraform-provider-aws/issues/44264)) + ## 6.13.0 (September 11, 2025) ENHANCEMENTS: From e7165b720d5977cd2be96307dc2dc5f825099b9e Mon Sep 17 00:00:00 2001 From: Jared Baker Date: Mon, 15 Sep 2025 09:44:10 -0400 Subject: [PATCH 2108/2115] r/aws_rds_global_cluster: remove `engine` and `source_db_cluster_identifier` conflict (#44252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This enables both arguments to be set upon creation, rather than requiring users to set a source DB for the initial global cluster creation and removing it to set `engine` and `engine_version` for subsequent major version upgrades. During create operations the `engine` and `engine_version` values will be ignored if `source_db_cluster_identifier` is set. If the engine version varies from what is inherited from the source cluster a second change will be planned immediately following the initial apply. To support future major version upgrades on a promoted global cluster, the following configuration is now valid. ```terraform resource "aws_rds_global_cluster" "test" { force_destroy = true global_cluster_identifier = "my-cluster" engine = local.engine engine_version = local.engine_version source_db_cluster_identifier = aws_rds_cluster.test.arn } ``` ```console % make testacc PKG=rds TESTS=TestAccRDSGlobalCluster_SourceDBClusterIdentifier make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 f-rds_global_cluster-rm-engine-conflict 🌿... TF_ACC=1 go1.24.6 test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccRDSGlobalCluster_SourceDBClusterIdentifier' -timeout 360m -vet=off 2025/09/11 13:05:11 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/11 13:05:11 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_databaseName (192.02s) --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_storageEncrypted (192.05s) --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_EngineVersion_updateMajor (1849.39s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/rds 1855.979s ``` ```console % make testacc PKG=rds TESTS=TestAccRDSGlobalCluster_ make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... make: Running acceptance tests on branch: 🌿 f-rds_global_cluster-rm-engine-conflict 🌿... TF_ACC=1 go1.24.6 test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccRDSGlobalCluster_' -timeout 360m -vet=off 2025/09/12 10:00:33 Creating Terraform AWS Provider (SDKv2-style)... 2025/09/12 10:00:33 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccRDSGlobalCluster_forceDestroy (31.24s) === CONT TestAccRDSGlobalCluster_EngineVersion_auroraPostgreSQL === NAME TestAccRDSGlobalCluster_storageEncrypted global_cluster_test.go:602: Step 3/3 error: Error running apply: exit status 1 Error: creating RDS Global Cluster (tf-acc-test-1266092778766974036): operation error RDS: CreateGlobalCluster, https response error StatusCode: 400, RequestID: 15aa4798-dc3b-40c7-98b1-4e1d443d2d14, GlobalClusterAlreadyExistsFault: Global cluster tf-acc-test-1266092778766974036 already exists with aws_rds_global_cluster.test, on terraform_plugin_test.tf line 12, in resource "aws_rds_global_cluster" "test": 12: resource "aws_rds_global_cluster" "test" { --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_emptyProviderOnlyTag (42.04s) === CONT TestAccRDSGlobalCluster_sourceDBClusterIdentifier --- FAIL: TestAccRDSGlobalCluster_storageEncrypted (42.79s) === CONT TestAccRDSGlobalCluster_EngineVersion_auroraMySQL --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_nullOverlappingResourceTag (44.13s) === CONT TestAccRDSGlobalCluster_tags_AddOnUpdate --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_emptyResourceTag (44.16s) === CONT TestAccRDSGlobalCluster_tags_EmptyTag_OnCreate --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_nullNonOverlappingResourceTag (44.55s) === CONT TestAccRDSGlobalCluster_disappears --- PASS: TestAccRDSGlobalCluster_tags_ComputedTag_OnCreate (45.52s) === CONT TestAccRDSGlobalCluster_databaseName --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_updateToProviderOnly (65.49s) === CONT TestAccRDSGlobalCluster_basic --- PASS: TestAccRDSGlobalCluster_EngineVersion_auroraPostgreSQL (35.94s) === CONT TestAccRDSGlobalCluster_tags_EmptyMap --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_updateToResourceOnly (67.40s) === CONT TestAccRDSGlobalCluster_EngineVersion_updateMajor --- PASS: TestAccRDSGlobalCluster_tags_ComputedTag_OnUpdate_Add (69.44s) === CONT TestAccRDSGlobalCluster_EngineVersion_updateMinorMultiRegion --- PASS: TestAccRDSGlobalCluster_tags_ComputedTag_OnUpdate_Replace (73.49s) === CONT TestAccRDSGlobalCluster_tags_null --- PASS: TestAccRDSGlobalCluster_disappears (30.15s) === CONT TestAccRDSGlobalCluster_tags_IgnoreTags_Overlap_ResourceTag --- PASS: TestAccRDSGlobalCluster_EngineVersion_auroraMySQL (35.53s) === CONT TestAccRDSGlobalCluster_tags_DefaultTags_providerOnly === NAME TestAccRDSGlobalCluster_databaseName global_cluster_test.go:171: Step 3/3 error: Error running apply: exit status 1 Error: creating RDS Global Cluster (tf-acc-test-5146216102148161976): operation error RDS: CreateGlobalCluster, https response error StatusCode: 400, RequestID: bf20209e-2aa5-4eca-89c9-2f7c8065cfe0, GlobalClusterAlreadyExistsFault: Global cluster tf-acc-test-5146216102148161976 already exists with aws_rds_global_cluster.test, on terraform_plugin_test.tf line 12, in resource "aws_rds_global_cluster" "test": 12: resource "aws_rds_global_cluster" "test" { --- FAIL: TestAccRDSGlobalCluster_databaseName (38.02s) === CONT TestAccRDSGlobalCluster_tags_DefaultTags_nonOverlapping --- PASS: TestAccRDSGlobalCluster_tags_IgnoreTags_Overlap_DefaultTag (84.98s) === CONT TestAccRDSGlobalCluster_EngineVersion_updateMinor --- PASS: TestAccRDSGlobalCluster_deletionProtection (87.05s) === CONT TestAccRDSGlobalCluster_engineLifecycleSupport_disabled --- PASS: TestAccRDSGlobalCluster_basic (30.27s) === CONT TestAccRDSGlobalCluster_tags_EmptyTag_OnUpdate_Replace --- PASS: TestAccRDSGlobalCluster_tags_EmptyTag_OnUpdate_Add (95.97s) --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_overlapping (101.57s) --- PASS: TestAccRDSGlobalCluster_tags_AddOnUpdate (58.35s) --- PASS: TestAccRDSGlobalCluster_tags_EmptyTag_OnCreate (60.96s) --- PASS: TestAccRDSGlobalCluster_tags_EmptyMap (44.07s) --- PASS: TestAccRDSGlobalCluster_engineLifecycleSupport_disabled (24.83s) --- PASS: TestAccRDSGlobalCluster_tags_null (40.28s) --- PASS: TestAccRDSGlobalCluster_tags (116.69s) --- PASS: TestAccRDSGlobalCluster_tags_EmptyTag_OnUpdate_Replace (35.37s) --- PASS: TestAccRDSGlobalCluster_tags_IgnoreTags_Overlap_ResourceTag (59.60s) --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_nonOverlapping (58.38s) --- PASS: TestAccRDSGlobalCluster_tags_DefaultTags_providerOnly (76.94s) --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_storageEncrypted (194.09s) --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_databaseName (204.21s) --- PASS: TestAccRDSGlobalCluster_sourceDBClusterIdentifier (193.83s) --- PASS: TestAccRDSGlobalCluster_EngineVersion_updateMinor (1283.77s) --- PASS: TestAccRDSGlobalCluster_EngineVersion_updateMajor (1709.34s) --- PASS: TestAccRDSGlobalCluster_SourceDBClusterIdentifier_EngineVersion_updateMajor (1865.42s) --- PASS: TestAccRDSGlobalCluster_EngineVersion_updateMinorMultiRegion (3051.41s) --- PASS: TestAccRDSGlobalCluster_EngineVersion_updateMajorMultiRegion (3467.62s) FAIL FAIL github.com/hashicorp/terraform-provider-aws/internal/service/rds 3474.432s ``` Failures are pre-existing and unrelated to this change. --- .changelog/44252.txt | 3 + internal/service/rds/global_cluster.go | 26 ++++--- internal/service/rds/global_cluster_test.go | 78 +++++++++++++++++++ .../docs/r/rds_global_cluster.html.markdown | 9 ++- 4 files changed, 102 insertions(+), 14 deletions(-) create mode 100644 .changelog/44252.txt diff --git a/.changelog/44252.txt b/.changelog/44252.txt new file mode 100644 index 000000000000..1c38854376e5 --- /dev/null +++ b/.changelog/44252.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_rds_global_cluster: Remove provider-side conflict between `source_db_cluster_identifier` and `engine` arguments +``` diff --git a/internal/service/rds/global_cluster.go b/internal/service/rds/global_cluster.go index ffc9957fea55..2683ba76747c 100644 --- a/internal/service/rds/global_cluster.go +++ b/internal/service/rds/global_cluster.go @@ -71,12 +71,11 @@ func resourceGlobalCluster() *schema.Resource { Computed: true, }, names.AttrEngine: { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - ConflictsWith: []string{"source_db_cluster_identifier"}, - ValidateFunc: validation.StringInSlice(globalClusterEngine_Values(), false), + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateFunc: validation.StringInSlice(globalClusterEngine_Values(), false), }, "engine_lifecycle_support": { Type: schema.TypeString, @@ -124,12 +123,11 @@ func resourceGlobalCluster() *schema.Resource { Computed: true, }, "source_db_cluster_identifier": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - ConflictsWith: []string{names.AttrEngine}, - RequiredWith: []string{names.AttrForceDestroy}, + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + RequiredWith: []string{names.AttrForceDestroy}, }, names.AttrStorageEncrypted: { Type: schema.TypeBool, @@ -175,6 +173,10 @@ func resourceGlobalClusterCreate(ctx context.Context, d *schema.ResourceData, me if v, ok := d.GetOk("source_db_cluster_identifier"); ok { input.SourceDBClusterIdentifier = aws.String(v.(string)) + // Engine and engine version cannot be sent during create requests if a source + // DB cluster is specified. + input.Engine = nil + input.EngineVersion = nil } if v, ok := d.GetOk(names.AttrStorageEncrypted); ok { diff --git a/internal/service/rds/global_cluster_test.go b/internal/service/rds/global_cluster_test.go index 2c20b7d183be..0490b260b922 100644 --- a/internal/service/rds/global_cluster_test.go +++ b/internal/service/rds/global_cluster_test.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/aws-sdk-go-base/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/plancheck" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -628,6 +629,49 @@ func TestAccRDSGlobalCluster_storageEncrypted(t *testing.T) { }) } +// Creates a global cluster from an existing regional source, then completes a major version upgrade +func TestAccRDSGlobalCluster_SourceDBClusterIdentifier_EngineVersion_updateMajor(t *testing.T) { + ctx := acctest.Context(t) + var v types.GlobalCluster + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_rds_global_cluster.test" + engineVersion := "15.10" + engineVersionUpdated := "16.6" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheckGlobalCluster(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.RDSServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckGlobalClusterDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccGlobalClusterConfig_sourceClusterIDEngineVersion(rName, engineVersion), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalClusterExists(ctx, resourceName, &v), + resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, engineVersion), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + }, + { + Config: testAccGlobalClusterConfig_sourceClusterIDEngineVersion(rName, engineVersionUpdated), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalClusterExists(ctx, resourceName, &v), + resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, engineVersionUpdated), + ), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate), + }, + }, + }, + }, + }) +} + func testAccCheckGlobalClusterExists(ctx context.Context, n string, v *types.GlobalCluster) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] @@ -1280,6 +1324,40 @@ resource "aws_rds_global_cluster" "test" { `, rName) } +func testAccGlobalClusterConfig_sourceClusterIDEngineVersion(rName, engineVersion string) string { + return fmt.Sprintf(` +resource "aws_rds_cluster" "test" { + cluster_identifier = %[1]q + engine = "aurora-postgresql" + engine_version = %[2]q + master_password = "mustbeeightcharacters" + master_username = "test" + skip_final_snapshot = true + database_name = "database04" + + lifecycle { + ignore_changes = [global_cluster_identifier, engine_version] + } +} + +resource "aws_rds_cluster_instance" "test" { + identifier = %[1]q + cluster_identifier = aws_rds_cluster.test.id + engine = aws_rds_cluster.test.engine + engine_version = aws_rds_cluster.test.engine_version + instance_class = "db.r5.large" +} + +resource "aws_rds_global_cluster" "test" { + force_destroy = true + global_cluster_identifier = %[1]q + engine = aws_rds_cluster.test.engine + engine_version = %[2]q + source_db_cluster_identifier = aws_rds_cluster.test.arn +} +`, rName, engineVersion) +} + func testAccGlobalClusterConfig_storageEncrypted(rName string, storageEncrypted bool) string { return fmt.Sprintf(` resource "aws_rds_global_cluster" "test" { diff --git a/website/docs/r/rds_global_cluster.html.markdown b/website/docs/r/rds_global_cluster.html.markdown index c11abc029976..15a2c81fec92 100644 --- a/website/docs/r/rds_global_cluster.html.markdown +++ b/website/docs/r/rds_global_cluster.html.markdown @@ -211,20 +211,25 @@ resource "aws_rds_cluster_instance" "primary" { ## Argument Reference -This resource supports the following arguments: +The following arguments are required: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `global_cluster_identifier` - (Required, Forces new resources) Global cluster identifier. + +The following arguments are optional: + * `database_name` - (Optional, Forces new resources) Name for an automatically created database on cluster creation. Terraform will only perform drift detection if a configuration value is provided. * `deletion_protection` - (Optional) If the Global Cluster should have deletion protection enabled. The database can't be deleted when this value is set to `true`. The default is `false`. * `engine` - (Optional, Forces new resources) Name of the database engine to be used for this DB cluster. Terraform will only perform drift detection if a configuration value is provided. Valid values: `aurora`, `aurora-mysql`, `aurora-postgresql`. Defaults to `aurora`. Conflicts with `source_db_cluster_identifier`. * `engine_lifecycle_support` - (Optional) The life cycle type for this DB instance. This setting applies only to Aurora PostgreSQL-based global databases. Valid values are `open-source-rds-extended-support`, `open-source-rds-extended-support-disabled`. Default value is `open-source-rds-extended-support`. [Using Amazon RDS Extended Support]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/extended-support.html * `engine_version` - (Optional) Engine version of the Aurora global database. The `engine`, `engine_version`, and `instance_class` (on the `aws_rds_cluster_instance`) must together support global databases. See [Using Amazon Aurora global databases](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-global-database.html) for more information. By upgrading the engine version, Terraform will upgrade cluster members. **NOTE:** To avoid an `inconsistent final plan` error while upgrading, use the `lifecycle` `ignore_changes` for `engine_version` meta argument on the associated `aws_rds_cluster` resource as shown above in [Upgrading Engine Versions](#upgrading-engine-versions) example. * `force_destroy` - (Optional) Enable to remove DB Cluster members from Global Cluster on destroy. Required with `source_db_cluster_identifier`. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `source_db_cluster_identifier` - (Optional) Amazon Resource Name (ARN) to use as the primary DB Cluster of the Global Cluster on creation. Terraform cannot perform drift detection of this value. **NOTE:** After initial creation, this argument can be removed and replaced with `engine` and `engine_version`. This allows upgrading the engine version of the Global Cluster. * `storage_encrypted` - (Optional, Forces new resources) Specifies whether the DB cluster is encrypted. The default is `false` unless `source_db_cluster_identifier` is specified and encrypted. Terraform will only perform drift detection if a configuration value is provided. * `tags` - (Optional) A map of tags to assign to the DB cluster. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +~> When both `source_db_cluster_identifier` and `engine`/`engine_version` are set, all engine related values will be ignored during creation. The global cluster will inherit the `engine` and `engine_version` values from the source cluster. After the first apply, any differences between the inherited and configured values will trigger an in-place update. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: From 828229b773c550f1a7af6c9962e535f19dad3bed Mon Sep 17 00:00:00 2001 From: changelogbot Date: Mon, 15 Sep 2025 13:49:14 +0000 Subject: [PATCH 2109/2115] Update CHANGELOG.md for #44252 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19bf040cb112..d618b86a33aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ FEATURES: ENHANCEMENTS: +* resource/aws_rds_global_cluster: Remove provider-side conflict between `source_db_cluster_identifier` and `engine` arguments ([#44252](https://github.com/hashicorp/terraform-provider-aws/issues/44252)) * resource/aws_scheduler_schedule: Add `action_after_completion` argument ([#44264](https://github.com/hashicorp/terraform-provider-aws/issues/44264)) ## 6.13.0 (September 11, 2025) From 00f7e0b15149bd6f334c86406eadf7266bbb8699 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:22:40 -0400 Subject: [PATCH 2110/2115] build(deps): bump actions/create-github-app-token from 2.1.1 to 2.1.4 (#44283) Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 2.1.1 to 2.1.4. - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/a8d616148505b5069dccd32f177bb87d7f39123b...67018539274d69449ef7c02e8e71183d1719ab42) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-version: 2.1.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/generate_changelog.yml | 2 +- .github/workflows/maintainer_helpers.yml | 4 ++-- .github/workflows/triage.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml index 09b4be9378ee..60a83b7d6dcb 100644 --- a/.github/workflows/generate_changelog.yml +++ b/.github/workflows/generate_changelog.yml @@ -8,7 +8,7 @@ jobs: if: github.event.pull_request.merged || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 + - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 id: app-token with: app-id: ${{ secrets.APP_ID }} diff --git a/.github/workflows/maintainer_helpers.yml b/.github/workflows/maintainer_helpers.yml index b93174b8cead..9e23eb9d1199 100644 --- a/.github/workflows/maintainer_helpers.yml +++ b/.github/workflows/maintainer_helpers.yml @@ -39,7 +39,7 @@ jobs: CURRENT_LABELS: ${{ github.event_name == 'issues' && toJSON(github.event.issue.labels.*.name) || toJSON(github.event.pull_request.labels.*.name) }} GH_CLI_SUBCOMMAND: ${{ github.event_name == 'pull_request_target' && 'pr' || 'issue' }} steps: - - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 + - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 id: token with: app-id: ${{ secrets.APP_ID }} @@ -220,7 +220,7 @@ jobs: ] } - - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 + - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 if: github.event_name == 'schedule' id: token with: diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 4c4e6b4e15ff..718ef501d529 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -80,7 +80,7 @@ jobs: enable-versioned-regex: 0 include-title: 1 - - uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1 + - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4 id: token if: github.event_name == 'issues' with: From 9b2b77ded28856b230c070c346937a60ad0baf3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:24:08 -0400 Subject: [PATCH 2111/2115] build(deps): bump breathingdust/github-jira-tidy from 0.14.0 to 0.15.0 (#44282) Bumps [breathingdust/github-jira-tidy](https://github.com/breathingdust/github-jira-tidy) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/breathingdust/github-jira-tidy/releases) - [Commits](https://github.com/breathingdust/github-jira-tidy/compare/90353323866d42ef3686f589d834ba5f30ce6534...302d16f9cc705ea132dc20c34d1cff6a98b03509) --- updated-dependencies: - dependency-name: breathingdust/github-jira-tidy dependency-version: 0.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/post-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index df724360263f..11737d6d7953 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Tidy Jira - uses: breathingdust/github-jira-tidy@90353323866d42ef3686f589d834ba5f30ce6534 # v0.14.0 + uses: breathingdust/github-jira-tidy@302d16f9cc705ea132dc20c34d1cff6a98b03509 # v0.15.0 with: jira_host: 'hashicorp.atlassian.net' jira_username: 'sdavis@hashicorp.com' From 8ffa95689227ba8f1b4ebceef36ddf2826ee85da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:40:10 -0400 Subject: [PATCH 2112/2115] build(deps): bump the aws-sdk-go-v2 group across 1 directory with 11 updates (#44284) * build(deps): bump the aws-sdk-go-v2 group across 1 directory with 11 updates Bumps the aws-sdk-go-v2 group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/service/amp](https://github.com/aws/aws-sdk-go-v2) | `1.39.4` | `1.40.0` | | [github.com/aws/aws-sdk-go-v2/service/datazone](https://github.com/aws/aws-sdk-go-v2) | `1.40.1` | `1.41.0` | | [github.com/aws/aws-sdk-go-v2/service/ecs](https://github.com/aws/aws-sdk-go-v2) | `1.63.7` | `1.64.0` | | [github.com/aws/aws-sdk-go-v2/service/emrcontainers](https://github.com/aws/aws-sdk-go-v2) | `1.39.4` | `1.40.0` | | [github.com/aws/aws-sdk-go-v2/service/evs](https://github.com/aws/aws-sdk-go-v2) | `1.4.4` | `1.5.0` | | [github.com/aws/aws-sdk-go-v2/service/guardduty](https://github.com/aws/aws-sdk-go-v2) | `1.63.4` | `1.64.0` | | [github.com/aws/aws-sdk-go-v2/service/medialive](https://github.com/aws/aws-sdk-go-v2) | `1.81.4` | `1.82.0` | | [github.com/aws/aws-sdk-go-v2/service/paymentcryptography](https://github.com/aws/aws-sdk-go-v2) | `1.24.0` | `1.25.0` | | [github.com/aws/aws-sdk-go-v2/service/quicksight](https://github.com/aws/aws-sdk-go-v2) | `1.93.4` | `1.94.0` | | [github.com/aws/aws-sdk-go-v2/service/rds](https://github.com/aws/aws-sdk-go-v2) | `1.106.2` | `1.107.0` | | [github.com/aws/aws-sdk-go-v2/service/redshiftserverless](https://github.com/aws/aws-sdk-go-v2) | `1.31.4` | `1.31.5` | Updates `github.com/aws/aws-sdk-go-v2/service/amp` from 1.39.4 to 1.40.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/amp/v1.39.4...service/s3/v1.40.0) Updates `github.com/aws/aws-sdk-go-v2/service/datazone` from 1.40.1 to 1.41.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/s3/v1.40.1...service/s3/v1.41.0) Updates `github.com/aws/aws-sdk-go-v2/service/ecs` from 1.63.7 to 1.64.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.63.7...service/s3/v1.64.0) Updates `github.com/aws/aws-sdk-go-v2/service/emrcontainers` from 1.39.4 to 1.40.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/amp/v1.39.4...service/s3/v1.40.0) Updates `github.com/aws/aws-sdk-go-v2/service/evs` from 1.4.4 to 1.5.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.5.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/m2/v1.4.4...v1.5.0) Updates `github.com/aws/aws-sdk-go-v2/service/guardduty` from 1.63.4 to 1.64.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/ecs/v1.63.4...service/s3/v1.64.0) Updates `github.com/aws/aws-sdk-go-v2/service/medialive` from 1.81.4 to 1.82.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.81.4...service/s3/v1.82.0) Updates `github.com/aws/aws-sdk-go-v2/service/paymentcryptography` from 1.24.0 to 1.25.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/v1.24.0...v1.25.0) Updates `github.com/aws/aws-sdk-go-v2/service/quicksight` from 1.93.4 to 1.94.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ec2/v1.94.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.93.4...service/ec2/v1.94.0) Updates `github.com/aws/aws-sdk-go-v2/service/rds` from 1.106.2 to 1.107.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/ec2/v1.107.0/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/service/rds/v1.106.2...service/ec2/v1.107.0) Updates `github.com/aws/aws-sdk-go-v2/service/redshiftserverless` from 1.31.4 to 1.31.5 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](https://github.com/aws/aws-sdk-go-v2/compare/config/v1.31.4...config/v1.31.5) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/amp dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/datazone dependency-version: 1.41.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/ecs dependency-version: 1.64.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/emrcontainers dependency-version: 1.40.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/evs dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/guardduty dependency-version: 1.64.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/medialive dependency-version: 1.82.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/paymentcryptography dependency-version: 1.25.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/quicksight dependency-version: 1.94.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/rds dependency-version: 1.107.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-sdk-go-v2 - dependency-name: github.com/aws/aws-sdk-go-v2/service/redshiftserverless dependency-version: 1.31.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk-go-v2 ... Signed-off-by: dependabot[bot] * chore: make clean-tidy --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jared Baker --- go.mod | 22 +++++++++++----------- go.sum | 44 +++++++++++++++++++++---------------------- tools/tfsdk2fw/go.mod | 22 +++++++++++----------- tools/tfsdk2fw/go.sum | 44 +++++++++++++++++++++---------------------- 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/go.mod b/go.mod index 96abbd43e61a..434e8df87d62 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.28.4 github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 - github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 + github.com/aws/aws-sdk-go-v2/service/amp v1.40.0 github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 @@ -91,7 +91,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 - github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 + github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0 github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 @@ -107,7 +107,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 + github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0 github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 @@ -117,11 +117,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0 github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 - github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 + github.com/aws/aws-sdk-go-v2/service/evs v1.5.0 github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 @@ -134,7 +134,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 + github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0 github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 @@ -168,7 +168,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 + github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0 github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 @@ -191,7 +191,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0 github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 @@ -201,13 +201,13 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 + github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0 github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 - github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 + github.com/aws/aws-sdk-go-v2/service/rds v1.107.0 github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5 github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 diff --git a/go.sum b/go.sum index 3863f8f3b249..e780618d7082 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 h1:gpzR1xWvsrNJeKgkFQHGXJMUr6+V github.com/aws/aws-sdk-go-v2/service/acm v1.37.4/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 h1:1bdOr2ALn/hXmSu55cn3meYg17IZj9QdRAMWqTURv6s= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 h1:ZdrAxWlzkxx3rFcbr07+7gOwxepzoTRdNZOMCNC6EIc= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.4/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= +github.com/aws/aws-sdk-go-v2/service/amp v1.40.0 h1:yM1W6WPzj6zg/KQ1ciOMksH/CJTJlIQuUczLDfoQn44= +github.com/aws/aws-sdk-go-v2/service/amp v1.40.0/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 h1:Wf3pQg+WebfAI5aklg3B6x8/5UDjXSFxzVaX4a30BBs= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 h1:UoAThO0F16j0XhBF0xVhur/ceXiidEtSTOL1AiUhBZw= @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 h1:RT2vYyEURb1Y2c9Wouf github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 h1:HaqO010CgYxtu8mNUUQUd2QC3yDN4JS9Olt4vOQpR20= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 h1:nrtKiE7MDX32FQ1cHI404PJvYXdyP5a1g1WbKdGgf7k= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0 h1:VPonYVHFrgQY/Y6vGUmis6FTAmo95qW1JnGu5ZGcJ7o= +github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 h1:0H43bqbpiPF4WV+2ppV9l6T30lWolBsshd8ZQYt//wk= github.com/aws/aws-sdk-go-v2/service/dax v1.28.4/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 h1:a/VOCosbBdJUSyaEXRN4hsqGbXG/itfOquy7GX1vBeU= @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 h1:phfqjO8ebHGoC/GrjHcuTrVkDCeM github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 h1:/HxbCJjqyO4eJ1FCVnvUJtXbWOnG217jMpkYaTUP6V8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 h1:VwvvHn/XroaU+md5moLOuFtvGjrExOVr2s3JP+3I2FI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0 h1:WydV4UxL/L1h+ZYQPkpto6jqMVRslWrufYstFZPrQEc= +github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 h1:iOfTDjU/S2b0BSWCqv7fDbT4uKo0e3jdtnRHVwXXggI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.5/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 h1:V6MAr82kSLdj3/tN4UcPtlXDbvkNcAxsIvq59CNe704= @@ -245,16 +245,16 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 h1:fcnPiM4WIbUoEk github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 h1:pXKG3/B5OVTYmautR+UpCWbeLhmaVnxeiWkEXVGzzSE= github.com/aws/aws-sdk-go-v2/service/emr v1.54.3/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 h1:UOLh0c5Zjnn8/JA25dFE6BtBIELqYi6fATod7ZKP0ZY= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0 h1:Y5/ySwaJzOPO61AWX1BGj4Yp6bI1Rzc9JX0FS7Yrd1E= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 h1:zOWo+iUy8bWSXDxz99OiZGBl8KBbgexMTCP3rDxwzQ4= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 h1:390U/RkWYmxI9z2konFlfhXi05PV6+ywYy1rDvGvD9c= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 h1:mmhBtyY6j9ncbB417ldmSvpQH9MIW8C6H20OZstvzTI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 h1:DOHjB2RH/hJvp+QETG9HgENH+Td7iGQ5gNniSc5GuQs= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.4/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= +github.com/aws/aws-sdk-go-v2/service/evs v1.5.0 h1:FrVKla4UH8i+RtnH95HVf9b8DwK+0kZjE2mMuYqy+y4= +github.com/aws/aws-sdk-go-v2/service/evs v1.5.0/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 h1:nIMnqlQNvnMuMkNvSrcaykHHHBZtsSZ+uPeKCpKyBx4= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 h1:LRa23ftG+djfUEQ5rGQxm0IfX5pc1bJ1HL1J/F61074= @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 h1:a0xWOiAVwUN6lFLLyo//Z github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 h1:QD71EO8w7RDwT/w6gnUS7dD+JZZljeomz/Gx9XvHxNg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 h1:dlchWELsKc+8CHOQ/QBzWRo0DyxyN2VfaFOKjY8yqzU= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0 h1:TCxB0sehnsofHa1YUfs+p2vBCfjaBm2le0Bd6H8m58c= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 h1:pKDsKc5fov+2XJx4JcdonlpUddvvHozYPw/XEBfgQMA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 h1:o2gRl9x3A/Sp6q4oHinnrS+2AC9Ud8DaG4JL9ygMACk= @@ -357,8 +357,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 h1:c4LeHvhTAYsO8md5in7 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 h1:88tdsQqAz0hhrCo4jVxjrTSB9eoNtRLRW1FyfLUCDB0= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 h1:g7OqgKXlgCgtpG2/IFkxoQKguUYXJ3/XO1QOEoZgwFE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= +github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0 h1:S7vCX+wJ/m20PKdpKYo0BUG06OuyiI7DqAnPilGYsZE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 h1:1vRJmRaj700hsd9p+gXRrbSu13xheA5YPkpVALYNC7U= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 h1:GJPo1aJDfnKPRcdsw9zOCY0zsoA8bN0jRJYADGzUfTo= @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 h1:5iK3XJb7lqznX5wFGu3hCs+hnYa github.com/aws/aws-sdk-go-v2/service/osis v1.19.3/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 h1:aGSJR31Z33MIDBz3imAxNYe3VJuev7pcyT3pIQUnTA8= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 h1:2xi1ySvJWcYhd0Uu/SuMkWAVZl4DXKb6KYbyo7Suk7E= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0 h1:Xa+1EAhqSQXNmGBsIanfy8tNo85XdhUk4TRi6uxMaJw= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 h1:fSfw+4bF7B23fCjB63HZOVsJmAYMz3SIcCK28B6kvPk= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 h1:3btzBHLKRPz9ecnk0EIE+EAGbMtl99x2VWdTflAml2k= @@ -423,20 +423,20 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 h1:TQ0TJxq5Ke7E5bPP8fEBsv github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 h1:ezX6I8vkNJDSYWH6Fxs3HZif3vCXXm1d8lg9BjhSdic= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 h1:cjQhZCAWDV6f7nFeR8DJaQz8qyFP0zwvUluOdojrIn8= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0 h1:15uL9RzToUifJuMkW6ONnWioTETxryUbgMBIOQ5D1rA= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 h1:TCaXm9jWgdARQXQg5geTepn5/v6Iqn6d4JkAmODNpbc= github.com/aws/aws-sdk-go-v2/service/ram v1.34.4/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 h1:NDgqGmtlBkSNxDzbYFLfPnCq91kyr1kkf9Wa68Im9MQ= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 h1:SCHx0JQl2E24HbpZltlQdaQOD9BsjSa0fjDMz3OZYtY= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.2/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= +github.com/aws/aws-sdk-go-v2/service/rds v1.107.0 h1:PcG+YEp/ADK4JBq21G2I/PYlsq6wuDvUQqw2YEtECU8= +github.com/aws/aws-sdk-go-v2/service/rds v1.107.0/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 h1:rXoN3hvwUimq8Z6uu2lsYncGPDQS+i70Rp1G0c0C/zk= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 h1:egzZblPqPYLXClImxh6zL0kVt+aINhKMtj0Dlzt6LgM= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 h1:zdjzJy+tcuRwgCI55ItwodgtmCqCdamIWPZZEEvdx+4= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5 h1:h+93gIgr7UIcMJi7L/0jQ1ZgV5lgaAqfK0Ht9VuX9hY= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 h1:1440u1Pza3HtYqsUiofmOYUB/i4fwLXRgvG9c37wz8w= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 h1:50EjSzYo2Zl1WRSRtNTNqH0inalyK5xzGjzNsxoP/Qw= diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod index a36736da7759..6611fde129e6 100644 --- a/tools/tfsdk2fw/go.mod +++ b/tools/tfsdk2fw/go.mod @@ -32,7 +32,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/account v1.28.4 // indirect github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 // indirect github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 // indirect - github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/amp v1.40.0 // indirect github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 // indirect github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 // indirect github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.32.4 // indirect @@ -103,7 +103,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.4 // indirect github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 // indirect github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 // indirect - github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 // indirect + github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0 // indirect github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 // indirect github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 // indirect github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.4 // indirect @@ -119,7 +119,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 // indirect + github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0 // indirect github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 // indirect github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 // indirect github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.3 // indirect @@ -129,11 +129,11 @@ require ( github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.4 // indirect github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 // indirect github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 // indirect - github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 // indirect + github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0 // indirect github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 // indirect github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 // indirect github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 // indirect - github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 // indirect + github.com/aws/aws-sdk-go-v2/service/evs v1.5.0 // indirect github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 // indirect github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 // indirect github.com/aws/aws-sdk-go-v2/service/fis v1.37.3 // indirect @@ -146,7 +146,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/grafana v1.31.4 // indirect github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 // indirect github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 // indirect - github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 // indirect + github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0 // indirect github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 // indirect github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 // indirect github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.4 // indirect @@ -185,7 +185,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/macie2 v1.49.4 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 // indirect github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 // indirect - github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 // indirect + github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 // indirect github.com/aws/aws-sdk-go-v2/service/mediapackagevod v1.39.4 // indirect @@ -208,7 +208,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/organizations v1.45.1 // indirect github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 // indirect github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 // indirect - github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 // indirect + github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0 // indirect github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 // indirect github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 // indirect github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.4 // indirect @@ -218,13 +218,13 @@ require ( github.com/aws/aws-sdk-go-v2/service/pricing v1.39.4 // indirect github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 // indirect github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 // indirect - github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 // indirect + github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0 // indirect github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 // indirect github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 // indirect - github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 // indirect + github.com/aws/aws-sdk-go-v2/service/rds v1.107.0 // indirect github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 // indirect github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 // indirect - github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 // indirect + github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5 // indirect github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 // indirect github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 // indirect github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.21.4 // indirect diff --git a/tools/tfsdk2fw/go.sum b/tools/tfsdk2fw/go.sum index dc7404b5bae1..2f1da8df6d91 100644 --- a/tools/tfsdk2fw/go.sum +++ b/tools/tfsdk2fw/go.sum @@ -51,8 +51,8 @@ github.com/aws/aws-sdk-go-v2/service/acm v1.37.4 h1:gpzR1xWvsrNJeKgkFQHGXJMUr6+V github.com/aws/aws-sdk-go-v2/service/acm v1.37.4/go.mod h1:ne6qRVJDTR/w+X72nwE+FrJeWjidVANOuHiPL47wzg4= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3 h1:1bdOr2ALn/hXmSu55cn3meYg17IZj9QdRAMWqTURv6s= github.com/aws/aws-sdk-go-v2/service/acmpca v1.44.3/go.mod h1:jzjrG1/5C4WP1Y045W+SXqqUSVa6mXI4oC/ddfv3BXI= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.4 h1:ZdrAxWlzkxx3rFcbr07+7gOwxepzoTRdNZOMCNC6EIc= -github.com/aws/aws-sdk-go-v2/service/amp v1.39.4/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= +github.com/aws/aws-sdk-go-v2/service/amp v1.40.0 h1:yM1W6WPzj6zg/KQ1ciOMksH/CJTJlIQuUczLDfoQn44= +github.com/aws/aws-sdk-go-v2/service/amp v1.40.0/go.mod h1:VU8yFbIjSf8ljYsuiU4Onb1sJp5MPoE4Xpo4CmgWzPc= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3 h1:Wf3pQg+WebfAI5aklg3B6x8/5UDjXSFxzVaX4a30BBs= github.com/aws/aws-sdk-go-v2/service/amplify v1.37.3/go.mod h1:uOvz7RWXMa+OA/JCphKN+z0EkkHRTCivfgfhqOqtf9E= github.com/aws/aws-sdk-go-v2/service/apigateway v1.35.4 h1:UoAThO0F16j0XhBF0xVhur/ceXiidEtSTOL1AiUhBZw= @@ -193,8 +193,8 @@ github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3 h1:RT2vYyEURb1Y2c9Wouf github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.3/go.mod h1:AjQynFDMSWmaGyNwzNlQQ4t1SGtqwY0Rq0dgqCKsGIA= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4 h1:HaqO010CgYxtu8mNUUQUd2QC3yDN4JS9Olt4vOQpR20= github.com/aws/aws-sdk-go-v2/service/datasync v1.54.4/go.mod h1:7TqFyNtpN5h1VeBbN1FcXi0T3FIXcsPUVqq7iJrlsF8= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1 h1:nrtKiE7MDX32FQ1cHI404PJvYXdyP5a1g1WbKdGgf7k= -github.com/aws/aws-sdk-go-v2/service/datazone v1.40.1/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= +github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0 h1:VPonYVHFrgQY/Y6vGUmis6FTAmo95qW1JnGu5ZGcJ7o= +github.com/aws/aws-sdk-go-v2/service/datazone v1.41.0/go.mod h1:xGX76ojBOXWCIM5ZjtnYEqUUVbBjMdBmPBNKyXhBo8o= github.com/aws/aws-sdk-go-v2/service/dax v1.28.4 h1:0H43bqbpiPF4WV+2ppV9l6T30lWolBsshd8ZQYt//wk= github.com/aws/aws-sdk-go-v2/service/dax v1.28.4/go.mod h1:aZWmrV2Xi7rNUPy0JZ5vQGF7zboJoekVQkp7+ETUy+Y= github.com/aws/aws-sdk-go-v2/service/detective v1.37.5 h1:a/VOCosbBdJUSyaEXRN4hsqGbXG/itfOquy7GX1vBeU= @@ -225,8 +225,8 @@ github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3 h1:phfqjO8ebHGoC/GrjHcuTrVkDCeM github.com/aws/aws-sdk-go-v2/service/ecr v1.50.3/go.mod h1:TbUfC2wbI144ak0zMJoQ2zjPwGaw1/Kt3SXI138wcoY= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4 h1:/HxbCJjqyO4eJ1FCVnvUJtXbWOnG217jMpkYaTUP6V8= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.4/go.mod h1:9zEtIIye6jj1KTURitANknagaJqoo6TCy/ARcr+jsA4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7 h1:VwvvHn/XroaU+md5moLOuFtvGjrExOVr2s3JP+3I2FI= -github.com/aws/aws-sdk-go-v2/service/ecs v1.63.7/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= +github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0 h1:WydV4UxL/L1h+ZYQPkpto6jqMVRslWrufYstFZPrQEc= +github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0/go.mod h1:aJR4g+fZtJ2Bh8VVMS/UP6A3fuwBn9cWajUVos4zhP0= github.com/aws/aws-sdk-go-v2/service/efs v1.40.5 h1:iOfTDjU/S2b0BSWCqv7fDbT4uKo0e3jdtnRHVwXXggI= github.com/aws/aws-sdk-go-v2/service/efs v1.40.5/go.mod h1:gnXK8cQKVDpkqG7lCZ2NYx32B9WbTIZsGiAFRXxpX70= github.com/aws/aws-sdk-go-v2/service/eks v1.73.3 h1:V6MAr82kSLdj3/tN4UcPtlXDbvkNcAxsIvq59CNe704= @@ -245,16 +245,16 @@ github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4 h1:fcnPiM4WIbUoEk github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.4/go.mod h1:j4tMgnEQp7HVeKOGwMgrYGiqdhLernvp6FfBXkHmzIY= github.com/aws/aws-sdk-go-v2/service/emr v1.54.3 h1:pXKG3/B5OVTYmautR+UpCWbeLhmaVnxeiWkEXVGzzSE= github.com/aws/aws-sdk-go-v2/service/emr v1.54.3/go.mod h1:Ir/4rlQE1/wjbg2QdNNpIbPFVk4PR2ki1Td3VjSaHG0= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4 h1:UOLh0c5Zjnn8/JA25dFE6BtBIELqYi6fATod7ZKP0ZY= -github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.39.4/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0 h1:Y5/ySwaJzOPO61AWX1BGj4Yp6bI1Rzc9JX0FS7Yrd1E= +github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.40.0/go.mod h1:/AkijHJn1MbVjpsIPuL5ck8P2pqxM8/FO+ihLd6DOWs= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4 h1:zOWo+iUy8bWSXDxz99OiZGBl8KBbgexMTCP3rDxwzQ4= github.com/aws/aws-sdk-go-v2/service/emrserverless v1.36.4/go.mod h1:+krd9QJi+8dAGmplRYZF3OnmP+N145+hrUzIo7tFlhQ= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3 h1:390U/RkWYmxI9z2konFlfhXi05PV6+ywYy1rDvGvD9c= github.com/aws/aws-sdk-go-v2/service/eventbridge v1.45.3/go.mod h1:BkhvzMxAI/j6qaQ58vny9wBMemSXuIy2NL2omslXZSI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3 h1:mmhBtyY6j9ncbB417ldmSvpQH9MIW8C6H20OZstvzTI= github.com/aws/aws-sdk-go-v2/service/evidently v1.28.3/go.mod h1:EO3hYYAqlOBhu85e14Is+zvtf70WHR0QTTIrIkAzcgc= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.4 h1:DOHjB2RH/hJvp+QETG9HgENH+Td7iGQ5gNniSc5GuQs= -github.com/aws/aws-sdk-go-v2/service/evs v1.4.4/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= +github.com/aws/aws-sdk-go-v2/service/evs v1.5.0 h1:FrVKla4UH8i+RtnH95HVf9b8DwK+0kZjE2mMuYqy+y4= +github.com/aws/aws-sdk-go-v2/service/evs v1.5.0/go.mod h1:VgX/yf6xu2mQDvG6ZVj01YI3aW2IAA/vrXqhVNZGuBQ= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4 h1:nIMnqlQNvnMuMkNvSrcaykHHHBZtsSZ+uPeKCpKyBx4= github.com/aws/aws-sdk-go-v2/service/finspace v1.33.4/go.mod h1:2ZHiMpbMFUR31mfnPdWmX05EQJER12rn0X2LmZse16o= github.com/aws/aws-sdk-go-v2/service/firehose v1.41.4 h1:LRa23ftG+djfUEQ5rGQxm0IfX5pc1bJ1HL1J/F61074= @@ -279,8 +279,8 @@ github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4 h1:a0xWOiAVwUN6lFLLyo//Z github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.4/go.mod h1:s+U6weWn40Nvq5S4eLzHuhES7uSAIG5KW87562JaEqg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4 h1:QD71EO8w7RDwT/w6gnUS7dD+JZZljeomz/Gx9XvHxNg= github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.4/go.mod h1:F/cesec44yEp9vF7wZ0Z+nAxQ3K6rOUeccvJw4VVMsA= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4 h1:dlchWELsKc+8CHOQ/QBzWRo0DyxyN2VfaFOKjY8yqzU= -github.com/aws/aws-sdk-go-v2/service/guardduty v1.63.4/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0 h1:TCxB0sehnsofHa1YUfs+p2vBCfjaBm2le0Bd6H8m58c= +github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.0/go.mod h1:TDxdVXXCbO7M8QOQYrF9jqjssGUCdqHAIKxiVsC45NE= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3 h1:pKDsKc5fov+2XJx4JcdonlpUddvvHozYPw/XEBfgQMA= github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.3/go.mod h1:WX6qFIz7GhV8sbshaRGsHvahNLwclpiM5i4SVMKSDEA= github.com/aws/aws-sdk-go-v2/service/iam v1.47.5 h1:o2gRl9x3A/Sp6q4oHinnrS+2AC9Ud8DaG4JL9ygMACk= @@ -357,8 +357,8 @@ github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4 h1:c4LeHvhTAYsO8md5in7 github.com/aws/aws-sdk-go-v2/service/mediaconnect v1.44.4/go.mod h1:1bIbSQ+gsTKdBcHkmxoft9hxDy7bip7gWHB6zdJ6VWo= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4 h1:88tdsQqAz0hhrCo4jVxjrTSB9eoNtRLRW1FyfLUCDB0= github.com/aws/aws-sdk-go-v2/service/mediaconvert v1.82.4/go.mod h1:KRt+IAhw3rjGeBZdOJMaKzV8dcRH0FjidiANtilzjVE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4 h1:g7OqgKXlgCgtpG2/IFkxoQKguUYXJ3/XO1QOEoZgwFE= -github.com/aws/aws-sdk-go-v2/service/medialive v1.81.4/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= +github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0 h1:S7vCX+wJ/m20PKdpKYo0BUG06OuyiI7DqAnPilGYsZE= +github.com/aws/aws-sdk-go-v2/service/medialive v1.82.0/go.mod h1:sslxx162DAlYmkfvajs1wCLhZMVJ9Egd7ZH9EeaDEms= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4 h1:1vRJmRaj700hsd9p+gXRrbSu13xheA5YPkpVALYNC7U= github.com/aws/aws-sdk-go-v2/service/mediapackage v1.39.4/go.mod h1:uVi/2YwWZnWEhlPG3Y0eYrE3rljwGYvFGddE9SvYC48= github.com/aws/aws-sdk-go-v2/service/mediapackagev2 v1.31.1 h1:GJPo1aJDfnKPRcdsw9zOCY0zsoA8bN0jRJYADGzUfTo= @@ -403,8 +403,8 @@ github.com/aws/aws-sdk-go-v2/service/osis v1.19.3 h1:5iK3XJb7lqznX5wFGu3hCs+hnYa github.com/aws/aws-sdk-go-v2/service/osis v1.19.3/go.mod h1:jTMFR2G2mZQYlH6xqPMMq/FrYk6gPdx4kMB2SSLRy9c= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4 h1:aGSJR31Z33MIDBz3imAxNYe3VJuev7pcyT3pIQUnTA8= github.com/aws/aws-sdk-go-v2/service/outposts v1.56.4/go.mod h1:oEwTEYL6jq3k0aYlGr811o291esaRs5vgUyx7Iw0oIM= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0 h1:2xi1ySvJWcYhd0Uu/SuMkWAVZl4DXKb6KYbyo7Suk7E= -github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.24.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0 h1:Xa+1EAhqSQXNmGBsIanfy8tNo85XdhUk4TRi6uxMaJw= +github.com/aws/aws-sdk-go-v2/service/paymentcryptography v1.25.0/go.mod h1:oTU8PgBAPmgXqcGNysGtsvHSVaB1t70POQWzrvvzekM= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4 h1:fSfw+4bF7B23fCjB63HZOVsJmAYMz3SIcCK28B6kvPk= github.com/aws/aws-sdk-go-v2/service/pcaconnectorad v1.15.4/go.mod h1:niQNNLiBhOtmIZdsx+ysgpmltLaENic1qZC0l+eMDyY= github.com/aws/aws-sdk-go-v2/service/pcs v1.12.4 h1:3btzBHLKRPz9ecnk0EIE+EAGbMtl99x2VWdTflAml2k= @@ -423,20 +423,20 @@ github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4 h1:TQ0TJxq5Ke7E5bPP8fEBsv github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.4/go.mod h1:qc2aOP01g+JGeH+49eopeEuXlGIGN8jHF8pBmUkI9gA= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4 h1:ezX6I8vkNJDSYWH6Fxs3HZif3vCXXm1d8lg9BjhSdic= github.com/aws/aws-sdk-go-v2/service/qldb v1.30.4/go.mod h1:YFfh8o2ao94xoukSHq4+VyS1d80dCNy1I7d1dWIJZMs= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4 h1:cjQhZCAWDV6f7nFeR8DJaQz8qyFP0zwvUluOdojrIn8= -github.com/aws/aws-sdk-go-v2/service/quicksight v1.93.4/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0 h1:15uL9RzToUifJuMkW6ONnWioTETxryUbgMBIOQ5D1rA= +github.com/aws/aws-sdk-go-v2/service/quicksight v1.94.0/go.mod h1:y6RX8GTCi2DI7lOyw//2ePenD4X6DYLt38VL1YbLXpU= github.com/aws/aws-sdk-go-v2/service/ram v1.34.4 h1:TCaXm9jWgdARQXQg5geTepn5/v6Iqn6d4JkAmODNpbc= github.com/aws/aws-sdk-go-v2/service/ram v1.34.4/go.mod h1:AsP8whp7pNZFVwNpxUMhQbR81Fmb+8SywIa5OfjUlRM= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4 h1:NDgqGmtlBkSNxDzbYFLfPnCq91kyr1kkf9Wa68Im9MQ= github.com/aws/aws-sdk-go-v2/service/rbin v1.26.4/go.mod h1:KHNVBn5Axg/mdA/Fl7uQB9VMQccunTxYdSjkvJuNLQQ= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.2 h1:SCHx0JQl2E24HbpZltlQdaQOD9BsjSa0fjDMz3OZYtY= -github.com/aws/aws-sdk-go-v2/service/rds v1.106.2/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= +github.com/aws/aws-sdk-go-v2/service/rds v1.107.0 h1:PcG+YEp/ADK4JBq21G2I/PYlsq6wuDvUQqw2YEtECU8= +github.com/aws/aws-sdk-go-v2/service/rds v1.107.0/go.mod h1:EVYMTmrAQr0LbGPy3FxHJHvPcP8x6byBwFJ9fUZKU3Q= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3 h1:rXoN3hvwUimq8Z6uu2lsYncGPDQS+i70Rp1G0c0C/zk= github.com/aws/aws-sdk-go-v2/service/redshift v1.58.3/go.mod h1:OfB6wMvsEozZQbEjgqe6J68wF5u7wXNEAdG4FLKLk/Y= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4 h1:egzZblPqPYLXClImxh6zL0kVt+aINhKMtj0Dlzt6LgM= github.com/aws/aws-sdk-go-v2/service/redshiftdata v1.37.4/go.mod h1:Jb2pR/0IhKbpPmetMChm8rxQDk2MLmb9ZNSDZlsGB4g= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4 h1:zdjzJy+tcuRwgCI55ItwodgtmCqCdamIWPZZEEvdx+4= -github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.4/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5 h1:h+93gIgr7UIcMJi7L/0jQ1ZgV5lgaAqfK0Ht9VuX9hY= +github.com/aws/aws-sdk-go-v2/service/redshiftserverless v1.31.5/go.mod h1:X10Ql/ih4yUJl87EKfnrX8iC9zfn2VFgVMCeWqGlOjI= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3 h1:1440u1Pza3HtYqsUiofmOYUB/i4fwLXRgvG9c37wz8w= github.com/aws/aws-sdk-go-v2/service/rekognition v1.51.3/go.mod h1:TDGlJxUrttcw4osr2qAj2KKn2tQf2AwaqjcXKxSaM5U= github.com/aws/aws-sdk-go-v2/service/resiliencehub v1.34.4 h1:50EjSzYo2Zl1WRSRtNTNqH0inalyK5xzGjzNsxoP/Qw= From aea8bd50c0aae1b3b3e62710bdb98699281dfff4 Mon Sep 17 00:00:00 2001 From: Dale Gartman <42749996+gartmand@users.noreply.github.com> Date: Mon, 15 Sep 2025 10:56:26 -0400 Subject: [PATCH 2113/2115] Documentation: specify that an SSM Parameter can be used in aws_imagebuilder_image_recipe parent_image argument. Fixes #44161 (#44267) Co-authored-by: dale.gartman --- website/docs/r/imagebuilder_image_recipe.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/imagebuilder_image_recipe.html.markdown b/website/docs/r/imagebuilder_image_recipe.html.markdown index 5263703c9347..a88c20366a82 100644 --- a/website/docs/r/imagebuilder_image_recipe.html.markdown +++ b/website/docs/r/imagebuilder_image_recipe.html.markdown @@ -50,7 +50,7 @@ The following arguments are required: * `component` - (Required) Ordered configuration block(s) with components for the image recipe. Detailed below. * `name` - (Required) Name of the image recipe. -* `parent_image` - (Required) The image recipe uses this image as a base from which to build your customized image. The value can be the base image ARN or an AMI ID. +* `parent_image` - (Required) The image recipe uses this image as a base from which to build your customized image. The value can be the base image ARN, an AMI ID, or an SSM Parameter referencing the AMI. For an SSM Parameter, enter the prefix `ssm:`, followed by the parameter name or ARN. * `version` - (Required) The semantic version of the image recipe, which specifies the version in the following format, with numeric values in each position to indicate a specific version: major.minor.patch. For example: 1.0.0. The following arguments are optional: From 80fe0fb5f3e0786108dbbce5f9d7a692f42e13e4 Mon Sep 17 00:00:00 2001 From: team-tf-cdk <84392119+team-tf-cdk@users.noreply.github.com> Date: Mon, 15 Sep 2025 17:55:35 +0200 Subject: [PATCH 2114/2115] =?UTF-8?q?cdktf:=20update=20index.html.markdown?= =?UTF-8?q?,r/xray=5Fsampling=5Frule.html.markdown,r/xray=5Fresource=5Fpol?= =?UTF-8?q?icy.html.markdown,r/xray=5Fgroup.html.markdown,r/xray=5Fencrypt?= =?UTF-8?q?ion=5Fconfig.html.markdown,r/workspacesweb=5Fuser=5Fsettings=5F?= =?UTF-8?q?association.html.markdown,r/workspacesweb=5Fuser=5Fsettings.htm?= =?UTF-8?q?l.markdown,r/workspacesweb=5Fuser=5Faccess=5Flogging=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fuser=5Faccess=5F?= =?UTF-8?q?logging=5Fsettings.html.markdown,r/workspacesweb=5Ftrust=5Fstor?= =?UTF-8?q?e=5Fassociation.html.markdown,r/workspacesweb=5Ftrust=5Fstore.h?= =?UTF-8?q?tml.markdown,r/workspacesweb=5Fsession=5Flogger=5Fassociation.h?= =?UTF-8?q?tml.markdown,r/workspacesweb=5Fsession=5Flogger.html.markdown,r?= =?UTF-8?q?/workspacesweb=5Fportal.html.markdown,r/workspacesweb=5Fnetwork?= =?UTF-8?q?=5Fsettings=5Fassociation.html.markdown,r/workspacesweb=5Fnetwo?= =?UTF-8?q?rk=5Fsettings.html.markdown,r/workspacesweb=5Fip=5Faccess=5Fset?= =?UTF-8?q?tings=5Fassociation.html.markdown,r/workspacesweb=5Fip=5Faccess?= =?UTF-8?q?=5Fsettings.html.markdown,r/workspacesweb=5Fidentity=5Fprovider?= =?UTF-8?q?.html.markdown,r/workspacesweb=5Fdata=5Fprotection=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fdata=5Fprotectio?= =?UTF-8?q?n=5Fsettings.html.markdown,r/workspacesweb=5Fbrowser=5Fsettings?= =?UTF-8?q?=5Fassociation.html.markdown,r/workspacesweb=5Fbrowser=5Fsettin?= =?UTF-8?q?gs.html.markdown,r/workspaces=5Fworkspace.html.markdown,r/works?= =?UTF-8?q?paces=5Fip=5Fgroup.html.markdown,r/workspaces=5Fdirectory.html.?= =?UTF-8?q?markdown,r/workspaces=5Fconnection=5Falias.html.markdown,r/wafv?= =?UTF-8?q?2=5Fweb=5Facl=5Frule=5Fgroup=5Fassociation.html.markdown,r/wafv?= =?UTF-8?q?2=5Fweb=5Facl=5Flogging=5Fconfiguration.html.markdown,r/wafv2?= =?UTF-8?q?=5Fweb=5Facl=5Fassociation.html.markdown,r/wafv2=5Fweb=5Facl.ht?= =?UTF-8?q?ml.markdown,r/wafv2=5Frule=5Fgroup.html.markdown,r/wafv2=5Frege?= =?UTF-8?q?x=5Fpattern=5Fset.html.markdown,r/wafv2=5Fip=5Fset.html.markdow?= =?UTF-8?q?n,r/wafv2=5Fapi=5Fkey.html.markdown,r/wafregional=5Fxss=5Fmatch?= =?UTF-8?q?=5Fset.html.markdown,r/wafregional=5Fweb=5Facl=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/wafregional=5Fweb=5Facl.html.markdown,r/wafregion?= =?UTF-8?q?al=5Fsql=5Finjection=5Fmatch=5Fset.html.markdown,r/wafregional?= =?UTF-8?q?=5Fsize=5Fconstraint=5Fset.html.markdown,r/wafregional=5Frule?= =?UTF-8?q?=5Fgroup.html.markdown,r/wafregional=5Frule.html.markdown,r/waf?= =?UTF-8?q?regional=5Fregex=5Fpattern=5Fset.html.markdown,r/wafregional=5F?= =?UTF-8?q?regex=5Fmatch=5Fset.html.markdown,r/wafregional=5Frate=5Fbased?= =?UTF-8?q?=5Frule.html.markdown,r/wafregional=5Fipset.html.markdown,r/waf?= =?UTF-8?q?regional=5Fgeo=5Fmatch=5Fset.html.markdown,r/wafregional=5Fbyte?= =?UTF-8?q?=5Fmatch=5Fset.html.markdown,r/waf=5Fxss=5Fmatch=5Fset.html.mar?= =?UTF-8?q?kdown,r/waf=5Fweb=5Facl.html.markdown,r/waf=5Fsql=5Finjection?= =?UTF-8?q?=5Fmatch=5Fset.html.markdown,r/waf=5Fsize=5Fconstraint=5Fset.ht?= =?UTF-8?q?ml.markdown,r/waf=5Frule=5Fgroup.html.markdown,r/waf=5Frule.htm?= =?UTF-8?q?l.markdown,r/waf=5Fregex=5Fpattern=5Fset.html.markdown,r/waf=5F?= =?UTF-8?q?regex=5Fmatch=5Fset.html.markdown,r/waf=5Frate=5Fbased=5Frule.h?= =?UTF-8?q?tml.markdown,r/waf=5Fipset.html.markdown,r/waf=5Fgeo=5Fmatch=5F?= =?UTF-8?q?set.html.markdown,r/waf=5Fbyte=5Fmatch=5Fset.html.markdown,r/vp?= =?UTF-8?q?n=5Fgateway=5Froute=5Fpropagation.html.markdown,r/vpn=5Fgateway?= =?UTF-8?q?=5Fattachment.html.markdown,r/vpn=5Fgateway.html.markdown,r/vpn?= =?UTF-8?q?=5Fconnection=5Froute.html.markdown,r/vpn=5Fconnection.html.mar?= =?UTF-8?q?kdown,r/vpclattice=5Ftarget=5Fgroup=5Fattachment.html.markdown,?= =?UTF-8?q?r/vpclattice=5Ftarget=5Fgroup.html.markdown,r/vpclattice=5Fserv?= =?UTF-8?q?ice=5Fnetwork=5Fvpc=5Fassociation.html.markdown,r/vpclattice=5F?= =?UTF-8?q?service=5Fnetwork=5Fservice=5Fassociation.html.markdown,r/vpcla?= =?UTF-8?q?ttice=5Fservice=5Fnetwork=5Fresource=5Fassociation.html.markdow?= =?UTF-8?q?n,r/vpclattice=5Fservice=5Fnetwork.html.markdown,r/vpclattice?= =?UTF-8?q?=5Fservice.html.markdown,r/vpclattice=5Fresource=5Fpolicy.html.?= =?UTF-8?q?markdown,r/vpclattice=5Fresource=5Fgateway.html.markdown,r/vpcl?= =?UTF-8?q?attice=5Fresource=5Fconfiguration.html.markdown,r/vpclattice=5F?= =?UTF-8?q?listener=5Frule.html.markdown,r/vpclattice=5Flistener.html.mark?= =?UTF-8?q?down,r/vpclattice=5Fauth=5Fpolicy.html.markdown,r/vpclattice=5F?= =?UTF-8?q?access=5Flog=5Fsubscription.html.markdown,r/vpc=5Fsecurity=5Fgr?= =?UTF-8?q?oup=5Fvpc=5Fassociation.html.markdown,r/vpc=5Fsecurity=5Fgroup?= =?UTF-8?q?=5Fingress=5Frule.html.markdown,r/vpc=5Fsecurity=5Fgroup=5Fegre?= =?UTF-8?q?ss=5Frule.html.markdown,r/vpc=5Froute=5Fserver=5Fvpc=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/vpc=5Froute=5Fserver=5Fpropagation.html.mar?= =?UTF-8?q?kdown,r/vpc=5Froute=5Fserver=5Fpeer.html.markdown,r/vpc=5Froute?= =?UTF-8?q?=5Fserver=5Fendpoint.html.markdown,r/vpc=5Froute=5Fserver.html.?= =?UTF-8?q?markdown,r/vpc=5Fpeering=5Fconnection=5Foptions.html.markdown,r?= =?UTF-8?q?/vpc=5Fpeering=5Fconnection=5Faccepter.html.markdown,r/vpc=5Fpe?= =?UTF-8?q?ering=5Fconnection.html.markdown,r/vpc=5Fnetwork=5Fperformance?= =?UTF-8?q?=5Fmetric=5Fsubscription.html.markdown,r/vpc=5Fipv6=5Fcidr=5Fbl?= =?UTF-8?q?ock=5Fassociation.html.markdown,r/vpc=5Fipv4=5Fcidr=5Fblock=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/vpc=5Fipam=5Fscope.html.markdown,r/v?= =?UTF-8?q?pc=5Fipam=5Fresource=5Fdiscovery=5Fassociation.html.markdown,r/?= =?UTF-8?q?vpc=5Fipam=5Fresource=5Fdiscovery.html.markdown,r/vpc=5Fipam=5F?= =?UTF-8?q?preview=5Fnext=5Fcidr.html.markdown,r/vpc=5Fipam=5Fpool=5Fcidr?= =?UTF-8?q?=5Fallocation.html.markdown,r/vpc=5Fipam=5Fpool=5Fcidr.html.mar?= =?UTF-8?q?kdown,r/vpc=5Fipam=5Fpool.html.markdown,r/vpc=5Fipam=5Forganiza?= =?UTF-8?q?tion=5Fadmin=5Faccount.html.markdown,r/vpc=5Fipam.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fsubnet=5Fassociation.html.markdown,r/vpc=5F?= =?UTF-8?q?endpoint=5Fservice=5Fprivate=5Fdns=5Fverification.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fservice=5Fallowed=5Fprincipal.html.markdown?= =?UTF-8?q?,r/vpc=5Fendpoint=5Fservice.html.markdown,r/vpc=5Fendpoint=5Fse?= =?UTF-8?q?curity=5Fgroup=5Fassociation.html.markdown,r/vpc=5Fendpoint=5Fr?= =?UTF-8?q?oute=5Ftable=5Fassociation.html.markdown,r/vpc=5Fendpoint=5Fpri?= =?UTF-8?q?vate=5Fdns.html.markdown,r/vpc=5Fendpoint=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/vpc=5Fendpoint=5Fconnection=5Fnotification.html.markdown,r/?= =?UTF-8?q?vpc=5Fendpoint=5Fconnection=5Faccepter.html.markdown,r/vpc=5Fen?= =?UTF-8?q?dpoint.html.markdown,r/vpc=5Fdhcp=5Foptions=5Fassociation.html.?= =?UTF-8?q?markdown,r/vpc=5Fdhcp=5Foptions.html.markdown,r/vpc=5Fblock=5Fp?= =?UTF-8?q?ublic=5Faccess=5Foptions.html.markdown,r/vpc=5Fblock=5Fpublic?= =?UTF-8?q?=5Faccess=5Fexclusion.html.markdown,r/vpc.html.markdown,r/volum?= =?UTF-8?q?e=5Fattachment.html.markdown,r/verifiedpermissions=5Fschema.htm?= =?UTF-8?q?l.markdown,r/verifiedpermissions=5Fpolicy=5Ftemplate.html.markd?= =?UTF-8?q?own,r/verifiedpermissions=5Fpolicy=5Fstore.html.markdown,r/veri?= =?UTF-8?q?fiedpermissions=5Fpolicy.html.markdown,r/verifiedpermissions=5F?= =?UTF-8?q?identity=5Fsource.html.markdown,r/verifiedaccess=5Ftrust=5Fprov?= =?UTF-8?q?ider.html.markdown,r/verifiedaccess=5Finstance=5Ftrust=5Fprovid?= =?UTF-8?q?er=5Fattachment.html.markdown,r/verifiedaccess=5Finstance=5Flog?= =?UTF-8?q?ging=5Fconfiguration.html.markdown,r/verifiedaccess=5Finstance.?= =?UTF-8?q?html.markdown,r/verifiedaccess=5Fgroup.html.markdown,r/verified?= =?UTF-8?q?access=5Fendpoint.html.markdown,r/transfer=5Fworkflow.html.mark?= =?UTF-8?q?down,r/transfer=5Fuser.html.markdown,r/transfer=5Ftag.html.mark?= =?UTF-8?q?down,r/transfer=5Fssh=5Fkey.html.markdown,r/transfer=5Fserver.h?= =?UTF-8?q?tml.markdown,r/transfer=5Fprofile.html.markdown,r/transfer=5Fco?= =?UTF-8?q?nnector.html.markdown,r/transfer=5Fcertificate.html.markdown,r/?= =?UTF-8?q?transfer=5Fagreement.html.markdown,r/transfer=5Faccess.html.mar?= =?UTF-8?q?kdown,r/transcribe=5Fvocabulary=5Ffilter.html.markdown,r/transc?= =?UTF-8?q?ribe=5Fvocabulary.html.markdown,r/transcribe=5Fmedical=5Fvocabu?= =?UTF-8?q?lary.html.markdown,r/transcribe=5Flanguage=5Fmodel.html.markdow?= =?UTF-8?q?n,r/timestreamwrite=5Ftable.html.markdown,r/timestreamwrite=5Fd?= =?UTF-8?q?atabase.html.markdown,r/timestreamquery=5Fscheduled=5Fquery.htm?= =?UTF-8?q?l.markdown,r/timestreaminfluxdb=5Fdb=5Finstance.html.markdown,r?= =?UTF-8?q?/timestreaminfluxdb=5Fdb=5Fcluster.html.markdown,r/synthetics?= =?UTF-8?q?=5Fgroup=5Fassociation.html.markdown,r/synthetics=5Fgroup.html.?= =?UTF-8?q?markdown,r/synthetics=5Fcanary.html.markdown,r/swf=5Fdomain.htm?= =?UTF-8?q?l.markdown,r/subnet.html.markdown,r/storagegateway=5Fworking=5F?= =?UTF-8?q?storage.html.markdown,r/storagegateway=5Fupload=5Fbuffer.html.m?= =?UTF-8?q?arkdown,r/storagegateway=5Ftape=5Fpool.html.markdown,r/storageg?= =?UTF-8?q?ateway=5Fstored=5Fiscsi=5Fvolume.html.markdown,r/storagegateway?= =?UTF-8?q?=5Fsmb=5Ffile=5Fshare.html.markdown,r/storagegateway=5Fnfs=5Ffi?= =?UTF-8?q?le=5Fshare.html.markdown,r/storagegateway=5Fgateway.html.markdo?= =?UTF-8?q?wn,r/storagegateway=5Ffile=5Fsystem=5Fassociation.html.markdown?= =?UTF-8?q?,r/storagegateway=5Fcached=5Fiscsi=5Fvolume.html.markdown,r/sto?= =?UTF-8?q?ragegateway=5Fcache.html.markdown,r/ssoadmin=5Ftrusted=5Ftoken?= =?UTF-8?q?=5Fissuer.html.markdown,r/ssoadmin=5Fpermissions=5Fboundary=5Fa?= =?UTF-8?q?ttachment.html.markdown,r/ssoadmin=5Fpermission=5Fset=5Finline?= =?UTF-8?q?=5Fpolicy.html.markdown,r/ssoadmin=5Fpermission=5Fset.html.mark?= =?UTF-8?q?down,r/ssoadmin=5Fmanaged=5Fpolicy=5Fattachment.html.markdown,r?= =?UTF-8?q?/ssoadmin=5Finstance=5Faccess=5Fcontrol=5Fattributes.html.markd?= =?UTF-8?q?own,r/ssoadmin=5Fcustomer=5Fmanaged=5Fpolicy=5Fattachment.html.?= =?UTF-8?q?markdown,r/ssoadmin=5Fapplication=5Fassignment=5Fconfiguration.?= =?UTF-8?q?html.markdown,r/ssoadmin=5Fapplication=5Fassignment.html.markdo?= =?UTF-8?q?wn,r/ssoadmin=5Fapplication=5Faccess=5Fscope.html.markdown,r/ss?= =?UTF-8?q?oadmin=5Fapplication.html.markdown,r/ssoadmin=5Faccount=5Fassig?= =?UTF-8?q?nment.html.markdown,r/ssmquicksetup=5Fconfiguration=5Fmanager.h?= =?UTF-8?q?tml.markdown,r/ssmincidents=5Fresponse=5Fplan.html.markdown,r/s?= =?UTF-8?q?smincidents=5Freplication=5Fset.html.markdown,r/ssmcontacts=5Fr?= =?UTF-8?q?otation.html.markdown,r/ssmcontacts=5Fplan.html.markdown,r/ssmc?= =?UTF-8?q?ontacts=5Fcontact=5Fchannel.html.markdown,r/ssmcontacts=5Fconta?= =?UTF-8?q?ct.html.markdown,r/ssm=5Fservice=5Fsetting.html.markdown,r/ssm?= =?UTF-8?q?=5Fresource=5Fdata=5Fsync.html.markdown,r/ssm=5Fpatch=5Fgroup.h?= =?UTF-8?q?tml.markdown,r/ssm=5Fpatch=5Fbaseline.html.markdown,r/ssm=5Fpar?= =?UTF-8?q?ameter.html.markdown,r/ssm=5Fmaintenance=5Fwindow=5Ftask.html.m?= =?UTF-8?q?arkdown,r/ssm=5Fmaintenance=5Fwindow=5Ftarget.html.markdown,r/s?= =?UTF-8?q?sm=5Fmaintenance=5Fwindow.html.markdown,r/ssm=5Fdocument.html.m?= =?UTF-8?q?arkdown,r/ssm=5Fdefault=5Fpatch=5Fbaseline.html.markdown,r/ssm?= =?UTF-8?q?=5Fassociation.html.markdown,r/ssm=5Factivation.html.markdown,r?= =?UTF-8?q?/sqs=5Fqueue=5Fredrive=5Fpolicy.html.markdown,r/sqs=5Fqueue=5Fr?= =?UTF-8?q?edrive=5Fallow=5Fpolicy.html.markdown,r/sqs=5Fqueue=5Fpolicy.ht?= =?UTF-8?q?ml.markdown,r/sqs=5Fqueue.html.markdown,r/spot=5Finstance=5Freq?= =?UTF-8?q?uest.html.markdown,r/spot=5Ffleet=5Frequest.html.markdown,r/spo?= =?UTF-8?q?t=5Fdatafeed=5Fsubscription.html.markdown,r/sns=5Ftopic=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/sns=5Ftopic=5Fpolicy.html.markdown,r/sn?= =?UTF-8?q?s=5Ftopic=5Fdata=5Fprotection=5Fpolicy.html.markdown,r/sns=5Fto?= =?UTF-8?q?pic.html.markdown,r/sns=5Fsms=5Fpreferences.html.markdown,r/sns?= =?UTF-8?q?=5Fplatform=5Fapplication.html.markdown,r/snapshot=5Fcreate=5Fv?= =?UTF-8?q?olume=5Fpermission.html.markdown,r/signer=5Fsigning=5Fprofile?= =?UTF-8?q?=5Fpermission.html.markdown,r/signer=5Fsigning=5Fprofile.html.m?= =?UTF-8?q?arkdown,r/signer=5Fsigning=5Fjob.html.markdown,r/shield=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/shield=5Fprotection=5Fhealth=5Fcheck=5F?= =?UTF-8?q?association.html.markdown,r/shield=5Fprotection=5Fgroup.html.ma?= =?UTF-8?q?rkdown,r/shield=5Fprotection.html.markdown,r/shield=5Fproactive?= =?UTF-8?q?=5Fengagement.html.markdown,r/shield=5Fdrt=5Faccess=5Frole=5Far?= =?UTF-8?q?n=5Fassociation.html.markdown,r/shield=5Fdrt=5Faccess=5Flog=5Fb?= =?UTF-8?q?ucket=5Fassociation.html.markdown,r/shield=5Fapplication=5Flaye?= =?UTF-8?q?r=5Fautomatic=5Fresponse.html.markdown,r/sfn=5Fstate=5Fmachine.?= =?UTF-8?q?html.markdown,r/sfn=5Falias.html.markdown,r/sfn=5Factivity.html?= =?UTF-8?q?.markdown,r/sesv2=5Femail=5Fidentity=5Fpolicy.html.markdown,r/s?= =?UTF-8?q?esv2=5Femail=5Fidentity=5Fmail=5Ffrom=5Fattributes.html.markdow?= =?UTF-8?q?n,r/sesv2=5Femail=5Fidentity=5Ffeedback=5Fattributes.html.markd?= =?UTF-8?q?own,r/sesv2=5Femail=5Fidentity.html.markdown,r/sesv2=5Fdedicate?= =?UTF-8?q?d=5Fip=5Fpool.html.markdown,r/sesv2=5Fdedicated=5Fip=5Fassignme?= =?UTF-8?q?nt.html.markdown,r/sesv2=5Fcontact=5Flist.html.markdown,r/sesv2?= =?UTF-8?q?=5Fconfiguration=5Fset=5Fevent=5Fdestination.html.markdown,r/se?= =?UTF-8?q?sv2=5Fconfiguration=5Fset.html.markdown,r/sesv2=5Faccount=5Fvdm?= =?UTF-8?q?=5Fattributes.html.markdown,r/sesv2=5Faccount=5Fsuppression=5Fa?= =?UTF-8?q?ttributes.html.markdown,r/ses=5Ftemplate.html.markdown,r/ses=5F?= =?UTF-8?q?receipt=5Frule=5Fset.html.markdown,r/ses=5Freceipt=5Frule.html.?= =?UTF-8?q?markdown,r/ses=5Freceipt=5Ffilter.html.markdown,r/ses=5Fidentit?= =?UTF-8?q?y=5Fpolicy.html.markdown,r/ses=5Fidentity=5Fnotification=5Ftopi?= =?UTF-8?q?c.html.markdown,r/ses=5Fevent=5Fdestination.html.markdown,r/ses?= =?UTF-8?q?=5Femail=5Fidentity.html.markdown,r/ses=5Fdomain=5Fmail=5Ffrom.?= =?UTF-8?q?html.markdown,r/ses=5Fdomain=5Fidentity=5Fverification.html.mar?= =?UTF-8?q?kdown,r/ses=5Fdomain=5Fidentity.html.markdown,r/ses=5Fdomain=5F?= =?UTF-8?q?dkim.html.markdown,r/ses=5Fconfiguration=5Fset.html.markdown,r/?= =?UTF-8?q?ses=5Factive=5Freceipt=5Frule=5Fset.html.markdown,r/servicequot?= =?UTF-8?q?as=5Ftemplate=5Fassociation.html.markdown,r/servicequotas=5Ftem?= =?UTF-8?q?plate.html.markdown,r/servicequotas=5Fservice=5Fquota.html.mark?= =?UTF-8?q?down,r/servicecatalogappregistry=5Fattribute=5Fgroup=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/servicecatalogappregistry=5Fattribute=5Fgro?= =?UTF-8?q?up.html.markdown,r/servicecatalogappregistry=5Fapplication.html?= =?UTF-8?q?.markdown,r/servicecatalog=5Ftag=5Foption=5Fresource=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/servicecatalog=5Ftag=5Foption.html.markdown?= =?UTF-8?q?,r/servicecatalog=5Fservice=5Faction.html.markdown,r/servicecat?= =?UTF-8?q?alog=5Fprovisioning=5Fartifact.html.markdown,r/servicecatalog?= =?UTF-8?q?=5Fprovisioned=5Fproduct.html.markdown,r/servicecatalog=5Fprodu?= =?UTF-8?q?ct=5Fportfolio=5Fassociation.html.markdown,r/servicecatalog=5Fp?= =?UTF-8?q?roduct.html.markdown,r/servicecatalog=5Fprincipal=5Fportfolio?= =?UTF-8?q?=5Fassociation.html.markdown,r/servicecatalog=5Fportfolio=5Fsha?= =?UTF-8?q?re.html.markdown,r/servicecatalog=5Fportfolio.html.markdown,r/s?= =?UTF-8?q?ervicecatalog=5Forganizations=5Faccess.html.markdown,r/servicec?= =?UTF-8?q?atalog=5Fconstraint.html.markdown,r/servicecatalog=5Fbudget=5Fr?= =?UTF-8?q?esource=5Fassociation.html.markdown,r/service=5Fdiscovery=5Fser?= =?UTF-8?q?vice.html.markdown,r/service=5Fdiscovery=5Fpublic=5Fdns=5Fnames?= =?UTF-8?q?pace.html.markdown,r/service=5Fdiscovery=5Fprivate=5Fdns=5Fname?= =?UTF-8?q?space.html.markdown,r/service=5Fdiscovery=5Finstance.html.markd?= =?UTF-8?q?own,r/service=5Fdiscovery=5Fhttp=5Fnamespace.html.markdown,r/se?= =?UTF-8?q?rverlessapplicationrepository=5Fcloudformation=5Fstack.html.mar?= =?UTF-8?q?kdown,r/securitylake=5Fsubscriber=5Fnotification.html.markdown,?= =?UTF-8?q?r/securitylake=5Fsubscriber.html.markdown,r/securitylake=5Fdata?= =?UTF-8?q?=5Flake.html.markdown,r/securitylake=5Fcustom=5Flog=5Fsource.ht?= =?UTF-8?q?ml.markdown,r/securitylake=5Faws=5Flog=5Fsource.html.markdown,r?= =?UTF-8?q?/securityhub=5Fstandards=5Fsubscription.html.markdown,r/securit?= =?UTF-8?q?yhub=5Fstandards=5Fcontrol=5Fassociation.html.markdown,r/securi?= =?UTF-8?q?tyhub=5Fstandards=5Fcontrol.html.markdown,r/securityhub=5Fprodu?= =?UTF-8?q?ct=5Fsubscription.html.markdown,r/securityhub=5Forganization=5F?= =?UTF-8?q?configuration.html.markdown,r/securityhub=5Forganization=5Fadmi?= =?UTF-8?q?n=5Faccount.html.markdown,r/securityhub=5Fmember.html.markdown,?= =?UTF-8?q?r/securityhub=5Finvite=5Faccepter.html.markdown,r/securityhub?= =?UTF-8?q?=5Finsight.html.markdown,r/securityhub=5Ffinding=5Faggregator.h?= =?UTF-8?q?tml.markdown,r/securityhub=5Fconfiguration=5Fpolicy=5Fassociati?= =?UTF-8?q?on.markdown,r/securityhub=5Fconfiguration=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/securityhub=5Fautomation=5Frule.html.markdown,r/securityhub?= =?UTF-8?q?=5Faction=5Ftarget.html.markdown,r/securityhub=5Faccount.html.m?= =?UTF-8?q?arkdown,r/security=5Fgroup=5Frule.html.markdown,r/security=5Fgr?= =?UTF-8?q?oup.html.markdown,r/secretsmanager=5Fsecret=5Fversion.html.mark?= =?UTF-8?q?down,r/secretsmanager=5Fsecret=5Frotation.html.markdown,r/secre?= =?UTF-8?q?tsmanager=5Fsecret=5Fpolicy.html.markdown,r/secretsmanager=5Fse?= =?UTF-8?q?cret.html.markdown,r/schemas=5Fschema.html.markdown,r/schemas?= =?UTF-8?q?=5Fregistry=5Fpolicy.html.markdown,r/schemas=5Fregistry.html.ma?= =?UTF-8?q?rkdown,r/schemas=5Fdiscoverer.html.markdown,r/scheduler=5Fsched?= =?UTF-8?q?ule=5Fgroup.html.markdown,r/scheduler=5Fschedule.html.markdown,?= =?UTF-8?q?r/sagemaker=5Fworkteam.html.markdown,r/sagemaker=5Fworkforce.ht?= =?UTF-8?q?ml.markdown,r/sagemaker=5Fuser=5Fprofile.html.markdown,r/sagema?= =?UTF-8?q?ker=5Fstudio=5Flifecycle=5Fconfig.html.markdown,r/sagemaker=5Fs?= =?UTF-8?q?pace.html.markdown,r/sagemaker=5Fservicecatalog=5Fportfolio=5Fs?= =?UTF-8?q?tatus.html.markdown,r/sagemaker=5Fproject.html.markdown,r/sagem?= =?UTF-8?q?aker=5Fpipeline.html.markdown,r/sagemaker=5Fnotebook=5Finstance?= =?UTF-8?q?=5Flifecycle=5Fconfiguration.html.markdown,r/sagemaker=5Fnotebo?= =?UTF-8?q?ok=5Finstance.html.markdown,r/sagemaker=5Fmonitoring=5Fschedule?= =?UTF-8?q?.html.markdown,r/sagemaker=5Fmodel=5Fpackage=5Fgroup=5Fpolicy.h?= =?UTF-8?q?tml.markdown,r/sagemaker=5Fmodel=5Fpackage=5Fgroup.html.markdow?= =?UTF-8?q?n,r/sagemaker=5Fmodel.html.markdown,r/sagemaker=5Fmlflow=5Ftrac?= =?UTF-8?q?king=5Fserver.html.markdown,r/sagemaker=5Fimage=5Fversion.html.?= =?UTF-8?q?markdown,r/sagemaker=5Fimage.html.markdown,r/sagemaker=5Fhuman?= =?UTF-8?q?=5Ftask=5Fui.html.markdown,r/sagemaker=5Fhub.html.markdown,r/sa?= =?UTF-8?q?gemaker=5Fflow=5Fdefinition.html.markdown,r/sagemaker=5Ffeature?= =?UTF-8?q?=5Fgroup.html.markdown,r/sagemaker=5Fendpoint=5Fconfiguration.h?= =?UTF-8?q?tml.markdown,r/sagemaker=5Fendpoint.html.markdown,r/sagemaker?= =?UTF-8?q?=5Fdomain.html.markdown,r/sagemaker=5Fdevice=5Ffleet.html.markd?= =?UTF-8?q?own,r/sagemaker=5Fdevice.html.markdown,r/sagemaker=5Fdata=5Fqua?= =?UTF-8?q?lity=5Fjob=5Fdefinition.html.markdown,r/sagemaker=5Fcode=5Frepo?= =?UTF-8?q?sitory.html.markdown,r/sagemaker=5Fapp=5Fimage=5Fconfig.html.ma?= =?UTF-8?q?rkdown,r/sagemaker=5Fapp.html.markdown,r/s3tables=5Ftable=5Fpol?= =?UTF-8?q?icy.html.markdown,r/s3tables=5Ftable=5Fbucket=5Fpolicy.html.mar?= =?UTF-8?q?kdown,r/s3tables=5Ftable=5Fbucket.html.markdown,r/s3tables=5Fta?= =?UTF-8?q?ble.html.markdown,r/s3tables=5Fnamespace.html.markdown,r/s3outp?= =?UTF-8?q?osts=5Fendpoint.html.markdown,r/s3control=5Fstorage=5Flens=5Fco?= =?UTF-8?q?nfiguration.html.markdown,r/s3control=5Fobject=5Flambda=5Facces?= =?UTF-8?q?s=5Fpoint=5Fpolicy.html.markdown,r/s3control=5Fobject=5Flambda?= =?UTF-8?q?=5Faccess=5Fpoint.html.markdown,r/s3control=5Fmulti=5Fregion=5F?= =?UTF-8?q?access=5Fpoint=5Fpolicy.html.markdown,r/s3control=5Fmulti=5Freg?= =?UTF-8?q?ion=5Faccess=5Fpoint.html.markdown,r/s3control=5Fdirectory=5Fbu?= =?UTF-8?q?cket=5Faccess=5Fpoint=5Fscope.html.markdown,r/s3control=5Fbucke?= =?UTF-8?q?t=5Fpolicy.html.markdown,r/s3control=5Fbucket=5Flifecycle=5Fcon?= =?UTF-8?q?figuration.html.markdown,r/s3control=5Fbucket.html.markdown,r/s?= =?UTF-8?q?3control=5Faccess=5Fpoint=5Fpolicy.html.markdown,r/s3control=5F?= =?UTF-8?q?access=5Fgrants=5Flocation.html.markdown,r/s3control=5Faccess?= =?UTF-8?q?=5Fgrants=5Finstance=5Fresource=5Fpolicy.html.markdown,r/s3cont?= =?UTF-8?q?rol=5Faccess=5Fgrants=5Finstance.html.markdown,r/s3control=5Fac?= =?UTF-8?q?cess=5Fgrant.html.markdown,r/s3=5Fobject=5Fcopy.html.markdown,r?= =?UTF-8?q?/s3=5Fobject.html.markdown,r/s3=5Fdirectory=5Fbucket.html.markd?= =?UTF-8?q?own,r/s3=5Fbucket=5Fwebsite=5Fconfiguration.html.markdown,r/s3?= =?UTF-8?q?=5Fbucket=5Fversioning.html.markdown,r/s3=5Fbucket=5Fserver=5Fs?= =?UTF-8?q?ide=5Fencryption=5Fconfiguration.html.markdown,r/s3=5Fbucket=5F?= =?UTF-8?q?request=5Fpayment=5Fconfiguration.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Freplication=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Fpu?= =?UTF-8?q?blic=5Faccess=5Fblock.html.markdown,r/s3=5Fbucket=5Fpolicy.html?= =?UTF-8?q?.markdown,r/s3=5Fbucket=5Fownership=5Fcontrols.html.markdown,r/?= =?UTF-8?q?s3=5Fbucket=5Fobject=5Flock=5Fconfiguration.html.markdown,r/s3?= =?UTF-8?q?=5Fbucket=5Fobject.html.markdown,r/s3=5Fbucket=5Fnotification.h?= =?UTF-8?q?tml.markdown,r/s3=5Fbucket=5Fmetric.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Fmetadata=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Floggi?= =?UTF-8?q?ng.html.markdown,r/s3=5Fbucket=5Flifecycle=5Fconfiguration.html?= =?UTF-8?q?.markdown,r/s3=5Fbucket=5Finventory.html.markdown,r/s3=5Fbucket?= =?UTF-8?q?=5Fintelligent=5Ftiering=5Fconfiguration.html.markdown,r/s3=5Fb?= =?UTF-8?q?ucket=5Fcors=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Fanal?= =?UTF-8?q?ytics=5Fconfiguration.html.markdown,r/s3=5Fbucket=5Facl.html.ma?= =?UTF-8?q?rkdown,r/s3=5Fbucket=5Faccelerate=5Fconfiguration.html.markdown?= =?UTF-8?q?,r/s3=5Fbucket.html.markdown,r/s3=5Faccount=5Fpublic=5Faccess?= =?UTF-8?q?=5Fblock.html.markdown,r/s3=5Faccess=5Fpoint.html.markdown,r/ru?= =?UTF-8?q?m=5Fmetrics=5Fdestination.html.markdown,r/rum=5Fapp=5Fmonitor.h?= =?UTF-8?q?tml.markdown,r/route=5Ftable=5Fassociation.html.markdown,r/rout?= =?UTF-8?q?e=5Ftable.html.markdown,r/route53recoveryreadiness=5Fresource?= =?UTF-8?q?=5Fset.html.markdown,r/route53recoveryreadiness=5Frecovery=5Fgr?= =?UTF-8?q?oup.html.markdown,r/route53recoveryreadiness=5Freadiness=5Fchec?= =?UTF-8?q?k.html.markdown,r/route53recoveryreadiness=5Fcell.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fsafety=5Frule.html.markdown,r?= =?UTF-8?q?/route53recoverycontrolconfig=5Frouting=5Fcontrol.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fcontrol=5Fpanel.html.markdown?= =?UTF-8?q?,r/route53recoverycontrolconfig=5Fcluster.html.markdown,r/route?= =?UTF-8?q?53profiles=5Fresource=5Fassociation.html.markdown,r/route53prof?= =?UTF-8?q?iles=5Fprofile.html.markdown,r/route53profiles=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/route53domains=5Fregistered=5Fdomain.html.markdow?= =?UTF-8?q?n,r/route53domains=5Fdomain.html.markdown,r/route53domains=5Fde?= =?UTF-8?q?legation=5Fsigner=5Frecord.html.markdown,r/route53=5Fzone=5Fass?= =?UTF-8?q?ociation.html.markdown,r/route53=5Fzone.html.markdown,r/route53?= =?UTF-8?q?=5Fvpc=5Fassociation=5Fauthorization.html.markdown,r/route53=5F?= =?UTF-8?q?traffic=5Fpolicy=5Finstance.html.markdown,r/route53=5Ftraffic?= =?UTF-8?q?=5Fpolicy.html.markdown,r/route53=5Fresolver=5Frule=5Fassociati?= =?UTF-8?q?on.html.markdown,r/route53=5Fresolver=5Frule.html.markdown,r/ro?= =?UTF-8?q?ute53=5Fresolver=5Fquery=5Flog=5Fconfig=5Fassociation.html.mark?= =?UTF-8?q?down,r/route53=5Fresolver=5Fquery=5Flog=5Fconfig.html.markdown,?= =?UTF-8?q?r/route53=5Fresolver=5Ffirewall=5Frule=5Fgroup=5Fassociation.ht?= =?UTF-8?q?ml.markdown,r/route53=5Fresolver=5Ffirewall=5Frule=5Fgroup.html?= =?UTF-8?q?.markdown,r/route53=5Fresolver=5Ffirewall=5Frule.html.markdown,?= =?UTF-8?q?r/route53=5Fresolver=5Ffirewall=5Fdomain=5Flist.html.markdown,r?= =?UTF-8?q?/route53=5Fresolver=5Ffirewall=5Fconfig.html.markdown,r/route53?= =?UTF-8?q?=5Fresolver=5Fendpoint.html.markdown,r/route53=5Fresolver=5Fdns?= =?UTF-8?q?sec=5Fconfig.html.markdown,r/route53=5Fresolver=5Fconfig.html.m?= =?UTF-8?q?arkdown,r/route53=5Frecords=5Fexclusive.html.markdown,r/route53?= =?UTF-8?q?=5Frecord.html.markdown,r/route53=5Fquery=5Flog.html.markdown,r?= =?UTF-8?q?/route53=5Fkey=5Fsigning=5Fkey.html.markdown,r/route53=5Fhosted?= =?UTF-8?q?=5Fzone=5Fdnssec.html.markdown,r/route53=5Fhealth=5Fcheck.html.?= =?UTF-8?q?markdown,r/route53=5Fdelegation=5Fset.html.markdown,r/route53?= =?UTF-8?q?=5Fcidr=5Flocation.html.markdown,r/route53=5Fcidr=5Fcollection.?= =?UTF-8?q?html.markdown,r/route.html.markdown,r/rolesanywhere=5Ftrust=5Fa?= =?UTF-8?q?nchor.html.markdown,r/rolesanywhere=5Fprofile.html.markdown,r/r?= =?UTF-8?q?esourcegroups=5Fresource.html.markdown,r/resourcegroups=5Fgroup?= =?UTF-8?q?.html.markdown,r/resourceexplorer2=5Fview.html.markdown,r/resou?= =?UTF-8?q?rceexplorer2=5Findex.html.markdown,r/resiliencehub=5Fresiliency?= =?UTF-8?q?=5Fpolicy.html.markdown,r/rekognition=5Fstream=5Fprocessor.html?= =?UTF-8?q?.markdown,r/rekognition=5Fproject.html.markdown,r/rekognition?= =?UTF-8?q?=5Fcollection.html.markdown,r/redshiftserverless=5Fworkgroup.ht?= =?UTF-8?q?ml.markdown,r/redshiftserverless=5Fusage=5Flimit.html.markdown,?= =?UTF-8?q?r/redshiftserverless=5Fsnapshot.html.markdown,r/redshiftserverl?= =?UTF-8?q?ess=5Fresource=5Fpolicy.html.markdown,r/redshiftserverless=5Fna?= =?UTF-8?q?mespace.html.markdown,r/redshiftserverless=5Fendpoint=5Faccess.?= =?UTF-8?q?html.markdown,r/redshiftserverless=5Fcustom=5Fdomain=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/redshiftdata=5Fstatement.html.markdown,r/re?= =?UTF-8?q?dshift=5Fusage=5Flimit.html.markdown,r/redshift=5Fsubnet=5Fgrou?= =?UTF-8?q?p.html.markdown,r/redshift=5Fsnapshot=5Fschedule=5Fassociation.?= =?UTF-8?q?html.markdown,r/redshift=5Fsnapshot=5Fschedule.html.markdown,r/?= =?UTF-8?q?redshift=5Fsnapshot=5Fcopy=5Fgrant.html.markdown,r/redshift=5Fs?= =?UTF-8?q?napshot=5Fcopy.html.markdown,r/redshift=5Fscheduled=5Faction.ht?= =?UTF-8?q?ml.markdown,r/redshift=5Fresource=5Fpolicy.html.markdown,r/reds?= =?UTF-8?q?hift=5Fpartner.html.markdown,r/redshift=5Fparameter=5Fgroup.htm?= =?UTF-8?q?l.markdown,r/redshift=5Flogging.html.markdown,r/redshift=5Finte?= =?UTF-8?q?gration.html.markdown,r/redshift=5Fhsm=5Fconfiguration.html.mar?= =?UTF-8?q?kdown,r/redshift=5Fhsm=5Fclient=5Fcertificate.html.markdown,r/r?= =?UTF-8?q?edshift=5Fevent=5Fsubscription.html.markdown,r/redshift=5Fendpo?= =?UTF-8?q?int=5Fauthorization.html.markdown,r/redshift=5Fendpoint=5Facces?= =?UTF-8?q?s.html.markdown,r/redshift=5Fdata=5Fshare=5Fconsumer=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/redshift=5Fdata=5Fshare=5Fauthorization.htm?= =?UTF-8?q?l.markdown,r/redshift=5Fcluster=5Fsnapshot.html.markdown,r/reds?= =?UTF-8?q?hift=5Fcluster=5Fiam=5Froles.html.markdown,r/redshift=5Fcluster?= =?UTF-8?q?.html.markdown,r/redshift=5Fauthentication=5Fprofile.html.markd?= =?UTF-8?q?own,r/rds=5Fshard=5Fgroup.html.markdown,r/rds=5Freserved=5Finst?= =?UTF-8?q?ance.html.markdown,r/rds=5Fintegration.html.markdown,r/rds=5Fin?= =?UTF-8?q?stance=5Fstate.html.markdown,r/rds=5Fglobal=5Fcluster.html.mark?= =?UTF-8?q?down,r/rds=5Fexport=5Ftask.html.markdown,r/rds=5Fcustom=5Fdb=5F?= =?UTF-8?q?engine=5Fversion.markdown,r/rds=5Fcluster=5Fsnapshot=5Fcopy.htm?= =?UTF-8?q?l.markdown,r/rds=5Fcluster=5Frole=5Fassociation.html.markdown,r?= =?UTF-8?q?/rds=5Fcluster=5Fparameter=5Fgroup.html.markdown,r/rds=5Fcluste?= =?UTF-8?q?r=5Finstance.html.markdown,r/rds=5Fcluster=5Fendpoint.html.mark?= =?UTF-8?q?down,r/rds=5Fcluster=5Factivity=5Fstream.html.markdown,r/rds=5F?= =?UTF-8?q?cluster.html.markdown,r/rds=5Fcertificate.html.markdown,r/rbin?= =?UTF-8?q?=5Frule.html.markdown,r/ram=5Fsharing=5Fwith=5Forganization.htm?= =?UTF-8?q?l.markdown,r/ram=5Fresource=5Fshare=5Faccepter.html.markdown,r/?= =?UTF-8?q?ram=5Fresource=5Fshare.html.markdown,r/ram=5Fresource=5Fassocia?= =?UTF-8?q?tion.html.markdown,r/ram=5Fprincipal=5Fassociation.html.markdow?= =?UTF-8?q?n,r/quicksight=5Fvpc=5Fconnection.html.markdown,r/quicksight=5F?= =?UTF-8?q?user=5Fcustom=5Fpermission.html.markdown,r/quicksight=5Fuser.ht?= =?UTF-8?q?ml.markdown,r/quicksight=5Ftheme.html.markdown,r/quicksight=5Ft?= =?UTF-8?q?emplate=5Falias.html.markdown,r/quicksight=5Ftemplate.html.mark?= =?UTF-8?q?down,r/quicksight=5Frole=5Fmembership.html.markdown,r/quicksigh?= =?UTF-8?q?t=5Frole=5Fcustom=5Fpermission.html.markdown,r/quicksight=5Fref?= =?UTF-8?q?resh=5Fschedule.html.markdown,r/quicksight=5Fnamespace.html.mar?= =?UTF-8?q?kdown,r/quicksight=5Fkey=5Fregistration.html.markdown,r/quicksi?= =?UTF-8?q?ght=5Fip=5Frestriction.html.markdown,r/quicksight=5Fingestion.h?= =?UTF-8?q?tml.markdown,r/quicksight=5Fiam=5Fpolicy=5Fassignment.html.mark?= =?UTF-8?q?down,r/quicksight=5Fgroup=5Fmembership.html.markdown,r/quicksig?= =?UTF-8?q?ht=5Fgroup.html.markdown,r/quicksight=5Ffolder=5Fmembership.htm?= =?UTF-8?q?l.markdown,r/quicksight=5Ffolder.html.markdown,r/quicksight=5Fd?= =?UTF-8?q?ata=5Fsource.html.markdown,r/quicksight=5Fdata=5Fset.html.markd?= =?UTF-8?q?own,r/quicksight=5Fdashboard.html.markdown,r/quicksight=5Fcusto?= =?UTF-8?q?m=5Fpermissions.html.markdown,r/quicksight=5Fanalysis.html.mark?= =?UTF-8?q?down,r/quicksight=5Faccount=5Fsubscription.html.markdown,r/quic?= =?UTF-8?q?ksight=5Faccount=5Fsettings.html.markdown,r/qldb=5Fstream.html.?= =?UTF-8?q?markdown,r/qldb=5Fledger.html.markdown,r/qbusiness=5Fapplicatio?= =?UTF-8?q?n.html.markdown,r/proxy=5Fprotocol=5Fpolicy.html.markdown,r/pro?= =?UTF-8?q?metheus=5Fworkspace=5Fconfiguration.html.markdown,r/prometheus?= =?UTF-8?q?=5Fworkspace.html.markdown,r/prometheus=5Fscraper.html.markdown?= =?UTF-8?q?,r/prometheus=5Frule=5Fgroup=5Fnamespace.html.markdown,r/promet?= =?UTF-8?q?heus=5Fquery=5Flogging=5Fconfiguration.html.markdown,r/promethe?= =?UTF-8?q?us=5Falert=5Fmanager=5Fdefinition.html.markdown,r/placement=5Fg?= =?UTF-8?q?roup.html.markdown,r/pipes=5Fpipe.html.markdown,r/pinpointsmsvo?= =?UTF-8?q?icev2=5Fphone=5Fnumber.html.markdown,r/pinpointsmsvoicev2=5Fopt?= =?UTF-8?q?=5Fout=5Flist.html.markdown,r/pinpointsmsvoicev2=5Fconfiguratio?= =?UTF-8?q?n=5Fset.html.markdown,r/pinpoint=5Fsms=5Fchannel.html.markdown,?= =?UTF-8?q?r/pinpoint=5Fgcm=5Fchannel.html.markdown,r/pinpoint=5Fevent=5Fs?= =?UTF-8?q?tream.html.markdown,r/pinpoint=5Femail=5Ftemplate.markdown,r/pi?= =?UTF-8?q?npoint=5Femail=5Fchannel.html.markdown,r/pinpoint=5Fbaidu=5Fcha?= =?UTF-8?q?nnel.html.markdown,r/pinpoint=5Fapp.html.markdown,r/pinpoint=5F?= =?UTF-8?q?apns=5Fvoip=5Fsandbox=5Fchannel.html.markdown,r/pinpoint=5Fapns?= =?UTF-8?q?=5Fvoip=5Fchannel.html.markdown,r/pinpoint=5Fapns=5Fsandbox=5Fc?= =?UTF-8?q?hannel.html.markdown,r/pinpoint=5Fapns=5Fchannel.html.markdown,?= =?UTF-8?q?r/pinpoint=5Fadm=5Fchannel.html.markdown,r/paymentcryptography?= =?UTF-8?q?=5Fkey=5Falias.html.markdown,r/paymentcryptography=5Fkey.html.m?= =?UTF-8?q?arkdown,r/osis=5Fpipeline.html.markdown,r/organizations=5Fresou?= =?UTF-8?q?rce=5Fpolicy.html.markdown,r/organizations=5Fpolicy=5Fattachmen?= =?UTF-8?q?t.html.markdown,r/organizations=5Fpolicy.html.markdown,r/organi?= =?UTF-8?q?zations=5Forganizational=5Funit.html.markdown,r/organizations?= =?UTF-8?q?=5Forganization.html.markdown,r/organizations=5Fdelegated=5Fadm?= =?UTF-8?q?inistrator.html.markdown,r/organizations=5Faccount.html.markdow?= =?UTF-8?q?n,r/opensearchserverless=5Fvpc=5Fendpoint.html.markdown,r/opens?= =?UTF-8?q?earchserverless=5Fsecurity=5Fpolicy.html.markdown,r/opensearchs?= =?UTF-8?q?erverless=5Fsecurity=5Fconfig.html.markdown,r/opensearchserverl?= =?UTF-8?q?ess=5Flifecycle=5Fpolicy.html.markdown,r/opensearchserverless?= =?UTF-8?q?=5Fcollection.html.markdown,r/opensearchserverless=5Faccess=5Fp?= =?UTF-8?q?olicy.html.markdown,r/opensearch=5Fvpc=5Fendpoint.html.markdown?= =?UTF-8?q?,r/opensearch=5Fpackage=5Fassociation.html.markdown,r/opensearc?= =?UTF-8?q?h=5Fpackage.html.markdown,r/opensearch=5Foutbound=5Fconnection.?= =?UTF-8?q?html.markdown,r/opensearch=5Finbound=5Fconnection=5Faccepter.ht?= =?UTF-8?q?ml.markdown,r/opensearch=5Fdomain=5Fsaml=5Foptions.html.markdow?= =?UTF-8?q?n,r/opensearch=5Fdomain=5Fpolicy.html.markdown,r/opensearch=5Fd?= =?UTF-8?q?omain.html.markdown,r/opensearch=5Fauthorize=5Fvpc=5Fendpoint?= =?UTF-8?q?=5Faccess.html.markdown,r/oam=5Fsink=5Fpolicy.html.markdown,r/o?= =?UTF-8?q?am=5Fsink.html.markdown,r/oam=5Flink.html.markdown,r/notificati?= =?UTF-8?q?onscontacts=5Femail=5Fcontact.html.markdown,r/notifications=5Fn?= =?UTF-8?q?otification=5Fhub.html.markdown,r/notifications=5Fnotification?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/notifications=5Fevent=5Frule.h?= =?UTF-8?q?tml.markdown,r/notifications=5Fchannel=5Fassociation.html.markd?= =?UTF-8?q?own,r/networkmonitor=5Fprobe.html.markdown,r/networkmonitor=5Fm?= =?UTF-8?q?onitor.html.markdown,r/networkmanager=5Fvpc=5Fattachment.html.m?= =?UTF-8?q?arkdown,r/networkmanager=5Ftransit=5Fgateway=5Froute=5Ftable=5F?= =?UTF-8?q?attachment.html.markdown,r/networkmanager=5Ftransit=5Fgateway?= =?UTF-8?q?=5Fregistration.html.markdown,r/networkmanager=5Ftransit=5Fgate?= =?UTF-8?q?way=5Fpeering.html.markdown,r/networkmanager=5Ftransit=5Fgatewa?= =?UTF-8?q?y=5Fconnect=5Fpeer=5Fassociation.html.markdown,r/networkmanager?= =?UTF-8?q?=5Fsite=5Fto=5Fsite=5Fvpn=5Fattachment.html.markdown,r/networkm?= =?UTF-8?q?anager=5Fsite.html.markdown,r/networkmanager=5Flink=5Fassociati?= =?UTF-8?q?on.html.markdown,r/networkmanager=5Flink.html.markdown,r/networ?= =?UTF-8?q?kmanager=5Fglobal=5Fnetwork.html.markdown,r/networkmanager=5Fdx?= =?UTF-8?q?=5Fgateway=5Fattachment.html.markdown,r/networkmanager=5Fdevice?= =?UTF-8?q?.html.markdown,r/networkmanager=5Fcustomer=5Fgateway=5Fassociat?= =?UTF-8?q?ion.html.markdown,r/networkmanager=5Fcore=5Fnetwork=5Fpolicy=5F?= =?UTF-8?q?attachment.html.markdown,r/networkmanager=5Fcore=5Fnetwork.html?= =?UTF-8?q?.markdown,r/networkmanager=5Fconnection.html.markdown,r/network?= =?UTF-8?q?manager=5Fconnect=5Fpeer.html.markdown,r/networkmanager=5Fconne?= =?UTF-8?q?ct=5Fattachment.html.markdown,r/networkmanager=5Fattachment=5Fa?= =?UTF-8?q?ccepter.html.markdown,r/networkfirewall=5Fvpc=5Fendpoint=5Fasso?= =?UTF-8?q?ciation.html.markdown,r/networkfirewall=5Ftls=5Finspection=5Fco?= =?UTF-8?q?nfiguration.html.markdown,r/networkfirewall=5Frule=5Fgroup.html?= =?UTF-8?q?.markdown,r/networkfirewall=5Fresource=5Fpolicy.html.markdown,r?= =?UTF-8?q?/networkfirewall=5Flogging=5Fconfiguration.html.markdown,r/netw?= =?UTF-8?q?orkfirewall=5Ffirewall=5Ftransit=5Fgateway=5Fattachment=5Faccep?= =?UTF-8?q?ter.html.markdown,r/networkfirewall=5Ffirewall=5Fpolicy.html.ma?= =?UTF-8?q?rkdown,r/networkfirewall=5Ffirewall.html.markdown,r/network=5Fi?= =?UTF-8?q?nterface=5Fsg=5Fattachment.html.markdown,r/network=5Finterface?= =?UTF-8?q?=5Fpermission.html.markdown,r/network=5Finterface=5Fattachment.?= =?UTF-8?q?html.markdown,r/network=5Finterface.html.markdown,r/network=5Fa?= =?UTF-8?q?cl=5Frule.html.markdown,r/network=5Facl=5Fassociation.html.mark?= =?UTF-8?q?down,r/network=5Facl.html.markdown,r/neptunegraph=5Fgraph.html.?= =?UTF-8?q?markdown,r/neptune=5Fsubnet=5Fgroup.html.markdown,r/neptune=5Fp?= =?UTF-8?q?arameter=5Fgroup.html.markdown,r/neptune=5Fglobal=5Fcluster.htm?= =?UTF-8?q?l.markdown,r/neptune=5Fevent=5Fsubscription.html.markdown,r/nep?= =?UTF-8?q?tune=5Fcluster=5Fsnapshot.html.markdown,r/neptune=5Fcluster=5Fp?= =?UTF-8?q?arameter=5Fgroup.html.markdown,r/neptune=5Fcluster=5Finstance.h?= =?UTF-8?q?tml.markdown,r/neptune=5Fcluster=5Fendpoint.html.markdown,r/nep?= =?UTF-8?q?tune=5Fcluster.html.markdown,r/nat=5Fgateway=5Feip=5Fassociatio?= =?UTF-8?q?n.html.markdown,r/nat=5Fgateway.html.markdown,r/mwaa=5Fenvironm?= =?UTF-8?q?ent.html.markdown,r/mskconnect=5Fworker=5Fconfiguration.html.ma?= =?UTF-8?q?rkdown,r/mskconnect=5Fcustom=5Fplugin.html.markdown,r/mskconnec?= =?UTF-8?q?t=5Fconnector.html.markdown,r/msk=5Fvpc=5Fconnection.html.markd?= =?UTF-8?q?own,r/msk=5Fsingle=5Fscram=5Fsecret=5Fassociation.html.markdown?= =?UTF-8?q?,r/msk=5Fserverless=5Fcluster.html.markdown,r/msk=5Fscram=5Fsec?= =?UTF-8?q?ret=5Fassociation.html.markdown,r/msk=5Freplicator.html.markdow?= =?UTF-8?q?n,r/msk=5Fconfiguration.html.markdown,r/msk=5Fcluster=5Fpolicy.?= =?UTF-8?q?html.markdown,r/msk=5Fcluster.html.markdown,r/mq=5Fconfiguratio?= =?UTF-8?q?n.html.markdown,r/mq=5Fbroker.html.markdown,r/memorydb=5Fuser.h?= =?UTF-8?q?tml.markdown,r/memorydb=5Fsubnet=5Fgroup.html.markdown,r/memory?= =?UTF-8?q?db=5Fsnapshot.html.markdown,r/memorydb=5Fparameter=5Fgroup.html?= =?UTF-8?q?.markdown,r/memorydb=5Fmulti=5Fregion=5Fcluster.html.markdown,r?= =?UTF-8?q?/memorydb=5Fcluster.html.markdown,r/memorydb=5Facl.html.markdow?= =?UTF-8?q?n,r/medialive=5Fmultiplex=5Fprogram.html.markdown,r/medialive?= =?UTF-8?q?=5Fmultiplex.html.markdown,r/medialive=5Finput=5Fsecurity=5Fgro?= =?UTF-8?q?up.html.markdown,r/medialive=5Finput.html.markdown,r/medialive?= =?UTF-8?q?=5Fchannel.html.markdown,r/media=5Fstore=5Fcontainer=5Fpolicy.h?= =?UTF-8?q?tml.markdown,r/media=5Fstore=5Fcontainer.html.markdown,r/media?= =?UTF-8?q?=5Fpackagev2=5Fchannel=5Fgroup.html.markdown,r/media=5Fpackage?= =?UTF-8?q?=5Fchannel.html.markdown,r/media=5Fconvert=5Fqueue.html.markdow?= =?UTF-8?q?n,r/main=5Froute=5Ftable=5Fassociation.html.markdown,r/macie2?= =?UTF-8?q?=5Forganization=5Fconfiguration.html.markdown,r/macie2=5Forgani?= =?UTF-8?q?zation=5Fadmin=5Faccount.html.markdown,r/macie2=5Fmember.html.m?= =?UTF-8?q?arkdown,r/macie2=5Finvitation=5Faccepter.html.markdown,r/macie2?= =?UTF-8?q?=5Ffindings=5Ffilter.html.markdown,r/macie2=5Fcustom=5Fdata=5Fi?= =?UTF-8?q?dentifier.html.markdown,r/macie2=5Fclassification=5Fjob.html.ma?= =?UTF-8?q?rkdown,r/macie2=5Fclassification=5Fexport=5Fconfiguration.html.?= =?UTF-8?q?markdown,r/macie2=5Faccount.html.markdown,r/m2=5Fenvironment.ht?= =?UTF-8?q?ml.markdown,r/m2=5Fdeployment.html.markdown,r/m2=5Fapplication.?= =?UTF-8?q?html.markdown,r/location=5Ftracker=5Fassociation.html.markdown,?= =?UTF-8?q?r/location=5Ftracker.html.markdown,r/location=5Froute=5Fcalcula?= =?UTF-8?q?tor.html.markdown,r/location=5Fplace=5Findex.html.markdown,r/lo?= =?UTF-8?q?cation=5Fmap.html.markdown,r/location=5Fgeofence=5Fcollection.h?= =?UTF-8?q?tml.markdown,r/load=5Fbalancer=5Fpolicy.html.markdown,r/load=5F?= =?UTF-8?q?balancer=5Flistener=5Fpolicy.html.markdown,r/load=5Fbalancer=5F?= =?UTF-8?q?backend=5Fserver=5Fpolicy.html.markdown,r/lightsail=5Fstatic=5F?= =?UTF-8?q?ip=5Fattachment.html.markdown,r/lightsail=5Fstatic=5Fip.html.ma?= =?UTF-8?q?rkdown,r/lightsail=5Flb=5Fstickiness=5Fpolicy.html.markdown,r/l?= =?UTF-8?q?ightsail=5Flb=5Fhttps=5Fredirection=5Fpolicy.html.markdown,r/li?= =?UTF-8?q?ghtsail=5Flb=5Fcertificate=5Fattachment.html.markdown,r/lightsa?= =?UTF-8?q?il=5Flb=5Fcertificate.html.markdown,r/lightsail=5Flb=5Fattachme?= =?UTF-8?q?nt.html.markdown,r/lightsail=5Flb.html.markdown,r/lightsail=5Fk?= =?UTF-8?q?ey=5Fpair.html.markdown,r/lightsail=5Finstance=5Fpublic=5Fports?= =?UTF-8?q?.html.markdown,r/lightsail=5Finstance.html.markdown,r/lightsail?= =?UTF-8?q?=5Fdomain=5Fentry.html.markdown,r/lightsail=5Fdomain.html.markd?= =?UTF-8?q?own,r/lightsail=5Fdistribution.html.markdown,r/lightsail=5Fdisk?= =?UTF-8?q?=5Fattachment.html.markdown,r/lightsail=5Fdisk.html.markdown,r/?= =?UTF-8?q?lightsail=5Fdatabase.html.markdown,r/lightsail=5Fcontainer=5Fse?= =?UTF-8?q?rvice=5Fdeployment=5Fversion.html.markdown,r/lightsail=5Fcontai?= =?UTF-8?q?ner=5Fservice.html.markdown,r/lightsail=5Fcertificate.html.mark?= =?UTF-8?q?down,r/lightsail=5Fbucket=5Fresource=5Faccess.html.markdown,r/l?= =?UTF-8?q?ightsail=5Fbucket=5Faccess=5Fkey.html.markdown,r/lightsail=5Fbu?= =?UTF-8?q?cket.html.markdown,r/licensemanager=5Flicense=5Fconfiguration.h?= =?UTF-8?q?tml.markdown,r/licensemanager=5Fgrant=5Faccepter.html.markdown,?= =?UTF-8?q?r/licensemanager=5Fgrant.html.markdown,r/licensemanager=5Fassoc?= =?UTF-8?q?iation.html.markdown,r/lexv2models=5Fslot=5Ftype.html.markdown,?= =?UTF-8?q?r/lexv2models=5Fslot.html.markdown,r/lexv2models=5Fintent.html.?= =?UTF-8?q?markdown,r/lexv2models=5Fbot=5Fversion.html.markdown,r/lexv2mod?= =?UTF-8?q?els=5Fbot=5Flocale.html.markdown,r/lexv2models=5Fbot.html.markd?= =?UTF-8?q?own,r/lex=5Fslot=5Ftype.html.markdown,r/lex=5Fintent.html.markd?= =?UTF-8?q?own,r/lex=5Fbot=5Falias.html.markdown,r/lex=5Fbot.html.markdown?= =?UTF-8?q?,r/lb=5Ftrust=5Fstore=5Frevocation.html.markdown,r/lb=5Ftrust?= =?UTF-8?q?=5Fstore.html.markdown,r/lb=5Ftarget=5Fgroup=5Fattachment.html.?= =?UTF-8?q?markdown,r/lb=5Ftarget=5Fgroup.html.markdown,r/lb=5Fssl=5Fnegot?= =?UTF-8?q?iation=5Fpolicy.html.markdown,r/lb=5Flistener=5Frule.html.markd?= =?UTF-8?q?own,r/lb=5Flistener=5Fcertificate.html.markdown,r/lb=5Flistener?= =?UTF-8?q?.html.markdown,r/lb=5Fcookie=5Fstickiness=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/lb.html.markdown,r/launch=5Ftemplate.html.markdown,r/launch?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/lambda=5Fruntime=5Fmanagement?= =?UTF-8?q?=5Fconfig.html.markdown,r/lambda=5Fprovisioned=5Fconcurrency=5F?= =?UTF-8?q?config.html.markdown,r/lambda=5Fpermission.html.markdown,r/lamb?= =?UTF-8?q?da=5Flayer=5Fversion=5Fpermission.html.markdown,r/lambda=5Flaye?= =?UTF-8?q?r=5Fversion.html.markdown,r/lambda=5Finvocation.html.markdown,r?= =?UTF-8?q?/lambda=5Ffunction=5Furl.html.markdown,r/lambda=5Ffunction=5Fre?= =?UTF-8?q?cursion=5Fconfig.html.markdown,r/lambda=5Ffunction=5Fevent=5Fin?= =?UTF-8?q?voke=5Fconfig.html.markdown,r/lambda=5Ffunction.html.markdown,r?= =?UTF-8?q?/lambda=5Fevent=5Fsource=5Fmapping.html.markdown,r/lambda=5Fcod?= =?UTF-8?q?e=5Fsigning=5Fconfig.html.markdown,r/lambda=5Falias.html.markdo?= =?UTF-8?q?wn,r/lakeformation=5Fresource=5Flf=5Ftags.html.markdown,r/lakef?= =?UTF-8?q?ormation=5Fresource=5Flf=5Ftag.html.markdown,r/lakeformation=5F?= =?UTF-8?q?resource.html.markdown,r/lakeformation=5Fpermissions.html.markd?= =?UTF-8?q?own,r/lakeformation=5Fopt=5Fin.html.markdown,r/lakeformation=5F?= =?UTF-8?q?lf=5Ftag.html.markdown,r/lakeformation=5Fdata=5Flake=5Fsettings?= =?UTF-8?q?.html.markdown,r/lakeformation=5Fdata=5Fcells=5Ffilter.html.mar?= =?UTF-8?q?kdown,r/kms=5Freplica=5Fkey.html.markdown,r/kms=5Freplica=5Fext?= =?UTF-8?q?ernal=5Fkey.html.markdown,r/kms=5Fkey=5Fpolicy.html.markdown,r/?= =?UTF-8?q?kms=5Fkey.html.markdown,r/kms=5Fgrant.html.markdown,r/kms=5Fext?= =?UTF-8?q?ernal=5Fkey.html.markdown,r/kms=5Fcustom=5Fkey=5Fstore.html.mar?= =?UTF-8?q?kdown,r/kms=5Fciphertext.html.markdown,r/kms=5Falias.html.markd?= =?UTF-8?q?own,r/kinesisanalyticsv2=5Fapplication=5Fsnapshot.html.markdown?= =?UTF-8?q?,r/kinesisanalyticsv2=5Fapplication.html.markdown,r/kinesis=5Fv?= =?UTF-8?q?ideo=5Fstream.html.markdown,r/kinesis=5Fstream=5Fconsumer.html.?= =?UTF-8?q?markdown,r/kinesis=5Fstream.html.markdown,r/kinesis=5Fresource?= =?UTF-8?q?=5Fpolicy.html.markdown,r/kinesis=5Ffirehose=5Fdelivery=5Fstrea?= =?UTF-8?q?m.html.markdown,r/kinesis=5Fanalytics=5Fapplication.html.markdo?= =?UTF-8?q?wn,r/keyspaces=5Ftable.html.markdown,r/keyspaces=5Fkeyspace.htm?= =?UTF-8?q?l.markdown,r/key=5Fpair.html.markdown,r/kendra=5Fthesaurus.html?= =?UTF-8?q?.markdown,r/kendra=5Fquery=5Fsuggestions=5Fblock=5Flist.html.ma?= =?UTF-8?q?rkdown,r/kendra=5Findex.html.markdown,r/kendra=5Ffaq.html.markd?= =?UTF-8?q?own,r/kendra=5Fexperience.html.markdown,r/kendra=5Fdata=5Fsourc?= =?UTF-8?q?e.html.markdown,r/ivschat=5Froom.html.markdown,r/ivschat=5Flogg?= =?UTF-8?q?ing=5Fconfiguration.html.markdown,r/ivs=5Frecording=5Fconfigura?= =?UTF-8?q?tion.html.markdown,r/ivs=5Fplayback=5Fkey=5Fpair.html.markdown,?= =?UTF-8?q?r/ivs=5Fchannel.html.markdown,r/iot=5Ftopic=5Frule=5Fdestinatio?= =?UTF-8?q?n.html.markdown,r/iot=5Ftopic=5Frule.html.markdown,r/iot=5Fthin?= =?UTF-8?q?g=5Ftype.html.markdown,r/iot=5Fthing=5Fprincipal=5Fattachment.h?= =?UTF-8?q?tml.markdown,r/iot=5Fthing=5Fgroup=5Fmembership.html.markdown,r?= =?UTF-8?q?/iot=5Fthing=5Fgroup.html.markdown,r/iot=5Fthing.html.markdown,?= =?UTF-8?q?r/iot=5Frole=5Falias.html.markdown,r/iot=5Fprovisioning=5Ftempl?= =?UTF-8?q?ate.html.markdown,r/iot=5Fpolicy=5Fattachment.html.markdown,r/i?= =?UTF-8?q?ot=5Fpolicy.html.markdown,r/iot=5Flogging=5Foptions.html.markdo?= =?UTF-8?q?wn,r/iot=5Findexing=5Fconfiguration.html.markdown,r/iot=5Fevent?= =?UTF-8?q?=5Fconfigurations.html.markdown,r/iot=5Fdomain=5Fconfiguration.?= =?UTF-8?q?html.markdown,r/iot=5Fcertificate.html.markdown,r/iot=5Fca=5Fce?= =?UTF-8?q?rtificate.html.markdown,r/iot=5Fbilling=5Fgroup.html.markdown,r?= =?UTF-8?q?/iot=5Fauthorizer.html.markdown,r/internetmonitor=5Fmonitor.htm?= =?UTF-8?q?l.markdown,r/internet=5Fgateway=5Fattachment.html.markdown,r/in?= =?UTF-8?q?ternet=5Fgateway.html.markdown,r/instance.html.markdown,r/inspe?= =?UTF-8?q?ctor=5Fresource=5Fgroup.html.markdown,r/inspector=5Fassessment?= =?UTF-8?q?=5Ftemplate.html.markdown,r/inspector=5Fassessment=5Ftarget.htm?= =?UTF-8?q?l.markdown,r/inspector2=5Forganization=5Fconfiguration.html.mar?= =?UTF-8?q?kdown,r/inspector2=5Fmember=5Fassociation.html.markdown,r/inspe?= =?UTF-8?q?ctor2=5Ffilter.html.markdown,r/inspector2=5Fenabler.html.markdo?= =?UTF-8?q?wn,r/inspector2=5Fdelegated=5Fadmin=5Faccount.html.markdown,r/i?= =?UTF-8?q?magebuilder=5Fworkflow.html.markdown,r/imagebuilder=5Flifecycle?= =?UTF-8?q?=5Fpolicy.html.markdown,r/imagebuilder=5Finfrastructure=5Fconfi?= =?UTF-8?q?guration.html.markdown,r/imagebuilder=5Fimage=5Frecipe.html.mar?= =?UTF-8?q?kdown,r/imagebuilder=5Fimage=5Fpipeline.html.markdown,r/imagebu?= =?UTF-8?q?ilder=5Fimage.html.markdown,r/imagebuilder=5Fdistribution=5Fcon?= =?UTF-8?q?figuration.html.markdown,r/imagebuilder=5Fcontainer=5Frecipe.ht?= =?UTF-8?q?ml.markdown,r/imagebuilder=5Fcomponent.html.markdown,r/identity?= =?UTF-8?q?store=5Fuser.html.markdown,r/identitystore=5Fgroup=5Fmembership?= =?UTF-8?q?.html.markdown,r/identitystore=5Fgroup.html.markdown,r/iam=5Fvi?= =?UTF-8?q?rtual=5Fmfa=5Fdevice.html.markdown,r/iam=5Fuser=5Fssh=5Fkey.htm?= =?UTF-8?q?l.markdown,r/iam=5Fuser=5Fpolicy=5Fattachments=5Fexclusive.html?= =?UTF-8?q?.markdown,r/iam=5Fuser=5Fpolicy=5Fattachment.html.markdown,r/ia?= =?UTF-8?q?m=5Fuser=5Fpolicy.html.markdown,r/iam=5Fuser=5Fpolicies=5Fexclu?= =?UTF-8?q?sive.html.markdown,r/iam=5Fuser=5Flogin=5Fprofile.html.markdown?= =?UTF-8?q?,r/iam=5Fuser=5Fgroup=5Fmembership.html.markdown,r/iam=5Fuser.h?= =?UTF-8?q?tml.markdown,r/iam=5Fsigning=5Fcertificate.html.markdown,r/iam?= =?UTF-8?q?=5Fservice=5Fspecific=5Fcredential.html.markdown,r/iam=5Fservic?= =?UTF-8?q?e=5Flinked=5Frole.html.markdown,r/iam=5Fserver=5Fcertificate.ht?= =?UTF-8?q?ml.markdown,r/iam=5Fsecurity=5Ftoken=5Fservice=5Fpreferences.ht?= =?UTF-8?q?ml.markdown,r/iam=5Fsaml=5Fprovider.html.markdown,r/iam=5Frole?= =?UTF-8?q?=5Fpolicy=5Fattachments=5Fexclusive.html.markdown,r/iam=5Frole?= =?UTF-8?q?=5Fpolicy=5Fattachment.html.markdown,r/iam=5Frole=5Fpolicy.html?= =?UTF-8?q?.markdown,r/iam=5Frole=5Fpolicies=5Fexclusive.html.markdown,r/i?= =?UTF-8?q?am=5Frole.html.markdown,r/iam=5Fpolicy=5Fattachment.html.markdo?= =?UTF-8?q?wn,r/iam=5Fpolicy.html.markdown,r/iam=5Forganizations=5Ffeature?= =?UTF-8?q?s.html.markdown,r/iam=5Fopenid=5Fconnect=5Fprovider.html.markdo?= =?UTF-8?q?wn,r/iam=5Finstance=5Fprofile.html.markdown,r/iam=5Fgroup=5Fpol?= =?UTF-8?q?icy=5Fattachments=5Fexclusive.html.markdown,r/iam=5Fgroup=5Fpol?= =?UTF-8?q?icy=5Fattachment.html.markdown,r/iam=5Fgroup=5Fpolicy.html.mark?= =?UTF-8?q?down,r/iam=5Fgroup=5Fpolicies=5Fexclusive.html.markdown,r/iam?= =?UTF-8?q?=5Fgroup=5Fmembership.html.markdown,r/iam=5Fgroup.html.markdown?= =?UTF-8?q?,r/iam=5Faccount=5Fpassword=5Fpolicy.html.markdown,r/iam=5Facco?= =?UTF-8?q?unt=5Falias.html.markdown,r/iam=5Faccess=5Fkey.html.markdown,r/?= =?UTF-8?q?guardduty=5Fthreatintelset.html.markdown,r/guardduty=5Fpublishi?= =?UTF-8?q?ng=5Fdestination.html.markdown,r/guardduty=5Forganization=5Fcon?= =?UTF-8?q?figuration=5Ffeature.html.markdown,r/guardduty=5Forganization?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/guardduty=5Forganization=5Fadm?= =?UTF-8?q?in=5Faccount.html.markdown,r/guardduty=5Fmember=5Fdetector=5Ffe?= =?UTF-8?q?ature.html.markdown,r/guardduty=5Fmember.html.markdown,r/guardd?= =?UTF-8?q?uty=5Fmalware=5Fprotection=5Fplan.html.markdown,r/guardduty=5Fi?= =?UTF-8?q?pset.html.markdown,r/guardduty=5Finvite=5Faccepter.html.markdow?= =?UTF-8?q?n,r/guardduty=5Ffilter.html.markdown,r/guardduty=5Fdetector=5Ff?= =?UTF-8?q?eature.html.markdown,r/guardduty=5Fdetector.html.markdown,r/gra?= =?UTF-8?q?fana=5Fworkspace=5Fservice=5Faccount=5Ftoken.html.markdown,r/gr?= =?UTF-8?q?afana=5Fworkspace=5Fservice=5Faccount.html.markdown,r/grafana?= =?UTF-8?q?=5Fworkspace=5Fsaml=5Fconfiguration.html.markdown,r/grafana=5Fw?= =?UTF-8?q?orkspace=5Fapi=5Fkey.html.markdown,r/grafana=5Fworkspace.html.m?= =?UTF-8?q?arkdown,r/grafana=5Frole=5Fassociation.html.markdown,r/grafana?= =?UTF-8?q?=5Flicense=5Fassociation.html.markdown,r/glue=5Fworkflow.html.m?= =?UTF-8?q?arkdown,r/glue=5Fuser=5Fdefined=5Ffunction.html.markdown,r/glue?= =?UTF-8?q?=5Ftrigger.html.markdown,r/glue=5Fsecurity=5Fconfiguration.html?= =?UTF-8?q?.markdown,r/glue=5Fschema.html.markdown,r/glue=5Fresource=5Fpol?= =?UTF-8?q?icy.html.markdown,r/glue=5Fregistry.html.markdown,r/glue=5Fpart?= =?UTF-8?q?ition=5Findex.html.markdown,r/glue=5Fpartition.html.markdown,r/?= =?UTF-8?q?glue=5Fml=5Ftransform.html.markdown,r/glue=5Fjob.html.markdown,?= =?UTF-8?q?r/glue=5Fdev=5Fendpoint.html.markdown,r/glue=5Fdata=5Fquality?= =?UTF-8?q?=5Fruleset.html.markdown,r/glue=5Fdata=5Fcatalog=5Fencryption?= =?UTF-8?q?=5Fsettings.html.markdown,r/glue=5Fcrawler.html.markdown,r/glue?= =?UTF-8?q?=5Fconnection.html.markdown,r/glue=5Fclassifier.html.markdown,r?= =?UTF-8?q?/glue=5Fcatalog=5Ftable=5Foptimizer.html.markdown,r/glue=5Fcata?= =?UTF-8?q?log=5Ftable.html.markdown,r/glue=5Fcatalog=5Fdatabase.html.mark?= =?UTF-8?q?down,r/globalaccelerator=5Flistener.html.markdown,r/globalaccel?= =?UTF-8?q?erator=5Fendpoint=5Fgroup.html.markdown,r/globalaccelerator=5Fc?= =?UTF-8?q?ustom=5Frouting=5Flistener.html.markdown,r/globalaccelerator=5F?= =?UTF-8?q?custom=5Frouting=5Fendpoint=5Fgroup.html.markdown,r/globalaccel?= =?UTF-8?q?erator=5Fcustom=5Frouting=5Faccelerator.html.markdown,r/globala?= =?UTF-8?q?ccelerator=5Fcross=5Faccount=5Fattachment.html.markdown,r/globa?= =?UTF-8?q?laccelerator=5Faccelerator.html.markdown,r/glacier=5Fvault=5Flo?= =?UTF-8?q?ck.html.markdown,r/glacier=5Fvault.html.markdown,r/gamelift=5Fs?= =?UTF-8?q?cript.html.markdown,r/gamelift=5Fgame=5Fsession=5Fqueue.html.ma?= =?UTF-8?q?rkdown,r/gamelift=5Fgame=5Fserver=5Fgroup.html.markdown,r/gamel?= =?UTF-8?q?ift=5Ffleet.html.markdown,r/gamelift=5Fbuild.html.markdown,r/ga?= =?UTF-8?q?melift=5Falias.html.markdown,r/fsx=5Fwindows=5Ffile=5Fsystem.ht?= =?UTF-8?q?ml.markdown,r/fsx=5Fs3=5Faccess=5Fpoint=5Fattachment.html.markd?= =?UTF-8?q?own,r/fsx=5Fopenzfs=5Fvolume.html.markdown,r/fsx=5Fopenzfs=5Fsn?= =?UTF-8?q?apshot.html.markdown,r/fsx=5Fopenzfs=5Ffile=5Fsystem.html.markd?= =?UTF-8?q?own,r/fsx=5Fontap=5Fvolume.html.markdown,r/fsx=5Fontap=5Fstorag?= =?UTF-8?q?e=5Fvirtual=5Fmachine.html.markdown,r/fsx=5Fontap=5Ffile=5Fsyst?= =?UTF-8?q?em.html.markdown,r/fsx=5Flustre=5Ffile=5Fsystem.html.markdown,r?= =?UTF-8?q?/fsx=5Ffile=5Fcache.html.markdown,r/fsx=5Fdata=5Frepository=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/fsx=5Fbackup.html.markdown,r/fms=5Fr?= =?UTF-8?q?esource=5Fset.html.markdown,r/fms=5Fpolicy.html.markdown,r/fms?= =?UTF-8?q?=5Fadmin=5Faccount.html.markdown,r/flow=5Flog.html.markdown,r/f?= =?UTF-8?q?is=5Fexperiment=5Ftemplate.html.markdown,r/finspace=5Fkx=5Fvolu?= =?UTF-8?q?me.html.markdown,r/finspace=5Fkx=5Fuser.html.markdown,r/finspac?= =?UTF-8?q?e=5Fkx=5Fscaling=5Fgroup.html.markdown,r/finspace=5Fkx=5Fenviro?= =?UTF-8?q?nment.html.markdown,r/finspace=5Fkx=5Fdataview.html.markdown,r/?= =?UTF-8?q?finspace=5Fkx=5Fdatabase.html.markdown,r/finspace=5Fkx=5Fcluste?= =?UTF-8?q?r.html.markdown,r/evidently=5Fsegment.html.markdown,r/evidently?= =?UTF-8?q?=5Fproject.html.markdown,r/evidently=5Flaunch.html.markdown,r/e?= =?UTF-8?q?vidently=5Ffeature.html.markdown,r/emrserverless=5Fapplication.?= =?UTF-8?q?html.markdown,r/emrcontainers=5Fvirtual=5Fcluster.html.markdown?= =?UTF-8?q?,r/emrcontainers=5Fjob=5Ftemplate.html.markdown,r/emr=5Fstudio?= =?UTF-8?q?=5Fsession=5Fmapping.html.markdown,r/emr=5Fstudio.html.markdown?= =?UTF-8?q?,r/emr=5Fsecurity=5Fconfiguration.html.markdown,r/emr=5Fmanaged?= =?UTF-8?q?=5Fscaling=5Fpolicy.html.markdown,r/emr=5Finstance=5Fgroup.html?= =?UTF-8?q?.markdown,r/emr=5Finstance=5Ffleet.html.markdown,r/emr=5Fcluste?= =?UTF-8?q?r.html.markdown,r/emr=5Fblock=5Fpublic=5Faccess=5Fconfiguration?= =?UTF-8?q?.html.markdown,r/elb=5Fattachment.html.markdown,r/elb.html.mark?= =?UTF-8?q?down,r/elastictranscoder=5Fpreset.html.markdown,r/elastictransc?= =?UTF-8?q?oder=5Fpipeline.html.markdown,r/elasticsearch=5Fvpc=5Fendpoint.?= =?UTF-8?q?html.markdown,r/elasticsearch=5Fdomain=5Fsaml=5Foptions.html.ma?= =?UTF-8?q?rkdown,r/elasticsearch=5Fdomain=5Fpolicy.html.markdown,r/elasti?= =?UTF-8?q?csearch=5Fdomain.html.markdown,r/elasticache=5Fuser=5Fgroup=5Fa?= =?UTF-8?q?ssociation.html.markdown,r/elasticache=5Fuser=5Fgroup.html.mark?= =?UTF-8?q?down,r/elasticache=5Fuser.html.markdown,r/elasticache=5Fsubnet?= =?UTF-8?q?=5Fgroup.html.markdown,r/elasticache=5Fserverless=5Fcache.html.?= =?UTF-8?q?markdown,r/elasticache=5Freserved=5Fcache=5Fnode.html.markdown,?= =?UTF-8?q?r/elasticache=5Freplication=5Fgroup.html.markdown,r/elasticache?= =?UTF-8?q?=5Fparameter=5Fgroup.html.markdown,r/elasticache=5Fglobal=5Frep?= =?UTF-8?q?lication=5Fgroup.html.markdown,r/elasticache=5Fcluster.html.mar?= =?UTF-8?q?kdown,r/elastic=5Fbeanstalk=5Fenvironment.html.markdown,r/elast?= =?UTF-8?q?ic=5Fbeanstalk=5Fconfiguration=5Ftemplate.html.markdown,r/elast?= =?UTF-8?q?ic=5Fbeanstalk=5Fapplication=5Fversion.html.markdown,r/elastic?= =?UTF-8?q?=5Fbeanstalk=5Fapplication.html.markdown,r/eks=5Fpod=5Fidentity?= =?UTF-8?q?=5Fassociation.html.markdown,r/eks=5Fnode=5Fgroup.html.markdown?= =?UTF-8?q?,r/eks=5Fidentity=5Fprovider=5Fconfig.html.markdown,r/eks=5Ffar?= =?UTF-8?q?gate=5Fprofile.html.markdown,r/eks=5Fcluster.html.markdown,r/ek?= =?UTF-8?q?s=5Faddon.html.markdown,r/eks=5Faccess=5Fpolicy=5Fassociation.h?= =?UTF-8?q?tml.markdown,r/eks=5Faccess=5Fentry.html.markdown,r/eip=5Fdomai?= =?UTF-8?q?n=5Fname.html.markdown,r/eip=5Fassociation.html.markdown,r/eip.?= =?UTF-8?q?html.markdown,r/egress=5Fonly=5Finternet=5Fgateway.html.markdow?= =?UTF-8?q?n,r/efs=5Freplication=5Fconfiguration.html.markdown,r/efs=5Fmou?= =?UTF-8?q?nt=5Ftarget.html.markdown,r/efs=5Ffile=5Fsystem=5Fpolicy.html.m?= =?UTF-8?q?arkdown,r/efs=5Ffile=5Fsystem.html.markdown,r/efs=5Fbackup=5Fpo?= =?UTF-8?q?licy.html.markdown,r/efs=5Faccess=5Fpoint.html.markdown,r/ecs?= =?UTF-8?q?=5Ftask=5Fset.html.markdown,r/ecs=5Ftask=5Fdefinition.html.mark?= =?UTF-8?q?down,r/ecs=5Ftag.html.markdown,r/ecs=5Fservice.html.markdown,r/?= =?UTF-8?q?ecs=5Fcluster=5Fcapacity=5Fproviders.html.markdown,r/ecs=5Fclus?= =?UTF-8?q?ter.html.markdown,r/ecs=5Fcapacity=5Fprovider.html.markdown,r/e?= =?UTF-8?q?cs=5Faccount=5Fsetting=5Fdefault.html.markdown,r/ecrpublic=5Fre?= =?UTF-8?q?pository=5Fpolicy.html.markdown,r/ecrpublic=5Frepository.html.m?= =?UTF-8?q?arkdown,r/ecr=5Frepository=5Fpolicy.html.markdown,r/ecr=5Frepos?= =?UTF-8?q?itory=5Fcreation=5Ftemplate.html.markdown,r/ecr=5Frepository.ht?= =?UTF-8?q?ml.markdown,r/ecr=5Freplication=5Fconfiguration.html.markdown,r?= =?UTF-8?q?/ecr=5Fregistry=5Fscanning=5Fconfiguration.html.markdown,r/ecr?= =?UTF-8?q?=5Fregistry=5Fpolicy.html.markdown,r/ecr=5Fpull=5Fthrough=5Fcac?= =?UTF-8?q?he=5Frule.html.markdown,r/ecr=5Flifecycle=5Fpolicy.html.markdow?= =?UTF-8?q?n,r/ecr=5Faccount=5Fsetting.html.markdown,r/ec2=5Ftransit=5Fgat?= =?UTF-8?q?eway=5Fvpc=5Fattachment=5Faccepter.html.markdown,r/ec2=5Ftransi?= =?UTF-8?q?t=5Fgateway=5Fvpc=5Fattachment.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Froute=5Ftable=5Fpropagation.html.markdown,r/ec2=5Ftra?= =?UTF-8?q?nsit=5Fgateway=5Froute=5Ftable=5Fassociation.html.markdown,r/ec?= =?UTF-8?q?2=5Ftransit=5Fgateway=5Froute=5Ftable.html.markdown,r/ec2=5Ftra?= =?UTF-8?q?nsit=5Fgateway=5Froute.html.markdown,r/ec2=5Ftransit=5Fgateway?= =?UTF-8?q?=5Fprefix=5Flist=5Freference.html.markdown,r/ec2=5Ftransit=5Fga?= =?UTF-8?q?teway=5Fpolicy=5Ftable=5Fassociation.html.markdown,r/ec2=5Ftran?= =?UTF-8?q?sit=5Fgateway=5Fpolicy=5Ftable.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Fpeering=5Fattachment=5Faccepter.html.markdown,r/ec2?= =?UTF-8?q?=5Ftransit=5Fgateway=5Fpeering=5Fattachment.html.markdown,r/ec2?= =?UTF-8?q?=5Ftransit=5Fgateway=5Fmulticast=5Fgroup=5Fsource.html.markdown?= =?UTF-8?q?,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fgroup=5Fmember.html.ma?= =?UTF-8?q?rkdown,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fdomain=5Fassocia?= =?UTF-8?q?tion.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fmulticast=5Fdoma?= =?UTF-8?q?in.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fdefault=5Froute=5F?= =?UTF-8?q?table=5Fpropagation.html.markdown,r/ec2=5Ftransit=5Fgateway=5Fd?= =?UTF-8?q?efault=5Froute=5Ftable=5Fassociation.html.markdown,r/ec2=5Ftran?= =?UTF-8?q?sit=5Fgateway=5Fconnect=5Fpeer.html.markdown,r/ec2=5Ftransit=5F?= =?UTF-8?q?gateway=5Fconnect.html.markdown,r/ec2=5Ftransit=5Fgateway.html.?= =?UTF-8?q?markdown,r/ec2=5Ftraffic=5Fmirror=5Ftarget.html.markdown,r/ec2?= =?UTF-8?q?=5Ftraffic=5Fmirror=5Fsession.html.markdown,r/ec2=5Ftraffic=5Fm?= =?UTF-8?q?irror=5Ffilter=5Frule.html.markdown,r/ec2=5Ftraffic=5Fmirror=5F?= =?UTF-8?q?filter.html.markdown,r/ec2=5Ftag.html.markdown,r/ec2=5Fsubnet?= =?UTF-8?q?=5Fcidr=5Freservation.html.markdown,r/ec2=5Fserial=5Fconsole=5F?= =?UTF-8?q?access.html.markdown,r/ec2=5Fnetwork=5Finsights=5Fpath.html.mar?= =?UTF-8?q?kdown,r/ec2=5Fnetwork=5Finsights=5Fanalysis.html.markdown,r/ec2?= =?UTF-8?q?=5Fmanaged=5Fprefix=5Flist=5Fentry.html.markdown,r/ec2=5Fmanage?= =?UTF-8?q?d=5Fprefix=5Flist.html.markdown,r/ec2=5Flocal=5Fgateway=5Froute?= =?UTF-8?q?=5Ftable=5Fvpc=5Fassociation.html.markdown,r/ec2=5Flocal=5Fgate?= =?UTF-8?q?way=5Froute.html.markdown,r/ec2=5Finstance=5Fstate.html.markdow?= =?UTF-8?q?n,r/ec2=5Finstance=5Fmetadata=5Fdefaults.html.markdown,r/ec2=5F?= =?UTF-8?q?instance=5Fconnect=5Fendpoint.html.markdown,r/ec2=5Fimage=5Fblo?= =?UTF-8?q?ck=5Fpublic=5Faccess.markdown,r/ec2=5Fhost.html.markdown,r/ec2?= =?UTF-8?q?=5Ffleet.html.markdown,r/ec2=5Fdefault=5Fcredit=5Fspecification?= =?UTF-8?q?.html.markdown,r/ec2=5Fclient=5Fvpn=5Froute.html.markdown,r/ec2?= =?UTF-8?q?=5Fclient=5Fvpn=5Fnetwork=5Fassociation.html.markdown,r/ec2=5Fc?= =?UTF-8?q?lient=5Fvpn=5Fendpoint.html.markdown,r/ec2=5Fclient=5Fvpn=5Faut?= =?UTF-8?q?horization=5Frule.html.markdown,r/ec2=5Fcarrier=5Fgateway.html.?= =?UTF-8?q?markdown,r/ec2=5Fcapacity=5Freservation.html.markdown,r/ec2=5Fc?= =?UTF-8?q?apacity=5Fblock=5Freservation.html.markdown,r/ec2=5Favailabilit?= =?UTF-8?q?y=5Fzone=5Fgroup.html.markdown,r/ebs=5Fvolume.html.markdown,r/e?= =?UTF-8?q?bs=5Fsnapshot=5Fimport.html.markdown,r/ebs=5Fsnapshot=5Fcopy.ht?= =?UTF-8?q?ml.markdown,r/ebs=5Fsnapshot=5Fblock=5Fpublic=5Faccess.html.mar?= =?UTF-8?q?kdown,r/ebs=5Fsnapshot.html.markdown,r/ebs=5Ffast=5Fsnapshot=5F?= =?UTF-8?q?restore.html.markdown,r/ebs=5Fencryption=5Fby=5Fdefault.html.ma?= =?UTF-8?q?rkdown,r/ebs=5Fdefault=5Fkms=5Fkey.html.markdown,r/dynamodb=5Ft?= =?UTF-8?q?ag.html.markdown,r/dynamodb=5Ftable=5Freplica.html.markdown,r/d?= =?UTF-8?q?ynamodb=5Ftable=5Fitem.html.markdown,r/dynamodb=5Ftable=5Fexpor?= =?UTF-8?q?t.html.markdown,r/dynamodb=5Ftable.html.markdown,r/dynamodb=5Fr?= =?UTF-8?q?esource=5Fpolicy.html.markdown,r/dynamodb=5Fkinesis=5Fstreaming?= =?UTF-8?q?=5Fdestination.html.markdown,r/dynamodb=5Fglobal=5Ftable.html.m?= =?UTF-8?q?arkdown,r/dynamodb=5Fcontributor=5Finsights.html.markdown,r/dx?= =?UTF-8?q?=5Ftransit=5Fvirtual=5Finterface.html.markdown,r/dx=5Fpublic=5F?= =?UTF-8?q?virtual=5Finterface.html.markdown,r/dx=5Fprivate=5Fvirtual=5Fin?= =?UTF-8?q?terface.html.markdown,r/dx=5Fmacsec=5Fkey=5Fassociation.html.ma?= =?UTF-8?q?rkdown,r/dx=5Flag.html.markdown,r/dx=5Fhosted=5Ftransit=5Fvirtu?= =?UTF-8?q?al=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted=5Ftransit?= =?UTF-8?q?=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5Fpublic=5Fv?= =?UTF-8?q?irtual=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted=5Fpub?= =?UTF-8?q?lic=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5Fprivate?= =?UTF-8?q?=5Fvirtual=5Finterface=5Faccepter.html.markdown,r/dx=5Fhosted?= =?UTF-8?q?=5Fprivate=5Fvirtual=5Finterface.html.markdown,r/dx=5Fhosted=5F?= =?UTF-8?q?connection.html.markdown,r/dx=5Fgateway=5Fassociation=5Fproposa?= =?UTF-8?q?l.html.markdown,r/dx=5Fgateway=5Fassociation.html.markdown,r/dx?= =?UTF-8?q?=5Fgateway.html.markdown,r/dx=5Fconnection=5Fconfirmation.html.?= =?UTF-8?q?markdown,r/dx=5Fconnection=5Fassociation.html.markdown,r/dx=5Fc?= =?UTF-8?q?onnection.html.markdown,r/dx=5Fbgp=5Fpeer.html.markdown,r/dsql?= =?UTF-8?q?=5Fcluster=5Fpeering.html.markdown,r/dsql=5Fcluster.html.markdo?= =?UTF-8?q?wn,r/drs=5Freplication=5Fconfiguration=5Ftemplate.html.markdown?= =?UTF-8?q?,r/docdbelastic=5Fcluster.html.markdown,r/docdb=5Fsubnet=5Fgrou?= =?UTF-8?q?p.html.markdown,r/docdb=5Fglobal=5Fcluster.html.markdown,r/docd?= =?UTF-8?q?b=5Fevent=5Fsubscription.html.markdown,r/docdb=5Fcluster=5Fsnap?= =?UTF-8?q?shot.html.markdown,r/docdb=5Fcluster=5Fparameter=5Fgroup.html.m?= =?UTF-8?q?arkdown,r/docdb=5Fcluster=5Finstance.html.markdown,r/docdb=5Fcl?= =?UTF-8?q?uster.html.markdown,r/dms=5Fs3=5Fendpoint.html.markdown,r/dms?= =?UTF-8?q?=5Freplication=5Ftask.html.markdown,r/dms=5Freplication=5Fsubne?= =?UTF-8?q?t=5Fgroup.html.markdown,r/dms=5Freplication=5Finstance.html.mar?= =?UTF-8?q?kdown,r/dms=5Freplication=5Fconfig.html.markdown,r/dms=5Fevent?= =?UTF-8?q?=5Fsubscription.html.markdown,r/dms=5Fendpoint.html.markdown,r/?= =?UTF-8?q?dms=5Fcertificate.html.markdown,r/dlm=5Flifecycle=5Fpolicy.html?= =?UTF-8?q?.markdown,r/directory=5Fservice=5Ftrust.html.markdown,r/directo?= =?UTF-8?q?ry=5Fservice=5Fshared=5Fdirectory=5Faccepter.html.markdown,r/di?= =?UTF-8?q?rectory=5Fservice=5Fshared=5Fdirectory.html.markdown,r/director?= =?UTF-8?q?y=5Fservice=5Fregion.html.markdown,r/directory=5Fservice=5Fradi?= =?UTF-8?q?us=5Fsettings.html.markdown,r/directory=5Fservice=5Flog=5Fsubsc?= =?UTF-8?q?ription.html.markdown,r/directory=5Fservice=5Fdirectory.html.ma?= =?UTF-8?q?rkdown,r/directory=5Fservice=5Fconditional=5Fforwarder.html.mar?= =?UTF-8?q?kdown,r/devopsguru=5Fservice=5Fintegration.html.markdown,r/devo?= =?UTF-8?q?psguru=5Fresource=5Fcollection.html.markdown,r/devopsguru=5Fnot?= =?UTF-8?q?ification=5Fchannel.html.markdown,r/devopsguru=5Fevent=5Fsource?= =?UTF-8?q?s=5Fconfig.html.markdown,r/devicefarm=5Fupload.html.markdown,r/?= =?UTF-8?q?devicefarm=5Ftest=5Fgrid=5Fproject.html.markdown,r/devicefarm?= =?UTF-8?q?=5Fproject.html.markdown,r/devicefarm=5Fnetwork=5Fprofile.html.?= =?UTF-8?q?markdown,r/devicefarm=5Finstance=5Fprofile.html.markdown,r/devi?= =?UTF-8?q?cefarm=5Fdevice=5Fpool.html.markdown,r/detective=5Forganization?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/detective=5Forganization=5Fadm?= =?UTF-8?q?in=5Faccount.html.markdown,r/detective=5Fmember.html.markdown,r?= =?UTF-8?q?/detective=5Finvitation=5Faccepter.html.markdown,r/detective=5F?= =?UTF-8?q?graph.html.markdown,r/default=5Fvpc=5Fdhcp=5Foptions.html.markd?= =?UTF-8?q?own,r/default=5Fvpc.html.markdown,r/default=5Fsubnet.html.markd?= =?UTF-8?q?own,r/default=5Fsecurity=5Fgroup.html.markdown,r/default=5Frout?= =?UTF-8?q?e=5Ftable.html.markdown,r/default=5Fnetwork=5Facl.html.markdown?= =?UTF-8?q?,r/db=5Fsubnet=5Fgroup.html.markdown,r/db=5Fsnapshot=5Fcopy.htm?= =?UTF-8?q?l.markdown,r/db=5Fsnapshot.html.markdown,r/db=5Fproxy=5Ftarget.?= =?UTF-8?q?html.markdown,r/db=5Fproxy=5Fendpoint.html.markdown,r/db=5Fprox?= =?UTF-8?q?y=5Fdefault=5Ftarget=5Fgroup.html.markdown,r/db=5Fproxy.html.ma?= =?UTF-8?q?rkdown,r/db=5Fparameter=5Fgroup.html.markdown,r/db=5Foption=5Fg?= =?UTF-8?q?roup.html.markdown,r/db=5Finstance=5Frole=5Fassociation.html.ma?= =?UTF-8?q?rkdown,r/db=5Finstance=5Fautomated=5Fbackups=5Freplication.html?= =?UTF-8?q?.markdown,r/db=5Finstance.html.markdown,r/db=5Fevent=5Fsubscrip?= =?UTF-8?q?tion.html.markdown,r/db=5Fcluster=5Fsnapshot.html.markdown,r/da?= =?UTF-8?q?x=5Fsubnet=5Fgroup.html.markdown,r/dax=5Fparameter=5Fgroup.html?= =?UTF-8?q?.markdown,r/dax=5Fcluster.html.markdown,r/datazone=5Fuser=5Fpro?= =?UTF-8?q?file.html.markdown,r/datazone=5Fproject.html.markdown,r/datazon?= =?UTF-8?q?e=5Fglossary=5Fterm.html.markdown,r/datazone=5Fglossary.html.ma?= =?UTF-8?q?rkdown,r/datazone=5Fform=5Ftype.html.markdown,r/datazone=5Fenvi?= =?UTF-8?q?ronment=5Fprofile.html.markdown,r/datazone=5Fenvironment=5Fblue?= =?UTF-8?q?print=5Fconfiguration.html.markdown,r/datazone=5Fenvironment.ht?= =?UTF-8?q?ml.markdown,r/datazone=5Fdomain.html.markdown,r/datazone=5Fasse?= =?UTF-8?q?t=5Ftype.html.markdown,r/datasync=5Ftask.html.markdown,r/datasy?= =?UTF-8?q?nc=5Flocation=5Fsmb.html.markdown,r/datasync=5Flocation=5Fs3.ht?= =?UTF-8?q?ml.markdown,r/datasync=5Flocation=5Fobject=5Fstorage.html.markd?= =?UTF-8?q?own,r/datasync=5Flocation=5Fnfs.html.markdown,r/datasync=5Floca?= =?UTF-8?q?tion=5Fhdfs.html.markdown,r/datasync=5Flocation=5Ffsx=5Fwindows?= =?UTF-8?q?=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5Ffsx=5Fop?= =?UTF-8?q?enzfs=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5Ffsx?= =?UTF-8?q?=5Fontap=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocation=5F?= =?UTF-8?q?fsx=5Flustre=5Ffile=5Fsystem.html.markdown,r/datasync=5Flocatio?= =?UTF-8?q?n=5Fefs.html.markdown,r/datasync=5Flocation=5Fazure=5Fblob.html?= =?UTF-8?q?.markdown,r/datasync=5Fagent.html.markdown,r/datapipeline=5Fpip?= =?UTF-8?q?eline=5Fdefinition.html.markdown,r/datapipeline=5Fpipeline.html?= =?UTF-8?q?.markdown,r/dataexchange=5Frevision=5Fassets.html.markdown,r/da?= =?UTF-8?q?taexchange=5Frevision.html.markdown,r/dataexchange=5Fevent=5Fac?= =?UTF-8?q?tion.html.markdown,r/dataexchange=5Fdata=5Fset.html.markdown,r/?= =?UTF-8?q?customerprofiles=5Fprofile.html.markdown,r/customerprofiles=5Fd?= =?UTF-8?q?omain.html.markdown,r/customer=5Fgateway.html.markdown,r/cur=5F?= =?UTF-8?q?report=5Fdefinition.html.markdown,r/costoptimizationhub=5Fprefe?= =?UTF-8?q?rences.html.markdown,r/costoptimizationhub=5Fenrollment=5Fstatu?= =?UTF-8?q?s.html.markdown,r/controltower=5Flanding=5Fzone.html.markdown,r?= =?UTF-8?q?/controltower=5Fcontrol.html.markdown,r/controltower=5Fbaseline?= =?UTF-8?q?.html.markdown,r/connect=5Fvocabulary.html.markdown,r/connect?= =?UTF-8?q?=5Fuser=5Fhierarchy=5Fstructure.html.markdown,r/connect=5Fuser?= =?UTF-8?q?=5Fhierarchy=5Fgroup.html.markdown,r/connect=5Fuser.html.markdo?= =?UTF-8?q?wn,r/connect=5Fsecurity=5Fprofile.html.markdown,r/connect=5Frou?= =?UTF-8?q?ting=5Fprofile.html.markdown,r/connect=5Fquick=5Fconnect.html.m?= =?UTF-8?q?arkdown,r/connect=5Fqueue.html.markdown,r/connect=5Fphone=5Fnum?= =?UTF-8?q?ber=5Fcontact=5Fflow=5Fassociation.html.markdown,r/connect=5Fph?= =?UTF-8?q?one=5Fnumber.html.markdown,r/connect=5Flambda=5Ffunction=5Fasso?= =?UTF-8?q?ciation.html.markdown,r/connect=5Finstance=5Fstorage=5Fconfig.h?= =?UTF-8?q?tml.markdown,r/connect=5Finstance.html.markdown,r/connect=5Fhou?= =?UTF-8?q?rs=5Fof=5Foperation.html.markdown,r/connect=5Fcontact=5Fflow=5F?= =?UTF-8?q?module.html.markdown,r/connect=5Fcontact=5Fflow.html.markdown,r?= =?UTF-8?q?/connect=5Fbot=5Fassociation.html.markdown,r/config=5Fretention?= =?UTF-8?q?=5Fconfiguration.html.markdown,r/config=5Fremediation=5Fconfigu?= =?UTF-8?q?ration.html.markdown,r/config=5Forganization=5Fmanaged=5Frule.h?= =?UTF-8?q?tml.markdown,r/config=5Forganization=5Fcustom=5Frule.html.markd?= =?UTF-8?q?own,r/config=5Forganization=5Fcustom=5Fpolicy=5Frule.html.markd?= =?UTF-8?q?own,r/config=5Forganization=5Fconformance=5Fpack.html.markdown,?= =?UTF-8?q?r/config=5Fdelivery=5Fchannel.html.markdown,r/config=5Fconforma?= =?UTF-8?q?nce=5Fpack.html.markdown,r/config=5Fconfiguration=5Frecorder=5F?= =?UTF-8?q?status.html.markdown,r/config=5Fconfiguration=5Frecorder.html.m?= =?UTF-8?q?arkdown,r/config=5Fconfiguration=5Faggregator.html.markdown,r/c?= =?UTF-8?q?onfig=5Fconfig=5Frule.html.markdown,r/config=5Faggregate=5Fauth?= =?UTF-8?q?orization.html.markdown,r/computeoptimizer=5Frecommendation=5Fp?= =?UTF-8?q?references.html.markdown,r/computeoptimizer=5Fenrollment=5Fstat?= =?UTF-8?q?us.html.markdown,r/comprehend=5Fentity=5Frecognizer.html.markdo?= =?UTF-8?q?wn,r/comprehend=5Fdocument=5Fclassifier.html.markdown,r/cognito?= =?UTF-8?q?=5Fuser=5Fpool=5Fui=5Fcustomization.html.markdown,r/cognito=5Fu?= =?UTF-8?q?ser=5Fpool=5Fdomain.html.markdown,r/cognito=5Fuser=5Fpool=5Fcli?= =?UTF-8?q?ent.html.markdown,r/cognito=5Fuser=5Fpool.html.markdown,r/cogni?= =?UTF-8?q?to=5Fuser=5Fin=5Fgroup.html.markdown,r/cognito=5Fuser=5Fgroup.h?= =?UTF-8?q?tml.markdown,r/cognito=5Fuser.html.markdown,r/cognito=5Frisk=5F?= =?UTF-8?q?configuration.html.markdown,r/cognito=5Fresource=5Fserver.html.?= =?UTF-8?q?markdown,r/cognito=5Fmanaged=5Fuser=5Fpool=5Fclient.html.markdo?= =?UTF-8?q?wn,r/cognito=5Fmanaged=5Flogin=5Fbranding.html.markdown,r/cogni?= =?UTF-8?q?to=5Flog=5Fdelivery=5Fconfiguration.html.markdown,r/cognito=5Fi?= =?UTF-8?q?dentity=5Fprovider.html.markdown,r/cognito=5Fidentity=5Fpool=5F?= =?UTF-8?q?roles=5Fattachment.html.markdown,r/cognito=5Fidentity=5Fpool=5F?= =?UTF-8?q?provider=5Fprincipal=5Ftag.html.markdown,r/cognito=5Fidentity?= =?UTF-8?q?=5Fpool.html.markdown,r/codestarnotifications=5Fnotification=5F?= =?UTF-8?q?rule.html.markdown,r/codestarconnections=5Fhost.html.markdown,r?= =?UTF-8?q?/codestarconnections=5Fconnection.html.markdown,r/codepipeline?= =?UTF-8?q?=5Fwebhook.html.markdown,r/codepipeline=5Fcustom=5Faction=5Ftyp?= =?UTF-8?q?e.html.markdown,r/codepipeline.html.markdown,r/codegurureviewer?= =?UTF-8?q?=5Frepository=5Fassociation.html.markdown,r/codeguruprofiler=5F?= =?UTF-8?q?profiling=5Fgroup.html.markdown,r/codedeploy=5Fdeployment=5Fgro?= =?UTF-8?q?up.html.markdown,r/codedeploy=5Fdeployment=5Fconfig.html.markdo?= =?UTF-8?q?wn,r/codedeploy=5Fapp.html.markdown,r/codeconnections=5Fhost.ht?= =?UTF-8?q?ml.markdown,r/codeconnections=5Fconnection.html.markdown,r/code?= =?UTF-8?q?commit=5Ftrigger.html.markdown,r/codecommit=5Frepository.html.m?= =?UTF-8?q?arkdown,r/codecommit=5Fapproval=5Frule=5Ftemplate=5Fassociation?= =?UTF-8?q?.html.markdown,r/codecommit=5Fapproval=5Frule=5Ftemplate.html.m?= =?UTF-8?q?arkdown,r/codecatalyst=5Fsource=5Frepository.html.markdown,r/co?= =?UTF-8?q?decatalyst=5Fproject.html.markdown,r/codecatalyst=5Fdev=5Fenvir?= =?UTF-8?q?onment.html.markdown,r/codebuild=5Fwebhook.html.markdown,r/code?= =?UTF-8?q?build=5Fsource=5Fcredential.html.markdown,r/codebuild=5Fresourc?= =?UTF-8?q?e=5Fpolicy.html.markdown,r/codebuild=5Freport=5Fgroup.html.mark?= =?UTF-8?q?down,r/codebuild=5Fproject.html.markdown,r/codebuild=5Ffleet.ht?= =?UTF-8?q?ml.markdown,r/codeartifact=5Frepository=5Fpermissions=5Fpolicy.?= =?UTF-8?q?html.markdown,r/codeartifact=5Frepository.html.markdown,r/codea?= =?UTF-8?q?rtifact=5Fdomain=5Fpermissions=5Fpolicy.html.markdown,r/codeart?= =?UTF-8?q?ifact=5Fdomain.html.markdown,r/cloudwatch=5Fquery=5Fdefinition.?= =?UTF-8?q?html.markdown,r/cloudwatch=5Fmetric=5Fstream.html.markdown,r/cl?= =?UTF-8?q?oudwatch=5Fmetric=5Falarm.html.markdown,r/cloudwatch=5Flog=5Fsu?= =?UTF-8?q?bscription=5Ffilter.html.markdown,r/cloudwatch=5Flog=5Fstream.h?= =?UTF-8?q?tml.markdown,r/cloudwatch=5Flog=5Fresource=5Fpolicy.html.markdo?= =?UTF-8?q?wn,r/cloudwatch=5Flog=5Fmetric=5Ffilter.html.markdown,r/cloudwa?= =?UTF-8?q?tch=5Flog=5Findex=5Fpolicy.html.markdown,r/cloudwatch=5Flog=5Fg?= =?UTF-8?q?roup.html.markdown,r/cloudwatch=5Flog=5Fdestination=5Fpolicy.ht?= =?UTF-8?q?ml.markdown,r/cloudwatch=5Flog=5Fdestination.html.markdown,r/cl?= =?UTF-8?q?oudwatch=5Flog=5Fdelivery=5Fsource.html.markdown,r/cloudwatch?= =?UTF-8?q?=5Flog=5Fdelivery=5Fdestination=5Fpolicy.html.markdown,r/cloudw?= =?UTF-8?q?atch=5Flog=5Fdelivery=5Fdestination.html.markdown,r/cloudwatch?= =?UTF-8?q?=5Flog=5Fdelivery.html.markdown,r/cloudwatch=5Flog=5Fdata=5Fpro?= =?UTF-8?q?tection=5Fpolicy.html.markdown,r/cloudwatch=5Flog=5Fanomaly=5Fd?= =?UTF-8?q?etector.html.markdown,r/cloudwatch=5Flog=5Faccount=5Fpolicy.htm?= =?UTF-8?q?l.markdown,r/cloudwatch=5Fevent=5Ftarget.html.markdown,r/cloudw?= =?UTF-8?q?atch=5Fevent=5Frule.html.markdown,r/cloudwatch=5Fevent=5Fpermis?= =?UTF-8?q?sion.html.markdown,r/cloudwatch=5Fevent=5Fendpoint.html.markdow?= =?UTF-8?q?n,r/cloudwatch=5Fevent=5Fconnection.html.markdown,r/cloudwatch?= =?UTF-8?q?=5Fevent=5Fbus=5Fpolicy.html.markdown,r/cloudwatch=5Fevent=5Fbu?= =?UTF-8?q?s.html.markdown,r/cloudwatch=5Fevent=5Farchive.html.markdown,r/?= =?UTF-8?q?cloudwatch=5Fevent=5Fapi=5Fdestination.html.markdown,r/cloudwat?= =?UTF-8?q?ch=5Fdashboard.html.markdown,r/cloudwatch=5Fcontributor=5Fmanag?= =?UTF-8?q?ed=5Finsight=5Frule.html.markdown,r/cloudwatch=5Fcontributor=5F?= =?UTF-8?q?insight=5Frule.html.markdown,r/cloudwatch=5Fcomposite=5Falarm.h?= =?UTF-8?q?tml.markdown,r/cloudtrail=5Forganization=5Fdelegated=5Fadmin=5F?= =?UTF-8?q?account.html.markdown,r/cloudtrail=5Fevent=5Fdata=5Fstore.html.?= =?UTF-8?q?markdown,r/cloudtrail.html.markdown,r/cloudsearch=5Fdomain=5Fse?= =?UTF-8?q?rvice=5Faccess=5Fpolicy.html.markdown,r/cloudsearch=5Fdomain.ht?= =?UTF-8?q?ml.markdown,r/cloudhsm=5Fv2=5Fhsm.html.markdown,r/cloudhsm=5Fv2?= =?UTF-8?q?=5Fcluster.html.markdown,r/cloudfrontkeyvaluestore=5Fkeys=5Fexc?= =?UTF-8?q?lusive.html.markdown,r/cloudfrontkeyvaluestore=5Fkey.html.markd?= =?UTF-8?q?own,r/cloudfront=5Fvpc=5Forigin.html.markdown,r/cloudfront=5Fre?= =?UTF-8?q?sponse=5Fheaders=5Fpolicy.html.markdown,r/cloudfront=5Frealtime?= =?UTF-8?q?=5Flog=5Fconfig.html.markdown,r/cloudfront=5Fpublic=5Fkey.html.?= =?UTF-8?q?markdown,r/cloudfront=5Forigin=5Frequest=5Fpolicy.html.markdown?= =?UTF-8?q?,r/cloudfront=5Forigin=5Faccess=5Fidentity.html.markdown,r/clou?= =?UTF-8?q?dfront=5Forigin=5Faccess=5Fcontrol.html.markdown,r/cloudfront?= =?UTF-8?q?=5Fmonitoring=5Fsubscription.html.markdown,r/cloudfront=5Fkey?= =?UTF-8?q?=5Fvalue=5Fstore.html.markdown,r/cloudfront=5Fkey=5Fgroup.html.?= =?UTF-8?q?markdown,r/cloudfront=5Ffunction.html.markdown,r/cloudfront=5Ff?= =?UTF-8?q?ield=5Flevel=5Fencryption=5Fprofile.html.markdown,r/cloudfront?= =?UTF-8?q?=5Ffield=5Flevel=5Fencryption=5Fconfig.html.markdown,r/cloudfro?= =?UTF-8?q?nt=5Fdistribution.html.markdown,r/cloudfront=5Fcontinuous=5Fdep?= =?UTF-8?q?loyment=5Fpolicy.html.markdown,r/cloudfront=5Fcache=5Fpolicy.ht?= =?UTF-8?q?ml.markdown,r/cloudformation=5Ftype.html.markdown,r/cloudformat?= =?UTF-8?q?ion=5Fstack=5Fset=5Finstance.html.markdown,r/cloudformation=5Fs?= =?UTF-8?q?tack=5Fset.html.markdown,r/cloudformation=5Fstack=5Finstances.h?= =?UTF-8?q?tml.markdown,r/cloudformation=5Fstack.html.markdown,r/cloudcont?= =?UTF-8?q?rolapi=5Fresource.html.markdown,r/cloud9=5Fenvironment=5Fmember?= =?UTF-8?q?ship.html.markdown,r/cloud9=5Fenvironment=5Fec2.html.markdown,r?= =?UTF-8?q?/cleanrooms=5Fmembership.html.markdown,r/cleanrooms=5Fconfigure?= =?UTF-8?q?d=5Ftable.html.markdown,r/cleanrooms=5Fcollaboration.html.markd?= =?UTF-8?q?own,r/chimesdkvoice=5Fvoice=5Fprofile=5Fdomain.html.markdown,r/?= =?UTF-8?q?chimesdkvoice=5Fsip=5Frule.html.markdown,r/chimesdkvoice=5Fsip?= =?UTF-8?q?=5Fmedia=5Fapplication.html.markdown,r/chimesdkvoice=5Fglobal?= =?UTF-8?q?=5Fsettings.html.markdown,r/chimesdkmediapipelines=5Fmedia=5Fin?= =?UTF-8?q?sights=5Fpipeline=5Fconfiguration.html.markdown,r/chime=5Fvoice?= =?UTF-8?q?=5Fconnector=5Ftermination=5Fcredentials.html.markdown,r/chime?= =?UTF-8?q?=5Fvoice=5Fconnector=5Ftermination.html.markdown,r/chime=5Fvoic?= =?UTF-8?q?e=5Fconnector=5Fstreaming.html.markdown,r/chime=5Fvoice=5Fconne?= =?UTF-8?q?ctor=5Forigination.html.markdown,r/chime=5Fvoice=5Fconnector=5F?= =?UTF-8?q?logging.html.markdown,r/chime=5Fvoice=5Fconnector=5Fgroup.html.?= =?UTF-8?q?markdown,r/chime=5Fvoice=5Fconnector.html.markdown,r/chatbot=5F?= =?UTF-8?q?teams=5Fchannel=5Fconfiguration.html.markdown,r/chatbot=5Fslack?= =?UTF-8?q?=5Fchannel=5Fconfiguration.html.markdown,r/ce=5Fcost=5Fcategory?= =?UTF-8?q?.html.markdown,r/ce=5Fcost=5Fallocation=5Ftag.html.markdown,r/c?= =?UTF-8?q?e=5Fanomaly=5Fsubscription.html.markdown,r/ce=5Fanomaly=5Fmonit?= =?UTF-8?q?or.html.markdown,r/budgets=5Fbudget=5Faction.html.markdown,r/bu?= =?UTF-8?q?dgets=5Fbudget.html.markdown,r/bedrockagent=5Fprompt.html.markd?= =?UTF-8?q?own,r/bedrockagent=5Fknowledge=5Fbase.html.markdown,r/bedrockag?= =?UTF-8?q?ent=5Fflow.html.markdown,r/bedrockagent=5Fdata=5Fsource.html.ma?= =?UTF-8?q?rkdown,r/bedrockagent=5Fagent=5Fknowledge=5Fbase=5Fassociation.?= =?UTF-8?q?html.markdown,r/bedrockagent=5Fagent=5Fcollaborator.html.markdo?= =?UTF-8?q?wn,r/bedrockagent=5Fagent=5Falias.html.markdown,r/bedrockagent?= =?UTF-8?q?=5Fagent=5Faction=5Fgroup.html.markdown,r/bedrockagent=5Fagent.?= =?UTF-8?q?html.markdown,r/bedrock=5Fprovisioned=5Fmodel=5Fthroughput.html?= =?UTF-8?q?.markdown,r/bedrock=5Fmodel=5Finvocation=5Flogging=5Fconfigurat?= =?UTF-8?q?ion.html.markdown,r/bedrock=5Finference=5Fprofile.html.markdown?= =?UTF-8?q?,r/bedrock=5Fguardrail=5Fversion.html.markdown,r/bedrock=5Fguar?= =?UTF-8?q?drail.html.markdown,r/bedrock=5Fcustom=5Fmodel.html.markdown,r/?= =?UTF-8?q?bcmdataexports=5Fexport.html.markdown,r/batch=5Fscheduling=5Fpo?= =?UTF-8?q?licy.html.markdown,r/batch=5Fjob=5Fqueue.html.markdown,r/batch?= =?UTF-8?q?=5Fjob=5Fdefinition.html.markdown,r/batch=5Fcompute=5Fenvironme?= =?UTF-8?q?nt.html.markdown,r/backup=5Fvault=5Fpolicy.html.markdown,r/back?= =?UTF-8?q?up=5Fvault=5Fnotifications.html.markdown,r/backup=5Fvault=5Floc?= =?UTF-8?q?k=5Fconfiguration.html.markdown,r/backup=5Fvault.html.markdown,?= =?UTF-8?q?r/backup=5Fselection.html.markdown,r/backup=5Frestore=5Ftesting?= =?UTF-8?q?=5Fselection.html.markdown,r/backup=5Frestore=5Ftesting=5Fplan.?= =?UTF-8?q?html.markdown,r/backup=5Freport=5Fplan.html.markdown,r/backup?= =?UTF-8?q?=5Fregion=5Fsettings.html.markdown,r/backup=5Fplan.html.markdow?= =?UTF-8?q?n,r/backup=5Flogically=5Fair=5Fgapped=5Fvault.html.markdown,r/b?= =?UTF-8?q?ackup=5Fglobal=5Fsettings.html.markdown,r/backup=5Fframework.ht?= =?UTF-8?q?ml.markdown,r/autoscalingplans=5Fscaling=5Fplan.html.markdown,r?= =?UTF-8?q?/autoscaling=5Ftraffic=5Fsource=5Fattachment.html.markdown,r/au?= =?UTF-8?q?toscaling=5Fschedule.html.markdown,r/autoscaling=5Fpolicy.html.?= =?UTF-8?q?markdown,r/autoscaling=5Fnotification.html.markdown,r/autoscali?= =?UTF-8?q?ng=5Flifecycle=5Fhook.html.markdown,r/autoscaling=5Fgroup=5Ftag?= =?UTF-8?q?.html.markdown,r/autoscaling=5Fgroup.html.markdown,r/autoscalin?= =?UTF-8?q?g=5Fattachment.html.markdown,r/auditmanager=5Forganization=5Fad?= =?UTF-8?q?min=5Faccount=5Fregistration.html.markdown,r/auditmanager=5Ffra?= =?UTF-8?q?mework=5Fshare.html.markdown,r/auditmanager=5Fframework.html.ma?= =?UTF-8?q?rkdown,r/auditmanager=5Fcontrol.html.markdown,r/auditmanager=5F?= =?UTF-8?q?assessment=5Freport.html.markdown,r/auditmanager=5Fassessment?= =?UTF-8?q?=5Fdelegation.html.markdown,r/auditmanager=5Fassessment.html.ma?= =?UTF-8?q?rkdown,r/auditmanager=5Faccount=5Fregistration.html.markdown,r/?= =?UTF-8?q?athena=5Fworkgroup.html.markdown,r/athena=5Fprepared=5Fstatemen?= =?UTF-8?q?t.html.markdown,r/athena=5Fnamed=5Fquery.html.markdown,r/athena?= =?UTF-8?q?=5Fdatabase.html.markdown,r/athena=5Fdata=5Fcatalog.html.markdo?= =?UTF-8?q?wn,r/athena=5Fcapacity=5Freservation.html.markdown,r/appsync=5F?= =?UTF-8?q?type.html.markdown,r/appsync=5Fsource=5Fapi=5Fassociation.html.?= =?UTF-8?q?markdown,r/appsync=5Fresolver.html.markdown,r/appsync=5Fgraphql?= =?UTF-8?q?=5Fapi.html.markdown,r/appsync=5Ffunction.html.markdown,r/appsy?= =?UTF-8?q?nc=5Fdomain=5Fname=5Fapi=5Fassociation.html.markdown,r/appsync?= =?UTF-8?q?=5Fdomain=5Fname.html.markdown,r/appsync=5Fdatasource.html.mark?= =?UTF-8?q?down,r/appsync=5Fchannel=5Fnamespace.html.markdown,r/appsync=5F?= =?UTF-8?q?api=5Fkey.html.markdown,r/appsync=5Fapi=5Fcache.html.markdown,r?= =?UTF-8?q?/appsync=5Fapi.html.markdown,r/appstream=5Fuser=5Fstack=5Fassoc?= =?UTF-8?q?iation.html.markdown,r/appstream=5Fuser.html.markdown,r/appstre?= =?UTF-8?q?am=5Fstack.html.markdown,r/appstream=5Fimage=5Fbuilder.html.mar?= =?UTF-8?q?kdown,r/appstream=5Ffleet=5Fstack=5Fassociation.html.markdown,r?= =?UTF-8?q?/appstream=5Ffleet.html.markdown,r/appstream=5Fdirectory=5Fconf?= =?UTF-8?q?ig.html.markdown,r/apprunner=5Fvpc=5Fingress=5Fconnection.html.?= =?UTF-8?q?markdown,r/apprunner=5Fvpc=5Fconnector.html.markdown,r/apprunne?= =?UTF-8?q?r=5Fservice.html.markdown,r/apprunner=5Fobservability=5Fconfigu?= =?UTF-8?q?ration.html.markdown,r/apprunner=5Fdeployment.html.markdown,r/a?= =?UTF-8?q?pprunner=5Fdefault=5Fauto=5Fscaling=5Fconfiguration=5Fversion.h?= =?UTF-8?q?tml.markdown,r/apprunner=5Fcustom=5Fdomain=5Fassociation.html.m?= =?UTF-8?q?arkdown,r/apprunner=5Fconnection.html.markdown,r/apprunner=5Fau?= =?UTF-8?q?to=5Fscaling=5Fconfiguration=5Fversion.html.markdown,r/appmesh?= =?UTF-8?q?=5Fvirtual=5Fservice.html.markdown,r/appmesh=5Fvirtual=5Frouter?= =?UTF-8?q?.html.markdown,r/appmesh=5Fvirtual=5Fnode.html.markdown,r/appme?= =?UTF-8?q?sh=5Fvirtual=5Fgateway.html.markdown,r/appmesh=5Froute.html.mar?= =?UTF-8?q?kdown,r/appmesh=5Fmesh.html.markdown,r/appmesh=5Fgateway=5Frout?= =?UTF-8?q?e.html.markdown,r/applicationinsights=5Fapplication.html.markdo?= =?UTF-8?q?wn,r/appintegrations=5Fevent=5Fintegration.html.markdown,r/appi?= =?UTF-8?q?ntegrations=5Fdata=5Fintegration.html.markdown,r/appflow=5Fflow?= =?UTF-8?q?.html.markdown,r/appflow=5Fconnector=5Fprofile.html.markdown,r/?= =?UTF-8?q?appfabric=5Fingestion=5Fdestination.html.markdown,r/appfabric?= =?UTF-8?q?=5Fingestion.html.markdown,r/appfabric=5Fapp=5Fbundle.html.mark?= =?UTF-8?q?down,r/appfabric=5Fapp=5Fauthorization=5Fconnection.html.markdo?= =?UTF-8?q?wn,r/appfabric=5Fapp=5Fauthorization.html.markdown,r/appconfig?= =?UTF-8?q?=5Fhosted=5Fconfiguration=5Fversion.html.markdown,r/appconfig?= =?UTF-8?q?=5Fextension=5Fassociation.html.markdown,r/appconfig=5Fextensio?= =?UTF-8?q?n.html.markdown,r/appconfig=5Fenvironment.html.markdown,r/appco?= =?UTF-8?q?nfig=5Fdeployment=5Fstrategy.html.markdown,r/appconfig=5Fdeploy?= =?UTF-8?q?ment.html.markdown,r/appconfig=5Fconfiguration=5Fprofile.html.m?= =?UTF-8?q?arkdown,r/appconfig=5Fapplication.html.markdown,r/appautoscalin?= =?UTF-8?q?g=5Ftarget.html.markdown,r/appautoscaling=5Fscheduled=5Faction.?= =?UTF-8?q?html.markdown,r/appautoscaling=5Fpolicy.html.markdown,r/app=5Fc?= =?UTF-8?q?ookie=5Fstickiness=5Fpolicy.html.markdown,r/apigatewayv2=5Fvpc?= =?UTF-8?q?=5Flink.html.markdown,r/apigatewayv2=5Fstage.html.markdown,r/ap?= =?UTF-8?q?igatewayv2=5Froute=5Fresponse.html.markdown,r/apigatewayv2=5Fro?= =?UTF-8?q?ute.html.markdown,r/apigatewayv2=5Fmodel.html.markdown,r/apigat?= =?UTF-8?q?ewayv2=5Fintegration=5Fresponse.html.markdown,r/apigatewayv2=5F?= =?UTF-8?q?integration.html.markdown,r/apigatewayv2=5Fdomain=5Fname.html.m?= =?UTF-8?q?arkdown,r/apigatewayv2=5Fdeployment.html.markdown,r/apigatewayv?= =?UTF-8?q?2=5Fauthorizer.html.markdown,r/apigatewayv2=5Fapi=5Fmapping.htm?= =?UTF-8?q?l.markdown,r/apigatewayv2=5Fapi.html.markdown,r/api=5Fgateway?= =?UTF-8?q?=5Fvpc=5Flink.html.markdown,r/api=5Fgateway=5Fusage=5Fplan=5Fke?= =?UTF-8?q?y.html.markdown,r/api=5Fgateway=5Fusage=5Fplan.html.markdown,r/?= =?UTF-8?q?api=5Fgateway=5Fstage.html.markdown,r/api=5Fgateway=5Frest=5Fap?= =?UTF-8?q?i=5Fput.markdown,r/api=5Fgateway=5Frest=5Fapi=5Fpolicy.html.mar?= =?UTF-8?q?kdown,r/api=5Fgateway=5Frest=5Fapi.html.markdown,r/api=5Fgatewa?= =?UTF-8?q?y=5Fresource.html.markdown,r/api=5Fgateway=5Frequest=5Fvalidato?= =?UTF-8?q?r.html.markdown,r/api=5Fgateway=5Fmodel.html.markdown,r/api=5Fg?= =?UTF-8?q?ateway=5Fmethod=5Fsettings.html.markdown,r/api=5Fgateway=5Fmeth?= =?UTF-8?q?od=5Fresponse.html.markdown,r/api=5Fgateway=5Fmethod.html.markd?= =?UTF-8?q?own,r/api=5Fgateway=5Fintegration=5Fresponse.html.markdown,r/ap?= =?UTF-8?q?i=5Fgateway=5Fintegration.html.markdown,r/api=5Fgateway=5Fgatew?= =?UTF-8?q?ay=5Fresponse.html.markdown,r/api=5Fgateway=5Fdomain=5Fname=5Fa?= =?UTF-8?q?ccess=5Fassociation.html.markdown,r/api=5Fgateway=5Fdomain=5Fna?= =?UTF-8?q?me.html.markdown,r/api=5Fgateway=5Fdocumentation=5Fversion.html?= =?UTF-8?q?.markdown,r/api=5Fgateway=5Fdocumentation=5Fpart.html.markdown,?= =?UTF-8?q?r/api=5Fgateway=5Fdeployment.html.markdown,r/api=5Fgateway=5Fcl?= =?UTF-8?q?ient=5Fcertificate.html.markdown,r/api=5Fgateway=5Fbase=5Fpath?= =?UTF-8?q?=5Fmapping.html.markdown,r/api=5Fgateway=5Fauthorizer.html.mark?= =?UTF-8?q?down,r/api=5Fgateway=5Fapi=5Fkey.html.markdown,r/api=5Fgateway?= =?UTF-8?q?=5Faccount.html.markdown,r/amplify=5Fwebhook.html.markdown,r/am?= =?UTF-8?q?plify=5Fdomain=5Fassociation.html.markdown,r/amplify=5Fbranch.h?= =?UTF-8?q?tml.markdown,r/amplify=5Fbackend=5Fenvironment.html.markdown,r/?= =?UTF-8?q?amplify=5Fapp.html.markdown,r/ami=5Flaunch=5Fpermission.html.ma?= =?UTF-8?q?rkdown,r/ami=5Ffrom=5Finstance.html.markdown,r/ami=5Fcopy.html.?= =?UTF-8?q?markdown,r/ami.html.markdown,r/acmpca=5Fpolicy.html.markdown,r/?= =?UTF-8?q?acmpca=5Fpermission.html.markdown,r/acmpca=5Fcertificate=5Fauth?= =?UTF-8?q?ority=5Fcertificate.html.markdown,r/acmpca=5Fcertificate=5Fauth?= =?UTF-8?q?ority.html.markdown,r/acmpca=5Fcertificate.html.markdown,r/acm?= =?UTF-8?q?=5Fcertificate=5Fvalidation.html.markdown,r/acm=5Fcertificate.h?= =?UTF-8?q?tml.markdown,r/account=5Fregion.markdown,r/account=5Fprimary=5F?= =?UTF-8?q?contact.html.markdown,r/account=5Falternate=5Fcontact.html.mark?= =?UTF-8?q?down,r/accessanalyzer=5Farchive=5Frule.html.markdown,r/accessan?= =?UTF-8?q?alyzer=5Fanalyzer.html.markdown,guides/version-6-upgrade.html.m?= =?UTF-8?q?arkdown,guides/version-5-upgrade.html.markdown,guides/version-4?= =?UTF-8?q?-upgrade.html.markdown,guides/version-3-upgrade.html.markdown,g?= =?UTF-8?q?uides/version-2-upgrade.html.markdown,guides/using-aws-with-aws?= =?UTF-8?q?cc-provider.html.markdown,guides/resource-tagging.html.markdown?= =?UTF-8?q?,guides/enhanced-region-support.html.markdown,guides/custom-ser?= =?UTF-8?q?vice-endpoints.html.markdown,guides/continuous-validation-examp?= =?UTF-8?q?les.html.markdown,functions/trim=5Fiam=5Frole=5Fpath.html.markd?= =?UTF-8?q?own,functions/arn=5Fparse.html.markdown,functions/arn=5Fbuild.h?= =?UTF-8?q?tml.markdown,ephemeral-resources/ssm=5Fparameter.html.markdown,?= =?UTF-8?q?ephemeral-resources/secretsmanager=5Fsecret=5Fversion.html.mark?= =?UTF-8?q?down,ephemeral-resources/secretsmanager=5Frandom=5Fpassword.htm?= =?UTF-8?q?l.markdown,ephemeral-resources/lambda=5Finvocation.html.markdow?= =?UTF-8?q?n,ephemeral-resources/kms=5Fsecrets.html.markdown,ephemeral-res?= =?UTF-8?q?ources/eks=5Fcluster=5Fauth.html.markdown,ephemeral-resources/c?= =?UTF-8?q?ognito=5Fidentity=5Fopenid=5Ftoken=5Ffor=5Fdeveloper=5Fidentity?= =?UTF-8?q?.markdown,d/workspaces=5Fworkspace.html.markdown,d/workspaces?= =?UTF-8?q?=5Fimage.html.markdown,d/workspaces=5Fdirectory.html.markdown,d?= =?UTF-8?q?/workspaces=5Fbundle.html.markdown,d/wafv2=5Fweb=5Facl.html.mar?= =?UTF-8?q?kdown,d/wafv2=5Frule=5Fgroup.html.markdown,d/wafv2=5Fregex=5Fpa?= =?UTF-8?q?ttern=5Fset.html.markdown,d/wafv2=5Fip=5Fset.html.markdown,d/wa?= =?UTF-8?q?fregional=5Fweb=5Facl.html.mar=E2=80=A6=20(#44279)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python/d/budgets_budget.html.markdown | 3 +- .../python/d/ssm_parameter.html.markdown | 25 +++- website/docs/cdktf/python/index.html.markdown | 4 +- .../python/r/acm_certificate.html.markdown | 27 +++- .../python/r/acmpca_certificate.html.markdown | 23 ++- ...acmpca_certificate_authority.html.markdown | 23 ++- .../python/r/acmpca_policy.html.markdown | 23 ++- ...main_name_access_association.html.markdown | 23 ++- .../r/appautoscaling_policy.html.markdown | 123 +++++++++++++++- .../r/appfabric_app_bundle.html.markdown | 23 ++- ...caling_configuration_version.html.markdown | 23 ++- ..._observability_configuration.html.markdown | 23 ++- .../python/r/apprunner_service.html.markdown | 23 ++- .../r/apprunner_vpc_connector.html.markdown | 23 ++- ...unner_vpc_ingress_connection.html.markdown | 23 ++- .../cdktf/python/r/appsync_api.html.markdown | 6 +- .../r/batch_compute_environment.html.markdown | 23 ++- .../r/batch_job_definition.html.markdown | 23 ++- .../python/r/batch_job_queue.html.markdown | 23 ++- .../r/bcmdataexports_export.html.markdown | 23 ++- .../r/bedrock_custom_model.html.markdown | 23 ++- .../python/r/bedrock_guardrail.html.markdown | 10 +- ...provisioned_model_throughput.html.markdown | 23 ++- .../python/r/budgets_budget.html.markdown | 3 +- .../python/r/ce_anomaly_monitor.html.markdown | 23 ++- .../r/ce_anomaly_subscription.html.markdown | 23 ++- .../python/r/ce_cost_category.html.markdown | 23 ++- ...ights_pipeline_configuration.html.markdown | 23 ++- .../r/cloudfront_distribution.html.markdown | 5 +- ...oudfront_realtime_log_config.html.markdown | 23 ++- .../cloudtrail_event_data_store.html.markdown | 23 ++- .../r/codeartifact_domain.html.markdown | 23 ++- ...ct_domain_permissions_policy.html.markdown | 23 ++- .../r/codeartifact_repository.html.markdown | 23 ++- ...epository_permissions_policy.html.markdown | 23 ++- .../python/r/codebuild_fleet.html.markdown | 23 ++- .../python/r/codebuild_project.html.markdown | 23 ++- .../r/codebuild_report_group.html.markdown | 23 ++- .../r/codebuild_resource_policy.html.markdown | 23 ++- .../codebuild_source_credential.html.markdown | 23 ++- .../python/r/codebuild_webhook.html.markdown | 20 ++- .../codeconnections_connection.html.markdown | 23 ++- .../r/codeconnections_host.html.markdown | 23 ++- .../r/codepipeline_webhook.html.markdown | 23 ++- ...destarconnections_connection.html.markdown | 23 ++- .../r/codestarconnections_host.html.markdown | 23 ++- ...ifications_notification_rule.html.markdown | 23 ++- ...mprehend_document_classifier.html.markdown | 23 ++- ...comprehend_entity_recognizer.html.markdown | 23 ++- .../r/controltower_baseline.html.markdown | 103 ++++++++++++++ .../python/r/datasync_agent.html.markdown | 23 ++- ...datasync_location_azure_blob.html.markdown | 23 ++- .../r/datasync_location_efs.html.markdown | 23 ++- .../r/datasync_location_hdfs.html.markdown | 23 ++- .../r/datasync_location_nfs.html.markdown | 23 ++- ...sync_location_object_storage.html.markdown | 23 ++- .../r/datasync_location_s3.html.markdown | 23 ++- .../r/datasync_location_smb.html.markdown | 23 ++- .../python/r/datasync_task.html.markdown | 23 ++- .../r/devicefarm_device_pool.html.markdown | 23 ++- .../devicefarm_instance_profile.html.markdown | 23 ++- .../devicefarm_network_profile.html.markdown | 23 ++- .../python/r/devicefarm_project.html.markdown | 23 ++- ...devicefarm_test_grid_project.html.markdown | 23 ++- .../python/r/devicefarm_upload.html.markdown | 23 ++- .../r/dms_replication_config.html.markdown | 23 ++- .../python/r/docdb_cluster.html.markdown | 7 +- .../r/docdbelastic_cluster.html.markdown | 25 +++- .../r/dynamodb_resource_policy.html.markdown | 23 ++- .../python/r/dynamodb_table.html.markdown | 13 +- .../r/dynamodb_table_export.html.markdown | 23 ++- .../r/ecs_capacity_provider.html.markdown | 23 ++- ...lobalaccelerator_accelerator.html.markdown | 23 ++- ...tor_cross_account_attachment.html.markdown | 23 ++- ...r_custom_routing_accelerator.html.markdown | 23 ++- ...ustom_routing_endpoint_group.html.markdown | 23 ++- ...ator_custom_routing_listener.html.markdown | 23 ++- ...alaccelerator_endpoint_group.html.markdown | 23 ++- .../globalaccelerator_listener.html.markdown | 23 ++- ...glue_catalog_table_optimizer.html.markdown | 12 +- .../python/r/glue_registry.html.markdown | 23 ++- .../cdktf/python/r/glue_schema.html.markdown | 23 ++- .../iam_openid_connect_provider.html.markdown | 23 ++- .../cdktf/python/r/iam_policy.html.markdown | 23 ++- .../python/r/iam_saml_provider.html.markdown | 23 ++- .../r/iam_service_linked_role.html.markdown | 23 ++- ...magebuilder_container_recipe.html.markdown | 23 ++- ...r_distribution_configuration.html.markdown | 23 ++- .../python/r/imagebuilder_image.html.markdown | 23 ++- .../imagebuilder_image_pipeline.html.markdown | 23 ++- .../r/imagebuilder_image_recipe.html.markdown | 23 ++- ...infrastructure_configuration.html.markdown | 23 ++- ...magebuilder_lifecycle_policy.html.markdown | 23 ++- .../r/imagebuilder_workflow.html.markdown | 23 ++- .../inspector_assessment_target.html.markdown | 23 ++- ...nspector_assessment_template.html.markdown | 23 ++- .../cdktf/python/r/ivs_channel.html.markdown | 23 ++- .../r/ivs_playback_key_pair.html.markdown | 23 ++- .../ivs_recording_configuration.html.markdown | 23 ++- ...vschat_logging_configuration.html.markdown | 23 ++- .../cdktf/python/r/ivschat_room.html.markdown | 23 ++- .../r/kinesis_resource_policy.html.markdown | 23 ++- website/docs/cdktf/python/r/lb.html.markdown | 23 ++- .../cdktf/python/r/lb_listener.html.markdown | 23 ++- .../python/r/lb_listener_rule.html.markdown | 23 ++- .../python/r/lb_target_group.html.markdown | 23 ++- .../python/r/lb_trust_store.html.markdown | 23 ++- .../networkfirewall_rule_group.html.markdown | 6 +- ...tls_inspection_configuration.html.markdown | 23 ++- ...etworkmanager_vpc_attachment.html.markdown | 31 ++++- .../r/paymentcryptography_key.html.markdown | 23 ++- .../r/quicksight_data_set.html.markdown | 11 +- .../python/r/rds_integration.html.markdown | 23 ++- .../r/resourceexplorer2_index.html.markdown | 23 ++- .../r/resourceexplorer2_view.html.markdown | 23 ++- .../python/r/scheduler_schedule.html.markdown | 5 +- .../r/secretsmanager_secret.html.markdown | 23 ++- ...secretsmanager_secret_policy.html.markdown | 23 ++- ...cretsmanager_secret_rotation.html.markdown | 23 ++- .../securityhub_automation_rule.html.markdown | 23 ++- .../r/securitylake_data_lake.html.markdown | 23 ++- .../cdktf/python/r/sns_topic.html.markdown | 23 ++- ...topic_data_protection_policy.html.markdown | 23 ++- .../python/r/sns_topic_policy.html.markdown | 23 ++- .../r/sns_topic_subscription.html.markdown | 23 ++- .../r/ssmcontacts_rotation.html.markdown | 23 ++- .../r/ssoadmin_application.html.markdown | 23 ++- ...ion_assignment_configuration.html.markdown | 23 ++- .../python/r/synthetics_canary.html.markdown | 15 +- .../cdktf/python/r/vpc_endpoint.html.markdown | 32 ++++- ...c_security_group_egress_rule.html.markdown | 28 +++- ..._security_group_ingress_rule.html.markdown | 28 +++- .../cdktf/python/r/xray_group.html.markdown | 23 ++- .../typescript/d/budgets_budget.html.markdown | 3 +- .../typescript/d/ssm_parameter.html.markdown | 28 +++- .../docs/cdktf/typescript/index.html.markdown | 4 +- .../r/acm_certificate.html.markdown | 27 +++- .../r/acmpca_certificate.html.markdown | 23 ++- ...acmpca_certificate_authority.html.markdown | 23 ++- .../typescript/r/acmpca_policy.html.markdown | 23 ++- ...main_name_access_association.html.markdown | 23 ++- .../r/appautoscaling_policy.html.markdown | 131 +++++++++++++++++- .../r/appfabric_app_bundle.html.markdown | 23 ++- ...caling_configuration_version.html.markdown | 23 ++- ..._observability_configuration.html.markdown | 23 ++- .../r/apprunner_service.html.markdown | 23 ++- .../r/apprunner_vpc_connector.html.markdown | 23 ++- ...unner_vpc_ingress_connection.html.markdown | 23 ++- .../typescript/r/appsync_api.html.markdown | 8 +- .../r/batch_compute_environment.html.markdown | 23 ++- .../r/batch_job_definition.html.markdown | 23 ++- .../r/batch_job_queue.html.markdown | 23 ++- .../r/bcmdataexports_export.html.markdown | 23 ++- .../r/bedrock_custom_model.html.markdown | 23 ++- .../r/bedrock_guardrail.html.markdown | 10 +- ...provisioned_model_throughput.html.markdown | 23 ++- .../typescript/r/budgets_budget.html.markdown | 3 +- .../r/ce_anomaly_monitor.html.markdown | 23 ++- .../r/ce_anomaly_subscription.html.markdown | 23 ++- .../r/ce_cost_category.html.markdown | 23 ++- ...ights_pipeline_configuration.html.markdown | 23 ++- .../r/cloudfront_distribution.html.markdown | 5 +- ...oudfront_realtime_log_config.html.markdown | 23 ++- .../cloudtrail_event_data_store.html.markdown | 23 ++- .../r/codeartifact_domain.html.markdown | 23 ++- ...ct_domain_permissions_policy.html.markdown | 23 ++- .../r/codeartifact_repository.html.markdown | 23 ++- ...epository_permissions_policy.html.markdown | 23 ++- .../r/codebuild_fleet.html.markdown | 23 ++- .../r/codebuild_project.html.markdown | 23 ++- .../r/codebuild_report_group.html.markdown | 23 ++- .../r/codebuild_resource_policy.html.markdown | 23 ++- .../codebuild_source_credential.html.markdown | 23 ++- .../r/codebuild_webhook.html.markdown | 20 ++- .../codeconnections_connection.html.markdown | 23 ++- .../r/codeconnections_host.html.markdown | 23 ++- .../r/codepipeline_webhook.html.markdown | 23 ++- ...destarconnections_connection.html.markdown | 23 ++- .../r/codestarconnections_host.html.markdown | 23 ++- ...ifications_notification_rule.html.markdown | 23 ++- ...mprehend_document_classifier.html.markdown | 23 ++- ...comprehend_entity_recognizer.html.markdown | 23 ++- .../r/controltower_baseline.html.markdown | 116 ++++++++++++++++ .../typescript/r/datasync_agent.html.markdown | 23 ++- ...datasync_location_azure_blob.html.markdown | 23 ++- .../r/datasync_location_efs.html.markdown | 23 ++- .../r/datasync_location_hdfs.html.markdown | 23 ++- .../r/datasync_location_nfs.html.markdown | 23 ++- ...sync_location_object_storage.html.markdown | 23 ++- .../r/datasync_location_s3.html.markdown | 23 ++- .../r/datasync_location_smb.html.markdown | 23 ++- .../typescript/r/datasync_task.html.markdown | 23 ++- .../r/devicefarm_device_pool.html.markdown | 23 ++- .../devicefarm_instance_profile.html.markdown | 23 ++- .../devicefarm_network_profile.html.markdown | 23 ++- .../r/devicefarm_project.html.markdown | 23 ++- ...devicefarm_test_grid_project.html.markdown | 23 ++- .../r/devicefarm_upload.html.markdown | 23 ++- .../r/dms_replication_config.html.markdown | 23 ++- .../typescript/r/docdb_cluster.html.markdown | 7 +- .../r/docdbelastic_cluster.html.markdown | 25 +++- .../r/dynamodb_resource_policy.html.markdown | 23 ++- .../typescript/r/dynamodb_table.html.markdown | 13 +- .../r/dynamodb_table_export.html.markdown | 23 ++- .../r/ecs_capacity_provider.html.markdown | 23 ++- ...lobalaccelerator_accelerator.html.markdown | 23 ++- ...tor_cross_account_attachment.html.markdown | 23 ++- ...r_custom_routing_accelerator.html.markdown | 23 ++- ...ustom_routing_endpoint_group.html.markdown | 23 ++- ...ator_custom_routing_listener.html.markdown | 23 ++- ...alaccelerator_endpoint_group.html.markdown | 23 ++- .../globalaccelerator_listener.html.markdown | 23 ++- ...glue_catalog_table_optimizer.html.markdown | 12 +- .../typescript/r/glue_registry.html.markdown | 23 ++- .../typescript/r/glue_schema.html.markdown | 23 ++- .../iam_openid_connect_provider.html.markdown | 23 ++- .../typescript/r/iam_policy.html.markdown | 23 ++- .../r/iam_saml_provider.html.markdown | 23 ++- .../r/iam_service_linked_role.html.markdown | 23 ++- ...magebuilder_container_recipe.html.markdown | 23 ++- ...r_distribution_configuration.html.markdown | 23 ++- .../r/imagebuilder_image.html.markdown | 23 ++- .../imagebuilder_image_pipeline.html.markdown | 23 ++- .../r/imagebuilder_image_recipe.html.markdown | 23 ++- ...infrastructure_configuration.html.markdown | 23 ++- ...magebuilder_lifecycle_policy.html.markdown | 23 ++- .../r/imagebuilder_workflow.html.markdown | 23 ++- .../inspector_assessment_target.html.markdown | 23 ++- ...nspector_assessment_template.html.markdown | 23 ++- .../typescript/r/ivs_channel.html.markdown | 23 ++- .../r/ivs_playback_key_pair.html.markdown | 23 ++- .../ivs_recording_configuration.html.markdown | 23 ++- ...vschat_logging_configuration.html.markdown | 23 ++- .../typescript/r/ivschat_room.html.markdown | 23 ++- .../r/kinesis_resource_policy.html.markdown | 23 ++- .../docs/cdktf/typescript/r/lb.html.markdown | 23 ++- .../typescript/r/lb_listener.html.markdown | 23 ++- .../r/lb_listener_rule.html.markdown | 23 ++- .../r/lb_target_group.html.markdown | 23 ++- .../typescript/r/lb_trust_store.html.markdown | 23 ++- .../networkfirewall_rule_group.html.markdown | 6 +- ...tls_inspection_configuration.html.markdown | 23 ++- ...etworkmanager_vpc_attachment.html.markdown | 34 ++++- .../r/paymentcryptography_key.html.markdown | 23 ++- .../r/quicksight_data_set.html.markdown | 11 +- .../r/rds_integration.html.markdown | 23 ++- .../r/resourceexplorer2_index.html.markdown | 23 ++- .../r/resourceexplorer2_view.html.markdown | 23 ++- .../r/scheduler_schedule.html.markdown | 5 +- .../r/secretsmanager_secret.html.markdown | 23 ++- ...secretsmanager_secret_policy.html.markdown | 23 ++- ...cretsmanager_secret_rotation.html.markdown | 23 ++- .../securityhub_automation_rule.html.markdown | 23 ++- .../r/securitylake_data_lake.html.markdown | 23 ++- .../typescript/r/sns_topic.html.markdown | 23 ++- ...topic_data_protection_policy.html.markdown | 23 ++- .../r/sns_topic_policy.html.markdown | 23 ++- .../r/sns_topic_subscription.html.markdown | 23 ++- .../r/ssmcontacts_rotation.html.markdown | 23 ++- .../r/ssoadmin_application.html.markdown | 23 ++- ...ion_assignment_configuration.html.markdown | 23 ++- .../r/synthetics_canary.html.markdown | 15 +- .../typescript/r/vpc_endpoint.html.markdown | 32 ++++- ...c_security_group_egress_rule.html.markdown | 28 +++- ..._security_group_ingress_rule.html.markdown | 28 +++- .../typescript/r/xray_group.html.markdown | 23 ++- 266 files changed, 5841 insertions(+), 332 deletions(-) create mode 100644 website/docs/cdktf/python/r/controltower_baseline.html.markdown create mode 100644 website/docs/cdktf/typescript/r/controltower_baseline.html.markdown diff --git a/website/docs/cdktf/python/d/budgets_budget.html.markdown b/website/docs/cdktf/python/d/budgets_budget.html.markdown index 18b40c5f4c48..e3df3c200845 100644 --- a/website/docs/cdktf/python/d/budgets_budget.html.markdown +++ b/website/docs/cdktf/python/d/budgets_budget.html.markdown @@ -49,6 +49,7 @@ The following arguments are optional: This data source exports the following attributes in addition to the arguments above: * `auto_adjust_data` - Object containing [AutoAdjustData] which determines the budget amount for an auto-adjusting budget. +* `billing_view_arn` - ARN of the billing view. * `budget_exceeded` - Boolean indicating whether this budget has been exceeded. * `budget_limit` - The total amount of cost, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage that you want to track with your budget. Contains object [Spend](#spend). * `budget_type` - Whether this budget tracks monetary cost or usage. @@ -147,4 +148,4 @@ Valid keys for `planned_limit` parameter. * `amount` - The cost or usage amount that's associated with a budget forecast, actual spend, or budget threshold. Length Constraints: Minimum length of `1`. Maximum length of `2147483647`. * `unit` - The unit of measurement that's used for the budget forecast, actual spend, or budget threshold, such as USD or GBP. Length Constraints: Minimum length of `1`. Maximum length of `2147483647`. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/d/ssm_parameter.html.markdown b/website/docs/cdktf/python/d/ssm_parameter.html.markdown index 53547f557994..f0a30a6d88e7 100644 --- a/website/docs/cdktf/python/d/ssm_parameter.html.markdown +++ b/website/docs/cdktf/python/d/ssm_parameter.html.markdown @@ -14,6 +14,8 @@ Provides an SSM Parameter data source. ## Example Usage +### Default + ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug from constructs import Construct @@ -31,6 +33,25 @@ class MyConvertedCode(TerraformStack): ) ``` +### With version + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.data_aws_ssm_parameter import DataAwsSsmParameter +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + DataAwsSsmParameter(self, "foo", + name="foo:3" + ) +``` + ~> **Note:** The unencrypted value of a SecureString will be stored in the raw state as plain-text. [Read more about sensitive data in state](https://www.terraform.io/docs/state/sensitive-data.html). @@ -41,7 +62,7 @@ class MyConvertedCode(TerraformStack): This data source supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `name` - (Required) Name of the parameter. +* `name` - (Required) Name of the parameter. To query by parameter version use `name:version` (e.g., `foo:3`). * `with_decryption` - (Optional) Whether to return decrypted `SecureString` value. Defaults to `true`. ## Attribute Reference @@ -55,4 +76,4 @@ This data source exports the following attributes in addition to the arguments a * `insecure_value` - Value of the parameter. **Use caution:** This value is never marked as sensitive. * `version` - Version of the parameter. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/index.html.markdown b/website/docs/cdktf/python/index.html.markdown index e70a0e08dce6..ff4b2b4a0b26 100644 --- a/website/docs/cdktf/python/index.html.markdown +++ b/website/docs/cdktf/python/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,537 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -897,4 +897,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/acm_certificate.html.markdown b/website/docs/cdktf/python/r/acm_certificate.html.markdown index 02b24f86b7f6..41144a01adca 100644 --- a/website/docs/cdktf/python/r/acm_certificate.html.markdown +++ b/website/docs/cdktf/python/r/acm_certificate.html.markdown @@ -260,6 +260,27 @@ Renewal summary objects export the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acm_certificate.example + identity = { + "arn" = "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a" + } +} + +resource "aws_acm_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) ARN of the certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import certificates using their ARN. For example: ```python @@ -274,13 +295,13 @@ from imports.aws.acm_certificate import AcmCertificate class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - AcmCertificate.generate_config_for_import(self, "cert", "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a") + AcmCertificate.generate_config_for_import(self, "example", "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a") ``` Using `terraform import`, import certificates using their ARN. For example: ```console -% terraform import aws_acm_certificate.cert arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a +% terraform import aws_acm_certificate.example arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/acmpca_certificate.html.markdown b/website/docs/cdktf/python/r/acmpca_certificate.html.markdown index 88a4fca96f15..7ce9c792450f 100644 --- a/website/docs/cdktf/python/r/acmpca_certificate.html.markdown +++ b/website/docs/cdktf/python/r/acmpca_certificate.html.markdown @@ -99,6 +99,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012/certificate/286535153982981100925020015808220737245" + } +} + +resource "aws_acmpca_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ACM PCA Certificates using their ARN. For example: ```python @@ -122,4 +143,4 @@ Using `terraform import`, import ACM PCA Certificates using their ARN. For examp % terraform import aws_acmpca_certificate.cert arn:aws:acm-pca:eu-west-1:675225743824:certificate-authority/08319ede-83g9-1400-8f21-c7d12b2b6edb/certificate/a4e9c2aa4bcfab625g1b9136464cd3a ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/acmpca_certificate_authority.html.markdown b/website/docs/cdktf/python/r/acmpca_certificate_authority.html.markdown index 31a685f13a59..8bb5a2a39915 100644 --- a/website/docs/cdktf/python/r/acmpca_certificate_authority.html.markdown +++ b/website/docs/cdktf/python/r/acmpca_certificate_authority.html.markdown @@ -210,6 +210,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate_authority.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_certificate_authority" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_certificate_authority` using the certificate authority ARN. For example: ```python @@ -233,4 +254,4 @@ Using `terraform import`, import `aws_acmpca_certificate_authority` using the ce % terraform import aws_acmpca_certificate_authority.example arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/acmpca_policy.html.markdown b/website/docs/cdktf/python/r/acmpca_policy.html.markdown index 821627cceae5..fd017e845bbb 100644 --- a/website/docs/cdktf/python/r/acmpca_policy.html.markdown +++ b/website/docs/cdktf/python/r/acmpca_policy.html.markdown @@ -82,6 +82,27 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_policy.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_policy` using the `resource_arn` value. For example: ```python @@ -105,4 +126,4 @@ Using `terraform import`, import `aws_acmpca_policy` using the `resource_arn` va % terraform import aws_acmpca_policy.example arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/api_gateway_domain_name_access_association.html.markdown b/website/docs/cdktf/python/r/api_gateway_domain_name_access_association.html.markdown index e7cfc9e195c4..1bae38a38ef0 100644 --- a/website/docs/cdktf/python/r/api_gateway_domain_name_access_association.html.markdown +++ b/website/docs/cdktf/python/r/api_gateway_domain_name_access_association.html.markdown @@ -53,6 +53,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_api_gateway_domain_name_access_association.example + identity = { + "arn" = "arn:aws:apigateway:us-east-1::/domainnames/example.com/accessassociation" + } +} + +resource "aws_api_gateway_domain_name_access_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the API Gateway domain name access association. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import API Gateway domain name acces associations using their `arn`. For example: ```python @@ -76,4 +97,4 @@ Using `terraform import`, import API Gateway domain name acces associations as u % terraform import aws_api_gateway_domain_name_access_association.example arn:aws:apigateway:us-west-2:123456789012:/domainnameaccessassociations/domainname/12qmzgp2.9m7ilski.test+hykg7a12e7/vpcesource/vpce-05de3f8f82740a748 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appautoscaling_policy.html.markdown b/website/docs/cdktf/python/r/appautoscaling_policy.html.markdown index 9f3610821c43..cd535df3162d 100644 --- a/website/docs/cdktf/python/r/appautoscaling_policy.html.markdown +++ b/website/docs/cdktf/python/r/appautoscaling_policy.html.markdown @@ -237,18 +237,133 @@ class MyConvertedCode(TerraformStack): ) ``` +### Predictive Scaling + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.appautoscaling_policy import AppautoscalingPolicy +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + AppautoscalingPolicy(self, "example", + name="example-policy", + policy_type="PredictiveScaling", + predictive_scaling_policy_configuration=AppautoscalingPolicyPredictiveScalingPolicyConfiguration( + metric_specification=[AppautoscalingPolicyPredictiveScalingPolicyConfigurationMetricSpecification( + predefined_metric_pair_specification=AppautoscalingPolicyPredictiveScalingPolicyConfigurationMetricSpecificationPredefinedMetricPairSpecification( + predefined_metric_type="ECSServiceMemoryUtilization" + ), + target_value=Token.as_string(40) + ) + ] + ), + resource_id=Token.as_string(aws_appautoscaling_target_example.resource_id), + scalable_dimension=Token.as_string(aws_appautoscaling_target_example.scalable_dimension), + service_namespace=Token.as_string(aws_appautoscaling_target_example.service_namespace) + ) +``` + ## Argument Reference This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `name` - (Required) Name of the policy. Must be between 1 and 255 characters in length. -* `policy_type` - (Optional) Policy type. Valid values are `StepScaling` and `TargetTrackingScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) and [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) documentation. +* `policy_type` - (Optional) Policy type. Valid values are `StepScaling`, `TargetTrackingScaling`, and `PredictiveScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html), [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html), and [Predictive Scaling](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-predictive-scaling.html) documentation. +* `predictive_scaling_policy_configuration` - (Optional) Predictive scaling policy configuration, requires `policy_type = "PredictiveScaling"`. See supported fields below. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `resource_id` - (Required) Resource type and unique identifier string for the resource associated with the scaling policy. Documentation can be found in the `ResourceId` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `scalable_dimension` - (Required) Scalable dimension of the scalable target. Documentation can be found in the `ScalableDimension` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `service_namespace` - (Required) AWS service namespace of the scalable target. Documentation can be found in the `ServiceNamespace` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `step_scaling_policy_configuration` - (Optional) Step scaling policy configuration, requires `policy_type = "StepScaling"` (default). See supported fields below. -* `target_tracking_scaling_policy_configuration` - (Optional) Target tracking policy, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. +* `target_tracking_scaling_policy_configuration` - (Optional) Target tracking policy configuration, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. + +### predictive_scaling_policy_configuration + +The `predictive_scaling_policy_configuration` configuration block supports the following arguments: + +* `max_capacity_breach_behavior` - (Optional) The behavior that should be applied if the forecast capacity approaches or exceeds the maximum capacity. Valid values are `HonorMaxCapacity` and `IncreaseMaxCapacity`. +* `max_capacity_buffer` - (Optional) Size of the capacity buffer to use when the forecast capacity is close to or exceeds the maximum capacity. The value is specified as a percentage relative to the forecast capacity. Required if the `max_capacity_breach_behavior` argument is set to `IncreaseMaxCapacity`, and cannot be used otherwise. +* `metric_specification` - (Required) Metrics and target utilization to use for predictive scaling. See supported fields below. +* `mode` - (Optional) Predictive scaling mode. Valid values are `ForecastOnly` and `ForecastAndScale`. +* `scheduling_buffer_time` - (Optional) Amount of time, in seconds, that the start time can be advanced. + +### predictive_scaling_policy_configuration metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` configuration block supports the following arguments: + +* `customized_capacity_metric_specification` - (Optional) Customized capacity metric specification. See supported fields below. +* `customized_load_metric_specification` - (Optional) Customized load metric specification. See supported fields below. +* `customized_scaling_metric_specification` - (Optional) Customized scaling metric specification. See supported fields below. +* `predefined_load_metric_specification` - (Optional) Predefined load metric specification. See supported fields below. +* `predefined_metric_pair_specification` - (Optional) Predefined metric pair specification that determines the appropriate scaling metric and load metric to use. See supported fields below. +* `predefined_scaling_metric_specification` - (Optional) Predefined scaling metric specification. See supported fields below. +* `target_value` - (Required) Target utilization. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification, customized_load_metric_specification and customized_scaling_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification`, `customized_load_metric_specification`, and `customized_scaling_metric_specification` configuration blocks supports the following arguments: + +* `metric_data_query` - (Required) One or more metric data queries to provide data points for a metric specification. See supported fields below. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` configuration block supports the following arguments: + +* `expression` - (Optional) Math expression to perform on the returned data, if this object is performing a math expression. +* `id` - (Required) Short name that identifies the object's results in the response. +* `label` - (Optional) Human-readable label for this metric or expression. +* `metric_stat` - (Optional) Information about the metric data to return. See supported fields below. +* `return_data` - (Optional) Whether to return the timestamps and raw data values of this metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` configuration block supports the following arguments: + +* `metric` - (Required) CloudWatch metric to return, including the metric name, namespace, and dimensions. See supported fields below. +* `stat` - (Required) Statistic to return. +* `unit` - (Optional) Unit to use for the returned data points. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` `metric` configuration block supports the following arguments: + +* `dimension` - (Optional) Dimensions of the metric. See supported fields below. +* `metric_name` - (Optional) Name of the metric. +* `namespace` - (Optional) Namespace of the metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric dimension + +The `predictive_scaling_policy_configuration` `metric_specification` `customized_capacity_metric_specification` `metric_data_query` `metric_stat` `metric` `dimension` configuration block supports the following arguments: + +* `name` - (Optional) Name of the dimension. +* `value` - (Optional) Value of the dimension. + +### predictive_scaling_policy_configuration metric_specification predefined_load_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_load_metric_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Metric type. +* `resource_label` - (Optional) Label that uniquely identifies a target group. + +### predictive_scaling_policy_configuration metric_specification predefined_metric_pair_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_metric_pair_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Which metrics to use. There are two different types of metrics for each metric type: one is a load metric and one is a scaling metric. +* `resource_label` - (Optional) Label that uniquely identifies a specific target group from which to determine the total and average request count. + +### predictive_scaling_policy_configuration metric_specification predefined_scaling_metric_specification + +The `predictive_scaling_policy_configuration` `metric_specification` `predefined_scaling_metric_specification` configuration block supports the following arguments: + +* `predefined_metric_type` - (Required) Metric type. +* `resource_label` - (Optional) Label that uniquely identifies a specific target group from which to determine the average request count. ### step_scaling_policy_configuration @@ -436,4 +551,4 @@ Using `terraform import`, import Application AutoScaling Policy using the `servi % terraform import aws_appautoscaling_policy.test-policy service-namespace/resource-id/scalable-dimension/policy-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appfabric_app_bundle.html.markdown b/website/docs/cdktf/python/r/appfabric_app_bundle.html.markdown index 72669cc967ea..ff7a1bc831e8 100644 --- a/website/docs/cdktf/python/r/appfabric_app_bundle.html.markdown +++ b/website/docs/cdktf/python/r/appfabric_app_bundle.html.markdown @@ -53,6 +53,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_appfabric_app_bundle.example + identity = { + "arn" = "arn:aws:appfabric:us-east-1:123456789012:appbundle/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_appfabric_app_bundle" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the AppFabric app bundle. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppFabric AppBundle using the `arn`. For example: ```python @@ -76,4 +97,4 @@ Using `terraform import`, import AppFabric AppBundle using the `arn`. For exampl % terraform import aws_appfabric_app_bundle.example arn:aws:appfabric:[region]:[account]:appbundle/ee5587b4-5765-4288-a202-xxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/apprunner_auto_scaling_configuration_version.html.markdown b/website/docs/cdktf/python/r/apprunner_auto_scaling_configuration_version.html.markdown index be7b0b9b8725..d257ac77a3fc 100644 --- a/website/docs/cdktf/python/r/apprunner_auto_scaling_configuration_version.html.markdown +++ b/website/docs/cdktf/python/r/apprunner_auto_scaling_configuration_version.html.markdown @@ -60,6 +60,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_auto_scaling_configuration_version.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:autoscalingconfiguration/example-auto-scaling-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_auto_scaling_configuration_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner auto scaling configuration version. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner AutoScaling Configuration Versions using the `arn`. For example: ```python @@ -83,4 +104,4 @@ Using `terraform import`, import App Runner AutoScaling Configuration Versions u % terraform import aws_apprunner_auto_scaling_configuration_version.example "arn:aws:apprunner:us-east-1:1234567890:autoscalingconfiguration/example/1/69bdfe0115224b0db49398b7beb68e0f ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/apprunner_observability_configuration.html.markdown b/website/docs/cdktf/python/r/apprunner_observability_configuration.html.markdown index bc81b8299bb1..1921c1b81314 100644 --- a/website/docs/cdktf/python/r/apprunner_observability_configuration.html.markdown +++ b/website/docs/cdktf/python/r/apprunner_observability_configuration.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_observability_configuration.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:observabilityconfiguration/example-observability-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_observability_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner observability configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Observability Configuration using the `arn`. For example: ```python @@ -87,4 +108,4 @@ Using `terraform import`, import App Runner Observability Configuration using th % terraform import aws_apprunner_observability_configuration.example arn:aws:apprunner:us-east-1:1234567890:observabilityconfiguration/example/1/d75bc7ea55b71e724fe5c23452fe22a1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/apprunner_service.html.markdown b/website/docs/cdktf/python/r/apprunner_service.html.markdown index 2ecb76c60145..52681d06d7ab 100644 --- a/website/docs/cdktf/python/r/apprunner_service.html.markdown +++ b/website/docs/cdktf/python/r/apprunner_service.html.markdown @@ -301,6 +301,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_service.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:service/example-app-service/8fe1e10304f84fd2b0df550fe98a71fa" + } +} + +resource "aws_apprunner_service" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner service. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Services using the `arn`. For example: ```python @@ -324,4 +345,4 @@ Using `terraform import`, import App Runner Services using the `arn`. For exampl % terraform import aws_apprunner_service.example arn:aws:apprunner:us-east-1:1234567890:service/example/0a03292a89764e5882c41d8f991c82fe ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/apprunner_vpc_connector.html.markdown b/website/docs/cdktf/python/r/apprunner_vpc_connector.html.markdown index c3787abc1900..bf03d95e5afc 100644 --- a/website/docs/cdktf/python/r/apprunner_vpc_connector.html.markdown +++ b/website/docs/cdktf/python/r/apprunner_vpc_connector.html.markdown @@ -54,6 +54,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_connector.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcconnector/example-vpc-connector/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_connector" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC connector. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner vpc connector using the `arn`. For example: ```python @@ -77,4 +98,4 @@ Using `terraform import`, import App Runner vpc connector using the `arn`. For e % terraform import aws_apprunner_vpc_connector.example arn:aws:apprunner:us-east-1:1234567890:vpcconnector/example/1/0a03292a89764e5882c41d8f991c82fe ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/apprunner_vpc_ingress_connection.html.markdown b/website/docs/cdktf/python/r/apprunner_vpc_ingress_connection.html.markdown index 3cb8a406aa2c..c4afa62e38a3 100644 --- a/website/docs/cdktf/python/r/apprunner_vpc_ingress_connection.html.markdown +++ b/website/docs/cdktf/python/r/apprunner_vpc_ingress_connection.html.markdown @@ -67,6 +67,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_ingress_connection.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcingressconnection/example-vpc-ingress-connection/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_ingress_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC ingress connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner VPC Ingress Connection using the `arn`. For example: ```python @@ -90,4 +111,4 @@ Using `terraform import`, import App Runner VPC Ingress Connection using the `ar % terraform import aws_apprunner_vpc_ingress_connection.example "arn:aws:apprunner:us-west-2:837424938642:vpcingressconnection/example/b379f86381d74825832c2e82080342fa" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/appsync_api.html.markdown b/website/docs/cdktf/python/r/appsync_api.html.markdown index 7c24f105ceb5..90b6e6b1fe20 100644 --- a/website/docs/cdktf/python/r/appsync_api.html.markdown +++ b/website/docs/cdktf/python/r/appsync_api.html.markdown @@ -123,7 +123,7 @@ class MyConvertedCode(TerraformStack): auth_type="AWS_LAMBDA", lambda_authorizer_config=[AppsyncApiEventConfigAuthProviderLambdaAuthorizerConfig( authorizer_result_ttl_in_seconds=300, - authorizer_uri=Token.as_string(aws_lambda_function_example.invoke_arn) + authorizer_uri=Token.as_string(aws_lambda_function_example.arn) ) ] ) @@ -173,7 +173,7 @@ The `event_config` block supports the following: The `auth_provider` block supports the following: -* `auth_type` - (Required) Type of authentication provider. Valid values: `AMAZON_COGNITO_USER_POOLS`, `AWS_LAMBDA`, `OPENID_CONNECT`, `API_KEY`. +* `auth_type` - (Required) Type of authentication provider. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. * `cognito_config` - (Optional) Configuration for Cognito user pool authentication. Required when `auth_type` is `AMAZON_COGNITO_USER_POOLS`. See [Cognito Config](#cognito-config) below. * `lambda_authorizer_config` - (Optional) Configuration for Lambda authorization. Required when `auth_type` is `AWS_LAMBDA`. See [Lambda Authorizer Config](#lambda-authorizer-config) below. * `openid_connect_config` - (Optional) Configuration for OpenID Connect. Required when `auth_type` is `OPENID_CONNECT`. See [OpenID Connect Config](#openid-connect-config) below. @@ -251,4 +251,4 @@ Using `terraform import`, import AppSync Event API using the `api_id`. For examp % terraform import aws_appsync_api.example example-api-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/batch_compute_environment.html.markdown b/website/docs/cdktf/python/r/batch_compute_environment.html.markdown index 8b071a11747d..939937b5cb89 100644 --- a/website/docs/cdktf/python/r/batch_compute_environment.html.markdown +++ b/website/docs/cdktf/python/r/batch_compute_environment.html.markdown @@ -280,6 +280,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_compute_environment.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:compute-environment/sample" + } +} + +resource "aws_batch_compute_environment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the compute environment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Batch compute using the `name`. For example: ```python @@ -307,4 +328,4 @@ Using `terraform import`, import AWS Batch compute using the `name`. For example [2]: http://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html [3]: http://docs.aws.amazon.com/batch/latest/userguide/troubleshooting.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/batch_job_definition.html.markdown b/website/docs/cdktf/python/r/batch_job_definition.html.markdown index ea89c014b5da..9dcefccab852 100644 --- a/website/docs/cdktf/python/r/batch_job_definition.html.markdown +++ b/website/docs/cdktf/python/r/batch_job_definition.html.markdown @@ -403,6 +403,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_definition.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-definition/sample:1" + } +} + +resource "aws_batch_job_definition" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job definition. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Definition using the `arn`. For example: ```python @@ -426,4 +447,4 @@ Using `terraform import`, import Batch Job Definition using the `arn`. For examp % terraform import aws_batch_job_definition.test arn:aws:batch:us-east-1:123456789012:job-definition/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/batch_job_queue.html.markdown b/website/docs/cdktf/python/r/batch_job_queue.html.markdown index dab5b5dd569f..ef91900a2924 100644 --- a/website/docs/cdktf/python/r/batch_job_queue.html.markdown +++ b/website/docs/cdktf/python/r/batch_job_queue.html.markdown @@ -131,6 +131,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_queue.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-queue/sample" + } +} + +resource "aws_batch_job_queue" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job queue. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Queue using the `arn`. For example: ```python @@ -154,4 +175,4 @@ Using `terraform import`, import Batch Job Queue using the `arn`. For example: % terraform import aws_batch_job_queue.test_queue arn:aws:batch:us-east-1:123456789012:job-queue/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown b/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown index 7e54a10d52ef..7756d7d6e399 100644 --- a/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown +++ b/website/docs/cdktf/python/r/bcmdataexports_export.html.markdown @@ -132,6 +132,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bcmdataexports_export.example + identity = { + "arn" = "arn:aws:bcm-data-exports:us-east-1:123456789012:export/example-export" + } +} + +resource "aws_bcmdataexports_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the BCM Data Exports export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import BCM Data Exports Export using the export ARN. For example: ```python @@ -155,4 +176,4 @@ Using `terraform import`, import BCM Data Exports Export using the export ARN. F % terraform import aws_bcmdataexports_export.example arn:aws:bcm-data-exports:us-east-1:123456789012:export/CostUsageReport-9f1c75f3-f982-4d9a-b936-1e7ecab814b7 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/bedrock_custom_model.html.markdown b/website/docs/cdktf/python/r/bedrock_custom_model.html.markdown index 608fe902eef3..848ab32a11f8 100644 --- a/website/docs/cdktf/python/r/bedrock_custom_model.html.markdown +++ b/website/docs/cdktf/python/r/bedrock_custom_model.html.markdown @@ -112,6 +112,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_custom_model.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:custom-model/amazon.titan-text-lite-v1:0:4k/example-model" + } +} + +resource "aws_bedrock_custom_model" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock custom model. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Bedrock Custom Model using the `job_arn`. For example: ```python @@ -135,4 +156,4 @@ Using `terraform import`, import Bedrock custom model using the `job_arn`. For e % terraform import aws_bedrock_custom_model.example arn:aws:bedrock:us-west-2:123456789012:model-customization-job/amazon.titan-text-express-v1:0:8k/1y5n57gh5y2e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/bedrock_guardrail.html.markdown b/website/docs/cdktf/python/r/bedrock_guardrail.html.markdown index e7b04b5940da..f00a808416a8 100644 --- a/website/docs/cdktf/python/r/bedrock_guardrail.html.markdown +++ b/website/docs/cdktf/python/r/bedrock_guardrail.html.markdown @@ -191,10 +191,18 @@ The `tier_config` configuration block supports the following arguments: #### Managed Word Lists Config * `type` (Required) Options for managed words. +* `input_action` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `input_enabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `output_action` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `output_enabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. #### Words Config * `text` (Required) The custom word text. +* `input_action` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `input_enabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `output_action` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `output_enabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. ## Attribute Reference @@ -239,4 +247,4 @@ Using `terraform import`, import Amazon Bedrock Guardrail using using a comma-de % terraform import aws_bedrock_guardrail.example guardrail-id-12345678,DRAFT ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/bedrock_provisioned_model_throughput.html.markdown b/website/docs/cdktf/python/r/bedrock_provisioned_model_throughput.html.markdown index 5184e9ab6935..71c288e397e0 100644 --- a/website/docs/cdktf/python/r/bedrock_provisioned_model_throughput.html.markdown +++ b/website/docs/cdktf/python/r/bedrock_provisioned_model_throughput.html.markdown @@ -60,6 +60,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_provisioned_model_throughput.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:provisioned-model/a1b2c3d4567890ab" + } +} + +resource "aws_bedrock_provisioned_model_throughput" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock provisioned model throughput. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Provisioned Throughput using the `provisioned_model_arn`. For example: ```python @@ -83,4 +104,4 @@ Using `terraform import`, import Provisioned Throughput using the `provisioned_m % terraform import aws_bedrock_provisioned_model_throughput.example arn:aws:bedrock:us-west-2:123456789012:provisioned-model/1y5n57gh5y2e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/budgets_budget.html.markdown b/website/docs/cdktf/python/r/budgets_budget.html.markdown index c76cbb94df9a..3307a89c93be 100644 --- a/website/docs/cdktf/python/r/budgets_budget.html.markdown +++ b/website/docs/cdktf/python/r/budgets_budget.html.markdown @@ -263,6 +263,7 @@ The following arguments are optional: * `account_id` - (Optional) The ID of the target account for budget. Will use current user's account_id by default if omitted. * `auto_adjust_data` - (Optional) Object containing [AutoAdjustData](#auto-adjust-data) which determines the budget amount for an auto-adjusting budget. +* `billing_view_arn` - (Optional) ARN of the billing view. * `cost_filter` - (Optional) A list of [CostFilter](#cost-filter) name/values pair to apply to budget. * `cost_types` - (Optional) Object containing [CostTypes](#cost-types) The types of cost included in a budget, such as tax and subscriptions. * `limit_amount` - (Optional) The amount of cost or usage being measured for a budget. @@ -370,4 +371,4 @@ Using `terraform import`, import budgets using `AccountID:BudgetName`. For examp % terraform import aws_budgets_budget.myBudget 123456789012:myBudget ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ce_anomaly_monitor.html.markdown b/website/docs/cdktf/python/r/ce_anomaly_monitor.html.markdown index da61524c1f6a..fa24f39cdbe3 100644 --- a/website/docs/cdktf/python/r/ce_anomaly_monitor.html.markdown +++ b/website/docs/cdktf/python/r/ce_anomaly_monitor.html.markdown @@ -90,6 +90,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_monitor.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalymonitor/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_monitor" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly monitor. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_monitor` using the `id`. For example: ```python @@ -113,4 +134,4 @@ Using `terraform import`, import `aws_ce_anomaly_monitor` using the `id`. For ex % terraform import aws_ce_anomaly_monitor.example costAnomalyMonitorARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ce_anomaly_subscription.html.markdown b/website/docs/cdktf/python/r/ce_anomaly_subscription.html.markdown index 3f47e2bfb32b..32ef38541d45 100644 --- a/website/docs/cdktf/python/r/ce_anomaly_subscription.html.markdown +++ b/website/docs/cdktf/python/r/ce_anomaly_subscription.html.markdown @@ -258,6 +258,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_subscription.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalysubscription/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_subscription` using the `id`. For example: ```python @@ -281,4 +302,4 @@ Using `terraform import`, import `aws_ce_anomaly_subscription` using the `id`. F % terraform import aws_ce_anomaly_subscription.example AnomalySubscriptionARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ce_cost_category.html.markdown b/website/docs/cdktf/python/r/ce_cost_category.html.markdown index 44cd8890c1aa..a2973e98db8b 100644 --- a/website/docs/cdktf/python/r/ce_cost_category.html.markdown +++ b/website/docs/cdktf/python/r/ce_cost_category.html.markdown @@ -138,6 +138,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_cost_category.example + identity = { + "arn" = "arn:aws:ce::123456789012:costcategory/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_cost_category" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer cost category. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_cost_category` using the id. For example: ```python @@ -161,4 +182,4 @@ Using `terraform import`, import `aws_ce_cost_category` using the id. For exampl % terraform import aws_ce_cost_category.example costCategoryARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown b/website/docs/cdktf/python/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown index 52e02c867dd4..905046bab590 100644 --- a/website/docs/cdktf/python/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown +++ b/website/docs/cdktf/python/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown @@ -407,6 +407,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_chimesdkmediapipelines_media_insights_pipeline_configuration.example + identity = { + "arn" = "arn:aws:chime:us-east-1:123456789012:media-insights-pipeline-configuration/example-config" + } +} + +resource "aws_chimesdkmediapipelines_media_insights_pipeline_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Chime SDK media insights pipeline configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Chime SDK Media Pipelines Media Insights Pipeline Configuration using the `id`. For example: ```python @@ -430,4 +451,4 @@ Using `terraform import`, import Chime SDK Media Pipelines Media Insights Pipeli % terraform import aws_chimesdkmediapipelines_media_insights_pipeline_configuration.example abcdef123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/cloudfront_distribution.html.markdown b/website/docs/cdktf/python/r/cloudfront_distribution.html.markdown index 3e41d940277a..cf15e2dcadd3 100644 --- a/website/docs/cdktf/python/r/cloudfront_distribution.html.markdown +++ b/website/docs/cdktf/python/r/cloudfront_distribution.html.markdown @@ -561,8 +561,9 @@ argument should not be specified. * `origin_id` (Required) - Unique identifier for the origin. * `origin_path` (Optional) - Optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin. * `origin_shield` - (Optional) [CloudFront Origin Shield](#origin-shield-arguments) configuration information. Using Origin Shield can help reduce the load on your origin. For more information, see [Using Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) in the Amazon CloudFront Developer Guide. +* `response_completion_timeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be integer greater than or equal to the value of `origin_read_timeout`. If omitted or explicitly set to `0`, no maximum value is enforced. * `s3_origin_config` - (Optional) [CloudFront S3 origin](#s3-origin-config-arguments) configuration information. If a custom origin is required, use `custom_origin_config` instead. -* `vpc_origin_config` - (Optional) The VPC origin configuration. +* `vpc_origin_config` - (Optional) The [VPC origin configuration](#vpc-origin-config-arguments). ##### Custom Origin Config Arguments @@ -677,4 +678,4 @@ Using `terraform import`, import CloudFront Distributions using the `id`. For ex % terraform import aws_cloudfront_distribution.distribution E74FTE3EXAMPLE ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/cloudfront_realtime_log_config.html.markdown b/website/docs/cdktf/python/r/cloudfront_realtime_log_config.html.markdown index aa01ae39fcad..92d0faa982bc 100644 --- a/website/docs/cdktf/python/r/cloudfront_realtime_log_config.html.markdown +++ b/website/docs/cdktf/python/r/cloudfront_realtime_log_config.html.markdown @@ -110,6 +110,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudfront_realtime_log_config.example + identity = { + "arn" = "arn:aws:cloudfront::123456789012:realtime-log-config/ExampleNameForRealtimeLogConfig" + } +} + +resource "aws_cloudfront_realtime_log_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudFront real-time log configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudFront real-time log configurations using the ARN. For example: ```python @@ -133,4 +154,4 @@ Using `terraform import`, import CloudFront real-time log configurations using t % terraform import aws_cloudfront_realtime_log_config.example arn:aws:cloudfront::111122223333:realtime-log-config/ExampleNameForRealtimeLogConfig ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/cloudtrail_event_data_store.html.markdown b/website/docs/cdktf/python/r/cloudtrail_event_data_store.html.markdown index f4b92569af03..2cd74ffb5476 100644 --- a/website/docs/cdktf/python/r/cloudtrail_event_data_store.html.markdown +++ b/website/docs/cdktf/python/r/cloudtrail_event_data_store.html.markdown @@ -131,6 +131,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudtrail_event_data_store.example + identity = { + "arn" = "arn:aws:cloudtrail:us-east-1:123456789012:eventdatastore/example-event-data-store-id" + } +} + +resource "aws_cloudtrail_event_data_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudTrail event data store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import event data stores using their `arn`. For example: ```python @@ -154,4 +175,4 @@ Using `terraform import`, import event data stores using their `arn`. For exampl % terraform import aws_cloudtrail_event_data_store.example arn:aws:cloudtrail:us-east-1:123456789123:eventdatastore/22333815-4414-412c-b155-dd254033gfhf ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeartifact_domain.html.markdown b/website/docs/cdktf/python/r/codeartifact_domain.html.markdown index 014b3fe12327..f51fac41e5be 100644 --- a/website/docs/cdktf/python/r/codeartifact_domain.html.markdown +++ b/website/docs/cdktf/python/r/codeartifact_domain.html.markdown @@ -55,6 +55,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain using the CodeArtifact Domain arn. For example: ```python @@ -78,4 +99,4 @@ Using `terraform import`, import CodeArtifact Domain using the CodeArtifact Doma % terraform import aws_codeartifact_domain.example arn:aws:codeartifact:us-west-2:012345678912:domain/tf-acc-test-8593714120730241305 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeartifact_domain_permissions_policy.html.markdown b/website/docs/cdktf/python/r/codeartifact_domain_permissions_policy.html.markdown index 5ed899789c61..fbe3ef2abf8d 100644 --- a/website/docs/cdktf/python/r/codeartifact_domain_permissions_policy.html.markdown +++ b/website/docs/cdktf/python/r/codeartifact_domain_permissions_policy.html.markdown @@ -79,6 +79,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain Permissions Policies using the CodeArtifact Domain ARN. For example: ```python @@ -102,4 +123,4 @@ Using `terraform import`, import CodeArtifact Domain Permissions Policies using % terraform import aws_codeartifact_domain_permissions_policy.example arn:aws:codeartifact:us-west-2:012345678912:domain/tf-acc-test-1928056699409417367 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeartifact_repository.html.markdown b/website/docs/cdktf/python/r/codeartifact_repository.html.markdown index fad616fe6424..51fd9fcd23f5 100644 --- a/website/docs/cdktf/python/r/codeartifact_repository.html.markdown +++ b/website/docs/cdktf/python/r/codeartifact_repository.html.markdown @@ -130,6 +130,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository using the CodeArtifact Repository ARN. For example: ```python @@ -153,4 +174,4 @@ Using `terraform import`, import CodeArtifact Repository using the CodeArtifact % terraform import aws_codeartifact_repository.example arn:aws:codeartifact:us-west-2:012345678912:repository/tf-acc-test-6968272603913957763/tf-acc-test-6968272603913957763 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeartifact_repository_permissions_policy.html.markdown b/website/docs/cdktf/python/r/codeartifact_repository_permissions_policy.html.markdown index 4c05b907f598..d643e82bcf87 100644 --- a/website/docs/cdktf/python/r/codeartifact_repository_permissions_policy.html.markdown +++ b/website/docs/cdktf/python/r/codeartifact_repository_permissions_policy.html.markdown @@ -90,6 +90,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository Permissions Policies using the CodeArtifact Repository ARN. For example: ```python @@ -113,4 +134,4 @@ Using `terraform import`, import CodeArtifact Repository Permissions Policies us % terraform import aws_codeartifact_repository_permissions_policy.example arn:aws:codeartifact:us-west-2:012345678912:repository/tf-acc-test-6968272603913957763/tf-acc-test-6968272603913957763 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_fleet.html.markdown b/website/docs/cdktf/python/r/codebuild_fleet.html.markdown index ada755c829ab..5eb9d4bff75a 100644 --- a/website/docs/cdktf/python/r/codebuild_fleet.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_fleet.html.markdown @@ -126,6 +126,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_fleet.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:fleet/example-fleet" + } +} + +resource "aws_codebuild_fleet" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild fleet. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Fleet using the `name` or the `arn`. For example: ```python @@ -149,4 +170,4 @@ Using `terraform import`, import CodeBuild Fleet using the `name`. For example: % terraform import aws_codebuild_fleet.name fleet-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_project.html.markdown b/website/docs/cdktf/python/r/codebuild_project.html.markdown index 0311810fe434..a8a01f96d7e2 100644 --- a/website/docs/cdktf/python/r/codebuild_project.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_project.html.markdown @@ -555,6 +555,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_project.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:project/project-name" + } +} + +resource "aws_codebuild_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Project using the `name`. For example: @@ -579,4 +600,4 @@ Using `terraform import`, import CodeBuild Project using the `name`. For example % terraform import aws_codebuild_project.name project-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_report_group.html.markdown b/website/docs/cdktf/python/r/codebuild_report_group.html.markdown index 1246dcfa6eef..56ea47acd464 100644 --- a/website/docs/cdktf/python/r/codebuild_report_group.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_report_group.html.markdown @@ -111,6 +111,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_report_group.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_report_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild report group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Report Group using the CodeBuild Report Group arn. For example: ```python @@ -134,4 +155,4 @@ Using `terraform import`, import CodeBuild Report Group using the CodeBuild Repo % terraform import aws_codebuild_report_group.example arn:aws:codebuild:us-west-2:123456789:report-group/report-group-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_resource_policy.html.markdown b/website/docs/cdktf/python/r/codebuild_resource_policy.html.markdown index 1605f3f6a18a..21fe0fe520f5 100644 --- a/website/docs/cdktf/python/r/codebuild_resource_policy.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_resource_policy.html.markdown @@ -79,6 +79,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_resource_policy.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild resource. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Resource Policy using the CodeBuild Resource Policy arn. For example: ```python @@ -102,4 +123,4 @@ Using `terraform import`, import CodeBuild Resource Policy using the CodeBuild R % terraform import aws_codebuild_resource_policy.example arn:aws:codebuild:us-west-2:123456789:report-group/report-group-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_source_credential.html.markdown b/website/docs/cdktf/python/r/codebuild_source_credential.html.markdown index cbcfa165f9fd..672dccf7b4a9 100644 --- a/website/docs/cdktf/python/r/codebuild_source_credential.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_source_credential.html.markdown @@ -105,6 +105,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_source_credential.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:token/github" + } +} + +resource "aws_codebuild_source_credential" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild source credential. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Source Credential using the CodeBuild Source Credential arn. For example: @@ -129,4 +150,4 @@ Using `terraform import`, import CodeBuild Source Credential using the CodeBuild % terraform import aws_codebuild_source_credential.example arn:aws:codebuild:us-west-2:123456789:token:github ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codebuild_webhook.html.markdown b/website/docs/cdktf/python/r/codebuild_webhook.html.markdown index 9efed3d9fad6..70cd79507e15 100644 --- a/website/docs/cdktf/python/r/codebuild_webhook.html.markdown +++ b/website/docs/cdktf/python/r/codebuild_webhook.html.markdown @@ -132,25 +132,31 @@ This resource supports the following arguments: * `build_type` - (Optional) The type of build this webhook will trigger. Valid values for this parameter are: `BUILD`, `BUILD_BATCH`. * `manual_creation` - (Optional) If true, CodeBuild doesn't create a webhook in GitHub and instead returns `payload_url` and `secret` values for the webhook. The `payload_url` and `secret` values in the output can be used to manually create a webhook within GitHub. * `branch_filter` - (Optional) A regular expression used to determine which branches get built. Default is all branches are built. We recommend using `filter_group` over `branch_filter`. -* `filter_group` - (Optional) Information about the webhook's trigger. Filter group blocks are documented below. -* `scope_configuration` - (Optional) Scope configuration for global or organization webhooks. Scope configuration blocks are documented below. +* `filter_group` - (Optional) Information about the webhook's trigger. See [filter_group](#filter_group) for details. +* `scope_configuration` - (Optional) Scope configuration for global or organization webhooks. See [scope_configuration](#scope_configuration) for details. +* `pull_request_build_policy` - (Optional) Defines comment-based approval requirements for triggering builds on pull requests. See [pull_request_build_policy](#pull_request_build_policy) for details. -`filter_group` supports the following: +### filter_group -* `filter` - (Required) A webhook filter for the group. Filter blocks are documented below. +* `filter` - (Required) A webhook filter for the group. See [filter](#filter) for details. -`filter` supports the following: +### filter * `type` - (Required) The webhook filter group's type. Valid values for this parameter are: `EVENT`, `BASE_REF`, `HEAD_REF`, `ACTOR_ACCOUNT_ID`, `FILE_PATH`, `COMMIT_MESSAGE`, `WORKFLOW_NAME`, `TAG_NAME`, `RELEASE_NAME`. At least one filter group must specify `EVENT` as its type. * `pattern` - (Required) For a filter that uses `EVENT` type, a comma-separated string that specifies one event: `PUSH`, `PULL_REQUEST_CREATED`, `PULL_REQUEST_UPDATED`, `PULL_REQUEST_REOPENED`. `PULL_REQUEST_MERGED`, `WORKFLOW_JOB_QUEUED` works with GitHub & GitHub Enterprise only. For a filter that uses any of the other filter types, a regular expression. * `exclude_matched_pattern` - (Optional) If set to `true`, the specified filter does *not* trigger a build. Defaults to `false`. -`scope_configuration` supports the following: +### scope_configuration * `name` - (Required) The name of either the enterprise or organization. * `scope` - (Required) The type of scope for a GitHub webhook. Valid values for this parameter are: `GITHUB_ORGANIZATION`, `GITHUB_GLOBAL`. * `domain` - (Optional) The domain of the GitHub Enterprise organization. Required if your project's source type is GITHUB_ENTERPRISE. +### pull_request_build_policy + +* `requires_comment_approval` - (Required) Specifies when comment-based approval is required before triggering a build on pull requests. Valid values are: `DISABLED`, `ALL_PULL_REQUESTS`, and `FORK_PULL_REQUESTS`. +* `approver_roles` - (Optional) List of repository roles that have approval privileges for pull request builds when comment approval is required. This argument must be specified only when `requires_comment_approval` is not `DISABLED`. See the [AWS documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/pull-request-build-policy.html#pull-request-build-policy.configuration) for valid values and defaults. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -187,4 +193,4 @@ Using `terraform import`, import CodeBuild Webhooks using the CodeBuild Project % terraform import aws_codebuild_webhook.example MyProjectName ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeconnections_connection.html.markdown b/website/docs/cdktf/python/r/codeconnections_connection.html.markdown index 8b9e4a3d799a..da7251c3fb4c 100644 --- a/website/docs/cdktf/python/r/codeconnections_connection.html.markdown +++ b/website/docs/cdktf/python/r/codeconnections_connection.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_connection.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codeconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections connection using the ARN. For example: ```python @@ -80,4 +101,4 @@ Using `terraform import`, import CodeConnections connection using the ARN. For e % terraform import aws_codeconnections_connection.test-connection arn:aws:codeconnections:us-west-1:0123456789:connection/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codeconnections_host.html.markdown b/website/docs/cdktf/python/r/codeconnections_host.html.markdown index 858d28953504..bdf3cb8a1183 100644 --- a/website/docs/cdktf/python/r/codeconnections_host.html.markdown +++ b/website/docs/cdktf/python/r/codeconnections_host.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_host.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codeconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections Host using the ARN. For example: ```python @@ -87,4 +108,4 @@ Using `terraform import`, import CodeConnections Host using the ARN. For example % terraform import aws_codeconnections_host.example-host arn:aws:codeconnections:us-west-1:0123456789:host/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codepipeline_webhook.html.markdown b/website/docs/cdktf/python/r/codepipeline_webhook.html.markdown index 40b753a54aae..3b86459c6baa 100644 --- a/website/docs/cdktf/python/r/codepipeline_webhook.html.markdown +++ b/website/docs/cdktf/python/r/codepipeline_webhook.html.markdown @@ -142,6 +142,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codepipeline_webhook.example + identity = { + "arn" = "arn:aws:codepipeline:us-west-2:123456789012:webhook:example-webhook" + } +} + +resource "aws_codepipeline_webhook" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodePipeline webhook. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodePipeline Webhooks using their ARN. For example: ```python @@ -165,4 +186,4 @@ Using `terraform import`, import CodePipeline Webhooks using their ARN. For exam % terraform import aws_codepipeline_webhook.example arn:aws:codepipeline:us-west-2:123456789012:webhook:example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codestarconnections_connection.html.markdown b/website/docs/cdktf/python/r/codestarconnections_connection.html.markdown index 67a7a49a24e1..b3b70ced7b30 100644 --- a/website/docs/cdktf/python/r/codestarconnections_connection.html.markdown +++ b/website/docs/cdktf/python/r/codestarconnections_connection.html.markdown @@ -105,6 +105,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_connection.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codestarconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar connections using the ARN. For example: ```python @@ -128,4 +149,4 @@ Using `terraform import`, import CodeStar connections using the ARN. For example % terraform import aws_codestarconnections_connection.test-connection arn:aws:codestar-connections:us-west-1:0123456789:connection/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codestarconnections_host.html.markdown b/website/docs/cdktf/python/r/codestarconnections_host.html.markdown index 646f9bc6ea12..caf1f7b0f40d 100644 --- a/website/docs/cdktf/python/r/codestarconnections_host.html.markdown +++ b/website/docs/cdktf/python/r/codestarconnections_host.html.markdown @@ -62,6 +62,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_host.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codestarconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar Host using the ARN. For example: ```python @@ -85,4 +106,4 @@ Using `terraform import`, import CodeStar Host using the ARN. For example: % terraform import aws_codestarconnections_host.example-host arn:aws:codestar-connections:us-west-1:0123456789:host/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/codestarnotifications_notification_rule.html.markdown b/website/docs/cdktf/python/r/codestarnotifications_notification_rule.html.markdown index ac59e5e98be6..bbd9a74030a2 100644 --- a/website/docs/cdktf/python/r/codestarnotifications_notification_rule.html.markdown +++ b/website/docs/cdktf/python/r/codestarnotifications_notification_rule.html.markdown @@ -93,6 +93,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarnotifications_notification_rule.example + identity = { + "arn" = "arn:aws:codestar-notifications:us-west-2:123456789012:notificationrule/dc82df7a-9435-44d4-a696-78f67EXAMPLE" + } +} + +resource "aws_codestarnotifications_notification_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar notification rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar notification rule using the ARN. For example: ```python @@ -116,4 +137,4 @@ Using `terraform import`, import CodeStar notification rule using the ARN. For e % terraform import aws_codestarnotifications_notification_rule.foo arn:aws:codestar-notifications:us-west-1:0123456789:notificationrule/2cdc68a3-8f7c-4893-b6a5-45b362bd4f2b ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/comprehend_document_classifier.html.markdown b/website/docs/cdktf/python/r/comprehend_document_classifier.html.markdown index 5c746ed86ea2..e9e4d131f1de 100644 --- a/website/docs/cdktf/python/r/comprehend_document_classifier.html.markdown +++ b/website/docs/cdktf/python/r/comprehend_document_classifier.html.markdown @@ -143,6 +143,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_document_classifier.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:document-classifier/example" + } +} + +resource "aws_comprehend_document_classifier" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend document classifier. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Document Classifier using the ARN. For example: ```python @@ -166,4 +187,4 @@ Using `terraform import`, import Comprehend Document Classifier using the ARN. F % terraform import aws_comprehend_document_classifier.example arn:aws:comprehend:us-west-2:123456789012:document_classifier/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/comprehend_entity_recognizer.html.markdown b/website/docs/cdktf/python/r/comprehend_entity_recognizer.html.markdown index 18469ddff654..7810032483e0 100644 --- a/website/docs/cdktf/python/r/comprehend_entity_recognizer.html.markdown +++ b/website/docs/cdktf/python/r/comprehend_entity_recognizer.html.markdown @@ -166,6 +166,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_entity_recognizer.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:entity-recognizer/example" + } +} + +resource "aws_comprehend_entity_recognizer" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend entity recognizer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Entity Recognizer using the ARN. For example: ```python @@ -189,4 +210,4 @@ Using `terraform import`, import Comprehend Entity Recognizer using the ARN. For % terraform import aws_comprehend_entity_recognizer.example arn:aws:comprehend:us-west-2:123456789012:entity-recognizer/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/controltower_baseline.html.markdown b/website/docs/cdktf/python/r/controltower_baseline.html.markdown new file mode 100644 index 000000000000..b1ea539ad75f --- /dev/null +++ b/website/docs/cdktf/python/r/controltower_baseline.html.markdown @@ -0,0 +1,103 @@ +--- +subcategory: "Control Tower" +layout: "aws" +page_title: "AWS: aws_controltower_baseline" +description: |- + Terraform resource for managing an AWS Control Tower Baseline. +--- + + + +# Resource: aws_controltower_baseline + +Terraform resource for managing an AWS Control Tower Baseline. + +## Example Usage + +### Basic Usage + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws. import ControltowerBaseline +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + ControltowerBaseline(self, "example", + baseline_identifier="arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2", + baseline_version="4.0", + parameters=[{ + "key": "IdentityCenterEnabledBaselineArn", + "value": "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC" + } + ], + target_identifier=test.arn + ) +``` + +## Argument Reference + +The following arguments are required: + +* `baseline_identifier` - (Required) The ARN of the baseline to be enabled. +* `baseline_version` - (Required) The version of the baseline to be enabled. +* `target_identifier` - (Required) The ARN of the target on which the baseline will be enabled. Only OUs are supported as targets. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `parameters` - (Optional) A list of key-value objects that specify enablement parameters, where key is a string and value is a document of any type. See [Parameter](#parameters) below for details. +* `tags` - (Optional) Tags to apply to the landing zone. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### parameters + +* `key` - (Required) The key of the parameter. +* `value` - (Required) The value of the parameter. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Baseline. +* `operaton_identifier` - The ID (in UUID format) of the asynchronous operation. +* `tags_all` - A map of tags assigned to the landing zone, including those inherited from the provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Control Tower Baseline using the `arn`. For example: + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws. import ControltowerBaseline +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + ControltowerBaseline.generate_config_for_import(self, "example", "arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC") +``` + +Using `terraform import`, import Control Tower Baseline using the `arn`. For example: + +```console +% terraform import aws_controltower_baseline.example arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_agent.html.markdown b/website/docs/cdktf/python/r/datasync_agent.html.markdown index 569be094c944..b4ceaf0d2153 100644 --- a/website/docs/cdktf/python/r/datasync_agent.html.markdown +++ b/website/docs/cdktf/python/r/datasync_agent.html.markdown @@ -107,6 +107,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_agent.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:agent/agent-12345678901234567" + } +} + +resource "aws_datasync_agent" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync agent. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_agent` using the DataSync Agent Amazon Resource Name (ARN). For example: ```python @@ -130,4 +151,4 @@ Using `terraform import`, import `aws_datasync_agent` using the DataSync Agent A % terraform import aws_datasync_agent.example arn:aws:datasync:us-east-1:123456789012:agent/agent-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_azure_blob.html.markdown b/website/docs/cdktf/python/r/datasync_location_azure_blob.html.markdown index adc5660b9259..628dfbfc5298 100644 --- a/website/docs/cdktf/python/r/datasync_location_azure_blob.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_azure_blob.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_azure_blob.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_azure_blob" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync Azure Blob location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_azure_blob` using the Amazon Resource Name (ARN). For example: ```python @@ -88,4 +109,4 @@ Using `terraform import`, import `aws_datasync_location_azure_blob` using the Am % terraform import aws_datasync_location_azure_blob.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_efs.html.markdown b/website/docs/cdktf/python/r/datasync_location_efs.html.markdown index 3709eb1dea65..2202774be80c 100644 --- a/website/docs/cdktf/python/r/datasync_location_efs.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_efs.html.markdown @@ -67,6 +67,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_efs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_efs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync EFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_efs` using the DataSync Task Amazon Resource Name (ARN). For example: ```python @@ -90,4 +111,4 @@ Using `terraform import`, import `aws_datasync_location_efs` using the DataSync % terraform import aws_datasync_location_efs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_hdfs.html.markdown b/website/docs/cdktf/python/r/datasync_location_hdfs.html.markdown index c566f6e24af3..7a445d9cf6b3 100644 --- a/website/docs/cdktf/python/r/datasync_location_hdfs.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_hdfs.html.markdown @@ -108,6 +108,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_hdfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_hdfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync HDFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_hdfs` using the Amazon Resource Name (ARN). For example: ```python @@ -131,4 +152,4 @@ Using `terraform import`, import `aws_datasync_location_hdfs` using the Amazon R % terraform import aws_datasync_location_hdfs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_nfs.html.markdown b/website/docs/cdktf/python/r/datasync_location_nfs.html.markdown index cf59c9102af5..6af32dda15dd 100644 --- a/website/docs/cdktf/python/r/datasync_location_nfs.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_nfs.html.markdown @@ -70,6 +70,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_nfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_nfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync NFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_nfs` using the DataSync Task Amazon Resource Name (ARN). For example: ```python @@ -93,4 +114,4 @@ Using `terraform import`, import `aws_datasync_location_nfs` using the DataSync % terraform import aws_datasync_location_nfs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown b/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown index 79c0f4b5a7d8..8ebda8fe8318 100644 --- a/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_object_storage.html.markdown @@ -61,6 +61,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_object_storage.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_object_storage" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync object storage location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_object_storage` using the Amazon Resource Name (ARN). For example: ```python @@ -84,4 +105,4 @@ Using `terraform import`, import `aws_datasync_location_object_storage` using th % terraform import aws_datasync_location_object_storage.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_s3.html.markdown b/website/docs/cdktf/python/r/datasync_location_s3.html.markdown index aa0bb97f0427..d61ae868c97b 100644 --- a/website/docs/cdktf/python/r/datasync_location_s3.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_s3.html.markdown @@ -90,6 +90,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_s3.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_s3" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync S3 location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_s3` using the DataSync Task Amazon Resource Name (ARN). For example: ```python @@ -113,4 +134,4 @@ Using `terraform import`, import `aws_datasync_location_s3` using the DataSync T % terraform import aws_datasync_location_s3.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_location_smb.html.markdown b/website/docs/cdktf/python/r/datasync_location_smb.html.markdown index 3fe44609c8d4..3baf2e2e7ab7 100644 --- a/website/docs/cdktf/python/r/datasync_location_smb.html.markdown +++ b/website/docs/cdktf/python/r/datasync_location_smb.html.markdown @@ -66,6 +66,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_smb.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_smb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync SMB location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_smb` using the Amazon Resource Name (ARN). For example: ```python @@ -89,4 +110,4 @@ Using `terraform import`, import `aws_datasync_location_smb` using the Amazon Re % terraform import aws_datasync_location_smb.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/datasync_task.html.markdown b/website/docs/cdktf/python/r/datasync_task.html.markdown index 565f69f6b8a3..d96c7277679f 100644 --- a/website/docs/cdktf/python/r/datasync_task.html.markdown +++ b/website/docs/cdktf/python/r/datasync_task.html.markdown @@ -217,6 +217,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_task.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:task/task-12345678901234567" + } +} + +resource "aws_datasync_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync task. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_task` using the DataSync Task Amazon Resource Name (ARN). For example: ```python @@ -240,4 +261,4 @@ Using `terraform import`, import `aws_datasync_task` using the DataSync Task Ama % terraform import aws_datasync_task.example arn:aws:datasync:us-east-1:123456789012:task/task-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_device_pool.html.markdown b/website/docs/cdktf/python/r/devicefarm_device_pool.html.markdown index 66be48524cb0..d6f4a692ca9f 100644 --- a/website/docs/cdktf/python/r/devicefarm_device_pool.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_device_pool.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_device_pool.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:devicepool:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_device_pool" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm device pool. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Device Pools using their ARN. For example: ```python @@ -88,4 +109,4 @@ Using `terraform import`, import DeviceFarm Device Pools using their ARN. For ex % terraform import aws_devicefarm_device_pool.example arn:aws:devicefarm:us-west-2:123456789012:devicepool:4fa784c7-ccb4-4dbf-ba4f-02198320daa1/4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_instance_profile.html.markdown b/website/docs/cdktf/python/r/devicefarm_instance_profile.html.markdown index 571a226a32f8..96c6c6fd584b 100644 --- a/website/docs/cdktf/python/r/devicefarm_instance_profile.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_instance_profile.html.markdown @@ -54,6 +54,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_instance_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:instanceprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_instance_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm instance profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Instance Profiles using their ARN. For example: ```python @@ -77,4 +98,4 @@ Using `terraform import`, import DeviceFarm Instance Profiles using their ARN. F % terraform import aws_devicefarm_instance_profile.example arn:aws:devicefarm:us-west-2:123456789012:instanceprofile:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_network_profile.html.markdown b/website/docs/cdktf/python/r/devicefarm_network_profile.html.markdown index 269f643f7fe3..6eeb9f48a95e 100644 --- a/website/docs/cdktf/python/r/devicefarm_network_profile.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_network_profile.html.markdown @@ -68,6 +68,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_network_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:networkprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_network_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm network profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Network Profiles using their ARN. For example: ```python @@ -91,4 +112,4 @@ Using `terraform import`, import DeviceFarm Network Profiles using their ARN. Fo % terraform import aws_devicefarm_network_profile.example arn:aws:devicefarm:us-west-2:123456789012:networkprofile:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_project.html.markdown b/website/docs/cdktf/python/r/devicefarm_project.html.markdown index b771b7237e90..51c1a7f1ea2d 100644 --- a/website/docs/cdktf/python/r/devicefarm_project.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_project.html.markdown @@ -56,6 +56,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Projects using their ARN. For example: ```python @@ -79,4 +100,4 @@ Using `terraform import`, import DeviceFarm Projects using their ARN. For exampl % terraform import aws_devicefarm_project.example arn:aws:devicefarm:us-west-2:123456789012:project:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_test_grid_project.html.markdown b/website/docs/cdktf/python/r/devicefarm_test_grid_project.html.markdown index 164546a3fbd9..af5277a7461e 100644 --- a/website/docs/cdktf/python/r/devicefarm_test_grid_project.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_test_grid_project.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_test_grid_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:testgrid-project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_test_grid_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm test grid project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Test Grid Projects using their ARN. For example: ```python @@ -87,4 +108,4 @@ Using `terraform import`, import DeviceFarm Test Grid Projects using their ARN. % terraform import aws_devicefarm_test_grid_project.example arn:aws:devicefarm:us-west-2:123456789012:testgrid-project:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/devicefarm_upload.html.markdown b/website/docs/cdktf/python/r/devicefarm_upload.html.markdown index b25f253802c1..60a80feeb434 100644 --- a/website/docs/cdktf/python/r/devicefarm_upload.html.markdown +++ b/website/docs/cdktf/python/r/devicefarm_upload.html.markdown @@ -62,6 +62,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_upload.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:upload:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_upload" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm upload. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Uploads using their ARN. For example: ```python @@ -85,4 +106,4 @@ Using `terraform import`, import DeviceFarm Uploads using their ARN. For example % terraform import aws_devicefarm_upload.example arn:aws:devicefarm:us-west-2:123456789012:upload:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dms_replication_config.html.markdown b/website/docs/cdktf/python/r/dms_replication_config.html.markdown index d882b816d636..79e7f150981a 100644 --- a/website/docs/cdktf/python/r/dms_replication_config.html.markdown +++ b/website/docs/cdktf/python/r/dms_replication_config.html.markdown @@ -97,6 +97,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dms_replication_config.example + identity = { + "arn" = "arn:aws:dms:us-east-1:123456789012:replication-config:example-config" + } +} + +resource "aws_dms_replication_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DMS replication configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import replication configs using the `arn`. For example: ```python @@ -120,4 +141,4 @@ Using `terraform import`, import a replication config using the `arn`. For examp % terraform import aws_dms_replication_config.example arn:aws:dms:us-east-1:123456789012:replication-config:UX6OL6MHMMJKFFOXE3H7LLJCMEKBDUG4ZV7DRSI ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/docdb_cluster.html.markdown b/website/docs/cdktf/python/r/docdb_cluster.html.markdown index d70d1a0a25b2..2d60f32b977d 100644 --- a/website/docs/cdktf/python/r/docdb_cluster.html.markdown +++ b/website/docs/cdktf/python/r/docdb_cluster.html.markdown @@ -59,8 +59,9 @@ This resource supports the following arguments: * `apply_immediately` - (Optional) Specifies whether any cluster modifications are applied immediately, or during the next maintenance window. Default is `false`. -* `availability_zones` - (Optional) A list of EC2 Availability Zones that - instances in the DB cluster can be created in. +* `availability_zones` - (Optional) A list of EC2 Availability Zones that instances in the DB cluster can be created in. + DocumentDB automatically assigns 3 AZs if less than 3 AZs are configured, which will show as a difference requiring resource recreation next Terraform apply. + We recommend specifying 3 AZs or using [the `lifecycle` configuration block `ignore_changes` argument](https://www.terraform.io/docs/configuration/meta-arguments/lifecycle.html#ignore_changes) if necessary. * `backup_retention_period` - (Optional) The days to retain backups for. Default `1` * `cluster_identifier_prefix` - (Optional, Forces new resource) Creates a unique cluster identifier beginning with the specified prefix. Conflicts with `cluster_identifier`. * `cluster_identifier` - (Optional, Forces new resources) The cluster identifier. If omitted, Terraform will assign a random, unique identifier. @@ -164,4 +165,4 @@ Using `terraform import`, import DocumentDB Clusters using the `cluster_identifi % terraform import aws_docdb_cluster.docdb_cluster docdb-prod-cluster ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/docdbelastic_cluster.html.markdown b/website/docs/cdktf/python/r/docdbelastic_cluster.html.markdown index 19bb687f9d7f..e78ba7b35ea5 100644 --- a/website/docs/cdktf/python/r/docdbelastic_cluster.html.markdown +++ b/website/docs/cdktf/python/r/docdbelastic_cluster.html.markdown @@ -80,7 +80,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import OpenSearchServerless Access Policy using the `name` and `type` arguments separated by a slash (`/`). For example: +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_docdbelastic_cluster.example + identity = { + "arn" = "arn:aws:docdb-elastic:us-east-1:000011112222:cluster/12345678-7abc-def0-1234-56789abcdef" + } +} + +resource "aws_docdbelastic_cluster" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DocDB Elastic cluster. + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DocDB Elastic Cluster using the `arn`. For example: ```python # DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug @@ -103,4 +124,4 @@ Using `terraform import`, import DocDB (DocumentDB) Elastic Cluster using the `a % terraform import aws_docdbelastic_cluster.example arn:aws:docdb-elastic:us-east-1:000011112222:cluster/12345678-7abc-def0-1234-56789abcdef ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dynamodb_resource_policy.html.markdown b/website/docs/cdktf/python/r/dynamodb_resource_policy.html.markdown index 4aa7b6a69da4..5e7714b3c9da 100644 --- a/website/docs/cdktf/python/r/dynamodb_resource_policy.html.markdown +++ b/website/docs/cdktf/python/r/dynamodb_resource_policy.html.markdown @@ -55,6 +55,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_resource_policy.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table" + } +} + +resource "aws_dynamodb_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB Resource Policy using the `resource_arn`. For example: ```python @@ -78,4 +99,4 @@ Using `terraform import`, import DynamoDB Resource Policy using the `resource_ar % terraform import aws_dynamodb_resource_policy.example arn:aws:dynamodb:us-east-1:1234567890:table/my-table ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dynamodb_table.html.markdown b/website/docs/cdktf/python/r/dynamodb_table.html.markdown index 75913eb8153b..5ea37bfe64fa 100644 --- a/website/docs/cdktf/python/r/dynamodb_table.html.markdown +++ b/website/docs/cdktf/python/r/dynamodb_table.html.markdown @@ -269,6 +269,7 @@ The following arguments are optional: Default value is `STANDARD`. * `tags` - (Optional) A map of tags to populate on the created table. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `ttl` - (Optional) Configuration block for TTL. See below. +* `warm_throughput` - (Optional) Sets the number of warm read and write units for the specified table. See below. * `write_capacity` - (Optional) Number of write units for this table. If the `billing_mode` is `PROVISIONED`, this field is required. ### `attribute` @@ -305,10 +306,11 @@ The following arguments are optional: * `hash_key` - (Required) Name of the hash key in the index; must be defined as an attribute in the resource. * `name` - (Required) Name of the index. * `non_key_attributes` - (Optional) Only required with `INCLUDE` as a projection type; a list of attributes to project into the index. These do not need to be defined as attributes on the table. -* `on_demand_throughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand table. See below. +* `on_demand_throughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand index. See below. * `projection_type` - (Required) One of `ALL`, `INCLUDE` or `KEYS_ONLY` where `ALL` projects every attribute into the index, `KEYS_ONLY` projects into the index only the table and index hash_key and sort_key attributes , `INCLUDE` projects into the index all of the attributes that are defined in `non_key_attributes` in addition to the attributes that that`KEYS_ONLY` project. * `range_key` - (Optional) Name of the range key; must be defined * `read_capacity` - (Optional) Number of read units for this index. Must be set if billing_mode is set to PROVISIONED. +* `warm_throughput` - (Optional) Sets the number of warm read and write units for this index. See below. * `write_capacity` - (Optional) Number of write units for this index. Must be set if billing_mode is set to PROVISIONED. ### `local_secondary_index` @@ -357,6 +359,13 @@ The following arguments are optional: * `enabled` - (Optional) Whether TTL is enabled. Default value is `false`. +### `warm_throughput` + +~> **Note:** Explicitly configuring both `read_units_per_second` and `write_units_per_second` to the default/minimum values will cause Terraform to report differences. + +* `read_units_per_second` - (Optional) Number of read operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `12000` (default). +* `write_units_per_second` - (Optional) Number of write operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `4000` (default). + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -405,4 +414,4 @@ Using `terraform import`, import DynamoDB tables using the `name`. For example: % terraform import aws_dynamodb_table.basic-dynamodb-table GameScores ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/dynamodb_table_export.html.markdown b/website/docs/cdktf/python/r/dynamodb_table_export.html.markdown index 496b5df9dc5b..b6859b1f0814 100644 --- a/website/docs/cdktf/python/r/dynamodb_table_export.html.markdown +++ b/website/docs/cdktf/python/r/dynamodb_table_export.html.markdown @@ -157,6 +157,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_table_export.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table/export/01234567890123-a1b2c3d4" + } +} + +resource "aws_dynamodb_table_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB table exports using the `arn`. For example: ```python @@ -180,4 +201,4 @@ Using `terraform import`, import DynamoDB table exports using the `arn`. For exa % terraform import aws_dynamodb_table_export.example arn:aws:dynamodb:us-west-2:12345678911:table/my-table-1/export/01580735656614-2c2f422e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ecs_capacity_provider.html.markdown b/website/docs/cdktf/python/r/ecs_capacity_provider.html.markdown index e31665c717a7..551bbc2bdf95 100644 --- a/website/docs/cdktf/python/r/ecs_capacity_provider.html.markdown +++ b/website/docs/cdktf/python/r/ecs_capacity_provider.html.markdown @@ -91,6 +91,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecs_capacity_provider.example + identity = { + "arn" = "arn:aws:ecs:us-west-2:123456789012:capacity-provider/example" + } +} + +resource "aws_ecs_capacity_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ECS capacity provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECS Capacity Providers using the `arn`. For example: ```python @@ -114,4 +135,4 @@ Using `terraform import`, import ECS Capacity Providers using the `arn`. For exa % terraform import aws_ecs_capacity_provider.example arn:aws:ecs:us-west-2:123456789012:capacity-provider/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_accelerator.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_accelerator.html.markdown index 54338a21b07b..d4d524d5809f 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_accelerator.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_accelerator.html.markdown @@ -86,6 +86,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator accelerators using the `arn`. For example: ```python @@ -109,4 +130,4 @@ Using `terraform import`, import Global Accelerator accelerators using the `arn` % terraform import aws_globalaccelerator_accelerator.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_cross_account_attachment.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_cross_account_attachment.html.markdown index c7e5d32ec89a..67da7703129b 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_cross_account_attachment.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_cross_account_attachment.html.markdown @@ -93,6 +93,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_cross_account_attachment.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:attachment/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_cross_account_attachment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator cross-account attachment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator Cross Account Attachment using the `arn`. For example: ```python @@ -116,4 +137,4 @@ Using `terraform import`, import Global Accelerator Cross Account Attachment usi % terraform import aws_globalaccelerator_cross_account_attachment.example arn:aws:globalaccelerator::012345678910:attachment/01234567-abcd-8910-efgh-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_accelerator.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_accelerator.html.markdown index 1a7c33b3dfd6..0144c0c3ff3b 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_accelerator.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_accelerator.html.markdown @@ -85,6 +85,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_custom_routing_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing accelerators using the `arn`. For example: ```python @@ -108,4 +129,4 @@ Using `terraform import`, import Global Accelerator custom routing accelerators % terraform import aws_globalaccelerator_custom_routing_accelerator.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_endpoint_group.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_endpoint_group.html.markdown index 6c2b8d59df9c..45f28decb183 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_endpoint_group.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_endpoint_group.html.markdown @@ -77,6 +77,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_custom_routing_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing endpoint groups using the `id`. For example: ```python @@ -100,4 +121,4 @@ Using `terraform import`, import Global Accelerator custom routing endpoint grou % terraform import aws_globalaccelerator_custom_routing_endpoint_group.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxx/endpoint-group/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_listener.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_listener.html.markdown index 0f183ebc38da..aeae1e86f2fa 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_custom_routing_listener.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_custom_routing_listener.html.markdown @@ -78,6 +78,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_custom_routing_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing listeners using the `id`. For example: ```python @@ -101,4 +122,4 @@ Using `terraform import`, import Global Accelerator custom routing listeners usi % terraform import aws_globalaccelerator_custom_routing_listener.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_endpoint_group.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_endpoint_group.html.markdown index bd8bb55845d2..0bf2a36f8a50 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_endpoint_group.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_endpoint_group.html.markdown @@ -82,6 +82,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator endpoint groups using the `id`. For example: ```python @@ -105,4 +126,4 @@ Using `terraform import`, import Global Accelerator endpoint groups using the `i % terraform import aws_globalaccelerator_endpoint_group.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxx/endpoint-group/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/globalaccelerator_listener.html.markdown b/website/docs/cdktf/python/r/globalaccelerator_listener.html.markdown index 3a021cc8f257..44f552118fb2 100644 --- a/website/docs/cdktf/python/r/globalaccelerator_listener.html.markdown +++ b/website/docs/cdktf/python/r/globalaccelerator_listener.html.markdown @@ -82,6 +82,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator listeners using the `id`. For example: ```python @@ -105,4 +126,4 @@ Using `terraform import`, import Global Accelerator listeners using the `id`. Fo % terraform import aws_globalaccelerator_listener.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/glue_catalog_table_optimizer.html.markdown b/website/docs/cdktf/python/r/glue_catalog_table_optimizer.html.markdown index 34bdf645c2b8..c0873fc599c1 100644 --- a/website/docs/cdktf/python/r/glue_catalog_table_optimizer.html.markdown +++ b/website/docs/cdktf/python/r/glue_catalog_table_optimizer.html.markdown @@ -133,15 +133,17 @@ This resource supports the following arguments: ### Orphan File Deletion Configuration * `iceberg_configuration` (Optional) - The configuration for an Iceberg orphan file deletion optimizer. - * `orphan_file_retention_period_in_days` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. * `location` (Optional) - Specifies a directory in which to look for files. You may choose a sub-directory rather than the top-level table location. Defaults to the table's location. - + * `orphan_file_retention_period_in_days` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. + * `run_rate_in_hours` (Optional) - interval in hours between orphan file deletion job runs. Defaults to `24`. + ### Retention Configuration * `iceberg_configuration` (Optional) - The configuration for an Iceberg snapshot retention optimizer. - * `snapshot_retention_period_in_days` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. - * `number_of_snapshots_to_retain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. * `clean_expired_files` (Optional) - If set to `false`, snapshots are only deleted from table metadata, and the underlying data and metadata files are not deleted. Defaults to `false`. + * `number_of_snapshots_to_retain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. + * `run_rate_in_hours` (Optional) - Interval in hours between retention job runs. Defaults to `24`. + * `snapshot_retention_period_in_days` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. ## Attribute Reference @@ -172,4 +174,4 @@ Using `terraform import`, import Glue Catalog Table Optimizer using the `catalog % terraform import aws_glue_catalog_table_optimizer.example 123456789012,example_database,example_table,compaction ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/glue_registry.html.markdown b/website/docs/cdktf/python/r/glue_registry.html.markdown index c85a7c1d5f61..1b8349f693ad 100644 --- a/website/docs/cdktf/python/r/glue_registry.html.markdown +++ b/website/docs/cdktf/python/r/glue_registry.html.markdown @@ -50,6 +50,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_registry.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:registry/example" + } +} + +resource "aws_glue_registry" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue registry. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```python @@ -73,4 +94,4 @@ Using `terraform import`, import Glue Registries using `arn`. For example: % terraform import aws_glue_registry.example arn:aws:glue:us-west-2:123456789012:registry/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/glue_schema.html.markdown b/website/docs/cdktf/python/r/glue_schema.html.markdown index 02d618243a82..20c21775bdcb 100644 --- a/website/docs/cdktf/python/r/glue_schema.html.markdown +++ b/website/docs/cdktf/python/r/glue_schema.html.markdown @@ -62,6 +62,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_schema.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:schema/example-registry/example-schema" + } +} + +resource "aws_glue_schema" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue schema. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```python @@ -85,4 +106,4 @@ Using `terraform import`, import Glue Registries using `arn`. For example: % terraform import aws_glue_schema.example arn:aws:glue:us-west-2:123456789012:schema/example/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/iam_openid_connect_provider.html.markdown b/website/docs/cdktf/python/r/iam_openid_connect_provider.html.markdown index dc46ce4ed898..90313535a30d 100644 --- a/website/docs/cdktf/python/r/iam_openid_connect_provider.html.markdown +++ b/website/docs/cdktf/python/r/iam_openid_connect_provider.html.markdown @@ -75,6 +75,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_openid_connect_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:oidc-provider/example.com" + } +} + +resource "aws_iam_openid_connect_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM OpenID Connect provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM OpenID Connect Providers using the `arn`. For example: ```python @@ -98,4 +119,4 @@ Using `terraform import`, import IAM OpenID Connect Providers using the `arn`. F % terraform import aws_iam_openid_connect_provider.default arn:aws:iam::123456789012:oidc-provider/accounts.google.com ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/iam_policy.html.markdown b/website/docs/cdktf/python/r/iam_policy.html.markdown index 29d5f6425783..da0d83c46d8c 100644 --- a/website/docs/cdktf/python/r/iam_policy.html.markdown +++ b/website/docs/cdktf/python/r/iam_policy.html.markdown @@ -68,6 +68,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_policy.example + identity = { + "arn" = "arn:aws:iam::123456789012:policy/UsersManageOwnCredentials" + } +} + +resource "aws_iam_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM Policies using the `arn`. For example: ```python @@ -91,4 +112,4 @@ Using `terraform import`, import IAM Policies using the `arn`. For example: % terraform import aws_iam_policy.administrator arn:aws:iam::123456789012:policy/UsersManageOwnCredentials ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/iam_saml_provider.html.markdown b/website/docs/cdktf/python/r/iam_saml_provider.html.markdown index aeec0fb6ef77..e8d7575fa71a 100644 --- a/website/docs/cdktf/python/r/iam_saml_provider.html.markdown +++ b/website/docs/cdktf/python/r/iam_saml_provider.html.markdown @@ -50,6 +50,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_saml_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:saml-provider/ExampleProvider" + } +} + +resource "aws_iam_saml_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM SAML provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM SAML Providers using the `arn`. For example: ```python @@ -73,4 +94,4 @@ Using `terraform import`, import IAM SAML Providers using the `arn`. For example % terraform import aws_iam_saml_provider.default arn:aws:iam::123456789012:saml-provider/SAMLADFS ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/iam_service_linked_role.html.markdown b/website/docs/cdktf/python/r/iam_service_linked_role.html.markdown index 6012176fbd4d..fb4b720d1a3d 100644 --- a/website/docs/cdktf/python/r/iam_service_linked_role.html.markdown +++ b/website/docs/cdktf/python/r/iam_service_linked_role.html.markdown @@ -54,6 +54,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_service_linked_role.example + identity = { + "arn" = "arn:aws:iam::123456789012:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk" + } +} + +resource "aws_iam_service_linked_role" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM service-linked role. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM service-linked roles using role ARN. For example: ```python @@ -77,4 +98,4 @@ Using `terraform import`, import IAM service-linked roles using role ARN. For ex % terraform import aws_iam_service_linked_role.elasticbeanstalk arn:aws:iam::123456789012:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_container_recipe.html.markdown b/website/docs/cdktf/python/r/imagebuilder_container_recipe.html.markdown index fea0892f221a..3acdcd8f0796 100644 --- a/website/docs/cdktf/python/r/imagebuilder_container_recipe.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_container_recipe.html.markdown @@ -140,6 +140,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_container_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:container-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_container_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder container recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_container_recipe` resources using the Amazon Resource Name (ARN). For example: ```python @@ -163,4 +184,4 @@ Using `terraform import`, import `aws_imagebuilder_container_recipe` resources u % terraform import aws_imagebuilder_container_recipe.example arn:aws:imagebuilder:us-east-1:123456789012:container-recipe/example/1.0.0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_distribution_configuration.html.markdown b/website/docs/cdktf/python/r/imagebuilder_distribution_configuration.html.markdown index 5fc16c5fa653..c110cf0c5b9f 100644 --- a/website/docs/cdktf/python/r/imagebuilder_distribution_configuration.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_distribution_configuration.html.markdown @@ -159,6 +159,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_distribution_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:distribution-configuration/example" + } +} + +resource "aws_imagebuilder_distribution_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder distribution configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_distribution_configurations` resources using the Amazon Resource Name (ARN). For example: ```python @@ -182,4 +203,4 @@ Using `terraform import`, import `aws_imagebuilder_distribution_configurations` % terraform import aws_imagebuilder_distribution_configuration.example arn:aws:imagebuilder:us-east-1:123456789012:distribution-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_image.html.markdown b/website/docs/cdktf/python/r/imagebuilder_image.html.markdown index 5ddbc5f6a261..9192a632f70d 100644 --- a/website/docs/cdktf/python/r/imagebuilder_image.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_image.html.markdown @@ -125,6 +125,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image/example/1.0.0/1" + } +} + +resource "aws_imagebuilder_image" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image` resources using the Amazon Resource Name (ARN). For example: ```python @@ -148,4 +169,4 @@ Using `terraform import`, import `aws_imagebuilder_image` resources using the Am % terraform import aws_imagebuilder_image.example arn:aws:imagebuilder:us-east-1:123456789012:image/example/1.0.0/1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_image_pipeline.html.markdown b/website/docs/cdktf/python/r/imagebuilder_image_pipeline.html.markdown index c1b2c1fe37c2..b3984591d0ee 100644 --- a/website/docs/cdktf/python/r/imagebuilder_image_pipeline.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_image_pipeline.html.markdown @@ -165,6 +165,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_pipeline.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-pipeline/example" + } +} + +resource "aws_imagebuilder_image_pipeline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image pipeline. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_pipeline` resources using the Amazon Resource Name (ARN). For example: ```python @@ -188,4 +209,4 @@ Using `terraform import`, import `aws_imagebuilder_image_pipeline` resources usi % terraform import aws_imagebuilder_image_pipeline.example arn:aws:imagebuilder:us-east-1:123456789012:image-pipeline/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_image_recipe.html.markdown b/website/docs/cdktf/python/r/imagebuilder_image_recipe.html.markdown index 16d06694f2fd..e40c0886bb58 100644 --- a/website/docs/cdktf/python/r/imagebuilder_image_recipe.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_image_recipe.html.markdown @@ -117,6 +117,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_image_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_recipe` resources using the Amazon Resource Name (ARN). For example: ```python @@ -140,4 +161,4 @@ Using `terraform import`, import `aws_imagebuilder_image_recipe` resources using % terraform import aws_imagebuilder_image_recipe.example arn:aws:imagebuilder:us-east-1:123456789012:image-recipe/example/1.0.0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/cdktf/python/r/imagebuilder_infrastructure_configuration.html.markdown index e5cb94609827..4e596792b6d2 100644 --- a/website/docs/cdktf/python/r/imagebuilder_infrastructure_configuration.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_infrastructure_configuration.html.markdown @@ -118,6 +118,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_infrastructure_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:infrastructure-configuration/example" + } +} + +resource "aws_imagebuilder_infrastructure_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder infrastructure configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_infrastructure_configuration` using the Amazon Resource Name (ARN). For example: ```python @@ -141,4 +162,4 @@ Using `terraform import`, import `aws_imagebuilder_infrastructure_configuration` % terraform import aws_imagebuilder_infrastructure_configuration.example arn:aws:imagebuilder:us-east-1:123456789012:infrastructure-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_lifecycle_policy.html.markdown b/website/docs/cdktf/python/r/imagebuilder_lifecycle_policy.html.markdown index 0120e7673e66..b8cf63c77820 100644 --- a/website/docs/cdktf/python/r/imagebuilder_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_lifecycle_policy.html.markdown @@ -201,6 +201,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_lifecycle_policy.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:lifecycle-policy/example" + } +} + +resource "aws_imagebuilder_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder lifecycle policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_lifecycle_policy` using the Amazon Resource Name (ARN). For example: ```python @@ -224,4 +245,4 @@ Using `terraform import`, import `aws_imagebuilder_lifecycle_policy` using the A % terraform import aws_imagebuilder_lifecycle_policy.example arn:aws:imagebuilder:us-east-1:123456789012:lifecycle-policy/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/imagebuilder_workflow.html.markdown b/website/docs/cdktf/python/r/imagebuilder_workflow.html.markdown index f43b2399d2f1..9f2fb0986a09 100644 --- a/website/docs/cdktf/python/r/imagebuilder_workflow.html.markdown +++ b/website/docs/cdktf/python/r/imagebuilder_workflow.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_workflow.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:workflow/build/example/1.0.0" + } +} + +resource "aws_imagebuilder_workflow" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder workflow. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import EC2 Image Builder Workflow using the `arn`. For example: ```python @@ -90,4 +111,4 @@ Using `terraform import`, import EC2 Image Builder Workflow using the `arn`. For Certain resource arguments, such as `uri`, cannot be read via the API and imported into Terraform. Terraform will display a difference for these arguments the first run after import if declared in the Terraform configuration for an imported resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/inspector_assessment_target.html.markdown b/website/docs/cdktf/python/r/inspector_assessment_target.html.markdown index d20aba91c15e..774f0f8a79f8 100644 --- a/website/docs/cdktf/python/r/inspector_assessment_target.html.markdown +++ b/website/docs/cdktf/python/r/inspector_assessment_target.html.markdown @@ -55,6 +55,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_target.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678" + } +} + +resource "aws_inspector_assessment_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment target. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Inspector Classic Assessment Targets using their Amazon Resource Name (ARN). For example: ```python @@ -78,4 +99,4 @@ Using `terraform import`, import Inspector Classic Assessment Targets using thei % terraform import aws_inspector_assessment_target.example arn:aws:inspector:us-east-1:123456789012:target/0-xxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/inspector_assessment_template.html.markdown b/website/docs/cdktf/python/r/inspector_assessment_template.html.markdown index ee9b56bcbc7a..75d5262e6ca8 100644 --- a/website/docs/cdktf/python/r/inspector_assessment_template.html.markdown +++ b/website/docs/cdktf/python/r/inspector_assessment_template.html.markdown @@ -68,6 +68,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_template.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678/template/0-87654321" + } +} + +resource "aws_inspector_assessment_template" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment template. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_inspector_assessment_template` using the template assessment ARN. For example: ```python @@ -91,4 +112,4 @@ Using `terraform import`, import `aws_inspector_assessment_template` using the t % terraform import aws_inspector_assessment_template.example arn:aws:inspector:us-west-2:123456789012:target/0-9IaAzhGR/template/0-WEcjR8CH ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ivs_channel.html.markdown b/website/docs/cdktf/python/r/ivs_channel.html.markdown index 503f8cff3fcf..7c6697a75942 100644 --- a/website/docs/cdktf/python/r/ivs_channel.html.markdown +++ b/website/docs/cdktf/python/r/ivs_channel.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_channel.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh" + } +} + +resource "aws_ivs_channel" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS channel. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Channel using the ARN. For example: ```python @@ -87,4 +108,4 @@ Using `terraform import`, import IVS (Interactive Video) Channel using the ARN. % terraform import aws_ivs_channel.example arn:aws:ivs:us-west-2:326937407773:channel/0Y1lcs4U7jk5 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ivs_playback_key_pair.html.markdown b/website/docs/cdktf/python/r/ivs_playback_key_pair.html.markdown index 972949593343..e6f28c8e2412 100644 --- a/website/docs/cdktf/python/r/ivs_playback_key_pair.html.markdown +++ b/website/docs/cdktf/python/r/ivs_playback_key_pair.html.markdown @@ -62,6 +62,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_playback_key_pair.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:playback-key/abcdABCDefgh" + } +} + +resource "aws_ivs_playback_key_pair" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS playback key pair. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Playback Key Pair using the ARN. For example: ```python @@ -85,4 +106,4 @@ Using `terraform import`, import IVS (Interactive Video) Playback Key Pair using % terraform import aws_ivs_playback_key_pair.example arn:aws:ivs:us-west-2:326937407773:playback-key/KDJRJNQhiQzA ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ivs_recording_configuration.html.markdown b/website/docs/cdktf/python/r/ivs_recording_configuration.html.markdown index 62783e55ff91..1d84abbc4752 100644 --- a/website/docs/cdktf/python/r/ivs_recording_configuration.html.markdown +++ b/website/docs/cdktf/python/r/ivs_recording_configuration.html.markdown @@ -73,6 +73,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_recording_configuration.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:recording-configuration/abcdABCDefgh" + } +} + +resource "aws_ivs_recording_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS recording configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Recording Configuration using the ARN. For example: ```python @@ -96,4 +117,4 @@ Using `terraform import`, import IVS (Interactive Video) Recording Configuration % terraform import aws_ivs_recording_configuration.example arn:aws:ivs:us-west-2:326937407773:recording-configuration/KAk1sHBl2L47 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ivschat_logging_configuration.html.markdown b/website/docs/cdktf/python/r/ivschat_logging_configuration.html.markdown index d754b09df7b4..c647dbbf1332 100644 --- a/website/docs/cdktf/python/r/ivschat_logging_configuration.html.markdown +++ b/website/docs/cdktf/python/r/ivschat_logging_configuration.html.markdown @@ -182,6 +182,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_logging_configuration.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:logging-configuration/abcdABCDefgh" + } +} + +resource "aws_ivschat_logging_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat logging configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Logging Configuration using the ARN. For example: ```python @@ -205,4 +226,4 @@ Using `terraform import`, import IVS (Interactive Video) Chat Logging Configurat % terraform import aws_ivschat_logging_configuration.example arn:aws:ivschat:us-west-2:326937407773:logging-configuration/MMUQc8wcqZmC ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ivschat_room.html.markdown b/website/docs/cdktf/python/r/ivschat_room.html.markdown index 93ef4af6e5bb..4868cb161721 100644 --- a/website/docs/cdktf/python/r/ivschat_room.html.markdown +++ b/website/docs/cdktf/python/r/ivschat_room.html.markdown @@ -117,6 +117,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_room.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:room/g1H2I3j4k5L6" + } +} + +resource "aws_ivschat_room" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat room. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Room using the ARN. For example: ```python @@ -140,4 +161,4 @@ Using `terraform import`, import IVS (Interactive Video) Chat Room using the ARN % terraform import aws_ivschat_room.example arn:aws:ivschat:us-west-2:326937407773:room/GoXEXyB4VwHb ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/kinesis_resource_policy.html.markdown b/website/docs/cdktf/python/r/kinesis_resource_policy.html.markdown index 9ca33e78aa14..d4f955e16be8 100644 --- a/website/docs/cdktf/python/r/kinesis_resource_policy.html.markdown +++ b/website/docs/cdktf/python/r/kinesis_resource_policy.html.markdown @@ -47,6 +47,27 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kinesis_resource_policy.example + identity = { + "arn" = "arn:aws:kinesis:us-east-1:123456789012:stream/example-stream" + } +} + +resource "aws_kinesis_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Kinesis stream. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Kinesis resource policies using the `resource_arn`. For example: ```python @@ -70,4 +91,4 @@ Using `terraform import`, import Kinesis resource policies using the `resource_a % terraform import aws_kinesis_resource_policy.example arn:aws:kinesis:us-west-2:123456789012:stream/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb.html.markdown b/website/docs/cdktf/python/r/lb.html.markdown index d7290adf910b..79d9549c8645 100644 --- a/website/docs/cdktf/python/r/lb.html.markdown +++ b/website/docs/cdktf/python/r/lb.html.markdown @@ -218,6 +218,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188" + } +} + +resource "aws_lb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import LBs using their ARN. For example: ```python @@ -241,4 +262,4 @@ Using `terraform import`, import LBs using their ARN. For example: % terraform import aws_lb.bar arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb_listener.html.markdown b/website/docs/cdktf/python/r/lb_listener.html.markdown index 06503762c98a..7d09482feb13 100644 --- a/website/docs/cdktf/python/r/lb_listener.html.markdown +++ b/website/docs/cdktf/python/r/lb_listener.html.markdown @@ -558,6 +558,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:187416307283:listener/app/front-end-alb/8e4497da625e2d8a/9ab28ade35828f96" + } +} + +resource "aws_lb_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import listeners using their ARN. For example: ```python @@ -581,4 +602,4 @@ Using `terraform import`, import listeners using their ARN. For example: % terraform import aws_lb_listener.front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:listener/app/front-end-alb/8e4497da625e2d8a/9ab28ade35828f96 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb_listener_rule.html.markdown b/website/docs/cdktf/python/r/lb_listener_rule.html.markdown index 362dd6fb6f92..40c0b99c02b9 100644 --- a/website/docs/cdktf/python/r/lb_listener_rule.html.markdown +++ b/website/docs/cdktf/python/r/lb_listener_rule.html.markdown @@ -328,6 +328,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener_rule.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:listener-rule/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2/9683b2d02a6cabee" + } +} + +resource "aws_lb_listener_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import rules using their ARN. For example: ```python @@ -351,4 +372,4 @@ Using `terraform import`, import rules using their ARN. For example: % terraform import aws_lb_listener_rule.front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:listener-rule/app/test/8e4497da625e2d8a/9ab28ade35828f96/67b3d2d36dd7c26b ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb_target_group.html.markdown b/website/docs/cdktf/python/r/lb_target_group.html.markdown index c2c1f700b976..5b17aee8f725 100644 --- a/website/docs/cdktf/python/r/lb_target_group.html.markdown +++ b/website/docs/cdktf/python/r/lb_target_group.html.markdown @@ -299,6 +299,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_target_group.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067" + } +} + +resource "aws_lb_target_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the target group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Target Groups using their ARN. For example: ```python @@ -322,4 +343,4 @@ Using `terraform import`, import Target Groups using their ARN. For example: % terraform import aws_lb_target_group.app_front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:targetgroup/app-front-end/20cfe21448b66314 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/lb_trust_store.html.markdown b/website/docs/cdktf/python/r/lb_trust_store.html.markdown index 0347882ecb51..e85384b71ff9 100644 --- a/website/docs/cdktf/python/r/lb_trust_store.html.markdown +++ b/website/docs/cdktf/python/r/lb_trust_store.html.markdown @@ -72,6 +72,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_trust_store.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:truststore/my-trust-store/73e2d6bc24d8a067" + } +} + +resource "aws_lb_trust_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the trust store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Trust Stores using their ARN. For example: ```python @@ -95,4 +116,4 @@ Using `terraform import`, import Target Groups using their ARN. For example: % terraform import aws_lb_trust_store.example arn:aws:elasticloadbalancing:us-west-2:187416307283:truststore/my-trust-store/20cfe21448b66314 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/networkfirewall_rule_group.html.markdown b/website/docs/cdktf/python/r/networkfirewall_rule_group.html.markdown index b052c450a7b7..f5e8117f8e47 100644 --- a/website/docs/cdktf/python/r/networkfirewall_rule_group.html.markdown +++ b/website/docs/cdktf/python/r/networkfirewall_rule_group.html.markdown @@ -614,7 +614,7 @@ The `dimension` block supports the following argument: The `destination` block supports the following argument: -* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Destination Port @@ -628,7 +628,7 @@ The `destination_port` block supports the following arguments: The `source` block supports the following argument: -* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `address_definition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Source Port @@ -685,4 +685,4 @@ Using `terraform import`, import Network Firewall Rule Groups using their `arn`. % terraform import aws_networkfirewall_rule_group.example arn:aws:network-firewall:us-west-1:123456789012:stateful-rulegroup/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/networkfirewall_tls_inspection_configuration.html.markdown b/website/docs/cdktf/python/r/networkfirewall_tls_inspection_configuration.html.markdown index 5288bba05535..c7b40805d765 100644 --- a/website/docs/cdktf/python/r/networkfirewall_tls_inspection_configuration.html.markdown +++ b/website/docs/cdktf/python/r/networkfirewall_tls_inspection_configuration.html.markdown @@ -448,6 +448,27 @@ The `certificates` block exports the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_networkfirewall_tls_inspection_configuration.example + identity = { + "arn" = "arn:aws:network-firewall:us-west-2:123456789012:tls-configuration/example" + } +} + +resource "aws_networkfirewall_tls_inspection_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Network Firewall TLS inspection configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Network Firewall TLS Inspection Configuration using the `arn`. For example: ```python @@ -471,4 +492,4 @@ Using `terraform import`, import Network Firewall TLS Inspection Configuration u % terraform import aws_networkfirewall_tls_inspection_configuration.example arn:aws:network-firewall::::tls-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/networkmanager_vpc_attachment.html.markdown b/website/docs/cdktf/python/r/networkmanager_vpc_attachment.html.markdown index 4c1fd6dbb3dc..fbabc261356c 100644 --- a/website/docs/cdktf/python/r/networkmanager_vpc_attachment.html.markdown +++ b/website/docs/cdktf/python/r/networkmanager_vpc_attachment.html.markdown @@ -35,6 +35,33 @@ class MyConvertedCode(TerraformStack): ) ``` +### Usage with Options + +```python +# DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +from constructs import Construct +from cdktf import Token, TerraformStack +# +# Provider bindings are generated by running `cdktf get`. +# See https://cdk.tf/provider-generation for more details. +# +from imports.aws.networkmanager_vpc_attachment import NetworkmanagerVpcAttachment +class MyConvertedCode(TerraformStack): + def __init__(self, scope, name): + super().__init__(scope, name) + NetworkmanagerVpcAttachment(self, "example", + core_network_id=Token.as_string(awscc_networkmanager_core_network_example.id), + options=NetworkmanagerVpcAttachmentOptions( + appliance_mode_support=False, + dns_support=True, + ipv6_support=False, + security_group_referencing_support=True + ), + subnet_arns=[Token.as_string(aws_subnet_example.arn)], + vpc_arn=Token.as_string(aws_vpc_example.arn) + ) +``` + ## Argument Reference The following arguments are required: @@ -51,7 +78,9 @@ The following arguments are optional: ### options * `appliance_mode_support` - (Optional) Whether to enable appliance mode support. If enabled, traffic flow between a source and destination use the same Availability Zone for the VPC attachment for the lifetime of that flow. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `dns_support` - (Optional) Whether to enable DNS support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. * `ipv6_support` - (Optional) Whether to enable IPv6 support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `security_group_referencing_support` - (Optional) Whether to enable security group referencing support for this VPC attachment. The default is `true`. However, at the core network policy-level the default is set to `false`. If the VPC attachment is pending acceptance, changing this value will recreate the resource. ## Attribute Reference @@ -102,4 +131,4 @@ Using `terraform import`, import `aws_networkmanager_vpc_attachment` using the a % terraform import aws_networkmanager_vpc_attachment.example attachment-0f8fa60d2238d1bd8 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/paymentcryptography_key.html.markdown b/website/docs/cdktf/python/r/paymentcryptography_key.html.markdown index 2ffe096ca303..8739cc0be060 100644 --- a/website/docs/cdktf/python/r/paymentcryptography_key.html.markdown +++ b/website/docs/cdktf/python/r/paymentcryptography_key.html.markdown @@ -103,6 +103,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_paymentcryptography_key.example + identity = { + "arn" = "arn:aws:payment-cryptography:us-east-1:123456789012:key/1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_paymentcryptography_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Payment Cryptography key. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Payment Cryptography Control Plane Key using the `arn:aws:payment-cryptography:us-east-1:123456789012:key/qtbojf64yshyvyzf`. For example: ```python @@ -126,4 +147,4 @@ Using `terraform import`, import Payment Cryptography Control Plane Key using th % terraform import aws_paymentcryptography_key.example arn:aws:payment-cryptography:us-east-1:123456789012:key/qtbojf64yshyvyzf ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/quicksight_data_set.html.markdown b/website/docs/cdktf/python/r/quicksight_data_set.html.markdown index 4e7b255e6772..142119c2749f 100644 --- a/website/docs/cdktf/python/r/quicksight_data_set.html.markdown +++ b/website/docs/cdktf/python/r/quicksight_data_set.html.markdown @@ -456,8 +456,17 @@ This resource exports the following attributes in addition to the arguments abov * `arn` - Amazon Resource Name (ARN) of the data set. * `id` - A comma-delimited string joining AWS account ID and data set ID. +* `output_columns` - The final set of columns available for use in analyses and dashboards after all data preparation and transformation steps have been applied within the data set. See [`output_columns` Block](#output_columns-block) below. * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +### `output_columns` Block + +The `output_columns` block has the following attributes. + +* `name` - The name of the column. +* `description` - The description of the column. +* `type` - The data type of the column. + ## Import In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Data Set using the AWS account ID and data set ID separated by a comma (`,`). For example: @@ -483,4 +492,4 @@ Using `terraform import`, import a QuickSight Data Set using the AWS account ID % terraform import aws_quicksight_data_set.example 123456789012,example-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/rds_integration.html.markdown b/website/docs/cdktf/python/r/rds_integration.html.markdown index 312d9393faac..4f2169f70f50 100644 --- a/website/docs/cdktf/python/r/rds_integration.html.markdown +++ b/website/docs/cdktf/python/r/rds_integration.html.markdown @@ -160,6 +160,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_rds_integration.example + identity = { + "arn" = "arn:aws:rds:us-east-1:123456789012:integration:12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_rds_integration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the RDS integration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import RDS (Relational Database) Integration using the `arn`. For example: ```python @@ -183,4 +204,4 @@ Using `terraform import`, import RDS (Relational Database) Integration using the % terraform import aws_rds_integration.example arn:aws:rds:us-west-2:123456789012:integration:abcdefgh-0000-1111-2222-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/resourceexplorer2_index.html.markdown b/website/docs/cdktf/python/r/resourceexplorer2_index.html.markdown index a5f2c0e8d50a..4856bdfbf04e 100644 --- a/website/docs/cdktf/python/r/resourceexplorer2_index.html.markdown +++ b/website/docs/cdktf/python/r/resourceexplorer2_index.html.markdown @@ -56,6 +56,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_index.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:index/example-index-id" + } +} + +resource "aws_resourceexplorer2_index" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer index. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer indexes using the `arn`. For example: ```python @@ -79,4 +100,4 @@ Using `terraform import`, import Resource Explorer indexes using the `arn`. For % terraform import aws_resourceexplorer2_index.example arn:aws:resource-explorer-2:us-east-1:123456789012:index/6047ac4e-207e-4487-9bcf-cb53bb0ff5cc ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/resourceexplorer2_view.html.markdown b/website/docs/cdktf/python/r/resourceexplorer2_view.html.markdown index 00636e897a43..a435a4aa1be1 100644 --- a/website/docs/cdktf/python/r/resourceexplorer2_view.html.markdown +++ b/website/docs/cdktf/python/r/resourceexplorer2_view.html.markdown @@ -79,6 +79,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_view.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:view/example-view/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_resourceexplorer2_view" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer view. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer views using the `arn`. For example: ```python @@ -102,4 +123,4 @@ Using `terraform import`, import Resource Explorer views using the `arn`. For ex % terraform import aws_resourceexplorer2_view.example arn:aws:resource-explorer-2:us-west-2:123456789012:view/exampleview/e0914f6c-6c27-4b47-b5d4-6b28381a2421 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/scheduler_schedule.html.markdown b/website/docs/cdktf/python/r/scheduler_schedule.html.markdown index 686f98af1556..fca0d80c9ed7 100644 --- a/website/docs/cdktf/python/r/scheduler_schedule.html.markdown +++ b/website/docs/cdktf/python/r/scheduler_schedule.html.markdown @@ -92,13 +92,14 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `action_after_completion` - (Optional) Action that applies to the schedule after completing invocation of the target. Valid values are `NONE` and `DELETE`. Defaults to `NONE`. * `description` - (Optional) Brief description of the schedule. * `end_date` - (Optional) The date, in UTC, before which the schedule can invoke its target. Depending on the schedule's recurrence expression, invocations might stop on, or before, the end date you specify. EventBridge Scheduler ignores the end date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `group_name` - (Optional, Forces new resource) Name of the schedule group to associate with this schedule. When omitted, the `default` schedule group is used. * `kms_key_arn` - (Optional) ARN for the customer managed KMS key that EventBridge Scheduler will use to encrypt and decrypt your data. * `name` - (Optional, Forces new resource) Name of the schedule. If omitted, Terraform will assign a random, unique name. Conflicts with `name_prefix`. * `name_prefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `schedule_expression_timezone` - (Optional) Timezone in which the scheduling expression is evaluated. Defaults to `UTC`. Example: `Australia/Sydney`. * `start_date` - (Optional) The date, in UTC, after which the schedule can begin invoking its target. Depending on the schedule's recurrence expression, invocations might occur on, or after, the start date you specify. EventBridge Scheduler ignores the start date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `state` - (Optional) Specifies whether the schedule is enabled or disabled. One of: `ENABLED` (default), `DISABLED`. @@ -235,4 +236,4 @@ Using `terraform import`, import schedules using the combination `group_name/nam % terraform import aws_scheduler_schedule.example my-schedule-group/my-schedule ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/secretsmanager_secret.html.markdown b/website/docs/cdktf/python/r/secretsmanager_secret.html.markdown index 1c8a37cfd694..bd82a0076988 100644 --- a/website/docs/cdktf/python/r/secretsmanager_secret.html.markdown +++ b/website/docs/cdktf/python/r/secretsmanager_secret.html.markdown @@ -70,6 +70,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret` using the secret Amazon Resource Name (ARN). For example: ```python @@ -93,4 +114,4 @@ Using `terraform import`, import `aws_secretsmanager_secret` using the secret Am % terraform import aws_secretsmanager_secret.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/secretsmanager_secret_policy.html.markdown b/website/docs/cdktf/python/r/secretsmanager_secret_policy.html.markdown index 835b76cddf27..12e53bb8a2ac 100644 --- a/website/docs/cdktf/python/r/secretsmanager_secret_policy.html.markdown +++ b/website/docs/cdktf/python/r/secretsmanager_secret_policy.html.markdown @@ -77,6 +77,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_policy.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_policy` using the secret Amazon Resource Name (ARN). For example: ```python @@ -100,4 +121,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_policy` using the se % terraform import aws_secretsmanager_secret_policy.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/secretsmanager_secret_rotation.html.markdown b/website/docs/cdktf/python/r/secretsmanager_secret_rotation.html.markdown index 1311c34b9577..8e53dae86c79 100644 --- a/website/docs/cdktf/python/r/secretsmanager_secret_rotation.html.markdown +++ b/website/docs/cdktf/python/r/secretsmanager_secret_rotation.html.markdown @@ -71,6 +71,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_rotation.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_rotation` using the secret Amazon Resource Name (ARN). For example: ```python @@ -94,4 +115,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_rotation` using the % terraform import aws_secretsmanager_secret_rotation.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/securityhub_automation_rule.html.markdown b/website/docs/cdktf/python/r/securityhub_automation_rule.html.markdown index 401bb04a92e9..1cbf9dd9b1f5 100644 --- a/website/docs/cdktf/python/r/securityhub_automation_rule.html.markdown +++ b/website/docs/cdktf/python/r/securityhub_automation_rule.html.markdown @@ -218,6 +218,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securityhub_automation_rule.example + identity = { + "arn" = "arn:aws:securityhub:us-east-1:123456789012:automation-rule/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_securityhub_automation_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Hub automation rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub Automation Rule using their ARN. For example: ```python @@ -241,4 +262,4 @@ Using `terraform import`, import Security Hub automation rule using their ARN. F % terraform import aws_securityhub_automation_rule.example arn:aws:securityhub:us-west-2:123456789012:automation-rule/473eddde-f5c4-4ae5-85c7-e922f271fffc ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/securitylake_data_lake.html.markdown b/website/docs/cdktf/python/r/securitylake_data_lake.html.markdown index 1e9ac3d7808a..74464e3aaa63 100644 --- a/website/docs/cdktf/python/r/securitylake_data_lake.html.markdown +++ b/website/docs/cdktf/python/r/securitylake_data_lake.html.markdown @@ -140,6 +140,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securitylake_data_lake.example + identity = { + "arn" = "arn:aws:securitylake:us-east-1:123456789012:data-lake/default" + } +} + +resource "aws_securitylake_data_lake" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Lake data lake. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub standards subscriptions using the standards subscription ARN. For example: ```python @@ -163,4 +184,4 @@ Using `terraform import`, import Security Hub standards subscriptions using the % terraform import aws_securitylake_data_lake.example arn:aws:securitylake:eu-west-1:123456789012:data-lake/default ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sns_topic.html.markdown b/website/docs/cdktf/python/r/sns_topic.html.markdown index 42525a232980..3ddcc16970ab 100644 --- a/website/docs/cdktf/python/r/sns_topic.html.markdown +++ b/website/docs/cdktf/python/r/sns_topic.html.markdown @@ -142,6 +142,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topics using the topic `arn`. For example: ```python @@ -165,4 +186,4 @@ Using `terraform import`, import SNS Topics using the topic `arn`. For example: % terraform import aws_sns_topic.user_updates arn:aws:sns:us-west-2:123456789012:my-topic ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sns_topic_data_protection_policy.html.markdown b/website/docs/cdktf/python/r/sns_topic_data_protection_policy.html.markdown index a782577f2aae..ee53ad2ad2a1 100644 --- a/website/docs/cdktf/python/r/sns_topic_data_protection_policy.html.markdown +++ b/website/docs/cdktf/python/r/sns_topic_data_protection_policy.html.markdown @@ -69,6 +69,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_data_protection_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:example" + } +} + +resource "aws_sns_topic_data_protection_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Data Protection Topic Policy using the topic ARN. For example: ```python @@ -92,4 +113,4 @@ Using `terraform import`, import SNS Data Protection Topic Policy using the topi % terraform import aws_sns_topic_data_protection_policy.example arn:aws:sns:us-west-2:123456789012:example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sns_topic_policy.html.markdown b/website/docs/cdktf/python/r/sns_topic_policy.html.markdown index c1767d7fa7c7..697f2702b182 100644 --- a/website/docs/cdktf/python/r/sns_topic_policy.html.markdown +++ b/website/docs/cdktf/python/r/sns_topic_policy.html.markdown @@ -77,6 +77,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Policy using the topic ARN. For example: ```python @@ -100,4 +121,4 @@ Using `terraform import`, import SNS Topic Policy using the topic ARN. For examp % terraform import aws_sns_topic_policy.user_updates arn:aws:sns:us-west-2:123456789012:my-topic ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/sns_topic_subscription.html.markdown b/website/docs/cdktf/python/r/sns_topic_subscription.html.markdown index b5545f287cd4..7a884417f764 100644 --- a/website/docs/cdktf/python/r/sns_topic_subscription.html.markdown +++ b/website/docs/cdktf/python/r/sns_topic_subscription.html.markdown @@ -338,6 +338,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_subscription.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic:8a21d249-4329-4871-acc6-7be709c6ea7f" + } +} + +resource "aws_sns_topic_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Subscriptions using the subscription `arn`. For example: ```python @@ -361,4 +382,4 @@ Using `terraform import`, import SNS Topic Subscriptions using the subscription % terraform import aws_sns_topic_subscription.user_updates_sqs_target arn:aws:sns:us-west-2:123456789012:my-topic:8a21d249-4329-4871-acc6-7be709c6ea7f ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssmcontacts_rotation.html.markdown b/website/docs/cdktf/python/r/ssmcontacts_rotation.html.markdown index 4229669f7798..bfc3ee781497 100644 --- a/website/docs/cdktf/python/r/ssmcontacts_rotation.html.markdown +++ b/website/docs/cdktf/python/r/ssmcontacts_rotation.html.markdown @@ -219,6 +219,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssmcontacts_rotation.example + identity = { + "arn" = "arn:aws:ssm-contacts:us-east-1:123456789012:rotation/example-rotation" + } +} + +resource "aws_ssmcontacts_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSM Contacts rotation. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSMContacts Rotation using the `arn`. For example: ```python @@ -242,4 +263,4 @@ Using `terraform import`, import CodeGuru Profiler Profiling Group using the `ar % terraform import aws_ssmcontacts_rotation.example arn:aws:ssm-contacts:us-east-1:012345678910:rotation/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssoadmin_application.html.markdown b/website/docs/cdktf/python/r/ssoadmin_application.html.markdown index 2eee1be1c042..4e3b28adcffd 100644 --- a/website/docs/cdktf/python/r/ssoadmin_application.html.markdown +++ b/website/docs/cdktf/python/r/ssoadmin_application.html.markdown @@ -120,6 +120,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application using the `id`. For example: ```python @@ -143,4 +164,4 @@ Using `terraform import`, import SSO Admin Application using the `id`. For examp % terraform import aws_ssoadmin_application.example arn:aws:sso::123456789012:application/id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/ssoadmin_application_assignment_configuration.html.markdown b/website/docs/cdktf/python/r/ssoadmin_application_assignment_configuration.html.markdown index 0d773abc3df4..3e389bdb0015 100644 --- a/website/docs/cdktf/python/r/ssoadmin_application_assignment_configuration.html.markdown +++ b/website/docs/cdktf/python/r/ssoadmin_application_assignment_configuration.html.markdown @@ -54,6 +54,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application_assignment_configuration.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application_assignment_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application Assignment Configuration using the `id`. For example: ```python @@ -77,4 +98,4 @@ Using `terraform import`, import SSO Admin Application Assignment Configuration % terraform import aws_ssoadmin_application_assignment_configuration.example arn:aws:sso::123456789012:application/id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/synthetics_canary.html.markdown b/website/docs/cdktf/python/r/synthetics_canary.html.markdown index 28c84fbb140e..532885951f57 100644 --- a/website/docs/cdktf/python/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/python/r/synthetics_canary.html.markdown @@ -50,22 +50,22 @@ The following arguments are required: * `handler` - (Required) Entry point to use for the source code when running the canary. This value must end with the string `.handler` . * `name` - (Required) Name for this canary. Has a maximum length of 255 characters. Valid characters are lowercase alphanumeric, hyphen, or underscore. * `runtime_version` - (Required) Runtime version to use for the canary. Versions change often so consult the [Amazon CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_Library.html) for the latest valid versions. Values include `syn-python-selenium-1.0`, `syn-nodejs-puppeteer-3.0`, `syn-nodejs-2.2`, `syn-nodejs-2.1`, `syn-nodejs-2.0`, and `syn-1.0`. -* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed below. +* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed [below](#schedule). The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `artifact_config` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). * `delete_lambda` - (Optional) Specifies whether to also delete the Lambda functions and layers used by this canary. The default is `false`. -* `vpc_config` - (Optional) Configuration block. Detailed below. * `failure_retention_period` - (Optional) Number of days to retain data about failed runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. -* `run_config` - (Optional) Configuration block for individual canary runs. Detailed below. +* `run_config` - (Optional) Configuration block for individual canary runs. Detailed [below](#run_config). * `s3_bucket` - (Optional) Full bucket name which is used if your canary script is located in S3. The bucket must already exist. **Conflicts with `zip_file`.** * `s3_key` - (Optional) S3 key of your script. **Conflicts with `zip_file`.** * `s3_version` - (Optional) S3 version ID of your script. **Conflicts with `zip_file`.** * `start_canary` - (Optional) Whether to run or stop the canary. * `success_retention_period` - (Optional) Number of days to retain data about successful runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`default_tags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -* `artifact_config` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). +* `vpc_config` - (Optional) Configuration block. Detailed [below](#vpc_config). * `zip_file` - (Optional) ZIP file that contains the script, if you input your canary script directly into the canary instead of referring to an S3 location. It can be up to 225KB. **Conflicts with `s3_bucket`, `s3_key`, and `s3_version`.** ### artifact_config @@ -81,6 +81,11 @@ The following arguments are optional: * `expression` - (Required) Rate expression or cron expression that defines how often the canary is to run. For rate expression, the syntax is `rate(number unit)`. _unit_ can be `minute`, `minutes`, or `hour`. For cron expression, the syntax is `cron(expression)`. For more information about the syntax for cron expressions, see [Scheduling canary runs using cron](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_cron.html). * `duration_in_seconds` - (Optional) Duration in seconds, for the canary to continue making regular runs according to the schedule in the Expression value. +* `retry_config` - (Optional) Configuration block for canary retries. Detailed [below](#retry_config). + +### retry_config + +* `max_retries` - (Required) Maximum number of retries. The value must be less than or equal to `2`. If `max_retries` is `2`, `run_config.timeout_in_seconds` should be less than 600 seconds. Defaults to `0`. ### run_config @@ -146,4 +151,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/vpc_endpoint.html.markdown b/website/docs/cdktf/python/r/vpc_endpoint.html.markdown index d25851cae1e1..9a1b68be8c52 100644 --- a/website/docs/cdktf/python/r/vpc_endpoint.html.markdown +++ b/website/docs/cdktf/python/r/vpc_endpoint.html.markdown @@ -304,6 +304,32 @@ DNS blocks (for `dns_entry`) support the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_endpoint.example + identity = { + id = "vpce-3ecf2a57" + } +} + +resource "aws_vpc_endpoint" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the VPC endpoint. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import VPC Endpoints using the VPC endpoint `id`. For example: ```python @@ -318,13 +344,13 @@ from imports.aws.vpc_endpoint import VpcEndpoint class MyConvertedCode(TerraformStack): def __init__(self, scope, name): super().__init__(scope, name) - VpcEndpoint.generate_config_for_import(self, "endpoint1", "vpce-3ecf2a57") + VpcEndpoint.generate_config_for_import(self, "example", "vpce-3ecf2a57") ``` Using `terraform import`, import VPC Endpoints using the VPC endpoint `id`. For example: ```console -% terraform import aws_vpc_endpoint.endpoint1 vpce-3ecf2a57 +% terraform import aws_vpc_endpoint.example vpce-3ecf2a57 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/vpc_security_group_egress_rule.html.markdown b/website/docs/cdktf/python/r/vpc_security_group_egress_rule.html.markdown index 2222e2dffca0..1567f8c915e9 100644 --- a/website/docs/cdktf/python/r/vpc_security_group_egress_rule.html.markdown +++ b/website/docs/cdktf/python/r/vpc_security_group_egress_rule.html.markdown @@ -69,6 +69,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_egress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_egress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group egress rules using the `security_group_rule_id`. For example: ```python @@ -92,4 +118,4 @@ Using `terraform import`, import security group egress rules using the `security % terraform import aws_vpc_security_group_egress_rule.example sgr-02108b27edd666983 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/vpc_security_group_ingress_rule.html.markdown b/website/docs/cdktf/python/r/vpc_security_group_ingress_rule.html.markdown index 85e3609825db..890351d8099f 100644 --- a/website/docs/cdktf/python/r/vpc_security_group_ingress_rule.html.markdown +++ b/website/docs/cdktf/python/r/vpc_security_group_ingress_rule.html.markdown @@ -81,6 +81,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_ingress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_ingress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `account_id` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group ingress rules using the `security_group_rule_id`. For example: ```python @@ -104,4 +130,4 @@ Using `terraform import`, import security group ingress rules using the `securit % terraform import aws_vpc_security_group_ingress_rule.example sgr-02108b27edd666983 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/python/r/xray_group.html.markdown b/website/docs/cdktf/python/r/xray_group.html.markdown index 432ba28befc6..3f80d752542e 100644 --- a/website/docs/cdktf/python/r/xray_group.html.markdown +++ b/website/docs/cdktf/python/r/xray_group.html.markdown @@ -63,6 +63,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_xray_group.example + identity = { + "arn" = "arn:aws:xray:us-west-2:123456789012:group/example-group/AFAEAFE" + } +} + +resource "aws_xray_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the X-Ray group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import XRay Groups using the ARN. For example: ```python @@ -86,4 +107,4 @@ Using `terraform import`, import XRay Groups using the ARN. For example: % terraform import aws_xray_group.example arn:aws:xray:us-west-2:1234567890:group/example-group/TNGX7SW5U6QY36T4ZMOUA3HVLBYCZTWDIOOXY3CJAXTHSS3YCWUA ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/budgets_budget.html.markdown b/website/docs/cdktf/typescript/d/budgets_budget.html.markdown index feb06d4495c6..191c7823ec24 100644 --- a/website/docs/cdktf/typescript/d/budgets_budget.html.markdown +++ b/website/docs/cdktf/typescript/d/budgets_budget.html.markdown @@ -52,6 +52,7 @@ The following arguments are optional: This data source exports the following attributes in addition to the arguments above: * `autoAdjustData` - Object containing [AutoAdjustData] which determines the budget amount for an auto-adjusting budget. +* `billingViewArn` - ARN of the billing view. * `budgetExceeded` - Boolean indicating whether this budget has been exceeded. * `budgetLimit` - The total amount of cost, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage that you want to track with your budget. Contains object [Spend](#spend). * `budgetType` - Whether this budget tracks monetary cost or usage. @@ -150,4 +151,4 @@ Valid keys for `plannedLimit` parameter. * `amount` - The cost or usage amount that's associated with a budget forecast, actual spend, or budget threshold. Length Constraints: Minimum length of `1`. Maximum length of `2147483647`. * `unit` - The unit of measurement that's used for the budget forecast, actual spend, or budget threshold, such as USD or GBP. Length Constraints: Minimum length of `1`. Maximum length of `2147483647`. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/d/ssm_parameter.html.markdown b/website/docs/cdktf/typescript/d/ssm_parameter.html.markdown index 551ba2fea512..bfbc0f5baf51 100644 --- a/website/docs/cdktf/typescript/d/ssm_parameter.html.markdown +++ b/website/docs/cdktf/typescript/d/ssm_parameter.html.markdown @@ -14,6 +14,8 @@ Provides an SSM Parameter data source. ## Example Usage +### Default + ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug import { Construct } from "constructs"; @@ -34,6 +36,28 @@ class MyConvertedCode extends TerraformStack { ``` +### With version + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { DataAwsSsmParameter } from "./.gen/providers/aws/data-aws-ssm-parameter"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new DataAwsSsmParameter(this, "foo", { + name: "foo:3", + }); + } +} + +``` + ~> **Note:** The unencrypted value of a SecureString will be stored in the raw state as plain-text. [Read more about sensitive data in state](https://www.terraform.io/docs/state/sensitive-data.html). @@ -44,7 +68,7 @@ class MyConvertedCode extends TerraformStack { This data source supports the following arguments: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). -* `name` - (Required) Name of the parameter. +* `name` - (Required) Name of the parameter. To query by parameter version use `name:version` (e.g., `foo:3`). * `withDecryption` - (Optional) Whether to return decrypted `SecureString` value. Defaults to `true`. ## Attribute Reference @@ -58,4 +82,4 @@ This data source exports the following attributes in addition to the arguments a * `insecureValue` - Value of the parameter. **Use caution:** This value is never marked as sensitive. * `version` - Version of the parameter. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/index.html.markdown b/website/docs/cdktf/typescript/index.html.markdown index 5181c7592054..6f305e6c8766 100644 --- a/website/docs/cdktf/typescript/index.html.markdown +++ b/website/docs/cdktf/typescript/index.html.markdown @@ -11,7 +11,7 @@ description: |- The Amazon Web Services (AWS) provider is Terraform’s most widely-used provider and the industry-standard way to manage AWS infrastructure as code. It is an indispensable part of how leading technology companies, global banks, government agencies, and some of the largest enterprises in the world build and operate in the cloud. Every day, it provisions and orchestrates billions of dollars of AWS infrastructure across thousands of organizations. -With 1,536 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. +With 1,537 resources and 609 data sources, the AWS provider spans the full breadth of AWS services—from foundational capabilities like compute, storage, networking, and identity management to advanced services for AI, analytics, and event-driven architectures, including Lambda, RDS, SageMaker, and Bedrock. Whether automating a single S3 bucket or orchestrating a multi-region, enterprise-scale environment, the provider delivers consistent, reliable workflows that scale with your needs. Configure the provider with your AWS credentials, and you can immediately begin creating and managing infrastructure in a safe, repeatable way. Use the navigation on the left to explore the available resources, or start with our [Get Started tutorials](https://developer.hashicorp.com/terraform/tutorials/aws-get-started/infrastructure-as-code?in=terraform/aws-get-started&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) to learn the fundamentals. For deeper guidance on specific AWS services, visit the [AWS services tutorials](https://developer.hashicorp.com/terraform/tutorials/aws?utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS). @@ -948,4 +948,4 @@ Approaches differ per authentication providers: There used to be no better way to get account ID out of the API when using the federated account until `sts:GetCallerIdentity` was introduced. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/acm_certificate.html.markdown b/website/docs/cdktf/typescript/r/acm_certificate.html.markdown index 462e6c123f25..b00091e5d7fa 100644 --- a/website/docs/cdktf/typescript/r/acm_certificate.html.markdown +++ b/website/docs/cdktf/typescript/r/acm_certificate.html.markdown @@ -281,6 +281,27 @@ Renewal summary objects export the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acm_certificate.example + identity = { + "arn" = "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a" + } +} + +resource "aws_acm_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) ARN of the certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import certificates using their ARN. For example: ```typescript @@ -297,7 +318,7 @@ class MyConvertedCode extends TerraformStack { super(scope, name); AcmCertificate.generateConfigForImport( this, - "cert", + "example", "arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a" ); } @@ -308,7 +329,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import certificates using their ARN. For example: ```console -% terraform import aws_acm_certificate.cert arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a +% terraform import aws_acm_certificate.example arn:aws:acm:eu-central-1:123456789012:certificate/7e7a28d2-163f-4b8f-b9cd-822f96c08d6a ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/acmpca_certificate.html.markdown b/website/docs/cdktf/typescript/r/acmpca_certificate.html.markdown index 565f35041423..390d021f8992 100644 --- a/website/docs/cdktf/typescript/r/acmpca_certificate.html.markdown +++ b/website/docs/cdktf/typescript/r/acmpca_certificate.html.markdown @@ -107,6 +107,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012/certificate/286535153982981100925020015808220737245" + } +} + +resource "aws_acmpca_certificate" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ACM PCA Certificates using their ARN. For example: ```typescript @@ -137,4 +158,4 @@ Using `terraform import`, import ACM PCA Certificates using their ARN. For examp % terraform import aws_acmpca_certificate.cert arn:aws:acm-pca:eu-west-1:675225743824:certificate-authority/08319ede-83g9-1400-8f21-c7d12b2b6edb/certificate/a4e9c2aa4bcfab625g1b9136464cd3a ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/acmpca_certificate_authority.html.markdown b/website/docs/cdktf/typescript/r/acmpca_certificate_authority.html.markdown index 3da46e183a6f..3130b33f3394 100644 --- a/website/docs/cdktf/typescript/r/acmpca_certificate_authority.html.markdown +++ b/website/docs/cdktf/typescript/r/acmpca_certificate_authority.html.markdown @@ -233,6 +233,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_certificate_authority.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_certificate_authority" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_certificate_authority` using the certificate authority ARN. For example: ```typescript @@ -263,4 +284,4 @@ Using `terraform import`, import `aws_acmpca_certificate_authority` using the ce % terraform import aws_acmpca_certificate_authority.example arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/acmpca_policy.html.markdown b/website/docs/cdktf/typescript/r/acmpca_policy.html.markdown index fba16e23be4c..f174a2a551b7 100644 --- a/website/docs/cdktf/typescript/r/acmpca_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/acmpca_policy.html.markdown @@ -95,6 +95,27 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_acmpca_policy.example + identity = { + "arn" = "arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_acmpca_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ACM PCA certificate authority. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_acmpca_policy` using the `resourceArn` value. For example: ```typescript @@ -125,4 +146,4 @@ Using `terraform import`, import `aws_acmpca_policy` using the `resourceArn` val % terraform import aws_acmpca_policy.example arn:aws:acm-pca:us-east-1:123456789012:certificate-authority/12345678-1234-1234-1234-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/api_gateway_domain_name_access_association.html.markdown b/website/docs/cdktf/typescript/r/api_gateway_domain_name_access_association.html.markdown index 509abbc8d72b..3125e74ab7f4 100644 --- a/website/docs/cdktf/typescript/r/api_gateway_domain_name_access_association.html.markdown +++ b/website/docs/cdktf/typescript/r/api_gateway_domain_name_access_association.html.markdown @@ -56,6 +56,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_api_gateway_domain_name_access_association.example + identity = { + "arn" = "arn:aws:apigateway:us-east-1::/domainnames/example.com/accessassociation" + } +} + +resource "aws_api_gateway_domain_name_access_association" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the API Gateway domain name access association. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import API Gateway domain name acces associations using their `arn`. For example: ```typescript @@ -86,4 +107,4 @@ Using `terraform import`, import API Gateway domain name acces associations as u % terraform import aws_api_gateway_domain_name_access_association.example arn:aws:apigateway:us-west-2:123456789012:/domainnameaccessassociations/domainname/12qmzgp2.9m7ilski.test+hykg7a12e7/vpcesource/vpce-05de3f8f82740a748 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appautoscaling_policy.html.markdown b/website/docs/cdktf/typescript/r/appautoscaling_policy.html.markdown index 73a0967a3fbc..c98abc36b103 100644 --- a/website/docs/cdktf/typescript/r/appautoscaling_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/appautoscaling_policy.html.markdown @@ -271,18 +271,141 @@ class MyConvertedCode extends TerraformStack { ``` +### Predictive Scaling + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { AppautoscalingPolicy } from "./.gen/providers/aws/appautoscaling-policy"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new AppautoscalingPolicy(this, "example", { + name: "example-policy", + policyType: "PredictiveScaling", + predictiveScalingPolicyConfiguration: { + metricSpecification: [ + { + predefinedMetricPairSpecification: { + predefinedMetricType: "ECSServiceMemoryUtilization", + }, + targetValue: Token.asString(40), + }, + ], + }, + resourceId: Token.asString(awsAppautoscalingTargetExample.resourceId), + scalableDimension: Token.asString( + awsAppautoscalingTargetExample.scalableDimension + ), + serviceNamespace: Token.asString( + awsAppautoscalingTargetExample.serviceNamespace + ), + }); + } +} + +``` + ## Argument Reference This resource supports the following arguments: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `name` - (Required) Name of the policy. Must be between 1 and 255 characters in length. -* `policyType` - (Optional) Policy type. Valid values are `StepScaling` and `TargetTrackingScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html) and [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html) documentation. +* `policyType` - (Optional) Policy type. Valid values are `StepScaling`, `TargetTrackingScaling`, and `PredictiveScaling`. Defaults to `StepScaling`. Certain services only support only one policy type. For more information see the [Target Tracking Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html), [Step Scaling Policies](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html), and [Predictive Scaling](https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-predictive-scaling.html) documentation. +* `predictiveScalingPolicyConfiguration` - (Optional) Predictive scaling policy configuration, requires `policy_type = "PredictiveScaling"`. See supported fields below. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `resourceId` - (Required) Resource type and unique identifier string for the resource associated with the scaling policy. Documentation can be found in the `ResourceId` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `scalableDimension` - (Required) Scalable dimension of the scalable target. Documentation can be found in the `ScalableDimension` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `serviceNamespace` - (Required) AWS service namespace of the scalable target. Documentation can be found in the `ServiceNamespace` parameter at: [AWS Application Auto Scaling API Reference](https://docs.aws.amazon.com/autoscaling/application/APIReference/API_RegisterScalableTarget.html) * `stepScalingPolicyConfiguration` - (Optional) Step scaling policy configuration, requires `policy_type = "StepScaling"` (default). See supported fields below. -* `targetTrackingScalingPolicyConfiguration` - (Optional) Target tracking policy, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. +* `targetTrackingScalingPolicyConfiguration` - (Optional) Target tracking policy configuration, requires `policy_type = "TargetTrackingScaling"`. See supported fields below. + +### predictive_scaling_policy_configuration + +The `predictiveScalingPolicyConfiguration` configuration block supports the following arguments: + +* `maxCapacityBreachBehavior` - (Optional) The behavior that should be applied if the forecast capacity approaches or exceeds the maximum capacity. Valid values are `HonorMaxCapacity` and `IncreaseMaxCapacity`. +* `maxCapacityBuffer` - (Optional) Size of the capacity buffer to use when the forecast capacity is close to or exceeds the maximum capacity. The value is specified as a percentage relative to the forecast capacity. Required if the `maxCapacityBreachBehavior` argument is set to `IncreaseMaxCapacity`, and cannot be used otherwise. +* `metricSpecification` - (Required) Metrics and target utilization to use for predictive scaling. See supported fields below. +* `mode` - (Optional) Predictive scaling mode. Valid values are `ForecastOnly` and `ForecastAndScale`. +* `schedulingBufferTime` - (Optional) Amount of time, in seconds, that the start time can be advanced. + +### predictive_scaling_policy_configuration metric_specification + +The `predictiveScalingPolicyConfiguration` `metricSpecification` configuration block supports the following arguments: + +* `customizedCapacityMetricSpecification` - (Optional) Customized capacity metric specification. See supported fields below. +* `customizedLoadMetricSpecification` - (Optional) Customized load metric specification. See supported fields below. +* `customizedScalingMetricSpecification` - (Optional) Customized scaling metric specification. See supported fields below. +* `predefinedLoadMetricSpecification` - (Optional) Predefined load metric specification. See supported fields below. +* `predefinedMetricPairSpecification` - (Optional) Predefined metric pair specification that determines the appropriate scaling metric and load metric to use. See supported fields below. +* `predefinedScalingMetricSpecification` - (Optional) Predefined scaling metric specification. See supported fields below. +* `targetValue` - (Required) Target utilization. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification, customized_load_metric_specification and customized_scaling_metric_specification + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `customizedCapacityMetricSpecification`, `customizedLoadMetricSpecification`, and `customizedScalingMetricSpecification` configuration blocks supports the following arguments: + +* `metricDataQuery` - (Required) One or more metric data queries to provide data points for a metric specification. See supported fields below. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `customizedCapacityMetricSpecification` `metricDataQuery` configuration block supports the following arguments: + +* `expression` - (Optional) Math expression to perform on the returned data, if this object is performing a math expression. +* `id` - (Required) Short name that identifies the object's results in the response. +* `label` - (Optional) Human-readable label for this metric or expression. +* `metricStat` - (Optional) Information about the metric data to return. See supported fields below. +* `returnData` - (Optional) Whether to return the timestamps and raw data values of this metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `customizedCapacityMetricSpecification` `metricDataQuery` `metricStat` configuration block supports the following arguments: + +* `metric` - (Required) CloudWatch metric to return, including the metric name, namespace, and dimensions. See supported fields below. +* `stat` - (Required) Statistic to return. +* `unit` - (Optional) Unit to use for the returned data points. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `customizedCapacityMetricSpecification` `metricDataQuery` `metricStat` `metric` configuration block supports the following arguments: + +* `dimension` - (Optional) Dimensions of the metric. See supported fields below. +* `metricName` - (Optional) Name of the metric. +* `namespace` - (Optional) Namespace of the metric. + +### predictive_scaling_policy_configuration metric_specification customized_capacity_metric_specification metric_data_query metric_stat metric dimension + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `customizedCapacityMetricSpecification` `metricDataQuery` `metricStat` `metric` `dimension` configuration block supports the following arguments: + +* `name` - (Optional) Name of the dimension. +* `value` - (Optional) Value of the dimension. + +### predictive_scaling_policy_configuration metric_specification predefined_load_metric_specification + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `predefinedLoadMetricSpecification` configuration block supports the following arguments: + +* `predefinedMetricType` - (Required) Metric type. +* `resourceLabel` - (Optional) Label that uniquely identifies a target group. + +### predictive_scaling_policy_configuration metric_specification predefined_metric_pair_specification + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `predefinedMetricPairSpecification` configuration block supports the following arguments: + +* `predefinedMetricType` - (Required) Which metrics to use. There are two different types of metrics for each metric type: one is a load metric and one is a scaling metric. +* `resourceLabel` - (Optional) Label that uniquely identifies a specific target group from which to determine the total and average request count. + +### predictive_scaling_policy_configuration metric_specification predefined_scaling_metric_specification + +The `predictiveScalingPolicyConfiguration` `metricSpecification` `predefinedScalingMetricSpecification` configuration block supports the following arguments: + +* `predefinedMetricType` - (Required) Metric type. +* `resourceLabel` - (Optional) Label that uniquely identifies a specific target group from which to determine the average request count. ### step_scaling_policy_configuration @@ -498,4 +621,4 @@ Using `terraform import`, import Application AutoScaling Policy using the `servi % terraform import aws_appautoscaling_policy.test-policy service-namespace/resource-id/scalable-dimension/policy-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appfabric_app_bundle.html.markdown b/website/docs/cdktf/typescript/r/appfabric_app_bundle.html.markdown index c2183a9de9f9..17fa61022f0a 100644 --- a/website/docs/cdktf/typescript/r/appfabric_app_bundle.html.markdown +++ b/website/docs/cdktf/typescript/r/appfabric_app_bundle.html.markdown @@ -56,6 +56,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_appfabric_app_bundle.example + identity = { + "arn" = "arn:aws:appfabric:us-east-1:123456789012:appbundle/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_appfabric_app_bundle" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the AppFabric app bundle. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AppFabric AppBundle using the `arn`. For example: ```typescript @@ -86,4 +107,4 @@ Using `terraform import`, import AppFabric AppBundle using the `arn`. For exampl % terraform import aws_appfabric_app_bundle.example arn:aws:appfabric:[region]:[account]:appbundle/ee5587b4-5765-4288-a202-xxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/apprunner_auto_scaling_configuration_version.html.markdown b/website/docs/cdktf/typescript/r/apprunner_auto_scaling_configuration_version.html.markdown index 372f857e730a..7aa1566eb3c3 100644 --- a/website/docs/cdktf/typescript/r/apprunner_auto_scaling_configuration_version.html.markdown +++ b/website/docs/cdktf/typescript/r/apprunner_auto_scaling_configuration_version.html.markdown @@ -63,6 +63,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_auto_scaling_configuration_version.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:autoscalingconfiguration/example-auto-scaling-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_auto_scaling_configuration_version" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner auto scaling configuration version. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner AutoScaling Configuration Versions using the `arn`. For example: ```typescript @@ -93,4 +114,4 @@ Using `terraform import`, import App Runner AutoScaling Configuration Versions u % terraform import aws_apprunner_auto_scaling_configuration_version.example "arn:aws:apprunner:us-east-1:1234567890:autoscalingconfiguration/example/1/69bdfe0115224b0db49398b7beb68e0f ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/apprunner_observability_configuration.html.markdown b/website/docs/cdktf/typescript/r/apprunner_observability_configuration.html.markdown index 56a1b1d4ec9d..0348ab6b33d4 100644 --- a/website/docs/cdktf/typescript/r/apprunner_observability_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/apprunner_observability_configuration.html.markdown @@ -67,6 +67,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_observability_configuration.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:observabilityconfiguration/example-observability-config/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_observability_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner observability configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Observability Configuration using the `arn`. For example: ```typescript @@ -97,4 +118,4 @@ Using `terraform import`, import App Runner Observability Configuration using th % terraform import aws_apprunner_observability_configuration.example arn:aws:apprunner:us-east-1:1234567890:observabilityconfiguration/example/1/d75bc7ea55b71e724fe5c23452fe22a1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/apprunner_service.html.markdown b/website/docs/cdktf/typescript/r/apprunner_service.html.markdown index 4dc73c78f751..bf4b76b1a274 100644 --- a/website/docs/cdktf/typescript/r/apprunner_service.html.markdown +++ b/website/docs/cdktf/typescript/r/apprunner_service.html.markdown @@ -312,6 +312,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_service.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:service/example-app-service/8fe1e10304f84fd2b0df550fe98a71fa" + } +} + +resource "aws_apprunner_service" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner service. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner Services using the `arn`. For example: ```typescript @@ -342,4 +363,4 @@ Using `terraform import`, import App Runner Services using the `arn`. For exampl % terraform import aws_apprunner_service.example arn:aws:apprunner:us-east-1:1234567890:service/example/0a03292a89764e5882c41d8f991c82fe ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/apprunner_vpc_connector.html.markdown b/website/docs/cdktf/typescript/r/apprunner_vpc_connector.html.markdown index 1a006427f8f7..5ca25e5d43e3 100644 --- a/website/docs/cdktf/typescript/r/apprunner_vpc_connector.html.markdown +++ b/website/docs/cdktf/typescript/r/apprunner_vpc_connector.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_connector.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcconnector/example-vpc-connector/1/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_connector" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC connector. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner vpc connector using the `arn`. For example: ```typescript @@ -87,4 +108,4 @@ Using `terraform import`, import App Runner vpc connector using the `arn`. For e % terraform import aws_apprunner_vpc_connector.example arn:aws:apprunner:us-east-1:1234567890:vpcconnector/example/1/0a03292a89764e5882c41d8f991c82fe ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/apprunner_vpc_ingress_connection.html.markdown b/website/docs/cdktf/typescript/r/apprunner_vpc_ingress_connection.html.markdown index 84472c220174..f9d105266e53 100644 --- a/website/docs/cdktf/typescript/r/apprunner_vpc_ingress_connection.html.markdown +++ b/website/docs/cdktf/typescript/r/apprunner_vpc_ingress_connection.html.markdown @@ -70,6 +70,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_apprunner_vpc_ingress_connection.example + identity = { + "arn" = "arn:aws:apprunner:us-east-1:123456789012:vpcingressconnection/example-vpc-ingress-connection/a1b2c3d4567890ab" + } +} + +resource "aws_apprunner_vpc_ingress_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the App Runner VPC ingress connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import App Runner VPC Ingress Connection using the `arn`. For example: ```typescript @@ -100,4 +121,4 @@ Using `terraform import`, import App Runner VPC Ingress Connection using the `ar % terraform import aws_apprunner_vpc_ingress_connection.example "arn:aws:apprunner:us-west-2:837424938642:vpcingressconnection/example/b379f86381d74825832c2e82080342fa" ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/appsync_api.html.markdown b/website/docs/cdktf/typescript/r/appsync_api.html.markdown index d440ec192177..7cc61e5d48ae 100644 --- a/website/docs/cdktf/typescript/r/appsync_api.html.markdown +++ b/website/docs/cdktf/typescript/r/appsync_api.html.markdown @@ -143,9 +143,7 @@ class MyConvertedCode extends TerraformStack { lambdaAuthorizerConfig: [ { authorizerResultTtlInSeconds: 300, - authorizerUri: Token.asString( - awsLambdaFunctionExample.invokeArn - ), + authorizerUri: Token.asString(awsLambdaFunctionExample.arn), }, ], }, @@ -201,7 +199,7 @@ The `eventConfig` block supports the following: The `authProvider` block supports the following: -* `authType` - (Required) Type of authentication provider. Valid values: `AMAZON_COGNITO_USER_POOLS`, `AWS_LAMBDA`, `OPENID_CONNECT`, `API_KEY`. +* `authType` - (Required) Type of authentication provider. Valid values: `API_KEY`, `AWS_IAM`, `AMAZON_COGNITO_USER_POOLS`, `OPENID_CONNECT`, `AWS_LAMBDA`. * `cognitoConfig` - (Optional) Configuration for Cognito user pool authentication. Required when `authType` is `AMAZON_COGNITO_USER_POOLS`. See [Cognito Config](#cognito-config) below. * `lambdaAuthorizerConfig` - (Optional) Configuration for Lambda authorization. Required when `authType` is `AWS_LAMBDA`. See [Lambda Authorizer Config](#lambda-authorizer-config) below. * `openidConnectConfig` - (Optional) Configuration for OpenID Connect. Required when `authType` is `OPENID_CONNECT`. See [OpenID Connect Config](#openid-connect-config) below. @@ -282,4 +280,4 @@ Using `terraform import`, import AppSync Event API using the `apiId`. For exampl % terraform import aws_appsync_api.example example-api-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown b/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown index 2d2294759f21..415d4f2967de 100644 --- a/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown +++ b/website/docs/cdktf/typescript/r/batch_compute_environment.html.markdown @@ -317,6 +317,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_compute_environment.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:compute-environment/sample" + } +} + +resource "aws_batch_compute_environment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the compute environment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import AWS Batch compute using the `name`. For example: ```typescript @@ -347,4 +368,4 @@ Using `terraform import`, import AWS Batch compute using the `name`. For example [2]: http://docs.aws.amazon.com/batch/latest/userguide/compute_environments.html [3]: http://docs.aws.amazon.com/batch/latest/userguide/troubleshooting.html - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown b/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown index aa9053c93c76..86f3258f9865 100644 --- a/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown +++ b/website/docs/cdktf/typescript/r/batch_job_definition.html.markdown @@ -450,6 +450,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_definition.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-definition/sample:1" + } +} + +resource "aws_batch_job_definition" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job definition. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Definition using the `arn`. For example: ```typescript @@ -480,4 +501,4 @@ Using `terraform import`, import Batch Job Definition using the `arn`. For examp % terraform import aws_batch_job_definition.test arn:aws:batch:us-east-1:123456789012:job-definition/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/batch_job_queue.html.markdown b/website/docs/cdktf/typescript/r/batch_job_queue.html.markdown index 77f5ee144be9..cebaceacabdb 100644 --- a/website/docs/cdktf/typescript/r/batch_job_queue.html.markdown +++ b/website/docs/cdktf/typescript/r/batch_job_queue.html.markdown @@ -142,6 +142,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_batch_job_queue.example + identity = { + "arn" = "arn:aws:batch:us-east-1:123456789012:job-queue/sample" + } +} + +resource "aws_batch_job_queue" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the job queue. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Batch Job Queue using the `arn`. For example: ```typescript @@ -172,4 +193,4 @@ Using `terraform import`, import Batch Job Queue using the `arn`. For example: % terraform import aws_batch_job_queue.test_queue arn:aws:batch:us-east-1:123456789012:job-queue/sample ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown b/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown index f71831de0f9d..0aa1e4791bc0 100644 --- a/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown +++ b/website/docs/cdktf/typescript/r/bcmdataexports_export.html.markdown @@ -147,6 +147,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bcmdataexports_export.example + identity = { + "arn" = "arn:aws:bcm-data-exports:us-east-1:123456789012:export/example-export" + } +} + +resource "aws_bcmdataexports_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the BCM Data Exports export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import BCM Data Exports Export using the export ARN. For example: ```typescript @@ -177,4 +198,4 @@ Using `terraform import`, import BCM Data Exports Export using the export ARN. F % terraform import aws_bcmdataexports_export.example arn:aws:bcm-data-exports:us-east-1:123456789012:export/CostUsageReport-9f1c75f3-f982-4d9a-b936-1e7ecab814b7 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/bedrock_custom_model.html.markdown b/website/docs/cdktf/typescript/r/bedrock_custom_model.html.markdown index 05a14794021c..d592223034b6 100644 --- a/website/docs/cdktf/typescript/r/bedrock_custom_model.html.markdown +++ b/website/docs/cdktf/typescript/r/bedrock_custom_model.html.markdown @@ -121,6 +121,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_custom_model.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:custom-model/amazon.titan-text-lite-v1:0:4k/example-model" + } +} + +resource "aws_bedrock_custom_model" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock custom model. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Bedrock Custom Model using the `jobArn`. For example: ```typescript @@ -151,4 +172,4 @@ Using `terraform import`, import Bedrock custom model using the `jobArn`. For ex % terraform import aws_bedrock_custom_model.example arn:aws:bedrock:us-west-2:123456789012:model-customization-job/amazon.titan-text-express-v1:0:8k/1y5n57gh5y2e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/bedrock_guardrail.html.markdown b/website/docs/cdktf/typescript/r/bedrock_guardrail.html.markdown index 38b17396d62d..33d7416a764b 100644 --- a/website/docs/cdktf/typescript/r/bedrock_guardrail.html.markdown +++ b/website/docs/cdktf/typescript/r/bedrock_guardrail.html.markdown @@ -191,10 +191,18 @@ The `tierConfig` configuration block supports the following arguments: #### Managed Word Lists Config * `type` (Required) Options for managed words. +* `inputAction` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `inputEnabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `outputAction` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `outputEnabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. #### Words Config * `text` (Required) The custom word text. +* `inputAction` (Optional) Action to take when harmful content is detected in the input. Valid values: `BLOCK`, `NONE`. +* `inputEnabled` (Optional) Whether to enable guardrail evaluation on the input. When disabled, you aren't charged for the evaluation. +* `outputAction` (Optional) Action to take when harmful content is detected in the output. Valid values: `BLOCK`, `NONE`. +* `outputEnabled` (Optional) Whether to enable guardrail evaluation on the output. When disabled, you aren't charged for the evaluation. ## Attribute Reference @@ -246,4 +254,4 @@ Using `terraform import`, import Amazon Bedrock Guardrail using using a comma-de % terraform import aws_bedrock_guardrail.example guardrail-id-12345678,DRAFT ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/bedrock_provisioned_model_throughput.html.markdown b/website/docs/cdktf/typescript/r/bedrock_provisioned_model_throughput.html.markdown index faa2f59d61a0..33dbf3d57959 100644 --- a/website/docs/cdktf/typescript/r/bedrock_provisioned_model_throughput.html.markdown +++ b/website/docs/cdktf/typescript/r/bedrock_provisioned_model_throughput.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_bedrock_provisioned_model_throughput.example + identity = { + "arn" = "arn:aws:bedrock:us-west-2:123456789012:provisioned-model/a1b2c3d4567890ab" + } +} + +resource "aws_bedrock_provisioned_model_throughput" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Bedrock provisioned model throughput. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Provisioned Throughput using the `provisionedModelArn`. For example: ```typescript @@ -94,4 +115,4 @@ Using `terraform import`, import Provisioned Throughput using the `provisionedMo % terraform import aws_bedrock_provisioned_model_throughput.example arn:aws:bedrock:us-west-2:123456789012:provisioned-model/1y5n57gh5y2e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/budgets_budget.html.markdown b/website/docs/cdktf/typescript/r/budgets_budget.html.markdown index 8406515c50e2..d944df7a8a8e 100644 --- a/website/docs/cdktf/typescript/r/budgets_budget.html.markdown +++ b/website/docs/cdktf/typescript/r/budgets_budget.html.markdown @@ -320,6 +320,7 @@ The following arguments are optional: * `accountId` - (Optional) The ID of the target account for budget. Will use current user's account_id by default if omitted. * `autoAdjustData` - (Optional) Object containing [AutoAdjustData](#auto-adjust-data) which determines the budget amount for an auto-adjusting budget. +* `billingViewArn` - (Optional) ARN of the billing view. * `costFilter` - (Optional) A list of [CostFilter](#cost-filter) name/values pair to apply to budget. * `costTypes` - (Optional) Object containing [CostTypes](#cost-types) The types of cost included in a budget, such as tax and subscriptions. * `limitAmount` - (Optional) The amount of cost or usage being measured for a budget. @@ -434,4 +435,4 @@ Using `terraform import`, import budgets using `AccountID:BudgetName`. For examp % terraform import aws_budgets_budget.myBudget 123456789012:myBudget ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ce_anomaly_monitor.html.markdown b/website/docs/cdktf/typescript/r/ce_anomaly_monitor.html.markdown index 32db41da3acd..b20a4f0a17b5 100644 --- a/website/docs/cdktf/typescript/r/ce_anomaly_monitor.html.markdown +++ b/website/docs/cdktf/typescript/r/ce_anomaly_monitor.html.markdown @@ -97,6 +97,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_monitor.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalymonitor/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_monitor" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly monitor. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_monitor` using the `id`. For example: ```typescript @@ -127,4 +148,4 @@ Using `terraform import`, import `aws_ce_anomaly_monitor` using the `id`. For ex % terraform import aws_ce_anomaly_monitor.example costAnomalyMonitorARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ce_anomaly_subscription.html.markdown b/website/docs/cdktf/typescript/r/ce_anomaly_subscription.html.markdown index fd161a07e0b5..bb40636f19d0 100644 --- a/website/docs/cdktf/typescript/r/ce_anomaly_subscription.html.markdown +++ b/website/docs/cdktf/typescript/r/ce_anomaly_subscription.html.markdown @@ -298,6 +298,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_anomaly_subscription.example + identity = { + "arn" = "arn:aws:ce::123456789012:anomalysubscription/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_anomaly_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer anomaly subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_anomaly_subscription` using the `id`. For example: ```typescript @@ -328,4 +349,4 @@ Using `terraform import`, import `aws_ce_anomaly_subscription` using the `id`. F % terraform import aws_ce_anomaly_subscription.example AnomalySubscriptionARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ce_cost_category.html.markdown b/website/docs/cdktf/typescript/r/ce_cost_category.html.markdown index bac364dea690..dd1a73a8906d 100644 --- a/website/docs/cdktf/typescript/r/ce_cost_category.html.markdown +++ b/website/docs/cdktf/typescript/r/ce_cost_category.html.markdown @@ -144,6 +144,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ce_cost_category.example + identity = { + "arn" = "arn:aws:ce::123456789012:costcategory/12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_ce_cost_category" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Cost Explorer cost category. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_ce_cost_category` using the id. For example: ```typescript @@ -170,4 +191,4 @@ Using `terraform import`, import `aws_ce_cost_category` using the id. For exampl % terraform import aws_ce_cost_category.example costCategoryARN ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown b/website/docs/cdktf/typescript/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown index 4c3ccb6bf61d..f45cd88d5dc4 100644 --- a/website/docs/cdktf/typescript/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/chimesdkmediapipelines_media_insights_pipeline_configuration.html.markdown @@ -479,6 +479,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_chimesdkmediapipelines_media_insights_pipeline_configuration.example + identity = { + "arn" = "arn:aws:chime:us-east-1:123456789012:media-insights-pipeline-configuration/example-config" + } +} + +resource "aws_chimesdkmediapipelines_media_insights_pipeline_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Chime SDK media insights pipeline configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Chime SDK Media Pipelines Media Insights Pipeline Configuration using the `id`. For example: ```typescript @@ -509,4 +530,4 @@ Using `terraform import`, import Chime SDK Media Pipelines Media Insights Pipeli % terraform import aws_chimesdkmediapipelines_media_insights_pipeline_configuration.example abcdef123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/cloudfront_distribution.html.markdown b/website/docs/cdktf/typescript/r/cloudfront_distribution.html.markdown index 9b980a31aaf4..ce7e165159d9 100644 --- a/website/docs/cdktf/typescript/r/cloudfront_distribution.html.markdown +++ b/website/docs/cdktf/typescript/r/cloudfront_distribution.html.markdown @@ -673,8 +673,9 @@ argument should not be specified. * `originId` (Required) - Unique identifier for the origin. * `originPath` (Optional) - Optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin. * `originShield` - (Optional) [CloudFront Origin Shield](#origin-shield-arguments) configuration information. Using Origin Shield can help reduce the load on your origin. For more information, see [Using Origin Shield](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/origin-shield.html) in the Amazon CloudFront Developer Guide. +* `responseCompletionTimeout` - (Optional) Time (in seconds) that a request from CloudFront to the origin can stay open and wait for a response. Must be integer greater than or equal to the value of `originReadTimeout`. If omitted or explicitly set to `0`, no maximum value is enforced. * `s3OriginConfig` - (Optional) [CloudFront S3 origin](#s3-origin-config-arguments) configuration information. If a custom origin is required, use `customOriginConfig` instead. -* `vpcOriginConfig` - (Optional) The VPC origin configuration. +* `vpcOriginConfig` - (Optional) The [VPC origin configuration](#vpc-origin-config-arguments). ##### Custom Origin Config Arguments @@ -796,4 +797,4 @@ Using `terraform import`, import CloudFront Distributions using the `id`. For ex % terraform import aws_cloudfront_distribution.distribution E74FTE3EXAMPLE ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/cloudfront_realtime_log_config.html.markdown b/website/docs/cdktf/typescript/r/cloudfront_realtime_log_config.html.markdown index 606bd1bc16e9..2c1211ef7ffd 100644 --- a/website/docs/cdktf/typescript/r/cloudfront_realtime_log_config.html.markdown +++ b/website/docs/cdktf/typescript/r/cloudfront_realtime_log_config.html.markdown @@ -120,6 +120,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudfront_realtime_log_config.example + identity = { + "arn" = "arn:aws:cloudfront::123456789012:realtime-log-config/ExampleNameForRealtimeLogConfig" + } +} + +resource "aws_cloudfront_realtime_log_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudFront real-time log configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CloudFront real-time log configurations using the ARN. For example: ```typescript @@ -150,4 +171,4 @@ Using `terraform import`, import CloudFront real-time log configurations using t % terraform import aws_cloudfront_realtime_log_config.example arn:aws:cloudfront::111122223333:realtime-log-config/ExampleNameForRealtimeLogConfig ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/cloudtrail_event_data_store.html.markdown b/website/docs/cdktf/typescript/r/cloudtrail_event_data_store.html.markdown index 7c9fc3388932..98a572cf104e 100644 --- a/website/docs/cdktf/typescript/r/cloudtrail_event_data_store.html.markdown +++ b/website/docs/cdktf/typescript/r/cloudtrail_event_data_store.html.markdown @@ -145,6 +145,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_cloudtrail_event_data_store.example + identity = { + "arn" = "arn:aws:cloudtrail:us-east-1:123456789012:eventdatastore/example-event-data-store-id" + } +} + +resource "aws_cloudtrail_event_data_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CloudTrail event data store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import event data stores using their `arn`. For example: ```typescript @@ -175,4 +196,4 @@ Using `terraform import`, import event data stores using their `arn`. For exampl % terraform import aws_cloudtrail_event_data_store.example arn:aws:cloudtrail:us-east-1:123456789123:eventdatastore/22333815-4414-412c-b155-dd254033gfhf ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeartifact_domain.html.markdown b/website/docs/cdktf/typescript/r/codeartifact_domain.html.markdown index 964feedcce84..aadd22b2ec0d 100644 --- a/website/docs/cdktf/typescript/r/codeartifact_domain.html.markdown +++ b/website/docs/cdktf/typescript/r/codeartifact_domain.html.markdown @@ -58,6 +58,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain using the CodeArtifact Domain arn. For example: ```typescript @@ -88,4 +109,4 @@ Using `terraform import`, import CodeArtifact Domain using the CodeArtifact Doma % terraform import aws_codeartifact_domain.example arn:aws:codeartifact:us-west-2:012345678912:domain/tf-acc-test-8593714120730241305 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeartifact_domain_permissions_policy.html.markdown b/website/docs/cdktf/typescript/r/codeartifact_domain_permissions_policy.html.markdown index 392ce248d541..7baf28a841bb 100644 --- a/website/docs/cdktf/typescript/r/codeartifact_domain_permissions_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/codeartifact_domain_permissions_policy.html.markdown @@ -88,6 +88,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_domain_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:domain/example" + } +} + +resource "aws_codeartifact_domain_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact domain. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Domain Permissions Policies using the CodeArtifact Domain ARN. For example: ```typescript @@ -118,4 +139,4 @@ Using `terraform import`, import CodeArtifact Domain Permissions Policies using % terraform import aws_codeartifact_domain_permissions_policy.example arn:aws:codeartifact:us-west-2:012345678912:domain/tf-acc-test-1928056699409417367 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeartifact_repository.html.markdown b/website/docs/cdktf/typescript/r/codeartifact_repository.html.markdown index 0688f8e2bd45..8d8ad9f1f4eb 100644 --- a/website/docs/cdktf/typescript/r/codeartifact_repository.html.markdown +++ b/website/docs/cdktf/typescript/r/codeartifact_repository.html.markdown @@ -144,6 +144,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository using the CodeArtifact Repository ARN. For example: ```typescript @@ -174,4 +195,4 @@ Using `terraform import`, import CodeArtifact Repository using the CodeArtifact % terraform import aws_codeartifact_repository.example arn:aws:codeartifact:us-west-2:012345678912:repository/tf-acc-test-6968272603913957763/tf-acc-test-6968272603913957763 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeartifact_repository_permissions_policy.html.markdown b/website/docs/cdktf/typescript/r/codeartifact_repository_permissions_policy.html.markdown index e7fd6fd678e1..6f5413e85be4 100644 --- a/website/docs/cdktf/typescript/r/codeartifact_repository_permissions_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/codeartifact_repository_permissions_policy.html.markdown @@ -109,6 +109,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeartifact_repository_permissions_policy.example + identity = { + "arn" = "arn:aws:codeartifact:us-west-2:123456789012:repository/example-domain/example-repo" + } +} + +resource "aws_codeartifact_repository_permissions_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeArtifact repository. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeArtifact Repository Permissions Policies using the CodeArtifact Repository ARN. For example: ```typescript @@ -139,4 +160,4 @@ Using `terraform import`, import CodeArtifact Repository Permissions Policies us % terraform import aws_codeartifact_repository_permissions_policy.example arn:aws:codeartifact:us-west-2:012345678912:repository/tf-acc-test-6968272603913957763/tf-acc-test-6968272603913957763 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_fleet.html.markdown b/website/docs/cdktf/typescript/r/codebuild_fleet.html.markdown index ac12e9a69968..c1ed97597233 100644 --- a/website/docs/cdktf/typescript/r/codebuild_fleet.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_fleet.html.markdown @@ -138,6 +138,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_fleet.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:fleet/example-fleet" + } +} + +resource "aws_codebuild_fleet" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild fleet. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Fleet using the `name` or the `arn`. For example: ```typescript @@ -164,4 +185,4 @@ Using `terraform import`, import CodeBuild Fleet using the `name`. For example: % terraform import aws_codebuild_fleet.name fleet-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_project.html.markdown b/website/docs/cdktf/typescript/r/codebuild_project.html.markdown index 155f0b6bf494..4159cd0ca590 100644 --- a/website/docs/cdktf/typescript/r/codebuild_project.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_project.html.markdown @@ -589,6 +589,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_project.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:project/project-name" + } +} + +resource "aws_codebuild_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Project using the `name`. For example: @@ -616,4 +637,4 @@ Using `terraform import`, import CodeBuild Project using the `name`. For example % terraform import aws_codebuild_project.name project-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_report_group.html.markdown b/website/docs/cdktf/typescript/r/codebuild_report_group.html.markdown index 50b2005b2e89..5a6ef7bf296c 100644 --- a/website/docs/cdktf/typescript/r/codebuild_report_group.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_report_group.html.markdown @@ -124,6 +124,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_report_group.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_report_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild report group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Report Group using the CodeBuild Report Group arn. For example: ```typescript @@ -154,4 +175,4 @@ Using `terraform import`, import CodeBuild Report Group using the CodeBuild Repo % terraform import aws_codebuild_report_group.example arn:aws:codebuild:us-west-2:123456789:report-group/report-group-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_resource_policy.html.markdown b/website/docs/cdktf/typescript/r/codebuild_resource_policy.html.markdown index 383c6668d9a0..0c291806936e 100644 --- a/website/docs/cdktf/typescript/r/codebuild_resource_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_resource_policy.html.markdown @@ -97,6 +97,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_resource_policy.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:report-group/report-group-name" + } +} + +resource "aws_codebuild_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild resource. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Resource Policy using the CodeBuild Resource Policy arn. For example: ```typescript @@ -127,4 +148,4 @@ Using `terraform import`, import CodeBuild Resource Policy using the CodeBuild R % terraform import aws_codebuild_resource_policy.example arn:aws:codebuild:us-west-2:123456789:report-group/report-group-name ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_source_credential.html.markdown b/website/docs/cdktf/typescript/r/codebuild_source_credential.html.markdown index 16b56ae484c9..0484c450e15a 100644 --- a/website/docs/cdktf/typescript/r/codebuild_source_credential.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_source_credential.html.markdown @@ -115,6 +115,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codebuild_source_credential.example + identity = { + "arn" = "arn:aws:codebuild:us-west-2:123456789012:token/github" + } +} + +resource "aws_codebuild_source_credential" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeBuild source credential. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeBuild Source Credential using the CodeBuild Source Credential arn. For example: @@ -146,4 +167,4 @@ Using `terraform import`, import CodeBuild Source Credential using the CodeBuild % terraform import aws_codebuild_source_credential.example arn:aws:codebuild:us-west-2:123456789:token:github ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown b/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown index a2ea4636441c..b3ca9e2ae72f 100644 --- a/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown +++ b/website/docs/cdktf/typescript/r/codebuild_webhook.html.markdown @@ -151,25 +151,31 @@ This resource supports the following arguments: * `buildType` - (Optional) The type of build this webhook will trigger. Valid values for this parameter are: `BUILD`, `BUILD_BATCH`. * `manualCreation` - (Optional) If true, CodeBuild doesn't create a webhook in GitHub and instead returns `payloadUrl` and `secret` values for the webhook. The `payloadUrl` and `secret` values in the output can be used to manually create a webhook within GitHub. * `branchFilter` - (Optional) A regular expression used to determine which branches get built. Default is all branches are built. We recommend using `filterGroup` over `branchFilter`. -* `filterGroup` - (Optional) Information about the webhook's trigger. Filter group blocks are documented below. -* `scopeConfiguration` - (Optional) Scope configuration for global or organization webhooks. Scope configuration blocks are documented below. +* `filterGroup` - (Optional) Information about the webhook's trigger. See [filter_group](#filter_group) for details. +* `scopeConfiguration` - (Optional) Scope configuration for global or organization webhooks. See [scope_configuration](#scope_configuration) for details. +* `pullRequestBuildPolicy` - (Optional) Defines comment-based approval requirements for triggering builds on pull requests. See [pull_request_build_policy](#pull_request_build_policy) for details. -`filterGroup` supports the following: +### filter_group -* `filter` - (Required) A webhook filter for the group. Filter blocks are documented below. +* `filter` - (Required) A webhook filter for the group. See [filter](#filter) for details. -`filter` supports the following: +### filter * `type` - (Required) The webhook filter group's type. Valid values for this parameter are: `EVENT`, `BASE_REF`, `HEAD_REF`, `ACTOR_ACCOUNT_ID`, `FILE_PATH`, `COMMIT_MESSAGE`, `WORKFLOW_NAME`, `TAG_NAME`, `RELEASE_NAME`. At least one filter group must specify `EVENT` as its type. * `pattern` - (Required) For a filter that uses `EVENT` type, a comma-separated string that specifies one event: `PUSH`, `PULL_REQUEST_CREATED`, `PULL_REQUEST_UPDATED`, `PULL_REQUEST_REOPENED`. `PULL_REQUEST_MERGED`, `WORKFLOW_JOB_QUEUED` works with GitHub & GitHub Enterprise only. For a filter that uses any of the other filter types, a regular expression. * `excludeMatchedPattern` - (Optional) If set to `true`, the specified filter does *not* trigger a build. Defaults to `false`. -`scopeConfiguration` supports the following: +### scope_configuration * `name` - (Required) The name of either the enterprise or organization. * `scope` - (Required) The type of scope for a GitHub webhook. Valid values for this parameter are: `GITHUB_ORGANIZATION`, `GITHUB_GLOBAL`. * `domain` - (Optional) The domain of the GitHub Enterprise organization. Required if your project's source type is GITHUB_ENTERPRISE. +### pull_request_build_policy + +* `requiresCommentApproval` - (Required) Specifies when comment-based approval is required before triggering a build on pull requests. Valid values are: `DISABLED`, `ALL_PULL_REQUESTS`, and `FORK_PULL_REQUESTS`. +* `approverRoles` - (Optional) List of repository roles that have approval privileges for pull request builds when comment approval is required. This argument must be specified only when `requiresCommentApproval` is not `DISABLED`. See the [AWS documentation](https://docs.aws.amazon.com/codebuild/latest/userguide/pull-request-build-policy.html#pull-request-build-policy.configuration) for valid values and defaults. + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -209,4 +215,4 @@ Using `terraform import`, import CodeBuild Webhooks using the CodeBuild Project % terraform import aws_codebuild_webhook.example MyProjectName ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeconnections_connection.html.markdown b/website/docs/cdktf/typescript/r/codeconnections_connection.html.markdown index 661ff12135bd..e791cb6fdafb 100644 --- a/website/docs/cdktf/typescript/r/codeconnections_connection.html.markdown +++ b/website/docs/cdktf/typescript/r/codeconnections_connection.html.markdown @@ -60,6 +60,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_connection.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codeconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections connection using the ARN. For example: ```typescript @@ -90,4 +111,4 @@ Using `terraform import`, import CodeConnections connection using the ARN. For e % terraform import aws_codeconnections_connection.test-connection arn:aws:codeconnections:us-west-1:0123456789:connection/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codeconnections_host.html.markdown b/website/docs/cdktf/typescript/r/codeconnections_host.html.markdown index dfc5deac608e..baf75819ef83 100644 --- a/website/docs/cdktf/typescript/r/codeconnections_host.html.markdown +++ b/website/docs/cdktf/typescript/r/codeconnections_host.html.markdown @@ -67,6 +67,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codeconnections_host.example + identity = { + "arn" = "arn:aws:codeconnections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codeconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeConnections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeConnections Host using the ARN. For example: ```typescript @@ -97,4 +118,4 @@ Using `terraform import`, import CodeConnections Host using the ARN. For example % terraform import aws_codeconnections_host.example-host arn:aws:codeconnections:us-west-1:0123456789:host/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codepipeline_webhook.html.markdown b/website/docs/cdktf/typescript/r/codepipeline_webhook.html.markdown index d24aa438ab02..501b09aa8547 100644 --- a/website/docs/cdktf/typescript/r/codepipeline_webhook.html.markdown +++ b/website/docs/cdktf/typescript/r/codepipeline_webhook.html.markdown @@ -152,6 +152,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codepipeline_webhook.example + identity = { + "arn" = "arn:aws:codepipeline:us-west-2:123456789012:webhook:example-webhook" + } +} + +resource "aws_codepipeline_webhook" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodePipeline webhook. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodePipeline Webhooks using their ARN. For example: ```typescript @@ -182,4 +203,4 @@ Using `terraform import`, import CodePipeline Webhooks using their ARN. For exam % terraform import aws_codepipeline_webhook.example arn:aws:codepipeline:us-west-2:123456789012:webhook:example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codestarconnections_connection.html.markdown b/website/docs/cdktf/typescript/r/codestarconnections_connection.html.markdown index e0c3bd4371d3..62885e508c10 100644 --- a/website/docs/cdktf/typescript/r/codestarconnections_connection.html.markdown +++ b/website/docs/cdktf/typescript/r/codestarconnections_connection.html.markdown @@ -129,6 +129,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_connection.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:connection/example-connection-id" + } +} + +resource "aws_codestarconnections_connection" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connection. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar connections using the ARN. For example: ```typescript @@ -159,4 +180,4 @@ Using `terraform import`, import CodeStar connections using the ARN. For example % terraform import aws_codestarconnections_connection.test-connection arn:aws:codestar-connections:us-west-1:0123456789:connection/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codestarconnections_host.html.markdown b/website/docs/cdktf/typescript/r/codestarconnections_host.html.markdown index 35381a885dce..73f019a718b8 100644 --- a/website/docs/cdktf/typescript/r/codestarconnections_host.html.markdown +++ b/website/docs/cdktf/typescript/r/codestarconnections_host.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarconnections_host.example + identity = { + "arn" = "arn:aws:codestar-connections:us-west-2:123456789012:host/example-host-id" + } +} + +resource "aws_codestarconnections_host" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar connections host. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar Host using the ARN. For example: ```typescript @@ -95,4 +116,4 @@ Using `terraform import`, import CodeStar Host using the ARN. For example: % terraform import aws_codestarconnections_host.example-host arn:aws:codestar-connections:us-west-1:0123456789:host/79d4d357-a2ee-41e4-b350-2fe39ae59448 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/codestarnotifications_notification_rule.html.markdown b/website/docs/cdktf/typescript/r/codestarnotifications_notification_rule.html.markdown index aef8bbbed7b1..8e47e077499d 100644 --- a/website/docs/cdktf/typescript/r/codestarnotifications_notification_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/codestarnotifications_notification_rule.html.markdown @@ -99,6 +99,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_codestarnotifications_notification_rule.example + identity = { + "arn" = "arn:aws:codestar-notifications:us-west-2:123456789012:notificationrule/dc82df7a-9435-44d4-a696-78f67EXAMPLE" + } +} + +resource "aws_codestarnotifications_notification_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the CodeStar notification rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import CodeStar notification rule using the ARN. For example: ```typescript @@ -129,4 +150,4 @@ Using `terraform import`, import CodeStar notification rule using the ARN. For e % terraform import aws_codestarnotifications_notification_rule.foo arn:aws:codestar-notifications:us-west-1:0123456789:notificationrule/2cdc68a3-8f7c-4893-b6a5-45b362bd4f2b ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/comprehend_document_classifier.html.markdown b/website/docs/cdktf/typescript/r/comprehend_document_classifier.html.markdown index ebfcc1547f04..9b41e3e8a633 100644 --- a/website/docs/cdktf/typescript/r/comprehend_document_classifier.html.markdown +++ b/website/docs/cdktf/typescript/r/comprehend_document_classifier.html.markdown @@ -152,6 +152,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_document_classifier.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:document-classifier/example" + } +} + +resource "aws_comprehend_document_classifier" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend document classifier. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Document Classifier using the ARN. For example: ```typescript @@ -182,4 +203,4 @@ Using `terraform import`, import Comprehend Document Classifier using the ARN. F % terraform import aws_comprehend_document_classifier.example arn:aws:comprehend:us-west-2:123456789012:document_classifier/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/comprehend_entity_recognizer.html.markdown b/website/docs/cdktf/typescript/r/comprehend_entity_recognizer.html.markdown index 0522883122df..dc0c00648ae0 100644 --- a/website/docs/cdktf/typescript/r/comprehend_entity_recognizer.html.markdown +++ b/website/docs/cdktf/typescript/r/comprehend_entity_recognizer.html.markdown @@ -187,6 +187,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_comprehend_entity_recognizer.example + identity = { + "arn" = "arn:aws:comprehend:us-west-2:123456789012:entity-recognizer/example" + } +} + +resource "aws_comprehend_entity_recognizer" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Comprehend entity recognizer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Comprehend Entity Recognizer using the ARN. For example: ```typescript @@ -217,4 +238,4 @@ Using `terraform import`, import Comprehend Entity Recognizer using the ARN. For % terraform import aws_comprehend_entity_recognizer.example arn:aws:comprehend:us-west-2:123456789012:entity-recognizer/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/controltower_baseline.html.markdown b/website/docs/cdktf/typescript/r/controltower_baseline.html.markdown new file mode 100644 index 000000000000..0b11002aa1e1 --- /dev/null +++ b/website/docs/cdktf/typescript/r/controltower_baseline.html.markdown @@ -0,0 +1,116 @@ +--- +subcategory: "Control Tower" +layout: "aws" +page_title: "AWS: aws_controltower_baseline" +description: |- + Terraform resource for managing an AWS Control Tower Baseline. +--- + + + +# Resource: aws_controltower_baseline + +Terraform resource for managing an AWS Control Tower Baseline. + +## Example Usage + +### Basic Usage + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { ControltowerBaseline } from "./.gen/providers/aws/"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new ControltowerBaseline(this, "example", { + baseline_identifier: + "arn:aws:controltower:us-east-1::baseline/17BSJV3IGJ2QSGA2", + baseline_version: "4.0", + parameters: [ + { + key: "IdentityCenterEnabledBaselineArn", + value: + "arn:aws:controltower:us-east-1:664418989480:enabledbaseline/XALULM96QHI525UOC", + }, + ], + target_identifier: test.arn, + }); + } +} + +``` + +## Argument Reference + +The following arguments are required: + +* `baseline_identifier` - (Required) The ARN of the baseline to be enabled. +* `baseline_version` - (Required) The version of the baseline to be enabled. +* `targetIdentifier` - (Required) The ARN of the target on which the baseline will be enabled. Only OUs are supported as targets. + +The following arguments are optional: + +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `parameters` - (Optional) A list of key-value objects that specify enablement parameters, where key is a string and value is a document of any type. See [Parameter](#parameters) below for details. +* `tags` - (Optional) Tags to apply to the landing zone. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. + +### parameters + +* `key` - (Required) The key of the parameter. +* `value` - (Required) The value of the parameter. + +## Attribute Reference + +This resource exports the following attributes in addition to the arguments above: + +* `arn` - ARN of the Baseline. +* `operaton_identifier` - The ID (in UUID format) of the asynchronous operation. +* `tagsAll` - A map of tags assigned to the landing zone, including those inherited from the provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block). + +## Timeouts + +[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts): + +* `create` - (Default `30m`) +* `update` - (Default `30m`) +* `delete` - (Default `30m`) + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Control Tower Baseline using the `arn`. For example: + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { ControltowerBaseline } from "./.gen/providers/aws/"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + ControltowerBaseline.generateConfigForImport( + this, + "example", + "arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC" + ); + } +} + +``` + +Using `terraform import`, import Control Tower Baseline using the `arn`. For example: + +```console +% terraform import aws_controltower_baseline.example arn:aws:controltower:us-east-1:012345678912:enabledbaseline/XALULM96QHI525UOC +``` + + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_agent.html.markdown b/website/docs/cdktf/typescript/r/datasync_agent.html.markdown index a003584bbcab..72b26651abd0 100644 --- a/website/docs/cdktf/typescript/r/datasync_agent.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_agent.html.markdown @@ -120,6 +120,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_agent.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:agent/agent-12345678901234567" + } +} + +resource "aws_datasync_agent" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync agent. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_agent` using the DataSync Agent Amazon Resource Name (ARN). For example: ```typescript @@ -150,4 +171,4 @@ Using `terraform import`, import `aws_datasync_agent` using the DataSync Agent A % terraform import aws_datasync_agent.example arn:aws:datasync:us-east-1:123456789012:agent/agent-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_azure_blob.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_azure_blob.html.markdown index 4ba080e3c44c..439f37891be4 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_azure_blob.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_azure_blob.html.markdown @@ -69,6 +69,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_azure_blob.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_azure_blob" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync Azure Blob location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_azure_blob` using the Amazon Resource Name (ARN). For example: ```typescript @@ -99,4 +120,4 @@ Using `terraform import`, import `aws_datasync_location_azure_blob` using the Am % terraform import aws_datasync_location_azure_blob.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_efs.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_efs.html.markdown index 8bda2ef00c41..a3fc327a7bd4 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_efs.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_efs.html.markdown @@ -70,6 +70,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_efs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_efs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync EFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_efs` using the DataSync Task Amazon Resource Name (ARN). For example: ```typescript @@ -100,4 +121,4 @@ Using `terraform import`, import `aws_datasync_location_efs` using the DataSync % terraform import aws_datasync_location_efs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_hdfs.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_hdfs.html.markdown index 6d7028c0a4ad..b9b11fda8171 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_hdfs.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_hdfs.html.markdown @@ -116,6 +116,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_hdfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_hdfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync HDFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_hdfs` using the Amazon Resource Name (ARN). For example: ```typescript @@ -146,4 +167,4 @@ Using `terraform import`, import `aws_datasync_location_hdfs` using the Amazon R % terraform import aws_datasync_location_hdfs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_nfs.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_nfs.html.markdown index 2200f7dd5221..3ad66962e825 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_nfs.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_nfs.html.markdown @@ -73,6 +73,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_nfs.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_nfs" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync NFS location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_nfs` using the DataSync Task Amazon Resource Name (ARN). For example: ```typescript @@ -103,4 +124,4 @@ Using `terraform import`, import `aws_datasync_location_nfs` using the DataSync % terraform import aws_datasync_location_nfs.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown index 229bbff9d94c..6bde6268ce4e 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_object_storage.html.markdown @@ -64,6 +64,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_object_storage.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_object_storage" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync object storage location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_object_storage` using the Amazon Resource Name (ARN). For example: ```typescript @@ -94,4 +115,4 @@ Using `terraform import`, import `aws_datasync_location_object_storage` using th % terraform import aws_datasync_location_object_storage.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_s3.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_s3.html.markdown index b266da8e5266..641e12f72350 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_s3.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_s3.html.markdown @@ -96,6 +96,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_s3.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_s3" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync S3 location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_s3` using the DataSync Task Amazon Resource Name (ARN). For example: ```typescript @@ -126,4 +147,4 @@ Using `terraform import`, import `aws_datasync_location_s3` using the DataSync T % terraform import aws_datasync_location_s3.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_location_smb.html.markdown b/website/docs/cdktf/typescript/r/datasync_location_smb.html.markdown index 7ab33e7c99e1..5c7104d344ba 100644 --- a/website/docs/cdktf/typescript/r/datasync_location_smb.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_location_smb.html.markdown @@ -69,6 +69,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_location_smb.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:location/loc-12345678901234567" + } +} + +resource "aws_datasync_location_smb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync SMB location. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_location_smb` using the Amazon Resource Name (ARN). For example: ```typescript @@ -99,4 +120,4 @@ Using `terraform import`, import `aws_datasync_location_smb` using the Amazon Re % terraform import aws_datasync_location_smb.example arn:aws:datasync:us-east-1:123456789012:location/loc-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/datasync_task.html.markdown b/website/docs/cdktf/typescript/r/datasync_task.html.markdown index b5c3ca6c9a62..9cd1ec52ea08 100644 --- a/website/docs/cdktf/typescript/r/datasync_task.html.markdown +++ b/website/docs/cdktf/typescript/r/datasync_task.html.markdown @@ -229,6 +229,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_datasync_task.example + identity = { + "arn" = "arn:aws:datasync:us-west-2:123456789012:task/task-12345678901234567" + } +} + +resource "aws_datasync_task" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DataSync task. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_datasync_task` using the DataSync Task Amazon Resource Name (ARN). For example: ```typescript @@ -259,4 +280,4 @@ Using `terraform import`, import `aws_datasync_task` using the DataSync Task Ama % terraform import aws_datasync_task.example arn:aws:datasync:us-east-1:123456789012:task/task-12345678901234567 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_device_pool.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_device_pool.html.markdown index 88a4ccdef5f4..cb2eb8d3d9c9 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_device_pool.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_device_pool.html.markdown @@ -69,6 +69,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_device_pool.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:devicepool:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_device_pool" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm device pool. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Device Pools using their ARN. For example: ```typescript @@ -99,4 +120,4 @@ Using `terraform import`, import DeviceFarm Device Pools using their ARN. For ex % terraform import aws_devicefarm_device_pool.example arn:aws:devicefarm:us-west-2:123456789012:devicepool:4fa784c7-ccb4-4dbf-ba4f-02198320daa1/4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_instance_profile.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_instance_profile.html.markdown index 50fc2652b627..417db00e6b96 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_instance_profile.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_instance_profile.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_instance_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:instanceprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_instance_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm instance profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Instance Profiles using their ARN. For example: ```typescript @@ -87,4 +108,4 @@ Using `terraform import`, import DeviceFarm Instance Profiles using their ARN. F % terraform import aws_devicefarm_instance_profile.example arn:aws:devicefarm:us-west-2:123456789012:instanceprofile:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_network_profile.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_network_profile.html.markdown index 1265e644c81d..f4b524e8c477 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_network_profile.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_network_profile.html.markdown @@ -75,6 +75,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_network_profile.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:networkprofile:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_network_profile" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm network profile. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Network Profiles using their ARN. For example: ```typescript @@ -105,4 +126,4 @@ Using `terraform import`, import DeviceFarm Network Profiles using their ARN. Fo % terraform import aws_devicefarm_network_profile.example arn:aws:devicefarm:us-west-2:123456789012:networkprofile:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_project.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_project.html.markdown index 98802a35bcf2..0c699bf0afc0 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_project.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_project.html.markdown @@ -59,6 +59,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Projects using their ARN. For example: ```typescript @@ -89,4 +110,4 @@ Using `terraform import`, import DeviceFarm Projects using their ARN. For exampl % terraform import aws_devicefarm_project.example arn:aws:devicefarm:us-west-2:123456789012:project:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_test_grid_project.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_test_grid_project.html.markdown index cb24bc92ad30..2d19d9c6e083 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_test_grid_project.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_test_grid_project.html.markdown @@ -68,6 +68,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_test_grid_project.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:testgrid-project:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e" + } +} + +resource "aws_devicefarm_test_grid_project" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm test grid project. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Test Grid Projects using their ARN. For example: ```typescript @@ -98,4 +119,4 @@ Using `terraform import`, import DeviceFarm Test Grid Projects using their ARN. % terraform import aws_devicefarm_test_grid_project.example arn:aws:devicefarm:us-west-2:123456789012:testgrid-project:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/devicefarm_upload.html.markdown b/website/docs/cdktf/typescript/r/devicefarm_upload.html.markdown index fe7d0fc3b632..50804462d194 100644 --- a/website/docs/cdktf/typescript/r/devicefarm_upload.html.markdown +++ b/website/docs/cdktf/typescript/r/devicefarm_upload.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_devicefarm_upload.example + identity = { + "arn" = "arn:aws:devicefarm:us-west-2:123456789012:upload:4e7e7e7e-7e7e-7e7e-7e7e-7e7e7e7e7e7e/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_devicefarm_upload" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Device Farm upload. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DeviceFarm Uploads using their ARN. For example: ```typescript @@ -95,4 +116,4 @@ Using `terraform import`, import DeviceFarm Uploads using their ARN. For example % terraform import aws_devicefarm_upload.example arn:aws:devicefarm:us-west-2:123456789012:upload:4fa784c7-ccb4-4dbf-ba4f-02198320daa1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dms_replication_config.html.markdown b/website/docs/cdktf/typescript/r/dms_replication_config.html.markdown index 85d53adcf1d7..909e1a85a78b 100644 --- a/website/docs/cdktf/typescript/r/dms_replication_config.html.markdown +++ b/website/docs/cdktf/typescript/r/dms_replication_config.html.markdown @@ -101,6 +101,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dms_replication_config.example + identity = { + "arn" = "arn:aws:dms:us-east-1:123456789012:replication-config:example-config" + } +} + +resource "aws_dms_replication_config" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DMS replication configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import replication configs using the `arn`. For example: ```typescript @@ -131,4 +152,4 @@ Using `terraform import`, import a replication config using the `arn`. For examp % terraform import aws_dms_replication_config.example arn:aws:dms:us-east-1:123456789012:replication-config:UX6OL6MHMMJKFFOXE3H7LLJCMEKBDUG4ZV7DRSI ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/docdb_cluster.html.markdown b/website/docs/cdktf/typescript/r/docdb_cluster.html.markdown index 08c1131f1d47..7a7341925e9a 100644 --- a/website/docs/cdktf/typescript/r/docdb_cluster.html.markdown +++ b/website/docs/cdktf/typescript/r/docdb_cluster.html.markdown @@ -62,8 +62,9 @@ This resource supports the following arguments: * `applyImmediately` - (Optional) Specifies whether any cluster modifications are applied immediately, or during the next maintenance window. Default is `false`. -* `availabilityZones` - (Optional) A list of EC2 Availability Zones that - instances in the DB cluster can be created in. +* `availabilityZones` - (Optional) A list of EC2 Availability Zones that instances in the DB cluster can be created in. + DocumentDB automatically assigns 3 AZs if less than 3 AZs are configured, which will show as a difference requiring resource recreation next Terraform apply. + We recommend specifying 3 AZs or using [the `lifecycle` configuration block `ignore_changes` argument](https://www.terraform.io/docs/configuration/meta-arguments/lifecycle.html#ignore_changes) if necessary. * `backupRetentionPeriod` - (Optional) The days to retain backups for. Default `1` * `clusterIdentifierPrefix` - (Optional, Forces new resource) Creates a unique cluster identifier beginning with the specified prefix. Conflicts with `clusterIdentifier`. * `clusterIdentifier` - (Optional, Forces new resources) The cluster identifier. If omitted, Terraform will assign a random, unique identifier. @@ -174,4 +175,4 @@ Using `terraform import`, import DocumentDB Clusters using the `clusterIdentifie % terraform import aws_docdb_cluster.docdb_cluster docdb-prod-cluster ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/docdbelastic_cluster.html.markdown b/website/docs/cdktf/typescript/r/docdbelastic_cluster.html.markdown index a71c21303188..7efda4d3f8ff 100644 --- a/website/docs/cdktf/typescript/r/docdbelastic_cluster.html.markdown +++ b/website/docs/cdktf/typescript/r/docdbelastic_cluster.html.markdown @@ -83,7 +83,28 @@ This resource exports the following attributes in addition to the arguments abov ## Import -In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import OpenSearchServerless Access Policy using the `name` and `type` arguments separated by a slash (`/`). For example: +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_docdbelastic_cluster.example + identity = { + "arn" = "arn:aws:docdb-elastic:us-east-1:000011112222:cluster/12345678-7abc-def0-1234-56789abcdef" + } +} + +resource "aws_docdbelastic_cluster" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DocDB Elastic cluster. + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DocDB Elastic Cluster using the `arn`. For example: ```typescript // DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug @@ -113,4 +134,4 @@ Using `terraform import`, import DocDB (DocumentDB) Elastic Cluster using the `a % terraform import aws_docdbelastic_cluster.example arn:aws:docdb-elastic:us-east-1:000011112222:cluster/12345678-7abc-def0-1234-56789abcdef ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dynamodb_resource_policy.html.markdown b/website/docs/cdktf/typescript/r/dynamodb_resource_policy.html.markdown index f27949bf952b..a1b85191a7ef 100644 --- a/website/docs/cdktf/typescript/r/dynamodb_resource_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/dynamodb_resource_policy.html.markdown @@ -58,6 +58,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_resource_policy.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table" + } +} + +resource "aws_dynamodb_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB Resource Policy using the `resourceArn`. For example: ```typescript @@ -88,4 +109,4 @@ Using `terraform import`, import DynamoDB Resource Policy using the `resourceArn % terraform import aws_dynamodb_resource_policy.example arn:aws:dynamodb:us-east-1:1234567890:table/my-table ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dynamodb_table.html.markdown b/website/docs/cdktf/typescript/r/dynamodb_table.html.markdown index cf3df1807859..77b69c0bf77a 100644 --- a/website/docs/cdktf/typescript/r/dynamodb_table.html.markdown +++ b/website/docs/cdktf/typescript/r/dynamodb_table.html.markdown @@ -297,6 +297,7 @@ The following arguments are optional: Default value is `STANDARD`. * `tags` - (Optional) A map of tags to populate on the created table. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. * `ttl` - (Optional) Configuration block for TTL. See below. +* `warmThroughput` - (Optional) Sets the number of warm read and write units for the specified table. See below. * `writeCapacity` - (Optional) Number of write units for this table. If the `billingMode` is `PROVISIONED`, this field is required. ### `attribute` @@ -333,10 +334,11 @@ The following arguments are optional: * `hashKey` - (Required) Name of the hash key in the index; must be defined as an attribute in the resource. * `name` - (Required) Name of the index. * `nonKeyAttributes` - (Optional) Only required with `INCLUDE` as a projection type; a list of attributes to project into the index. These do not need to be defined as attributes on the table. -* `onDemandThroughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand table. See below. +* `onDemandThroughput` - (Optional) Sets the maximum number of read and write units for the specified on-demand index. See below. * `projectionType` - (Required) One of `ALL`, `INCLUDE` or `KEYS_ONLY` where `ALL` projects every attribute into the index, `KEYS_ONLY` projects into the index only the table and index hash_key and sort_key attributes , `INCLUDE` projects into the index all of the attributes that are defined in `nonKeyAttributes` in addition to the attributes that that`KEYS_ONLY` project. * `rangeKey` - (Optional) Name of the range key; must be defined * `readCapacity` - (Optional) Number of read units for this index. Must be set if billing_mode is set to PROVISIONED. +* `warmThroughput` - (Optional) Sets the number of warm read and write units for this index. See below. * `writeCapacity` - (Optional) Number of write units for this index. Must be set if billing_mode is set to PROVISIONED. ### `localSecondaryIndex` @@ -385,6 +387,13 @@ The following arguments are optional: * `enabled` - (Optional) Whether TTL is enabled. Default value is `false`. +### `warmThroughput` + +~> **Note:** Explicitly configuring both `readUnitsPerSecond` and `writeUnitsPerSecond` to the default/minimum values will cause Terraform to report differences. + +* `readUnitsPerSecond` - (Optional) Number of read operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `12000` (default). +* `writeUnitsPerSecond` - (Optional) Number of write operations a table or index can instantaneously support. For the base table, decreasing this value will force a new resource. For a global secondary index, this value can be increased or decreased without recreation. Minimum value of `4000` (default). + ## Attribute Reference This resource exports the following attributes in addition to the arguments above: @@ -440,4 +449,4 @@ Using `terraform import`, import DynamoDB tables using the `name`. For example: % terraform import aws_dynamodb_table.basic-dynamodb-table GameScores ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/dynamodb_table_export.html.markdown b/website/docs/cdktf/typescript/r/dynamodb_table_export.html.markdown index 57167c92a0f4..a8244600757a 100644 --- a/website/docs/cdktf/typescript/r/dynamodb_table_export.html.markdown +++ b/website/docs/cdktf/typescript/r/dynamodb_table_export.html.markdown @@ -171,6 +171,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_dynamodb_table_export.example + identity = { + "arn" = "arn:aws:dynamodb:us-west-2:123456789012:table/example-table/export/01234567890123-a1b2c3d4" + } +} + +resource "aws_dynamodb_table_export" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the DynamoDB table export. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import DynamoDB table exports using the `arn`. For example: ```typescript @@ -201,4 +222,4 @@ Using `terraform import`, import DynamoDB table exports using the `arn`. For exa % terraform import aws_dynamodb_table_export.example arn:aws:dynamodb:us-west-2:12345678911:table/my-table-1/export/01580735656614-2c2f422e ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ecs_capacity_provider.html.markdown b/website/docs/cdktf/typescript/r/ecs_capacity_provider.html.markdown index 4b3ebf2eb445..a20d63e31d3e 100644 --- a/website/docs/cdktf/typescript/r/ecs_capacity_provider.html.markdown +++ b/website/docs/cdktf/typescript/r/ecs_capacity_provider.html.markdown @@ -103,6 +103,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ecs_capacity_provider.example + identity = { + "arn" = "arn:aws:ecs:us-west-2:123456789012:capacity-provider/example" + } +} + +resource "aws_ecs_capacity_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the ECS capacity provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import ECS Capacity Providers using the `arn`. For example: ```typescript @@ -133,4 +154,4 @@ Using `terraform import`, import ECS Capacity Providers using the `arn`. For exa % terraform import aws_ecs_capacity_provider.example arn:aws:ecs:us-west-2:123456789012:capacity-provider/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_accelerator.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_accelerator.html.markdown index bbca35fe44b5..ef3b6c3e5ab2 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_accelerator.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_accelerator.html.markdown @@ -89,6 +89,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator accelerators using the `arn`. For example: ```typescript @@ -119,4 +140,4 @@ Using `terraform import`, import Global Accelerator accelerators using the `arn` % terraform import aws_globalaccelerator_accelerator.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_cross_account_attachment.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_cross_account_attachment.html.markdown index 364c05cf0186..114e15933415 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_cross_account_attachment.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_cross_account_attachment.html.markdown @@ -101,6 +101,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_cross_account_attachment.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:attachment/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_cross_account_attachment" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator cross-account attachment. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator Cross Account Attachment using the `arn`. For example: ```typescript @@ -131,4 +152,4 @@ Using `terraform import`, import Global Accelerator Cross Account Attachment usi % terraform import aws_globalaccelerator_cross_account_attachment.example arn:aws:globalaccelerator::012345678910:attachment/01234567-abcd-8910-efgh-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_accelerator.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_accelerator.html.markdown index 18b9b6f3202c..14089b3d3fc4 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_accelerator.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_accelerator.html.markdown @@ -88,6 +88,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_accelerator.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh" + } +} + +resource "aws_globalaccelerator_custom_routing_accelerator" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing accelerator. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing accelerators using the `arn`. For example: ```typescript @@ -118,4 +139,4 @@ Using `terraform import`, import Global Accelerator custom routing accelerators % terraform import aws_globalaccelerator_custom_routing_accelerator.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_endpoint_group.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_endpoint_group.html.markdown index 767f72fbfdbc..6db97be274cb 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_endpoint_group.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_endpoint_group.html.markdown @@ -84,6 +84,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_custom_routing_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing endpoint groups using the `id`. For example: ```typescript @@ -114,4 +135,4 @@ Using `terraform import`, import Global Accelerator custom routing endpoint grou % terraform import aws_globalaccelerator_custom_routing_endpoint_group.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxx/endpoint-group/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_listener.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_listener.html.markdown index 87ff8303d7e9..f13a349d4cdf 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_listener.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_custom_routing_listener.html.markdown @@ -88,6 +88,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_custom_routing_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_custom_routing_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator custom routing listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator custom routing listeners using the `id`. For example: ```typescript @@ -118,4 +139,4 @@ Using `terraform import`, import Global Accelerator custom routing listeners usi % terraform import aws_globalaccelerator_custom_routing_listener.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_endpoint_group.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_endpoint_group.html.markdown index c88df045292a..653226fc3dc8 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_endpoint_group.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_endpoint_group.html.markdown @@ -86,6 +86,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_endpoint_group.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz/endpoint-group/098765zyxwvu" + } +} + +resource "aws_globalaccelerator_endpoint_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator endpoint group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator endpoint groups using the `id`. For example: ```typescript @@ -116,4 +137,4 @@ Using `terraform import`, import Global Accelerator endpoint groups using the `i % terraform import aws_globalaccelerator_endpoint_group.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxx/endpoint-group/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/globalaccelerator_listener.html.markdown b/website/docs/cdktf/typescript/r/globalaccelerator_listener.html.markdown index 0d124316c7b6..a2603bf6bb85 100644 --- a/website/docs/cdktf/typescript/r/globalaccelerator_listener.html.markdown +++ b/website/docs/cdktf/typescript/r/globalaccelerator_listener.html.markdown @@ -90,6 +90,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_globalaccelerator_listener.example + identity = { + "arn" = "arn:aws:globalaccelerator::123456789012:accelerator/1234abcd-abcd-1234-abcd-1234abcdefgh/listener/0123vxyz" + } +} + +resource "aws_globalaccelerator_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Global Accelerator listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Global Accelerator listeners using the `id`. For example: ```typescript @@ -120,4 +141,4 @@ Using `terraform import`, import Global Accelerator listeners using the `id`. Fo % terraform import aws_globalaccelerator_listener.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/listener/xxxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/glue_catalog_table_optimizer.html.markdown b/website/docs/cdktf/typescript/r/glue_catalog_table_optimizer.html.markdown index 96d00198484f..88559db1cd0a 100644 --- a/website/docs/cdktf/typescript/r/glue_catalog_table_optimizer.html.markdown +++ b/website/docs/cdktf/typescript/r/glue_catalog_table_optimizer.html.markdown @@ -149,15 +149,17 @@ This resource supports the following arguments: ### Orphan File Deletion Configuration * `icebergConfiguration` (Optional) - The configuration for an Iceberg orphan file deletion optimizer. - * `orphanFileRetentionPeriodInDays` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. * `location` (Optional) - Specifies a directory in which to look for files. You may choose a sub-directory rather than the top-level table location. Defaults to the table's location. - + * `orphanFileRetentionPeriodInDays` (Optional) - The number of days that orphan files should be retained before file deletion. Defaults to `3`. + * `runRateInHours` (Optional) - interval in hours between orphan file deletion job runs. Defaults to `24`. + ### Retention Configuration * `icebergConfiguration` (Optional) - The configuration for an Iceberg snapshot retention optimizer. - * `snapshotRetentionPeriodInDays` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. - * `numberOfSnapshotsToRetain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. * `cleanExpiredFiles` (Optional) - If set to `false`, snapshots are only deleted from table metadata, and the underlying data and metadata files are not deleted. Defaults to `false`. + * `numberOfSnapshotsToRetain` (Optional) - The number of Iceberg snapshots to retain within the retention period. Defaults to `1` or the corresponding Iceberg table configuration field if it exists. + * `runRateInHours` (Optional) - Interval in hours between retention job runs. Defaults to `24`. + * `snapshotRetentionPeriodInDays` (Optional) - The number of days to retain the Iceberg snapshots. Defaults to `5`, or the corresponding Iceberg table configuration field if it exists. ## Attribute Reference @@ -195,4 +197,4 @@ Using `terraform import`, import Glue Catalog Table Optimizer using the `catalog % terraform import aws_glue_catalog_table_optimizer.example 123456789012,example_database,example_table,compaction ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/glue_registry.html.markdown b/website/docs/cdktf/typescript/r/glue_registry.html.markdown index 947598f77d8e..ed65338a262a 100644 --- a/website/docs/cdktf/typescript/r/glue_registry.html.markdown +++ b/website/docs/cdktf/typescript/r/glue_registry.html.markdown @@ -53,6 +53,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_registry.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:registry/example" + } +} + +resource "aws_glue_registry" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue registry. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```typescript @@ -83,4 +104,4 @@ Using `terraform import`, import Glue Registries using `arn`. For example: % terraform import aws_glue_registry.example arn:aws:glue:us-west-2:123456789012:registry/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/glue_schema.html.markdown b/website/docs/cdktf/typescript/r/glue_schema.html.markdown index 226fbe47f39e..c530bfab6e89 100644 --- a/website/docs/cdktf/typescript/r/glue_schema.html.markdown +++ b/website/docs/cdktf/typescript/r/glue_schema.html.markdown @@ -66,6 +66,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_glue_schema.example + identity = { + "arn" = "arn:aws:glue:us-west-2:123456789012:schema/example-registry/example-schema" + } +} + +resource "aws_glue_schema" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Glue schema. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Glue Registries using `arn`. For example: ```typescript @@ -96,4 +117,4 @@ Using `terraform import`, import Glue Registries using `arn`. For example: % terraform import aws_glue_schema.example arn:aws:glue:us-west-2:123456789012:schema/example/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/iam_openid_connect_provider.html.markdown b/website/docs/cdktf/typescript/r/iam_openid_connect_provider.html.markdown index f4bdb7309bfc..8fd1a2b583d3 100644 --- a/website/docs/cdktf/typescript/r/iam_openid_connect_provider.html.markdown +++ b/website/docs/cdktf/typescript/r/iam_openid_connect_provider.html.markdown @@ -83,6 +83,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_openid_connect_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:oidc-provider/example.com" + } +} + +resource "aws_iam_openid_connect_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM OpenID Connect provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM OpenID Connect Providers using the `arn`. For example: ```typescript @@ -113,4 +134,4 @@ Using `terraform import`, import IAM OpenID Connect Providers using the `arn`. F % terraform import aws_iam_openid_connect_provider.default arn:aws:iam::123456789012:oidc-provider/accounts.google.com ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/iam_policy.html.markdown b/website/docs/cdktf/typescript/r/iam_policy.html.markdown index cc0a49e7a641..398f3629d666 100644 --- a/website/docs/cdktf/typescript/r/iam_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/iam_policy.html.markdown @@ -73,6 +73,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_policy.example + identity = { + "arn" = "arn:aws:iam::123456789012:policy/UsersManageOwnCredentials" + } +} + +resource "aws_iam_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM Policies using the `arn`. For example: ```typescript @@ -103,4 +124,4 @@ Using `terraform import`, import IAM Policies using the `arn`. For example: % terraform import aws_iam_policy.administrator arn:aws:iam::123456789012:policy/UsersManageOwnCredentials ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/iam_saml_provider.html.markdown b/website/docs/cdktf/typescript/r/iam_saml_provider.html.markdown index cc2b00bb0aec..b29be9893f2d 100644 --- a/website/docs/cdktf/typescript/r/iam_saml_provider.html.markdown +++ b/website/docs/cdktf/typescript/r/iam_saml_provider.html.markdown @@ -53,6 +53,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_saml_provider.example + identity = { + "arn" = "arn:aws:iam::123456789012:saml-provider/ExampleProvider" + } +} + +resource "aws_iam_saml_provider" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM SAML provider. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM SAML Providers using the `arn`. For example: ```typescript @@ -83,4 +104,4 @@ Using `terraform import`, import IAM SAML Providers using the `arn`. For example % terraform import aws_iam_saml_provider.default arn:aws:iam::123456789012:saml-provider/SAMLADFS ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/iam_service_linked_role.html.markdown b/website/docs/cdktf/typescript/r/iam_service_linked_role.html.markdown index 7a208146dd1d..76345f1fb44f 100644 --- a/website/docs/cdktf/typescript/r/iam_service_linked_role.html.markdown +++ b/website/docs/cdktf/typescript/r/iam_service_linked_role.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_iam_service_linked_role.example + identity = { + "arn" = "arn:aws:iam::123456789012:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk" + } +} + +resource "aws_iam_service_linked_role" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IAM service-linked role. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IAM service-linked roles using role ARN. For example: ```typescript @@ -87,4 +108,4 @@ Using `terraform import`, import IAM service-linked roles using role ARN. For ex % terraform import aws_iam_service_linked_role.elasticbeanstalk arn:aws:iam::123456789012:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_container_recipe.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_container_recipe.html.markdown index 6874c3f7984f..e98e0bb57c34 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_container_recipe.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_container_recipe.html.markdown @@ -148,6 +148,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_container_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:container-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_container_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder container recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_container_recipe` resources using the Amazon Resource Name (ARN). For example: ```typescript @@ -178,4 +199,4 @@ Using `terraform import`, import `aws_imagebuilder_container_recipe` resources u % terraform import aws_imagebuilder_container_recipe.example arn:aws:imagebuilder:us-east-1:123456789012:container-recipe/example/1.0.0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_distribution_configuration.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_distribution_configuration.html.markdown index 40e4df1664cc..4bfd5300ca35 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_distribution_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_distribution_configuration.html.markdown @@ -164,6 +164,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_distribution_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:distribution-configuration/example" + } +} + +resource "aws_imagebuilder_distribution_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder distribution configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_distribution_configurations` resources using the Amazon Resource Name (ARN). For example: ```typescript @@ -194,4 +215,4 @@ Using `terraform import`, import `aws_imagebuilder_distribution_configurations` % terraform import aws_imagebuilder_distribution_configuration.example arn:aws:imagebuilder:us-east-1:123456789012:distribution-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_image.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_image.html.markdown index b12423054423..3efa2d53cbc4 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_image.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_image.html.markdown @@ -132,6 +132,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image/example/1.0.0/1" + } +} + +resource "aws_imagebuilder_image" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image` resources using the Amazon Resource Name (ARN). For example: ```typescript @@ -162,4 +183,4 @@ Using `terraform import`, import `aws_imagebuilder_image` resources using the Am % terraform import aws_imagebuilder_image.example arn:aws:imagebuilder:us-east-1:123456789012:image/example/1.0.0/1 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_image_pipeline.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_image_pipeline.html.markdown index f9ef4b06e7ce..25d489883ad1 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_image_pipeline.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_image_pipeline.html.markdown @@ -182,6 +182,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_pipeline.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-pipeline/example" + } +} + +resource "aws_imagebuilder_image_pipeline" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image pipeline. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_pipeline` resources using the Amazon Resource Name (ARN). For example: ```typescript @@ -212,4 +233,4 @@ Using `terraform import`, import `aws_imagebuilder_image_pipeline` resources usi % terraform import aws_imagebuilder_image_pipeline.example arn:aws:imagebuilder:us-east-1:123456789012:image-pipeline/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_image_recipe.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_image_recipe.html.markdown index 5f408a46ebc5..886bf74300ee 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_image_recipe.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_image_recipe.html.markdown @@ -129,6 +129,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_image_recipe.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:image-recipe/example/1.0.0" + } +} + +resource "aws_imagebuilder_image_recipe" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder image recipe. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_image_recipe` resources using the Amazon Resource Name (ARN). For example: ```typescript @@ -159,4 +180,4 @@ Using `terraform import`, import `aws_imagebuilder_image_recipe` resources using % terraform import aws_imagebuilder_image_recipe.example arn:aws:imagebuilder:us-east-1:123456789012:image-recipe/example/1.0.0 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_infrastructure_configuration.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_infrastructure_configuration.html.markdown index 80c336ae3f0b..8a9522cf6717 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_infrastructure_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_infrastructure_configuration.html.markdown @@ -121,6 +121,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_infrastructure_configuration.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:infrastructure-configuration/example" + } +} + +resource "aws_imagebuilder_infrastructure_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder infrastructure configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_infrastructure_configuration` using the Amazon Resource Name (ARN). For example: ```typescript @@ -151,4 +172,4 @@ Using `terraform import`, import `aws_imagebuilder_infrastructure_configuration` % terraform import aws_imagebuilder_infrastructure_configuration.example arn:aws:imagebuilder:us-east-1:123456789012:infrastructure-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_lifecycle_policy.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_lifecycle_policy.html.markdown index c9a7bfadee23..695a709ce2c6 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_lifecycle_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_lifecycle_policy.html.markdown @@ -217,6 +217,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_lifecycle_policy.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:lifecycle-policy/example" + } +} + +resource "aws_imagebuilder_lifecycle_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder lifecycle policy. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_imagebuilder_lifecycle_policy` using the Amazon Resource Name (ARN). For example: ```typescript @@ -247,4 +268,4 @@ Using `terraform import`, import `aws_imagebuilder_lifecycle_policy` using the A % terraform import aws_imagebuilder_lifecycle_policy.example arn:aws:imagebuilder:us-east-1:123456789012:lifecycle-policy/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/imagebuilder_workflow.html.markdown b/website/docs/cdktf/typescript/r/imagebuilder_workflow.html.markdown index 1b988d299b2a..ae31d83555b1 100644 --- a/website/docs/cdktf/typescript/r/imagebuilder_workflow.html.markdown +++ b/website/docs/cdktf/typescript/r/imagebuilder_workflow.html.markdown @@ -68,6 +68,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_imagebuilder_workflow.example + identity = { + "arn" = "arn:aws:imagebuilder:us-east-1:123456789012:workflow/build/example/1.0.0" + } +} + +resource "aws_imagebuilder_workflow" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Image Builder workflow. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import EC2 Image Builder Workflow using the `arn`. For example: ```typescript @@ -100,4 +121,4 @@ Using `terraform import`, import EC2 Image Builder Workflow using the `arn`. For Certain resource arguments, such as `uri`, cannot be read via the API and imported into Terraform. Terraform will display a difference for these arguments the first run after import if declared in the Terraform configuration for an imported resource. - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/inspector_assessment_target.html.markdown b/website/docs/cdktf/typescript/r/inspector_assessment_target.html.markdown index 923187fb9b4a..845b721713ae 100644 --- a/website/docs/cdktf/typescript/r/inspector_assessment_target.html.markdown +++ b/website/docs/cdktf/typescript/r/inspector_assessment_target.html.markdown @@ -58,6 +58,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_target.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678" + } +} + +resource "aws_inspector_assessment_target" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment target. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Inspector Classic Assessment Targets using their Amazon Resource Name (ARN). For example: ```typescript @@ -88,4 +109,4 @@ Using `terraform import`, import Inspector Classic Assessment Targets using thei % terraform import aws_inspector_assessment_target.example arn:aws:inspector:us-east-1:123456789012:target/0-xxxxxxx ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/inspector_assessment_template.html.markdown b/website/docs/cdktf/typescript/r/inspector_assessment_template.html.markdown index f31de98dd593..84998726fa33 100644 --- a/website/docs/cdktf/typescript/r/inspector_assessment_template.html.markdown +++ b/website/docs/cdktf/typescript/r/inspector_assessment_template.html.markdown @@ -76,6 +76,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_inspector_assessment_template.example + identity = { + "arn" = "arn:aws:inspector:us-west-2:123456789012:target/0-12345678/template/0-87654321" + } +} + +resource "aws_inspector_assessment_template" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Inspector assessment template. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_inspector_assessment_template` using the template assessment ARN. For example: ```typescript @@ -106,4 +127,4 @@ Using `terraform import`, import `aws_inspector_assessment_template` using the t % terraform import aws_inspector_assessment_template.example arn:aws:inspector:us-west-2:123456789012:target/0-9IaAzhGR/template/0-WEcjR8CH ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ivs_channel.html.markdown b/website/docs/cdktf/typescript/r/ivs_channel.html.markdown index 8b0a1640e04b..ecf0debb4b53 100644 --- a/website/docs/cdktf/typescript/r/ivs_channel.html.markdown +++ b/website/docs/cdktf/typescript/r/ivs_channel.html.markdown @@ -67,6 +67,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_channel.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh" + } +} + +resource "aws_ivs_channel" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS channel. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Channel using the ARN. For example: ```typescript @@ -97,4 +118,4 @@ Using `terraform import`, import IVS (Interactive Video) Channel using the ARN. % terraform import aws_ivs_channel.example arn:aws:ivs:us-west-2:326937407773:channel/0Y1lcs4U7jk5 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ivs_playback_key_pair.html.markdown b/website/docs/cdktf/typescript/r/ivs_playback_key_pair.html.markdown index 3b4d06bc3ff0..30fd5938b2d1 100644 --- a/website/docs/cdktf/typescript/r/ivs_playback_key_pair.html.markdown +++ b/website/docs/cdktf/typescript/r/ivs_playback_key_pair.html.markdown @@ -65,6 +65,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_playback_key_pair.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:playback-key/abcdABCDefgh" + } +} + +resource "aws_ivs_playback_key_pair" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS playback key pair. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Playback Key Pair using the ARN. For example: ```typescript @@ -95,4 +116,4 @@ Using `terraform import`, import IVS (Interactive Video) Playback Key Pair using % terraform import aws_ivs_playback_key_pair.example arn:aws:ivs:us-west-2:326937407773:playback-key/KDJRJNQhiQzA ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ivs_recording_configuration.html.markdown b/website/docs/cdktf/typescript/r/ivs_recording_configuration.html.markdown index 76e5fce97260..fac29adacead 100644 --- a/website/docs/cdktf/typescript/r/ivs_recording_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/ivs_recording_configuration.html.markdown @@ -76,6 +76,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivs_recording_configuration.example + identity = { + "arn" = "arn:aws:ivs:us-west-2:123456789012:recording-configuration/abcdABCDefgh" + } +} + +resource "aws_ivs_recording_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS recording configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Recording Configuration using the ARN. For example: ```typescript @@ -106,4 +127,4 @@ Using `terraform import`, import IVS (Interactive Video) Recording Configuration % terraform import aws_ivs_recording_configuration.example arn:aws:ivs:us-west-2:326937407773:recording-configuration/KAk1sHBl2L47 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ivschat_logging_configuration.html.markdown b/website/docs/cdktf/typescript/r/ivschat_logging_configuration.html.markdown index 0c1fd239383d..1c608114d7f6 100644 --- a/website/docs/cdktf/typescript/r/ivschat_logging_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/ivschat_logging_configuration.html.markdown @@ -195,6 +195,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_logging_configuration.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:logging-configuration/abcdABCDefgh" + } +} + +resource "aws_ivschat_logging_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat logging configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Logging Configuration using the ARN. For example: ```typescript @@ -225,4 +246,4 @@ Using `terraform import`, import IVS (Interactive Video) Chat Logging Configurat % terraform import aws_ivschat_logging_configuration.example arn:aws:ivschat:us-west-2:326937407773:logging-configuration/MMUQc8wcqZmC ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ivschat_room.html.markdown b/website/docs/cdktf/typescript/r/ivschat_room.html.markdown index 029c4bea3987..c4440bb888f5 100644 --- a/website/docs/cdktf/typescript/r/ivschat_room.html.markdown +++ b/website/docs/cdktf/typescript/r/ivschat_room.html.markdown @@ -122,6 +122,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ivschat_room.example + identity = { + "arn" = "arn:aws:ivschat:us-west-2:123456789012:room/g1H2I3j4k5L6" + } +} + +resource "aws_ivschat_room" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the IVS Chat room. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import IVS (Interactive Video) Chat Room using the ARN. For example: ```typescript @@ -152,4 +173,4 @@ Using `terraform import`, import IVS (Interactive Video) Chat Room using the ARN % terraform import aws_ivschat_room.example arn:aws:ivschat:us-west-2:326937407773:room/GoXEXyB4VwHb ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/kinesis_resource_policy.html.markdown b/website/docs/cdktf/typescript/r/kinesis_resource_policy.html.markdown index ee06c4e6b3f8..d6e1bd296f53 100644 --- a/website/docs/cdktf/typescript/r/kinesis_resource_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/kinesis_resource_policy.html.markdown @@ -53,6 +53,27 @@ This resource exports no additional attributes. ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_kinesis_resource_policy.example + identity = { + "arn" = "arn:aws:kinesis:us-east-1:123456789012:stream/example-stream" + } +} + +resource "aws_kinesis_resource_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Kinesis stream. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Kinesis resource policies using the `resourceArn`. For example: ```typescript @@ -83,4 +104,4 @@ Using `terraform import`, import Kinesis resource policies using the `resourceAr % terraform import aws_kinesis_resource_policy.example arn:aws:kinesis:us-west-2:123456789012:stream/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb.html.markdown b/website/docs/cdktf/typescript/r/lb.html.markdown index ff9b34628264..a7971610b53b 100644 --- a/website/docs/cdktf/typescript/r/lb.html.markdown +++ b/website/docs/cdktf/typescript/r/lb.html.markdown @@ -238,6 +238,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188" + } +} + +resource "aws_lb" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import LBs using their ARN. For example: ```typescript @@ -268,4 +289,4 @@ Using `terraform import`, import LBs using their ARN. For example: % terraform import aws_lb.bar arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb_listener.html.markdown b/website/docs/cdktf/typescript/r/lb_listener.html.markdown index 126176bcf43a..0c287e8d5d66 100644 --- a/website/docs/cdktf/typescript/r/lb_listener.html.markdown +++ b/website/docs/cdktf/typescript/r/lb_listener.html.markdown @@ -609,6 +609,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:187416307283:listener/app/front-end-alb/8e4497da625e2d8a/9ab28ade35828f96" + } +} + +resource "aws_lb_listener" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import listeners using their ARN. For example: ```typescript @@ -639,4 +660,4 @@ Using `terraform import`, import listeners using their ARN. For example: % terraform import aws_lb_listener.front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:listener/app/front-end-alb/8e4497da625e2d8a/9ab28ade35828f96 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb_listener_rule.html.markdown b/website/docs/cdktf/typescript/r/lb_listener_rule.html.markdown index 13647d6f07c2..0f7c74ac8522 100644 --- a/website/docs/cdktf/typescript/r/lb_listener_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/lb_listener_rule.html.markdown @@ -361,6 +361,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_listener_rule.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:listener-rule/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2/9683b2d02a6cabee" + } +} + +resource "aws_lb_listener_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the load balancer listener rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import rules using their ARN. For example: ```typescript @@ -391,4 +412,4 @@ Using `terraform import`, import rules using their ARN. For example: % terraform import aws_lb_listener_rule.front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:listener-rule/app/test/8e4497da625e2d8a/9ab28ade35828f96/67b3d2d36dd7c26b ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb_target_group.html.markdown b/website/docs/cdktf/typescript/r/lb_target_group.html.markdown index 96ac597e240a..781fdc921cdd 100644 --- a/website/docs/cdktf/typescript/r/lb_target_group.html.markdown +++ b/website/docs/cdktf/typescript/r/lb_target_group.html.markdown @@ -318,6 +318,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_target_group.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067" + } +} + +resource "aws_lb_target_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the target group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Target Groups using their ARN. For example: ```typescript @@ -348,4 +369,4 @@ Using `terraform import`, import Target Groups using their ARN. For example: % terraform import aws_lb_target_group.app_front_end arn:aws:elasticloadbalancing:us-west-2:187416307283:targetgroup/app-front-end/20cfe21448b66314 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/lb_trust_store.html.markdown b/website/docs/cdktf/typescript/r/lb_trust_store.html.markdown index 4ba41ef6f619..fb3eeb733bc1 100644 --- a/website/docs/cdktf/typescript/r/lb_trust_store.html.markdown +++ b/website/docs/cdktf/typescript/r/lb_trust_store.html.markdown @@ -76,6 +76,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_lb_trust_store.example + identity = { + "arn" = "arn:aws:elasticloadbalancing:us-west-2:123456789012:truststore/my-trust-store/73e2d6bc24d8a067" + } +} + +resource "aws_lb_trust_store" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the trust store. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Trust Stores using their ARN. For example: ```typescript @@ -106,4 +127,4 @@ Using `terraform import`, import Target Groups using their ARN. For example: % terraform import aws_lb_trust_store.example arn:aws:elasticloadbalancing:us-west-2:187416307283:truststore/my-trust-store/20cfe21448b66314 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/networkfirewall_rule_group.html.markdown b/website/docs/cdktf/typescript/r/networkfirewall_rule_group.html.markdown index 591f6cded45e..162b027e8194 100644 --- a/website/docs/cdktf/typescript/r/networkfirewall_rule_group.html.markdown +++ b/website/docs/cdktf/typescript/r/networkfirewall_rule_group.html.markdown @@ -658,7 +658,7 @@ The `dimension` block supports the following argument: The `destination` block supports the following argument: -* `addressDefinition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `addressDefinition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Destination Port @@ -672,7 +672,7 @@ The `destinationPort` block supports the following arguments: The `source` block supports the following argument: -* `addressDefinition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4. +* `addressDefinition` - (Required) An IP address or a block of IP addresses in CIDR notation. AWS Network Firewall supports all address ranges for IPv4 and IPv6. ### Source Port @@ -736,4 +736,4 @@ Using `terraform import`, import Network Firewall Rule Groups using their `arn`. % terraform import aws_networkfirewall_rule_group.example arn:aws:network-firewall:us-west-1:123456789012:stateful-rulegroup/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/networkfirewall_tls_inspection_configuration.html.markdown b/website/docs/cdktf/typescript/r/networkfirewall_tls_inspection_configuration.html.markdown index f824b7efaccd..ed473e8c9f05 100644 --- a/website/docs/cdktf/typescript/r/networkfirewall_tls_inspection_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/networkfirewall_tls_inspection_configuration.html.markdown @@ -513,6 +513,27 @@ The `certificates` block exports the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_networkfirewall_tls_inspection_configuration.example + identity = { + "arn" = "arn:aws:network-firewall:us-west-2:123456789012:tls-configuration/example" + } +} + +resource "aws_networkfirewall_tls_inspection_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Network Firewall TLS inspection configuration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Network Firewall TLS Inspection Configuration using the `arn`. For example: ```typescript @@ -543,4 +564,4 @@ Using `terraform import`, import Network Firewall TLS Inspection Configuration u % terraform import aws_networkfirewall_tls_inspection_configuration.example arn:aws:network-firewall::::tls-configuration/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/networkmanager_vpc_attachment.html.markdown b/website/docs/cdktf/typescript/r/networkmanager_vpc_attachment.html.markdown index 54b473954214..17f509e71827 100644 --- a/website/docs/cdktf/typescript/r/networkmanager_vpc_attachment.html.markdown +++ b/website/docs/cdktf/typescript/r/networkmanager_vpc_attachment.html.markdown @@ -38,6 +38,36 @@ class MyConvertedCode extends TerraformStack { ``` +### Usage with Options + +```typescript +// DO NOT EDIT. Code generated by 'cdktf convert' - Please report bugs at https://cdk.tf/bug +import { Construct } from "constructs"; +import { Token, TerraformStack } from "cdktf"; +/* + * Provider bindings are generated by running `cdktf get`. + * See https://cdk.tf/provider-generation for more details. + */ +import { NetworkmanagerVpcAttachment } from "./.gen/providers/aws/networkmanager-vpc-attachment"; +class MyConvertedCode extends TerraformStack { + constructor(scope: Construct, name: string) { + super(scope, name); + new NetworkmanagerVpcAttachment(this, "example", { + coreNetworkId: Token.asString(awsccNetworkmanagerCoreNetworkExample.id), + options: { + applianceModeSupport: false, + dnsSupport: true, + ipv6Support: false, + securityGroupReferencingSupport: true, + }, + subnetArns: [Token.asString(awsSubnetExample.arn)], + vpcArn: Token.asString(awsVpcExample.arn), + }); + } +} + +``` + ## Argument Reference The following arguments are required: @@ -54,7 +84,9 @@ The following arguments are optional: ### options * `applianceModeSupport` - (Optional) Whether to enable appliance mode support. If enabled, traffic flow between a source and destination use the same Availability Zone for the VPC attachment for the lifetime of that flow. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `dnsSupport` - (Optional) Whether to enable DNS support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. * `ipv6Support` - (Optional) Whether to enable IPv6 support. If the VPC attachment is pending acceptance, changing this value will recreate the resource. +* `securityGroupReferencingSupport` - (Optional) Whether to enable security group referencing support for this VPC attachment. The default is `true`. However, at the core network policy-level the default is set to `false`. If the VPC attachment is pending acceptance, changing this value will recreate the resource. ## Attribute Reference @@ -112,4 +144,4 @@ Using `terraform import`, import `aws_networkmanager_vpc_attachment` using the a % terraform import aws_networkmanager_vpc_attachment.example attachment-0f8fa60d2238d1bd8 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/paymentcryptography_key.html.markdown b/website/docs/cdktf/typescript/r/paymentcryptography_key.html.markdown index 71c3461a1710..fbe3aeeea10c 100644 --- a/website/docs/cdktf/typescript/r/paymentcryptography_key.html.markdown +++ b/website/docs/cdktf/typescript/r/paymentcryptography_key.html.markdown @@ -108,6 +108,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_paymentcryptography_key.example + identity = { + "arn" = "arn:aws:payment-cryptography:us-east-1:123456789012:key/1234abcd-12ab-34cd-56ef-1234567890ab" + } +} + +resource "aws_paymentcryptography_key" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Payment Cryptography key. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Payment Cryptography Control Plane Key using the `arn:aws:payment-cryptography:us-east-1:123456789012:key/qtbojf64yshyvyzf`. For example: ```typescript @@ -138,4 +159,4 @@ Using `terraform import`, import Payment Cryptography Control Plane Key using th % terraform import aws_paymentcryptography_key.example arn:aws:payment-cryptography:us-east-1:123456789012:key/qtbojf64yshyvyzf ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/quicksight_data_set.html.markdown b/website/docs/cdktf/typescript/r/quicksight_data_set.html.markdown index 84f201d13cec..dbd0a75c2a44 100644 --- a/website/docs/cdktf/typescript/r/quicksight_data_set.html.markdown +++ b/website/docs/cdktf/typescript/r/quicksight_data_set.html.markdown @@ -490,8 +490,17 @@ This resource exports the following attributes in addition to the arguments abov * `arn` - Amazon Resource Name (ARN) of the data set. * `id` - A comma-delimited string joining AWS account ID and data set ID. +* `outputColumns` - The final set of columns available for use in analyses and dashboards after all data preparation and transformation steps have been applied within the data set. See [`outputColumns` Block](#output_columns-block) below. * `tagsAll` - A map of tags assigned to the resource, including those inherited from the provider [`defaultTags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block). +### `outputColumns` Block + +The `outputColumns` block has the following attributes. + +* `name` - The name of the column. +* `description` - The description of the column. +* `type` - The data type of the column. + ## Import In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import a QuickSight Data Set using the AWS account ID and data set ID separated by a comma (`,`). For example: @@ -524,4 +533,4 @@ Using `terraform import`, import a QuickSight Data Set using the AWS account ID % terraform import aws_quicksight_data_set.example 123456789012,example-id ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/rds_integration.html.markdown b/website/docs/cdktf/typescript/r/rds_integration.html.markdown index 62a1361bc811..133f712053b6 100644 --- a/website/docs/cdktf/typescript/r/rds_integration.html.markdown +++ b/website/docs/cdktf/typescript/r/rds_integration.html.markdown @@ -170,6 +170,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_rds_integration.example + identity = { + "arn" = "arn:aws:rds:us-east-1:123456789012:integration:12345678-1234-1234-1234-123456789012" + } +} + +resource "aws_rds_integration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the RDS integration. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import RDS (Relational Database) Integration using the `arn`. For example: ```typescript @@ -200,4 +221,4 @@ Using `terraform import`, import RDS (Relational Database) Integration using the % terraform import aws_rds_integration.example arn:aws:rds:us-west-2:123456789012:integration:abcdefgh-0000-1111-2222-123456789012 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/resourceexplorer2_index.html.markdown b/website/docs/cdktf/typescript/r/resourceexplorer2_index.html.markdown index 69f56d2aef94..0443927faaf1 100644 --- a/website/docs/cdktf/typescript/r/resourceexplorer2_index.html.markdown +++ b/website/docs/cdktf/typescript/r/resourceexplorer2_index.html.markdown @@ -59,6 +59,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_index.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:index/example-index-id" + } +} + +resource "aws_resourceexplorer2_index" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer index. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer indexes using the `arn`. For example: ```typescript @@ -89,4 +110,4 @@ Using `terraform import`, import Resource Explorer indexes using the `arn`. For % terraform import aws_resourceexplorer2_index.example arn:aws:resource-explorer-2:us-east-1:123456789012:index/6047ac4e-207e-4487-9bcf-cb53bb0ff5cc ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/resourceexplorer2_view.html.markdown b/website/docs/cdktf/typescript/r/resourceexplorer2_view.html.markdown index 7a1d10368734..96f06a8bc625 100644 --- a/website/docs/cdktf/typescript/r/resourceexplorer2_view.html.markdown +++ b/website/docs/cdktf/typescript/r/resourceexplorer2_view.html.markdown @@ -88,6 +88,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_resourceexplorer2_view.example + identity = { + "arn" = "arn:aws:resource-explorer-2:us-east-1:123456789012:view/example-view/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_resourceexplorer2_view" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Resource Explorer view. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Resource Explorer views using the `arn`. For example: ```typescript @@ -118,4 +139,4 @@ Using `terraform import`, import Resource Explorer views using the `arn`. For ex % terraform import aws_resourceexplorer2_view.example arn:aws:resource-explorer-2:us-west-2:123456789012:view/exampleview/e0914f6c-6c27-4b47-b5d4-6b28381a2421 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/scheduler_schedule.html.markdown b/website/docs/cdktf/typescript/r/scheduler_schedule.html.markdown index 6aa04da3fa14..cec269f267b6 100644 --- a/website/docs/cdktf/typescript/r/scheduler_schedule.html.markdown +++ b/website/docs/cdktf/typescript/r/scheduler_schedule.html.markdown @@ -103,13 +103,14 @@ The following arguments are required: The following arguments are optional: -* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `action_after_completion` - (Optional) Action that applies to the schedule after completing invocation of the target. Valid values are `NONE` and `DELETE`. Defaults to `NONE`. * `description` - (Optional) Brief description of the schedule. * `endDate` - (Optional) The date, in UTC, before which the schedule can invoke its target. Depending on the schedule's recurrence expression, invocations might stop on, or before, the end date you specify. EventBridge Scheduler ignores the end date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `groupName` - (Optional, Forces new resource) Name of the schedule group to associate with this schedule. When omitted, the `default` schedule group is used. * `kmsKeyArn` - (Optional) ARN for the customer managed KMS key that EventBridge Scheduler will use to encrypt and decrypt your data. * `name` - (Optional, Forces new resource) Name of the schedule. If omitted, Terraform will assign a random, unique name. Conflicts with `namePrefix`. * `namePrefix` - (Optional, Forces new resource) Creates a unique name beginning with the specified prefix. Conflicts with `name`. +* `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). * `scheduleExpressionTimezone` - (Optional) Timezone in which the scheduling expression is evaluated. Defaults to `UTC`. Example: `Australia/Sydney`. * `startDate` - (Optional) The date, in UTC, after which the schedule can begin invoking its target. Depending on the schedule's recurrence expression, invocations might occur on, or after, the start date you specify. EventBridge Scheduler ignores the start date for one-time schedules. Example: `2030-01-01T01:00:00Z`. * `state` - (Optional) Specifies whether the schedule is enabled or disabled. One of: `ENABLED` (default), `DISABLED`. @@ -253,4 +254,4 @@ Using `terraform import`, import schedules using the combination `group_name/nam % terraform import aws_scheduler_schedule.example my-schedule-group/my-schedule ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/secretsmanager_secret.html.markdown b/website/docs/cdktf/typescript/r/secretsmanager_secret.html.markdown index 82777db57af3..a3ec1836a354 100644 --- a/website/docs/cdktf/typescript/r/secretsmanager_secret.html.markdown +++ b/website/docs/cdktf/typescript/r/secretsmanager_secret.html.markdown @@ -73,6 +73,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret` using the secret Amazon Resource Name (ARN). For example: ```typescript @@ -103,4 +124,4 @@ Using `terraform import`, import `aws_secretsmanager_secret` using the secret Am % terraform import aws_secretsmanager_secret.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/secretsmanager_secret_policy.html.markdown b/website/docs/cdktf/typescript/r/secretsmanager_secret_policy.html.markdown index 3931fac2577e..43b0da817ece 100644 --- a/website/docs/cdktf/typescript/r/secretsmanager_secret_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/secretsmanager_secret_policy.html.markdown @@ -90,6 +90,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_policy.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_policy` using the secret Amazon Resource Name (ARN). For example: ```typescript @@ -120,4 +141,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_policy` using the se % terraform import aws_secretsmanager_secret_policy.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/secretsmanager_secret_rotation.html.markdown b/website/docs/cdktf/typescript/r/secretsmanager_secret_rotation.html.markdown index 93a1d18c6b51..6938da998bb5 100644 --- a/website/docs/cdktf/typescript/r/secretsmanager_secret_rotation.html.markdown +++ b/website/docs/cdktf/typescript/r/secretsmanager_secret_rotation.html.markdown @@ -74,6 +74,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_secretsmanager_secret_rotation.example + identity = { + "arn" = "arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456" + } +} + +resource "aws_secretsmanager_secret_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Secrets Manager secret. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import `aws_secretsmanager_secret_rotation` using the secret Amazon Resource Name (ARN). For example: ```typescript @@ -104,4 +125,4 @@ Using `terraform import`, import `aws_secretsmanager_secret_rotation` using the % terraform import aws_secretsmanager_secret_rotation.example arn:aws:secretsmanager:us-east-1:123456789012:secret:example-123456 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/securityhub_automation_rule.html.markdown b/website/docs/cdktf/typescript/r/securityhub_automation_rule.html.markdown index 21bf467e05a1..929543df3a01 100644 --- a/website/docs/cdktf/typescript/r/securityhub_automation_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/securityhub_automation_rule.html.markdown @@ -230,6 +230,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securityhub_automation_rule.example + identity = { + "arn" = "arn:aws:securityhub:us-east-1:123456789012:automation-rule/a1b2c3d4-5678-90ab-cdef-EXAMPLE11111" + } +} + +resource "aws_securityhub_automation_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Hub automation rule. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub Automation Rule using their ARN. For example: ```typescript @@ -260,4 +281,4 @@ Using `terraform import`, import Security Hub automation rule using their ARN. F % terraform import aws_securityhub_automation_rule.example arn:aws:securityhub:us-west-2:123456789012:automation-rule/473eddde-f5c4-4ae5-85c7-e922f271fffc ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/securitylake_data_lake.html.markdown b/website/docs/cdktf/typescript/r/securitylake_data_lake.html.markdown index 8ced813fbdd6..4a35c08f9cdc 100644 --- a/website/docs/cdktf/typescript/r/securitylake_data_lake.html.markdown +++ b/website/docs/cdktf/typescript/r/securitylake_data_lake.html.markdown @@ -154,6 +154,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_securitylake_data_lake.example + identity = { + "arn" = "arn:aws:securitylake:us-east-1:123456789012:data-lake/default" + } +} + +resource "aws_securitylake_data_lake" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the Security Lake data lake. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Security Hub standards subscriptions using the standards subscription ARN. For example: ```typescript @@ -184,4 +205,4 @@ Using `terraform import`, import Security Hub standards subscriptions using the % terraform import aws_securitylake_data_lake.example arn:aws:securitylake:eu-west-1:123456789012:data-lake/default ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sns_topic.html.markdown b/website/docs/cdktf/typescript/r/sns_topic.html.markdown index a9fb2715d9a2..17bdd5ad1830 100644 --- a/website/docs/cdktf/typescript/r/sns_topic.html.markdown +++ b/website/docs/cdktf/typescript/r/sns_topic.html.markdown @@ -155,6 +155,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topics using the topic `arn`. For example: ```typescript @@ -185,4 +206,4 @@ Using `terraform import`, import SNS Topics using the topic `arn`. For example: % terraform import aws_sns_topic.user_updates arn:aws:sns:us-west-2:123456789012:my-topic ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sns_topic_data_protection_policy.html.markdown b/website/docs/cdktf/typescript/r/sns_topic_data_protection_policy.html.markdown index c6242f845893..686c44d484a9 100644 --- a/website/docs/cdktf/typescript/r/sns_topic_data_protection_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/sns_topic_data_protection_policy.html.markdown @@ -75,6 +75,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_data_protection_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:example" + } +} + +resource "aws_sns_topic_data_protection_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Data Protection Topic Policy using the topic ARN. For example: ```typescript @@ -105,4 +126,4 @@ Using `terraform import`, import SNS Data Protection Topic Policy using the topi % terraform import aws_sns_topic_data_protection_policy.example arn:aws:sns:us-west-2:123456789012:example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sns_topic_policy.html.markdown b/website/docs/cdktf/typescript/r/sns_topic_policy.html.markdown index 88e7941cf9f4..1b1ab9826bdc 100644 --- a/website/docs/cdktf/typescript/r/sns_topic_policy.html.markdown +++ b/website/docs/cdktf/typescript/r/sns_topic_policy.html.markdown @@ -96,6 +96,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_policy.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic" + } +} + +resource "aws_sns_topic_policy" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Policy using the topic ARN. For example: ```typescript @@ -126,4 +147,4 @@ Using `terraform import`, import SNS Topic Policy using the topic ARN. For examp % terraform import aws_sns_topic_policy.user_updates arn:aws:sns:us-west-2:123456789012:my-topic ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/sns_topic_subscription.html.markdown b/website/docs/cdktf/typescript/r/sns_topic_subscription.html.markdown index 848303d44f7d..3b1364e5acf1 100644 --- a/website/docs/cdktf/typescript/r/sns_topic_subscription.html.markdown +++ b/website/docs/cdktf/typescript/r/sns_topic_subscription.html.markdown @@ -422,6 +422,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_sns_topic_subscription.example + identity = { + "arn" = "arn:aws:sns:us-west-2:123456789012:my-topic:8a21d249-4329-4871-acc6-7be709c6ea7f" + } +} + +resource "aws_sns_topic_subscription" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SNS topic subscription. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SNS Topic Subscriptions using the subscription `arn`. For example: ```typescript @@ -452,4 +473,4 @@ Using `terraform import`, import SNS Topic Subscriptions using the subscription % terraform import aws_sns_topic_subscription.user_updates_sqs_target arn:aws:sns:us-west-2:123456789012:my-topic:8a21d249-4329-4871-acc6-7be709c6ea7f ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssmcontacts_rotation.html.markdown b/website/docs/cdktf/typescript/r/ssmcontacts_rotation.html.markdown index a8b3c0fd9b48..3d3bcb9d3202 100644 --- a/website/docs/cdktf/typescript/r/ssmcontacts_rotation.html.markdown +++ b/website/docs/cdktf/typescript/r/ssmcontacts_rotation.html.markdown @@ -244,6 +244,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssmcontacts_rotation.example + identity = { + "arn" = "arn:aws:ssm-contacts:us-east-1:123456789012:rotation/example-rotation" + } +} + +resource "aws_ssmcontacts_rotation" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSM Contacts rotation. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSMContacts Rotation using the `arn`. For example: ```typescript @@ -274,4 +295,4 @@ Using `terraform import`, import CodeGuru Profiler Profiling Group using the `ar % terraform import aws_ssmcontacts_rotation.example arn:aws:ssm-contacts:us-east-1:012345678910:rotation/example ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssoadmin_application.html.markdown b/website/docs/cdktf/typescript/r/ssoadmin_application.html.markdown index 98ebe8092e2f..e18251c3d62d 100644 --- a/website/docs/cdktf/typescript/r/ssoadmin_application.html.markdown +++ b/website/docs/cdktf/typescript/r/ssoadmin_application.html.markdown @@ -138,6 +138,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application using the `id`. For example: ```typescript @@ -168,4 +189,4 @@ Using `terraform import`, import SSO Admin Application using the `id`. For examp % terraform import aws_ssoadmin_application.example arn:aws:sso::123456789012:application/id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/ssoadmin_application_assignment_configuration.html.markdown b/website/docs/cdktf/typescript/r/ssoadmin_application_assignment_configuration.html.markdown index 5704217d0d15..7bce0368074b 100644 --- a/website/docs/cdktf/typescript/r/ssoadmin_application_assignment_configuration.html.markdown +++ b/website/docs/cdktf/typescript/r/ssoadmin_application_assignment_configuration.html.markdown @@ -57,6 +57,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_ssoadmin_application_assignment_configuration.example + identity = { + "arn" = "arn:aws:sso::123456789012:application/ssoins-1234567890abcdef/apl-1234567890abcdef" + } +} + +resource "aws_ssoadmin_application_assignment_configuration" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the SSO application. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SSO Admin Application Assignment Configuration using the `id`. For example: ```typescript @@ -87,4 +108,4 @@ Using `terraform import`, import SSO Admin Application Assignment Configuration % terraform import aws_ssoadmin_application_assignment_configuration.example arn:aws:sso::123456789012:application/id-12345678 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown index 2386c1c54b8e..848d8b83b56d 100644 --- a/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown +++ b/website/docs/cdktf/typescript/r/synthetics_canary.html.markdown @@ -53,22 +53,22 @@ The following arguments are required: * `handler` - (Required) Entry point to use for the source code when running the canary. This value must end with the string `.handler` . * `name` - (Required) Name for this canary. Has a maximum length of 255 characters. Valid characters are lowercase alphanumeric, hyphen, or underscore. * `runtimeVersion` - (Required) Runtime version to use for the canary. Versions change often so consult the [Amazon CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_Library.html) for the latest valid versions. Values include `syn-python-selenium-1.0`, `syn-nodejs-puppeteer-3.0`, `syn-nodejs-2.2`, `syn-nodejs-2.1`, `syn-nodejs-2.0`, and `syn-1.0`. -* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed below. +* `schedule` - (Required) Configuration block providing how often the canary is to run and when these test runs are to stop. Detailed [below](#schedule). The following arguments are optional: * `region` - (Optional) Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the [provider configuration](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#aws-configuration-reference). +* `artifactConfig` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). * `deleteLambda` - (Optional) Specifies whether to also delete the Lambda functions and layers used by this canary. The default is `false`. -* `vpcConfig` - (Optional) Configuration block. Detailed below. * `failureRetentionPeriod` - (Optional) Number of days to retain data about failed runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. -* `runConfig` - (Optional) Configuration block for individual canary runs. Detailed below. +* `runConfig` - (Optional) Configuration block for individual canary runs. Detailed [below](#run_config). * `s3Bucket` - (Optional) Full bucket name which is used if your canary script is located in S3. The bucket must already exist. **Conflicts with `zipFile`.** * `s3Key` - (Optional) S3 key of your script. **Conflicts with `zipFile`.** * `s3Version` - (Optional) S3 version ID of your script. **Conflicts with `zipFile`.** * `startCanary` - (Optional) Whether to run or stop the canary. * `successRetentionPeriod` - (Optional) Number of days to retain data about successful runs of this canary. If you omit this field, the default of 31 days is used. The valid range is 1 to 455 days. * `tags` - (Optional) Key-value map of resource tags. If configured with a provider [`defaultTags` configuration block](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. -* `artifactConfig` - (Optional) configuration for canary artifacts, including the encryption-at-rest settings for artifacts that the canary uploads to Amazon S3. See [Artifact Config](#artifact_config). +* `vpcConfig` - (Optional) Configuration block. Detailed [below](#vpc_config). * `zipFile` - (Optional) ZIP file that contains the script, if you input your canary script directly into the canary instead of referring to an S3 location. It can be up to 225KB. **Conflicts with `s3Bucket`, `s3Key`, and `s3Version`.** ### artifact_config @@ -84,6 +84,11 @@ The following arguments are optional: * `expression` - (Required) Rate expression or cron expression that defines how often the canary is to run. For rate expression, the syntax is `rate(number unit)`. _unit_ can be `minute`, `minutes`, or `hour`. For cron expression, the syntax is `cron(expression)`. For more information about the syntax for cron expressions, see [Scheduling canary runs using cron](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Synthetics_Canaries_cron.html). * `durationInSeconds` - (Optional) Duration in seconds, for the canary to continue making regular runs according to the schedule in the Expression value. +* `retryConfig` - (Optional) Configuration block for canary retries. Detailed [below](#retry_config). + +### retry_config + +* `maxRetries` - (Required) Maximum number of retries. The value must be less than or equal to `2`. If `maxRetries` is `2`, `run_config.timeout_in_seconds` should be less than 600 seconds. Defaults to `0`. ### run_config @@ -152,4 +157,4 @@ Using `terraform import`, import Synthetics Canaries using the `name`. For examp % terraform import aws_synthetics_canary.some some-canary ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown b/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown index f3cf28dabf75..e423661c631f 100644 --- a/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown +++ b/website/docs/cdktf/typescript/r/vpc_endpoint.html.markdown @@ -337,6 +337,32 @@ DNS blocks (for `dnsEntry`) support the following attributes: ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_endpoint.example + identity = { + id = "vpce-3ecf2a57" + } +} + +resource "aws_vpc_endpoint" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the VPC endpoint. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import VPC Endpoints using the VPC endpoint `id`. For example: ```typescript @@ -351,7 +377,7 @@ import { VpcEndpoint } from "./.gen/providers/aws/vpc-endpoint"; class MyConvertedCode extends TerraformStack { constructor(scope: Construct, name: string) { super(scope, name); - VpcEndpoint.generateConfigForImport(this, "endpoint1", "vpce-3ecf2a57"); + VpcEndpoint.generateConfigForImport(this, "example", "vpce-3ecf2a57"); } } @@ -360,7 +386,7 @@ class MyConvertedCode extends TerraformStack { Using `terraform import`, import VPC Endpoints using the VPC endpoint `id`. For example: ```console -% terraform import aws_vpc_endpoint.endpoint1 vpce-3ecf2a57 +% terraform import aws_vpc_endpoint.example vpce-3ecf2a57 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/vpc_security_group_egress_rule.html.markdown b/website/docs/cdktf/typescript/r/vpc_security_group_egress_rule.html.markdown index accc459e5636..59ffa1a807d6 100644 --- a/website/docs/cdktf/typescript/r/vpc_security_group_egress_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/vpc_security_group_egress_rule.html.markdown @@ -72,6 +72,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_egress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_egress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group egress rules using the `securityGroupRuleId`. For example: ```typescript @@ -102,4 +128,4 @@ Using `terraform import`, import security group egress rules using the `security % terraform import aws_vpc_security_group_egress_rule.example sgr-02108b27edd666983 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/vpc_security_group_ingress_rule.html.markdown b/website/docs/cdktf/typescript/r/vpc_security_group_ingress_rule.html.markdown index 4f4fc6a0e8ab..2a8b2724e7b6 100644 --- a/website/docs/cdktf/typescript/r/vpc_security_group_ingress_rule.html.markdown +++ b/website/docs/cdktf/typescript/r/vpc_security_group_ingress_rule.html.markdown @@ -84,6 +84,32 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_vpc_security_group_ingress_rule.example + identity = { + id = "sgr-02108b27edd666983" + } +} + +resource "aws_vpc_security_group_ingress_rule" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +* `id` - (String) ID of the security group rule. + +#### Optional + +- `accountId` (String) AWS Account where this resource is managed. +- `region` (String) Region where this resource is managed. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import security group ingress rules using the `securityGroupRuleId`. For example: ```typescript @@ -114,4 +140,4 @@ Using `terraform import`, import security group ingress rules using the `securit % terraform import aws_vpc_security_group_ingress_rule.example sgr-02108b27edd666983 ``` - \ No newline at end of file + \ No newline at end of file diff --git a/website/docs/cdktf/typescript/r/xray_group.html.markdown b/website/docs/cdktf/typescript/r/xray_group.html.markdown index edc46fd78770..cc79b79b470e 100644 --- a/website/docs/cdktf/typescript/r/xray_group.html.markdown +++ b/website/docs/cdktf/typescript/r/xray_group.html.markdown @@ -66,6 +66,27 @@ This resource exports the following attributes in addition to the arguments abov ## Import +In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute. For example: + +```terraform +import { + to = aws_xray_group.example + identity = { + "arn" = "arn:aws:xray:us-west-2:123456789012:group/example-group/AFAEAFE" + } +} + +resource "aws_xray_group" "example" { + ### Configuration omitted for brevity ### +} +``` + +### Identity Schema + +#### Required + +- `arn` (String) Amazon Resource Name (ARN) of the X-Ray group. + In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import XRay Groups using the ARN. For example: ```typescript @@ -96,4 +117,4 @@ Using `terraform import`, import XRay Groups using the ARN. For example: % terraform import aws_xray_group.example arn:aws:xray:us-west-2:1234567890:group/example-group/TNGX7SW5U6QY36T4ZMOUA3HVLBYCZTWDIOOXY3CJAXTHSS3YCWUA ``` - \ No newline at end of file + \ No newline at end of file From 8843156559cb276b66ab53e91a9967bd588fedac Mon Sep 17 00:00:00 2001 From: Tabito Hara <105637744+tabito-hara@users.noreply.github.com> Date: Tue, 16 Sep 2025 00:59:38 +0900 Subject: [PATCH 2115/2115] docs: Update the example (#44276) * Use bucket policy instead of bucket ACL * Add OAC resource * Remove logging configuration * Add arguments related to ACM * Add some resources of Route 53 to register aliases --- .../r/cloudfront_distribution.html.markdown | 77 ++++++++++++++++--- 1 file changed, 66 insertions(+), 11 deletions(-) diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown index a36da0052c1c..f205bb077500 100644 --- a/website/docs/r/cloudfront_distribution.html.markdown +++ b/website/docs/r/cloudfront_distribution.html.markdown @@ -29,13 +29,55 @@ resource "aws_s3_bucket" "b" { } } -resource "aws_s3_bucket_acl" "b_acl" { - bucket = aws_s3_bucket.b.id - acl = "private" +# See https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-restricting-access-to-s3.html +data "aws_iam_policy_document" "origin_bucket_policy" { + statement { + sid = "AllowCloudFrontServicePrincipalReadWrite" + effect = "Allow" + + principals { + type = "Service" + identifiers = ["cloudfront.amazonaws.com"] + } + + actions = [ + "s3:GetObject", + "s3:PutObject", + ] + + resources = [ + "${aws_s3_bucket.b.arn}/*", + ] + + condition { + test = "StringEquals" + variable = "AWS:SourceArn" + values = [aws_cloudfront_distribution.s3_distribution.arn] + } + } +} + +resource "aws_s3_bucket_policy" "b" { + bucket = aws_s3_bucket.b.bucket + policy = data.aws_iam_policy_document.origin_bucket_policy.json } locals { s3_origin_id = "myS3Origin" + my_domain = "mydomain.com" +} + +data "aws_acm_certificate" "my_domain" { + region = "us-east-1" + domain = "*.${local.my_domain}" + statuses = ["ISSUED"] +} + +resource "aws_cloudfront_origin_access_control" "default" { + name = "default-oac" + origin_access_control_origin_type = "s3" + signing_behavior = "always" + signing_protocol = "sigv4" } resource "aws_cloudfront_distribution" "s3_distribution" { @@ -50,13 +92,7 @@ resource "aws_cloudfront_distribution" "s3_distribution" { comment = "Some comment" default_root_object = "index.html" - logging_config { - include_cookies = false - bucket = "mylogs.s3.amazonaws.com" - prefix = "myprefix" - } - - aliases = ["mysite.example.com", "yoursite.example.com"] + aliases = ["mysite.${local.my_domain}", "yoursite.${local.my_domain}"] default_cache_behavior { allowed_methods = ["DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT"] @@ -136,7 +172,26 @@ resource "aws_cloudfront_distribution" "s3_distribution" { } viewer_certificate { - cloudfront_default_certificate = true + acm_certificate_arn = data.aws_acm_certificate.my_domain.arn + ssl_support_method = "sni-only" + } +} + +# Create Route53 records for the CloudFront distribution aliases +data "aws_route53_zone" "my_domain" { + name = local.my_domain +} + +resource "aws_route53_record" "cloudfront" { + for_each = aws_cloudfront_distribution.s3_distribution.aliases + zone_id = data.aws_route53_zone.my_domain.zone_id + name = each.value + type = "A" + + alias { + name = aws_cloudfront_distribution.s3_distribution.domain_name + zone_id = aws_cloudfront_distribution.s3_distribution.hosted_zone_id + evaluate_target_health = false } } ```